[jabref] 393/459: Imported Upstream version 2.10~beta1+ds

gregor herrmann gregoa at debian.org
Thu Sep 15 20:41:24 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 f6a735efb0054b3d9913e39de34a4e734ee583ac
Author: gregor herrmann <gregoa at debian.org>
Date:   Fri Mar 29 17:26:06 2013 +0100

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

diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..dff5f3a
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1 @@
+language: java
diff --git a/build.gradle b/build.gradle
deleted file mode 100644
index 52890bc..0000000
--- a/build.gradle
+++ /dev/null
@@ -1,88 +0,0 @@
-apply plugin: 'java'
-
-// with gradle 1.1, Sonar 3.2 is not working. One needs Sonar 3.1.1
-apply plugin: 'sonar'
-
-sourceSets {
-	main {
-		java {
-			srcDir 'src/java'
-		}
-		resources {
-			srcDir 'src/resource'
-		}
-	}
-}
-
-repositories {
-	mavenCentral()
-}
-
-/* ANTLR support for Bst.g
-Source: http://fenrock.wordpress.com/2012/05/17/gradle-and-antlr-3-x/
-*/
-
-configurations {
-	antlr3
-}
-
-dependencies {
-	compile 'org.antlr:antlr-runtime:3.4'
-	antlr3 'org.antlr:antlr:3.4'
-}
-task generateGrammarSource(type: JavaExec) {
-    def antlrSource = 'src/java/net/sf/jabref/bst'
-    destinationDir = antlrSource
-
-    inputs.dir file(antlrSource)
-    outputs.dir file(destinationDir)
-
-    def grammars = fileTree(antlrSource).include('**/*.g')
-
-    main = 'org.antlr.Tool'
-    classpath = configurations.antlr3
-    args = ["-o", "${destinationDir}", grammars.files].flatten()
-}
-
-/*
- Code for JavaNCSS adapted from http://gradle.codehaus.org/Cookbook#Cookbook-usingJavaNCSS
- JavaNCSS: http://www.kclee.de/clemens/java/javancss/
-
-Cyclomatic
-Complexity             Ease of       Risk
-Number (CCN)           maintenance
-(McCabe metric)
----------------------------------------------
-1-10, simple           easy          minimum
-11-20, complex         moderate      moderate
-21-50, more complex    hard          high
->50, unstable          very hard     very high
-*/
-
-configurations {
-    javancssConf
-}
-
-dependencies {
-    javancssConf 'org.codehaus.javancss:javancss:32.53'
-}
-
-task javancss << {
-    println 'Running javancss quality metrics tool'
-    ant {
-        taskdef(name:'javancss', classname:'javancss.JavancssAntTask', classpath: configurations.javancssConf.asPath)
-        javancss(
-			srcdir:'src/java',
-			includes:'**/*.java',
-			excludes:'jama/**/*.java, jmat/**/*.java, cformat/**/*.java',
-			abortOnFail:'false',
-			generateReport:'true',
-			outputfile:'build/javancss_report.plain',
-			ccnPerFuncMax:'30',
-			format:'plain',
-			packageMetrics:'true',
-			classMetrics:'false',
-			functionMetrics:'false'
-		)
-    }
-}
diff --git a/build.xml b/build.xml
index 71b6ac0..6b3b4eb 100644
--- a/build.xml
+++ b/build.xml
@@ -35,8 +35,8 @@
      +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-->
 
 	<!-- some version information -->
-	<property name="jabref.version" value="2.9.2" />
-	<property name="jabref.version.full" value="2.9.2.0" /> <!-- a version number with 4 places. Required by launch4j -->
+	<property name="jabref.version" value="2.10b" />
+	<property name="jabref.version.full" value="2.10.0.0" /> <!-- a version number with 4 places. Required by launch4j -->
 	<property name="jabref.year" value="2013" />
 	<property name="jabref.placeholder.version" value="@version@" />
 	<property name="jabref.placeholder.year" value="@year@" />
@@ -83,7 +83,7 @@
 	<property name="osxbin.dir" value="osx" />
 
 	<!-- Load user dependent properties. Has to happen before setting the properties here -->
-	<!-- For instance to redefine the NSIS-compiler write 
+	<!-- For instance to redefine the NSIS-compiler write
 		nsis.executable="d:\\prog\\dev\\NSIS\\makensis.exe"
 	  -->
 	<property file="user.properties" />
@@ -137,7 +137,7 @@
         <include name="spl/*.jar" />
     </fileset>
 	<fileset id="deletableMeta-InfFiles" dir="${build.tmp}/META-INF">
-	        <exclude name="services/**/*" />	        
+	        <exclude name="services/**/*" />
 	</fileset>
     <!-- Done by MrDlib -->
 
@@ -201,14 +201,13 @@
 	<!-- Compiles project excluding tests -->
 	<target name="compile" depends="generate">
 		<mkdir dir="${build.classes}" />
-		<javac debug="on" deprecation="on" destdir="${build.classes}" encoding="UTF8"
-		   source="1.6" target="1.6">
+		<javac debug="on" deprecation="on" destdir="${build.classes}" encoding="UTF8" source="1.6" target="1.6">
 			<src path="${java.dir}" />
 			<exclude name="tests/**" />
 			<exclude name="**/JabRefMain.java" />
 			<classpath refid="classpath" />
 		</javac>
-		<javac debug="off" deprecation="on" destdir="${build.classes}" source="1.6" target="1.6">
+		<javac debug="off" deprecation="on" destdir="${build.classes}" encoding="UTF8" source="1.6" target="1.6">
 			<src path="${java.dir}" />
 			<include name="**/JabRefMain.java" />
 		</javac>
@@ -217,7 +216,7 @@
 	<!-- Compiles project including tests -->
 	<target name="compiletest">
 		<mkdir dir="${build.classes}" />
-		<javac debug="on" destdir="${build.classes}" source="1.6" target="1.6">
+		<javac debug="on" destdir="${build.classes}" encoding="UTF8" source="1.6" target="1.6">
 			<src path="${java.dir}" />
 			<include name="tests/**" />
 			<classpath refid="classpathTest" />
@@ -241,9 +240,9 @@
 	<!-- Jars up project -->
 	<target name="jars" depends="build, unjarlib">
 		<mkdir dir="${build.lib}" />
-        
+
 		<mkdir dir="${build.tmp}" />
-		<jar destfile="${build.lib}/${build.jar}" > 
+		<jar destfile="${build.lib}/${build.jar}" >
         <!--<jar destfile="${build.lib}/JabRef-${revision}.jar" manifest="${src.dir}/MANIFEST.MF">-->
 
 			<fileset dir="${build.classes}" />
@@ -336,10 +335,10 @@
 		<!-- Insert version informations -->
 		<replace dir="${build.help}">
 		    <replacefilter
-			    token="${jabref.placeholder.version}" 
+			    token="${jabref.placeholder.version}"
 				value="${jabref.version}" />
 		    <replacefilter
-			    token="${jabref.placeholder.year}" 
+			    token="${jabref.placeholder.year}"
 				value="${jabref.year}" />
 			<include name="**/About.html" />
 		</replace>
@@ -405,8 +404,8 @@ version=${jabref.version}</echo>
 		</copy>
 
 		<javadoc sourcepath="${java.dir}" destdir="${build.extension-javadocs}" author="true" version="true" windowtitle="JabRef-Extensions API" link="http://docs.oracle.com/javase/6/docs/api/" Overview="${extensions.dir}/API/overview.html" access="protected">
-			<!-- 
-                 create javadoc only selectively for classes that 
+			<!--
+                 create javadoc only selectively for classes that
                  users extending JabRef are likely to use
               -->
 			<fileset dir="${java.dir}" defaultexcludes="yes">
@@ -475,7 +474,7 @@ version=${jabref.version}</echo>
 		<jarbundler dir="${build.lib}"
                     name="JabRef"
                     mainclass="net.sf.jabref.JabRef"
-                    jars="${build.lib}/${build.jar}"
+                    jar="${build.lib}/${build.jar}"
                     icon="${images.dir}/JabRef-Logo.icns"
                     version="${jabref.version}"
                     jvmversion="1.6+"
@@ -698,7 +697,8 @@ version=${jabref.version}</echo>
 		<delete dir="${temp.dir}" failonerror="no"/>
 	</target>
 
-	<!-- creates all distribution files in ${build.lib} -->
-	<target name="release" depends="clean, win.installer, non_osx, osxjar, bzip2src, zipsrc" />
-	<target name="release.linux" depends="clean, win.installer.linux, non_osx, osxjar, bzip2src, zipsrc" />
+	<target name="devsnapshot" depends="clean, addgitinfo, non_osx, win.installer, osxjar" description="creates development snapshot binaries" />
+
+	<target name="release" depends="clean, win.installer, non_osx, osxjar, bzip2src, zipsrc" description="Do a release on Windows. Creates all distribution files in ${build.lib}"/>
+	<target name="release.linux" depends="clean, win.installer.linux, non_osx, osxjar, bzip2src, zipsrc" description="Do a release on Linux. Creates all distribution files in ${build.lib}" />
 </project>
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
deleted file mode 100644
index e3b3376..0000000
Binary files a/gradle/wrapper/gradle-wrapper.jar and /dev/null differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
deleted file mode 100644
index 06a433a..0000000
--- a/gradle/wrapper/gradle-wrapper.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-#Thu Aug 16 16:15:51 CEST 2012
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.1-bin.zip
diff --git a/osx/JavaApplicationStub b/osx/JavaApplicationStub
deleted file mode 100644
index d0d2cd5..0000000
Binary files a/osx/JavaApplicationStub and /dev/null differ
diff --git a/osx/OSXAdapter.class b/osx/OSXAdapter.class
deleted file mode 100644
index 8451e95..0000000
Binary files a/osx/OSXAdapter.class and /dev/null differ
diff --git a/src/help/About.html b/src/help/About.html
index aa649bc..58f976d 100644
--- a/src/help/About.html
+++ b/src/help/About.html
@@ -58,10 +58,11 @@
         Ervin Kolenovic,
         Krzysztof A. Kościuszkiewicz,
         Christian Kopf,
-        Felix Langner,
-        Stephan Lau,
+        Jan Kubovy,
         Jeffrey Kuhn,
         Uwe Kuehn,
+        Felix Langner,
+        Stephan Lau,
         Alex Montgomery,
         Saverio Mori,
         Ambrogio Oliva,
diff --git a/src/help/BibtexHelp.html b/src/help/BibtexHelp.html
index cd01417..8115fa8 100644
--- a/src/help/BibtexHelp.html
+++ b/src/help/BibtexHelp.html
@@ -32,8 +32,7 @@
         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.</li>
 
         <li><strong>address<br /></strong> Usually the address of
         the <tt>publisher</tt> or other type of institution. For
@@ -55,8 +54,7 @@
          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.</li>
 
         <li><strong>booktitle<br /></strong> Title of a book, part
         of which is being cited. For book entries, use the
@@ -271,5 +269,17 @@
     </ul><br />
      *) not direct supported by JabRef<br />
      <br />
+
+    <h2>Hints on fields</h2>
+    <p>
+    An institution name should be inside <code>{} </code> brackets. If the institution name also includes its abbreviation, this abbreviation should be also in <code>{}</code> brackets. For instance, <code>{The Attributed Graph Grammar System ({AGG})}</code>.</p>
+
+    <h2>Further information resources</h2>
+    <ul>
+    <li>
+    Hints on BibTeX: <a href="http://sandilands.info/sgordon/node/488">Recommended BibTeX Format</a>
+    </li>
+    </ul>
+
 </body>
 </html>
diff --git a/src/help/Contents.html b/src/help/Contents.html
index a15eb23..9c97b45 100644
--- a/src/help/Contents.html
+++ b/src/help/Contents.html
@@ -22,10 +22,11 @@
       <li><a href="FileLinks.html">External file links</a></li>
       <li><a href="ExternalFiles.html">PDF/PS/URL/DOI links in JabRef</a></li>
       <li><a href="TimeStampHelp.html">Entry time stamps</a></li>
-      <li><a href="OwnerHelp.html">The 'owner' field</a></li>
+      <li><a href="OwnerHelp.html">The ‘owner’ field</a></li>
       <li><a href="ContentSelectorHelp.html">Field content selector</a></li>
       <li><a href="JournalAbbreviations.html">Journal abbreviations</a></li>
       <li><a href="SpecialFieldsHelp.html">Special Fields</a></li>
+      <li><a href="StringsHelp.html">Bibtex Strings</a></li>
     </ul>
     
     <h2>Finding and sorting entries</h2>
diff --git a/src/help/LabelPatterns.html b/src/help/LabelPatterns.html
index 1f3ec47..5872dd3 100644
--- a/src/help/LabelPatterns.html
+++ b/src/help/LabelPatterns.html
@@ -7,7 +7,7 @@
 
     <h1>Customizing the BibTeX key generator</h1>
 
-    <p>In the 'Key pattern' tab in Preferences, one can set the fields
+    <p>In the ‘Key pattern’ tab in Preferences, one can set the fields
     used in auto generation of BibTex labels. The pattern can be
     set for each of the standard entry types.</p>
 
@@ -38,14 +38,14 @@
         author<br /></li>
 
         <li><b>[<code>authorsN</code>]</b>: The last name of up to
-        N authors. If there are more authors, "EtAl" is
+        N authors. If there are more authors, “EtAl” is
         appended.<br /></li>
         
         <li><b>[<code>authorsAlpha</code>]</b>: Corresponds to the BibTeX
-        style "alpha". One author: First three letters of the last name.
+        style “alpha”. One author: First three letters of the last name.
         Two to four authors: First letters of last names concatenated.
         More than four authors: First letters of last names of first three
-        authors concatenated. "+" at the end. <br /></li>  
+        authors concatenated. “+” at the end. <br /></li>
 
         <li><b>[<code>authIniN</code>]</b>: The beginning of each
         author's last name, using no more than N
@@ -62,19 +62,34 @@
         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
+        the first two authors, and “.ea” if there are more than
         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
+        there are two authors or “.etal” if there are more than
         two.<br /></li>
 
+        <li><b>[<code>authEtAl</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. This is similar to <code>auth.etal</code>. The
+        difference is  that the authors are not separated by “.”
+        and in case of more than 2 authors “EtAl” instead of “.etal”
+        is appended.<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>
+
+	<li><b>[<code>authForeIni</code>]</b>: The forename initial 
+        of the first author.<br /></li>
+
+	<li><b>[<code>authorLastForeIni</code>]</b>: The forename initial 
+        of the last author.<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)
@@ -112,7 +127,7 @@
         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
+        the first two editors, and “.ea” if there are more than
         two.<br /></li>
 
         <li><b>[<code>edtrshort</code>]</b>: The last name if one
@@ -121,13 +136,19 @@
         plus character is added, if there are more than three
         editors.<br /></li>
 
+	<li><b>[<code>edtrForeIni</code>]</b>: The forename initial 
+        of the first editor.<br /></li>
+
+	<li><b>[<code>editorLastForeIni</code>]</b>: The forename initial 
+        of the last editor.<br /></li>
+
         <li><b>[<code>firstpage</code>]</b>: The number of the
         first page of the publication (Caution: this will return 
         the lowest number found in the pages field, since bibtex 
         allows <code>7,41,73--97</code> or <code>43+</code>.)<br /></li>
 
         <li><b>[<code>keywordN</code>]</b>: Keyword number N from
-        the "keywords" field, assuming keywords are separated by
+        the “keywords” field, assuming keywords are separated by
         commas or semicolons.<br /></li>
 
         <li><b>[<code>lastpage</code>]</b>: The number of the last
@@ -141,7 +162,7 @@
         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
@@ -153,8 +174,8 @@
         field name or spcial field marker. Only the first character
         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>
+        journal name “Journal of Fish Biology” produce
+        “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>
diff --git a/src/help/RevisionHistory.html b/src/help/RevisionHistory.html
index cbe3014..e908b37 100644
--- a/src/help/RevisionHistory.html
+++ b/src/help/RevisionHistory.html
@@ -6,6 +6,66 @@
 <body>
 
   <h1>Revision history</h1>
+	<h3>2.10 beta</h3>
+    <ul>
+    <li>Applied fix for JStor fetcher (<a href="https://sourceforge.net/p/jabref/patches/202">patch 202</a> by Nicolas Brouard)</li>
+    <li>Added Settings menu item “Clear connection settings” in OpenOffice/LibreOffice panel.</li>
+    <li>Added support for specifying a BibTeX file at <code>--importToOpen</code>. This allows a usage in browsers
+      to directly append downloaded entries to the currently opened database.</li>
+    <li>Added Unicode to LaTeX conversion for Medline imports (<a href="https://sourceforge.net/p/jabref/feature-requests/721">feature 721</a>)</li>
+    <li>Added Unicode to LaTeX conversion cleanup action (<a href="https://sourceforge.net/p/jabref/feature-requests/721">feature 721</a>)</li>
+    <li>Added countries, weekdays and months to the case keeper</li>
+    <li>Added support for Emacs key bindings at the entry editor.
+      To avoid collisions of common key bindings, Page up and page down (C-v) are not supported as C-v is “paste” in Windows key bindings.</li>
+    <li>Added a formatter for units which keeps the case and adds non-breaking separators</li>
+    <li>Added a Merge entries functionality</li>
+    <li>Added a setting to choose either a DOI link or a URL to be standard (<a href="https://sourceforge.net/p/jabref/feature-requests/710">feature 710</a>)</li>
+    <li>Added button to change entry type. Removed this functionality from the type label, and
+      reduced the font size.</li>
+    <li>Added Iso690 export including two new formatters: Iso690FormatDate and Iso690NamesAuthors
+      (<a href="https://sourceforge.net/p/jabref/patches/123">patch 123</a> by Laura Hernández Gómez)</li>
+    <li>Added menu option “Automatically set file links for selected entries”.</li>
+    <li>Added new BibTeX label pattern authEtAl</li>
+    <li>Added new BibTeX label pattern authForeIne, authorLastForeIni, edtrForeIni, and editorLastForeIni
+      (<a href="https://sourceforge.net/p/jabref/patches/199">patch 199</a>)</li>
+    <li>The folder of attachments can now be opened (<a href="https://sourceforge.net/p/jabref/feature-requests/726">feature 726</a>, patch by Douglas Nassif Roma Junior).</li>
+    <li>New translation: Spanish. By Jorge Tornero et al.</li>
+    <li>Adapted the required and optional fields of entry types according to
+      <a href="http://en.wikipedia.org/wiki/BibTeX#Entry_types">http://en.wikipedia.org/wiki/BibTeX#Entry_types</a></li>
+    <li>After a search has been done, the first entry of the entry table is selected (<a href="https://sourceforge.net/p/jabref/feature-requests/656">feature 656</a>).</li>
+    <li>Entries contained in an .aux file can now be selected (<a href="https://sourceforge.net/p/jabref/feature-requests/644">feature 644</a>).</li>
+    <li>Number of entries in a group is now displayed in brackets (<a href="https://sourceforge.net/p/jabref/patches/124">patch 124</a>).
+      Feature has to be enabled at the group settings as calculating the numbers takes a long time at huge databases.</li>
+    <li>New entries are now always be added to a group. Fixes <a href="https://sourceforge.net/p/jabref/bugs/1093">bug 1093</a>.</li>
+    <li>Configurable: Timestamp is now automatically updated on a change of an entry (<a href="https://sourceforge.net/p/jabref/feature-requests/799">feature 799</a>)</li>
+    <li>Re-enabled customization of shortcut keys</li>
+    <li>Changed serialization of BibTeX entries:
+	<ul>
+      <li>First, the required, then the optional and then all other fields are written.
+        Thereby, fields are now ordered by name. Except the title, which is written first.</li>
+      <li>The second word in of the BibTeX type is capitalized. E.g., Inproceedings got InProceedings</li>
+      <li>Configurable: Start field contents in same column. Enabled by default.</li>
+      <li>Configurable: Use camel case for field names (e.g., <code>HowPublished</code> instead of <code>howpublished</code>). Enabled by default.</li>
+      <li>If no field name is given, then <code>UNKNOWN</code> is used. For instance, <code> = {X}</code> gets <code> UNKNOWN = {X}</code>.</li>
+	</ul>
+	</li>
+    <li>Saving a part of the database now also writes entries with a crossref field first.</li>
+    <li>Author field is now resolved using <code>@String</code> data.</li>
+    <li>A custom proxy can be specified (<a href="https://sourceforge.net/p/jabref/patches/198">patch 198</a> by Michael).</li>
+    <li>Default key binding for Write XMP is now “CTRL+F7” instead of “CTRL+F4”
+      as the latter conflicts with “Synchronize files” (by Adrian Daerr)</li>
+    <li>WriteXMPAction now uses database to resolve strings even for selected entries (by Adrian Daerr)</li>
+    <li>Extend XMP privacy filtering to Dublin Core Schema (by Adrian Daerr)</li>
+    <li>IEEE search should include author field again (<a href="https://sourceforge.net/p/jabref/patches/201">patch 201</a> by Christopher S. Lester, fixes <a href="https://sourceforge.net/p/jabref/bugs/1137">bug 1137</a>)</li>
+    </ul>
+    </div>
+    </div>
+
+	<h3>2.9.2</h3>
+    <ul>
+     <li>Fixed handling of empty author parts in rare cases. Fixes <a href="https://sourceforge.net/p/jabref/bugs/1124">bug 1124</a>.</li>
+     <li>Fetchers work again: Import inspection dialog is not modal any more.</li>
+    </ul>
     <h3>2.9.1</h3>
     <ul>
     <li>Command line option <code>--importToOpen</code> now also adds to an open tab when JabRef is launched.</li>
@@ -48,7 +108,7 @@
       <li>During file renaming: More illegal characters are removed (idea by Sarel Botha)</li>
       <li>Rudimentary support for IEEEtranBSTCTL added (patch 3582376 by Oscar Gustafsson)</li>
       <li>":" is not filtered from the BibTeX keys any more (patch 3582376 by Oscar Gustafsson)</li>
-      <li>Changed internal look&feel setting (based on patch 3580605)</li>
+      <li>Changed internal look&feel setting (based on patch 3580605)</li>
       <li>Custom importers nested in jars should be supported now (bug 3582838)</li>
       <li>PDFContentImporter uses the DOI fetcher to fetch the BibTeX for the entry (if a DOI exists at the first page).</li>
       <li>Moved migration of legacy PDF/PS fields from legacy tools to clean up dialog.</li>
diff --git a/src/help/StringsHelp.html b/src/help/StringsHelp.html
new file mode 100644
index 0000000..96e884e
--- /dev/null
+++ b/src/help/StringsHelp.html
@@ -0,0 +1,56 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<link rel="stylesheet" type="text/css" href="jabref_help.css"/>
+</head>
+
+<body>
+
+    <h1>Help on Strings</h1>
+    <p><em>Bibtex</em> supports storing constant strings using <code>@String {key = value}</code>.
+    <acronym>JabRef</acronym> supports managing them using <b>BibTeX -> Edit strings</b>, which opens the <a href="StringEditorHelp.html">String Editor</a>. These values can be used
+    in fields. For example, you can have:</p>
+    <pre><code>@String { kopp = "Kopp, Oliver" }
+ at String { kubovy = "Kubovy, Jan" }
+ at String { et = " and " }</code></pre>
+<p>and then in some entry for example: <code>@Misc{ author = kopp # et # kubovy }</code> or <code>@Misc{ author = kopp # " and " # kubovy }</code>. In the JabRef field editor, the author has to be inserted as  <code>#kopp# #et# #kubovy#</code> or <code>#kopp# and #kubovy#</code>.</p>
+
+<p>
+<acronym>JabRef</acronym> enhances the concept of Strings to add a type to those <code>@String</code>s.
+The issue is how to preserve such type of a string in a bibtex file.
+<acronym>JabRef</acronym>adds the type though prefixes:</p>
+
+<ul>
+<li><code>@String { aKopp = "Kopp, Oliver" }</code> is a <code>@String</code> with the type author.</li>
+<li><code>@String { iMIT = "{Massachusetts Institute of Technology ({MIT})}" }</code> is a <code>@String</code> with the type of institution.</li>
+<li><code>@String { anct = "Anecdote" }</code> is a <code>@String</code> of type other.</li>
+<li><code>@String { lTOSCA = "Topology and Orchestration Specification for Cloud Applications" }</code> is a <code>@String</code> of type other.</li>
+</ul>
+
+<p>
+Then <code>@String</code>s of type author should be used for author and editors
+fields only. <code>@String</code>s of type institution should be used for
+institution and organization fields only. <code>@String</code>s of type publisher
+should be used only for publisher fields. And finally <code>@String</code>s of type
+other can be used anywhere.
+</p>
+
+<p>
+It can also happen that you will have the same institution for more types:
+</p>
+<ul>
+<li><code>@String { aMIT = "{Massachusetts Institute of Technology ({MIT})}" }</code>
+if the institution will appear as author or editor</li>
+<li>
+<code>@String { iMIT = "{Massachusetts Institute of Technology ({MIT})}" }</code>
+if the institution will appear as institution or organization</li>
+<li>
+<code>@String { pMIT = "{Massachusetts Institute of Technology ({MIT}) press}" }</code> if the institution will appear as publisher.</li>
+</ul>
+<p>
+Even if the last example may appear contradicting the intention was to
+remove duplicity and unify the names of persons and institutions.
+</p>
+
+
+</body>
+</html>
diff --git a/src/help/da/About.html b/src/help/da/About.html
index ef10d2a..71b7b42 100644
--- a/src/help/da/About.html
+++ b/src/help/da/About.html
@@ -57,10 +57,11 @@
         Ervin Kolenovic,
         Krzysztof A. Kościuszkiewicz,
         Christian Kopf,
-        Felix Langner,
-        Stephan Lau,
+        Jan Kubovy,
         Jeffrey Kuhn,
         Uwe Kuehn,
+        Felix Langner,
+        Stephan Lau,
         Alex Montgomery,
         Saverio Mori,
         Ambrogio Oliva,
diff --git a/src/help/de/About.html b/src/help/de/About.html
index b75976d..a6c254f 100644
--- a/src/help/de/About.html
+++ b/src/help/de/About.html
@@ -55,11 +55,13 @@
         Ervin Kolenovic,
         Krzysztof A. Kościuszkiewicz,
         Christian Kopf,
-        Felix Langner,
-        Stephan Lau,
+        Jan Kubovy,
         Jeffrey Kuhn,
         Uwe Kuehn,
+        Felix Langner,
+        Stephan Lau,
         Alex Montgomery,
+        Saverio Mori,
         Ambrogio Oliva,
         Stephan Rave,
         John Relph,
diff --git a/src/help/fr/About.html b/src/help/fr/About.html
index 298088d..f80592e 100644
--- a/src/help/fr/About.html
+++ b/src/help/fr/About.html
@@ -65,9 +65,11 @@
         Ervin Kolenovic,
         Krzysztof A. Kościuszkiewicz,
         Christian Kopf,
+        Jan Kubovy,
+        Jeffrey Kuhn,
+        Uwe Kuehn,
         Felix Langner,
         Stephan Lau,
-        Jeffrey Kuhn,
         Alex Montgomery,
         Saverio Mori,
         Ambrogio Oliva,
diff --git a/src/help/fr/BibtexHelp.html b/src/help/fr/BibtexHelp.html
index 02c2b87..9dfa69b 100644
--- a/src/help/fr/BibtexHelp.html
+++ b/src/help/fr/BibtexHelp.html
@@ -39,7 +39,7 @@
         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.</li>
 
         <li><strong>address<br /></strong> Habituellement l'adresse
         de l'<tt>éditeur commercial</tt> ("publisher" en
@@ -67,8 +67,7 @@
          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...].</li>
 
         <li><strong>booktitle<br /></strong> Titre d'un livre, dont
         une partie est citée. Pour les entrées du
@@ -306,5 +305,20 @@
     </ul><br />
      *) non supporté directement par JabRef<br />
      <br />
+     
+    <h2>Conseils sur les champs</h2>
+    <p>
+    Le nom d'une institution doit être placé entre accolades <code>{}</code>.
+    Si le nom de l'institution inclut aussi son abréviation, cette abréviation
+    doit aussi être placée entre accolades <code>{}</code>.
+    Par exemple : <code>{The Attributed Graph Grammar System ({AGG})}</code>.</p>
+
+    <h2>Autres sources d'information</h2>
+    <ul>
+    <li>
+    Conseils sur BibTeX :
+    <a href="http://sandilands.info/sgordon/node/488"> Format BibTeX recommandé</a>
+    </li>
+    </ul>
 </body>
 </html>
diff --git a/src/help/fr/CiteSeerHelp.html b/src/help/fr/CiteSeerHelp.html
index 7913909..669cda1 100644
--- a/src/help/fr/CiteSeerHelp.html
+++ b/src/help/fr/CiteSeerHelp.html
@@ -14,11 +14,11 @@
     <p>CiteSeerX est une bibliothèque numérique évolutive de littérature
         scientifique et un moteur de recherche se focalisant principalement
         sur la littérature des sciences de l'information et de l'informatique.
-        CiteSeerx vise à améliorer la dissémination de la littérature
+        CiteSeerx vise à améliorer la dissémination de la littérature
         scientifique et à fournir des améliorations dans la fonctionnalité,
         l'utilité, la disponibilité, le coût, la complétude, l'efficacité et
         l'intemporalité de l'accès aux connaissances scientifiques et
-        savante.
+        savantes.
     </p>
     
 </body>
diff --git a/src/help/fr/Contents.html b/src/help/fr/Contents.html
index 2e4ed10..adc40d8 100644
--- a/src/help/fr/Contents.html
+++ b/src/help/fr/Contents.html
@@ -23,10 +23,11 @@
       <li><a href="FileLinks.html">Liens de fichiers externes</a></li>
       <li><a href="ExternalFiles.html">Liens PDF/PS/URL/DOI dans JabRef</a></li>
       <li><a href="TimeStampHelp.html">Horodatage des entrées</a></li>
-      <li><a href="OwnerHelp.html">Le champ 'owner' (propriétaire)</a></li>
+      <li><a href="OwnerHelp.html">Le champ ‘owner’ (propriétaire)</a></li>
       <li><a href="ContentSelectorHelp.html">Sélecteur de contenu de champ</a></li>
       <li><a href="JournalAbbreviations.html">Abréviations de journaux</a></li>
       <li><a href="SpecialFieldsHelp.html">Champs spéciaux</a></li>
+      <li><a href="StringsHelp.html">Chaînes BibTeX</a></li>
     </ul>
 
     <h2>Recherche et tri des entrées</h2>
diff --git a/src/help/fr/IEEEXploreHelp.html b/src/help/fr/IEEEXploreHelp.html
index 78f9733..a9033e3 100644
--- a/src/help/fr/IEEEXploreHelp.html
+++ b/src/help/fr/IEEEXploreHelp.html
@@ -35,7 +35,8 @@
     fonctionne pas encore.</p>
 
     <p>Pour toute suggestion, envoyez s'il vous plaît
-    un courriel à Aaron Chen <b>nextAaron at gmail.com</b>.</p>    
+    un courriel à Oscar Gustafsson <b>ogib73 at gmail.com</b> ou 
+    à Aaron Chen <b>nextAaron at gmail.com</b>.</p>    
     
 </body>
 </html>
diff --git a/src/help/fr/LabelPatterns.html b/src/help/fr/LabelPatterns.html
index 707baa5..6d426cb 100644
--- a/src/help/fr/LabelPatterns.html
+++ b/src/help/fr/LabelPatterns.html
@@ -9,7 +9,7 @@
     <h1>Personnalisation du générateur de clefs
     BibTeX</h1>
 
-    <p>Dans le menu 'Paramétrage des clefs' de la
+    <p>Dans le menu ‘Paramétrage des clefs’ de la
     fenêtre Préférences, on peut indiquer les
     champs à utiliser pour la génération
     automatique des clefs BibTeX. La définition peut
@@ -46,14 +46,14 @@
         auteur<br /></li>
 
         <li><b>[<code>authorsN</code>]</b>: Les noms des N premiers
-        auteurs. S'il y a plus d'auteurs, "EtAl" est
+        auteurs. S'il y a plus d'auteurs, “EtAl” est
         ajouté.<br /></li>
                 
         <li><b>[<code>authorsAlpha</code>]</b> : correspond au style
-        BibTeX "alpha". Un auteur : les trois premières lettres du nom.
+        BibTeX “alpha”. Un auteur : les trois premières lettres du nom.
         Deux à quatre auteurs : Les premières lettres des noms, concaténées.
-        Plus de quatre auterus : Les premières lettres des noms des trois
-        premiers auteurs, concaténées, avec un "+" à la fin.<br /></li>
+        Plus de quatre auteurs : Les premières lettres des noms des trois
+        premiers auteurs, concaténées, avec un “+” à la fin.<br /></li>
 
         <li><b>[<code>authIniN</code>]</b> : Les N
         premières lettres (ou moins) du nom de chacun des
@@ -71,18 +71,31 @@
         auteurs.<br /></li>
 
         <li><b>[<code>auth.auth.ea</code>]</b> : Le nom des
-        deux premiers auteurs suivi de ".ea" lorsqu'ils sont plus
+        deux premiers auteurs suivi de “.ea” lorsqu'ils sont plus
         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
+        auteur et le nom du second auteur, ou “.etal” s'il y en a
         plus de deux.<br /></li>
+        
+        <li><b>[<code>authEtAl</code>]</b>: Le nom du premier auteur et
+        le nom du second auteur s'il y a deux auteurs ou “EtAl” s'il
+        y en a plus de deux. C'est similaire à <code>auth.etal</code>. La
+        différence est que les auteurs ne sont pas séparés par “.”
+        et dans le cas de plus de deux auteurs “EtAl” est ajouté
+        au lieu de “.etal”.<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 (+)
+        premier caractère du nom de chacun d'eux. Au-delà
+        de trois auteurs, le caractère plus (+)
         est ajouté.<br /></li>
+        
+        <li><b>[<code>authForeIni</code>]</b> : L'initiale du prénom
+        du premier auteur.<br /></li>
+
+	<li><b>[<code>authorLastForeIni</code>]</b>:  : L'initiale du prénom
+        du dernier auteur.<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
@@ -124,22 +137,28 @@
         éditeurs.<br /></li>
 
         <li><b>[<code>edtr.edtr.ea</code>]</b> : Le nom des
-        deux premiers éditeurs suivi de ".ea" lorsqu'ils
+        deux premiers éditeurs suivi de “.ea” lorsqu'ils
         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
+        chacun d'eux. Au-delà de trois éditeurs, le
         caractère plus (+) est ajouté.<br /></li>
 
+        <li><b>[<code>edtrForeIni</code>]</b> : L'initiale du prénom
+        du premier éditeur.<br /></li>
+
+	<li><b>[<code>edtrLastForeIni</code>]</b>:  : L'initiale du prénom
+        du dernier éditeur.<br /></li>
+        
         <li><b>[<code>firstpage</code>]</b> : Le numéro
         de la première page de la publication (Attention : cela retournera
         le plus petit nombre trouvé dans le champ pages, puisque BibTeX
         permet <code>7,41,73--97</code> ou <code>43+</code>).<br /></li>
 
         <li><b>[<code>keywordN</code>]</b>: Nombre de mots-clefs
-        dans le champ "keywords" en supposant que les 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>
 
@@ -154,27 +173,40 @@
         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
-    dessus) peut, de façon optionnelle, être suivi par
+    <p>Un nom de champs (ou celui de l'un des pseudo-champs vu
+    au-dessus) peut, de façon optionnelle, être suivi par
     un ou plusieurs modificateurs. Les modificateurs sont
     appliqués dans l'ordre où ils sont
     spécifiés.</p>
 
     <ul>
-        <li><b>:abbr</b>: Abrège le texte produit par le nom
+        <li><b><code>:abbr</code></b> : Abrège le texte produit par le nom
         du champ ou un marqueur de champ spécial. Uniquement
         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>
+        <b>[journal:abbr]</b> abrégera “Journal of Fish
+        Biology” en “JoFB”.</li>
 
-        <li><b>:lower</b>, force le texte inséré par
+        <li><b><code>:lower</code></b> : Force le texte inséré par
         le marqueur de champ à être en minuscules. Par
         exemple, <b>[auth:lower]</b> bascule le nom du premier
         auteur en minuscules.</li>
+        
+        <li><b><code>:upper</code></b> : Force le texte inséré par
+        le marqueur de champ à être en majuscules. Par
+        exemple, <b>[auth:upper]</b> bascule le nom du premier
+        auteur en majuscules.</li>
+
+        <li><b><code>:(x)</code></b> : Remplace x par une chaîne quelconque.
+        La chaîne entre les parenthèses sera insérée si le marqueur
+        de champ précédent ce modifieur produit une valeur vide. Par exemple le
+        marqueur <b>[volume:(unknown)]</b> renverra le volume de l'entrée
+        s'il existe, et la chaîne <b>unknown</b> si le champ
+        <code>volume</code> de l'entrée est vide.
+        </li>
     </ul>
 
     <p>Si vous n'avez pas défini de modèle de clef
@@ -188,9 +220,9 @@
 
     <p>La clef utilisée par défaut est [auth][year];
     elle produit des clefs du type <code>Yared1998</code>. Si la
-    clef n'est pas unique dans la base de donnée, elle est
+    clef n'est pas unique dans la base de données, elle est
     modifiée par l'ajout d'une des lettres de a à z
-    et ceci jusqu'a ce quelle soit unique. De cette façon,
+    et ceci jusqu'à ce quelle soit unique. De cette façon,
     les étiquettes ressemblent à :</p>
 
     <p style="margin-left: 28pt">
@@ -208,7 +240,7 @@
     régulière donnée et de la remplacer avec
     une chaîne. L'expression régulière et la
     chaîne de remplacement sont entrées dans les
-    champs textes situés sous la liste des définition
+    champs textes situés sous la liste des définitions
     de clefs.</p>
 
     <p>Si la chaîne de remplacement est vide, les
diff --git a/src/help/fr/StringsHelp.html b/src/help/fr/StringsHelp.html
new file mode 100644
index 0000000..6552687
--- /dev/null
+++ b/src/help/fr/StringsHelp.html
@@ -0,0 +1,66 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<link rel="stylesheet" type="text/css" href="jabref_help.css"/>
+</head>
+
+<body>
+
+    <h1>Aide sur les chaînes</h1>
+    <p><em>BibTeX</em> permet d'avoir des chaînes constantes en utilisant <code>@String {key = value}</code>.
+    <acronym>JabRef</acronym>  est capable de les gérer en utilisant <b>BibTeX -> Editer les chaînes</b>,
+    ce qui ouvre l'<a href="StringEditorHelp.html">Editeur de chaînes</a>.
+    Ces valeurs peuvent être utilisées dans des champs. Par exemple, vous pouvez
+    avoir </p>
+<pre><code>@String { kopp = "Kopp, Oliver" }
+ at String { kubovy = "Kubovy, Jan" }
+ at String { et = " and " }</code></pre>
+<p>et ainsi, dans certaines entrées, par exemple :
+    <code>@Misc{ author = kopp # et # kubovy }</code> ou
+    <code>@Misc{ author = kopp # " and " # kubovy }</code>.
+Dans l'éditeur de champs de JabRef, l'auteur doit être inséré comme
+<code>#kopp# #et# #kubovy#</code> ou <code>#kopp# and #kubovy#</code>.</p<
+
+<p>
+<acronym>JabRef</acronym> améliore le concept de chaînes en associant un
+type à ces <code>@String</code>s. Le problème est de préserver le type
+d'une chaîne dans un fichier BibTeX.
+<acronym>JabRef</acronym> spécifie le type grâce à un préfixe :</p>
+
+<ul>
+<li><code>@String { aKopp = "Kopp, Oliver" }</code> est un <code>@String</code> avec le type author.</li>
+<li><code>@String { iMIT = "{Massachusetts Institute of Technology ({MIT})}" }</code> est un <code>@String</code> avec le type institution.</li>
+<li><code>@String { anct = "Anecdote" }</code> est un <code>@String</code> de type other.</li>
+<li><code>@String { lTOSCA = "Topology and Orchestration Specification for Cloud Applications" }</code> est un <code>@String</code> de type other.</li>
+</ul>
+
+<p>
+Ensuite, les <code>@String</code>s de type author ne pourront être utilisées que
+dans les champs author ou editors.
+Des <code>@String</code>s de type institution ne pourront être utilisées que
+dans les champs institution et organization. Des <code>@String</code>s de type publisher
+ne pourront être utilisées que
+dans les champs publisher. Et enfin, des <code>@String</code>s de type
+other seront utilisables partout.
+</p>
+
+<p>
+Il est parfois nécessaire d'avoir la même institution pour plusieurs types :
+</p>
+<ul>
+<li><code>@String { aMIT = "{Massachusetts Institute of Technology ({MIT})}" }</code>
+si l'institution doit apparaître comme author ou editor</li>
+<li>
+<code>@String { iMIT = "{Massachusetts Institute of Technology ({MIT})}" }</code>
+si l'institution doit apparaître comme institution ou organization</li>
+<li>
+<code>@String { pMIT = "{Massachusetts Institute of Technology ({MIT}) press}" }</code>
+si l'institution doit apparaître comme publisher.</li>
+</ul>
+<p>
+Même si le dernier exemple peut apparaître contradictoire, l'intention était 
+de supprimer les doublons et d'unifier les noms de personnes et d'institutions.
+</p>
+
+
+</body>
+</html>
diff --git a/src/help/in/About.html b/src/help/in/About.html
index abc91bc..d1c9f05 100644
--- a/src/help/in/About.html
+++ b/src/help/in/About.html
@@ -57,10 +57,11 @@
         Ervin Kolenovic,
         Krzysztof A. Kościuszkiewicz,
         Christian Kopf,
-        Felix Langner,
-        Stephan Lau,
+        Jan Kubovy,
         Jeffrey Kuhn,
         Uwe Kuehn,
+        Felix Langner,
+        Stephan Lau,
         Alex Montgomery,
         Saverio Mori,
         Ambrogio Oliva,
diff --git a/src/help/ja/ACMPortalHelp.html b/src/help/ja/ACMPortalHelp.html
index b0fc78a..f4d68c5 100644
--- a/src/help/ja/ACMPortalHelp.html
+++ b/src/help/ja/ACMPortalHelp.html
@@ -10,16 +10,14 @@
 
     <p>ACM Portalには二つのデータベースがあります。そのうちの一つ、ACMデジタルライブラリは、50年以上のアーカイブを含む、ACMから出版された論文すべての全文収録コレクションであり、Guide to Computing Literatureは、コンピューティングに関わる主要な出版社からの文献コレクションで、100万以上の項目があります。</p>
 
-    <p>JabRefは、ACM Portalデータベースから文献情報をダウンロードすることができます。この機能を使うには、<b>ウェブ検索→ACMPortalを検索</b>を選択してください。すると検索インタフェースが側面に表示されるようになります。</p>
+    <p>JabRefは、ACM Portalデータベースから文献情報をダウンロードすることができます。この機能を使うには、<b>検索→ウェブ検索</b>を選択してください。すると検索インタフェースが側面に表示されるようになります。ドロップダウンメニューから<b>ACM Portal</b>を選択してください。</p>
 
     <p>検索を始めるには、問い合わせる単語を入力し、<b>Enter</b>鍵を押すか<b>取得</b>ボタンを押してください。</p>
 
     <p>どのデータベースを検索するかを選択することができるほか、<b>概要を取り込む</b>というチェックボックスを有効にすれば、各項目の文献情報に加えて要約もダウンロードすることを選ぶことができます。</p>
 
-    <p>ACM Portalウェブサイトに過度な負荷をかけることを防ぐために、与えられた数以上の項目をダウンロードすることは、JabRefによって拒否されます。</p>
+    <p>ACM Portalに頻繁に接続すると、お使いのIPアドレスが数時間アクセス不能になることがあります。これを回避するために、JabRefは、サーバーが返す項目の最初のページのプレビューを、検索毎に表示します。そこから、どの項目をダウンロードするかを選択してください。</p>
 
-    <p>この点に関して、ACM Portalに頻繁に接続すると、お使いのIPアドレスが数時間アクセス不能になります。そこで、JabRefは、各接続の間に5秒間待機しますので、ダウンロード手順は非常に遅くなります。</p>
-
-    <p>何かご提案がありましたら、Aaron Chen <b>nextAaron at gmail.com</b>にメールを送ってください。</p>
+    <p>何かご提案がありましたら、Aaron Chen (<b>nextAaron at gmail.com</b>)にメールを送ってください。</p>
 </body>
 </html>
diff --git a/src/help/ja/About.html b/src/help/ja/About.html
index 49b9baf..206619c 100644
--- a/src/help/ja/About.html
+++ b/src/help/ja/About.html
@@ -11,7 +11,7 @@
         <img src="../../images/JabRef-icon-48.png" alt="JabRef logo"/><br/>© 2003- at year@
         </div>
 
-        <p>JabRefは、GNU <a href="License.html">General Public License</a>, version 2の下で自由に配布可能です。</p>
+        <p>JabRefはフリーソフトウェアです。JabRefは、Free Software Foundationが公開しているGNU <a href="License.html">General Public License</a>のversion 2か、(お望みであれば)それよりも新しい版の下で自由に配布し修正することが可能です。</p>
 
         <h2>開発者:</h2>
 
@@ -56,10 +56,11 @@
         Ervin Kolenovic,
         Krzysztof A. Kościuszkiewicz,
         Christian Kopf,
-        Felix Langner,
-        Stephan Lau,
+        Jan Kubovy,
         Jeffrey Kuhn,
         Uwe Kuehn,
+        Felix Langner,
+        Stephan Lau,
         Alex Montgomery,
         Saverio Mori,
         Ambrogio Oliva,
@@ -104,7 +105,8 @@
 
         <p>大半のアイコンは、Everaldo (<code>http://www.everaldo.com</code>) によるCrystal Clearから採られています。これはLesser General Public Licenseの下で配布されています。</p>
 
-        <p>JabRefは、PDF取扱のために、JempBoxおよびPDFBoxライブラリを使用しています。両者ともBSDスタイルライセンスの下で配布されています。
-		</p>
+        <p>JabRefは、PDF取扱のために、FontBox、JempBoxおよびPDFBoxライブラリを使用しています。これらはApacheライセンスの下で配布されています。詳細は<code>http://pdfbox.apache.org</code>を参照してください。</p>
+
+        <p>Ubuntu版では、Unityグローバルメニューへの統合をサポートするために、JabRefは、Java Ayatanaを使用しています。詳細については、<code>http://code.google.com/p/java-swing-ayatana/</code>を参照してください。</p>
 </body>
 </html>
diff --git a/src/help/ja/BaseFrameHelp.html b/src/help/ja/BaseFrameHelp.html
index b897b82..18ba69f 100644
--- a/src/help/ja/BaseFrameHelp.html
+++ b/src/help/ja/BaseFrameHelp.html
@@ -8,7 +8,7 @@
 
     <h1>JabRef 基本ウィンドウ</h1>
 
-    <p><b>《註》</b>以下に言及されているメニューアクションのほとんどには、短絡キーがあり、多くはツールバーからも使用できます。短絡キーは、プルダウンメニューに表示されます。</p>
+    <p><b>《註》</b>以下に言及されているメニューアクションのほとんどには、<ruby><rb>捷径鍵</rb><rp>(</rp><rt>ショートカットキー</rt><rp>)</rp></ruby>があり、多くはツールバーからも使用できます。捷径鍵は、プルダウンメニューに表示されます。</p>
 
     <p>これは基本ウィンドウであり、ここからあなたのデータベースを操作します。メニューバーとツールバーの下には、タブ付きのパネルがあり、各パネルが現在開いているデータベースの各々に対応しています。これらのパネルの一つを選択すると、表が表われて、データベース全項目のうち主要なフィールド(表示フィールドは設定可能)が表示されます。</p>
 
@@ -32,24 +32,24 @@
 
 	  <li><span style="color: green">緑色</span>セルは、非必須フィールドを示します。</li>
 
-	  <li>色づけされていないセルは、<em>bibtex</em>プログラムが、この型の項目用にこのフィールドを使用していないことを示します。このフィールドは、JabRef中では編集することができます。</li>
+	  <li>色づけされていないセルは、<em>BibTeX</em>プログラムが、この型の項目用にこのフィールドを使用していないことを示します。このフィールドは、JabRef中では編集することができます。</li>
 	</ul>
       </li>
     </ul>
 
     <h2>項目を新しく追加するには</h2>
 
-    <p>項目を新しく追加するには、いくつかの方法があります。<strong>新規項目</strong>メニューを選ぶと、ダイアログが表示されて、一覧から項目型を選択することができます。このダイアログを飛ばすためには、各項目型に対応したメニューがあり、良く使用されるほとんどの型については短絡キーもあります。</p>
+    <p>項目を新しく追加するには、いくつかの方法があります。<strong>新規項目</strong>メニューを選ぶと、ダイアログが表示されて、一覧から項目型を選択することができます。このダイアログを飛ばすためには、各項目型に対応したメニューがあり、良く使用されるほとんどの型については捷径鍵もあります。</p>
 
     <p>新しい項目が追加されると、既定ではその項目の<a href="EntryEditorHelp.html">項目エディタ</a>が開きます。この挙動は、<strong>設定</strong>ダイアログの中で切り替えることができます。</p>
 
-    <p><b>《註》</b>もっともよく使う項目型の短絡キーを覚えておくことを、つよくお勧めします。たとえば、<em>article</em>型項目を追加するのはCTRL-SHIFT-Aです。</p>
+    <p><b>《註》</b>もっともよく使う項目型の捷径鍵を覚えておくことを、つよくお勧めします。たとえば、<em>article</em>型項目を追加するのはCTRL-SHIFT-Aです。</p>
 
     <h2>項目の編集</h2>
 
     <p>既存の項目の<a href="EntryEditorHelp.html">項目エディタ</a>を開くには、適切な行のどこでもいいのでダブルクリックするか、項目を選択してENTERキーを押してください。</p>
 
-    <h2>フィールド中で<em>bibtex</em>文字列を参照するには</h2>
+    <h2>フィールド中で<em>BibTeX</em>文字列を参照するには</h2>
 
     <p>JabRefでは、全フィールドの中身は、テキストエディタ中で書くのと同じようにそのまま書くことができますが、一つだけ例外があります。文字列を参照するには、<br />
       「#jan# 1997」<br />
diff --git a/src/help/ja/BibtexHelp.html b/src/help/ja/BibtexHelp.html
index fab3a60..d5af4b8 100644
--- a/src/help/ja/BibtexHelp.html
+++ b/src/help/ja/BibtexHelp.html
@@ -6,20 +6,20 @@
 
 <body>
 
-    <h1><em>bibtex</em> について</h1>
+    <h1><em>BibTeX</em> について</h1>
 
-    <p>JabRefは、あなたが<em>bibtex</em>データベースの作業をする手助けをしますが、それでも依然として、お使いのデータベースが、正しく確実に<em>bibtex</em>プログラムによって取り扱われるようにするためには、項目編集にあたって頭においておかなくてはならない規則があります。</p>
+    <p>JabRefは、あなたが<em>BibTeX</em>データベースの作業をする手助けをしますが、それでも依然として、お使いのデータベースが、正しく確実に<em>BibTeX</em>プログラムによって取り扱われるようにするためには、項目編集にあたって頭においておかなくてはならない規則があります。</p>
 
-    <h2><em>Bibtex</em> フィールド</h2>
+    <h2><em>BibTeX</em> フィールド</h2>
 
-    <p><em>bibtex</em>には多くのフィールドがあるほか、JabRef特有のフィールドもあります。</p>
+    <p><em>BibTeX</em>には多くのフィールドがあるほか、JabRef特有のフィールドもあります。</p>
 
-    <p>一般に、テキストを含むフィールド内部では、LaTeXコマンドを使用することができます。<em>Bibtex</em>は、自動的にあなたの文献一覧を整形し、一覧に含まれているフィールドは、文献目録様式にしたがって、自動的に大文字や小文字に変換されます。特定の文字が確実に大文字のままで残されるようにするためには、{B}elgiumのように、その文字を波括弧で囲んでください。</p>
+    <p>一般に、テキストを含むフィールド内部では、LaTeXコマンドを使用することができます。<em>BibTeX</em>は、自動的にあなたの文献一覧を整形し、一覧に含まれているフィールドは、文献目録様式にしたがって、自動的に大文字や小文字に変換されます。特定の文字が確実に大文字のままで残されるようにするためには、{B}elgiumのように、その文字を波括弧で囲んでください。</p>
 
     <p>一部のフィールド型に関する注釈:</p>
 
     <ul>
-        <li><strong style="font-style: italic;">Bibtexkey</strong> LaTeX文書中で、この項目を参照するために使われる固有文字列。LaTeXから項目を参照する際、キーは大文字小文字の区別を含め、参照文字列と一致していなくてはならないことに注意してください。<br /><br /></li>
+        <li><strong style="font-style: italic;">BibTeX<ruby><rb>鍵</rb><rp>(</rp><rt>キー</rt><rp>)</rp></ruby></strong> LaTeX文書中で、この項目を参照するために使われる固有文字列。LaTeXから項目を参照する際、<ruby><rb>鍵</rb><rp>(</rp><rt>キー</rt><rp>)</rp></ruby>は大文字小文字の区別を含め、参照文字列と一致していなくてはならないことに注意してください。<br /><br /></li>
 
         <li><strong>address<br /></strong> 通常は、<tt>publisher</tt>あるいは他の型の団体の住所を示します。van Leunenによれば、主要な出版社に関しては、この情報を空欄にしておくことが推奨されます。一方、小さな出版社については、完全なアドレスを提供することによって読者を助けることができるでしょう。</li>
 
@@ -47,7 +47,7 @@
 
         <li><strong>journal<br /></strong> 学術誌名。学術誌名は、「文字列」を使用して短縮することができます。この文字列を定義するには、<a href="StringEditorHelp.html">文字列エディタ</a>を使用してください。</li>
 
-        <li><strong>key<br /></strong> 「author」情報が欠けているときに、アルファベット順の整序や相互参照、ラベルの作成に使用されます。このフィールドを、<code>\cite</code>コマンドに現れるキーやデータベース項目の最初のキーと混同しないようにしてください。</li>
+        <li><strong>key<br /></strong> 「author」情報が欠けているときに、アルファベット順の整序や相互参照、ラベルの作成に使用されます。このフィールドを、<code>\cite</code>コマンドに現れる<ruby><rb>鍵</rb><rp>(</rp><rt>キー</rt><rp>)</rp></ruby>やデータベース項目の最初に現れる鍵と混同しないようにしてください。</li>
 
         <li><strong>month<br /></strong> 著作が発行された月、または未刊行著作の場合にはそれが書かれた月。標準的な3文字短縮形を使用してください (jan, feb, mar, apr, may, jun, jul, aug, sep, oct, nov, dec)。</li>
 
diff --git a/src/help/ja/CiteSeerHelp.html b/src/help/ja/CiteSeerHelp.html
index 4c98940..7b466aa 100644
--- a/src/help/ja/CiteSeerHelp.html
+++ b/src/help/ja/CiteSeerHelp.html
@@ -6,34 +6,11 @@
 
 <body>
 
-    <h1>CiteSeerから取り込む</h1>
+    <h1>CiteSeerXから読み込む</h1>
 
-    <p>CiteSeerは、科学文献デジタルライブラリであり、主にコンピューターおよび情報科学の文献に特化した検索エンジンです。</p>
+    <p>この機能を使うには、<b>検索→ウェブ検索</b>を選択すれば、操作盤が側面に表示されますので、そのドロップダウンメニューから<b>CiteSeerX</b>を選択してください。</p>
 
-    <h2>CiteSeerから項目を取り込む</h2>
-
-    <p>JabRefは、特定の文献についての情報をCiteSeerデータベースからダウンロードすることができます。この手順を開始するには、データベースに新規項目を追加し、citeseerurlフィールドに、CiteSeer上の当該内容ページへのリンクを置いてください。citeseerurlフィールドは、DDDDDDを数字の列として、以下の書式で書かなくてはなりません。</p>
-
-    <p>http://citeseer.ist.psu.edu/DDDDDD[.html], または<br />
-    oai:CiteSeerPSU:DDDDDD, または<br />
-    DDDDDD</p>
-
-    <p>CiteSeer項目の数字列(DDDDDD)を見つけるには、http://citeseer.ist.psu.edu/<b>名前年タイトル</b>.htmlというアドレスのその文献の文書ページに行き、この文献の(更新)リンクをクリックしてください。更新リンクのURLにこの文献の数値IDが含まれています。</p>
-
-    <p>citeseerurlフィールドを埋めると、<b>BibTeX→CiteSeerからフィールドを取り込む</b>を選択してCiteSeerの各フィールドをダウンロードすることができます。更新したい行を選択していることを確かめてください。</p>
-
-    <h2>文献データベースを生成する</h2>
-
-    <p>いくつかの参考文献の組に対して、これらの構成文献を引用している文書の一覧を生成することができます。この機能を利用するには、データベース中の各文献に、<b>CiteSeerから項目を取り込む</b>で指定した書式に則ったcitesserurlフィールドが含まれている必要があります。この機能を使用するには、<b>ウェブ検索→引用をCiteSeerから取得</b>を選択してください。</p>
-
-    <h2>プロキシサーバーを使用する</h2>
-
-    <p>httpプロクシサーバーを使用する必要があるときには、以下のように、実行時にサーバー名とポート番号を渡してください。</p>
-
-    <p><code>java -Dhttp.proxyHost="ホスト名"
-    -Dhttp.proxyPort="ポート番号"</code></p>
-
-    <p>これらの環境設定は、<a href="http://java.sun.com/j2se/1.4.2/docs/guide/net/properties.html">Sun J2SE documentation</a>で説明されています。</p>
+    <p>CiteSeerXは、発展著しい科学文献デジタルライブラリであり、主にコンピューターおよび情報科学の文献に特化した検索エンジンです。CiteSeerXは、科学文献の普及を促し、科学学術知識へのアクセスにおいて、改善された機能性・使いやすさ・利用可能性・費用・包括性・効率性・即時性を提供することを目的としています。</p>
 
 </body>
 </html>
diff --git a/src/help/ja/CommandLine.html b/src/help/ja/CommandLine.html
index d618e14..2a63841 100644
--- a/src/help/ja/CommandLine.html
+++ b/src/help/ja/CommandLine.html
@@ -1,134 +1,85 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <link rel="stylesheet" type="text/css" href="jabref_help.css"/>
 </head>
 
 <body>
 
-    <h1>Command line options</h1>
+    <h1>コマンドライン オプション</h1>
 
-    <p>Although JabRef is primarily a GUI
-    based application, it offers several command line options that
-    may be useful, and can even perform file conversion operations
-    without opening the graphical interface.</p>
+<p>JabRefは、第一にGUIベースのアプリケーションですが、便利なコマンドライン オプションもいくつか提供しており、グラフィカル インタフェースを開くこと無しにファイル変換操作を行うこともできます。</p>
 
-    <p>You can always specify one or more BibTeX files to load by
-    simply listing their filenames. Take care to specify all
-    options before your list of file names. You must make sure the
-    first file name is not misunderstood as being an argument for
-    an option - this simply means that if a boolean option like
-    <code>-n</code> or <code>-l</code> immediately precedes a file
-    name, add the word "true" as an argument. For instance, the
-    command line:</p>
+    <p>ファイル名を列挙するだけで、一つ以上のBibTeXファイルを読み込むように指定することができます。オプションを指定する場合には、すべてこのファイル名の列挙よりも前で行ってください。最初のファイル名は、オプションの引数と誤解されないようにしなくてはいけませんので、<code>-n</code>や<code>-l</code>のような二値オプションがファイル名の直前に来る場合には、引数として「true」を指定してください。例えば、</p>
 
     <p><code>jabref -o filetoexport.xml,docbook -n true
     original.bib</code></p>
 
-    <p>will correctly load the file <code>original.bib</code>,
-    export it in docbook format to <code>filetoexport.xml</code>,
-    and suppress the GUI. The word <em>true</em> prevents the file
-    name from being interpreted as an argument to the -n
-    option.</p>
+    <p>というコマンドラインは、<code>original.bib</code>ファイルを正しく読み込み、docbook形式で<code>filetoexport.xml</code>に書き出し、GUIは抑制します。ここでは、<em>true</em>という単語があることで、ファイル名が<code>-n</code>オプションの引数と解釈されるのを防いでいます。</p>
 
-    <h2>Help: -h</h2>
+    <h2>ヘルプ: -h</h2>
 
-    <p>This option causes JabRef to display a summary
-    of the command line options, and quit immediately.</p>
+<p>このオプションを与えると、JabRefはコマンドライン オプションの概略を表示して、直ちに終了します。</p>
 
-    <h2>No-GUI mode: -n</h2>
+    <h2>GUI無しモード: -n</h2>
 
-    <p>This option suppresses both the JabRef
-    window and the splash window normally shown at startup. It
-    causes the program to quit immediately once the command line
-    options have been processed.</p>
+    <p>このオプションを与えると、起動時に通常表示されるスプラッシュ ウィンドウとJabRefウィンドウが表示されなくなります。これは、コマンドラインオプションを実行すると、直ちにプログラムを終了します。</p>
 
-    <p>This option is useful for performing file conversion
-    operations from the command line or a script.</p>
+    <p>このオプションは、コマンドラインやスクリプトからファイル変換操作を行う際に便利です。</p>
 
-    <h2>Load session: -l</h2>
+    <h2>セッションの読込: -l</h2>
 
-    <p>This option causes JabRef to load the
-    saved session, if any, before opening the main window.</p>
+    <p>このオプションを与えると、JabRefは、保存されたセッションがある場合には其れを読み込み、それから基本ウィンドウを開きます。</p>
 
-    <h2>Import file: -i filename[,format]</h2>
+    <h2>ファイルの読込: -i ファイル名[,形式]</h2>
 
-    <p>This option causes
-    JabRef to import or load the specified file. If only a filename
-    is specified, or the filename is followed by a comma and a *
-    character, JabRef will attempt to detect the file format
-    automatically. This should work for all BibTeX files and files
-    in any import format supported by JabRef. If the filename is
-    followed by a comma and the name of an import format, the given
-    import filter will be used. Use the <code>-h</code> option to
-    get a list of availiable import formats.</p>
+    <p>このオプションを与えると、JabRefは指定したファイルを読み込むか開くかします。ファイル名だけが指定された場合やファイル名の後にコンマか*文字を付けた場合には、JabRefはファイル形式の自動検出を試みます。これは、BibTeXファイルとJabRefがサポートしているすべての読込形式に対して機能します。ファイル名の後にコンマと読込形式名を続けると、その読込フィルタが使用されます。使用できる読込形式については、<code>-h</code>オプションを使うと一覧を得ることができます。</p>
 
-    <p>If an output option is also specified, an import will always
-    be processed before it, and the imported or loaded file will be
-    given to the export filter. If the GUI is not suppressed using
-    the <code>-n</code> option, any imported or loaded file will
-    show up in the main window.</p>
+    <p>出力オプションが指定されると、読込は出力よりも前に処理されるので、読み込んだり開いたりしたファイルは書出フィルタに渡されます。<code>-n</code>オプションを使ってGUIを抑制しなかった場合には、読み込んだり開いたりしたファイルは、基本ウィンドウに表示されます。</p>
 
-    <p>The -i option can be specified only once, and for one file
-    only.</p>
+    <p><code>-i</code>オプションは、一度だけかつ一つのファイルについてのみ指定することができます。</p>
 
-    <h2>Export file: -o filename[,format]</h2>
+    <h2>ファイルの書出: -o ファイル名[,形式]</h2>
 
-    <p>This option causes
-    JabRef to save or export a file imported or loaded by the same
-    command line. If a file is imported using the <code>-i</code>
-    option, that database will be exported. Otherwise, the
-    <em>last</em> file specified (and successfully loaded) without
-    the <code>-i</code> option will be exported.</p>
+    <p>このオプションを与えると、JabRefは同一コマンドライン中で読み込んだり開いたりしたファイルを、保存したり書き出したりします。ファイルが<code>-i</code>を使って読み込まれた場合には、そのデータベースが書き出されます。<code>-i</code>オプションを使わない場合には、指定した(かつ成功裏に開かれた)<b>最後の</b>ファイルが書き出されます。</p>
 
-    <p>If only a filename is specified, it will be saved in BibTeX
-    format. If the filename is followed by a comma and an export
-    format, the given export filter will be used. A custom export
-    filter can be used in this way, and will be preferred if the
-    export name matches both a custom and a standard export
-    filter.</p>
+    <p>ファイル名だけを指定すると、BibTeX形式で保存されます。ファイル名の後にコンマと書出形式を続けると、その書出フィルタが使用されます。この方法で自作書出フィルタも使用することができ、自作書出フィルタと標準書出フィルタの書出名が同一の時には、前者が優先されます。</p>
 
-    <p>Use the <code>-h</code> option to get a list of availiable
-    export formats.</p>
+    <p>使用できる書出形式については、<code>-h</code>オプションを使うと一覧を得ることができます。</p>
 
-    <p>If the <code>-n</code> option has not been invoked, any
-    export operation will be performed before the JabRef window is
-    opened, and the imported database will show up in the
-    window.</p>
+    <p><code>-n</code>オプションを使用しなかった場合には、書き出し操作はすべてJabRefウィンドウが開く前に実行され、読み込まれたデータベースがウィンドウに表示されます。</p>
 
-    <p>The -o option can be specified only once, and for one file
-    only.</p>
+    <p><code>-o</code>オプションは、一度だけかつ一つのファイルについてのみ指定することができます。</p>
 
-    <h2>Export preferences: -x filename</h2>
+    <h2>設定の書出: -x ファイル名</h2>
 
-    <p>Using this option, you
-    can have JabRef export all user preferences to an XML file.
-    After exporting, JabRef will start normally.</p>
+    <p>このオプションを使うと、ユーザー設定全部をXMLファイルに書き出すようJabRefに指定することができます。書き出した後、JabRefは通常通り起動します。</p>
 
-    <h2>Import preferences: -p filename</h2>
+    <h2>設定の読込: -p ファイル名</h2>
 
-    <p>This option causes
-    JabRef to import user preferences exported using the
-    <code>-x</code> option. After importing, JabRef will start
-    normally.</p>
-
-    <h2>Export only used items: -a
-    filename[.aux],newBibFile[.bib]</h2>
-
-    <p>Sometimes it is helpful, to
-    have a bibtex file that contains only the used bibtex entries.
-    A list of these used entries is located in an aux file. Jabref
-    can parse this file to generate a new bibtex file, which
-    contains only the known and used entries. That will mean, if an
-    entry is not defined in the standard bibtex file, it cannot be
-    located in the new file.</p>
+    <p>このオプションを与えると、JabRefは<code>-x</code>オプションを使って書き出した設定を読み込みます。読み込んだ後、JabRefは通常通り起動します。</p>
+    
+    <h2>一致項目の書出: -m [フィールド=]検索語,書出ファイル[,書出形式]</h2>
+    <p>これは、与えられた検索語に一致するデータベース項目をすべて新しいファイルに保存します。書出ファイル形式は選択することができますが、既定形式は(tablerefsabsbibが提供するabstractおよびbibtex付き)HTML表です。</p>
+
+    <p>呼び出し方法l: <code>JabRef.jar -m [フィールド=]検索語,出力ファイル[,書出形式] -n true 入力ファイル</code></p>
+    <p>検索機能についての詳細は、説明書の「詳細検索」の項をご覧ください。特定の年の項目を検索できるだけでなく、起源を区切って項目を検索することも可能です。</p>
+    <p>空白を含む検索語は引用符で囲む必要があることに留意してください。</p>
+	<p>用例</p>
+	<ul>
+		<li> <code>Year=2005</code> </li>
+		<li> <code>title|keywords=Optimization</code> </li>
+		<li> <code>(author=bock or title|keywords="computer methods")and not(author=sager)</code> </li>
+		<li> <code>Year=1989-2005</code> </li>
+	</ul>
+
+    <h2>使用されている項目のみの書出: -a
+    ファイル名[.aux],新規bibファイル[.bib]</h2>
+
+    <p>ときどき、使用されているBibTeX項目のみを集めたBibTeXファイルを作ると便利なことがあります。これら使用されている項目の一覧はauxファイルに含まれています。JabRefはこのファイルを解析して、既知の使用されている項目のみを含んだBibTeXファイルを新しく生成することができます。言い換えれば、このauxファイルに項目が定義されていない場合、生成したファイルにも含まれません。</p>
     
-    <h2>Fetch from Web: --fetch==name of fetcher:query string</h2>
+    <h2>ウェブからの取得: --fetch==取得法:問い合わせ文字列</h2>
     
-    <p>The fetchers in the Web menu can also be run from the command 
-    line. Use the --fetch option and then pass both the name of a fetcher 
-    (for instance ieee, medline or jstor) and your search term or paper id and 
-    the given fetcher will be run. Note that some fetcher will still display 
-    GUI if they need feedback from you. To get a list of available fetchers run
-    --fetch without parameters.</p>
+    <p>ウェブ検索メニュー中の各取得法は、コマンドラインからも指定することができます。--fetchオプションを使って、取得方法(ieee、medline、jstorなど)と、検索語もしくは論文IDのいずれかを渡すと、その方法で取得が行われます。ユーザーからのフィードバックが必要な場合には、GUIを表示する取得法もありますので、注意してください。利用できる取得法を列挙させるには、パラメーターを与えずに--fetchを実行してください。</p>
 </body>
 </html>
diff --git a/src/help/ja/Contents.html b/src/help/ja/Contents.html
index e9dac6b..fb001e8 100644
--- a/src/help/ja/Contents.html
+++ b/src/help/ja/Contents.html
@@ -19,7 +19,7 @@
 
     <h2>フィールド</h2>
     <ul>
-      <li><a href="BibtexHelp.html"><em>Bibtex</em>ヘルプ</a></li>
+      <li><a href="BibtexHelp.html"><em>BibTeX</em>ヘルプ</a></li>
       <li><a href="FileLinks.html">外部ファイルリンク</a></li>
       <li><a href="ExternalFiles.html">JabRef におけるPDF/PS/URL/DOIリンク</a></li>
       <li><a href="TimeStampHelp.html">項目の時間スタンプ</a></li>
@@ -27,6 +27,7 @@
       <li><a href="ContentSelectorHelp.html">フィールド内容選択メニュー</a></li>
       <li><a href="JournalAbbreviations.html">学術誌名の短縮形</a></li>
       <li><a href="SpecialFieldsHelp.html">特殊フィールド</a></li>
+      <li><a href="StringsHelp.html">BibTeX文字列</a></li>
     </ul>
     
     <h2>項目の検索と整序</h2>
@@ -41,19 +42,19 @@
       <li><a href="StringEditorHelp.html">文字列エディタ</a></li>
       <li><a href="DatabaseProperties.html">データベース特性ウィンドウ</a></li>
       <li><a href="PreviewHelp.html">項目プレビューの設定</a></li>
-      <li><a href="LabelPatterns.html">BibTeXキー生成機構の個人用設定</a></li>
-      <li><a href="CustomEntriesHelp.html">Customizing entry types</a></li>
-      <li><a href="GeneralFields.html">一般フィールドの個人用設定</a></li>
+      <li><a href="LabelPatterns.html">BibTeX鍵生成機構の自作</a></li>
+      <li><a href="CustomEntriesHelp.html">項目型の自作</a></li>
+      <li><a href="GeneralFields.html">汎用フィールドの個人設定</a></li>
       <li><a href="Plugin.html">プラグインを使用してJabRefを拡張する</a></li>
     </ul>
 
     <h2>読み込み/書き出し</h2>
     <ul>
-      <li><a href="CustomExports.html">Custom export filters</a></li>
-      <li><a href="CustomImports.html">Custom import filters</a></li>
-      <li><a href="ImportInspectionDialog.html">Import inspection window</a></li>
-      <li><a href="EndNoteFilters.html">EndNote読み込み/書き出しフィルタセット</a></li>
-      <li><a href="OpenOfficeHelp.html">OpenOffice.orgでJabRef書誌情報を利用するには</a></li>
+      <li><a href="CustomExports.html">自作書出フィルタ</a></li>
+      <li><a href="CustomImports.html">自作読込フィルタ</a></li>
+      <li><a href="ImportInspectionDialog.html">読込検査ウィンドウ</a></li>
+      <li><a href="EndNoteFilters.html">EndNote読込/書出フィルタセット</a></li>
+      <li><a href="OpenOfficeIntegration.html">OpenOffice.orgやLibreOfficeでJabRef書誌情報を利用するには</a></li>
       <li><a href="ACMPortalHelp.html"><em>ACM</em> Portalから項目を取得する</a></li>
       <li><a href="CiteSeerHelp.html"><em>CiteSeerX</em>から項目を取得する</a></li>
       <li><a href="DiVAtoBibTeXHelp.html"><em>DiVA</em>から項目を取得する</a></li>
@@ -62,13 +63,13 @@
 
       <li><a href="IEEEXploreHelp.html"><em>IEEExplore</em>から項目を取得する</a></li>
       <li><a href="ISBNtoBibTeXHelp.html"><em>ISBN to BibTeX Converter</em>を使用して項目を取得する</a></li>
-      <li><a href="MedlineHelp.html">Fetching entries from <em>Medline</em></a></li>
+      <li><a href="MedlineHelp.html"><em>Medline</em>から項目を取得する</a></li>
       <li><a href="JSTOR.html"><em>JStor</em> 検索</a></li>
       <li><a href="ScienceDirect.html"><em>ScienceDirect</em> 検索</a></li>
       <li><a href="Spires.html"><em>Spires</em> 検索</a></li>
-      <li><a href="SQLExport.html">Export to an External SQL Database</a></li>
-      <li><a href="XMPHelp.html">XMP metadata support in JabRef</a></li>
-      <li><a href="CommandLine.html">Command line options</a></li>
+      <li><a href="SQLExport.html">外部SQLデータベースへの書き出し</a></li>
+      <li><a href="XMPHelp.html">JabRefにおけるXMPメタデータ サポート</a></li>
+      <li><a href="CommandLine.html">コマンドラインオプション</a></li>
       <li><a href="RemoteHelp.html">リモート操作</a></li>
     </ul>
 
diff --git a/src/help/ja/CustomEntriesHelp.html b/src/help/ja/CustomEntriesHelp.html
index 34e553b..b7c0e3e 100644
--- a/src/help/ja/CustomEntriesHelp.html
+++ b/src/help/ja/CustomEntriesHelp.html
@@ -1,83 +1,44 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<link rel="stylesheet" type="text/css" href="jabref_help.css"/>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<link rel="stylesheet" type="text/css" href="jabref_help.css"/>
 </head>
 
 <body>
 
-    <h1>項目型のカスタマイズ</h1>
-
-    <p>To customize entry types, select the menu <strong>Options
-    --> Customize entry types</strong>.</p>
-
-    <p>When customizing an entry type, you both define how its
-    entry editor should look, and what it takes for JabRef to
-    consider an entry complete. You can both make changes to the
-    existing entry types, and define new ones.</p>
-
-    <p>Note that no modifications you make in this dialog will be
-    stored until you click <b>Apply</b> or <b>OK</b>. If you click
-    <b>Cancel</b> or simply close the dialog, unapplied changes
-    will be lost.</p>
-
-    <h2>Using the entry customization dialog</h2>
-
-    <p>The entry
-    customization dialog is divided in three main panels. The
-    leftmost panel is where you can select an entry type for
-    modification, and add new ones. The middle panel is used for
-    setting up the required fields of the selected entry type, and
-    the right panel for setting up the optional fields.</p>
-
-    <h3>Adding and removing entry types</h3>
-
-    <p>The currently available entry types are listed in the left
-    panel. Whenever you select an entry type, the other panels will
-    update to show what fields are required and optional for this
-    entry type.</p>
-
-    <p>To add a new entry type, you must enter a name for it in the
-    text field below the type list, and click <b>Add</b>. The new
-    entry type will be added to the list, and selected for
-    modification.</p>
-
-    <p>To remove a custom entry type, select it and click
-    <b>Remove</b>. This operation will only be available for custom
-    entry types that are not merely modifications of standard
-    types. It is not possible to remove a standard entry type.</p>
-
-    <p>To return a modified standard type to its default setup,
-    select it and click <b>Default</b>. This operation will only be
-    available for customized entry types that modify a standard
-    type.</p>
-
-    <h2>Editing entry types</h2>
-
-    <p>When an entry type is selected, the
-    current required and optional fields will be listed in the
-    center and right panels of the dialog. The process of editing
-    the lists are identical for the required and optional fields.</p>
-
-    <p>To add a new field, edit the text field below the list, or
-    select a field name from the dropdown menu, then click
-    <b>Add</b>. The chosen field name will be added at the end of
-    the list.</p>
-
-    <p>To remove one or more fields, select them in the list, and
-    click <b>Remove</b>.</p>
-
-    <p>To change the order of the fields, choose one field name,
-    and click the arrow buttons to move it up or down in the
-    list.</p>
-
-    <h3>Either/or fields</h3>
-    <p>Certain entry types have an either-or condition in their
-    required fields. For instance, a <em>book</em> entry is complete
-    with either the <em>author</em> or the <em>editor</em> field, or
-    both. To indicate such a condition in a custom entry type, you should
-    add a field named as the set of alternative fields separated by slashes,
-    for instance <em>author/editor</em> indicates the condition mentioned above for
-    the <em>book</em> entry type.</p>
+    <h1>項目型の自作</h1>
+
+    <p>項目型を自作するには、<strong>オプション→項目型を自作</strong>メニューを選択してください。</p>
+
+    <p>項目型を自作する際、その項目エディタの外観を定義するとともに、JabRefが項目入力を完了したと見なす基準を定義しなくてはなりません。変更は、既存の項目型に対して加えることもできますし、新規のものを定義することもできます。</p>
+
+    <p>このダイアログで加えた変更は、<b>適用</b>か<b>OK</b>を押すまで保存されないことに注意してください。<b>取消</b>もしくはダイアログを閉じた場合には、適用済みでない変更は失われます。</p>
+
+    <h2>項目型自作ダイアログを使う</h2>
+
+    <p>項目型自作ダイアログは3つの主要パネルに分かたれています。左パネルは、修正する項目型を選んだり新しい項目型を付け加えたりする場所です。中央パネルは、選択した項目型の必須フィールドを設定するのに用いられ、右パネルは非必須フィールドを設定するのに使用されます。</p>
+
+    <h3>項目型の追加と削除</h3>
+
+    <p>現在使用することのできる項目型は、左パネルに羅列されます。項目型を選ぶと、他の2つのパネルが更新されて、この項目型に対してどれが必須でどれが非必須のフィールドかが表示されます。</p>
+
+    <p>新規項目型を追加するには、項目型一覧下のテキストフィールドに名称を入力して、<b>追加</b>ボタンを押す必要があります。すると、新規項目型が一覧に追加されて選択状態になり、修正ができるようになります。</p>
+
+    <p>自作した項目型を削除するには、その項目型を選択して、<b>削除</b>ボタンを押してください。この操作は、標準項目型に手を加えただけのものではない自作項目型に対してのみ行うことができます。標準項目型を削除することはできません。</p>
+
+    <p>変更を加えた標準型を既定の設定に戻すには、その型を選択して<b>既定値</b>を押します。この操作は、標準型に変更を加えた自作項目型に対してのみ行うことができます。</p>
+
+    <h2>項目型を編集する</h2>
+
+    <p>項目型を選択すると、その必須フィールドと非必須フィールドが、ダイアログの中央パネルと右パネルに列挙されます。一覧の編集方法は、必須フィールド・非必須フィールドともに共通です。</p>
+
+    <p>新規フィールドを追加するには、一覧下のテキストフィールドを編集するか、ドロップダウンメニューからフィールド名を選択し、<b>追加</b>を押してください。選択したフィールド名が、一覧末尾に追加されます。</p>
+
+    <p>フィールドを一つないしそれ以上削除するには、対象となるものを一覧から選択して、<b>削除</b>を押します。</p>
+
+    <p>フィールド順を変更するには、フィールド名を一つ選択して、矢印ボタンを押し、そのフィールド名を一覧内で上下させてください。</p>
+
+    <h3>論理和(OR)フィールド</h3>
+    <p>項目型の中には、必須フィールドに論理和(OR)条件を持つものがあります。例えば、<em>book</em>項目は、<em>author</em>か<em>editor</em>フィールドの一方もしくは双方が満たされれば、完成します。自作項目型でそのような条件を課すには、代替条件下にあるフィールド群をスラッシュで区切ったフィールド名を追加します。例えば、<em>author/editor</em>は、上述の<em>book</em>項目型が持つ条件と同じ条件を指定することになります。</p>
 </body>
 </html>
diff --git a/src/help/ja/CustomExports.html b/src/help/ja/CustomExports.html
index 7a88132..d8a0129 100644
--- a/src/help/ja/CustomExports.html
+++ b/src/help/ja/CustomExports.html
@@ -1,565 +1,371 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <link rel="stylesheet" type="text/css" href="jabref_help.css"/>
 </head>
 
 <body>
 
-    <h1>Custom export filters</h1>
-
-    <p>JabRef allows you to define and
-    use your own export filters, in the same way as the standard
-    export filters are defined. An export filter is defined by one
-    or more <i>layout files</i>, which with the help of a
-    collection of built-in formatter routines specify the format of
-    the exported files. Your layout files must be prepared in a
-    text editor outside of JabRef.</p>
-
-    <h2>Adding a custom export filter</h2>
-
-    <p>The only requirement for
-    a valid export filter is the existence of a file with the
-    extension <b>.layout</b>. To add a new custom export filter,
-    open the dialog box <b>Options -> Manage custom exports</b>,
-    and click <b>Add new</b>. A new dialog box will appear,
-    allowing you to specify a name for the export filter (which
-    will appear as one of the choices in the File type dropdown
-    menu of the file dialog when you use the <b>File ->
-    Export</b> menu choice in the JabRef window), the path to the
-    <b>.layout</b> file, and the preferred file extension for the
-    export filter (which will be the suggested extension in the
-    file dialog when you use the export filter).</p>
-
-    <h2>Creating the export filter</h2>
-
-    <p>To see examples of how export filters are made, look for
-    the package containing the layout files for the standard
-    export filters on our download page.</p>
-
-    <h3>Layout files</h3>
-
-    <p>Let us assume that we are creating an HTML export filter.</p>
-
-    <p>While the export filter only needs to consist of a single
-    <b>.layout</b> file, which in this case could be called
-    <i>html.layout</i>, you may also want to add two files called
-    <i>html.begin.layout</i> and <i>html.end.layout</i>. The former
-    contains the header part of the output, and the latter the
-    footer part. JabRef will look for these two files whenever the
-    export filter is used, and if found, either of these will be
-    copied verbatim to the output before or after the individual
-    entries are written.</p>
-
-    <p>Note that these files must reside in the same directory as
-    <i>html.layout</i>, and must be named by inserting
-    <b>.begin</b> and <b>.end</b>, respectively.</p>
-
-    <p>In our example export filter, these could look like the
-    following:</p>
+    <h1>自作書出フィルタ</h1>
+
+    <p>JabRefでは、標準書出フィルタが定義されているのと同様の方法で、自分自身の書出フィルタを定義して使用することができます。書出フィルタは、一つ以上の<b>レイアウトファイル</b>で定義されており、組込整形ルーチン群によって、書出ファイルの書式を決定します。レイアウトファイルは、JabRef外部で、テキストエディタを使用して準備する必要があります。</p>
+
+    <h2>自作書出フィルタを追加する</h2>
+
+    <p>書出フィルタが有効となる唯一の条件は、拡張子<b>.layout</b>のファイルがあることだけです。自作書出フィルタを新たに追加するには、ダイアログボックス<b>オプション→自作書出の管理</b>を開き、<b>新規追加</b>を押します。新しいダイアログボックスが現れるので、書出フィルタの名称(これは、<b>ファイル→書出</b>メニューをJabRefウィンドウから選択した時に、ファイルダイアログのファイル型ドロップダウンメニューに選択肢として現れるものです)と<b>.layout</b>ファイルのパス、書出フィルタの優先ファイル拡張子(これは書出フィルタを使用する際、ファイルダイアログで提案される拡張子になります)を指定します。</p>
+
+    <h2>書出フィルタを作成する</h2>
+
+    <p>書出フィルタの作り方の例を見るには、JabRefダウンロードページから標準書出フィルタのレイアウトファイルを含むパッケージを手に入れてください。</p>
+
+    <h3>レイアウトファイル</h3>
+
+    <p>HTML書出フィルタを作成しようとしているものとしましょう。書出フィルタは、<b>.layout</b>ファイル——ここでは<i>html.layout</i>としましょう——が一つありさえすればよいのですが、<i>html.begin.layout</i>と<i>html.end.layout</i>という二つのファイルも作りたくなるでしょう。前者は出力のヘッダ部分を持ち、後者はフッタ部分です。JabRefは、書出フィルタが使用された際にこの二つのファイルを探し出し、検出されると、その内容が各項目の出力の前後に逐語的にコピーされます。</p>
+
+    <p>これらのファイルは、<i>html.layout</i>と同じディレクトリになくてはならず、それぞれ<b>.begin</b>と<b>.end</b>を名称に挿入しなくてはなりません。この書出フィルタの例では、これらのファイルは以下のようになります。</p>
 
     <p><i>html.begin.layout</i>:<br />
-    <code><HTML><br />
-     <BODY> text="#275856"><br />
-    <basefont size="4" color="#2F4958"
-    face="arial"></code></p>
+    <code><!DOCTYPE html><br/><html><br /> <body style="color:#275856; font-family: Arial, sans-serif;"></code>
+    </p>
 
     <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>
-    template for exporting one single entry. If you want to use
-    different templates for different entry types, you can do this
-    by adding entry-specific <b>.layout</b> files. These must also
-    reside in the same directory as the main layout file, and are
-    named by inserting <b>.entrytype</b> into the name of the main
-    layout file. The entry type name must be in all lowercase. In
-    our example, we might want to add a template for book entries,
-    and this would go into the file <i>html.book.layout</i>. For a
-    PhD thesis we would add the file <i>html.phdthesis.layout</i>,
-    and so on. These files are similar to the default layout file,
-    except that they will only be used for entries of the matching
-    type. Note that the default file can easily be made general
-    enough to cover most entry types in most export filters.</p>
-
-    <h3>The layout file format</h3>
-
-    <p>Layout files are created using a
-    simple markup format where commands are identified by a
-    preceding backslash. All text not identified as part of a
-    command will be copied verbatim to the output file.</p>
-
-    <h3>Field commands</h3>
-
-    <p>An arbitrary word preceded by a backslash, e.g.
-    <code>\author</code>, <code>\editor</code>, <code>\title</code>
-    or <code>\year</code>, will be interpreted as a reference to
-    the corresponding field, which will be copied directly to the
-    output.</p>
-
-    <h3>Field formatters</h3>
-
-    <p>Often there will be a need for some preprocessing of the
-    field contents before output. This is done using a <i>field
-    formatter</i> - a java class containing a single method that
-    manipulates the contents of a field.</p>
-
-    <p>A formatter is used by inserting the <code>\format</code>
-    command followed by the formatter name in square braces, and
-    the field command in curly braces, e.g.:</p>
+    <code></body><br /></html></code></p>
+
+    <p><i>html.layout</i>ファイルは、1項目のみを書き出す時の<b>既定の</b>ひな型となります。項目型毎に異なるひな型を用いたい場合には、項目依存の<b>.layout</b>ファイルを追加します。これらは、基本となるレイアウトファイルと同じディレクトリになくてはならず、基本レイアウト ファイル名に<b>.項目型</b>を挿入した名称を付けなくてはなりません。項目型名はすべて小文字です。ここの例では、book項目のひな型を作りたいとすると、そのファイルは<i>html.book.layout</i>となります。博士論文ならば、<i>html.phdthesis.layout</i>などとなるでしょう。これらのファイルは、一致する項目型のみに用いられるという点を除けば、既定レイアウトファイルと同じです。ただし、既定ファイルは、ほとんどの書出フィルタにおいて、たいていの項目型を網羅できるように、十分一般的な形で作ることが容易にできます。</p>
+
+    <h3>レイアウトファイルの書式</h3>
+
+    <p>レイアウトファイルは、簡単なマークアップ形式を用いて作成されており、コマンドはバックスラッシュの後に続けることで認識されます。コマンドの一部と認識されないテキストはすべて、文字通り出力ファイルにコピーされます。</p>
+
+    <h3>フィールドコマンド</h3>
+
+    <p><code>\author</code>・<code>\editor</code>・<code>\title</code>・<code>\year</code>のような、バックスラッシュに続く単語は、いずれも対応するフィールドを参照しているものと解釈され、直接出力にコピーされます。</p>
+
+    <h3>フィールド<ruby><rb>整形子</rb><rp>(</rp><rt>フォーマッタ</rt><rp>)</rp></ruby></h3>
+
+    <p>往々にして、出力前にフィールド内容を事前処理する必要のあることがあります。これは、フィールド内容を操作するメソッドを一つだけ持ったjavaクラス<i>field formatter</i>を用いて行われます。</p>
+
+    <p>フォーマッタは、<code>\format</code>コマンドを挿入した後にフォーマッタ名を角括弧で続け、フィールドコマンドを波括弧で続けることで使用することができます。例:</p>
 
     <p><code>\format[ToLowerCase]{\author}</code></p>
 
-    <p>You can also specify multiple formatters separated by
-    commas. These will be called sequentially, from left to right,
-    e.g.</p>
+    <p>また、コンマで区切ることで複数のフォーマッタを指定することができます。これらは左から右にシーケンシャルに呼び出されます。例えば、</p>
 
     <p><code>\format[ToLowerCase,HTMLChars]{\author}</code></p>
 
-    <p>will cause the formatter <b>ToLowerCase</b> to be called
-    first, and then <b>HTMLChars</b> will be called to format the
-    result. You can list an arbitrary number of formatters in this
-    way.</p>
-
-    <p>The argument to the formatters, withing the curly braces,
-    does not have to be a field command. Instead, you can insert
-    normal text, which will then be passed to the formatters
-    instead of the contents of any field. This can be useful for
-    some fomatters, e.g. the CurrentDate formatter (described
-    below).</p>
-
-    <p>Some formatters take an extra argument, given in parentheses
-    immediately after the formatter name. The argument can be enclosed
-    in quotes, which is necessary if it includes the parenthesis characters.
-    For instance, <code>\format[Replace("\s,_")]{\journal}</code> calls
-    the <b>Replace</b> formatter with the argument <b>\s,_</b> (which results
-    in the "journal" field after replacing all whitespace by underscores).
-    </p>
+    <p>上記は、まずフォーマッタ<b>ToLowerCase</b>が呼び出され、それからその結果を整形するのに<b>HTMLChars</b>が呼び出されます。この方法で、好きな数のフォーマッタを列挙することができます。</p>
+
+    <p>波括弧で囲んだフォーマッタへの引数は、フィールドコマンドである必要はありません。代わりに通常のテキストを入れると、フィールド内容ではなく、そのテキストがフォーマッタに渡されます。これは、(後述するように)CurrentDateフォーマッタなど、いくつかのフォーマッタで有用です。</p>
 
-    <p>See below for a list of built-in export formatters.</p>
+    <p>フォーマッタによっては、追加的な引数を取るものがあり、これはフォーマッタ名の直後に丸括弧に入れて与えます。引数は引用符で囲むことができ、これは引数に括弧文字が含まれる場合には必要です。例えば、<code>\format[Replace("\s,_")]{\journal}</code>は、<b>Replace</b>フォーマッタを引数<b>\s,_</b>とともに呼び出します(これは、すべての空白をアンダースコアで置換した「journal」フィールドを返します)。</p>
 
-    <h3>Conditional output</h3>
+    <p>組込書出フォーマッタの一覧は、下記をご覧ください。</p>
 
-    <p>Some static output might only make
-    sense if a specific field is set. For instance, say we want to
-    follow the editor names with the text <code>(Ed.)</code>. This
-    can be done with the following text:</p>
+    <h3>条件付き出力</h3>
+
+    <p>静的出力の中には、特定のフィールドが設定されて初めて意味を持つものがあります。例えば、編集者名の後に<code>(Ed.)</code>という文字列を付けたいものとしましょう。これは、以下のテキストで実現できます。</p>
 
     <p><code>\format[HTMLChars,AuthorFirstFirst]{\editor}
     (Ed.)</code></p>
 
-    <p>However, if the <code>editor</code> field has not been set -
-    it might not even make sense for the entry being exported - the
-    <code>(Ed.)</code> would be left hanging. This can be prevented
-    by instead using the <code>\begin</code> and <code>\end</code>
-    commands:</p>
+    <p>しかしながら、もし<code>editor</code>フィールドが設定されていなければ——書き出す項目によっては、そもそもこのフィールドは意味を持たないかもしれません——、<code>(Ed.)</code>は宙ぶらりんで残されてしまいます。これは、下記のように、代わりに<code>\begin</code>および<code>\end</code>コマンドを使うと、回避できます。</p>
 
     <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
-    sure the text in between is printed if and only if the field
-    referred in the curly braces is defined for the entry being
-    exported.</p>
-
-    <p>A conditional block can also be dependent on more than one field. In this case
-    the contents of the block are printed only if all the fields are defined. To make
-    such a block, simply give the list of fields separated by semicolons. For instance,
-    to output text only if both <code>year</code> and <code>month</code> are set, use
-    a block like the following:</p>
-
-    <p><code>\begin{year;month}Month: \format[HTMLChars]{\month}\end{year;month}</code></p>
+    <p><code>\begin</code>および<code>\end</code>コマンドは、書き出す項目について、波括弧で参照されているフィールドが定義されている場合に限り、その間の文字列が出力されるようにするものです。</p>
 
-    <p>which will print "Month: " plus the contents of the <code>month</code> field, but
-    only if also the <code>year</code> field is defined.</p>
+    <p>条件付きブロックは、二つ以上のフィールドに依存させることもでき、簡単な二値条件が満たされた時のみ、内容が出力されます。二値演算子は下記の二つが用意されています。</p>
+    <ul>
+	<li>AND演算子 : <code>&</code>, <code>&&</code></li>
+	<li>OR演算子 : <code>|</code>, <code>||</code></li>
+    </ul>
+    <p><code>year</code>と<code>month</code>の両方が設定されている時のみ文字列を出力したい場合には、下記のようなブロックを使用してください。<br/><br/> <code>\begin{year&&month}Month: \format[HTMLChars]{\month}\end{year&&month}</code><br/><br/>これは<code>year</code>フィールドも定義されている時のみ、「Month:」と<code>month</code>フィールドの内容を出力します。</p>
 
-    <p><b>Note:</b> Use of the <code>\begin</code> and
-    <code>\end</code> commands is a key to creating layout files
-    that work well with a variety of entry types.</p>
+    <p><b>《註》</b>様々な項目型でうまく動作するレイアウトファイルを作る上では、<code>\begin</code>コマンドと<code>\end</code>コマンドを使うことが鍵となります。</p>
 
-    <h3>Grouped output</h3>
+    <h3>グループ化出力</h3>
 
-    <p>If you wish to separate your entries
-    into groups based on a certain field, use the grouped output
-    commands. Grouped output is very similar to conditional output,
-    except that the text in between is printed only if the field
-    referred in the curly braces has changed value.</p>
+    <p>特定のフィールドに基づいて項目をグループ化したい場合、グループ化出力コマンドを使用してください。グループ化出力は、波括弧で参照されているフィールドの値が変化した時のみ、間の文字列が出力されるという点を除いては、条件付き出力に非常に類似したものです。</p>
 
-    <p>For example, let's assume I wish to group by keyword. Before
-    exporting the file, make sure you have sorted your entries
-    based on keyword. Now use the following commands to group by
-    keyword:</p>
+    <p>例えば、キーワードでグループを作りたいとしましょう。ファイルを書き出す前に、項目をキーワードで整序して保管したことを確認してください。キーワードでグループ化するには、以下のコマンドを使用します。</p>
 
     <p><code>\begingroup{keywords}New Category:
     \format[HTMLChars]{\keywords}<br />
      \endgroup{keywords}</code></p>
 
-    <h2>Sharing your work</h2>
+    <h2>作業の共有</h2>
 
-    <p>With external layout files, it's
-    fairly simple to share custom export formats between users. If
-    you write an export filter for a format not supported by
-    JabRef, or an improvement over an existing one, we encourage
-    you to post your work on our SourceForge.net page. The same
-    goes for formatter classes that you write. We'd be happy to
-    distribute a collection of submitted layout files, or to add to
-    the selection of standard export filters and formatters.</p>
+    <p>外部レイアウトファイルを使用すれば、ユーザー間で自作書出形式を共有することは、たいへん容易です。JabRefでサポートされていない書式の書出フィルタを書いたり、既存のフィルタを改善した場合、その成果をぜひSourceForge.netページに投稿してください。自作されたフォーマッタクラスについても同様です。喜んで、投稿されたレイアウトファイルのコレクションを配布したり、標準書出フィルタと標準フォーマッタのセレクションに追加したりしたいと思います。</p>
 
-    <p>Starting with JabRef 2.4 you can also package your 
-	ExportFormat or LayoutFormatter as a plug-in. If you do so,
-	you can provide a single zip-file to other user to make use
-	of your ExportFormat. For an example download the JabRef
-	source release and have a look at the directory
-	<code>src/plugins/</code>. Don't hesitate to stop by the
-	forums on Sourceforge, since we don't have extensive documentation, yet.</p>
+    <p>JabRef 2.4版以降、自作のExportFormatとLayoutFormatterをプラグインとしてパッケージ化することもできるようになりました。その場合、単一のzipファイルを他のユーザーに提供して、自作のExportFormatを利用できるようにすることができます。例を見るには、JabRefソースリリースをダウンロードして、<code>src/plugins/</code>ディレクトリをご覧ください。まだ充分な文書化がされていませんので、SourceForgeのフォーラムを自由にご利用ください。</p>
 
 
-    <h2>Built-in export formatters</h2>
+    <h2>組込書出フォーマッタ</h2>
 
-    <p>JabRef provides the following set of formatters:</p>
+    <p>JabRefは、以下のフォーマッタを提供しています。</p>
 
     <ul>
-        <li><code>Authors</code> : this formatter provides formatting options for the author and editor fields; for detailed information, see below. It deprecates a range of dedicated formatters provided in versions of JabRef prior to 2.7.</li>
-
-        <li><code>CreateDocBookAuthors</code> : formats the author
-        field in DocBook style.</li>
-
-        <li><code>CreateDocBookEditors</code> : to be
-        documented.</li>
-
-        <li><code>CurrentDate</code> : outputs the current date.
-        With no argument, this formatter outputs the current date
-        and time in the format "yyyy.MM.dd hh:mm:ss z" (date, time
-        and time zone). By giving a different format string as
-        argument, the date format can be customized. E.g.
-        <code>\format[CurrentDate]{yyyy.MM.dd}</code> will give the
-        date only, e.g. 2005.11.30.</li>
-
-        <li><code>Default</code> : takes a single argument, which serves as a default value.
-        If the string to format is non-empty, it is output without changes. If it is empty,
-        the default value is output. For instance, <code>\format[Default(unknown)]{\year}</code>
-        will output the entry's year if set, and "unknown" if no year is set.</li>
+        <li><code>Authors</code> : このフォーマッタは、authorおよびeditorフィールドの整形オプションを提供します。詳細な情報については後述部分をご覧ください。これは、JabRef2.7版以前に提供されていた多くの旧フォーマッタを置き換えるものです。</li>
+
+		<li><code>CreateBibORDFAuthors</code> : Bibliographic Ontology (bibo)の要件を満たすようにauthorフィールドを整形します。</li>
+
+        <li><code>CreateDocBookAuthors</code> : authorフィールドをDocBook様式で整形します。</li>
+
+        <li><code>CreateDocBookEditors</code> : editorフィールドをDocBook様式で整形します。</li>
+
+        <li><code>CurrentDate</code> : 現在の日付を出力します。引数を与えなければ、このフォーマッタは、現在の日付と時刻を「yyyy.MM.dd hh:mm:ss z」(日付と時刻とタイムゾーン)の書式で出力します。引数として、別の書式文字列を与えれば、日付の書式を変更することができます。例えば、<code>\format[CurrentDate]{yyyy.MM.dd}</code>は、2005.11.30のように日付のみを返します。</li>
+
+        <li><code>Default</code> : これは一つだけ引数を取り、それを既定値とします。整形する文字列が空でなければ、それに変更を加えずに出力されます。もしそれが空ならば、既定値が出力されます。例えば、<code>\format[Default(unknown)]{\year}</code>は、項目のyearが設定されていればそれを出力し、yearが設定されていなければ、「unknown」を出力します。</li>
 	
-        <li><code>DOIStrip</code> : strips any prefixes from the DOI string.</li>
-        <li><code>DOICheck</code> : provides the full url for a DOI link.</li>
-
-        <li><code>FileLink(filetype)</code> : if no argument is given, this formatter outputs
-        the first external file link encoded in the field. To work, the formatter must
-        be supplied with the contents of the "file" field.
-        <p>This formatter takes the name of an external file type as an optional argument,
-        specified in parentheses after the formatter name. For instance,
-        <code>\format[FileLink(pdf)]{\file}</code> specifies <code>pdf</code> as an
-        argument. When an argument is given, the formatter selects the first file
-        link of the specified type. In the example, the path to the first PDF link will
-        be output.</p></li>
-
-        <li><code>FirstPage</code> : returns the first page from the "pages" field, if set.
-            For instance, if the pages field is set to "345-360" or "345--360",
-            this formatter will return "345".</li>
-
-        <li><code>FormatPagesForHTML</code> : replaces "--" with "-".</li>
-
-        <li><code>FormatPagesForXML</code> : replaces "--" with an XML en-dash.</li>
-
-        <li><code>GetOpenOfficeType</code> : returns the number used by the OpenOffice.org
-        bibliography system (versions 1.x and 2.x) to denote the type of this entry.</li>
-
-        <li><code>HTMLChars</code> : replaces TeX-specific special
-        characters (e.g. {\^a} or {\"{o}}) with their HTML
-        representations, and translates LaTeX commands \emph, \textit,
-        \textbf into HTML equivalents.</li>
-
-        <li><code>HTMLParagraphs</code> : interprets two
-        consecutive newlines (e.g. \n \n) as the beginning of a new
-        paragraph and creates paragraph-html-tags accordingly.</li>
-
-        <li><code>IfPlural</code> : outputs its first argument if the input field looks
-        like an author list with two or more names, or its second argument otherwise.
-        E.g. <code>\format[IfPlural(Eds.,Ed.)]{\editor}</code> will output "Eds." if there
-        is more than one editor, and "Ed." if there is only one.</li>
-
-        <li><code>LastPage</code> : returns the last page from the "pages" field, if set.
-            For instance, if the pages field is set to "345-360" or "345--360",
-            this formatter will return "360".</li>
-
-        <li><code>Number</code> : outputs the 1-based sequence number of the current entry in the
-        current export. This formatter can be used to make a numbered list of entries. The
-        sequence number depends on the current entry's place in the current sort order, not on
-        the number of calls to this formatter.</li>
-
-        <li><code>RemoveBrackets</code> : removes all curly brackets "{" or "}".</li>
-
-        <li><code>RemoveBracketsAddComma</code> : to be documented.</li>
-
-        <li><code>RemoveLatexCommands</code> : removes LaTeX
-        commands like <code>\em</code>, <code>\textbf</code>, etc.
-        If used together with <code>HTMLChars</code> or
-        <code>XMLChars</code>, this formatter should be called
-        last.</li>
-
-        <li><code>RemoveTilde</code> : replaces the tilde character
-        used in LaTeX as a non-breakable space by a regular space.
-        Useful in combination with the NameFormatter discussed in
-        the next section.</li>
-
-        <li><code>RemoveWhitespace</code> : removes all whitespace characters.</li>
-
-        <li><code>Replace(regexp,replacewith)</code> : does a regular expression replacement.
-        To use this formatter, a two-part argument must be given. The parts are
-        separated by a comma. To indicate the comma character, use an escape
-        sequence: \,<br/> <br/>
-        The first part is the regular expression to search for. Remember that any commma
-        character must be preceded by a backslash, and consequently a literal backslash must
-        be written as a pair of backslashes. A description of Java regular expressions can be
-        found at:<br/>
+        <li><code>DOIStrip</code> : DOI文字列から前置句を取り除きます。</li>
+        <li><code>DOICheck</code> : DOIリンクの完全URLを提供します。</li>
+
+        <li><code>FileLink(ファイル型)</code> : 引数を与えなければ、このフォーマッタは、当該フィールドにエンコードされている最初の外部ファイルリンクを出力します。動作するためには、このフォーマッタに「file」フィールドの内容を与えなくてはいけません。
+        <p>このフォーマッタは、外部ファイル型の名称を非必須引数としてとり、フォーマッタ名の後に丸括弧に入れて指定します。例えば、<code>\format[FileLink(pdf)]{\file}</code>は、<code>pdf</code>を引数として指定しています。引数が与えられると、フォーマッタは指定された型の最初のファイルリンクを選択します。この例では、最初のPDFリンクのパスが出力されます。</p></li>
+
+        <li><code>FirstPage</code> : 「pages」フィールドに設定があると、そこから最初のページを返します。例えば、pagesフィールドが「345-360」や「345--360」に設定されていると、このフォーマッタは「345」を返します。</li>
+            
+        <li><code>FormatChars</code> : このフォーマッタは、LaTeX文字列を同等のunicode文字列に変換し、他のLaTeXコマンドを処理しないで削除します。</li>
+
+        <li><code>FormatPagesForHTML</code> : 「--」を「-」に置換します。</li>
+
+        <li><code>FormatPagesForXML</code> : 「--」をXMLエヌダッシュに置換します。</li>
+
+        <li><code>GetOpenOfficeType</code> : OpenOffice.org書誌情報システム(第1.x版および第2.x版)において、この項目の型を表す番号を返します。</li>
+
+        <li><code>HTMLChars</code> : TeXの特殊文字({\^a}や{\"{o}}など)をHTML表記に置き換え、\emph・\textit・\textbfのLaTeXコマンドをHTMLでの等価のコマンドに書き換えます。</li>
+
+        <li><code>HTMLParagraphs</code> : 二連続の改行(\n \nなど)を新しい段落の開始と解釈し、段落HTMLタグを正しく付与します。</li>
+
+        <li><code>IfPlural</code> : 入力フィールドが2著者以上の著者リスト様に見える場合には第1引数を出力し、それ以外は第2引数を出力します。例えば、<code>\format[IfPlural(Eds.,Ed.)]{\editor}</code>は2名以上の編者がいる場合は「Eds.」を出力し、1名だけの場合は「Ed.」を出力します。</li>
+        
+        <li><code>JournalAbbreviator</code> : 与えられた入力文字列を、誌名短縮形リストにしたがって短縮形にします。入力に対して短縮形が見つからない場合(リスト中にないか既に短縮されている場合など)には、入力は修正されずに返されます。例えば、<code>\format[JournalAbbreviator]{\journal}</code>を使用すると、「Physical Review Letters」は「Phys. Rev. Lett.」となります。</li>
+
+        <li><code>LastPage</code> : 「pages」フィールドに設定があると、そこから最後のページを返します。例えば、pagesフィールドが「345-360」や「345--360」に設定されていると、このフォーマッタは「360」を返します。</li>
+            
+        <li><code>NoSpaceBetweenAbbreviations</code> :  短縮されたファーストネームの間の空白を取り除くLayoutFormatterです。例えば、J. R. R. TolkienはJ.R.R. Tolkienとなります。</li>
+        
+        <li><code>NotFoundFormatter</code> : フォーマッタが見つからなかったことをシグナルするためのフォーマッタです。レイアウトが未定義の書式を使っている時に、品質低下を優美に表すために使うことができます。</li>
+ 
+        <li><code>Number</code> : 現在の書出中で、現在の項目の(1から始まる)順番を出力します。このフォーマッタは、項目の連番リストを作るのに用いることができます。順番は、現在の整序順での現在の項目位置で決められ、このフォーマッタの呼び出し回数には依存しません。</li>
+
+        <li><code>RemoveBrackets</code> : 波括弧「{」「}」をすべて取り除きます。</li>
+
+        <li><code>RemoveBracketsAddComma</code> : 波括弧「{」「}」をすべて取り除き、閉じ括弧はコンマで置き換えられます。</li>
+
+        <li><code>RemoveLatexCommands</code> : <code>\em</code>や<code>\textbf</code>のようなコマンドを取り除きます。<code>HTMLChars</code>や<code>XMLChars</code>と用いられる場合は、このフォーマッタは最後に呼び出されるべきです。</li>
+
+        <li><code>RemoveTilde</code> : LaTeXで改行禁止空白として用いられるチルダを普通の空白で置き換えます。次節で論じる<a href="#NameFormatter">NameFormatter</a>とともに用いると便利です。</li>
+
+        <li><code>RemoveWhitespace</code> : すべての空白文字を取り除きます。</li>
+
+        <li><code>Replace(正規表現,置換文字列)</code> : 正規表現置換を行います。このフォーマッタを使うには、二部からなる引数を与えなくてはなりません。各部はコンマで区切ります。 コンマ文字自身を表すには、  エスケープシークエンス\,を用いてください。<br/> <br/>
+	第一部は検索する正規表現です。コンマ文字はすべてバックスラッシュを付けなくてはならず、その結果、バックスラッシュ文字自身は、バックスラッシュ2つで表す必要があることに注意してください。Java正規表現についての説明は<br/>
          http://java.sun.com/j2se/1.4.2/docs/api/java/util/regex/Pattern.html
-         <br/> <br/>
-        The second part is the text to replace all matches with.</li>
+         <br/>にあります。<br/> <br/>
+        第二部は一致した部分すべてを置き換える文字列です。</li>
+
+	<li><code>RisAuthors</code> : まだ文書化されていません。</li>
+	<li><code>RisKeywords</code> : まだ文書化されていません。</li>
+	<li><code>RisMonth</code> : まだ文書化されていません。</li>
 
-        <li><code>RTFChars</code> : replaces TeX-specific special
-        characters (e.g. {\^a} or {\"{o}}) with their RTF
-        representations, and translates LaTeX commands \emph, \textit,
-        \textbf into RTF equivalents.</li>
+        <li><code>RTFChars</code> : TeXで用いられる特殊文字({\^a}や{\"{o}}など)をRTF表現に置き換え、LaTeXコマンド\emph・\textit・\textbfをRTFの同等表現に置き換えます。</li>
 
-        <li><code>ToLowerCase</code> : turns all characters into
-        lower case.</li>
+        <li><code>ToLowerCase</code> : 全文字を小文字にします。</li>
 
-        <li><code>ToUpperCase</code> : turns all characters into
-        upper case.</li>
+        <li><code>ToUpperCase</code> : 全文字を大文字にします。</li>
 
-        <li><code>WrapContent</code> : This formatter outputs the input value after adding a
-        prefix and a postfix, as long as the input value is non-empty. If the input value
-        is empty, an empty string is output (the prefix and postfix are not output in this case).
-        The formatter requires an argument containing the prefix and postix separated
-        by a comma. To include the comma character in either, use an escape sequence
-        (\,).</li>
+        <li><code>WrapContent</code> : このフォーマッタは、入力値が空でない限り、入力値に前置句及び後置句を付して出力します。入力値が空の場合には、空の文字列が出力されます(この場合前置句及び後置句は出力されません)。このフォーマッタは、前置句と後置句をコンマで区切った引数を必須とします。いずれかにコンマ文字自身を入れたい場合には、エスケープシークエンス(\,)を使用してください。</li>
 
-        <li><code>WrapFileLinks</code> : See below.</li>
+        <li><code>WrapFileLinks</code> : 後述。</li>
 
-        <li><code>XMLChars</code> : replaces TeX-specific special
-        characters (e.g. {\^a} or {\"{o}}) with their XML
-        representations.</li>
+        <li><code>XMLChars</code> : TeXで用いられる特殊文字({\^a}や{\"{o}}など)をXML表現に置き換えます。</li>
 
     </ul>
 
-<h3>The <code>Authors</code> formatter</h3>
+<h3><code>Authors</code>フォーマッタ</h3>
 
-<p>To accommodate for the numerous citation styles, the <code>Authors</code> formatter allows flexible control over the layout of the author list. The formatter takes a comma-separated list of options, by which the default values can be overridden. The following option/value pairs are currently available, where the default values are given in curly brackets.</p>
+    <p>様々な引用様式を可能にするために、<code>Authors</code>フォーマッタは、著者リストのレイアウトを自由に制御できるようになっています。このフォーマッタは、コンマ区切りのオプション列を取り、これによって既定値を上書きできます。現在、以下のオプション・値の組が利用できます。既定値は波括弧で表示されています。</p>
 <dl>
 <dt><code>AuthorSort = [ {FirstFirst} | LastFirst | LastFirstFirstFirst ]</code></dt>
-<dd>specifies the order in which the author names are formatted.
+<dd>著者名が整形される順序を指定します。
 	<ul>
-		<li><code>FirstFirst</code> : first names are followed by the surname.</li>
-		<li><code>LastFirst</code> : the authors' surnames are followed by their first names, separated by a comma.</li>		
-		<li><code>LastFirstFirstFirst</code> : the first author is formatted as LastFirst, the subsequent authors as FirstFirst.</li>
+		<li><code>FirstFirst</code> : 名の後に姓が来ます。</li>
+		<li><code>LastFirst</code> : 著者の姓の後にコンマで区切って名が来ます。</li>
+		<li><code>LastFirstFirstFirst</code> : 第一著者がLastFirstで、その他の著者はFirstFirstで整形されます。</li>
 	</ul>
 </dd>
 
 <dt><code>AuthorAbbr = [ FullName | LastName | {Initials} | InitialsNoSpace | FirstInitial | MiddleInitial ]</code></dt>
-<dd>specifies how the author names are abbreviated.
+<dd>著者名の短縮のしかたを指定します。
 	<ul>
-		<li><code>FullName</code> : shows full author names; first names are not abbreviated.</li>
-		<li><code>LastName</code> : show only surnames, first names are removed.</li> 
-		<li><code>Initials</code> : all first names are abbreviated.</li> 
-		<li><code>InitialsNospace</code> : as Initials, with any spaces between initials removed.</li>
-		<li><code>FirstInitial</code> : only first initial is shown.</li> 
-		<li><code>MiddleInitial</code> : first name is shown, but all middle names are abbreviated.</li>
+		<li><code>FullName</code> : 著者名を完全形で表示します。名は短縮されません。</li>
+		<li><code>LastName</code> : 姓のみを表示し、名は表示されません。</li>
+		<li><code>Initials</code> : すべての名を短縮します。</li> 
+		<li><code>InitialsNospace</code> : イニシャルで表示し、イニシャル間の空白はすべて削除されます。</li>
+		<li><code>FirstInitial</code> : 最初のイニシャルのみ表示されます。</li> 
+		<li><code>MiddleInitial</code> : 名は表示されますが、ミドルネームはすべて短縮されます。</li>
 	</ul>	
 </dd>
 
 <dt><code>AuthorPunc = [ {FullPunc} | NoPunc | NoComma | NoPeriod ]</code></dt>
-<dd>specifies the punctuation used in the author list when <code>AuthorAbbr</code> is used
+<dd><code>AuthorAbbr</code>を用いる際、著者リストでの句読点の付け方を指定します。
 	<ul>
-		<li><code>FullPunc</code> : no changes are made to punctuation.</li>
-		<li><code>NoPunc</code> : all full stops and commas are removed from the author name.</li>
-		<li><code>NoComma</code> : all commas are removed from the author name.</li>
-		<li><code>NoPeriod</code> : all full stops are removed from the author name.</li>
+		<li><code>FullPunc</code> : 句読点に変化は加えません。</li>
+		<li><code>NoPunc</code> : 著者名からコンマとピリオドをすべて取り除きます。</li>
+		<li><code>NoComma</code> : 著者名からコンマをすべて取り除きます。</li>
+		<li><code>NoPeriod</code> : 著者名からピリオドをすべて取り除きます。</li>
 	</ul>	
 </dd>
 
-<dt><code>AuthorSep = [ {Comma} | And | Colon | Semicolon | Sep=<string> ]</code></dt>
-<dd>specifies the separator to be used between authors. Any separator can be specified, with the <code>Sep=<string></code> option. Note that appropriate spaces need to be added around <code>string</code>.</dd> 
+<dt><code>AuthorSep = [ {Comma} | And | Colon | Semicolon | Sep=<文字列> ]</code></dt>
+<dd>著者の間の区切り文字を指定します。<code>Sep=<文字列></code>オプションを用いれば、任意の区切り文字を使用することができます。<code>文字列</code>の前後には余白を適宜入れる必要があることに注意してください。</dd> 
 
-<dt><code>AuthorLastSep = [ Comma | {And} | Colon | Semicolon | Amp | Oxford | LastSep=<string> ]</code></dt>
-<dd>specifies the last separator in the author list. Any separator can be specified, with the <code>LastSep=<string></code> option. Note that appropriate spaces need to be added around <code>string</code>.</dd>
+<dt><code>AuthorLastSep = [ Comma | {And} | Colon | Semicolon | Amp | Oxford | LastSep=<文字列> ]</code></dt>
+<dd>著者リスト中の最後の区切り文字を指定します。<code>Sep=<文字列></code>オプションを用いれば、任意の区切り文字を使用することができます。<code>文字列</code>の前後には余白を適宜入れる必要があることに注意してください。</dd>
 
-<dt><code>AuthorNumber = [ {inf} | <integer> ]</code></dt>
-<dd>specifies the number of authors that are printed. If the number of authors exceeds the maximum specified, the authorlist is replaced by the first author, followed by <code>EtAlString</code>.</dd>
+<dt><code>AuthorNumber = [ {inf} | <整数> ]</code></dt>
+<dd>出力する著者の数を指定します。著者数がここで指定した最大値を超えた場合、著者リストは、第一著者(あるいは<code>AuthorNumberEtAl</code>で指定した数の著者)の後に<code>EtAlString</code>を付けたものに置き換えられます。</dd>
 
-<dt><code>EtAlString = [ { et al.} | EtAl=<string> ]</code></dt>
-<dd>specifies the string used to replace multiple authors. Any string can be given, using <code>EtAl=<string></code></dd>
+<dt><code>AuthorNumberEtAl = [ {1} | <整数> ]</code></dt>
+<dd>著者の全数が<code>AuthorNumber</code>を超えた場合、出力する著者数を指定します。この引数は、<code>AuthorNumber</code>が既に指定されている場合のみ、指定することができます。</dd>
+
+<dt><code>EtAlString = [ { et al.} | EtAl=<文字列> ]</code></dt>
+<dd>複数の著者を置き換える文字列を指定します。<code>EtAl=<文字列></code>を用いれば、任意の文字列を与えることができます。</dd>
 
 </dl>
 
-<p>If an option is unspecified, the default value (shown in curly brackets above) is used. Therefore, only layout options that differ from the defaults need to be specified. The order in which the options are defined is (mostly) irrelevant. So, for example,</p>
+<p>オプションを指定しなければ、既定値(上記において波括弧で表記されているもの)が用いられます。したがって、既定値と異なるレイアウトオプション以外は指定する必要がありません。オプションの定義順は(ほぼ)関係ありません。したがって、例えば</p>
 <p><code>\format[Authors(Initials,Oxford)]{\author}</code></p>
-<p>is equivalent to</p>
+<p>は、</p>
 <p><code>\format[Authors(Oxford,Initials)]{\author}</code></p>
-<p>As mentioned, the order in which the options are specified is irrelevant. There is one possibility for ambiguity, and that is if both <code>AuthorSep</code> and <code>AuthorLastSep</code> are given. In that case, the first applicable value encountered would be for <code>AuthorSep</code>, and the second for <code>AuthorLastSep</code>. It is good practise to specify both when changing the default, to avoid ambiguity.</p>
+<p>と等価です。このように、オプションを指定する順序は無関係です。一つ、曖昧さが残る可能性があるのは、<code>AuthorSep</code>と<code>AuthorLastSep</code>の両方を指定する場合です。この場合、最初に遭遇した適用可能な値が<code>AuthorSep</code>用と解釈され、二番目は<code>AuthorLastSep</code>に用いられます。既定値を変更する際には、曖昧さを避けるために両方する様にした方が良いでしょう。</p>
 
-<h4>Examples</h4>
-<p>Given the following authors, <i>"Joe James Doe and Mary Jane and Bruce Bar and Arthur Kay"</i> ,the <code>Authors</code> formatter will give the following results:</p>
+<h4>用例</h4>
+<p>著者名として「<i>Joe James Doe and Mary Jane and Bruce Bar and Arthur Kay</i>」が与えられた場合、<code>Authors</code>フォーマッタは、以下のような結果を返します。</p>
 <dl>
-<dt><code>Authors()</code>, or equivalently, <code>Authors(FirstFirst,Initials,FullPunc,Comma,And,inf,EtAl= et al.)</code></dt>
+<dt><code>Authors()</code>もしくはそれと同等な<code>Authors(FirstFirst,Initials,FullPunc,Comma,And,inf,EtAl= et al.)</code>の場合</dt>
 <dd><pre>J. J. Doe, M. Jane, B. Bar and A. Kay</pre></dd>
 
-<dt><code>Authors(LastFirstFirstFirst,MiddleInitial,Semicolon)</code></dt>
+<dt><code>Authors(LastFirstFirstFirst,MiddleInitial,Semicolon)</code>の場合</dt>
 <dd><pre>Doe, Joe J.; Mary Jane; Bruce Bar and Arthur Kay</pre></dd>
 
-<dt><code>Authors(LastFirst,InitialsNoSpace,NoPunc,Oxford)</code></dt>
+<dt><code>Authors(LastFirst,InitialsNoSpace,NoPunc,Oxford)</code>の場合</dt>
 <dd><pre>Doe JJ, Jane M, Bar B, and Kay A</pre></dd>
 
-<dt><code>Authors(2,EtAl= and others)</code></dt>
+<dt><code>Authors(2,EtAl= and others)</code>の場合</dt>
 <dd><pre>J. J. Doe and others</pre></dd>
 </dl>
-<p>Most commonly available citation formats should be possible with this formatter. For even more advanced options, consider using the Custom Formatters detailed below.</p>
+<p>通常使用される引用書式は、ほとんどこのフォーマッタで実現できるはずです。もっと詳細なオプションについては、後述の自作フォーマッタを使うことをご考慮ください。</p>
 
-<h3>The <code>WrapFileLinks</code> formatter</h3>
+<h3><code>WrapFileLinks</code>フォーマッタ</h3>
 
-<p>This formatter iterates over all file links, or all file links of a specified type, outputting a format string given as the first argument. The format string can contain a number of escape sequences indicating file link information to be inserted into the string.</p>
-<p>This formatter can take an optional second argument specifying the name of a file type. If specified, the iteration will only include those files with a file type matching the given name (case-insensitively). If specified as an empty argument, all file links will be included.</p>
-<p> After the second argument, pairs of additional arguments can be added in order to specify regular expression replacements to be done upon the inserted link information before insertion into the output string. A non-paired argument will be ignored. In order to specify replacements without filtering on file types, use an empty second argument.</p>
-<p>The escape sequences for embedding information are as follows:</p>
+<p>このフォーマッタは、すべてのファイルリンクもしくは指定した型のすべてのファイルリンクに対して、第一引数で与えられた整形文字列を反復出力します。整形文字列には、文字列にファイルリンク情報を挿入するためのエスケープシークエンスを複数入れることができます。</p>
+<p>このフォーマッタは、非必須の第二引数としてファイル型名を指定することができます。これを指定した場合には、その型名に一致する(大文字小文字の区別無し)ファイル型に対してのみ反復を行います。空の引数を与えると、すべてのファイルリンクを対象とします。</p>
+<p>第二引数の後には、さらに引数の対を追加することができ、挿入したリンク情報を出力文字列に埋め込む前に、リンク情報に対して行う正規表現置換を指定します。対になっていない引数は無視されます。ファイル型のフィルタをかけること無しに置換を指定するには、第二引数は空にしてください。</p>
+<p>情報を埋め込むエスケープシークエンスは以下の通りです。</p>
 <ul>
-	<li><code>\i</code> : This inserts the iteration index (starting from 1), and can be useful if the output list of files should be enumerated.</li>
-	<li><code>\p</code> : This inserts the file path of the file link.</li>
-	<li><code>\f</code> : This inserts the name of the file link's type.</li>
-	<li><code>\x</code> : This inserts the file's extension, if any.</li>
-	<li><code>\d</code> : This inserts the file link's description, if any.</li>
+	<li><code>\i</code> : 繰り返しインデックス(1から始まる)を挿入します。出力ファイルリストに連番を振る際に便利です。</li>
+	<li><code>\p</code> : ファイルリンクのファイルパスを挿入します。</li>
+	<li><code>\f</code> : ファイルリンク型の名称を挿入します。</li>
+	<li><code>\x</code> : ファイル拡張子があれば、それを挿入します。</li>
+	<li><code>\d</code> : ファイルリンクの説明があれば、それを挿入します。</li>
 </ul>
-<p>For instance, an entry could contain a file link to the file "/home/john/report.pdf" of the "PDF" type with description "John's final report". Using the WrapFileLinks formatter with the following argument:</p>
+<p>例えば、「John's final report」という説明が入った「PDF」型のファイル「/home/john/report.pdf」へのファイルリンクが入った項目があるとしましょう。以下のような引数を持つWrapFileLinksフォーマッタを使うと、</p>
 <p><code>\format[WrapFileLinks(\i. \d (\p))]{\file}</code></p>
-<p>would give the following output:</p>
+<p>以下のような出力を得ます。</p>
 <pre>
     1. John's final report (/home/john/report.pdf)
 
 </pre>
-<p>If the entry contained a second file link to the file "/home/john/draft.txt" of the "Text file" type with description 'An early "draft"', the output would be as follows:</p>
+<p>項目に二つめのファイルリンクとして、「An early "draft"」という説明のついた「テキスト」ファイル「/home/john/draft.txt」へのファイルリンクがあったとすると、出力は以下のようになります。</p>
 <pre>
     1. John's final report (/home/john/report.pdf)
     2. An early "draft" (/home/john/draft.txt)
 
 </pre>
-<p>If the formatter was called with a second argument, the list would be filtered. For instance:</p>
+<p>フォーマッタが第二引数を付けて呼ばれると、リストにはフィルタがかけられます。例えば、</p>
 <p><code>\format[WrapFileLinks(\i. \d (\p),,text file)]{\file}</code></p>
-<p> would show only the text file:</p>
+<p>は、以下のようにテキストファイルだけを表示します。</p>
 <pre>
     1. An early "draft" (/home/john/draft.txt)
 
 </pre>
-<p>If we wanted this output to be part of an XML styled output, the quotes in the file description could cause problems. Adding two additional arguments to translate the quotes into XML characters solves this:</p>
+<p>この出力をXML様式出力の一部としたい場合には、ファイル説明の引用符は問題を引き起こし得ます。以下のように、さらに引数を二つ加えて、引用符をXML文字に変換すると、この問題を解決できます。</p>
 <p><code>\format[WrapFileLinks(\i. \d (\p),,text file,",&quot;)]{\file}</code></p>
-<p>would give the following output:</p>
+<p>これは以下のような出力を得ます。</p>
 <pre>
     1. An early "draft" (/home/john/draft.txt)
 
 </pre>
-<p>Additional pairs of replacements could be added.</p>
-
-
-    <h3>Custom formatters</h3>
-    <p>If none of the available formatters can do what you want to
-    achieve, you can add your own by implementing the
-    <code>net.sf.jabref.export.layout.LayoutFormatter</code>
-    interface. If you insert your class into the
-    <code>net.sf.jabref.export.layout.format</code> package, you
-    can call the formatter by its class name only, like with the
-    standard formatters. Otherwise, you must call the formatter by
-    its fully qualified name (including package name). In any case,
-    the formatter must be in your classpath when running
-    JabRef.</p>
-
-    <h2><a name="NameFormatter"
-       id="NameFormatter">Using Custom Name Formatters</a></h2>
-
-    <p>From JabRef 2.2, it is possible to define custom name
-    formatters using the bibtex-sty-file syntax. This allows
-    ultimate flexibility, but is a cumbersome to write</p>
-
-    <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 />
-
-     <case2>@<range21>@... and so on.</code>
-
-    <p>This format first splits the task to format a list of author
-    into cases depending on how many authors there are (this is
-    since some formats differ depending on how many authors there
-    are). Each individual case is separated by @@ and contains
-    instructions on how to format each author in the case. These
-    instructions are separated by a @.</p>
-
-    <p>Cases are identified using integers (1, 2, 3, etc.) or the
-    character * (matches any number of authors) and will tell the
-    formatter to apply the following instructions if there are a
-    number of less or equal of authors given.</p>
-
-    <p>Ranges are either
-    <code><integer>..<integer></code>,
-    <code><integer></code> or the character <code>*</code>
-    using a 1 based index for indexing authors from the given list
-    of authors. Integer indexes can be negative to denote them to
-    start from the end of the list where -1 is the last author.</p>
-
-    <p>For instance with an authorlist of "Joe Doe and Mary Jane
-    and Bruce Bar and Arthur Kay":</p>
+<p>置換の対は、もっと付け加えることもできます。</p>
+
+
+    <h3>自作フォーマッタ</h3>
+    <p>もし用意されたフォーマッタでは、あなたが実現したいことをできない場合には、<code>net.sf.jabref.export.layout.LayoutFormatter</code>インタフェースを実装することによって、自分自身のフォーマッタを追加することができます。自作のクラスを<code>net.sf.jabref.export.layout.format</code>パッケージに挿入すれば、標準フォーマッタと同様に、自作フォーマッタをそのクラス名のみで呼び出すことができます。このようにしない場合には、自作フォーマッタは、完全修飾名(パッケージ名を含む)で呼び出さなくてはなりません。いずれにしても、JabRef実行時には、フォーマッタはクラスパス上になくてはなりません。</p>
+
+    <h2 id="NameFormatter">自作名前フォーマッタを使う</h2>
+
+    <p>JabRef第2.2版以降、BibTeXのstyファイルで用いられる文法を使って、自作の名前フォーマッタを定義することができます。これは究極の柔軟性をもたらしますが、他方、書くことは非常に面倒です。</p>
+
+    <p>自作フォーマッタは、設定タブの「名前の整形」で以下の書式を使って定義することができるので、他のフォーマッタと同じように、それに付与した名称を呼び出して使用してください。</p>
+    <code><場合1>@<範囲11>@<書式>@<範囲12>@<書式>@<範囲13>...@@<br />
+
+     <場合2>@<範囲21>@... 等々</code>
+
+    <p>この書式は、著者リストを整形するために、まず著者が何人いるかによってタスクを場合分けします(著者が何人かによって、書式が異なる場合があるからです)。それぞれの場合は@@で区切られ、それぞれの場合について各著者をどう整形するかの指示を書き込みます。これらの指示は@で区切られます。</p>
+
+    <p>それぞれの場合は、整数(1, 2, 3など)か<code>*</code>文字(任意の数の著者に一致)で認識され、与えられた数以下の著者しかいない場合、以下の指示を適用するようにフォーマッタに命令します。</p>
+
+    <p>範囲は、与えられた著者リストから作られた、1から始まるインデックスを使用して、<code><整数>..<整数></code>の形か<code><整数></code>あるいは<code>*</code>文字で表されます。リストの最後から始まる順序を示すために、インデックスには負の値を用いることができ、-1は最後の著者を表します。</p>
+
+    <p>例えば「Joe Doe and Mary Jane and Bruce Bar and Arthur Kay」という著者リストにを用いると、</p>
 
     <ul>
-        <li>1..3 will affect Joe, Mary and Bruce</li>
+        <li>1..3は、Joe・Mary・Bruceに対して作用します。</li>
 
-        <li>4..4 will affect Arthur</li>
+        <li>4..4は、Arthurに対して作用します。</li>
 
-        <li>* will affect all of them</li>
+        <li>*は、すべてに対して作用します。</li>
 
-        <li>2..-1 will affect Mary, Bruce and Arthur</li>
+        <li>2..-1は、Mary・Bruce・Arthurに対して作用します。</li>
     </ul>
 
-    <p>The <code><format></code>-strings use the Bibtex
-    formatter format:</p>
+    <p><code><書式></code>部分の文字列は、以下のようにBibTeXフォーマッタの書式を用います。</p>
 
-    <p>The four letters v, f, l, j indicate the name parts von,
-    first, last, jr which are used within curly braces. A single
-    letter v, f, l, j indicates that the name should be
-    abbreviated. If one of these letters or letter pairs is
-    encountered JabRef will output all the respective names
-    (possibly abbreviated), but the whole expression in curly
-    braces is only printed if the name part exists.</p>
+    <p>v/f/l/jの4文字は、波括弧の中で用いられ、名前の「von」/名/姓/「jr」の部分を表します。v/f/l/jを単一文字で使うと、対応する名前部分の短縮形を表します。これらの文字や文字の組に遭遇すると、JabRefは、対応する名前部分をすべて(場合によって短縮形で)出力しますが、波括弧内の表現は、その名前部分が存在する時のみ出力されます。</p>
 
-    <p>For instance if the format is "{ll} {vv {von Part}} {ff}"
-    and the names are "Mary Kay and John von Neumann", then JabRef
-    will output "Kay Mary" (with two space between last and first)
-    and "Neuman von von Part John".</p>
+    <p>例えば、書式が「{ll} {vv {von Part}} {ff}」で著者名が「Mary Kay and John von Neumann」ならば、JabRefは「Kay  Mary」(姓名間に空白二つ)と「Neuman von von Part John」を出力します。</p>
 
-    <p>I give two examples but would rather point you to the bibtex
-    documentation.</p>
+    <p>二つの例を示しますが、できればBibTeXの文書を参照されることをお勧めします。</p>
 
-    <p>Small example: <code>"{ll}, {f.}"</code> will turn
-    <code>"Joe Doe"</code> into <code>"Doe, J."</code></p>
+    <p>短い例: <code>"{ll}, {f.}"</code>は「<code>Joe Doe</code>」を「<code>Doe, J.</code>」と返します。</p>
 
-    <p>Large example:</p>
+    <p>長い例:</p>
 
     <blockquote>
-        <p>To turn:</p>
+        <p>以下の名前</p>
 
-        <p><code>"Joe Doe and Mary Jane and Bruce Bar and Arthur
-        Kay"</code></p>
+        <p>「<code>Joe Doe and Mary Jane and Bruce Bar and Arthur
+        Kay</code>」</p>
 
-        <p>into</p>
+        <p>を</p>
 
-        <p><code>"Doe, J., Jane, M., Bar, B. and Kay,
-        A."</code></p>
+        <p>「<code>Doe, J., Jane, M., Bar, B. and Kay,
+        A.</code>」</p>
 
-        <p>you would use</p>
+        <p>と返すには、</p>
 
         <p><code>1@*@{ll}, {f}.@@2 at 1@{ll}, {f}. at 2@ and {ll},
         {f}.@@*@1..-3@{ll}, {f}., @-2@{ll}, {f}. at -1@ and {ll},
         {f}.</code></p>
+
+        <p>と指定します。</p>
     </blockquote>
 
-    <p>If somebody would like to write a better tutorial about
-    this: Write a mail to one of the JabRef mailinglists!</p>
+    <p>このトピックについて、もっと良いチュートリアルを書いてくれる人がおられましたら、JabRefメーリングリストのどれかにメールを送ってください。</p>
 
 
 </body>
diff --git a/src/help/ja/CustomImports.html b/src/help/ja/CustomImports.html
index fe986ff..47f053e 100644
--- a/src/help/ja/CustomImports.html
+++ b/src/help/ja/CustomImports.html
@@ -1,68 +1,30 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <link rel="stylesheet" type="text/css" href="jabref_help.css"/>
 </head>
 
 <body>
 
-    <h1>Custom import filters</h1>
-
-    <p>JabRef allows you to define and use your own importers, in
-    very much the same way as the standard import filters are
-    defined. An import filter is defined by one or more Java
-    <i>classes</i>, which parse the contents of a file from an
-    input stream and create BibTex-Entries. So with some basic Java
-    programming you can add an importer for your favorite source of
-    references or register a new, improved version of an existing
-    importer. Also, this allows you to add compiled custom
-    importers that you might have obtained e.g. from SourceForge
-    without rebuilding JabRef (see "Sharing your work").</p>
-
-    <p>Custom importers take precedence over standard importers.
-    This way, you can override existing importers for the
-    Autodetect and Command Line features of JabRef. Custom
-    importers are ordered by name.</p>
-
-    <h2>Adding a custom import filter</h2>
-
-    <p>Make sure, you have a compiled custom import filter (one or
-    more <code>.class</code> files as described below) and the
-    class files are in a directory structure according to their
-    package structure. To add a new custom import filter, open the
-    dialog box <b>Options -> Manage custom imports</b>, and
-    click <b>Add from folder</b>. A file chooser will appear,
-    allowing you to select the classpath of your importer, i.e. the
-    directory where the top folder of the package structure of your
-    importer resides. In a second file chooser you select your
-    importer class file, which must be derived from
-    <code>ImportFormat</code>. By clicking <b>Select new
-    ImportFormat Subclass</b>, your new importer will appear in the
-    list of custom import filters. All custom importers will appear
-    in the <b>File -> Import -> Custom Importers</b> and
-    <b>File -> Import and Append -> Custom Importers</b>
-    submenus of the JabRef window.</p>
-
-    <p>Please note that if you move the class to another directory
-    you will have to remove and re-add the importer. If you add a
-    custom importer under a name that already exists, the existing
-    importer will be replaced. Although in some cases it is
-    possible to update an existing custom importer without
-    restarting JabRef (when the importer is not on the classpath),
-    we recommend restarting JabRef after updating an
-    custom-importer. You can also register importers contained in a
-    ZIP- or JAR-file, simply select the Zip- or Jar-archive, then
-    the entry (class-file) that represents the new importer.</p>
-
-    <h2>Creating an import filter</h2>
-
-    <p>For examples and some helpful
-    files on how to build your own importer, please check our
-    download page.</p>
-
-    <h3>A simple example</h3>
-
-    <p>Let us assume that we want to import files of the following
-    form:</p>
+    <h1>自作読込フィルタ</h1>
+
+    <p>JabRefでは、標準読込フィルタが定義されているのとほとんど同じ方法で、あなた自身の読込フィルタを定義して使うことができます。読込フィルタは、1つ以上のJava<b>クラス</b>として定義され、入力ストリームからファイルの内容を解析し、BibTeX項目を生成します。つまり、簡単なJavaプログラミングで、あなたの気に入った文献ソースの読込フィルタを追加したり、既存読込フィルタの改善版を新しく登録したりすることができます。また、これによって、例えばSourceForgeなどから入手したコンパイル済みの自作読込フィルタを追加することもできます(「作品を共有する」を参照)。</p>
+
+    <p>自作読込フィルタは、標準読込フィルタよりも優先されます。こうして、JabRefの自動検出機構やコマンドライン機構によって既存の読込フィルタを上書きすることができます。自作読込フィルタは、名称順に整序されます。</p>
+
+    <h2>自作読込フィルタを追加する</h2>
+
+    <p>コンパイルした自作読込フィルタ(上述のように1つ以上の<code>.class</code>ファイル)とクラスファイルが、そのパッケージ構造と同じディレクトリ構造に配置されるようにしてください。新規自作読込フィルタを追加するには、<b>オプション→自作読込の管理</b>ダイアログボックスを開き、<b>フォルダから追加</b>を押してください。ファイル選択ウィンドウが開き、自作読込のクラスパス——つまり自作読込のパッケージ構造の最上位フォルダがあるディレクトリ——を選択することができます。二つめのファイル選択ウィンドウでは、自作読込クラスファイルを選択してください。これは<code>ImportFormat</code>から派生していなくてはなりません。<b>新しいImportFormatサブクラスを選択</b>を押すと、自作読込フィルタの一覧の中に新しい自作フィルタが表示されます。自作読込はすべて、JabRefウィンドウサブメニューの<b>ファイル→読み込み→自作読込</b>と<b>ファイル→読み込んで追加→ [...]
+
+    <p>クラスを別のディレクトリに移動した場合には、読込をいったん削除して追加し直さなくてはならないことに注意してください。既に存在する名称の自作読込を追加すると、既存の読込は置換されます。JabRefを再起動しないで既存の自作読込を更新することができることもありますが(読込がクラスパスにない場合)、自作読込を更新した時にはJabRefを再起動することを推奨します。zipファイルもしくはjarファイルに含まれる読込を登録することも可能です。単にzipファイルもしくはjarファイルを選択して、新規読込を表す項目(クラスファイル)を選択してください。</p>
+
+    <h2>読込フィルタを作成する</h2>
+
+    <p>自作読込のビルドのしかたに関する用例と参考になるファイルについては、JabRefのダウンロードページをご覧ください。</p>
+
+    <h3>簡単な例</h3>
+
+    <p>以下の形のファイルを読み込みたいものと仮定しましょう。</p>
     <pre>
 1936;John Maynard Keynes;The General Theory of Employment, Interest and Money
 2003;Boldrin & Levine;Case Against Intellectual Monopoly
@@ -70,10 +32,7 @@
 </pre><br />
     <br />
 
-    <p>In your favorite IDE or text editor create a class derived
-    from <code>ImportFormat</code> that implements methods
-    <code>getFormatName()</code>, <code>isRecognizedFormat</code>
-    and <code>importEntries()</code>. Here is an example:</p>
+    <p>お好きなIDEやテキストエディタで、<code>getFormatName()</code>・<code>isRecognizedFormat</code>・<code>importEntries()</code>の各メソッドを実装している<code>ImportFormat</code>からの派生クラスを作成してください。下記はその用例です。</p>
     <pre>
 import java.io.*;
 import java.util.*;
@@ -114,38 +73,18 @@ public class SimpleCsvImporter extends ImportFormat {
 </pre><br />
     <br />
 
-    <p>Note that the example is in the default package. Suppose you
-    have saved it under
-    <code>/mypath/SimpleCsvImporter.java</code>. Also suppose the
-    JabRef-2.0.jar is in the same folder as
-    <code>SimpleCsvImporter.java</code> and Java is on your command
-    path. Compile it using a JSDK 1.4 e.g. with</p>
+    <p>用例は既定パッケージにあることに留意してください。これを<code>/mypath/SimpleCsvImporter.java</code>に保存したものとしましょう。また、JabRef-2.0.jarが<code>SimpleCsvImporter.java</code>と同じフォルダにあり、Javaがコマンドパス上にあるものとしましょう。これをJSDK 1.4を使ってコンパイルします。例えば、</p>
     <pre>
 javac -classpath JabRef-2.0.jar SimpleCsvImporter.java
-</pre>Now there should be a file
-<code>/mypath/SimpleCsvImporter.class</code>.<br />
+</pre>とすると、
+<code>/mypath/SimpleCsvImporter.class</code>というファイルができあがるはずです。<br />
     <br />
 
 
-    <p>In JabRef, open <b>Options -> Manage custom imports</b>,
-    and click <b>Add from folder</b>. Navigate to
-    <code>/mypath</code> and click the <b>Select ...</b> button.
-    Select the <code>SimpleCsvImporter.class</code> and click the
-    <b>Select ...</b> button. Your importer should now appear in
-    the list of custom importers under the name "Simple CSV
-    Importer" and, after you click <b>Close</b> also in the <b>File
-    -> Import -> Custom Importers</b> and <b>File ->
-    Import and Append -> Custom Importers</b> submenus of the
-    JabRef window.</p>
-
-    <h2>Sharing your work</h2>
-
-    <p>With custom importer files, it's fairly simple to share
-    custom import formats between users. If you write an import
-    filter for a format not supported by JabRef, or an improvement
-    over an existing one, we encourage you to post your work on our
-    SourceForge.net page. We'd be happy to distribute a collection
-    of submitted import files, or to add to the selection of
-    standard importers.</p>
+    <p>JabRefから<b>オプション→自作読込の管理</b>を開き、<b>フォルダから追加</b>ボタンを押してください。 <code>/mypath</code>に移動し、<b>選択...</b>ボタンを押します。<code>SimpleCsvImporter.class</code>を選択し、<b>選択...</b>を押してください。すると、この読込が自作読込一覧に「Simple CSV Importer」という名称で表示されるようになるので、<b>閉じる</b>を押すと、JabRefウィンドウサブメニューの<b>ファイル→読み込み→自作読込</b>と<b>ファイル→読み込んで追加→自作読込</b>に表示されます。</p>
+
+    <h2>作業の共有</h2>
+
+    <p>自作読込ファイルを使用すれば、ユーザー間で自作読込形式を共有することは、たいへん容易です。JabRefでサポートされていない書式の読込フィルタを書いたり、既存のフィルタを改善した場合、その成果をぜひSourceForge.netページに投稿してください。喜んで、投稿された読込ファイルのコレクションを配布したり、標準読込フィルタのセレクションに追加したりしたいと思います。</p>
 </body>
 </html>
diff --git a/src/help/ja/DOItoBibTeXHelp.html b/src/help/ja/DOItoBibTeXHelp.html
new file mode 100644
index 0000000..07ae650
--- /dev/null
+++ b/src/help/ja/DOItoBibTeXHelp.html
@@ -0,0 +1,17 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<link rel="stylesheet" type="text/css" href="jabref_help.css"/>
+</head>
+
+<body>
+    <h1>Digital Object Identifier (DOI)を使用して項目を取得する</h1>
+
+    <p>この機能を使うには、<b>検索→ウェブ検索</b>を選択すれば、操作盤が側面に表示されますので、そのドロップダウンメニューから<b>DOI to BibTeX</b>を選択してください。</p>
+
+    <p>この取得子は、DOIからBibTeX項目に変換するのに、<a href="http://dx.doi.org/">http://dx.doi.org/</a>を使用しています。</p>
+
+    <p>検索フィールドにDOIを入力し、<b>Enter</b>鍵を押すか<b>取得</b>ボタンを押してください。項目が取得されて、現在アクティブになっているデータベースに追加されます。エラーが発生した場合には、その旨ポップアップで表示されます。</p>
+
+</body>
+</html>
diff --git a/src/help/ja/DiVAtoBibTeXHelp.html b/src/help/ja/DiVAtoBibTeXHelp.html
new file mode 100644
index 0000000..ed4253e
--- /dev/null
+++ b/src/help/ja/DiVAtoBibTeXHelp.html
@@ -0,0 +1,17 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<link rel="stylesheet" type="text/css" href="jabref_help.css"/>
+</head>
+
+<body>
+    <h1>DiVAから項目を取得する</h1>
+            
+    <p><a href="http://www.diva-portal.org/">DiVA (Digitala Vetenskapliga Arkivet)</a>は、およそ<a href="http://www.diva-portal.org/smash/aboutdiva.jsf">30</a>校のスウェーデンの大学および高等教育機関からの出版物のデータベースです。</p>
+
+    <p>この機能を使うためには、<b>検索→ウェブ検索</b>を選択すれば、検索インタフェースが側面に表示されます。ドロップダウンメニューから<b>DiVA</b>を選択してください。</p>
+
+    <p>検索フィールドに、DiVA識別子、例えば<b>diva2:260746</b>と入力して<b>Enter</b>鍵もしくは<b>取得</b>ボタンを押します。すると、その項目が取得されて、現在アクティブになっているデータベースに付け加えられます。エラーが起こった場合には、ポップアップ内に表示されます。</p>
+
+</body>
+</html>
diff --git a/src/help/ja/EndNoteFilters.html b/src/help/ja/EndNoteFilters.html
index a53470a..04c7d48 100644
--- a/src/help/ja/EndNoteFilters.html
+++ b/src/help/ja/EndNoteFilters.html
@@ -5,15 +5,15 @@
 </head>
 
 <body>
-    <h1>EndNote書き出しフィルタ</h1>
+    <h1>EndNote書出フィルタ</h1>
 
     <h2>JabRefからの書き出し</h2>
 
-    <p>JabRefは、EndoNoteが読み込み可能な形式のファイルへ書き出すことができます。この機能を使うには、<b>ファイル→書き出す</b>を選択して、ファイル形式 <b>Endnote (*.txt)</b> を選択し、書き出しファイル名を指定してください。</p>
+    <p>JabRefは、EndoNoteが読込可能形式ファイルへ書き出すことができます。この機能を使うには、<b>ファイル→書き出す</b>を選択して、ファイル形式 <b>Endnote (*.txt)</b> を選択し、書出ファイル名を指定してください。</p>
 
     <h2>EndNoteへの読み込み</h2>
 
-    <p>EndNoteの既定の読み込みフィルタは、複数の著者や編者を適切に取り扱うことができません。これを回避するには、以下の2つの方法があります。</p>
+    <p>EndNoteの既定の読込フィルタは、複数の著者や編者を適切に取り扱うことができません。これを回避するには、以下の2つの方法があります。</p>
 
     <ol>
         <li>組み込みフィルタを使用して、ファイルを後から修正します。ファイルをEndNoteで開くには、EndNoteで新規データベースを作成するか、既存のデータベースを開いてください。その後、<b>File → Import</b>を選んで <b>Choose File</b> をクリックし、書き出したファイルを選択してから <b>Choose</b> をクリックしてください。<b>Import Options</b> をクリックして、<b>EndNote Import</b> を選択します。<b>Import</b> をクリックすれば、読み込みが始まります。読み込み後、<b>Edit → Change Text</b> を選択し、<b>Any Field</b> を <b>Author</b> に変更します。" and "を検索フィールドに入力し(引用符なし)、変更フィールドにリターン文字を入力して(Mac OS Xではoption-return、Windows XPではctrl-return)、<b>Change</b> をクリックしてください。同じこ [...]
@@ -23,7 +23,7 @@
 
     <h2>注記</h2>
 
-    <p>EndNote書き出しフィルタは、BibTeX項目型を以下のように EndNote reference type に対応させます。</p>
+    <p>EndNote書出フィルタは、BibTeX項目型を以下のように EndNote reference type に対応させます。</p>
     <pre>
 BibTeX項目型 → EndNote Reference Type
 ------------------------------------------
@@ -40,10 +40,10 @@ mastersthesis, phdthesis → Thesis</pre>
 
     <h2>共著者</h2>
 
-    <p>既定の書き出しフィルタは、authorフィールドやeditorフィールド中の角括弧に囲まれた項目は、共著者であるものと見なし、角括弧は後ろに付けたコンマに変換されます。しかし、これは角括弧に囲まれたLaTeXコードを含む項目も共著者と見なされることを意味し、このような場合には適切に整形されません。</p>
+    <p>既定の書出フィルタは、authorフィールドやeditorフィールド中の角括弧に囲まれた項目は、共著者であるものと見なし、角括弧は後ろに付けたコンマに変換されます。しかし、これは角括弧に囲まれたLaTeXコードを含む項目も共著者と見なされることを意味し、このような場合には適切に整形されません。</p>
 
     <h2>進んだ使い方: EndNote Extras</h2>
 
-   EndNoteとJabRefの間の相互互換性を向上させるためには、JabRefウェブページにあるResourcesのページからEndNoteフィルターセットをダウンロードしてください。
+   EndNoteとJabRefの間の相互互換性を向上させるためには、JabRefウェブページにあるResourcesのページからEndNoteフィルタセットをダウンロードしてください。
 </body>
 </html>
diff --git a/src/help/ja/EntryEditorHelp.html b/src/help/ja/EntryEditorHelp.html
index 4d7bf09..694ba27 100644
--- a/src/help/ja/EntryEditorHelp.html
+++ b/src/help/ja/EntryEditorHelp.html
@@ -9,63 +9,51 @@
 
     <p><em>これは、基本ウィンドウで当該項目行の適当なところをダブルクリックするか、項目を選んでENTER鍵を押すと開きます。パネルはESC鍵を押すと閉じます。</em></p>
 
-    <p>このパネルでは、単一の項目に関連したすべての情報を指定することができます。項目エディタは、ご使用の項目の型を確認し、この項目を<em>bibtex</em>で参照するための、必須フィールドと非必須フィールドとをすべて列挙します。くわえて、すべての項目型に共通な<em>汎用フィールド</em>と名付けられたフィールドがあります。</p>
+    <p>このパネルでは、単一の項目に関連したすべての情報を指定することができます。項目エディタは、ご使用の項目の型を確認し、この項目を<em>BibTeX</em>で参照するための、必須フィールドと非必須フィールドとをすべて列挙します。くわえて、すべての項目型に共通な<em>汎用フィールド</em>と名付けられたフィールドがあります。</p>
 
-    <p>項目型のそれぞれについて、どのフィールドが必須で、どのフィールドが非必須か、またどのフィールドが汎用フィールドタブに表示されるべきかを、完全に指定することができます。これについて詳しくは、<a href="CustomEntriesHelp.html">項目型のカスタマイズ</a>を参照してください。</p>
+    <p>項目型のそれぞれについて、どのフィールドが必須で、どのフィールドが非必須か、またどのフィールドが汎用フィールドタブに表示されるべきかを、完全に指定することができます。これについて詳しくは、<a href="CustomEntriesHelp.html">項目型の自作</a>を参照してください。</p>
 
-    <p>フィールドをどのように埋めていくべきかについての情報は、<a href="BibtexHelp.html">Bibtexヘルプ</a>をご覧ください。</p>
+    <p>フィールドをどのように埋めていくべきかについての情報は、<a href="BibtexHelp.html">BibTeXヘルプ</a>をご覧ください。</p>
 
     <h2>項目エディタのパネル</h2>
 
-    <p>項目エディタには、<em>必須フィールド</em>・<em>非必須フィールド</em>・<em>汎用</em>・<em>概要</em>・<em>レビュー</em>・<em>BibTeXソース</em>の6つのパネルがあります。ここで、<em>汎用</em>・<em>概要</em>・<em>レビュー</em>はカスタマイズ可能です(<a href="GeneralFields.html">汎用フィールドのカスタマイズ</a>を参照)。最初の3つのパネルでは、TABとSHIFT-TABがテキストフィールド間でフォーカスを移すのに使用できます。</p>
+    <p>項目エディタには、<em>必須フィールド</em>・<em>非必須フィールド</em>・<em>汎用</em>・<em>概要</em>・<em>レビュー</em>・<em>BibTeXソース</em>の6つのパネルがあります。ここで、<em>汎用</em>・<em>概要</em>・<em>レビュー</em>はカスタマイズ可能です(<a href="GeneralFields.html">汎用フィールドの個人設定</a>を参照)。最初の3つのパネルでは、TABとSHIFT-TABがテキストフィールド間でフォーカスを移すのに使用できます。</p>
 
     <p>パネルを切り替えるにはタブをクリックするか、以下のキーの組み合わせで左右のパネルに移動してください。右側のタブに異動するには、CTRL-TABまたはCTRL-プラス、左側のタブに異動するには、CTRL-SHIFT-TABまたはCTRL-マイナスを使います。また、次または前の項目に移動するには、それぞれCTRL-SHIFT-↓またはCTRL-SHIFT-↑を押すか、適切なツールバーボタンをクリックしてください。</p>
 
-    <p><em>bibtexソース</em>パネルは、データベースが<em>bibtex</em>形式に保存されたときに、項目がどのように表記されるかを示します。お望みならば、このパネルで<em>bibtex</em>ソースを直接編集することもできます。別のパネルに移動したり、CTRL-Sを押したり、あるいは項目エディタを閉じたりした際に、JabRefはソースパネルの内容を解析しようと試みます。問題がある場合には、それを通知して、その項目をさらに編集するのか、以前の内容に戻すのかの選択肢を提示します。<strong>設定</strong>ダイアログの<strong>項目エディタ</strong>タブにある<strong>既定でBibTeXソースを表示</strong>を有効にすると、項目エディタを開く度に、ソースパネルが表示されます。BibTeXの提供する4つのパネルではなく、ソースで編集することをお好みならば、このオプションを有効にしてください。</p>
+    <p><em>BibTeXソース</em>パネルは、データベースが<em>BibTeX</em>形式に保存されたときに、項目がどのように表記されるかを示します。お望みならば、このパネルで<em>BibTeX</em>ソースを直接編集することもできます。別のパネルに移動したり、CTRL-Sを押したり、あるいは項目エディタを閉じたりした際に、JabRefはソースパネルの内容を解析しようと試みます。問題がある場合には、それを通知して、その項目をさらに編集するのか、以前の内容に戻すのかの選択肢を提示します。<strong>設定</strong>ダイアログの<strong>項目エディタ</strong>タブにある<strong>既定でBibTeXソースを表示</strong>を有効にすると、項目エディタを開く度に、ソースパネルが表示されます。BibTeXの提供する4つのパネルではなく、ソースで編集することをお好みならば、このオプションを有効にしてください。</p>
 
     <p><strong>一口メモ</strong> お使いのデータベースにJabRefが知らないフィールドが含まれている場合、これらはソースパネルから見ることができます。</p>
 
+    <p><strong>一口メモ</strong> <i>pdf</i>および<i>url</i>フィールドは、ドラッグ&ドロップ操作をサポートしています。ここにブラウザからURLをドラッグしたり、PDFファイルをドラッグしてJabRefにダウンロードさせるか、リンクのままにしておいたりすることができます。</p>
+
     <h2>フィールド整合性検査</h2>
 
-    <p>フィールドの内容が変更された場合、JabRefは新しい内容を受諾可能かどうか検査します。<em>bibtex</em>が使用するフィールド型については、「#」文字の使用法に関しての検査も行われます。#記号は、(「\#」の形でエスケープされている場合を除き)<em>つねに</em>対で使用され、参照されている<em>bibtex</em>文字列を囲みます。なお、JabRefは、参照されている文字列が実際に存在するかどうかの検査は行わないので注意してください(これは自明ではありません。自分で使用する<em>bibtex</em>スタイルは、JabRefが知らない文字列を好きなだけ定義することができるからです)。</p>
+    <p>フィールドの内容が変更された場合、JabRefは新しい内容を受諾可能かどうか検査します。<em>BibTeX</em>が使用するフィールド型については、「#」文字の使用法に関しての検査も行われます。#記号は、(「\#」の形でエスケープされている場合を除き)<em>つねに</em>対で使用され、参照されている<em>BibTeX</em>文字列を囲みます。なお、JabRefは、参照されている文字列が実際に存在するかどうかの検査は行わないので注意してください(これは自明ではありません。自分で使用する<em>BibTeX</em>スタイルは、JabRefが知らない文字列を好きなだけ定義することができるからです)。</p>
 
    <p>内容が受諾されなければ、フィールドが赤く表示されてエラーであることを示します。この場合には、変更点は保存されません。</p>
 
-<!--<h2>Word/name autocompletion</h2>
-
-    <p>The entry editor offers autocompletion of words. In the Preferences dialog
-    you can enable or disable autocompletion, and choose for which fields
-    autocompletion is active.</p>
+    <h2>単語/名称自動補完</h2>
 
-    <p>With autocompletion, JabRef records all words that appear in
-    each of the chosen fields throughout your database. Whenever you write
-    the beginning of one of these words, it will be suggested visually. To
-    ignore the suggestion, simply write on. To accept the suggestion,
-    either press <em>ENTER</em> or use your arrow keys or other keys to
-    remove the selection box around the suggested characters.</p>
+    <p>項目エディタでは、単語の自動補完を使うことができます。設定ダイアログで、自動補完を有効にしたり無効にしたりすることができる他、どのフィールドで自動補完をアクティブにするか選ぶことができます。</p>
 
-    <p><em>Note:</em> the words considered for suggestion are only the ones
-    appearing in the same field in entries of the same database as the one you
-    are editing. There are many ways to realise this kind of feature, and if you feel
-    it should have been implemented differently, we'd like to hear your suggestions!</p>
+    <p>自動補完が有効にすると、選択した各フィールドでデータベース中に現れる単語をすべて記録します。これらの単語のどれかを書き始めると、画面上でその候補が提案されます。提案候補を無視するには、そのまま書き続けてください。候補を受け入れるには、ENTERを押すか、矢印キーを押すか、あるいは他の文字を押して提案文字脇の選択ボックスを消してください。</p>
 
-    <h2>Copy <em>bibtex</em> key</h2>
+    <p><b>《註》</b> 提案候補の単語は、編集しているデータベースの同じフィールドに現れる単語のみです。この種の機能を実現するには様々な方法が考えられ、もしこれとは違う実装をするべきだと考えられる方がおられれば、ご提案をお聞かせください。</p>
 
-    <p>Pressing CTRL-K or the 'key' button causes the <em>bibtex</em> key for your entry
-    to be copied to the clipboard.</p>
-    -->
+    <h2><em>BibTeX</em>鍵を引用コマンド付きでコピーする</h2>
 
-    <h2><em>bibtex</em>キー自動生成</h2>
+    <p>CTRL-Kか「鍵」ボタンを押すと、その項目の<em>BibTeX</em>鍵の前後に引用コマンドを付したものがクリップボードにコピーされます。</p>
 
-    <p>当該項目の必須フィールドの内容に基づいて<em>bibtex</em>キーを自動生成させるには、CTRL-Gを押すか「キー生成」ボタン(魔法の杖)を押してください。</p>
+    <h2><em>BibTeX</em>鍵をコピーする</h2>
 
-    <p>JabRefがどうやって<em>bibtex</em>キーを生成するかについての詳しい情報は、<a href="LabelPatterns.html">BibTeXキーの生成をカスタマイズする</a>をご覧ください。</p>
+    <p>CTRL-SHIFT-Kを押すと、その項目の<em>BibTeX</em>鍵がクリップボードにコピーされます。</p>
 
-    <h2>単語/名称自動補完</h2>
+    <h2><em>BibTeX</em>鍵自動生成</h2>
 
-    <p>JabRefには、単語および名称の自動補完機能があります。自動補完は、<b>オプション→設定→項目エディタ</b>で設定することができ、よく使われるフィールドのいくつかにおいて、既定で有効化されています。</p>
+    <p>当該項目の必須フィールドの内容に基づいて<em>BibTeX</em>鍵を自動生成させるには、CTRL-Gを押すか「鍵生成」ボタン(魔法の杖)を押してください。</p>
 
-    <p>自動補完が有効になっているフィールドを編集すると、JabRefは、これまでにデータベース中のその特定のフィールドで使用された単語に基づいて、あなたが書き込むと同時に単語補完を提案しようとします。提案候補は、補完時に強調されたテキストブロックとして表示されます。補完候補が複数ある場合には、候補を変えるのにPAGE UPおよびPAGE DOWNを使用することができます。候補を受け入れるには、ENTERを一度押してください。候補を無視するには、入力をそのまま続けてください。</p>
+    <p>JabRefがどうやって<em>BibTeX</em>鍵を生成するかについての詳しい情報は、<a href="LabelPatterns.html">BibTeX鍵生成機構の自作</a>をご覧ください。</p>
 
 </body>
 </html>
diff --git a/src/help/ja/ExternalFiles.html b/src/help/ja/ExternalFiles.html
index 6679864..407b7c5 100644
--- a/src/help/ja/ExternalFiles.html
+++ b/src/help/ja/ExternalFiles.html
@@ -20,11 +20,11 @@
 
     <h2>外部ファイルやリンクを開く</h2>
 
-    <p>外部ファイルやウェブページを開くには、いくつかの方法があります。項目エディタでは、ファイル名やDOIもしくはURLを含むテキストフィールドをダブルクリックします。項目表では、項目を選択して、メニューを選ぶか短絡キーを使うか右クリックメニューを使用するかして、ファイルやウェブページを開くことができます。さらに、PDF/PS/URL/DOIアイコンをクリックすることもできます。</p>
+    <p>外部ファイルやウェブページを開くには、いくつかの方法があります。項目エディタでは、ファイル名やDOIもしくはURLを含むテキストフィールドをダブルクリックします。項目表では、項目を選択して、メニューを選ぶか<ruby><rb>捷径鍵</rb><rp>(</rp><rt>ショートカットキー</rt><rp>)</rp></ruby>を使うか右クリックメニューを使用するかして、ファイルやウェブページを開くことができます。さらに、PDF/PS/URL/DOIアイコンをクリックすることもできます。</p>
 
     <p>既定では、項目表には、外部ファイルやURLにリンクしている項目のために、2つのアイコン列があります。これらは、<b>設定→項目表</b>で表示しないようにすることができます。項目表の2列目は、PDFまたはPSファイルのアイコンを(両方が存在するときはPDFのみ)表示し、3列目はURLまたはDOIのアイコンを(両者が存在するときはURLのみ)表示します。これらのファイルやウェブページはアイコンをクリックすれば開くことができます。</p>
 
-    <p><b>《註》</b>項目エディタ(の「汎用」パネル)にPSフィールドが表示されないときは、<a href="GeneralFields.html">汎用フィールドの項目型をカスタマイズ</a>しなくてはならないかもしれません。</p>
+    <p><b>《註》</b>項目エディタ(の「汎用」パネル)にPSフィールドが表示されないときは、<a href="GeneralFields.html">汎用フィールドの項目型を調整</a>しなくてはならないかもしれません。</p>
 
     <h2>基本PDFディレクトリと基本PSディレクトリ</h2>
 
diff --git a/src/help/ja/FileLinks.html b/src/help/ja/FileLinks.html
index eb99526..a1ef014 100644
--- a/src/help/ja/FileLinks.html
+++ b/src/help/ja/FileLinks.html
@@ -22,12 +22,16 @@
 
     <p><a href="GeneralFields.html">汎用フィールド</a>に「file」フィールドが含まれている場合、<a href="EntryEditorHelp.html">項目エディタ</a>内で、項目中の外部ファイル一覧を編集することができます。エディタには、リンクの挿入や編集、削除のためのボタンの他、リンク一覧を整序するためのボタンがあります。</p>
 
-    <p>お使いのファイルディレクトリ(<b>設定→外部プログラム→外部ファイルリンク→基本ファイルディレクトリ</b>で設定)に、定義済みの外部ファイル型のいずれかを拡張子として持ち、名称にBibTeX項目のBibTeXキーが含まれているファイルがある場合、項目エディタの<b>自動</b>ボタンをクリックすれば、このファイルを自動的にリンクすることができます。どのファイル名をBibTeXキーに自動リンクするかの規則は、<b>設定→外部プログラム→外部ファイルリンク→正規表現検索を使用</b>で設定できます。</p>
+    <p>お使いのファイルディレクトリ(<b>設定→外部プログラム→外部ファイルリンク→基本ファイルディレクトリ</b>で設定)に、定義済みの外部ファイル型のいずれかを拡張子として持ち、名称にBibTeX項目のBibTeX<ruby><rb>鍵</rb><rp>(</rp><rt>キー</rt><rp>)</rp></ruby>が含まれているファイルがある場合、項目エディタの<b>自動</b>ボタンをクリックすれば、このファイルを自動的にリンクすることができます。どのファイル名をBibTeX鍵に自動リンクするかの規則は、<b>設定→外部プログラム→外部ファイルリンク→正規表現検索を使用</b>で設定できます。</p>
 
-    <p>ファイルをダウンロードし、それに対してBibTeX項目からリンクを張るには、項目エディタから<b>ダウンロード</b>ボタンをクリックします。すると、ダイアログボックスが現れ、URLを入力するよう促されます。ファイルは基本ファイルディレクトリにダウンロードされ、その項目のBibTeXキーに基づいて名称が割り振られた上で、この項目からのリンクが張られます。</p>
+    <p>ファイルをダウンロードし、それに対してBibTeX項目からリンクを張るには、項目エディタから<b>ダウンロード</b>ボタンをクリックします。すると、ダイアログボックスが現れ、URLを入力するよう促されます。ファイルは基本ファイルディレクトリにダウンロードされ、その項目のBibTeX鍵に基づいて名称が割り振られた上で、この項目からのリンクが張られます。</p>
+
+    <p>固定ファイルディレクトリを使う以外の方法もあります。まず、(設定→外部プログラムで設定して)bibファイルからの相対パスにリンクを置くこともできます。このようにリンクしたファイルは、リンクを切ることなくbibファイルと移動させることができます。また、bibファイルの場所を<b>主要</b>ファイルディレクトリにする設定もできます。これは、リンクしたファイルをダウンロードしたり移動したりする時に、JabRefが使うディレクトリになります。</p>
+
+    <p><b>ファイル→データベース特性</b>から単独データベース用にファイルディレクトリ(絶対パスもしくはbibファイルからの相対パス)を設定することもできます。最後に、<b>データベース特性</b>ダイアログでは、ユーザー毎のファイルディレクトリを設定することができ、これはあなたがこのbibファイルで作業をしている時に限り有効となります。</p>
 
     <h2>外部ファイルを開く</h2>
 
-    <p>外部ファイルやウェブページを開くにはいくつかの方法があります。項目の最優先外部リンクを開くには、項目表から項目を選び、メニューを選ぶか、短絡キーを使用するか、あるいは右クリックメニューを使用します。または、項目表が<b>ファイル</b>列を表示するように設定されている場合には(<b>設定→項目表→特殊な表列→ファイル列を表示</b>で設定)、ファイルアイコンをクリックすれば、項目の最優先リンクが開きます。項目のその他のリンクにアクセスするには、アイコンを右マウスボタンでクリックし(Mac OS Xの場合はCtrl-クリック)、すべてのリンクが載っているメニューを表示させてください。</p>
+    <p>外部ファイルやウェブページを開くにはいくつかの方法があります。項目の最優先外部リンクを開くには、項目表から項目を選び、メニューを選ぶか、<ruby><rb>捷径鍵</rb><rp>(</rp><rt>ショートカットキー</rt><rp>)</rp></ruby>を使用するか、あるいは右クリックメニューを使用します。または、項目表が<b>ファイル</b>列を表示するように設定されている場合には(<b>設定→項目表→特殊な表列→ファイル列を表示</b>で設定)、ファイルアイコンをクリックすれば、項目の最優先リンクが開きます。項目のその他のリンクにアクセスするには、アイコンを右マウスボタンでクリックし(Mac OS Xの場合はCtrl-クリック)、すべてのリンクが載っているメニューを表示させてください。</p>
 </body>
 </html>
diff --git a/src/help/ja/GeneralFields.html b/src/help/ja/GeneralFields.html
index 0174050..cf716b7 100644
--- a/src/help/ja/GeneralFields.html
+++ b/src/help/ja/GeneralFields.html
@@ -1,27 +1,21 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <link rel="stylesheet" type="text/css" href="jabref_help.css"/>
 </head>
 
 <body>
 
-    <h1>Customizing general fields</h1>
+    <h1>汎用フィールドの個人設定</h1>
 
-    <p>You can add an arbitrary number of tabs to the entry editor.
-    These will be present for all entry types. To customize these
-    tabs, go to "Options -> Set up general fields".</p>
+    <p>項目エディタには、好きな数だけタブを追加することができます。これはどの項目型に対しても表示されます。タブを編集するには、「オプション→汎用フィールドを設定」を開いてください。</p>
 
-    <p>You specify one tab on each line. The line should start with
-    the name of the tab, followed by a colon (:), and the fields it
-    should contain, separated by semicolons (;).</p>
+    <p>一行ごとに一つのタブを指定します。各行の行頭にはタブ名を書いてコロン(:)を続け、その後にタブに入れるフィールドをセミコロン(;)で区切って書き入れます。</p>
 
-    <p>E.g.<br />
+    <p>例<br />
     <code>General:url;keywords;doi;pdf<br />
      Abstract:abstract;annote</code></p>
 
-    <p>which would give one tab named "General" containing the
-    fields <em>url</em>, <em>keywords</em>, <em>doi</em> and
-    <em>pdf</em>, and another tab named "Abstract" containing the
-    fields <em>abstract</em> and <em>annote</em>.</p>
+    <p>これは、<em>url</em>・<em>keywords</em>・<em>doi</em>・<em>pdf</em>の各フィールドを含む「General」と云う名のタブと、<em>abstract</em>・<em>annote</em>の各フィールドを含む「Abstract」と云う名のタブを生成します。</p>
 </body>
 </html>
diff --git a/src/help/ja/GoogleScholarHelp.html b/src/help/ja/GoogleScholarHelp.html
new file mode 100644
index 0000000..3316a4f
--- /dev/null
+++ b/src/help/ja/GoogleScholarHelp.html
@@ -0,0 +1,18 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<link rel="stylesheet" type="text/css" href="jabref_help.css"/>
+</head>
+
+<body>
+
+    <h1>Google Scholarを検索</h1>
+
+    <p>JabRefは、Google Scholarで検索を行い、引用をダウンロードすることができます。この機能を使うには、<b>検索→ウェブ検索</b>を選択すれば、操作盤が側面に表示されますので、そのドロップダウンメニューから<b>Google Scholar</b>を選択してください。</p>
+
+    <p>検索を開始するには、問い合わせる単語を入力し、<b>Enter</b>鍵を押すか、<b>取得</b>ボタンを押してください。</p>
+
+    <p>Google Scholarに頻繁に接続すると、Googleは画像認証を問い合わせてくるので、JabRefには対応することができません。この問題に対処するため、JabRefは、各検索毎にサーバーが返す項目1ページ目のプレビューを表示します。そこからどの項目をダウンロードするか選択してください。</p>
+
+</body>
+</html>
diff --git a/src/help/ja/GroupsHelp.html b/src/help/ja/GroupsHelp.html
index 9d18b0a..423c3cb 100644
--- a/src/help/ja/GroupsHelp.html
+++ b/src/help/ja/GroupsHelp.html
@@ -15,7 +15,7 @@
         <li>グループは、特定の基準を設けて内容を動的に制御することができます。これらの基準に一致する新規項目は、自動的にグループに加えられます。このような機能は、通常のファイルシステムにはありませんが、電子メールクライアントの中には、同様の機能を持つものがあります(ThunderbirdやOperaなど)。</li>
     </ul>
 
-    <p>グループを選択すると、当該グループに属する項目が表示されます。複数のグループを選択すると、現在の設定の状態によって、どれかのグループに属する項目が表示されるか(和集合)、すべてのグループに属する項目が表示されます(積集合)。これらはすべて下記に詳細に説明します。</p>
+    <p>グループを選択すると、当該グループに属する項目が表示されます。複数のグループを選択すると、現在の設定の状態によって、どれかのグループに属する項目が表示されるか(論理和)、すべてのグループに属する項目が表示されます(論理積)。これらはすべて下記に詳細に説明します。</p>
 
     <p>グループの定義はデータベース毎に為されます。これは、<tt>.bib</tt>ファイル内の<tt>@COMMENT</tt>ブロックに保存され、全ユーザーに共有されます(将来のJabRefではユーザー毎のグループがサポートされるかもしれません)。</p>
 
@@ -32,25 +32,25 @@
             <td>
                 <h2>いくつかの簡単な例</h2>
 
-                <p>わたしは...</p>
+                <p>わたしは…</p>
 
-                <h3>...グループを作成して、いくつかの項目を割り当てたいのです</h3>
+                <h3>…グループを作成して、いくつかの項目を割り当てたいのです</h3>
 
                 <p>グループ制御盤が表示されていることを確認します。<b>新規グループ</b>ボタンを押し、新しいグループの名称を入力、他の値はすべて既定値にしたままで<b>OK</b>ボタンを押します。そのグループに所属させたい項目群を選択して、そのグループへドラッグ&ドロップするか、コンテクストメニュー中の<b>グループに追加</b>オプションを選択します。最後に、そのグループを選択して、内容を表示させます(いま所属させた項目が表示されるはずです)。</p>
 
-                <h3>...<tt>keywords</tt>フィールドを使用して項目をグループ分けしたいのです</h3>
+                <h3>…<tt>keywords</tt>フィールドを使用して項目をグループ分けしたいのです</h3>
 
                 <p>グループ制御盤が表示されていることを確認します。<b>新規グループ</b>ボタンを押し、新しいグループの名称を入力、オプションを「フィールド中のキーワードを検索して動的にグループ化」に設定します。検索するキーワードを入力して<b>OK</b>ボタンを押します。最後に、そのグループを選択して、内容を表示させます(<tt>keywords</tt>フィールドに指定したキーワードが入っている項目すべてが表示されるはずです)。</p>
 
-                <h3>...自由型検索表現を使ってグループを定義したいのです</h3>
+                <h3>…自由型検索表現を使ってグループを定義したいのです</h3>
 
                 <p>グループ制御盤が表示されていることを確認します。<b>新規グループ</b>ボタンを押し、新しいグループの名称を入力、オプションを「自由型検索表現で動的にグループ化」に設定します。「検索表現」に<tt>author=smith</tt>のように入力し(<tt>smith</tt>はデータベース中の実際の名前に置き換えてください)、<b>OK</b>ボタンを押します。最後に、そのグループを選択して、内容を表示させます(<tt>author</tt>フィールドに指定した名前が入っている項目すべてが表示されるはずです)。</p>
 
-                <h3>...複数のグループを連結したいのです</h3>
+                <h3>…複数のグループを連結したいのです</h3>
 
                 <p>上述の方法などを使って、2つのグループを作成します。<b>設定</b>ボタンを押して、<b>論理和</b>が選択されていることを確認します。それから2つのグループを選択します。2つのグループのうちどちらかに属している項目がすべて表示されます。<b>設定</b>をもう一度押し、<b>論理積</b>を選択します。すると、両方のグループの属している項目のみが表示されます(全く表示されないかもしれませんし、両方のグループが同じ項目を含んでいる場合には全く同じ項目が表示されます)。</p>
 
-                <h3>...重複のあるグループを識別したいのです</h3>
+                <h3>…重複のあるグループを識別したいのです</h3>
 
                 <p>JabRefでは、現在選択しているグループと重複部分があるグループ(すなわち、そのうち少なくとも1つの項目が現在選択しているグループにも含まれているもの)を簡単に見つけることができます。<b>設定</b>を押して、「重複のあるグループを着色」オプションを有効にします。そして、他のグループと重複しているグループを選択すると、他のグループの方が着色されます。</p>
             </td>
@@ -103,107 +103,46 @@
 
     <p>グループ表示において、動的グループは、既定値で<i>イタリック体</i>で表示されます。この表示は、設定(オプション→設定→グループ→「動的グループをイタリック体で表示」チェックボックス)で、止めることができます。</p>
 
-    <h3>Hierarchical context</h3>
-
-    <p>By default, a group is
-    <b>independent</b> of its position in the groups tree: When
-    selected, only the group's contents are shown. However,
-    especially when using dynamic groups, it is often useful to
-    define a subgroup that <b>refines its supergroup</b>, i.e.,
-    when selected, entries contained in both groups are displayed.
-    For example, create a supergroup containing entries with the
-    keyword <tt>distribution</tt> and a subgroup containing entries
-    with the keyword <tt>gauss</tt> that refines this supergroup.
-    Selecting the subgroup now displays entries that match both
-    conditions, i.e. are concerned with Gaussian distributions. By
-    adding another refining subgroup for <tt>laplace</tt> to the
-    original supergroup, the grouping can easily be extended. In
-    the groups tree, refining groups have a special icon (this can
-    be turned off in the preferences).</p>
-
-    <p>The logical complement to a refining group is a group that
-    <b>includes its subgroups</b>, i.e. when selected, not only the
-    group's own entries, but also its subgroups' entries are shown.
-    In the groups tree, this type of group has a special icon (this
-    can be turned off in the preferences).</p>
-
-    <h2>Viewing a group's entries, combining multiple
-    groups</h2>
-
-    <p>Selecting a group shows the entries contained in
-    that group by highlighting them and, depending on the settings
-    (accessible by clicking the <b>Settings</b> button), moving
-    them to the top of the list and/or selecting them. These
-    options are identical to those available for the regular
-    search.</p>
-
-    <p>When multiple groups are selected, either the union or the
-    intersection of their content is shown, depending on the
-    current settings. This allows to quickly combine multiple
-    conditions, e.g. if you have a static group <tt>Extremely
-    Important</tt> to which you assign all extremely important
-    entries, you can view the extremely important entries in any
-    other group by selecting both groups (this requires to have
-    <b>Intersection</b> selected in the settings).</p>
-
-    <h2>Groups and searching</h2>
-
-    <p>When viewing the contents of the
-    selected group(s), a search can be performed within these
-    contents using the regular search facility.</p>
-
-    <h2>Highlighting overlapping groups</h2>
-
-    <p>The <b>Settings</b>
-    button offers an option to highlight overlapping groups. If
-    this is activated, upon selection of one or more groups, all
-    groups that contain at least one of the entries contained in
-    the currently selected group(s) are highlighted. This quickly
-    identifies overlap between the groups' contents. You might, for
-    example, create a group <tt>To Read</tt> that contains all
-    entries which you plan to read. Now, whenever you select any
-    group, the group <tt>To Read</tt> is highlighted if the
-    selected group contains entries that you plan to read.</p>
-
-    <h2>Advanced features</h2>
-
-    <p>After mastering the grouping concepts
-    described above, the following advanced features might come in
-    handy.</p>
-
-    <h3>Automatically creating dynamic groups</h3>
-
-    <p>By clicking the
-    <b>Automatically create groups for database</b> button, you can
-    quickly create a set of groups appropriate for your database.
-    This feature will gather all words found in a specific field of
-    your choice, and create a group for each word. This is useful
-    for instance if your database contains suitable keywords for
-    all entries. By autogenerating groups based on the
-    <tt>keywords</tt> field, you should have a basic set of groups
-    at no cost.</p>
-
-    <p>You can also specify characters to ignore, for instance
-    commas used between keywords. These will be treated as
-    separators between words, and not part of them. This step is
-    important for combined keywords such as <tt>laplace
-    distribution</tt> to be recognized as a single semantic unit.
-    (You cannot use this option to remove complete words. Instead,
-    delete the unwanted groups manually after they were created
-    automatically.)</p>
-
-    <h3>Refreshing the groups view</h3>
-
-    <p>The <b>Refresh</b> button
-    updates the entry table to reflect the current groups
-    selection. This is usually done automatically, but in rare
-    occasions (e.g. after a group-related undo/redo) a manual
-    refresh is required.</p>
-
-    <h3>Mixing refining groups with including groups</h3>
-
-    <p>If a refining group is a subgroup of a group that includes its
-    subgroups -- the refining group's siblings --, these siblings
-    are ignored when the refining group is selected.</p>
+    <h3>階層コンテクスト</h3>
+
+    <p>既定値では、グループは、グループツリー中で他の階層から<b>独立</b>したものと解され、該当するグループの内容のみが表示されます。しかしながら、特に動的グループを使用している際には、<b>上層グループを絞り込む</b>形の下層グループを定義することが便利なことがあり、この場合、下層グループとその上層グループの両方に属する項目が表示されます。例えば、<tt>distribution</tt>というキーワードを持つ項目を集めた上層グループと、この上層グループを絞り込む<tt>gauss</tt>というキーワードを持つ項目を集めた下層グループを作成したとしましょう。この下層グループを選択すると、両方の条件を満たす項目、すなわちガウス分布に関連した項目が表示されます。さらに、この上層グループを<tt>laplace</tt>で絞り込む下層グループを追加すると、元のグループ化を簡単に拡張することができます。グループツリー中では、絞り込みグループは、専用アイコンで表されます(この表示は設定で切ることができます)。</p>
+
+    <p>絞り込みグループの逆は、<b>下層グループを取り込む</b>形のグループで、グループ自身の項目だけでなく、その下層グループの項目も表示されるものです。グループツリー中で、この型のグループは、専用アイコンで表されます(この表示は設定で切ることができます)。</p>
+
+    <h2>グループ項目の表示と複数グループの結合</h2>
+
+    <p>グループを選択すると、当該グループに含まれる項目を着色して、設定次第では(<b>設定</b>ボタンをクリックすれば変更できます)、それらを一覧の最上部に移動したり選択したり(あるいは両方)します。これらのオプションは、通常検索で使用されるものと同一です。</p>
+
+    <p>複数のグループを選択すると、設定に依存して、それらの中身の和集合(結び)もしくは積集合(交わり)が表示されます。これを用いると、複数の条件を簡単に結びつけることができます。例えば、非常に重要な項目すべてに割り当てた<tt>最重要</tt>という静的グループがある時、他のどのグループにおいても、そのグループと<tt>最重要</tt>グループ両方を選択することで、そのグループ内の最重要項目を表示することができます(この時、設定で<b>論理積</b>が選択されている必要があります)。</p>
+
+    <h2>グループと検索</h2>
+
+    <p>選択したグループの内容が表示されている時には、通常検索機能を使って、これらの内容内部での検索を行うことができます。</p>
+
+    <h2>重複のあるグループを着色表示</h2>
+
+    <p><b>設定</b>ボタンを押すと、重複のあるグループを着色表示するオプションがあります。一つ以上のグループを選択した上で、これを有効にすると、現在選択されているグループに含まれている項目を少なくとも一つ含むグループは、すべて着色表示されます。これを使うと、グループ間の項目に重複があるかどうかを簡単に確かめることができます。例えば、これから読もうと思っている項目をすべて含む<tt>読む予定</tt>というグループを作成したとします。すると、どのグループを選択したとしても、そのグループに読む予定の項目があるときには、<tt>読む予定</tt>グループが着色表示されるようになります。</p>
+
+    <h2>選択したグループに新規項目を割り当てる</h2>
+   
+    <p><b>設定</b>ボタンでは、新規項目を選択したグループに自動的に割り当てるオプションも提供します。一つ以上のグループを選択した上で、これを有効にすると、作成した新規項目はすべて、選択したグループに割り当てられるようになります。これは、メニューボタンから作成した項目に対しても、クリップボードから貼り付けた項目に対しても動作します。本オプションは、「オプション→設定→グループ」メニューからでも有効化ないし無効化することができます。</p>
+
+    <h2>熟練者向け機能</h2>
+
+    <p>前述のグループ化の概念をマスターしたならば、下記の熟練者向け機能が便利であることに気づかれるかもしれません。</p>
+
+    <h3>動的グループを自動生成</h3>
+
+    <p><b>データベースのグループを自動生成</b>ボタンをクリックすると、使用中のデータベースに適切なグループの組を簡単に作ることができます。この機能は、ユーザーが選んだ特定のフィールド中に収められているすべての単語を収集して、単語毎にグループを生成します。これは、例えば、使用中のデータベースの全項目に適切なキーワードが収められている場合に便利です。<tt>keywords</tt>フィールドに基づいてグループを自動生成すれば、グループの基本となる組を、手間をかけることなく手に入れることができます。</p>
+
+    <p>また、例えばキーワードを区切るコンマなど、特定の文字を無視するよう指定することもできます。コンマは単語間の区切りとして扱われ、単語の一部としては解されません。このステップは、<tt>laplace distribution</tt>のような複合キーワードが、単一の意味論的単位として認識されるために重要です(このオプションを完全な単語を削除するために使うことはできません。代わりに、グループを自動的に生成させた後に、要らないグループを手動で削除してください)。</p>
+
+    <h3>グループの表示を更新</h3>
+
+    <p><b>更新</b>ボタンは、現在選択しているグループを、項目表に反映させて更新するためのものです。これは通常自動的に行われますが、稀に手動更新が必要になることがあります(例えば、グループに関連した取り消しや再実行)。</p>
+
+    <h3>絞り込みグループと取り込みグループの両立</h3>
+
+    <p>絞り込みグループが、下層グループ(絞り込みグループと同階層の兄弟)を取り込むグループの下層グループになっている場合、これらの同階層兄弟は、絞り込みグループを選択したときには無視されます。</p>
 </body>
 </html>
diff --git a/src/help/ja/HelpHelp.html b/src/help/ja/HelpHelp.html
index 2bd8aba..c48ec42 100644
--- a/src/help/ja/HelpHelp.html
+++ b/src/help/ja/HelpHelp.html
@@ -18,7 +18,7 @@
 
     <p>ヘルプウィンドウは、どのプログラムウィンドウからそれが呼ばれたのかによって、異なるファイルを既定で開きます。もしこのファイルが、あなたの関心事を説明していないときには、ツールバーの<em>目次</em>ボタンを押すと、利用できるヘルプファイルの一覧が表示されます。</p>
 
-    <p>さらに、ツールバーには、次または前のファイルを表示するための移動ボタンがあります。これらは、標準的なウェブブラウザの<em>戻る</em>ボタンや<em>進む</em>ボタンに似たものです。<em> 戻る</em>の移動短絡キーは左矢印キーであり、<em>進む</em>の移動短絡キーは右矢印キーです。</p>
+    <p>さらに、ツールバーには、次または前のファイルを表示するための移動ボタンがあります。これらは、標準的なウェブブラウザの<em>戻る</em>ボタンや<em>進む</em>ボタンに似たものです。<em> 戻る</em>の移動<ruby><rb>捷径鍵</rb><rp>(</rp><rt>ショートカットキー</rt><rp>)</rp></ruby>は左矢印キーであり、<em>進む</em>の移動捷径鍵は右矢印キーです。</p>
 
     <p>ヘルプウィンドウは、エスケープ鍵を押すと閉じます。</p>
 </body>
diff --git a/src/help/ja/IEEEXploreHelp.html b/src/help/ja/IEEEXploreHelp.html
index eaa8403..88edd79 100644
--- a/src/help/ja/IEEEXploreHelp.html
+++ b/src/help/ja/IEEEXploreHelp.html
@@ -7,18 +7,16 @@
 <body>
     <h1>IEEEXploreの検索</h1>
 
-    <p>IEEEXploreは、電気工学やコンピューター科学、電子工学分野の技術文献へのアクセスを提供しています。</p>
+    <p>この機能を使うには、<b>検索→ウェブ検索</b>を選択すれば、操作盤が側面に表示されますので、そのドロップダウンメニューから<b>IEEEXplore</b>を選択してください。</p>
 
-    <p>JabRefは、IEEEXploreデータベースから文献情報をダウンロードすることができます。この機能を使うには、<b>ウェブ検索→ACMPortalを検索</b>を選択してください。すると検索インタフェースが側面に表示されるようになります。</p>
+    <p>IEEEXploreは、電気工学やコンピューター科学、電子工学分野の技術文献へのアクセスを提供しています。検索を始めるには、問い合わせる単語を入力し、<b>Enter</b>鍵を押すか<b>取得</b>ボタンを押してください。</p>
 
-    <p>検索を始めるには、問い合わせる単語を入力し、<b>Enter</b>鍵を押すか<b>取得</b>ボタンを押してください。</p>
+    <p>検索はゲストモードで為されますので、最大100個の結果が返されます。</p>
 
-    <p>検索はゲストモードで為されますので、最大で100個の結果が返されます。</p>
-
-    <p><b>概要を取り込む</b>というチェックボックスを有効にすれば、各項目の文献情報に加えて要約もダウンロードすることを選ぶことができます。これはネットワークへの問い合わせを増やすことは<b>ありません</b>。</p>
+    <p>好みによって、<b>概要を取り込む</b>というチェックボックスを有効にすれば、各項目の文献情報に加えて要約もダウンロードすることを選ぶことができます。これはネットワークへの問い合わせを増やすことは<b>ありません</b>。</p>
 
     <p>BibTeX引用をIEEEXploreから直接ダウンロードするオプションは、まだ動作しません。</p>
 
-    <p>何かご提案がありましたら、Aaron Chen <b>nextAaron at gmail.com</b>にメールを送ってください。</p>
+    <p>何かご提案がありましたら、Oscar Gustafsson (<b>ogib73 at gmail.com</b>)かAaron Chen (<b>nextAaron at gmail.com</b>)までメールをお送りください。</p>
 </body>
 </html>
diff --git a/src/help/ja/ISBNtoBibTeXHelp.html b/src/help/ja/ISBNtoBibTeXHelp.html
new file mode 100644
index 0000000..d775ee3
--- /dev/null
+++ b/src/help/ja/ISBNtoBibTeXHelp.html
@@ -0,0 +1,17 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<link rel="stylesheet" type="text/css" href="jabref_help.css"/>
+</head>
+
+<body>
+    <h1>ISBN番号を使用して項目を取得する</h1>
+
+    <p>この機能を使うには、<b>検索→ウェブ検索</b>を選択すれば、操作盤が側面に表示されますので、そのドロップダウンメニューから<b>ISBN to BibTeX</b>を選択してください。</p>
+
+     <p>この取得子は、ISBNからBibTeX項目に変換するのに、<a href="http://manas.tungare.name/software/isbn-to-bibtex/">Manas TungareのISBN to BibTeX Converter</a>を使用しています。</p>
+
+    <p>検索フィールドにISBN番号を入力し、<b>Enter</b>鍵を押すか<b>取得</b>ボタンを押してください。項目が取得されて、現在アクティブになっているデータベースに追加されます。エラーが発生した場合には、その旨ポップアップで表示されます。</p>
+
+</body>
+</html>
diff --git a/src/help/ja/ImportInspectionDialog.html b/src/help/ja/ImportInspectionDialog.html
index 44fe93e..c55cdcc 100644
--- a/src/help/ja/ImportInspectionDialog.html
+++ b/src/help/ja/ImportInspectionDialog.html
@@ -1,24 +1,15 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <link rel="stylesheet" type="text/css" href="jabref_help.css"/>
 </head>
 
 <body>
 
-    <h1>Import inspection window</h1>
+    <h1>読込検査ウィンドウ</h1>
 
-    <p>When you import new entries
-    from a supported reference format, or fetch entries directly
-    from the Internet, they are first shown in this window for
-    inspection. At this point none of the entries have been added
-    to the database you already have open (if any).</p>
+    <p>サポートされている文献形式から項目を読み込んだり、インターネットから直接項目を取得したりすると、それらは検査のために、まずこのウィンドウに表示されます。この時点では、既に開かれているデータベースがあったとしても、まだどの項目も追加されていません。</p>
 
-    <p>The inspection window allows you to discard entries you
-    don't want to keep, and to perform some simple operations like
-    generating BibTeX keys for the entries, or adding them to
-    <a href="GroupsHelp.html">groups</a>. If you are importing into
-    an existing database, it is often easier to perform these
-    operations before they are mixed in between the entries of the
-    existing database.</p>
+    <p>検査ウィンドウでは、必要のない項目を捨てることができる他、各項目のBibTeX鍵を生成したり、<a href="GroupsHelp.html">グループ</a>に追加したりと云った簡単な操作を行うことができます。既存データベースへの読み込みを行う場合、各項目が既存データベースの項目の中に紛れてしまう前に、これらの操作を行っておいた方が楽なことが良くあります。</p>
 </body>
 </html>
diff --git a/src/help/ja/JSTOR.html b/src/help/ja/JSTOR.html
index 0e38aef..7451e85 100644
--- a/src/help/ja/JSTOR.html
+++ b/src/help/ja/JSTOR.html
@@ -8,7 +8,7 @@
 
   <h1>JStor 検索</h1>
 
-    <p>JStor検索は、JStorウェブページから情報を抽出するにあたって、BibSonomy scraperプロジェクト (http://scraper.bibsonomy.org/) に依存しています。</p>
+    <p>この機能を使うには、<b>検索→ウェブ検索</b>を選択すると、検索操作盤が側面に現れます。ドロップダウンメニューから<b>JStor</b>を選択してください。JStor検索は、JStorウェブページから情報を抽出するにあたって、BibSonomy scraperプロジェクト (http://scraper.bibsonomy.org/) に依存しています。</p>
 
     <p>以下のヘルプは、JStorウェブサイトから転載したものであり、JStorが変更すれば変更される可能性があります。</p>
    <ul>
@@ -32,7 +32,7 @@
       <li>music</li>
     </ul>
 
-    <p>検索は、最大で200個の結果を返します。</p>
+    <p>検出された項目数が報告され、そのうちいくつダウンロードするか尋ねられます。検索は、負荷を制限するため、最大で200個の結果(一致25個を8頁分)を返します。</p>
 
 </body>
 </html>
\ No newline at end of file
diff --git a/src/help/ja/JabRefHelp.html b/src/help/ja/JabRefHelp.html
index 0405bf1..f681d28 100644
--- a/src/help/ja/JabRefHelp.html
+++ b/src/help/ja/JabRefHelp.html
@@ -7,11 +7,11 @@
 <body>
     <h1>JabRef</h1>
 
-    <p><strong>《註》</strong><em>bibtex</em>プログラムは、各ヘルプファイル中で繰り返し言及されています。<em>Bibtex</em>は、Oren Patashniによって作られた、LaTeX文書中の書誌参照を生成するためのユーティリティです。同じデータベース形式が、Adobe FrameMaker中の書誌情報生成ユーティリティであるCiteMakerでも使用されています。</p>
+    <p><strong>《註》</strong><em>BibTeX</em>プログラムは、各ヘルプファイル中で繰り返し言及されています。<em>BibTeX</em>は、Oren Patashniによって作られた、LaTeX文書中の書誌参照を生成するためのユーティリティです。同じデータベース形式が、Adobe FrameMaker中の書誌情報生成ユーティリティであるCiteMakerでも使用されています。</p>
 
-    <p>JabRefは、<em>bibtex</em>データベースを操作するためのプログラムです。本プログラムは、内部ファイル形式は使用しておらず、通常はデータベースを直接<em>bibtex</em> .bib形式で読み込んだり保存したりします。一方で、様々な形式の書誌データベースをJabRefに読み込むこともできます。</p>
+    <p>JabRefは、<em>BibTeX</em>データベースを操作するためのプログラムです。本プログラムは、内部ファイル形式は使用しておらず、通常はデータベースを直接<em>BibTeX</em>の.bib形式で読み込んだり保存したりします。一方で、様々な形式の書誌データベースをJabRefに読み込むこともできます。</p>
 
-    <p>JabRefは、使用しているデータベース内容の全体像を得られるように、整序機能や検索機能を備えています。また、どの情報が必須だったか暗記しておくことなく、簡単に新しいデータベース項目を追加することができますし、<em>bibtex</em>キーを自動生成させることもできます。JabRefは、<em>bibtex</em>やCiteMakerを利用している方々に最適ですが、その他の参照システムを使用している方や、単に文献ソースを整理したいという方にも便利です。</p>
+    <p>JabRefは、使用しているデータベース内容の全体像を得られるように、整序機能や検索機能を備えています。また、どの情報が必須だったか暗記しておくことなく、簡単に新しいデータベース項目を追加することができますし、<em>BibTeX</em>キーを自動生成させることもできます。JabRefは、<em>BibTeX</em>やCiteMakerを利用している方々に最適ですが、その他の参照システムを使用している方や、単に文献ソースを整理したいという方にも便利です。</p>
 
     <p><a href="BaseFrameHelp.html">JabRef 基本ウィンドウ</a></p>
 </body>
diff --git a/src/help/ja/JournalAbbreviations.html b/src/help/ja/JournalAbbreviations.html
index a37cd34..ae67807 100644
--- a/src/help/ja/JournalAbbreviations.html
+++ b/src/help/ja/JournalAbbreviations.html
@@ -29,9 +29,9 @@
 
     <p>誌名表は、JabRefからリンクした外部テキストファイルの形で、複数持つことができます。そのうち優先表は、JabRef内から編集することができます。</p>
 
-    <h3>個人用の誌名短縮表</h3>
+    <h3>誌名短縮表の自作</h3>
 
-    <p>個人用の誌名表は、<b>誌名短縮形の管理</b>ウィンドウの上部で取り扱うことができます。個人用誌名表を作成するには、<b>新規ファイル</b>を選択して、手動でファイル名を入力するか<b>一覧</b>ボタンを使用してください。手始めとなるファイルが既にある場合には、<b>既存ファイル</b>を選択して、<b>一覧</b>ボタンからファイルを選択してください。画面の表が更新されて、選択した表の内容が表示されます。</p>
+    <p>自作の誌名表は、<b>誌名短縮形の管理</b>ウィンドウの上部で取り扱うことができます。自作誌名表を作成するには、<b>新規ファイル</b>を選択して、手動でファイル名を入力するか<b>一覧</b>ボタンを使用してください。手始めとなるファイルが既にある場合には、<b>既存ファイル</b>を選択して、<b>一覧</b>ボタンからファイルを選択してください。画面の表が更新されて、選択した表の内容が表示されます。</p>
 
     <p>この表と右側のツールボタンを用いて、学術誌項目を追加したり削除したり編集したりすることができます。それぞれの項目については、学術誌の完全な名称とISO式短縮形を指定しなくてはなりません(例えば"Aquacultural Engineering"と"Aquacult. Eng.")。項目を編集するには、表中の行をダブルクリックしてください。</p>
 
@@ -39,7 +39,7 @@
 
     <h3>外部誌名表</h3>
 
-    <p>個人用誌名表の他に、複数の外部の誌名表にリンクすることができます。これらのリンクは、<b>誌名短縮形の管理</b>ウィンドウの下部で設定することができます。外部誌名表は、個人用誌名表と類似しています。唯一の違いは、JabRefには、外部誌名表を編集するインタフェースが備わっていないことです。</p>
+    <p>自作誌名表の他に、複数の外部の誌名表にリンクすることができます。これらのリンクは、<b>誌名短縮形の管理</b>ウィンドウの下部で設定することができます。外部誌名表は、自作誌名表と類似しています。唯一の違いは、JabRefには、外部誌名表を編集するインタフェースが備わっていないことです。</p>
 
     <p>必要に応じて外部誌名表を新たに追加するには、<b>+</b>ボタンをクリックして、インタフェースにファイル行を追加してください。その上で、ウィンドウ下部のファイル行横にある<b>一覧</b>か<b>ダウンロード</b>ボタンを使用してください。</p>
 
@@ -47,6 +47,6 @@
         <li><b>一覧</b>ボタンを使うと、コンピューター上の既存のファイルを選択することができます。</li>
 
         <li><b>ダウンロード</b>ボタンを使うと、URLを入力してインターネットから誌名表をダウンロードし、コンピューター上のローカルファイルとして保存して、JabRefから誌名表としてリンクすることができます。URLは、既定でJabRefのウェブページにある誌名表のアドレスになっています。この誌名表は完全ではありませんが、将来的に改善されていくでしょう。</li>
-    </ul>個人用誌名表にある項目は、外部誌名表のいずれかに存在する、同じ完全名の項目に優先します。同様に、外部誌名表間の優先順位は、ウィンドウに挙げられている順で優先されます。
+    </ul>自作誌名表にある項目は、外部誌名表のいずれかに存在する、同じ完全名の項目に優先します。同様に、外部誌名表間の優先順位は、ウィンドウに挙げられている順で優先されます。
 </body>
 </html>
diff --git a/src/help/ja/LabelPatterns.html b/src/help/ja/LabelPatterns.html
index 0586222..555be8a 100644
--- a/src/help/ja/LabelPatterns.html
+++ b/src/help/ja/LabelPatterns.html
@@ -6,13 +6,13 @@
 
 <body>
 
-    <h1>BibTeXキー生成機構の個人用設定</h1>
+    <h1>BibTeX<ruby><rb>鍵</rb><rp>(</rp><rt>キー</rt><rp>)</rp></ruby>生成機構の自作</h1>
 
-    <p>JabRef設定の「BibTeXキーの生成」タブでは、BibTeXラベルの自動生成に使用されるフィールドを設定することができます。パターンは、標準的な項目型それぞれに対して設定することができます。</p>
+    <p>JabRef設定の「BibTeX鍵の生成」タブでは、BibTeXラベルの自動生成に使用されるフィールドを設定することができます。パターンは、標準的な項目型それぞれに対して設定することができます。</p>
 
-    <h2>キーパターン</h2>
+    <h2><ruby><rb>鍵</rb><rp>(</rp><rt>キー</rt><rp>)</rp></ruby>パターン</h2>
 
-    <p>パターンには、特定の項目フィールドをキー内のその場所に入れることを示すフィールドマーカーの他、好きな文字列を含めることができます。フィールドマーカーは、<b>[volume]</b>のように、通常、フィールド名を角括弧で囲ったものです。キーを生成するときに、項目内でフィールドが定義されていなければ、フィールドマーカーには何も挿入されません。</p>
+    <p>パターンには、特定の項目フィールドを<ruby><rb>鍵</rb><rp>(</rp><rt>キー</rt><rp>)</rp></ruby>内のその場所に入れることを示すフィールドマーカーの他、好きな文字列を含めることができます。フィールドマーカーは、<b>[volume]</b>のように、通常、フィールド名を角括弧で囲ったものです。鍵を生成するときに、項目内でフィールドが定義されていなければ、フィールドマーカーには何も挿入されません。</p>
 
     <p>フィールド中の特定部分を抜き出す特殊フィールドマーカーがいくつか用意されています。これらを下記に列挙します。追加したい特殊フィールドマーカーがありましたら、ぜひお知らせください。</p>
 
@@ -92,9 +92,9 @@
         </li>
     </ul>
 
-    <p>ある項目型に対してキーパターンを定義していない場合には、<b>既定キーパターン</b>が使われます。既定パターンは変更することができ、<b>設定</b>ダイアログの<b>キーパターン</b>セクションの項目型一覧の上で設定します。</p>
+    <p>ある項目型に対して鍵パターンを定義していない場合には、<b>既定鍵パターン</b>が使われます。既定パターンは変更することができ、<b>設定</b>ダイアログの<b>鍵パターン</b>セクションの項目型一覧の上で設定します。</p>
 
-    <p>既定キーパターンは[auth][year]となっており、これは<code>Yared1998</code>のようなキーを生成します。現在のデータベース中でキーが一意でない場合には、キーが一意になるようにa-zのうち1文字を付け加えます。したがって、ラベルは以下のような形になります。</p>
+    <p>既定鍵パターンは[auth][year]となっており、これは<code>Yared1998</code>のような鍵を生成します。現在のデータベース中で鍵が一意でない場合には、鍵が一意になるようにa-zのうち1文字を付け加えます。したがって、ラベルは以下のような形になります。</p>
 
     <p style="margin-left: 28pt">
         <code>Yared1998</code><br />
@@ -104,7 +104,7 @@
 
     <h2>正規表現での置換</h2>
 
-    <p>キーパターンを適用してキーを生成した後、キー生成機構に特定の正規表現を検索させ、それを文字列で置換することができます。正規表現文字列と置換文字列は、キーパターン一覧の下にあるテキストフィールドに入力します。置換文字列が空の場合、正規表現に一致した文字列は、生成されたキーから削除されます。例えば、置換対象に<code>\p{Punct}</code>あるいは<code>[:/%]</code>を入れ、置換文字列を空にした場合、キーから不必要な文字を取り除くことができます。これは、BibTeXキーにしたがってPDFの名前を付ける時便利です。</p>
+    <p>鍵パターンを適用して鍵を生成した後、鍵生成機構に特定の正規表現を検索させ、それを文字列で置換することができます。正規表現文字列と置換文字列は、鍵パターン一覧の下にあるテキストフィールドに入力します。置換文字列が空の場合、正規表現に一致した文字列は、生成された鍵から削除されます。例えば、置換対象に<code>\p{Punct}</code>あるいは<code>[:/%]</code>を入れ、置換文字列を空にした場合、鍵から不必要な文字を取り除くことができます。これは、BibTeX鍵にしたがってPDFの名前を付ける時便利です。</p>
 
 </body>
 </html>
diff --git a/src/help/ja/MarkingHelp.html b/src/help/ja/MarkingHelp.html
index 282bba6..dfffcea 100644
--- a/src/help/ja/MarkingHelp.html
+++ b/src/help/ja/MarkingHelp.html
@@ -7,7 +7,7 @@
 <body>
     <h1>項目の標識付け</h1>
 
-    <p>項目には,<ruby><rb><strong>標識</strong></rb><rp>(</rp><rt>マーク</rt><rp>)</rp></ruby>を付けることができます。選択項目を標識付けする<ruby><rb>短絡鍵</rb><rp>(</rp><rt>ショートカット</rt><rp>)</rp></ruby>はCTRL-M,外す短絡鍵はCTRL-SHIFT-Mです。これらはメニューからもアクセスすることができます。</p>
+    <p>項目には,<ruby><rb><strong>標識</strong></rb><rp>(</rp><rt>マーク</rt><rp>)</rp></ruby>を付けることができます。選択項目を標識付けする<ruby><rb>捷径鍵</rb><rp>(</rp><rt>ショートカット</rt><rp>)</rp></ruby>はCTRL-M,外す捷径鍵はCTRL-SHIFT-Mです。これらはメニューからもアクセスすることができます。</p>
 
     <p>標識付けは項目の選択とは違います。標識を付けた項目は,他の項目と2つの点で異なる働きをします。まず,項目表中でこれらの項目は,常に異なる背景色で表示されます。第二に,グループ順に整序されていたり,検索結果を上部に表示する設定をしていない限り,これらは項目一覧の最上位に表示されます。</p>
 
diff --git a/src/help/ja/MedlineHelp.html b/src/help/ja/MedlineHelp.html
index 6f49a1a..5c42dbf 100644
--- a/src/help/ja/MedlineHelp.html
+++ b/src/help/ja/MedlineHelp.html
@@ -1,48 +1,47 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <link rel="stylesheet" type="text/css" href="jabref_help.css"/>
 </head>
 
 <body>
-    <h1>Fetching Medline entries</h1>
+    <h1>Medlineから項目を取得する</h1>
 
-    <p>MEDLINE is the U.S. National Library of Medicine's premier
-    bibliographic database. It contains references to journal
-    articles in life sciences with a concentration on biomedicine.</p>
+    <p>この機能を使うには、<b>検索→ウェブ検索</b>を選択すると、検索操作盤が側面に表示されます。ドロップダウンメニューから<b>Medline</b>を選択してください。</p>
 
-    <p>JabRef can download citations from the Medline database. To
-    use this feature, choose <b>Web search -> Fetch Medline</b>,
-    and the Medline interface will appear in the side pane.</p>
+    <p>MEDLINEは、米国国立医学図書館の第一級の書誌情報データベースです。生態臨床医学を重点に生命科学分野の学術論文の書誌情報を収録しています。</p>
 
-    <p>There are two ways of specifying which entries to
-    download:</p>
+    <p>ダウンロードする項目を指定するには、以下の二つの方法があります。</p>
 
     <ol>
-        <li>Enter one or more Medline IDs (separated by
-        comma/semicolon) in the text field.</li>
+        <li>テキストフィールドに一つもしくはそれ以上のMedline IDを(コンマもしくはセミコロンで区切って)入力します。</li>
 
-        <li>Enter a set of names and/or words to search for. You
-        can use the operators <em>and</em> and <em>or</em> and
-        parentheses to refine your search expression.</li>
-    </ol>In both cases, press <b>Enter</b> or the <b>Fetch</b>
-    button. If you use a text search, you will be prompted with the
-    number of entries found, and given a choice of how many to
-    download.
+        <li>検索する名前や単語の組を入力します。検索表現を絞り込むのに、<em>and</em>演算子や<em>or</em>演算子および括弧を使用することもできます。詳しい説明は、<a href="http://www.ovid.com/site/products/ovidguide/medline.htm">Medline/OVID operators</a>をご覧ください。</li>
 
-    <p>The entries fetched will be added to your currently active
-    database.</p>
+       <li>例:
+       <ol>
+         <li>May [au] AND Anderson [au]</li>
+         <li> Anderson RM [au] HIV [ti] </li>
+         <li> Valleron [au] 1988:2000[dp] HIV [ti]</li>
+         <li> Valleron [au] AND 1987:2000[dp] AND (AIDS [ti] OR HIV[ti])</li>
+         <li> Anderson [au] AND Nature [ta]</li>
+         <li>Population [ta] </li>
+       </ol>
+       </li>
+    </ol>
 
-    <h2>Using a Proxy Server</h2>
+    <p>どちらの場合も、<b>Enter</b>鍵か<b>取得</b>ボタンを押してください。テキスト検索を行うと、検出された項目数が表示され、いくつダウンロードするかを尋ねられます。</p>
 
-    <p>If you need to use an http proxy
-    server, pass the server name and port number to java at
-    runtime.</p>
+    <p>取得された項目は、現在アクティブなデータベースに追加されます。</p>
 
-    <p><code>java -Dhttp.proxyHost="hostname"
-    -Dhttp.proxyPort="portnumber"</code></p>
+    <h2>プロキシサーバーを利用する</h2>
 
-    <p>These environment settings are documented in the 
-    <a href="http://docs.oracle.com/javase/1.4.2/docs/guide/net/properties.html">Sun J2SE documentation</a>.</p>
+    <p>httpプロキシサーバーを使用する必要がある場合は、以下のようにサーバー名とポート番号をjava実行時に渡します。</p>
+
+    <p><code>java -Dhttp.proxyHost="ホスト名"
+    -Dhttp.proxyPort="ポート番号"</code></p>
+
+    <p>これらの環境設定は、<a href="http://docs.oracle.com/javase/1.4.2/docs/guide/net/properties.html">Oracle J2SE documentation</a>に文書化されています。</p>
 
 </body>
 </html>
diff --git a/src/help/ja/OpenOfficeHelp.html b/src/help/ja/OpenOfficeHelp.html
deleted file mode 100644
index f84cbf1..0000000
--- a/src/help/ja/OpenOfficeHelp.html
+++ /dev/null
@@ -1,73 +0,0 @@
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<link rel="stylesheet" type="text/css" href="jabref_help.css"/>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-</head>
-
-<body>
-
-    <h1>OpenOffice.org で JabRef 書誌情報を利用するには</h1>
-
-    <p>JabRef は、データベースを OpenOffice.org 1.1 の <b>.sxc</b> 表計算ドキュメント形式と、 OpenOffice.org 2.0 で用いられる OpenDocument <b>.ods</b> 表計算ドキュメント形式の両方に書き出すことができます。</p>
-
-    <p>どちらの場合も、書き出した表計算ドキュメントには、各項目を行とし、各フィールドを列とした1つのデータシートだけが含まれます。列順と列名は、OpenOffice.org の書誌情報関数と互換性があるように設定されます (<b>.sxc</b> 形式の場合は OOo 1.1、<b>.ods</b> 形式の場合は OOo 2.0)。</p>
-
-    以下は、OpenOffice.org のバージョン毎の、JabRef 書誌情報データベースの利用法です。
-
-    <h2>書き出したファイルを OpenOffice.org 2.3 および 2.4 の書誌情報データベースとして利用するには</h2>
-
-    <p>JabRef から書き出したスプレッドシートを OpenOffice.org の書誌情報データベースとして設定するには、以下のステップを踏んでください。</p>
-
-    <ul>
-    <li>JabRef からデータベースを <b>.ods</b> 形式で書き出します。</li>
-    <li>OpenOffice.org Writer を起動します。</li>
-
-    <li><b>編集→データベースを交換</b>を選ぶ。<b>選択</b>をクリックし、.ods 形式に書き出されたデータベースを選択します。</li>
-    <li>読み込んだデータベース名の前にある <b>+</b> を展開して、表示されたファイル名をクリックし、最後に<b>指定</b>ボタンを押します。</li>
-    <li><b>ツール→オプション→OpenOffice.org Base→データベース</b>を選択します。このウィンドウには、いま読み込んだデータベースが表示されているはずです。また、既定のOOo書誌情報データベース (<i>Bibliography</i>) も表示されているはずです。</li>
-    <li>Bibliography データベースを編集し、その名前を <i>Bibliography-old</i> などに変えてください (OpenOffice.org Writer では複数の書誌情報データベースを選択することができません)。</li>
-    <li>使用する書誌情報データベースを選択し、その名前を <i>Bibliography</i> に変えてください (名前の最初の文字が大文字になっていることに特に注意してください)。</li>
-    </ul>
-
-    これらのステップを踏むと、あなたの書誌情報データベースが OpenOffice.org で利用できるようになっているはずです。これを確認するには、<b>挿入→目次と索引→参考文献項目...</b>を選択してください。すると、BibTeX 鍵のリストが表示されるはずです。
-
-
-    <h2>書き出したファイルを OpenOffice.org 2.0/2.1/2.2 の書誌情報データベースとして利用するには</h2>
-
-    <p>JabRef から書き出したスプレッドシートを OpenOffice.org の書誌情報データベースとして設定するには、以下のステップを踏んでください。</p>
-
-    <ul>
-        <li>データベースを <b>.ods</b> 形式で書き出します。</li>
-
-        <li>OpenOffice.org を起動します。</li>
-
-        <li><b>ツール→オプション→OpenOffice.org Base→データベース</b>を選択します。</li>
-
-        <li><i>Bibliography</i> データベースを編集し、その名前を <i>Bibliography-old</i> などに変えてください (OpenOffice.org Writer では複数の書誌情報データベースを選択することができません)。</li>
-
-        <li><b>オプション</b>ウィンドウを閉じて、<b>ファイル→新規作成→データベース</b>を選びます。</li>
-
-        <li><b>既存のデータベースに接続</b>を選び、データベース型として<b>表計算ドキュメント</b>を選択して、書き出した <b>.ods</b> ファイルを選びます。</li>
-
-        <li><b>完了</b>をクリックして、選択を促されたら <i>Bibliography</i> を選んでください。</li>
-    </ul>これらのステップを終えた後に<b>ツール→参考文献データベース</b>を選んでください。すると、あなたのデータベースwが表示されているはずです。
-
-    <h2>書き出したファイルを OpenOffice.org 1.1.x の書誌情報データベースとして利用するには</h2>
-
-    <ul>
-        <li>データベースを <b>.sxc</b> 形式で書き出します。</li>
-
-        <li>OpenOffice.org を起動する</li>
-
-        <li><b>ツール→データソース</b>を選択します。</li>
-
-        <li><i>Bibliography</i> データベースを編集し、その名前を <i>Bibliography-old</i> などに変え、<b>適用</b>をクリックしてください。</li>
-
-	<li><b>新規データソース</b>をクリックすると、新しい項目が表示されるので、その名前を <i>Bibliography</i> に変更してください。</li>
-
-        <li><b>データベース型</b>を<b>表計算ドキュメント</b>に変更し、<b>データソースURL</b>行にある<b>...</b>ボタンをクリックしてください。そして書き出した <b>.sxc</b> ファイルを選択してください。</li>
-
-        <li><b>OK</b> をクリックして<b>データソース</b>ウィンドウを閉じてください。</li>
-    </ul>これらのステップを終えた後に<b>ツール→参考文献データベース</b>を選んでください。すると、あなたのデータベースが表示されているはずです。
-</body>
-</html> 
diff --git a/src/help/ja/OpenOfficeIntegration.html b/src/help/ja/OpenOfficeIntegration.html
new file mode 100644
index 0000000..2477882
--- /dev/null
+++ b/src/help/ja/OpenOfficeIntegration.html
@@ -0,0 +1,370 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<link rel="stylesheet" type="text/css" href="jabref_help.css"/>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+</head>
+
+<body>
+
+<h1>OpenOffice.org / LibreOffice の統合</h1>
+
+<h2>はじめに</h2>
+
+<p>この機能は、JabRefからOpenOfficeもしくはLibreOfficeのWriter文書に引用を挿入したり、書誌情報を整形したりするための橋渡しを提供します。</p>
+
+<p>本ヘルプ文書内で<i>OpenOffice</i>という語が使用されているところでは、常に、これを<i>LibreOffice</i>に置き換えて結構です。</p>
+
+<h2>OpenOffice/LibreOffice操作盤の使用法</h2>
+
+<p>OpenOfficeと通信するために、JabRefは、まず起動済みのOpenOfficeインスタンスに接続する必要があります。JabRefから接続する前に、OpenOfficeを起動し、文書を開いてください。JabRefは、OpenOffice実行ファイル(Windowsでは<b>soffice.exe</b>、他のプラットフォームでは<b>soffice</b>)の位置と、OpenOfficeのjarファイルがあるディレクトリを知っておく必要があります。<b>接続</b>ボタンを押して接続すると、JabRefは、自動的にこれらの位置を特定しようと試みます。これがうまく動作しない場合には、<b>手動接続</b>ボタンを使用しなくてはなりません。この場合、必要な場所を入力するウィンドウが開きます。</p>
+
+<p>接続が確立されたあと、JabRefで一つ以上の項目を選択して、JabRefツールバーのドロップダウンメニューから<b>OpenOfficeへ送出</b>ボタンか、サイドペーンのOpenOfficeパネルで適切なボタンを押すことで、引用を挿入することができます。これによって、OpenOffice文書のカーソル現在位置に選択した項目が挿入され、参照文献すべてを含む書誌情報が更新されます。</p>
+
+<p><b>《註》</b>JabRefは、OpenOfficeの組込書誌情報システムは、制約があるために使用しません。JabRefから挿入された引用を含む文書は、一般的に、BibusやZeteroなど他の書誌情報マネージャとは互換性がありません。</p>
+
+<p>引用には、括弧に囲まれた引用「(Author 2007)」と文中での引用「Author (2007)」の二つの型を用いることができます。この区別は、連番引用ではなく、著者-年型の引用が行われる時のみ意味がありますが、この区別はスタイルを変更した時にも維持されます。</p>
+
+<p>OpenOfficeに引用を挿入したあとにJabRefで項目を変更した場合、書誌情報を同期させる必要があります。<b>OO書誌情報を同期</b>ボタンを押すと、それらのBibTeX鍵が変更されていない限り(元のJabRef項目がどのBibTeX鍵を保持しているかを追跡するため、JabRefはBibTeX鍵を参照名の中にエンコードします)、書誌情報がすべて更新されます。</p>
+
+<h2>様式ファイル</h2>
+
+<p>引用様式を調整するためには、様式ファイルを選択するか、既定様式のいずれかを用いる必要があります。様式は、引用の書式と書誌情報の書式を定めるものです。標準JabRef書出フォーマッタを使用することによって、項目フィールドはOpenOfficeへの送出前に処理することができます。様式ファイルを用いることによって、引用様式にできる限りの柔軟性を持たせることが意図されています。様式ファイルはいつでも変更することができ、新規様式を反映するために、<b>更新</b>ボタンを押して、書誌情報を更新することができます。</p>
+
+<p><b>様式の選択</b>ボタンを押すことによって、既定様式か外部様式ファイルを選択するウィンドウを開くことができます。既定様式に基づいて新しい様式を作成したい場合には、<b>表示</b>ボタンを押して既定様式の内容を表示させ、テキストエディタにコピーして修正することができます。</p>
+
+<p>外部様式ファイルを選択するには、二つの方法があります。直接様式ファイルを選択するか、様式ファイルディレクトリを設定するかです。後者の方法では、そのディレクトリ(とサブディレクトリ)の様式一覧を見て、その中から一つを選ぶことになります。</p>
+
+<p>下記は様式ファイルの例です。</p>
+<pre>
+NAME
+Example style file for JabRef-OpenOffice integration.
+
+JOURNALS
+Journal name 1
+Journal name 2
+
+PROPERTIES
+Title="References"
+IsSortByPosition="false"
+IsNumberEntries="false"
+ReferenceParagraphFormat="Default"
+ReferenceHeaderParagraphFormat="Heading 1"
+
+CITATION
+AuthorField="author/editor"
+YearField="year"
+MaxAuthors="3"
+MaxAuthorsFirst="3"
+AuthorSeparator=", "
+AuthorLastSeparator=" & "
+EtAlString=" et al."
+ItalicEtAl="true"
+YearSeparator=" "
+InTextYearSeparator=" "
+BracketBefore="["
+BracketAfter="]"
+BracketBeforeInList="["
+BracketAfterInList="]"
+CitationSeparator="; "
+UniquefierSeparator=","
+GroupedNumbersSeparator="-"
+MinimumGroupingCount="3"
+FormatCitations="false"
+CitationCharacterFormat="Default"
+MultiCiteChronological="false"
+PageInfoSeparator="; "
+
+LAYOUT
+article=\format[AuthorLastFirst,AuthorAbbreviator,AuthorAndsReplacer]{\author}
+(<b>\year\uniq</b>). <i>\title</i>, \journal \volume\begin{pages} :
+\format[FormatPagesForHTML]{\pages}\end{pages}.
+
+book=\format[AuthorLastFirst,AuthorAbbreviator,AuthorAndsReplacer]{\author}\begin{editor}
+\format[AuthorLastFirst,AuthorAbbreviator,AuthorAndsReplacer]{\editor} (Ed.)\end{editor},
+<b>\year\uniq</b>. <i>\title</i>. \publisher, \address.
+
+incollection=\format[AuthorLastFirst,AuthorAbbreviator,AuthorAndsReplacer]{\author}
+(<b>\year\uniq</b>). <i>\title</i>. In: \format[AuthorLastFirst,
+AuthorAbbreviator,AuthorAndsReplacer]{\editor} (Ed.), <i>\booktitle</i>, \publisher.
+
+inbook=\format[AuthorLastFirst,AuthorAbbreviator,AuthorAndsReplacer]{\author}
+(<b>\year\uniq</b>). <i>\chapter</i>. In: \format[AuthorLastFirst,
+AuthorAbbreviator,AuthorAndsReplacer]{\editor} (Ed.), <i>\title</i>, \publisher.
+
+phdthesis=\format[AuthorLastFirst,AuthorAbbreviator,AuthorAndsReplacer]{\author}
+(<b>\year\uniq</b>). <i>\title</i>, \school.
+
+default=\format[AuthorLastFirst,AuthorAbbreviator,AuthorAndsReplacer]{\author}
+(<b>\year\uniq</b>). <i>\title</i>, \journal \volume\begin{pages} :
+\format[FormatPagesForHTML]{\pages}\end{pages}.
+
+</pre>
+
+<p>(各項目型のレイアウトは、スタイルファイル内で一行に収めなくてはなりません。上記では、読みやすさのために、わざと改行が入れてあります。)</p>
+
+<h3>大域特性</h3>
+
+<p><b>PROPERTIES</b>セクションには、書誌情報の大域的な特性を記述します。下表に使用できる特性を挙げます。</p>
+
+<table border="1" rules="none" summary="Available Properties">
+    <tr>
+        <td><b>特性</b></td>
+        <td><b>型</b></td>
+        <td><b>既定値</b></td>
+        <td><b>摘要</b></td>
+    </tr>
+    <tr>
+        <td>IsNumberEntries</td>
+        <td>ブール値</td>
+        <td><code>false</code></td>
+        <td>使用する引用の型を指定。<code>true</code>ならば連番引用が用いられ、<code>false</code>ならば著者-年型引用が用いられます。
+        </td>
+    </tr>
+    <tr>
+        <td>IsSortByPosition</td>
+        <td>ブール値</td>
+        <td><code>false</code></td>
+        <td>書誌情報の整序のしかたを指定。<code>true</code>ならば、項目は引用された順に整序され、<code>false</code>ならば、項目は著者のアルファベット順に整序されます。
+        </td>
+    </tr>
+    <tr>
+        <td>ReferenceParagraphFormat</td>
+        <td>文字列</td>
+        <td><code>Default</code></td>
+        <td>書誌情報一覧に用いる段落書式名を与えます。この書式はOpenOffice文書で定義されている必要があります。
+        </td>
+    </tr>
+    <tr>
+        <td>ReferenceHeaderParagraphFormat</td>
+        <td>文字列</td>
+        <td><code>Heading 1</code></td>
+        <td>書誌情報一覧の見出しに用いる段落書式名を与えます。この書式はOpenOffice文書で定義されている必要があります。
+        </td>
+    </tr>
+    <tr>
+        <td>Title</td>
+        <td>文字列</td>
+        <td><code>Bibliography</code></td>
+        <td>書誌情報一覧の見出しに入れる文字列</td>
+    </tr>
+</table>
+
+<h3>引用特性</h3>
+
+<p><b>CITATION</b>セクションには、本文中に挿入する引用マーカーの書式を記述します。</p>
+
+<p>下表は、使用できる引用特性すべての簡単な説明です。様式ファイルで特性を指定しない場合、既定値が用いられます。</p>
+
+<table border="1" rules="none" summary="Brief Description">
+    <tr>
+        <td><b>特性</b></td>
+        <td><b>型</b></td>
+        <td><b>既定値</b></td>
+        <td><b>摘要</b></td>
+    </tr>
+    <tr>
+        <td>AuthorField</td>
+        <td>文字列</td>
+        <td><code>author/editor</code></td>
+        <td>著者名の入っているBibTeXフィールド。<code>author/editor</code>のように帰着フィールドを指定することができます。</td>
+    </tr>
+    <tr>
+        <td>AuthorLastSeparator</td>
+        <td>文字列</td>
+        <td><code> & </code></td>
+        <td>最後の二つの著者名の間に入れる文字列</td>
+    </tr>
+    <tr>
+        <td>AuthorLastSeparatorInText</td>
+        <td>文字列</td>
+        <td> </td>
+        <td>指定すると、<code>Smith & Jones (2001)</code>のような本文中での引用時に、この特性で<code>AuthorLastSeparator</code>を上書きします。
+        </td>
+    </tr>
+    <tr>
+        <td>AuthorSeparator</td>
+        <td>文字列</td>
+        <td><code>, </code></td>
+        <td>最後の二つ以外の著者名の間に挿入する文字列</td>
+    </tr>
+    <tr>
+        <td>BracketAfter</td>
+        <td>文字列</td>
+        <td><code>]</code></td>
+        <td>引用の閉じ括弧</td>
+    </tr>
+    <tr>
+        <td>BracketAfterInList</td>
+        <td>文字列</td>
+        <td>]</td>
+        <td>書誌情報一覧中の引用番号の閉じ括弧</td>
+    </tr>
+    <tr>
+        <td>BracketBefore</td>
+        <td>文字列</td>
+        <td><code>[</code></td>
+        <td>引用の開き括弧</td>
+    </tr>
+    <tr>
+        <td>BracketBeforeInList</td>
+        <td>文字列</td>
+        <td>[</td>
+        <td>書誌情報一覧中の引用番号の開き括弧</td>
+    </tr>
+    <tr>
+        <td>CitationCharacterFormat</td>
+        <td>文字列</td>
+        <td><code>Default</code></td>
+        <td><code>FormatCitations</code>が<code>true</code>に設定されている時、この特性で指定した名称の文字書式が引用に用いられます。文字書式は、OpenOffice文書で定義されている必要があります。
+        </td>
+    </tr>
+    <tr>
+        <td>CitationSeparator</td>
+        <td>文字列</td>
+        <td><code>; </code></td>
+        <td>引用が複数の項目を含む時(例: <code>[Smith 2001; Jones 2002]</code>)、項目の間に挿入する文字列</td>
+    </tr>
+    <tr>
+        <td>EtAlString</td>
+        <td>文字列</td>
+        <td><code> et al. </code></td>
+        <td>すべての著者を表示しない時に、著者名のあとに入れる文字列 (例)<code>[Smith et al. 2001]</code></td>
+    </tr>
+    <tr>
+        <td>FormatCitations</td>
+        <td>ブール値</td>
+        <td><code>false</code></td>
+        <td>引用に整形を行うかどうかを指定します。trueならば、引用に文字書式が適用されます。<code>CitationCharacterFormat</code>特性がどの書式を適用すべきかを制御しますが、その文字書式で使うフォント設定や効果は、OpenOfficeで選択可能でなくてはなりません。
+        </td>
+    </tr>
+    <tr>
+        <td>GroupedNumbersSeparator</td>
+        <td>文字列</td>
+        <td><code>-</code></td>
+        <td>連番引用をグループ化する際に、番号の間に入れる文字列 (例)<code>[4-6]</code></td>
+    </tr>
+    <tr>
+        <td>InTextYearSeparator</td>
+        <td>文字列</td>
+        <td>Single Space</td>
+        <td>本文中引用時に発行年の前の開き括弧と著者名の間に入れる文字列/td>
+    </tr>
+    <tr>
+        <td>ItalicEtAl</td>
+        <td>ブール値</td>
+        <td><code>true</code></td>
+        <td>trueならば、引用マーカー中の「et al.」文字列はイタリック体になります。</td>
+    </tr>
+    <tr>
+        <td>MaxAuthors</td>
+        <td>整数</td>
+        <td><code>3</code></td>
+        <td>文中既出の引用において表示する著者の最大数</td>
+    </tr>
+    <tr>
+        <td>MaxAuthorsFirst</td>
+        <td>整数</td>
+        <td><code>3</code></td>
+        <td>最初の引用において表示する著者の最大数</td>
+    </tr>
+    <tr>
+        <td>MinimumGroupingCount</td>
+        <td>整数</td>
+        <td><code>3</code></td>
+        <td>引用で番号をグループ化し始める前に最小限列挙する項目数。(例) <code>[4-6]</code> 対 <code>[4; 5; 6]</code>.
+        </td>
+    </tr>
+    <tr>
+        <td>MultiCiteChronological</td>
+        <td>ブール値</td>
+        <td><code>true</code></td>
+        <td><code>true</code>ならば、同一引用中の複数項目は年代順に並べられ、<code>false</code>ならば、アルファベット順に並べられます。
+        </td>
+    </tr>
+    <tr>
+        <td>PageInfoSeparator</td>
+        <td>文字列</td>
+        <td><code>; </code></td>
+        <td>ページ番号などの追加情報付きの引用で、この文字列は、発行年と追加情報の間(著者-発行年引用の場合)や、引用番号と追加情報の間(連番情報の場合)に挿入されます。(例) <code>[Smith 2001; p. 301]</code>における<code>2001</code>と<code>p. 301</code>の間の文字。
+        </td>
+    </tr>
+    <tr>
+        <td>UniquefierSeparator</td>
+        <td>文字列</td>
+        <td><code>, </code></td>
+        <td>同じ著者と発行年を持つ引用同士を区別するために使う文字の間に挿入する文字列。(例) <code>[Smith 2001a, b]</code>における<code>a</code>と<code>b</code>の間の文字。
+        </td>
+    </tr>
+    <tr>
+        <td>YearField</td>
+        <td>文字列</td>
+        <td><code>year</code></td>
+        <td>発行年を抽出するBibTeXフィールド。</td>
+    </tr>
+    <tr>
+        <td>YearSeparator</td>
+        <td>文字列</td>
+        <td>Single Space</td>
+        <td><code>[Smith 2001]</code>のような括弧付き引用で著者名と発行年の間に入れる文字。</td>
+    </tr>
+</table>
+
+<p>連番引用を用いる場合には、<code>BracketBefore</code>特性と<code>BracketAfter</code>特性は、最も重要です。これらは、引用番号を囲む文字に何を使うかを指定します。引用は、<br/>
+    <code>[BracketBefore][番号][BracketAfter]</code><br/>
+という形で構成され、ここで[番号]には、書誌情報の順番と本文中の引用の位置にしたがって定められる引用番号が入ります。一つの引用が複数の項目を参照している場合、<code>CitationSeparator</code>特性で指定されている文字列で区切られます(例えば、<code>CitationSeparator</code>=;ならば、引用部分は<code>[2;4;6]</code>のようになります)。二つ以上の項目が連番になっている場合、番号をグループ化することができます(例えば、2・3・4に対して<code>[2-4]</code>、2・5・6・7に対して<code>[2;5-7]</code>)。<code>GroupedNumbersSeparator</code>特性は、グループ化された連番の最初と最後の数字を区切る文字を指定します(既定値は<code>-</code>)。整数値を取る<code>MinimumGroupingCount</code> 特性は、項目をグループ化し始める前に列挙しなくてはならない連番の数を指定します(既定値は3)。<code> [...]
+</p>
+
+<p>連番項目を使わない場合には、著者-発行年型引用が、引用特性に基づいて生成されます。括弧付き引用は、以下のように構成されます。<br/>
+    <code>[BracketBefore][著者][YearSeparator][発行年][BracketAfter]</code><br/>
+    ここで、[著者]は、<code>AuthorField</code>特性で指定されたフィールドを参照し、得られた著者リストを整形した結果が入ります。このリストには、最大<code>MaxAuthors</code>個までの著者名が入ることができ増す。それ以上の場合のリストは、第一著者に<code>EtAlString</code>特性で指定した文字列を加えたものとして構成されます。<code>MaxAuthorsFirst</code>特性が指定されている場合には、特定の引用が本文中に初めて現れた場合には、<code>MaxAuthors</code>の代わりにこちらが用いられます。</p>
+
+<p><code>AuthorField</code>特性に、スラッシュで区切られた複数のフィールドが与えられている場合、最初のフィールドが、特定のBibTeX項目に関しては空だった場合、他のフィールドが順に参照されます。上述の例では、「author」フィールドが使われますが、それが空ならば「editor」フィールドがバックアップとして用いられます。</p>
+
+<p>著者リスト中の名前は、<code>AuthorLastSeparator</code>で与えられた文字列で区切られる最後の二人を除き、<code>AuthorSeparator</code>特性で与えられている文字列で区切られます。<code>AuthorLastSeparatorInText</code>特性が指定されている時は、本文中型の引用では、こちらの方が用いられます。こうすると、同じ様式に対して、<code>(Olsen & Jensen, 2008)</code>と<code>Olsen and Jensen (2008)</code>という引用型を得ることができます。</p>
+
+<p>[発行年]には、[YearField]特性で与えられているフィールドを参照した結果が入ります。</p>
+
+<p>本文中引用は、以下のように構成されます。<br/>
+    <code>[著者][InTextYearSeparator][BracketBefore][発行年][BracketAfter]</code><br/>
+    ここで[著者]および[発行年]は、括弧内引用と全く同じように解決されます。</p>
+
+<p>二つの別々の引用元の著者と発行年が重なっており、著者-発行年型引用が用いられている場合、これらを区別するためにマーカーに手を加える必要があります。これは、各引用の発行年の後に、最初の引用文献には「a」、二つめの引用文献には「b」のように、文字を付け加えることで自動的に為されます。例えば、著者「Olsen」の2005年の論文を二つ引用している場合、引用マーカーは、<code>(Olsen, 2005a)</code>および<code>(Olsen, 2005b)</code>のように変更されます。書誌情報レイアウト中で「一意化」文字の位置は、疑似フィールド<code>uniq</code>を挿入することで明示的に指示することができます。</p>
+
+<p>「一意化」された項目のいくつかが同時に引用されると、それらは引用マーカーの中でグループ化されます。例えば、上記の例において、二つの項目が同時に引用されたとすると、引用マーカーは、<code>(Olsen, 2005a; Olsen, 2005b)</code>とはならずに<code>(Olsen, 2005a, b)</code>となります。グループ化された一意化文字(上例ではaやb)は、<code>UniquefierSeparator</code>特性で指定された文字列で区切られます。
+</p>
+
+<p>二つ以上の項目を参照する著者-発行年型引用では、既定値では年代順に整序されます。アルファベット順に整序したい時には、引用特性<code>MultiCiteChronological</code>を<code>false</code>に設定する必要があります。</p>
+
+
+
+<h3>参考文献一覧の様式</h3>
+
+<p><b>LAYOUT</b>セクションには、JabRef中の各項目型の書誌情報項目がどのように表示されるかが記述されています。各行の冒頭は、BibTeX項目型名か<code>default</code>で始まり、その後に「=」が来ます。<code>default</code>は、明示的にレイアウトが与えられていないすべての項目型に使用されます。</p>
+
+<p>各行の残りの部分は、レイアウトを定義しており、通常のテキストと空白は、書誌情報項目にそのまま出力されます。BibTeX項目からの情報は、<code>\field</code>のようにフィールド名を入れたマーカー(例:著者名を入れる時は<code>\author</code>)を書き加えることで挿入することができます。ここには、JabRefの標準書出レイアウトの文法を用いて、フィールドの整形情報を含めることができます。使用できる<ruby><rb>整形子</rb><rp>(</rp><rt>フォーマッタ</rt><rp>)</rp></ruby>についての情報は、<a href="http://jabref.sourceforge.net/help/ja/CustomExports.php">自作書出フィルタに関するJabRefの説明書</a>を参照してください。</p>
+
+<p>著者-発行年型引用を用いる場合には、同型になった場合の別の引用を区別するために追記される「一意化」文字の位置を明示的に指定しなくてはなりません。これは、マーカーに疑似フィールド<code>uniq</code>を、典型的には(様式ファイルの例に示されているように)発行年の後に加えることで実現できます。<code>uniq</code>フィールドは、文献の参照テキストが配置される前に、各項目向けに自動的に正しく設定されます。</p>
+
+<p>書誌情報の整形を指示するためには、ボールド体には<b> </b>、イタリック体には<i> </i>、上付文字には<sup> </sup>、下付文字には<sub> </sub>と云った風に、HTML型のタグ対を使用することができます。</p>
+
+<p>連番引用を用いる場合には、各項目の番号は、書誌情報一覧中、各項目の冒頭に自動的に挿入されます。既定状態では、番号は引用向けに定義されている括弧と同じもので囲われます。非必須の引用特性<code>BracketBeforeInList</code>および<code>BracketAfterInList</code>は、指定されると<code>BracketBefore</code>および<code>BracketAfter</code>よりも優先して用いられます。これは、書誌情報一覧中で異なる形の括弧を用いたい(場合によっては括弧無し)場合に使います。これらは、文字通り括弧である必要はありません。文字の組み合わせを用いることもできます。</p>
+
+<h2>既知の問題</h2>
+
+<ul>
+    <li>Writer文書は、OpenDocument形式(odt)で保存するようにしてください。Word形式で保存すると、引用マークが損なわれます。</li>
+    <li>脚注にある引用は、現在のところサポートされていません。</li>
+    <li>引用を挿入した後、カーソルは変な位置に飛ぶ可能性があります。</li>
+    <li>このページの様式ファイルの例を直接コピー&ペーストすると、解析不能なファイルを生成することがあります。これを回避するために、コピー&ペーストをしないで、ダウンロードセクションのリンクから用例ファイルをダウンロードしてください。</li>
+</ul>
+
+
+
+
+
+
+
+
+
+</body>
+</html> 
diff --git a/src/help/ja/Plugin.html b/src/help/ja/Plugin.html
index a98f619..2b84e25 100644
--- a/src/help/ja/Plugin.html
+++ b/src/help/ja/Plugin.html
@@ -19,10 +19,10 @@
     <ul>
       <li><code>ImportFormat</code> - 「...データベースに読み込む」に表示される読込子をJabRefに追加する。</li> 
       <li><code>EntryFetcher</code> - <b>ウェブ検索</b>メニューにCiteseerやMedlineのようなデータベースへのアクセスを追加する。</li>
-      <li><code>ExportFormatTemplate</code> - <b>自製書き出しの管理</b>から使用できるのと同じようなひな型ベースの書き出しを追加する。</li>
-      <li><code>ExportFormat</code> - JabRefの書き出しダイアログへ書き出しフィルタを追加する。単純なひな型ベースのものよりも複雑です。</li>
-      <li><code>ExportFormatProvider</code> - JabRefに書き出し書式を加える、さらに強力な方法です。</li> 
-      <li><code>LayoutFormatter</code> - レイアウトベースの書き出しに使用される整形子を追加する。</li>
+      <li><code>ExportFormatTemplate</code> - <b>自作書出の管理</b>から使用できるのと同じようなひな型ベースの書出を追加する。</li>
+      <li><code>ExportFormat</code> - JabRef書出ダイアログへ書出フィルタを追加する。単純なひな型ベースのものよりも複雑です。</li>
+      <li><code>ExportFormatProvider</code> - JabRefに書出形式を加える、さらに強力な方法です。</li> 
+      <li><code>LayoutFormatter</code> - レイアウトベースの書出に使用される整形子を追加する。</li>
       <li><code>SidePanePlugin</code> - 任意の操作を行うことができる側面要素を追加します。側面パネルは、JabRef基本ウィンドウの<b>プラグイン</b>メニューからアクセスすることができます。</li>
     </ul>
     
diff --git a/src/help/ja/PreviewHelp.html b/src/help/ja/PreviewHelp.html
index 2f020aa..cf73c06 100644
--- a/src/help/ja/PreviewHelp.html
+++ b/src/help/ja/PreviewHelp.html
@@ -8,6 +8,6 @@
 
     <h1>項目プレビューの設定</h1>
 
-    <p>項目プレビューは、<a href="CustomExports.html">個人設定書き出しフィルタ</a>機能と同じ機構を使って生成されます。プレビューを行うと、項目は、2つのレイアウトのうち1つを使用して(2つのレイアウトはF9を押して切り替えられます)HTMLコードが生成され、プレビュー画面に表示されます。プレビューの外見と内容を修正するには、ヘルプファイル<a href="CustomExports.html">個人設定書き出しフィルタ</a>に記述のある文法を用いて、プレビューレイアウトを編集する必要があります。</p>
+    <p>項目プレビューは、<a href="CustomExports.html">自作書出フィルタ</a>機能と同じ機構を使って生成されます。プレビューを行うと、項目は、2つのレイアウトのうち1つを使用して(2つのレイアウトはF9を押して切り替えられます)HTMLコードが生成され、プレビュー画面に表示されます。プレビューの外見と内容を修正するには、ヘルプファイル<a href="CustomExports.html">自作書出フィルタ</a>に記述のある文法を用いて、プレビューレイアウトを編集する必要があります。</p>
 </body>
 </html>
diff --git a/src/help/ja/RevisionHistory.html b/src/help/ja/RevisionHistory.html
index 6727306..0b0a62a 100644
--- a/src/help/ja/RevisionHistory.html
+++ b/src/help/ja/RevisionHistory.html
@@ -8,7 +8,7 @@
 
   <h1>更新履歴</h1>
 
-  <p>Please refer to <a href=http://jabref.sourceforge.net/revisionhistory.php">http://jabref.sourceforge.net/revisionhistory.php</a> for a complete history in English.</p>
+  <p>完全な履歴については、<a href="../RevisionHistory.html">英語版のページ</a>を参照してください。</p>
 
 </body>
 
diff --git a/src/help/ja/SQLExport.html b/src/help/ja/SQLExport.html
index fc1ccf1..98358d7 100644
--- a/src/help/ja/SQLExport.html
+++ b/src/help/ja/SQLExport.html
@@ -1,38 +1,27 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <link rel="stylesheet" type="text/css" href="jabref_help.css"/>
 </head>
 
 <body>
 
-    <h1>Export to an External SQL Database</h1>
+    <h1>外部SQLデータベースへの書き出し</h1>
 
-    <p> JabRef is capable of
-        exporting the contents of the BibTeX database, along with groups
-    	information, to an external MySQL or PostgreSQL database.</p>
+    <p>JabRefは、BibTeXデータベースの内容を、グループ情報とともに、外部のMySQLやPostgreSQLデータベースに書き出すことができます。</p>
 
-		<p>You just need to be sure you have an user/password with full privileges on a MySQL or PostgreSQL server.</p>
+    <p>ただし、MySQL若しくはPostgreSQLサーバーの全権限を持つユーザー名とパスワードを持っていることが必要です。</p>
 
-    <h2>Export</h2>
+    <h2>書き出し</h2>
     <ol>
-      <li> Choose <b>File -> Export to external SQL database</b>, or click the corresponding button on the toolbar.</li>
-      <li> Select the database type from the drop down menu for <em>Server Type</em>.</li>
-      <li> Enter the database connection information, and click <b>Connect</b>.</li>
+      <li><b>ファイル→外部SQLデータベースに書き出す</b>を選択するか、ツールバーの対応するボタンを押してください。</li>
+      <li><b>サーバー型</b>ドロップダウンメニューからデータベースの型を選択してください。</li>
+      <li>データベース接続情報を入力し、<b>接続</b>を押してください。</li>
     </ol>
 
-		<p>
-		JabRef will then connect to the specified database, create new tables, and populate those tables with entries and groups information.
-		You will be able to export as many JabRef bib databases as you want without losing the previously explored data.
-		The system recognize a database uniquely by its full path (directory structure + filename). In case you export the same JabRef database 
-		more than once, the data of that database will be update in the SQL database.
-		Note that you will not be prompted for the connection information on subsequent exports.  If you would like to
-		export to a different database, you can change the connection information by choosing <b>File ->
-		Connect to external SQL database</b> (or by clicking the associated toolbar button), and then
-		performing an export.
-		Since version 2.8 tables are not dropped, and user is able to store more than one JabRef database into a single SQL database.
-    </p>	
-
-	<p>When importing a database from an SQL database (<b>File -> Import from external SQL database</b>), JabRef will place each database found in a different tab.</p>
+		<p>すると、JabRefは指定されたデータベースに接続し、新規テーブルを作成し、それらのテーブルに項目とグループ情報を格納します。それ以前に書き出したデータを失うことなく、好きなだけ多くのJabRef書誌情報データベースを書き出すことができます。システムは、フルパス(ディレクトリ構造+ファイル名)を使ってデータベースを一意に識別します。同じJabRefデータベースを二度以上書き出すと、SQLデータベース内のそのデータベースのデータが更新されます。なお、続けて書き出す場合には、接続情報を入力するようには促されません。別のデータベースに書き出したい場合には、<b>ファイル→外部SQLデータベースに接続</b>を選択して(若しくは対応するツールバーボタンを押して)、書き出しを実行してください。第2.8版以降では、テーブルはドロップされませんので、二つ以上のJabRefデータベースを同一のSQLデータベースに保管することができます。</p>	
+
+	<p>SQLデータベースからデータベースを読み込む場合(<b>ファイル→外部SQLデータベースから読み込む</b>)には、読み込まれた各データベースを別々のタブに収録します。</p>
   </body>
 
 </html>
diff --git a/src/help/ja/ScienceDirect.html b/src/help/ja/ScienceDirect.html
index a3ce436..6ef4b26 100644
--- a/src/help/ja/ScienceDirect.html
+++ b/src/help/ja/ScienceDirect.html
@@ -8,6 +8,8 @@
 
   <h1>ScienceDirect 検索</h1>
 
+    <p>この機能を使うには、<b>検索→ウェブ検索</b>を選択すると、検索操作盤が検索に現れます。ドロップダウンメニューから<b>ScienceDirect</b>を選択してください。</p>
+
     <p>ScienceDirect検索は、ScienceDirectウェブページから情報を抽出するにあたって、BibSonomy scraperプロジェクト (http://scraper.bibsonomy.org/) に依存しています。</p>
 
     <p>この取得子は、ScienceDirectウェブサイトのクイックサーチを実行し、最大100ヒットまで表示します。そして全ヒット分が取り込まれます。</p>
diff --git a/src/help/ja/SearchHelp.html b/src/help/ja/SearchHelp.html
index 6fa1866..6a39ab7 100644
--- a/src/help/ja/SearchHelp.html
+++ b/src/help/ja/SearchHelp.html
@@ -8,7 +8,7 @@
 
     <h1>検索</h1>
 
-    <h2>キーボード<ruby><rb>短絡鍵</rb><rp>(</rp><rt>ショートカット</rt><rp>)</rp></ruby></h2>
+    <h2>キーボード<ruby><rb>捷径鍵</rb><rp>(</rp><rt>ショートカット</rt><rp>)</rp></ruby></h2>
 
     <p><em>CTRL-F</em>を押すと、検索操作盤が開くかフォーカスを得ます。<em>CTRL-F</em>を押すたびに、検索モードが切り替わります。<ruby><rb>逐次検索</rb><rp>(</rp><rt>インクリメンタルサーチ</rt><rp>)</rp></ruby>中に、<em>CTRL-F</em>を押すと、プログラムは、検索文字列の次の該当箇所を探します。</p>
 
@@ -20,7 +20,7 @@
     
     <h3><ruby><rb>逐次検索</rb><rp>(</rp><rt>インクリメンタルサーチ</rt><rp>)</rp></ruby></h3>
 
-    <p>逐次検索では、あなたが一文字入力するごとにプログラムが即座に検索を開始します。検索結果は、ステイタスラインに表示されます。検索短絡鍵を押すと、現在の検索文字列の次の該当箇所を探し始めます。次の該当箇所がない場合には、その旨ステイタスラインに表示されます。そのまま検索を続けると、検索は冒頭から再開されます。検索順は、常に現在のデータベースの整序順に従います。逐次検索を終えるには、ESC鍵を押すか「消去」ボタンを押してください。</p>
+    <p>逐次検索では、あなたが一文字入力するごとにプログラムが即座に検索を開始します。検索結果は、ステイタスラインに表示されます。検索捷径鍵を押すと、現在の検索文字列の次の該当箇所を探し始めます。次の該当箇所がない場合には、その旨ステイタスラインに表示されます。そのまま検索を続けると、検索は冒頭から再開されます。検索順は、常に現在のデータベースの整序順に従います。逐次検索を終えるには、ESC鍵を押すか「消去」ボタンを押してください。</p>
 
     <h3>通常検索</h3>
 
diff --git a/src/help/ja/SpecialFieldsHelp.html b/src/help/ja/SpecialFieldsHelp.html
new file mode 100644
index 0000000..426f8ce
--- /dev/null
+++ b/src/help/ja/SpecialFieldsHelp.html
@@ -0,0 +1,46 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<link rel="stylesheet" type="text/css" href="jabref_help.css"/>
+</head>
+
+<body>
+
+<h1>特殊フィールド</h1>
+
+<p>特殊フィールドは以下の機能を提供します。</p>
+<ul>
+<li>読了論文の評価</li>
+<li>論文を作業に関連があるものとして標識</li>
+<li>BibTeX項目の品質が保証されているものとして標識</li>
+<li>未読の論文に優先度をつける</li>
+</ul>
+<p>
+項目の標識付けと違う主な点は、既定値では、評価した項目は表上部に移動しないことと、評価列のみが着色されることです。したがって、項目には、標識付けと評価の両方を行うことができます。
+</p>
+<p>
+各特殊フィールドは、設定で入切することができます。
+</p>
+
+<h2>フィールド型</h2>
+
+<h3>評価</h3>
+<p>これは「昇順の」評価を設定する機能です。JabRefでは、1つ星から5つ星までを使って論文を評価できます。</p>
+
+<h3>関連性</h3>
+<p>項目を関連があるものとして標識できます。</p>
+
+<h3>品質保証済</h3>
+<p>項目を品質保証済として標識できます。BibTeX項目のフィールドの内容について、徹底的なチェックがなされていることを標識するためのものです。</p>
+
+<h3>優先度</h3>
+<p>項目の優先度をprio3 (低)からprio1 (高)まで付けることができます。未読論文の優先度を付けるためのものです。</p>
+
+<h2>BibTeX項目への記憶</h2>
+<p>
+内部的には、特殊フィールドは、独立したBibTeXフィールドとして記憶されます。「特殊フィールドの値を独立したフィールドとしてBibTeXに書き込む」が有効になっている時、これらのフィールドは、データベースが保存される時にも書き込まれます。JabRefには、これらのフィールドをキーワードと同期する機能もあります。これは「キーワードと同期」を設定することで有効になります。この設定が有効になっていると、特殊フィールドを変更した分がキーワードフィールドに反映されます。逆に、キーワードを変更すると、特殊フィールドも変更されます。さらに、データベース読み込み時や新規項目の解析時に、特殊フィールドを設定するのにキーワードが用いられます。
+</p>
+
+</body>
+</html>
+
diff --git a/src/help/ja/Spires.html b/src/help/ja/Spires.html
index cb85b9c..e4ce1b8 100644
--- a/src/help/ja/Spires.html
+++ b/src/help/ja/Spires.html
@@ -8,7 +8,9 @@
 
     <h1>Spires 検索</h1>
 
-    <p>Spires検索は、検索クエリをSpiresウェブサーチにそのまま渡しますので、<em>find</em>あるいは<em>fin</em>コマンドを省く点以外は、そのままクエリを構成してください。このヘルプページは、検索クエリへの簡単な導入を行うだけですので、Spires検索の詳細なヘルプについては、http://www.slac.stanford.edu/spires/hep/help/index.shtmlを参照してください。</p>
+    <p>この機能を使うには、<b>検索→ウェブ検索</b>を選択すると、検索操作盤が側面に現れます。ドロップダウンメニューから<b>Spires</b>を選択してください。</p>
+
+<p>Spires検索は、検索クエリをSpiresウェブサーチにそのまま渡しますので、<em>find</em>あるいは<em>fin</em>コマンドを省く点以外は、そのままクエリを構成してください。このヘルプページは、検索クエリへの簡単な導入を行うだけですので、Spires検索の詳細なヘルプについては、http://www.slac.stanford.edu/spires/hep/help/index.shtmlを参照してください。</p>
 
     <p>論理演算子として<em>and</em>および<em>or</em>を使用して結合することで、複数の部分を持つクエリを構成することができます。各部分は、検索するフィールド型を示す文字または単語の後に空白を置き、その後に検索する文字列を置くことで構成されます。</p>
 
diff --git a/src/help/ja/StringsHelp.html b/src/help/ja/StringsHelp.html
new file mode 100644
index 0000000..9d6fe25
--- /dev/null
+++ b/src/help/ja/StringsHelp.html
@@ -0,0 +1,49 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<link rel="stylesheet" type="text/css" href="jabref_help.css"/>
+</head>
+
+<body>
+
+    <h1>文字列ヘルプ</h1>
+    <p><em>BibTeX</em>は、<code>@String {<ruby><rb>鍵</rb><rp>(</rp><rt>キー</rt><rp>)</rp></ruby> = 値}</code> と指定することで固定文字列を記憶させることをサポートしています。
+    <acronym>JabRef</acronym>は、文字列の管理を<b>BibTeX→文字列を編集</b>(これは<a href="StringEditorHelp.html">文字列エディタ</a>を開きます)でサポートしています。指定した値は、フィールド中で使用することができます。例えば、BibTeXファイル中で</p>
+    <pre><code>@String { kopp = "Kopp, Oliver" }
+ at String { kubovy = "Kubovy, Jan" }
+ at String { et = " and " }</code></pre>
+<p>と指定してあれば、どこかの項目中で、例えば、<code>@Misc{ author = kopp # et # kubovy }</code> あるいは <code>@Misc{ author = kopp # " and " # kubovy }</code> として使うことができます。JabRefフィールドエディタ中では、authorフィールドに  <code>#kopp# #et# #kubovy#</code> あるいは <code>#kopp# and #kubovy#</code> のように挿入します。</p>
+
+<p>
+<acronym>JabRef</acronym>では、文字列の概念を拡張して、これら<code>@String</code>に型を導入しました。問題は、そのような文字列の型をBibTeXファイル中でどう保管するかですが、<acronym>JabRef</acronym>は、以下のように前置句を加えることで型を追記します。</p>
+
+<ul>
+<li><code>@String { aKopp = "Kopp, Oliver" }</code>は、author型の<code>@String</code>です。</li>
+<li><code>@String { iMIT = "{Massachusetts Institute of Technology ({MIT})}" }</code>は、institution型の<code>@String</code>です。</li>
+<li><code>@String { anct = "Anecdote" }</code>は、other型の<code>@String</code>です。</li>
+<li><code>@String { lTOSCA = "Topology and Orchestration Specification for Cloud Applications" }</code>は、other型の<code>@String</code>です。</li>
+</ul>
+
+<p>
+author型の<code>@String</code>は、authorフィールドとeditorsフィールドでのみ使うことができます。同じく、institution型の<code>@String</code>は、institutionフィールドとorganizationフィールドでのみ使うことができます。other型の<code>@String</code>は、どこでも使用することができます。
+</p>
+
+<p>
+下記の通り、同じinstitutionを複数の型に持つこともできます。
+</p>
+<ul>
+<li><code>@String { aMIT = "{Massachusetts Institute of Technology ({MIT})}" }</code>
+ は、institutionがauthorもしくはeditorとして現れる場合のものです。</li>
+<li>
+<code>@String { iMIT = "{Massachusetts Institute of Technology ({MIT})}" }</code>
+は、institutionがinstitutionもしくはorganizationとして現れる場合のものです。</li>
+<li>
+<code>@String { pMIT = "{Massachusetts Institute of Technology ({MIT}) press}" }</code>
+は、institutionがpublisherとして現れる場合のものです。</li>
+</ul>
+<p>
+最後の例は、矛盾しているように見えるかもしれませんが、重複を避けた上で、人名と組織名を統一的に扱うためのものです。</p>
+
+
+</body>
+</html>
diff --git a/src/help/ja/XMPHelp.html b/src/help/ja/XMPHelp.html
index 987aa2e..daa07ee 100644
--- a/src/help/ja/XMPHelp.html
+++ b/src/help/ja/XMPHelp.html
@@ -1,96 +1,53 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <link rel="stylesheet" type="text/css" href="jabref_help.css"/>
 </head>
 
 <body>
 
-    <h1>XMP metadata support in JabRef</h1>
+    <h1>JabRefにおけるXMPメタデータ サポート</h1>
 
-    <p>XMP is a standard created by Adobe Systems for storing
-    metadata (data about data) in files. An well known example for
-    metadata are MP3 tags, which can be used to describe artist,
-    album and song name of a MP3 file. Adding metadata to MP3 helps
-    other people to identify the songs correctly independent of
-    file-name and can provide means for software (MP3 players for
-    instance) to sort and group songs.</p>
+    <p>XMPは、ファイル中にメタデータ(データに関するデータ)を収録するために、Adobe Systemsによって作られた標準です。メタデータのよく知られた例としてはMP3タグがありますが、これはMP3ファイルのアーティストやアルバム、歌の名前を記述するのに用いられます。MP3にメタデータを書き加えると、他の人が、ファイル名とは独立に正しく楽曲を特定する助けとなる他、(MP3プレイヤーのような)ソフトウェアが、楽曲を整序したりグループ化したりするための手段を提供することになります。</p>
 
-    <p>With XMP-support the JabRef team tries to bring the
-    advantages of metadata to the world of reference managers. You
-    can now choose to "Write XMP" metadata in the General Tab of
-    JabRef, which will put all the Bibtex information into the PDF.
-    If you then email this PDF to a collegue she can just drag the
-    file into JabRef and all information that you entered will be
-    available to her.</p>
+    <p>XMPサポートによって、JabRef開発チームは、メタデータの利点を書誌情報管理の世界に持ち込もうとしました。JabRefタブ中の「XMPメタデータとして書き込む」ボタンを押すと、BibTeX情報をリンクされたPDFに書き込みます。このPDFを同僚に電子メールで送って、同僚がそのファイルをJabRefにドラッグすれば、あなたが入力した情報すべてが、この同僚にも利用可能になります。</p>
 
-    <h2>Usage</h2>
+    <h2>使用法</h2>
 
-    <p>To use the XMP-feature in JabRef you can do the
-    following:</p>
+    <p>JabRefでXMP機能を使うには、以下のようにしてください。</p>
 
     <ul>
-        <li>To <b>import a single annotated PDF-file</b> that
-        contains XMP you can select "File -> Import into...
-        -> XMP-annotated PDF" or drag the file into the main
-        view.</li>
-
-        <li>To <b>write the bibliographic information to the
-        associated PDF</b> do the following: Double click the entry
-        in the main view, go to the "General" tab and click on
-        "Write XMP".</li>
-
-        <li>If you want <b>to annotate all the PDFs in a given
-        database</b> you can select "Tools -> Write XMP for
-        database"</li>
-
-        <li>To verify if it worked you can open the PDF in Adobe
-        Acrobat and select "File -> Document Properties ->
-        Additional Metadata -> Advanced". In the tree to the
-        right you should see an entry called
-        "http://purl.org/net/bibteXMP". This works only with Adobe
-        Acrobat, not with Adobe Reader.</li>
-
-        <li>If you don't have Adobe Acrobat, you can use
-        <i>pdfinfo</i> instead in order to see the XMP metadata.
-        <i>pdfinfo</i> is part of Xpdf
-        (<code>www.foolabs.com/xpdf</code>) and Poppler
-        (<code>http://poppler.freedesktop.org</code>).</li>
+        <li>XMPを含んでいる<b>注釈付きPDFファイルを読み込む</b>には、「ファイル→...に読み込む→XMP注釈付きPDF」を選択するか、そのファイルを基本ビューにドラッグしてください。</li>
+
+        <li><b>関連したPDFに書誌情報を書き込む</b>には、基本ビューで項目をダブルクリックし、タブ中の「XMPメタデータとして書き込む」ボタンを押してください。</li>
+
+        <li><b>データベース中のすべてのPDFに注釈を付ける</b>場合には、「ツール→XMPメタデータをPDFに書き出す」を選択してください。</li>
+
+        <li>うまく行ったかどうかを確認するには、PDFをAdobe Acrobatで開き、「ファイル→文書プロパティ→追加のMetadata→詳細」を選択してください。右側のツリーに「http://purl.org/net/bibteXMP」という項目があります。これは、Adobe Acrobatで動作しますが、Adobe Readerでは動作しません。</li>
+
+        <li>Adobe Acrobatがなければ、XMPメタデータを見るのに代わりに<i>pdfinfo</i>を使うことができます。<i>pdfinfo</i>は、Xpdf (<code>www.foolabs.com/xpdf</code>)とPoppler (<code>http://poppler.freedesktop.org</code>)の一部です。</li>
 
         <li style="list-style: none">
             <div style="margin-left: 2em">
-                <h2>BibteXmp Fileformat</h2>
+                <h2>BibteXmpファイル形式</h2>
 
-                <p>XMP uses a subset of the Resource Description
-                Framework (RDF) to store data. For JabRef a new
-                metadata format is used which maps very closely to
-                BibTeX. Basically all fields and values are turned
-                into nodes of an XML document. Only authors and
-                editors are stored as rdf:Seq-structures, so users
-                of the data can skip the splitting on 'and's. All
-                strings and crossrefs will be resolved in the
-                data.</p>
+                <p>XMPは、データを保管するのにResource Description Framework (RDF)のサブセットを使用します。JabRefでは、BibTeXに非常に近い形にマップする新しいメタデータ形式を使用しています。基本的にすべてのフィールドと値は、XML文書のノードに変換されます。authorsとeditorsのみがrdf:Seq構造として保管されるので、データのユーザーは「and」の分割作業をスキップすることができます。すべての文字列と相互参照は、データ中で解決されます。</p>
 
-                <p>The following easy minimal schema is used:</p>
+                <p>以下の簡単な最小限のスキーマを使用します。</p>
 
                 <ul>
-                    <li>The BibTeX-key is stored as
-                    <code>bibtexkey</code>.</li>
+                    <li>BibTeX鍵は<code>bibtexkey</code>として保管されます。</li>
 
-                    <li>The type of the BibTeX-entry is stored as
-                    <code>entrytype</code>.</li>
+                    <li>BibTeX鍵の型は<code>entrytype</code>として保管されます。</li>
 
-                    <li><code>author</code> and <code>editor</code>
-                    are encoding as <code>rdf:Seq</code>s where the
-                    individual authors are represented as
-                    <code>rdf:li</code>s.</li>
+                    <li><code>author</code>と<code>editor</code>は、<code>rdf:Seq</code>としてエンコードされ、各著者は<code>rdf:li</code>として表されます。</li>
 
-                    <li>All other fields are saved using their
-                    field-name as is.</li>
+                    <li>他のフィールドは、すべてフィールド名そのものを使用して保存されます。</li>
                 </ul><br />
                 <br />
 
 
-                <p>The following is an example of the mapping</p>
+                <p>下記はマッピングの例です。</p>
                 <pre>
 @INPROCEEDINGS{CroAnnHow05,
   author = {Crowston, K. and Annabi, H. and Howison, J. and Masango, C.},
@@ -101,7 +58,7 @@
   timestamp = {2006.05.29},
   url = {http://james.howison.name/publications.html}
 }
-</pre>will be transformed into
+</pre>これは以下のように変換されます。
                 <pre>
 <rdf:Description xmlns:bibtex="http://jabref.sourceforge.net/bibteXMP/"
     bibtex:bibtexkey="CroAnnHow05"
@@ -123,41 +80,36 @@
 </rdf:Description>
 </pre>
 
-                <p>Beware of the following caveats if you trying to
-                parse bibteXMP:</p>
+                <p>bibtexXMPを解析しようとする場合には、以下の点に注意してください。</p>
 
                 <ul>
-                    <li>In RDF attribute-value pairs can also be
-                    expressed as nodes and vice versa.</li>
+                    <li>RDFでは、属性-値の組はノードとして表すこともでき、その逆もできます。</li>
                 </ul><br />
                 <br />
 
 
-                <h2>Related Links:</h2>
+                <h2>関連リンク:</h2>
 
-                <p>Some links about XMP and annotating PDFs:</p>
+                <p>XMPと注釈付きPDFに関するリンク:</p>
 
                 <ul>
                     <li>
                     <a href="http://freelancepropaganda.com/themp/">
-                    James Howison's blog "Themp---Managing Academic
-                    Papers like MP3s"</a></li>
+                    James Howisonのブログ「Themp---MP3のように学術論文を管理する」</a></li>
 
                     <li>
                     <a href="http://www.xml.com/pub/a/2004/09/22/xmp.html">
-                    XML.com article about XMP</a></li>
+                    XMPに関するXML.comの記事</a></li>
 
-					<li><a href="http://pdfbox.apache.org">PDFBox libraries</a> for PDF
-				    file and metadata handling. They are distributed under the Apache License.</li>
+					<li>Apache Software Foundationの<a href="http://pdfbox.apache.org/">PDFBox</a>は、PDFとメタデータ ストリームにアクセスするのに使われるJavaライブラリです。</li>
 
                     <li>
                     <a href="http://arstechnica.com/civis/viewtopic.php?f=19&t=408429">
-                    Good thread on ArsTechnica discussing the
-                    management of PDFs.</a></li>
+                    PDF管理を論じているArsTechnica上の良いスレッド</a></li>
 
                     <li>
                     <a href="http://www.adobe.com/content/dam/Adobe/en/devnet/xmp/pdfs/XMPSpecificationPart1.pdf">
-                    Adobe XMP Specification</a></li>
+                    Adobe XMPの仕様</a></li>
                 </ul><br />
                 <br />
 
diff --git a/src/help/ja/jabref_help.css b/src/help/ja/jabref_help.css
index 44fd49c..c9e8b79 100644
--- a/src/help/ja/jabref_help.css
+++ b/src/help/ja/jabref_help.css
@@ -1,73 +1,73 @@
-/* CSS for JabRef */
- at charset ‘UTF-8′;
-
-body {
-	font-family: 'ヒラギノ角ゴ Pro W3','Hiragino Kaku Gothic Pro','メイリオ', Meiryo, Osaka, 'MS Pゴシック','MS PGothic', sans-serif;
-	font-size: 13pt;
-	color: #393939;
-	margin: 0px;
-	padding: 20px 50px;
-}
-
-h1 {
-	font-size: 19pt;
-	padding: 2px 5px;
-	margin-top: 0px;
-
-	color: #3D3C5E;
-	background-color: #D8D4EC;
-
-	border-width: 1px;
-	border-style: solid;
-	border-color: #3D3C5E;
-
-}
-
-h2 { font-size: 15pt; margin-top: 15px ; margin-bottom: 5px; color: #3D3C5E; }
-h3 { font-size: 13pt; margin-top: 10px ; margin-bottom: 5px; }
-
-p { text-align: justify; margin-top: 0px; margin-bottom: 10px; line-height: 16pt; }
-
-code { font-family: Courier, monospace; font-size: 13pt; background-color: #f3f2fa; }
-
-ul, dl { margin-top: 0px; }
-li, dd { text-align: justify; margin-top: 0px; margin-bottom: 3px; }
-
-ul { margin-left: 10px; }
-
-blockquote { background-color: #f3f2fa; padding: 5px; }
-
-a, a:visited { text-decoration: underline; color: #4f5f8f; }
-
-#aboutpage { text-align: center; }
-#logo { margin-bottom: 10px; }
-
-.withRuby {
-    display: inline-block;
-    position: relative;
-    top: -1em;
-    left: 0;
-    margin: 0;
-    padding: 0;
-    border: none;
-    white-space: nowrap;
-    text-indent: 0;
-    line-height: 100%;
-    vertical-align: text-bottom;
-    text-align: center;
-    text-decoration: none;
-    }
-
-.withRuby:after {
-    display: block;
-    margin: -3em 0 0;
-    padding: 0;
-    border: none;
-    white-space: nowrap;
-    font: inherit;
-    font-size: 50%;
-    line-height: 100%;
-    text-decoration: none;
-    text-align: center;
-    content: attr(title);
+/* CSS for JabRef */
+ at charset ‘UTF-8′;
+
+body {
+	font-family: 'ヒラギノ角ゴ Pro W3','Hiragino Kaku Gothic Pro','メイリオ', Meiryo, Osaka, 'MS Pゴシック','MS PGothic', sans-serif;
+	font-size: 13pt;
+	color: #393939;
+	margin: 0px;
+	padding: 20px 50px;
+}
+
+h1 {
+	font-size: 19pt;
+	padding: 2px 5px;
+	margin-top: 0px;
+
+	color: #3D3C5E;
+	background-color: #D8D4EC;
+
+	border-width: 1px;
+	border-style: solid;
+	border-color: #3D3C5E;
+
+}
+
+h2 { font-size: 15pt; margin-top: 15px ; margin-bottom: 5px; color: #3D3C5E; }
+h3 { font-size: 13pt; margin-top: 10px ; margin-bottom: 5px; }
+
+p { text-align: justify; margin-top: 0px; margin-bottom: 10px; line-height: 16pt; }
+
+code { font-family: Courier, monospace; font-size: 13pt; background-color: #f3f2fa; }
+
+ul, dl { margin-top: 0px; }
+li, dd { text-align: justify; margin-top: 0px; margin-bottom: 3px; }
+
+ul { margin-left: 10px; }
+
+blockquote { background-color: #f3f2fa; padding: 5px; }
+
+a, a:visited { text-decoration: underline; color: #4f5f8f; }
+
+#aboutpage { text-align: center; }
+#logo { margin-bottom: 10px; }
+
+.withRuby {
+    display: inline-block;
+    position: relative;
+    top: -1em;
+    left: 0;
+    margin: 0;
+    padding: 0;
+    border: none;
+    white-space: nowrap;
+    text-indent: 0;
+    line-height: 100%;
+    vertical-align: text-bottom;
+    text-align: center;
+    text-decoration: none;
+    }
+
+.withRuby:after {
+    display: block;
+    margin: -3em 0 0;
+    padding: 0;
+    border: none;
+    white-space: nowrap;
+    font: inherit;
+    font-size: 50%;
+    line-height: 100%;
+    text-decoration: none;
+    text-align: center;
+    content: attr(title);
     }
\ No newline at end of file
diff --git a/src/images/crystal_16/Icons.properties b/src/images/crystal_16/Icons.properties
index 48a0be6..b57eff9 100644
--- a/src/images/crystal_16/Icons.properties
+++ b/src/images/crystal_16/Icons.properties
@@ -80,6 +80,7 @@ dbExport=database_save.png
 dbImport=database_save.png
 plugin=kwikdisk.png
 cleanupentries=cleanupentries.png
+mergeentries=mergeentries.png
 dragNdropArrow=dragNdropArrow.png
 relevant=relevance.png
 toggleRelevance=relevance.png
diff --git a/src/images/crystal_16/mergeentries.png b/src/images/crystal_16/mergeentries.png
new file mode 100644
index 0000000..9375280
Binary files /dev/null and b/src/images/crystal_16/mergeentries.png differ
diff --git a/src/images/splash-dev.svg b/src/images/splash-dev.svg
index 03739fc..92065ab 100644
--- a/src/images/splash-dev.svg
+++ b/src/images/splash-dev.svg
@@ -12,7 +12,7 @@
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    inkscape:export-ydpi="90.000000"
    inkscape:export-xdpi="90.000000"
-   inkscape:export-filename="splash.png"
+   inkscape:export-filename="/home/alver/jabref_head/jabref/src/images/splash.png"
    sodipodi:docname="splash-dev.svg"
    inkscape:version="0.48.2 r9819"
    sodipodi:version="0.32"
@@ -81,16 +81,16 @@
       <image
          sodipodi:absref="C:\git-repositories\jabref\jabref\src\images\behandlet.png"
          xlink:href="behandlet.png"
-         transform="translate(-231.0000,-284.3622)"
-         style="opacity:1.0000000;stroke:#000000;stroke-width:5.0000000;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-opacity:1.0000000"
-         inkscape:export-ydpi="90.000000"
-         inkscape:export-xdpi="90.000000"
-         inkscape:export-filename="/home/alver/Desktop/bilder/jabref/splash4.png"
-         y="284.36218"
-         x="231.00000"
-         width="572.00000"
+         id="image9050"
          height="428.00000"
-         id="image9050" />
+         width="572.00000"
+         x="231.00000"
+         y="284.36218"
+         inkscape:export-filename="/home/alver/Desktop/bilder/jabref/splash4.png"
+         inkscape:export-xdpi="90.000000"
+         inkscape:export-ydpi="90.000000"
+         style="opacity:1.0000000;stroke:#000000;stroke-width:5.0000000;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-opacity:1.0000000"
+         transform="translate(-231.0000,-284.3622)" />
     </pattern>
     <radialGradient
        inkscape:collect="always"
@@ -137,9 +137,9 @@
   </defs>
   <sodipodi:namedview
      inkscape:window-y="-8"
-     inkscape:window-x="-8"
-     inkscape:window-height="1027"
-     inkscape:window-width="1920"
+     inkscape:window-x="54"
+     inkscape:window-height="1129"
+     inkscape:window-width="1986"
      inkscape:current-layer="layer1"
      inkscape:document-units="px"
      inkscape:cy="225.8697"
@@ -165,7 +165,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -187,14 +187,14 @@
     <image
        sodipodi:absref="C:\git-repositories\jabref\jabref\src\images\splashBackground.png"
        xlink:href="splashBackground.png"
-       id="image1821"
-       height="428"
-       width="572"
-       x="79"
-       y="172.36218"
-       inkscape:export-filename="/home/alver/jabref/jabref/src/images/splash.png"
+       inkscape:export-ydpi="75"
        inkscape:export-xdpi="75"
-       inkscape:export-ydpi="75" />
+       inkscape:export-filename="/home/alver/jabref/jabref/src/images/splash.png"
+       y="172.36218"
+       x="79"
+       width="572"
+       height="428"
+       id="image1821" />
     <flowRoot
        inkscape:export-ydpi="75.000000"
        inkscape:export-xdpi="75.000000"
@@ -277,25 +277,25 @@
     </g>
     <text
        xml:space="preserve"
-       style="font-size:57.12125397px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:#727888;stroke-width:1.80000007;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;font-family:Nimbus Sans L"
-       x="444.77087"
-       y="426.25284"
+       style="font-size:57.1212616px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:#727888;stroke-width:1.80000031;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;font-family:Nimbus Sans L"
+       x="462.20135"
+       y="426.2529"
        id="text2911"
        sodipodi:linespacing="100%"
-       transform="scale(0.9179321,1.0894052)"
+       transform="scale(0.917932,1.089405)"
        inkscape:export-filename="/home/alver/jabref/jabref/src/images/splash.png"
        inkscape:export-xdpi="75"
        inkscape:export-ydpi="75"><tspan
          sodipodi:role="line"
          id="tspan2913"
-         x="444.77087"
-         y="426.25284"
-         style="font-size:119.00261688px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:#727888;stroke-width:1.80000007;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;font-family:Bitstream Vera Sans">2.9.2</tspan></text>
+         x="462.20135"
+         y="426.2529"
+         style="font-size:119.00263214px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:#727888;stroke-width:1.80000031;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;font-family:Bitstream Vera Sans">2.10</tspan></text>
     <text
        xml:space="preserve"
        style="font-size:41.23898697px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#ff0000;fill-opacity:1;stroke:#ff6600;stroke-width:2.8878212;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;font-family:Nimbus Sans L"
-       x="243.9458"
-       y="638.84186"
+       x="210.24789"
+       y="610.62048"
        id="text2911-4"
        sodipodi:linespacing="100%"
        transform="matrix(0.80568825,-0.44174063,0.52619691,0.95267301,0,0)"
@@ -304,8 +304,8 @@
        inkscape:export-ydpi="75"><tspan
          sodipodi:role="line"
          id="tspan2913-0"
-         x="243.9458"
-         y="638.84186"
+         x="210.24789"
+         y="610.62048"
          style="font-size:85.91455841px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#ff0000;fill-opacity:1;stroke:#ff6600;stroke-width:2.8878212;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;font-family:Bitstream Vera Sans">dev</tspan></text>
     <text
        xml:space="preserve"
diff --git a/src/images/splash.png b/src/images/splash.png
index 215a244..41c8efc 100644
Binary files a/src/images/splash.png and b/src/images/splash.png differ
diff --git a/src/java/net/sf/jabref/AdvancedTab.java b/src/java/net/sf/jabref/AdvancedTab.java
index a3746ef..fe8dbef 100644
--- a/src/java/net/sf/jabref/AdvancedTab.java
+++ b/src/java/net/sf/jabref/AdvancedTab.java
@@ -46,14 +46,14 @@ public class AdvancedTab extends JPanel implements PrefsTab {
     JPanel p1 = new JPanel(),
         p2 = new JPanel();
     String oldLnf = "";
-    boolean oldUseDef, oldBiblMode=false, oldConvertToEquation, oldCaseKeeperOnSearch;
+    boolean oldUseDef, oldBiblMode=false, oldConvertToEquation,
+            oldCaseKeeperOnSearch, oldUnitFormatterOnSearch;
     int oldPort = -1;
     
     public final static String PREF_IMPORT_CONVERT_TO_EQUATION = "importFileConvertToEquation"; 
     public final static String PREF_IMPORT_FILENAMEPATTERN = "importFileNamePattern"; 
 	
-    private JCheckBox useConvertToEquation;
-    private JCheckBox useCaseKeeperOnSearch;
+    private JCheckBox useConvertToEquation, useCaseKeeperOnSearch, useUnitFormatterOnSearch;
 	
 
     public AdvancedTab(JabRefPreferences prefs, HelpDialog diag) {
@@ -78,6 +78,7 @@ public class AdvancedTab extends JPanel implements PrefsTab {
         });
     useConvertToEquation = new JCheckBox(Globals.lang("Prefer converting subscripts and superscripts to equations rather than text"));
     useCaseKeeperOnSearch = new JCheckBox(Globals.lang("Add {} to specified title words on search to keep the correct case"));
+    useUnitFormatterOnSearch = new JCheckBox(Globals.lang("Format units by adding non-breaking separators and keeping the correct case on search"));
 	
     FormLayout layout = new FormLayout
         ("1dlu, 8dlu, left:pref, 4dlu, fill:3dlu",//, 4dlu, fill:pref",// 4dlu, left:pref, 4dlu",
@@ -157,6 +158,9 @@ public class AdvancedTab extends JPanel implements PrefsTab {
     builder.nextLine();
     builder.append(pan);
     builder.append(useCaseKeeperOnSearch);
+    builder.nextLine();
+    builder.append(pan);
+    builder.append(useUnitFormatterOnSearch);
         
     pan = builder.getPanel();
     pan.setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
@@ -183,6 +187,8 @@ public class AdvancedTab extends JPanel implements PrefsTab {
         useConvertToEquation.setSelected(oldConvertToEquation);
         oldCaseKeeperOnSearch = Globals.prefs.getBoolean("useCaseKeeperOnSearch");
         useCaseKeeperOnSearch.setSelected(oldCaseKeeperOnSearch);
+        oldUnitFormatterOnSearch = Globals.prefs.getBoolean("useUnitFormatterOnSearch");
+        useUnitFormatterOnSearch.setSelected(oldUnitFormatterOnSearch);
     }
 
     public void storeSettings() {
@@ -241,6 +247,7 @@ public class AdvancedTab extends JPanel implements PrefsTab {
         
         _prefs.putBoolean("useConvertToEquation", useConvertToEquation.isSelected());
         _prefs.putBoolean("useCaseKeeperOnSearch", useCaseKeeperOnSearch.isSelected());
+        _prefs.putBoolean("useUnitFormatterOnSearch", useUnitFormatterOnSearch.isSelected());
     }
 
     public boolean readyToClose() {
diff --git a/src/java/net/sf/jabref/AppearancePrefsTab.java b/src/java/net/sf/jabref/AppearancePrefsTab.java
index 695d569..c87b04f 100644
--- a/src/java/net/sf/jabref/AppearancePrefsTab.java
+++ b/src/java/net/sf/jabref/AppearancePrefsTab.java
@@ -53,8 +53,8 @@ class AppearancePrefsTab extends JPanel implements PrefsTab {
         fontSize = new JTextField(5);
 
 
-        colorCodes = new JCheckBox(Globals.lang
-                   ("Color codes for required and optional fields"));
+        colorCodes = new JCheckBox(
+                   Globals.lang("Color codes for required and optional fields"));
         /*antialias = new JCheckBox(Globals.lang
                   ("Use antialiasing font"));*/
         overrideFonts = new JCheckBox(Globals.lang("Override default font settings"));
@@ -85,19 +85,18 @@ class AppearancePrefsTab extends JPanel implements PrefsTab {
         builder.nextLine();
         builder.appendSeparator(Globals.lang("Table and entry editor colors"));
         builder.append(colorPanel);
-        /*builder.appendSeparator(Globals.lang("Custom icon theme"));
-        builder.append(useCustomIconTheme);
-        builder.nextLine();
-        JPanel p2 = new JPanel();
-        lab = new JLabel(Globals.lang("Custom icon theme file")+":");
-        p2.add(lab);
-        p2.add(customIconThemeFile);
-        BrowseAction browse = new BrowseAction(null, customIconThemeFile, false);
-        JButton browseBut = new JButton(Globals.lang("Browse"));
-        browseBut.addActionListener(browse);
-        p2.add(browseBut);
-        builder.append(p2);
-          */
+        //builder.appendSeparator(Globals.lang("Custom icon theme"));
+        //builder.append(useCustomIconTheme);
+        //builder.nextLine();
+        //JPanel p2 = new JPanel();
+        //lab = new JLabel(Globals.lang("Custom icon theme file")+":");
+        //p2.add(lab);
+        //p2.add(customIconThemeFile);
+        //BrowseAction browse = new BrowseAction(null, customIconThemeFile, false);
+        //JButton browseBut = new JButton(Globals.lang("Browse"));
+        //browseBut.addActionListener(browse);
+        //p2.add(browseBut);
+        //builder.append(p2);
 
     JPanel upper = new JPanel(),
         sort = new JPanel(),
diff --git a/src/java/net/sf/jabref/AutoLinkFilesAction.java b/src/java/net/sf/jabref/AutoLinkFilesAction.java
new file mode 100644
index 0000000..788232b
--- /dev/null
+++ b/src/java/net/sf/jabref/AutoLinkFilesAction.java
@@ -0,0 +1,50 @@
+package net.sf.jabref;
+
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.ArrayList;
+
+import javax.swing.AbstractAction;
+import javax.swing.JDialog;
+
+import net.sf.jabref.undo.NamedCompound;
+
+/**
+ * This Action may only be used in a menu or button.
+ * Never in the entry editor. FileListEditor and EntryEditor have other ways to update the file links
+ */
+public class AutoLinkFilesAction extends AbstractAction {
+    public AutoLinkFilesAction() {
+        putValue(SMALL_ICON, GUIGlobals.getImage("autoGroup"));
+        putValue(NAME, Globals.lang("Automatically set file links"));
+        putValue(ACCELERATOR_KEY, Globals.prefs.getKey("Automatically link files"));
+    }
+
+    public void actionPerformed(ActionEvent event) {
+        ArrayList<BibtexEntry> entries = new ArrayList<BibtexEntry>();
+        for (BibtexEntry e: JabRef.jrf.basePanel().getSelectedEntries()) {
+            entries.add(e);
+        }
+        if (entries.isEmpty()) {
+            JabRef.jrf.basePanel().output(Globals.lang("No entries selected."));
+            return;
+        }
+        JDialog diag = new JDialog(JabRef.jrf, true);
+        final NamedCompound nc = new NamedCompound(Globals.lang("Automatically set file links"));
+        Util.autoSetLinks(entries, nc, null, null, JabRef.jrf.basePanel().metaData(), new ActionListener() {
+            public void actionPerformed(ActionEvent e) {
+                if (e.getID() > 0) {
+                    // entry has been updated in Util.autoSetLinks, only treat nc and status message
+                    if (nc.hasEdits()) {
+                        nc.end();
+                        JabRef.jrf.basePanel().undoManager.addEdit(nc);
+                        JabRef.jrf.basePanel().markBaseChanged();
+                    }
+                    JabRef.jrf.output(Globals.lang("Finished autosetting external links."));
+                }
+                else JabRef.jrf.output(Globals.lang("Finished autosetting external links.")
+                    +" "+Globals.lang("No files found."));
+            }
+        }, diag);
+    }
+}
diff --git a/src/java/net/sf/jabref/BasePanel.java b/src/java/net/sf/jabref/BasePanel.java
index 43438b6..6727e71 100644
--- a/src/java/net/sf/jabref/BasePanel.java
+++ b/src/java/net/sf/jabref/BasePanel.java
@@ -42,6 +42,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.Vector;
+import java.util.logging.Logger;
+
 import javax.swing.AbstractAction;
 import javax.swing.JComponent;
 import javax.swing.JFileChooser;
@@ -54,6 +56,7 @@ import javax.swing.tree.TreePath;
 import javax.swing.undo.CannotRedoException;
 import javax.swing.undo.CannotUndoException;
 
+import net.sf.jabref.DatabaseChangeEvent.ChangeType;
 import net.sf.jabref.autocompleter.AbstractAutoCompleter;
 import net.sf.jabref.autocompleter.AutoCompleterFactory;
 import net.sf.jabref.autocompleter.NameFieldAutoCompleter;
@@ -62,12 +65,20 @@ import net.sf.jabref.collab.FileUpdateListener;
 import net.sf.jabref.collab.FileUpdatePanel;
 import net.sf.jabref.export.ExportToClipboardAction;
 import net.sf.jabref.export.FileActions;
+import net.sf.jabref.export.OpenFolder;
 import net.sf.jabref.export.SaveDatabaseAction;
 import net.sf.jabref.export.SaveException;
 import net.sf.jabref.export.SaveSession;
 import net.sf.jabref.export.layout.Layout;
 import net.sf.jabref.export.layout.LayoutHelper;
-import net.sf.jabref.external.*;
+import net.sf.jabref.external.AttachFileAction;
+import net.sf.jabref.external.AutoSetExternalFileForEntries;
+import net.sf.jabref.external.ExternalFileMenuItem;
+import net.sf.jabref.external.ExternalFileType;
+import net.sf.jabref.external.FindFullTextAction;
+import net.sf.jabref.external.RegExpFileSearch;
+import net.sf.jabref.external.SynchronizeFileField;
+import net.sf.jabref.external.WriteXMPAction;
 import net.sf.jabref.groups.GroupSelector;
 import net.sf.jabref.groups.GroupTreeNode;
 import net.sf.jabref.gui.*;
@@ -80,17 +91,17 @@ import net.sf.jabref.labelPattern.LabelPatternUtil;
 import net.sf.jabref.labelPattern.SearchFixDuplicateLabels;
 import net.sf.jabref.search.NoSearchMatcher;
 import net.sf.jabref.search.SearchMatcher;
-import net.sf.jabref.specialfields.SpecialFieldAction;
 import net.sf.jabref.specialfields.Priority;
 import net.sf.jabref.specialfields.Quality;
 import net.sf.jabref.specialfields.Rank;
 import net.sf.jabref.specialfields.Relevance;
+import net.sf.jabref.specialfields.SpecialFieldAction;
 import net.sf.jabref.specialfields.SpecialFieldDatabaseChangeListener;
 import net.sf.jabref.specialfields.SpecialFieldValue;
 import net.sf.jabref.sql.DBConnectDialog;
+import net.sf.jabref.sql.DBExporterAndImporterFactory;
 import net.sf.jabref.sql.DBStrings;
 import net.sf.jabref.sql.DbConnectAction;
-import net.sf.jabref.sql.DBExporterAndImporterFactory;
 import net.sf.jabref.sql.SQLUtil;
 import net.sf.jabref.sql.exporter.DBExporter;
 import net.sf.jabref.undo.CountingUndoManager;
@@ -110,6 +121,7 @@ import com.jgoodies.forms.layout.FormLayout;
 import com.jgoodies.uif_lite.component.UIFSplitPane;
 
 public class BasePanel extends JPanel implements ClipboardOwner, FileUpdateListener {
+    private static Logger logger = Logger.getLogger(BasePanel.class.getName());
 
     public final static int SHOWING_NOTHING=0, SHOWING_PREVIEW=1, SHOWING_EDITOR=2, WILL_SHOW_EDITOR=3;
     
@@ -139,6 +151,10 @@ public class BasePanel extends JPanel implements ClipboardOwner, FileUpdateListe
     GridBagLayout gbl = new GridBagLayout();
     GridBagConstraints con = new GridBagConstraints();
 
+    // Hashtable indexing the only search auto completer
+    // required for the SearchAutoCompleterUpdater
+    HashMap<String, AbstractAutoCompleter> searchAutoCompleterHM = new HashMap<String, AbstractAutoCompleter>();
+
     HashMap<String, AbstractAutoCompleter> autoCompleters = new HashMap<String, AbstractAutoCompleter>();
     // Hashtable that holds as keys the names of the fields where
     // autocomplete is active, and references to the autocompleter objects.
@@ -263,6 +279,9 @@ public class BasePanel extends JPanel implements ClipboardOwner, FileUpdateListe
 
         metaData.setFile(file);
 
+        // ensure that at each addition of a new entry, the entry is added to the groups interface
+        db.addDatabaseChangeListener(new GroupTreeUpdater());
+
         if (file == null) {
             if (!database.getEntries().isEmpty()) {
                 // if the database is not empty and no file is assigned,
@@ -276,7 +295,7 @@ public class BasePanel extends JPanel implements ClipboardOwner, FileUpdateListe
                 fileMonitorHandle = Globals.fileUpdateMonitor.addUpdateListener(this,
                         file);
             } catch (IOException ex) {
-                System.err.println(ex);
+                logger.warning(ex.toString());
             }
         }
         
@@ -602,7 +621,6 @@ public class BasePanel extends JPanel implements ClipboardOwner, FileUpdateListe
                               be.setId(Util.createNeutralId());
                               database.insertEntry(be);
                               
-                              addToSelectedGroup(be); 
                               ce.addEdit(new UndoableInsertEntry
                                          (database, be, BasePanel.this));
                             } catch (KeyCollisionException ex) {
@@ -924,6 +942,13 @@ public class BasePanel extends JPanel implements ClipboardOwner, FileUpdateListe
         
      // The action for cleaning up entry.
         actions.put("Cleanup", cleanUpAction);
+        
+        actions.put("mergeEntries", new BaseAction() {
+            public void action() {
+                MergeEntriesDialog med = new MergeEntriesDialog(BasePanel.this);
+                
+            }
+        });
 
         actions.put("search", new BaseAction() {
                 public void action() {
@@ -1082,6 +1107,7 @@ public class BasePanel extends JPanel implements ClipboardOwner, FileUpdateListe
 
           actions.put("mergeDatabase", new AppendDatabaseAction(frame, this));
 
+          actions.put("openFolder", new OpenFolder(frame));
 
         actions.put("openFile", new BaseAction() {
             public void action() {
@@ -1614,6 +1640,9 @@ public class BasePanel extends JPanel implements ClipboardOwner, FileUpdateListe
 
         actions.put("resolveDuplicateKeys", new SearchFixDuplicateLabels(this));
 
+        actions.put("addToGroup", new GroupAddRemoveDialog(this, true));
+        actions.put("removeFromGroup", new GroupAddRemoveDialog(this, false));
+
         //actions.put("downloadFullText", new FindFullTextAction(this));
     }
 
@@ -1774,7 +1803,7 @@ public class BasePanel extends JPanel implements ClipboardOwner, FileUpdateListe
                 database.insertEntry(be);
                 // Set owner/timestamp if options are enabled:
                 ArrayList<BibtexEntry> list = new ArrayList<BibtexEntry>();
-                list.add(be);                
+                list.add(be);
                 Util.setAutomaticFields(list, true, true, false);
 
                 // Create an UndoableInsertEntry object.
@@ -1800,10 +1829,7 @@ public class BasePanel extends JPanel implements ClipboardOwner, FileUpdateListe
                 }
 
                 markBaseChanged(); // The database just changed.
-                new FocusRequester(getEntryEditor(be));              
-
-                //Add the new entry to the group(s) selected in the Group Panel
-                addToSelectedGroup(be);
+                new FocusRequester(getEntryEditor(be));
 
                 return be;
             } catch (KeyCollisionException ex) {
@@ -1814,14 +1840,15 @@ public class BasePanel extends JPanel implements ClipboardOwner, FileUpdateListe
     }
 
     /**
-     * This method is called to add a new entry to a group (or a set of groups)
+     * This listener is used to add a new entry to a group (or a set of groups)
      * in case the Group View is selected and one or more groups are marked
-     * @param bibEntry The new entry.
-     */    
-	private void addToSelectedGroup(final BibtexEntry bibEntry) {
-		if (Globals.prefs.getBoolean("autoAssignGroup")){
-			if (frame.groupToggle.isSelected()){
-				BibtexEntry[] entries = {bibEntry};
+     */
+    private class GroupTreeUpdater implements DatabaseChangeListener {
+        public void databaseChanged(DatabaseChangeEvent e) {
+            if ( (e.getType() == ChangeType.ADDED_ENTRY)
+                 && (Globals.prefs.getBoolean("autoAssignGroup"))
+                 && (frame.groupToggle.isSelected())) {
+				BibtexEntry[] entries = {e.getEntry()};
 				TreePath[] selection = frame.groupSelector.getGroupsTree().getSelectionPaths();
 				if (selection != null) {
 					// it is possible that the user selected nothing. Therefore, checked for "!= null"
@@ -1829,11 +1856,40 @@ public class BasePanel extends JPanel implements ClipboardOwner, FileUpdateListe
 						((GroupTreeNode)(tree.getLastPathComponent())).addToGroup(entries);
 					}
 				}
-				this.updateEntryEditorIfShowing();
-				this.getGroupSelector().valueChanged(null);
-			}
-		}
-	}
+				//BasePanel.this.updateEntryEditorIfShowing(); // doesn't seem to be necessary
+				SwingUtilities.invokeLater(new Runnable() {
+                    @Override
+                    public void run() {
+                        BasePanel.this.getGroupSelector().valueChanged(null);
+                    }
+                });
+            }
+        }
+    }
+
+    /**
+     * Ensures that the search auto completer is up to date when entries are changed
+     * AKA Let the auto completer, if any, harvest words from the entry
+     */
+    private class SearchAutoCompleterUpdater implements DatabaseChangeListener {
+        public void databaseChanged(DatabaseChangeEvent e) {
+            if ((e.getType() == ChangeType.CHANGED_ENTRY) || (e.getType() == ChangeType.ADDED_ENTRY)) {
+                Util.updateCompletersForEntry(BasePanel.this.searchAutoCompleterHM, e.getEntry());
+            }
+        }
+    }
+
+    /**
+     * Ensures that auto completers are up to date when entries are changed
+     * AKA Let the auto completer, if any, harvest words from the entry
+     */
+    private class AutoCompletersUpdater implements DatabaseChangeListener {
+        public void databaseChanged(DatabaseChangeEvent e) {
+            if ((e.getType() == ChangeType.CHANGED_ENTRY) || (e.getType() == ChangeType.ADDED_ENTRY)) {
+                Util.updateCompletersForEntry(BasePanel.this.getAutoCompleters(), e.getEntry());
+            }
+        }
+    }
 
     /**
      * This method is called from JabRefFrame when the user wants to
@@ -2040,11 +2096,15 @@ public class BasePanel extends JPanel implements ClipboardOwner, FileUpdateListe
         add(splitPane, BorderLayout.CENTER);
 
         // Set up name autocompleter for search:
+        //if (!Globals.prefs.getBoolean("searchAutoComplete")) {
         instantiateSearchAutoCompleter();
+        this.getDatabase().addDatabaseChangeListener(new SearchAutoCompleterUpdater());
 
         // Set up AutoCompleters for this panel:
         if (Globals.prefs.getBoolean("autoComplete")) {
             instantiateAutoCompleters();
+            // ensure that the autocompleters are in sync with entries
+            this.getDatabase().addDatabaseChangeListener(new AutoCompletersUpdater());
         }
 
         splitPane.revalidate();
@@ -2065,13 +2125,10 @@ public class BasePanel extends JPanel implements ClipboardOwner, FileUpdateListe
     }
 
     private void instantiateSearchAutoCompleter() {
-        //if (!Globals.prefs.getBoolean("searchAutoComplete"))
-        //    return;
         searchCompleter = new NameFieldAutoCompleter(new String[] {"author", "editor"}, true);
-        HashMap<String, AbstractAutoCompleter> hm = new HashMap<String, AbstractAutoCompleter>();
-        hm.put("x", searchCompleter);
+        searchAutoCompleterHM.put("x", searchCompleter);
         for (BibtexEntry entry : database.getEntries()){
-            Util.updateCompletersForEntry(hm, entry);
+            Util.updateCompletersForEntry(searchAutoCompleterHM, entry);
         }
         searchCompleteListener = new AutoCompleteListener(searchCompleter);
         searchCompleteListener.setConsumeEnterKey(false); // So you don't have to press Enter twice
diff --git a/src/java/net/sf/jabref/BibtexEntry.java b/src/java/net/sf/jabref/BibtexEntry.java
index c2e6a5e..a2e3b14 100644
--- a/src/java/net/sf/jabref/BibtexEntry.java
+++ b/src/java/net/sf/jabref/BibtexEntry.java
@@ -52,6 +52,77 @@ public class BibtexEntry
     // Search and grouping status is stored in boolean fields for quick reference:
     private boolean searchHit, groupHit;
 
+    /** Display name map for entry field names. */
+    private static final Map<String, String> tagDisplayNameMap = new HashMap<String, String>();
+    /** The maximum length of a field name to properly make the alignment of the
+     *  equal sign. */
+    private static final int maxFieldLength;
+    static{
+        // The field name display map.
+        tagDisplayNameMap.put("bibtexkey", "BibTeXKey");
+        tagDisplayNameMap.put("howpublished", "HowPublished");
+        tagDisplayNameMap.put("lastchecked", "LastChecked");
+        tagDisplayNameMap.put("isbn", "ISBN");
+        tagDisplayNameMap.put("issn", "ISSN");
+        tagDisplayNameMap.put("UNKNOWN", "UNKNOWN");
+
+        // Looking for the longest field name.
+        // XXX JK: Look for all used field names not only defined once, since
+        //         there may be some unofficial field name used.
+        int max = 0;
+        for (BibtexEntryType t : BibtexEntryType.ALL_TYPES.values()) {
+            if (t.getRequiredFields() != null) {
+                for(String field : t.getRequiredFields()) {
+                    max = Math.max(max, field.length());
+                }
+            }
+            if (t.getOptionalFields() != null) {
+                for(String field : t.getOptionalFields()) {
+                    max = Math.max(max, field.length());
+                }
+            }
+        }
+        maxFieldLength = max;
+    }
+
+    /**
+     * Get display version of a entry field.
+     *
+     * BibTeX is case-insensitive therefore there is no difference between:
+     * howpublished, HOWPUBLISHED, HowPublished, etc. Since the camel case
+     * version is the most easy to read this should be the one written in the
+     * *.bib file. Since there is no way how do detect multi-word strings by
+     * default the first character will be made uppercase. In other characters
+     * case needs to be changed the {@link #tagDisplayNameMap} will be used. 
+     *
+     * @param field The name of the field.
+     * @return The display version of the field name.
+     */
+	private static final String getFieldDisplayName(String field) {
+        if (field.length() == 0) {
+            // hard coded "UNKNOWN" is assigned to a field without any name
+            field = "UNKNOWN";
+        }
+
+        String suffix = "";
+		if (JabRef.jrf.prefs.getBoolean(JabRefPreferences.WRITEFIELD_ADDSPACES)) {
+			for (int i = maxFieldLength - field.length(); i > 0; i--)
+				suffix += " ";
+		}
+
+		String res;
+		if (JabRef.jrf.prefs.getBoolean(JabRefPreferences.WRITEFIELD_CAMELCASENAME)) {
+			if (tagDisplayNameMap.containsKey(field.toLowerCase())) {
+				res = tagDisplayNameMap.get(field.toLowerCase()) + suffix;
+			} else {
+				res = (field.charAt(0)+"").toUpperCase() + field.substring(1) + suffix;
+			}
+		} else {
+			res = field + suffix;
+		}
+		return res;
+	}
+
     public BibtexEntry(){
     	this(Util.createNeutralId());
     }
@@ -329,7 +400,7 @@ public class BibtexEntry
      */
     public void write(Writer out, FieldFormatter ff, boolean write) throws IOException {
         // Write header with type and bibtex-key.
-        out.write("@"+_type.getName().toUpperCase(Locale.US)+"{");
+        out.write("@"+_type.getName()+"{");
 
         String str = Util.shaveString(getField(BibtexFields.KEY_FIELD));
         out.write(((str == null) ? "" : str)+","+Globals.NEWLINE);
@@ -337,18 +408,33 @@ public class BibtexEntry
         written.put(BibtexFields.KEY_FIELD, null);
         boolean hasWritten = false;
         // Write required fields first.
+        // Thereby, write the title field first.
+        hasWritten = hasWritten | writeField("title", out, ff, hasWritten, false);
+        written.put("title", null);
         String[] s = getRequiredFields();
-        if (s != null) for (int i=0; i<s.length; i++) {
-            hasWritten = hasWritten | writeField(s[i], out, ff, hasWritten);
-            written.put(s[i], null);
+        if (s != null) {
+            Arrays.sort(s); // Sorting in alphabetic order.
+            for (int i=0; i<s.length; i++) {
+                if (!written.containsKey(s[i])) { // If field appears both in req. and opt. don't repeat.
+                    hasWritten = hasWritten | writeField(s[i], out, ff, hasWritten, false);
+                    written.put(s[i], null);
+                }
+            }
         }
         // Then optional fields.
         s = getOptionalFields();
-        if (s != null) for (int i=0; i<s.length; i++) {
-            if (!written.containsKey(s[i])) { // If field appears both in req. and opt. don't repeat.
-                //writeField(s[i], out, ff);
-                hasWritten = hasWritten | writeField(s[i], out, ff, hasWritten);
-                written.put(s[i], null);
+        boolean first = true, previous = true;
+        previous = false;
+        if (s != null) {
+            Arrays.sort(s); // Sorting in alphabetic order.
+            for (int i=0; i<s.length; i++) {
+                if (!written.containsKey(s[i])) { // If field appears both in req. and opt. don't repeat.
+                    //writeField(s[i], out, ff);
+                    hasWritten = hasWritten | writeField(s[i], out, ff, hasWritten, hasWritten && first);
+                    written.put(s[i], null);
+                    first = false;
+                    previous = true;
+                }
             }
         }
         // Then write remaining fields in alphabetic order.
@@ -359,8 +445,11 @@ public class BibtexEntry
             if (!written.containsKey(key) && writeIt)
                        remainingFields.add(key);
         }
-        for (String field: remainingFields)
-            hasWritten = hasWritten | writeField(field, out, ff, hasWritten);
+        first = previous;
+        for (String field: remainingFields) {
+            hasWritten = hasWritten | writeField(field, out, ff, hasWritten, hasWritten && first);
+            first = false;
+        }
 
         // Finally, end the entry.
         out.write((hasWritten ? Globals.NEWLINE : "")+"}"+Globals.NEWLINE);
@@ -371,22 +460,24 @@ public class BibtexEntry
      * @param name The field name
      * @param out The Writer to send it to
      * @param ff A formatter to filter field contents before writing
-     * @param isFirst Indicates whether this is the first field written for
+     * @param isNotFirst Indicates whether this is the first field written for
      *    this entry - if not, start by writing a comma and newline
      * @return true if this field was written, false if it was skipped because
      *    it was not set
      * @throws IOException In case of an IO error
      */
     private boolean writeField(String name, Writer out,
-                            FieldFormatter ff, boolean isFirst) throws IOException {
+                            FieldFormatter ff, boolean isNotFirst, boolean isNextGroup) throws IOException {
         String o = getField(name);
-        if (o != null) {
-            if (isFirst)
+        if (o != null || Globals.prefs.getBoolean("includeEmptyFields")) {
+            if (isNotFirst)
                 out.write(","+Globals.NEWLINE);
-            out.write("  "+name+" = ");
+            if (isNextGroup)
+                out.write(Globals.NEWLINE);
+            out.write("  "+ getFieldDisplayName(name) + " = ");
 
             try {
-                out.write(ff.format(o.toString(), name));
+                out.write(ff.format(o, name));
             } catch (Throwable ex) {
                 throw new IOException
                     (Globals.lang("Error in field")+" '"+name+"': "+ex.getMessage());
diff --git a/src/java/net/sf/jabref/BibtexEntryType.java b/src/java/net/sf/jabref/BibtexEntryType.java
index f60c269..234a799 100644
--- a/src/java/net/sf/jabref/BibtexEntryType.java
+++ b/src/java/net/sf/jabref/BibtexEntryType.java
@@ -33,6 +33,11 @@ import java.util.Iterator;
 import java.util.TreeMap;
 import java.util.Locale;
 
+/**
+ * Provides a list of known entry types
+ *
+ * The list of optional and required fields is derived from http://en.wikipedia.org/wiki/BibTeX#Entry_types
+ */
 public abstract class BibtexEntryType implements Comparable<BibtexEntryType>
 {
 
@@ -79,7 +84,7 @@ public abstract class BibtexEntryType implements Comparable<BibtexEntryType>
             {
                 return new String[]
                 {
-                    "number", "month", "part", "eid", "note"
+                    "volume", "number", "pages", "month", "note", //- "volume", "pages", "part", "eid"
                 };
             }
 
@@ -87,7 +92,7 @@ public abstract class BibtexEntryType implements Comparable<BibtexEntryType>
             {
                 return new String[]
                 {
-                    "author", "title", "journal", "year", "volume", "pages"
+                    "author", "title", "journal", "year" //+ "volume", "pages"
                 };
             }
 
@@ -117,7 +122,7 @@ public abstract class BibtexEntryType implements Comparable<BibtexEntryType>
             {
                 return new String[]
                 {
-                    "author", "howpublished", "lastchecked", "address", "month", "year", "note"
+                    "author", "howpublished", "address", "month", "year", "note" //+ "lastchecked"
                 };
             }
 
@@ -149,15 +154,15 @@ public abstract class BibtexEntryType implements Comparable<BibtexEntryType>
         {
             public String getName()
             {
-                return "Inbook";
+                return "InBook";
             }
 
             public String[] getOptionalFields()
             {
                 return new String[]
                 {
-                    "volume", "number", "pages", "series", "type", "address", "edition",
-		    "month", "note"
+                    "volume", "number", "series", "type", "address", "edition",
+		    "month", "note" //+ "pages"
                 };
             }
 
@@ -206,8 +211,8 @@ public abstract class BibtexEntryType implements Comparable<BibtexEntryType>
             {
                 return new String[]
                 {
-                    "volume", "number", "pages", "series", "address", "edition", "month",
-                    "note"
+                    "volume", "number", "series", "address", "edition", "month",
+                    "note" //+ pages
                 };
             }
 
@@ -249,7 +254,7 @@ public abstract class BibtexEntryType implements Comparable<BibtexEntryType>
         {
             public String getName()
             {
-                return "Incollection";
+                return "InCollection";
             }
 
             public String[] getOptionalFields()
@@ -329,7 +334,7 @@ public abstract class BibtexEntryType implements Comparable<BibtexEntryType>
         {
             public String getName()
             {
-                return "Inproceedings";
+                return "InProceedings";
             }
 
             public String[] getOptionalFields()
@@ -447,7 +452,7 @@ public abstract class BibtexEntryType implements Comparable<BibtexEntryType>
         {
             public String getName()
             {
-                return "Techreport";
+                return "TechReport";
             }
 
             public String[] getOptionalFields()
@@ -487,7 +492,7 @@ public abstract class BibtexEntryType implements Comparable<BibtexEntryType>
         {
             public String getName()
             {
-                return "Mastersthesis";
+                return "MastersThesis";
             }
 
             public String[] getOptionalFields()
@@ -526,7 +531,7 @@ public abstract class BibtexEntryType implements Comparable<BibtexEntryType>
         {
             public String getName()
             {
-                return "Phdthesis";
+                return "PhdThesis";
             }
 
             public String[] getOptionalFields()
diff --git a/src/java/net/sf/jabref/BibtexString.java b/src/java/net/sf/jabref/BibtexString.java
index 523bcbd..f6bb873 100644
--- a/src/java/net/sf/jabref/BibtexString.java
+++ b/src/java/net/sf/jabref/BibtexString.java
@@ -15,14 +15,87 @@
 */
 package net.sf.jabref;
 
+/**
+ * This class models a BibTex String ("@String")
+ */
 public class BibtexString {
 
+    /**
+     * Type of a \@String.
+     *
+     * Differentiate a \@String based on its usage:
+     *
+     * - {@link #AUTHOR}: prefix "a", for author and editor fields.
+     * - {@link #INSTITUTION}: prefix "i", for institution and organization
+     *                         field
+     * - {@link #PUBLISHER}: prefix "p", for publisher fields
+     * - {@link #OTHER}: no prefix, for any field
+     *
+     * Examples:
+     *
+     * \@String { aKahle    = "Kahle, Brewster " } -> author
+     * \@String { aStallman = "Stallman, Richard" } -> author
+     * \@String { iMIT      = "{Massachusetts Institute of Technology ({MIT})}" } -> institution
+     * \@String { pMIT      = "{Massachusetts Institute of Technology ({MIT}) press}" } -> publisher
+     * \@String { anct      = "Anecdote" } -> other
+     * \@String { eg        = "for example" } -> other
+     * \@String { et        = " and " } -> other
+     * \@String { lBigMac   = "Big Mac" } -> other
+     *
+     * Usage:
+     *
+     * \@Misc {
+     *   title       = "The GNU Project"
+     *   author      = aStallman # et # aKahle
+     *   institution = iMIT
+     *   publisher   = pMIT
+     *   note        = "Just " # eg
+     * }
+     *
+     * @author Jan Kubovy <jan at kubovy.eu>
+     */
+    public enum Type {
+		AUTHOR("a"),
+        INSTITUTION("i"),
+        PUBLISHER("p"),
+        OTHER("");
+
+        private String prefix;
+
+        Type(String prefix) {
+            this.prefix = prefix;
+        }
+
+        public static final Type get(String name) {
+        	if (name.length() == 0) {
+        		return OTHER;
+        	}
+            if (!(name.charAt(1) + "").toUpperCase().equals(
+                    (name.charAt(1) + "")))
+                return OTHER;
+            for(Type t : Type.values()) {
+                if (t.prefix.equals(name.charAt(0) + ""))
+                    return t;
+            }
+            return OTHER;
+        }
+    }
+
     String _name, _content, _id;
+    Type _type;
 
     public BibtexString(String id, String name, String content) {
 	_id = id;
 	_name = name;
 	_content = content;
+	_type = Type.get(name);
+    }
+
+    public BibtexString(String id, String name, String content, Type type) {
+	_id = id;
+	_name = name;
+	_content = content;
+	_type = type;
     }
 
     public String getId() {
@@ -39,6 +112,7 @@ public class BibtexString {
 
     public void setName(String name) {
 	_name = name;
+	_type = Type.get(name);
     }
 
     public String getContent() {
@@ -53,4 +127,7 @@ public class BibtexString {
       return new BibtexString(_id, _name, _content);
     }
 
+    public Type getType() {
+        return _type;
+    }
 }
diff --git a/src/java/net/sf/jabref/CompressedEntryEditorTab.java b/src/java/net/sf/jabref/CompressedEntryEditorTab.java
index 8279d73..fdf9efd 100644
--- a/src/java/net/sf/jabref/CompressedEntryEditorTab.java
+++ b/src/java/net/sf/jabref/CompressedEntryEditorTab.java
@@ -35,10 +35,8 @@ import java.util.List;
 
 /**
  * A single tab displayed in the EntryEditor holding several FieldEditors.
- *
- * @author $Author$
- * @version $Revision$ ($Date$)
- *
+ * 
+ * Used in Biblatex mode (called from setupFiledPanels())
  */
 public class CompressedEntryEditorTab extends EntryEditorTab {
 
@@ -55,6 +53,9 @@ public class CompressedEntryEditorTab extends EntryEditorTab {
 
 	private FieldEditor activeField = null;
 
+	// UGLY HACK to have a pointer to the fileListEditor to call autoSetLinks()
+	public FileListEditor fileListEditor = null;
+
 	public CompressedEntryEditorTab(JabRefFrame frame, BasePanel panel, List<String> fields, EntryEditor parent,
                           boolean addKeyField, String name) {
 		if (fields != null)
@@ -126,9 +127,10 @@ public class CompressedEntryEditorTab extends EntryEditorTab {
             int editorType = BibtexFields.getEditorType(fields[i]);
 
             final FieldEditor ta;
-            if (editorType == GUIGlobals.FILE_LIST_EDITOR)
+            if (editorType == GUIGlobals.FILE_LIST_EDITOR) {
                 ta = new FileListEditor(frame, bPanel.metaData(), fields[i], null, parent);
-            else{
+                fileListEditor = (FileListEditor) ta;
+            } else {
                 ta = new FieldTextArea(fields[i], null);
                 //inform the fieldtextarea of search events to highlight searchstrings
                 frame.getSearchManager().addSearchListener((FieldTextArea)ta);                
diff --git a/src/java/net/sf/jabref/DatabaseSearch.java b/src/java/net/sf/jabref/DatabaseSearch.java
index f19ce43..9a2a7c6 100644
--- a/src/java/net/sf/jabref/DatabaseSearch.java
+++ b/src/java/net/sf/jabref/DatabaseSearch.java
@@ -97,8 +97,7 @@ public class DatabaseSearch extends Thread {
 		final int outputHits = hits;
 		SwingUtilities.invokeLater(new Thread() {
 			public void run() {
-				panel.output(Globals
-                    .lang("Searched database. Global number of hits")
+				panel.output(Globals.lang("Searched database. Global number of hits")
                     + ": " + outputHits);
 			}
 		});
diff --git a/src/java/net/sf/jabref/EntryEditor.java b/src/java/net/sf/jabref/EntryEditor.java
index 4ce8458..86a2901 100644
--- a/src/java/net/sf/jabref/EntryEditor.java
+++ b/src/java/net/sf/jabref/EntryEditor.java
@@ -43,6 +43,7 @@ import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
+import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import javax.swing.AbstractAction;
@@ -50,7 +51,6 @@ import javax.swing.ActionMap;
 import javax.swing.InputMap;
 import javax.swing.JButton;
 import javax.swing.JComponent;
-import javax.swing.JDialog;
 import javax.swing.JFileChooser;
 import javax.swing.JLabel;
 import javax.swing.JOptionPane;
@@ -71,10 +71,7 @@ import net.sf.jabref.autocompleter.AbstractAutoCompleter;
 import net.sf.jabref.export.LatexFieldFormatter;
 import net.sf.jabref.external.ExternalFilePanel;
 import net.sf.jabref.external.WriteXMPEntryEditorAction;
-import net.sf.jabref.gui.FileDialogs;
-import net.sf.jabref.gui.FileListEditor;
-import net.sf.jabref.gui.FileListTableModel;
-import net.sf.jabref.gui.VerticalLabelUI;
+import net.sf.jabref.gui.*;
 import net.sf.jabref.gui.date.DatePickerButton;
 import net.sf.jabref.help.HelpAction;
 import net.sf.jabref.imports.BibtexParser;
@@ -130,7 +127,9 @@ public class EntryEditor extends JPanel implements VetoableChangeListener, Entry
     // The action which generates a bibtexkey for this entry.
     public GenerateKeyAction generateKeyAction;
 
-    public AutoSetFileAction autoLink = new AutoSetFileAction();
+    // UGLY HACK to have a pointer to the fileListEditor to call autoSetLinks()
+    private FileListEditor fileListEditor = null;
+    private final AutoLinkAction autoLinkAction = new AutoLinkAction();
 
     public AbstractAction writeXmp;
 
@@ -154,7 +153,7 @@ public class EntryEditor extends JPanel implements VetoableChangeListener, Entry
 
     JLabel lab;
 
-    TypeLabel typeLabel;
+    TypeButton typeButton;
 
     JabRefFrame frame;
 
@@ -236,6 +235,7 @@ public class EntryEditor extends JPanel implements VetoableChangeListener, Entry
         if (fields != null)
             fieldList = java.util.Arrays.asList(fields);
         reqPan = new EntryEditorTab(frame, panel, fieldList, this, true, Globals.lang("Required fields"));
+        if (reqPan.fileListEditor != null) fileListEditor = reqPan.fileListEditor;
         tabbed.addTab(Globals.lang("Required fields"), GUIGlobals.getImage("required"), reqPan
             .getPane(), Globals.lang("Show required fields"));
         tabs.add(reqPan);
@@ -244,6 +244,7 @@ public class EntryEditor extends JPanel implements VetoableChangeListener, Entry
             if (!prefs.getBoolean("biblatexMode")) {
                 optPan = new EntryEditorTab(frame, panel, java.util.Arrays.asList(entry.getOptionalFields()), this,
                     false, Globals.lang("Optional fields"));
+                if (optPan.fileListEditor != null) fileListEditor = optPan.fileListEditor;
                 tabbed.addTab(Globals.lang("Optional fields"), GUIGlobals.getImage("optional"), optPan
                     .getPane(), Globals.lang("Show optional fields"));
                 tabs.add(optPan);
@@ -252,6 +253,7 @@ public class EntryEditor extends JPanel implements VetoableChangeListener, Entry
                 optPan = new CompressedEntryEditorTab(frame, panel,
                         java.util.Arrays.asList(entry.getType().getPrimaryOptionalFields()), this,
                     false, Globals.lang("Optional fields"));
+                if (optPan.fileListEditor != null) fileListEditor = optPan.fileListEditor;
                 tabbed.addTab(Globals.lang("Optional fields"), GUIGlobals.getImage("optional"), optPan
                     .getPane(), Globals.lang("Show optional fields"));
                 tabs.add(optPan);
@@ -259,10 +261,10 @@ public class EntryEditor extends JPanel implements VetoableChangeListener, Entry
                         java.util.Arrays.asList(Util.getRemainder(entry.getOptionalFields(),
                                 entry.getType().getPrimaryOptionalFields())), this,
                     false, Globals.lang("Optional fields 2"));
+                if (optPan.fileListEditor != null) fileListEditor = optPan.fileListEditor;
                 tabbed.addTab(Globals.lang("Optional fields 2"), GUIGlobals.getImage("optional"), optPan
                     .getPane(), Globals.lang("Show optional fields"));
                 tabs.add(optPan);
-
             }
         }
 
@@ -270,6 +272,7 @@ public class EntryEditor extends JPanel implements VetoableChangeListener, Entry
         for (int i = 0; i < tabList.getTabCount(); i++) {
             EntryEditorTab newTab = new EntryEditorTab(frame, panel, tabList.getTabFields(i), this, false,
                 tabList.getTabName(i));
+            if (newTab.fileListEditor != null) fileListEditor = newTab.fileListEditor;
             tabbed.addTab(tabList.getTabName(i), GUIGlobals.getImage("general"), newTab.getPane());
             tabs.add(newTab);
         }
@@ -288,6 +291,9 @@ public class EntryEditor extends JPanel implements VetoableChangeListener, Entry
         return type;
     }
 
+    /**
+     * @return reference to the currently edited entry
+     */
     public BibtexEntry getEntry() {
         return entry;
     }
@@ -318,7 +324,7 @@ public class EntryEditor extends JPanel implements VetoableChangeListener, Entry
         im.put(prefs.getKey("Autogenerate BibTeX keys"), "generateKey");
         am.put("generateKey", generateKeyAction);
         im.put(prefs.getKey("Automatically link files"), "autoLink");
-        am.put("autoLink", autoLink);
+        am.put("autoLink", autoLinkAction);
         im.put(prefs.getKey("Entry editor, previous entry"), "prev");
         am.put("prev", prevEntryAction);
         im.put(prefs.getKey("Entry editor, next entry"), "next");
@@ -336,18 +342,16 @@ public class EntryEditor extends JPanel implements VetoableChangeListener, Entry
         JButton closeBut = new JButton(closeAction);
         closeBut.setText(null);
         closeBut.setBorder(null);
+        closeBut.setMargin(new Insets(8,0,8,0));
         leftPan.add(closeBut, BorderLayout.NORTH);
 
         // Create type-label
-        typeLabel = new TypeLabel(entry.getType().getName());
-        leftPan.add(typeLabel, BorderLayout.CENTER);
-
-        //tlb.add(typeL);
+        leftPan.add(new TypeLabel(entry.getType().getName()), BorderLayout.CENTER);
+        typeButton = new TypeButton(entry.getType().getName());
 
-        tlb.addSeparator();
-        
+        tlb.add(typeButton);
         tlb.add(generateKeyAction);
-        tlb.add(autoLink);
+        tlb.add(autoLinkAction);
 
         tlb.add(writeXmp);
 
@@ -535,7 +539,7 @@ public class EntryEditor extends JPanel implements VetoableChangeListener, Entry
 
         //DefaultFormBuilder builder = new DefaultFormBuilder
         //        (srcPanel, new FormLayout( "fill:pref:grow", "fill:pref:grow"));
-        source.setEditable(true); // prefs.getBoolean("enableSourceEditing"));
+        source.setEditable(true);
         source.setLineWrap(true);
         source.setTabSize(GUIGlobals.INDENT);
         source.addFocusListener(new FieldEditorFocusListener());
@@ -996,44 +1000,45 @@ public class EntryEditor extends JPanel implements VetoableChangeListener, Entry
         movingToDifferentEntry = true;
     }
 
-    private class TypeLabel extends JLabel {
-        public TypeLabel(String type) {
-            super(type+" ");
-            setUI(new VerticalLabelUI(false));
-            setForeground(GUIGlobals.entryEditorLabelColor);
-            setHorizontalAlignment(RIGHT);
-            setFont(GUIGlobals.typeNameFont);
-            addMouseListener(new MouseAdapter() {
-                public void mouseClicked(MouseEvent e) {
-                    boolean ctrlClick = prefs.getBoolean("ctrlClick");
-
-                    if ((e.getButton() == MouseEvent.BUTTON3)
-                        || (ctrlClick && (e.getButton() == MouseEvent.BUTTON1) && e.isControlDown())) {
-                        JPopupMenu typeMenu = new JPopupMenu();
-
-                        // typeMenu.addSeparator();
-                        for (String s: BibtexEntryType.ALL_TYPES.keySet())
-                            typeMenu.add(new ChangeTypeAction(BibtexEntryType.getType(s), panel));
+    private class TypeButton extends JButton {
+        public TypeButton(String type) {
+            super(GUIGlobals.getImage("edit"));
+            setToolTipText(Globals.lang("Change entry type"));
+            addActionListener(new ActionListener() {
+                public void actionPerformed(ActionEvent e) {
+                    JPopupMenu typeMenu = new JPopupMenu();
+                    for (String s: BibtexEntryType.ALL_TYPES.keySet())
+                        typeMenu.add(new ChangeTypeAction(BibtexEntryType.getType(s), panel));
 
-                        typeMenu.show(ths, e.getX(), e.getY());
-                    }
+                    typeMenu.show(ths, 0, 0);
                 }
             });
         }
 
-        public void paintComponent(Graphics g) {
-            Graphics2D g2 = (Graphics2D) g;
-            //g2.setColor(GUIGlobals.entryEditorLabelColor);
-            //g2.setFont(GUIGlobals.typeNameFont);
-            //FontMetrics fm = g2.getFontMetrics();
-            //int width = fm.stringWidth(label);
-            g2.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
-            super.paintComponent(g2);
-            //g2.rotate(-Math.PI / 2, 0, 0);
-            //g2.drawString(label, -width - 7, 28);
-        }
     }
 
+    private class TypeLabel extends JLabel {
+            public TypeLabel(String type) {
+                super(type);
+                setUI(new VerticalLabelUI(false));
+                setForeground(GUIGlobals.entryEditorLabelColor);
+                setHorizontalAlignment(RIGHT);
+                setFont(GUIGlobals.typeNameFont);
+            }
+
+            public void paintComponent(Graphics g) {
+                Graphics2D g2 = (Graphics2D) g;
+                //g2.setColor(GUIGlobals.entryEditorLabelColor);
+                //g2.setFont(GUIGlobals.typeNameFont);
+                //FontMetrics fm = g2.getFontMetrics();
+                //int width = fm.stringWidth(label);
+                g2.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
+                super.paintComponent(g2);
+                //g2.rotate(-Math.PI / 2, 0, 0);
+                //g2.drawString(label, -width - 7, 28);
+            }
+        }
+
     class FieldListener extends FocusAdapter {
         /*
          * Focus listener that fires the storeFieldAction when a FieldTextArea
@@ -1173,8 +1178,13 @@ public class EntryEditor extends JPanel implements VetoableChangeListener, Entry
                 }
 
                 // Add an UndoableKeyChange to the baseframe's undoManager.
-                panel.undoManager.addEdit(new UndoableKeyChange(panel.database, entry.getId(),
-                    oldValue, newValue));
+                UndoableKeyChange undoableKeyChange = new UndoableKeyChange(panel.database, entry.getId(), oldValue, newValue);
+                if (Util.updateTimeStampIsSet()) {
+                    NamedCompound ce = Util.doUpdateTimeStamp(entry, undoableKeyChange);
+                    panel.undoManager.addEdit(ce);
+                } else {
+                    panel.undoManager.addEdit(undoableKeyChange);
+                }
 
                 if ((newValue != null) && (newValue.length() > 0))
                     // fe.setLabelColor(GUIGlobals.entryEditorLabelColor);
@@ -1243,16 +1253,19 @@ public class EntryEditor extends JPanel implements VetoableChangeListener, Entry
                         if (aComp != null)
                             aComp.addBibtexEntry(entry);
 
-                        // Add an UndoableFieldChange to the baseframe's
-                        // undoManager.
-                        panel.undoManager.addEdit(new UndoableFieldChange(entry, fe.getFieldName(),
-                            oldValue, toSet));
+                        // Add an UndoableFieldChange to the baseframe's undoManager.
+                        UndoableFieldChange undoableFieldChange = new UndoableFieldChange(entry, fe.getFieldName(), oldValue, toSet);
+                        if (Util.updateTimeStampIsSet()) {
+                            NamedCompound ce = Util.doUpdateTimeStamp(entry, undoableFieldChange);
+                            panel.undoManager.addEdit(ce);
+                        } else {
+                            panel.undoManager.addEdit(undoableFieldChange);
+                        }
                         updateSource();
                         panel.markBaseChanged();
-
                     } catch (IllegalArgumentException ex) {
-                        JOptionPane.showMessageDialog(frame, Globals.lang("Error") + ": " + ex.getMessage(), Globals
-                            .lang("Error setting field"), JOptionPane.ERROR_MESSAGE);
+                        JOptionPane.showMessageDialog(frame, Globals.lang("Error") + ": " + ex.getMessage(),
+                                Globals.lang("Error setting field"), JOptionPane.ERROR_MESSAGE);
                         fe.setInvalidBackgroundColor();
                     }
                 } else {
@@ -1559,28 +1572,20 @@ public class EntryEditor extends JPanel implements VetoableChangeListener, Entry
         }*/
     }
 
-
-    class AutoSetFileAction extends AbstractAction {
-        public AutoSetFileAction() {
+    private class AutoLinkAction extends AbstractAction {
+        public AutoLinkAction() {
             putValue(SMALL_ICON, GUIGlobals.getImage("autoGroup"));
-            putValue(SHORT_DESCRIPTION, Globals.lang("Automatically set file links for this entry")
-                    +" (Alt-F)");
+            putValue(SHORT_DESCRIPTION, Globals.lang("Automatically set file links for this entry") + " (Alt-F)");
         }
 
         public void actionPerformed(ActionEvent event) {
-            JDialog diag = new JDialog(frame, true);
-            final FileListTableModel tableModel = new FileListTableModel();
-            tableModel.setContent(entry.getField(GUIGlobals.FILE_FIELD));
-            FileListEditor.autoSetLinks(entry, tableModel, panel.metaData(), new ActionListener() {
-                public void actionPerformed(ActionEvent e) {
-                    if (e.getID() > 0) {
-                        entry.setField(GUIGlobals.FILE_FIELD, tableModel.getStringRepresentation());
-                        frame.output(Globals.lang("Finished autosetting external links."));
-                    }
-                    else frame.output(Globals.lang("Finished autosetting external links.")
-                        +" "+Globals.lang("No files found."));
-                }
-            }, diag);
+            FileListEditor fileListEditor = EntryEditor.this.fileListEditor;
+            if (fileListEditor == null) {
+                logger.log(Level.WARNING, "No file list editor found.");
+            } else {
+                fileListEditor.autoSetLinks();
+            }
         }
     }
+
 }
diff --git a/src/java/net/sf/jabref/EntryEditorPrefsTab.java b/src/java/net/sf/jabref/EntryEditorPrefsTab.java
index 1ff0589..55d0c4f 100644
--- a/src/java/net/sf/jabref/EntryEditorPrefsTab.java
+++ b/src/java/net/sf/jabref/EntryEditorPrefsTab.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2003-2011 JabRef contributors.
+/*  Copyright (C) 2003-2013 JabRef contributors.
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
@@ -22,6 +22,8 @@ import javax.swing.*;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
 
+import org.xnap.commons.gui.shortcut.EmacsKeyBindings;
+
 import net.sf.jabref.autocompleter.AbstractAutoCompleter;
 
 import com.jgoodies.forms.builder.DefaultFormBuilder;
@@ -31,7 +33,7 @@ import com.jgoodies.forms.layout.FormLayout;
 public class EntryEditorPrefsTab extends JPanel implements PrefsTab {
 
     private JCheckBox autoOpenForm, showSource,
-        defSource, editSource, disableOnMultiple, autoComplete;
+        defSource, emacsMode, emacsRebindCtrlA, disableOnMultiple, autoComplete;
     private JRadioButton autoCompBoth, autoCompFF, autoCompLF, 
     	autoCompFirstNameMode_Full, autoCompFirstNameMode_Abbr, autoCompFirstNameMode_Both;
     boolean oldAutoCompFF, oldAutoCompLF,
@@ -62,7 +64,8 @@ public class EntryEditorPrefsTab extends JPanel implements PrefsTab {
         autoOpenForm = new JCheckBox(Globals.lang("Open editor when a new entry is created"));
         defSource = new JCheckBox(Globals.lang("Show BibTeX source by default"));
         showSource = new JCheckBox(Globals.lang("Show BibTeX source panel"));
-        editSource = new JCheckBox(Globals.lang("Enable source editing"));
+        emacsMode = new JCheckBox(Globals.lang("Use Emacs key bindings"));
+        emacsRebindCtrlA = new JCheckBox(Globals.lang("Rebind C-a, too"));
         disableOnMultiple = new JCheckBox(Globals.lang("Disable entry editor when multiple entries are selected"));
         autoComplete = new JCheckBox(Globals.lang("Enable word/name autocompletion"));
         
@@ -85,19 +88,28 @@ public class EntryEditorPrefsTab extends JPanel implements PrefsTab {
         bg_firstNameMode.add(autoCompFirstNameMode_Full);
         bg_firstNameMode.add(autoCompFirstNameMode_Abbr);
         bg_firstNameMode.add(autoCompFirstNameMode_Both);
-        
-        autoCompFields = new JTextField(40);
-        Insets marg = new Insets(0,12,3,0);
-        editSource.setMargin(marg);
+
+        Insets marg = new Insets(0,20,3,0);
         defSource.setMargin(marg);
         // We need a listener on showSource to enable and disable the source panel-related choices:
         showSource.addChangeListener(new ChangeListener() {
             public void stateChanged(ChangeEvent event) {
                 defSource.setEnabled(showSource.isSelected());
-                editSource.setEnabled(showSource.isSelected());
             }
         }
         );
+        
+        emacsRebindCtrlA.setMargin(marg);
+        // We need a listener on showSource to enable and disable the source panel-related choices:
+        emacsMode.addChangeListener(new ChangeListener() {
+            public void stateChanged(ChangeEvent event) {
+                emacsRebindCtrlA.setEnabled(emacsMode.isSelected());
+            }
+        }
+        );
+
+        
+        autoCompFields = new JTextField(40);
         // We need a listener on autoComplete to enable and disable the
         // autoCompFields text field:
         autoComplete.addChangeListener(new ChangeListener() {
@@ -108,13 +120,14 @@ public class EntryEditorPrefsTab extends JPanel implements PrefsTab {
         );
 
         FormLayout layout = new FormLayout
-                ("8dlu, left:pref, 8dlu, fill:150dlu, 4dlu, fill:pref", // 4dlu, left:pref, 4dlu",
+                (// columns
+                 "8dlu, left:pref, 8dlu, fill:150dlu, 4dlu, fill:pref", // 4dlu, left:pref, 4dlu",
                  // rows  1 to 10
                  "pref, 6dlu, pref, 6dlu, pref, 6dlu, pref, 6dlu, pref, 6dlu, " +
                  // rows 11 to 20
-                 "pref, 6dlu, pref, 6dlu, pref, 6dlu, pref, pref, pref, pref, " +
-                 // rows 21 to 26
-                 "6dlu, pref, pref, pref, pref");
+                 "pref, 6dlu, pref, 6dlu, pref, 6dlu, pref, 6dlu, pref, 6dlu, " +
+                 // rows 21 to 29
+                 "pref, pref, pref, pref, 6dlu, pref, pref, pref, pref");
         DefaultFormBuilder builder = new DefaultFormBuilder(layout);
         CellConstraints cc = new CellConstraints();
         builder.addSeparator(Globals.lang("Editor options"), cc.xyw(1, 1, 5));
@@ -122,9 +135,11 @@ public class EntryEditorPrefsTab extends JPanel implements PrefsTab {
         builder.add(disableOnMultiple, cc.xy(2, 5));
         builder.add(showSource, cc.xy(2, 7));
         builder.add(defSource, cc.xy(2, 9));
+        builder.add(emacsMode, cc.xy(2, 11));
+        builder.add(emacsRebindCtrlA, cc.xy(2, 13));
         
-        builder.addSeparator(Globals.lang("Autocompletion options"), cc.xyw(1, 11, 5));
-        builder.add(autoComplete, cc.xy(2, 13));
+        builder.addSeparator(Globals.lang("Autocompletion options"), cc.xyw(1, 15, 5));
+        builder.add(autoComplete, cc.xy(2, 17));
         
         DefaultFormBuilder builder3 = new DefaultFormBuilder(new FormLayout("left:pref, 4dlu, fill:150dlu",""));
         JLabel label = new JLabel(Globals.lang("Use autocompletion for the following fields")+":");
@@ -133,17 +148,17 @@ public class EntryEditorPrefsTab extends JPanel implements PrefsTab {
         JLabel label2 = new JLabel(Globals.lang("Autocomplete after following number of characters")+":");
         builder3.append(label2);
         builder3.append(shortestToComplete);
-        builder.add(builder3.getPanel(), cc.xyw(2, 15, 3));
+        builder.add(builder3.getPanel(), cc.xyw(2, 19, 3));
 
-        builder.addSeparator(Globals.lang("Name format used for autocompletion"), cc.xyw(2, 17, 4));
-        builder.add(autoCompFF, cc.xy(2,18));
-        builder.add(autoCompLF, cc.xy(2,19));
-        builder.add(autoCompBoth, cc.xy(2,20));
+        builder.addSeparator(Globals.lang("Name format used for autocompletion"), cc.xyw(2, 21, 4));
+        builder.add(autoCompFF, cc.xy(2,22));
+        builder.add(autoCompLF, cc.xy(2,23));
+        builder.add(autoCompBoth, cc.xy(2,24));
         
-        builder.addSeparator(Globals.lang("Treatment of first names"), cc.xyw(2, 22, 4));
-        builder.add(autoCompFirstNameMode_Abbr, cc.xy(2,23));
-        builder.add(autoCompFirstNameMode_Full, cc.xy(2,24));
-        builder.add(autoCompFirstNameMode_Both, cc.xy(2,25));
+        builder.addSeparator(Globals.lang("Treatment of first names"), cc.xyw(2, 26, 4));
+        builder.add(autoCompFirstNameMode_Abbr, cc.xy(2,27));
+        builder.add(autoCompFirstNameMode_Full, cc.xy(2,28));
+        builder.add(autoCompFirstNameMode_Both, cc.xy(2,29));
         
         JPanel pan = builder.getPanel();
         pan.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
@@ -154,7 +169,8 @@ public class EntryEditorPrefsTab extends JPanel implements PrefsTab {
         autoOpenForm.setSelected(_prefs.getBoolean("autoOpenForm"));
         defSource.setSelected(_prefs.getBoolean("defaultShowSource"));
         showSource.setSelected(_prefs.getBoolean("showSource"));
-        editSource.setSelected(_prefs.getBoolean("enableSourceEditing"));
+        emacsMode.setSelected(_prefs.getBoolean(JabRefPreferences.EDITOR_EMACS_KEYBINDINGS));
+        emacsRebindCtrlA.setSelected(_prefs.getBoolean(JabRefPreferences.EDITOR_EMACS_KEYBINDINGS_REBIND_CA));
         disableOnMultiple.setSelected(_prefs.getBoolean("disableOnMultipleSelection"));
         autoComplete.setSelected(_prefs.getBoolean("autoComplete"));
         autoCompFields.setText(_prefs.get("autoCompleteFields"));
@@ -179,17 +195,37 @@ public class EntryEditorPrefsTab extends JPanel implements PrefsTab {
         oldAutoCompFModeAbbr = autoCompFirstNameMode_Abbr.isSelected();
         oldAutoCompFModeFull = autoCompFirstNameMode_Full.isSelected();
 
-        // Two choices only make sense when the source panel is visible:
+        // This choice only makes sense when the source panel is visible:
         defSource.setEnabled(showSource.isSelected());
-        editSource.setEnabled(showSource.isSelected());
-        // Autocomplete fields is only enabled when autocompletion is:
+        // similar for emacs CTRL-a and emacs mode
+        emacsRebindCtrlA.setEnabled(emacsMode.isSelected());
+        // Autocomplete fields is only enabled when autocompletion is selected
         setAutoCompleteElementsEnabled(autoComplete.isSelected());
     }
 
     public void storeSettings() {
         _prefs.putBoolean("autoOpenForm", autoOpenForm.isSelected());
         _prefs.putBoolean("defaultShowSource", defSource.isSelected());
-        _prefs.putBoolean("enableSourceEditing", editSource.isSelected());
+        boolean emacsModeChanged = (_prefs.getBoolean(JabRefPreferences.EDITOR_EMACS_KEYBINDINGS) != emacsMode.isSelected());
+        boolean emacsRebindCtrlAChanged = (_prefs.getBoolean(JabRefPreferences.EDITOR_EMACS_KEYBINDINGS_REBIND_CA) != emacsRebindCtrlA.isSelected()); 
+        if (emacsModeChanged || emacsRebindCtrlAChanged) {
+            _prefs.putBoolean(JabRefPreferences.EDITOR_EMACS_KEYBINDINGS, emacsMode.isSelected());
+            _prefs.putBoolean(JabRefPreferences.EDITOR_EMACS_KEYBINDINGS_REBIND_CA, emacsRebindCtrlA.isSelected());
+            // immediately apply the change
+            if (emacsModeChanged) {
+            	if (emacsMode.isSelected()) {
+            		EmacsKeyBindings.load();
+            	} else {
+            		EmacsKeyBindings.unload();
+            	}
+            } else {
+                // only rebinding of CTRL+a changed
+                assert(emacsMode.isSelected());
+                // we simply reload the emacs mode to activate the CTRL+a change
+                EmacsKeyBindings.unload();
+                EmacsKeyBindings.load();
+            }
+        }
         _prefs.putBoolean("disableOnMultipleSelection", disableOnMultiple.isSelected());
         // We want to know if the following settings have been modified:
         boolean oldAutoComplete = _prefs.getBoolean("autoComplete");
diff --git a/src/java/net/sf/jabref/EntryEditorTab.java b/src/java/net/sf/jabref/EntryEditorTab.java
index ba25473..7f59931 100644
--- a/src/java/net/sf/jabref/EntryEditorTab.java
+++ b/src/java/net/sf/jabref/EntryEditorTab.java
@@ -63,6 +63,9 @@ public class EntryEditorTab {
 
 	private FieldEditor activeField = null;
 
+   // UGLY HACK to have a pointer to the fileListEditor to call autoSetLinks()
+    public FileListEditor fileListEditor = null;
+
     protected EntryEditorTab() {
 
     }
@@ -139,6 +142,7 @@ public class EntryEditorTab {
             int wHeight = (int) (50.0 * BibtexFields.getFieldWeight(fields[i]));
             if (editorType == GUIGlobals.FILE_LIST_EDITOR) {
                 ta = new FileListEditor(frame, bPanel.metaData(), fields[i], null, parent);
+                fileListEditor = (FileListEditor) ta;
                 defaultHeight = 0;
             }
             else {
diff --git a/src/java/net/sf/jabref/ExternalTab.java b/src/java/net/sf/jabref/ExternalTab.java
index 79ab3c0..1c158e9 100644
--- a/src/java/net/sf/jabref/ExternalTab.java
+++ b/src/java/net/sf/jabref/ExternalTab.java
@@ -235,7 +235,7 @@ public class ExternalTab extends JPanel implements PrefsTab {
 
         if (_prefs.getBoolean(JabRefPreferences.USE_REG_EXP_SEARCH_KEY))
             useRegExpComboBox.setSelected(true);
-        else if (_prefs.getBoolean("autolinkExactKeyOnly"))
+        else if (_prefs.getBoolean(JabRefPreferences.AUTOLINK_EXACT_KEY_ONLY))
             matchExactKeyOnly.setSelected(true);
         else
             matchStartsWithKey.setSelected(true);
@@ -254,7 +254,7 @@ public class ExternalTab extends JPanel implements PrefsTab {
         _prefs.put(GUIGlobals.FILE_FIELD+"Directory", fileDir.getText());
         _prefs.putBoolean("bibLocationAsFileDir", bibLocationAsFileDir.isSelected());
         _prefs.putBoolean("bibLocAsPrimaryDir", bibLocAsPrimaryDir.isSelected());
-		_prefs.putBoolean("autolinkExactKeyOnly", matchExactKeyOnly.isSelected());
+		_prefs.putBoolean(JabRefPreferences.AUTOLINK_EXACT_KEY_ONLY, matchExactKeyOnly.isSelected());
         _prefs.putBoolean("runAutomaticFileSearch", runAutoFileSearch.isSelected());
         _prefs.putBoolean("allowFileAutoOpenBrowse", allowFileAutoOpenBrowse.isSelected());
         _prefs.put(JabRefPreferences.EMAIL_SUBJECT, emailSubject.getText());
diff --git a/src/java/net/sf/jabref/FieldComparator.java b/src/java/net/sf/jabref/FieldComparator.java
index 2d433a5..1b1ffe6 100644
--- a/src/java/net/sf/jabref/FieldComparator.java
+++ b/src/java/net/sf/jabref/FieldComparator.java
@@ -18,7 +18,10 @@ package net.sf.jabref;
 import net.sf.jabref.gui.MainTableFormat;
 
 import java.text.Collator;
+import java.text.ParseException;
+import java.text.RuleBasedCollator;
 import java.util.Comparator;
+import java.util.Locale;
 
 /**
  * 
@@ -42,7 +45,13 @@ public class FieldComparator implements Comparator<BibtexEntry> {
     private static Collator collator;
 
     static {
-        collator = Collator.getInstance();
+        try {
+            collator = new RuleBasedCollator(
+                        ((RuleBasedCollator) Collator.getInstance()).getRules()
+                                .replaceAll("<'\u005f'", "<' '<'\u005f'"));
+        } catch (ParseException e) {
+            collator = Collator.getInstance();
+        }
     }
 
 	private String[] field;
diff --git a/src/java/net/sf/jabref/FileTab.java b/src/java/net/sf/jabref/FileTab.java
index 8b04215..fd0f3af 100644
--- a/src/java/net/sf/jabref/FileTab.java
+++ b/src/java/net/sf/jabref/FileTab.java
@@ -35,10 +35,12 @@ public class FileTab extends JPanel implements PrefsTab {
     JabRefPreferences _prefs;
     JabRefFrame _frame;
 
-    private JCheckBox backup, openLast, autoDoubleBraces, autoSave, promptBeforeUsingAutoSave;
+    private JCheckBox backup, openLast, autoDoubleBraces, autoSave,
+            promptBeforeUsingAutoSave, includeEmptyFields, camelCase, sameColumn;
+    private JComboBox<String> valueDelimiter;
     private JRadioButton
-        saveOriginalOrder, saveAuthorOrder, saveTableOrder,
-        exportOriginalOrder, exportAuthorOrder, exportTableOrder,
+        saveOriginalOrder, saveAuthorOrder, saveTableOrder, saveTitleOrder,
+        exportOriginalOrder, exportAuthorOrder, exportTableOrder, exportTitleOrder,
         resolveStringsStandard, resolveStringsAll;
     private JTextField bracesAroundCapitalsFields, nonWrappableFields,
             doNotResolveStringsFor;
@@ -60,17 +62,27 @@ public class FileTab extends JPanel implements PrefsTab {
         exportOriginalOrder = new JRadioButton(Globals.lang("Export entries in their original order"));
         saveTableOrder = new JRadioButton(Globals.lang("Save in current table sort order"));
         exportTableOrder = new JRadioButton(Globals.lang("Export in current table sort order"));
+        saveTitleOrder = new JRadioButton(Globals.lang("Save entries ordered by title"));
+        exportTitleOrder = new JRadioButton(Globals.lang("Export entries ordered by title"));
         autoSave = new JCheckBox(Globals.lang("Autosave"));
         promptBeforeUsingAutoSave = new JCheckBox(Globals.lang("Prompt before recovering a database from an autosave file"));
         autoSaveInterval = new JSpinner(new SpinnerNumberModel(1, 1, 60, 1));
+        valueDelimiter = new JComboBox<String>(new String[]{
+                Globals.lang("Quotes") + ": \", \"",
+                Globals.lang("Curly Brackets") + ": {, }" });
+        includeEmptyFields = new JCheckBox(Globals.lang("Include empty fields"));
+        camelCase = new JCheckBox(Globals.lang("Start field contents in same column"));
+        sameColumn = new JCheckBox(Globals.lang("Use camel case for field names (e.g., \"HowPublished\" instead of \"howpublished\")"));
         ButtonGroup bg = new ButtonGroup();
         bg.add(saveAuthorOrder);
         bg.add(saveOriginalOrder);
         bg.add(saveTableOrder);
+        bg.add(saveTitleOrder);
         bg = new ButtonGroup();
         bg.add(exportAuthorOrder);
         bg.add(exportOriginalOrder);
         bg.add(exportTableOrder);
+        bg.add(exportTitleOrder);
         resolveStringsAll = new JRadioButton(Globals.lang("Resolve strings for all fields except")+":");
         resolveStringsStandard = new JRadioButton(Globals.lang("Resolve strings for standard BibTeX fields only"));
         bg = new ButtonGroup();
@@ -142,6 +154,26 @@ public class FileTab extends JPanel implements PrefsTab {
         builder.append(saveOriginalOrder, 1);
         builder.append(exportOriginalOrder, 1);
         builder.nextLine();
+        builder.append(saveTitleOrder, 1);
+        builder.append(exportTitleOrder, 1);
+        builder.nextLine();
+        builder.appendSeparator(Globals.lang("Field saving options"));
+        builder.nextLine();
+        builder.append(camelCase);
+        builder.nextLine();
+        builder.append(sameColumn);
+        FormLayout layout2 = new FormLayout(
+                "left:pref, 8dlu, fill:pref", "");
+        DefaultFormBuilder builder2 = new DefaultFormBuilder(layout2);
+    	builder2.append(new JLabel(Globals.lang("Field value delimiter. E.g., \"author={x}\" or \"author='x'\"") + ":"));
+        builder2.append(valueDelimiter);
+        builder.nextLine();
+        builder.append(builder2.getPanel());
+        builder.append(new JPanel());
+        builder.nextLine();
+        builder.append(includeEmptyFields);
+        builder.append(new JPanel());
+        builder.nextLine();
 
         JPanel pan = builder.getPanel();
         pan.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
@@ -156,12 +188,16 @@ public class FileTab extends JPanel implements PrefsTab {
             saveAuthorOrder.setSelected(true);
         else if (_prefs.getBoolean("saveInOriginalOrder"))
             saveOriginalOrder.setSelected(true);
+        else if (_prefs.getBoolean("saveInTitleOrder"))
+            saveTitleOrder.setSelected(true);
         else
             saveTableOrder.setSelected(true);
         if (_prefs.getBoolean("exportInStandardOrder"))
             exportAuthorOrder.setSelected(true);
         else if (_prefs.getBoolean("exportInOriginalOrder"))
             exportOriginalOrder.setSelected(true);
+        else if (_prefs.getBoolean("exportInTitleOrder"))
+            exportTitleOrder.setSelected(true);
         else
             exportTableOrder.setSelected(true);
 
@@ -177,6 +213,10 @@ public class FileTab extends JPanel implements PrefsTab {
         promptBeforeUsingAutoSave.setSelected(_prefs.getBoolean("promptBeforeUsingAutosave"));
         autoSaveInterval.setValue(_prefs.getInt("autoSaveInterval"));
         origAutoSaveSetting = autoSave.isSelected();
+        valueDelimiter.setSelectedIndex(_prefs.getInt("valueDelimiters"));
+        includeEmptyFields.setSelected(_prefs.getBoolean("includeEmptyFields"));
+        camelCase.setSelected(_prefs.getBoolean(JabRefPreferences.WRITEFIELD_CAMELCASENAME));
+        sameColumn.setSelected(_prefs.getBoolean(JabRefPreferences.WRITEFIELD_ADDSPACES));
     }
 
     public void storeSettings() {
@@ -184,14 +224,20 @@ public class FileTab extends JPanel implements PrefsTab {
         _prefs.putBoolean("openLastEdited", openLast.isSelected());
         _prefs.putBoolean("saveInStandardOrder", saveAuthorOrder.isSelected());
         _prefs.putBoolean("saveInOriginalOrder", saveOriginalOrder.isSelected());
+        _prefs.putBoolean("saveInTitleOrder", saveTitleOrder.isSelected());
         _prefs.putBoolean("exportInStandardOrder", exportAuthorOrder.isSelected());
         _prefs.putBoolean("exportInOriginalOrder", exportOriginalOrder.isSelected());
+        _prefs.putBoolean("exportInTitleOrder", exportTitleOrder.isSelected());
         _prefs.putBoolean("autoDoubleBraces", autoDoubleBraces.isSelected());
         _prefs.putBoolean("resolveStringsAllFields", resolveStringsAll.isSelected());
         _prefs.put("doNotResolveStringsFor", doNotResolveStringsFor.getText().trim());
         _prefs.putBoolean("autoSave", autoSave.isSelected());
         _prefs.putBoolean("promptBeforeUsingAutosave", promptBeforeUsingAutoSave.isSelected());
         _prefs.putInt("autoSaveInterval", (Integer)autoSaveInterval.getValue());
+        _prefs.putInt("valueDelimiters", valueDelimiter.getSelectedIndex());
+        _prefs.putBoolean("includeEmptyFields", includeEmptyFields.isSelected());
+        _prefs.putBoolean(JabRefPreferences.WRITEFIELD_CAMELCASENAME, camelCase.isSelected());
+        _prefs.putBoolean(JabRefPreferences.WRITEFIELD_ADDSPACES, sameColumn.isSelected());
         doNotResolveStringsFor.setText(_prefs.get("doNotResolveStringsFor"));
         boolean updateSpecialFields = false;
         if (!bracesAroundCapitalsFields.getText().trim().equals(_prefs.get("putBracesAroundCapitals"))) {
diff --git a/src/java/net/sf/jabref/FindUnlinkedFilesDialog.java b/src/java/net/sf/jabref/FindUnlinkedFilesDialog.java
index 9e518cf..23db5ed 100644
--- a/src/java/net/sf/jabref/FindUnlinkedFilesDialog.java
+++ b/src/java/net/sf/jabref/FindUnlinkedFilesDialog.java
@@ -245,7 +245,7 @@ public class FindUnlinkedFilesDialog extends JDialog {
 	 */
 	protected void initializeActions() {
 		
-		actionSelectAll = new AbstractAction(Globals.lang("Select All")) {
+		actionSelectAll = new AbstractAction(Globals.lang("Select all")) {
 			private static final long serialVersionUID = 9153126361571985383L;
 			public void actionPerformed(ActionEvent e) {
 				CheckableTreeNode rootNode = (CheckableTreeNode) tree.getModel().getRoot();
@@ -255,7 +255,7 @@ public class FindUnlinkedFilesDialog extends JDialog {
 			}
 		};
 		
-		actionUnselectAll = new AbstractAction(Globals.lang("Unselect All")) {
+		actionUnselectAll = new AbstractAction(Globals.lang("Unselect all")) {
 			private static final long serialVersionUID = -9012913268030356450L;
 			public void actionPerformed(ActionEvent e) {
 				CheckableTreeNode rootNode = (CheckableTreeNode) tree.getModel().getRoot();
@@ -265,7 +265,7 @@ public class FindUnlinkedFilesDialog extends JDialog {
 			}
 		};
 		
-		actionExpandTree = new AbstractAction(Globals.lang("Expand All")) {
+		actionExpandTree = new AbstractAction(Globals.lang("Expand all")) {
 			private static final long serialVersionUID = -4794088095435302433L;
 			public void actionPerformed(ActionEvent e) {
 				CheckableTreeNode rootNode = (CheckableTreeNode) tree.getModel().getRoot();
@@ -273,7 +273,7 @@ public class FindUnlinkedFilesDialog extends JDialog {
 			}
 		};
 		
-		actionCollapseTree = new AbstractAction(Globals.lang("Collapse All")) {
+		actionCollapseTree = new AbstractAction(Globals.lang("Collapse all")) {
 			private static final long serialVersionUID = 6007246730370326456L;
 			public void actionPerformed(ActionEvent e) {
 				CheckableTreeNode rootNode = (CheckableTreeNode) tree.getModel().getRoot();
diff --git a/src/java/net/sf/jabref/FontSelectorDialog.java b/src/java/net/sf/jabref/FontSelectorDialog.java
index 9aeaa26..e210b94 100644
--- a/src/java/net/sf/jabref/FontSelectorDialog.java
+++ b/src/java/net/sf/jabref/FontSelectorDialog.java
@@ -265,7 +265,7 @@ public class FontSelectorDialog extends JDialog {
                 buttons.setBorder(new EmptyBorder(12,0,0,0));
                 buttons.add(Box.createGlue());
 
-                ok = new JButton(Globals.lang("OK"));
+                ok = new JButton(Globals.lang("Ok"));
                 ok.addActionListener(new ActionHandler());
                 getRootPane().setDefaultButton(ok);
                 buttons.add(ok);
diff --git a/src/java/net/sf/jabref/GUIGlobals.java b/src/java/net/sf/jabref/GUIGlobals.java
index 94812e5..b7e9530 100644
--- a/src/java/net/sf/jabref/GUIGlobals.java
+++ b/src/java/net/sf/jabref/GUIGlobals.java
@@ -28,6 +28,8 @@ import java.util.*;
 import javax.swing.ImageIcon;
 import javax.swing.JLabel;
 
+import org.xnap.commons.gui.shortcut.EmacsKeyBindings;
+
 import net.sf.jabref.specialfields.Priority;
 import net.sf.jabref.specialfields.Quality;
 import net.sf.jabref.specialfields.Rank;
@@ -172,6 +174,8 @@ public class GUIGlobals {
     public static final int MAX_BACK_HISTORY_SIZE = 10; // The maximum number of "Back" operations stored.
 
     public static final String FILE_FIELD = "file";
+    
+    public static final String FOLDER_FIELD = "folder";
 
     public static final double
 	SMALL_W = 0.30,
@@ -221,7 +225,7 @@ public class GUIGlobals {
 		LANGUAGES.put("Japanese", "ja");
 		LANGUAGES.put("Nederlands", "nl");
 		LANGUAGES.put("Norsk", "no");
-		//LANGUAGES.put("Español", "es"); // Not complete
+		LANGUAGES.put("Español", "es");
 		//LANGUAGES.put("Polski", "pl");
 		LANGUAGES.put("Turkish", "tr");
 		LANGUAGES.put("Simplified Chinese", "zh");
@@ -381,7 +385,7 @@ public class GUIGlobals {
 	 * on Un*x is unavailable.
 	 */
 	public static void init() {
-		typeNameFont = new Font("arial", Font.ITALIC+Font.BOLD, 24);
+		typeNameFont = new Font("dialog", Font.ITALIC+Font.BOLD, 18);
 		fieldNameFont = new Font("arial", Font.ITALIC+Font.BOLD, 14);
 		JLabel lab;
 		lab = new JLabel(getImage("pdfSmall"));
@@ -402,6 +406,9 @@ public class GUIGlobals {
 		lab = new JLabel(getImage("psSmall"));
 		lab.setToolTipText(Globals.lang("Open")+" PS");
 		tableIcons.put("ps", lab);
+		lab = new JLabel(getImage("psSmall"));
+        lab.setToolTipText(Globals.lang("Open folder"));
+        tableIcons.put(GUIGlobals.FOLDER_FIELD, lab);
         lab = new JLabel(getImage("psSmall"));
         lab.setToolTipText(Globals.lang("Open file"));
         tableIcons.put(GUIGlobals.FILE_FIELD, lab);
@@ -427,6 +434,10 @@ public class GUIGlobals {
         tableIcons.put(SpecialFieldsUtils.FIELDNAME_PRIORITY, lab);
         
         //jabRefFont = new Font("arial", Font.ITALIC/*+Font.BOLD*/, 20); 
+
+        if (Globals.prefs.getBoolean(JabRefPreferences.EDITOR_EMACS_KEYBINDINGS)) {
+        	EmacsKeyBindings.load();
+        }
 	}
 
 }
diff --git a/src/java/net/sf/jabref/GeneralTab.java b/src/java/net/sf/jabref/GeneralTab.java
index ad8b11d..434063d 100644
--- a/src/java/net/sf/jabref/GeneralTab.java
+++ b/src/java/net/sf/jabref/GeneralTab.java
@@ -42,7 +42,7 @@ public class GeneralTab extends JPanel implements PrefsTab {
     defSort, ctrlClick, useOwner, overwriteOwner,
     keyDuplicateWarningDialog, keyEmptyWarningDialog, enforceLegalKeys,
     confirmDelete, allowEditing, memoryStick, useImportInspector,
-    useImportInspectorForSingle, inspectionWarnDupli, useTimeStamp, overwriteTimeStamp,
+    useImportInspectorForSingle, inspectionWarnDupli, useTimeStamp, updateTimeStamp, overwriteTimeStamp,
     markImportedEntries, unmarkAllEntriesBeforeImporting;
 
     private JTextField defOwnerField, timeStampFormat, timeStampField;
@@ -66,6 +66,13 @@ public class GeneralTab extends JPanel implements PrefsTab {
         useOwner = new JCheckBox(Globals.lang("Mark new entries with owner name") + ":");
         useTimeStamp = new JCheckBox(Globals.lang("Mark new entries with addition date") + ". "
             +Globals.lang("Date format")+ ":");
+        useTimeStamp.addChangeListener(new ChangeListener() {
+            @Override
+            public void stateChanged(ChangeEvent arg0) {
+                updateTimeStamp.setEnabled(useTimeStamp.isSelected());
+            }
+        });
+        updateTimeStamp = new JCheckBox(Globals.lang("Update timestamp on modification"));
         overwriteOwner = new JCheckBox(Globals.lang("Overwrite"));
         overwriteTimeStamp = new JCheckBox(Globals.lang("Overwrite"));
         overwriteOwner.setToolTipText(Globals.lang("If a pasted or imported entry already has "
@@ -156,6 +163,10 @@ public class GeneralTab extends JPanel implements PrefsTab {
         builder.append(hlp);
         builder.nextLine();
 
+        builder.append(new JPanel());
+        builder.append(updateTimeStamp, 2);
+        builder.nextLine();
+
         builder.append(markImportedEntries, 13);
         builder.nextLine();
         builder.append(unmarkAllEntriesBeforeImporting, 13);
@@ -183,6 +194,8 @@ public class GeneralTab extends JPanel implements PrefsTab {
         overwriteOwner.setSelected(_prefs.getBoolean("overwriteOwner"));
         useTimeStamp.setSelected(_prefs.getBoolean("useTimeStamp"));
         overwriteTimeStamp.setSelected(_prefs.getBoolean("overwriteTimeStamp"));
+        updateTimeStamp.setSelected(_prefs.getBoolean(JabRefPreferences.UPDATE_TIMESTAMP));
+        updateTimeStamp.setEnabled(useTimeStamp.isSelected());
         keyDuplicateWarningDialog.setSelected(_prefs.getBoolean("dialogWarningForDuplicateKey"));
         keyEmptyWarningDialog.setSelected(_prefs.getBoolean("dialogWarningForEmptyKey"));
         enforceLegalKeys.setSelected(_prefs.getBoolean("enforceLegalBibtexKey"));
@@ -224,6 +237,7 @@ public class GeneralTab extends JPanel implements PrefsTab {
         _prefs.putBoolean("overwriteOwner", overwriteOwner.isSelected());
         _prefs.putBoolean("useTimeStamp", useTimeStamp.isSelected());
         _prefs.putBoolean("overwriteTimeStamp", overwriteTimeStamp.isSelected());
+        _prefs.putBoolean(JabRefPreferences.UPDATE_TIMESTAMP, updateTimeStamp.isSelected());
         _prefs.putBoolean("dialogWarningForDuplicateKey", keyDuplicateWarningDialog.isSelected());
         _prefs.putBoolean("dialogWarningForEmptyKey", keyEmptyWarningDialog.isSelected());
         _prefs.putBoolean("enforceLegalBibtexKey", enforceLegalKeys.isSelected());
diff --git a/src/java/net/sf/jabref/Globals.java b/src/java/net/sf/jabref/Globals.java
index 644b301..ab63c48 100644
--- a/src/java/net/sf/jabref/Globals.java
+++ b/src/java/net/sf/jabref/Globals.java
@@ -175,13 +175,15 @@ public class Globals {
 
     public static AutoSaveManager autoSaveManager = null;
 
+    // In the main program, this field is initialized in JabRef.java
+    // Each test case initializes this field if required
 	public static JabRefPreferences prefs = null;
 
 	public static HelpDialog helpDiag = null;
 
 	public static final String osName = System.getProperty("os.name", "def");
 
-	public static final boolean ON_MAC = (osName.equals(MAC)), ON_WIN = osName.startsWith("Windows");
+	public static final boolean ON_MAC = (osName.equals(MAC)), ON_WIN = osName.startsWith("Windows"), ON_LINUX = osName.startsWith("Linux");
 
 	public static final String[] SKIP_WORDS = { "a", "an", "the", "for", "on", "of" };
 	
@@ -283,7 +285,7 @@ public class Globals {
 
 	public static JournalAbbreviations journalAbbrev;
 
-	public static String lang(String key, String[] params) {
+	public static String lang(String key, String... params) {
 		String translation = null;
 		try {
 			if (Globals.messages != null) 
@@ -334,22 +336,6 @@ public class Globals {
 		return key;
 	}
 
-	public static String lang(String key) {
-		return lang(key, (String[]) null);
-	}
-
-	public static String lang(String key, String s1) {
-		return lang(key, new String[] { s1 });
-	}
-
-	public static String lang(String key, String s1, String s2) {
-		return lang(key, new String[] { s1, s2 });
-	}
-
-	public static String lang(String key, String s1, String s2, String s3) {
-		return lang(key, new String[] { s1, s2, s3 });
-	}
-
 	public static String menuTitle(String key) {
 		String translation = null;
 		try {
diff --git a/src/java/net/sf/jabref/JTextAreaWithHighlighting.java b/src/java/net/sf/jabref/JTextAreaWithHighlighting.java
index 3675802..b9cc9cd 100644
--- a/src/java/net/sf/jabref/JTextAreaWithHighlighting.java
+++ b/src/java/net/sf/jabref/JTextAreaWithHighlighting.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2003-2011 JabRef contributors.
+/*  Copyright (C) 2003-2012 JabRef contributors.
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
@@ -18,15 +18,17 @@ package net.sf.jabref;
 import java.awt.event.ActionEvent;
 import java.util.ArrayList;
 import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
-import javax.swing.*;
+import javax.swing.AbstractAction;
+import javax.swing.JTextArea;
+import javax.swing.KeyStroke;
 import javax.swing.event.UndoableEditEvent;
 import javax.swing.event.UndoableEditListener;
 import javax.swing.text.BadLocationException;
 import javax.swing.text.DefaultHighlighter;
 import javax.swing.text.Document;
 import javax.swing.text.Highlighter;
+import javax.swing.text.Keymap;
 import javax.swing.undo.CannotRedoException;
 import javax.swing.undo.CannotUndoException;
 import javax.swing.undo.UndoManager;
@@ -109,8 +111,28 @@ public class JTextAreaWithHighlighting extends JTextArea implements SearchTextLi
                     }
                 });
 
-        // Bind the redo action to ctl-Y
-        getInputMap().put(Globals.prefs.getKey("Redo"), "Redo");
+        // Bind the redo action to ctrl-Y
+        boolean bind = true;
+        KeyStroke redoKey = Globals.prefs.getKey("Redo");
+        if (Globals.prefs.getBoolean(JabRefPreferences.EDITOR_EMACS_KEYBINDINGS)) {
+        	// If emacs is enabled, check if we have a conflict at keys
+        	// If yes, do not bind
+        	// Typically, we have: CTRL+y is "yank" in emacs and REDO in 'normal' settings
+        	// The Emacs key bindings are stored in the keymap, not in the input map.
+        	Keymap keymap2 = getKeymap();
+        	KeyStroke[] keys = keymap2.getBoundKeyStrokes();
+        	int i = 0;
+        	while ((i<keys.length) && (!keys[i].equals(redoKey))) {
+        		i++;
+        	}
+        	if (i<keys.length) {
+        		// conflict found -> do not bind
+        		bind = false;
+        	}
+        }
+        if (bind) {
+        	getInputMap().put(redoKey, "Redo");
+        }
     }
 
     /**
diff --git a/src/java/net/sf/jabref/JabRef.java b/src/java/net/sf/jabref/JabRef.java
index 04c8ff0..e242762 100644
--- a/src/java/net/sf/jabref/JabRef.java
+++ b/src/java/net/sf/jabref/JabRef.java
@@ -88,10 +88,6 @@ public class JabRef {
 
 		singleton = this;
 
-		// The following two lines signal that the system proxy settings should
-		// be used:
-		System.setProperty("java.net.useSystemProxies", "true");
-		System.getProperties().put("proxySet", "true");
 
 		JabRefPreferences prefs = JabRefPreferences.getInstance();
 
@@ -102,6 +98,23 @@ public class JabRef {
             prefs.put("deletePlugins", "");
         }
 
+        if (prefs.getBoolean("useProxy")) {
+        	// NetworkTab.java ensures that proxyHostname and proxyPort are not null
+			System.getProperties().put("http.proxyHost", prefs.get("proxyHostname"));
+			System.getProperties().put("http.proxyPort", prefs.get("proxyPort"));
+
+			// currently, the following cannot be configured
+			if (prefs.get("proxyUsername") != null) {
+				System.getProperties().put("http.proxyUser", prefs.get("proxyUsername"));
+				System.getProperties().put("http.proxyPassword", prefs.get("proxyPassword"));
+			}
+		} else {
+			// The following two lines signal that the system proxy settings
+			// should be used:
+			System.setProperty("java.net.useSystemProxies", "true");
+			System.getProperties().put("proxySet", "true");
+		}
+
         Globals.startBackgroundTasks();
         Globals.setupLogging();
 		Globals.prefs = prefs;
@@ -622,7 +635,7 @@ public class JabRef {
         }
 
         System.out.println(Globals.lang("Running Query '%0' with fetcher '%1'.", query, engine) +
-            " " + Globals.lang("Please wait!"));
+            " " + Globals.lang("Please wait..."));
         Collection<BibtexEntry> result = new ImportInspectionCommandLine().query(query, fetcher);
 
         if (result == null || result.size() == 0) {
diff --git a/src/java/net/sf/jabref/JabRefFrame.java b/src/java/net/sf/jabref/JabRefFrame.java
index 63bc5d7..b62916e 100644
--- a/src/java/net/sf/jabref/JabRefFrame.java
+++ b/src/java/net/sf/jabref/JabRefFrame.java
@@ -124,8 +124,8 @@ public class JabRefFrame extends JFrame implements OutputPrinter {
     GridBagLayout gbl = new GridBagLayout();
     GridBagConstraints con = new GridBagConstraints();
 
-    JLabel statusLine = new JLabel("", SwingConstants.LEFT), statusLabel = new JLabel(Globals
-        .lang("Status")
+    JLabel statusLine = new JLabel("", SwingConstants.LEFT), statusLabel = new JLabel(
+        Globals.lang("Status")
         + ":", SwingConstants.LEFT);
     JProgressBar progressBar = new JProgressBar();
 
@@ -145,9 +145,11 @@ public class JabRefFrame extends JFrame implements OutputPrinter {
     // Note: GeneralAction's constructor automatically gets translations
     // for the name and message strings.
 
-  // References to the toggle buttons in the toolbar:
-  public JToggleButton groupToggle, searchToggle, previewToggle, highlightAny,
-      highlightAll;
+  /* References to the toggle buttons in the toolbar */
+  // the groups interface
+  public JToggleButton groupToggle;
+  public JToggleButton searchToggle, previewToggle, highlightAny, highlightAll;
+
   OpenDatabaseAction
       open = new OpenDatabaseAction(this, true);
   AbstractAction
@@ -198,14 +200,14 @@ public class JabRefFrame extends JFrame implements OutputPrinter {
               "right", prefs.getKey("Forward")),
       back = new GeneralAction("back", "Back", Globals.lang("Back"),
               "left", prefs.getKey("Back")),
-      /*cut = new GeneralAction("cut", "Cut", Globals.lang("Cut"),
-         GUIGlobals.cutIconFile,
-         prefs.getKey("Cut")),*/
+      //cut = new GeneralAction("cut", "Cut", Globals.lang("Cut"),
+      //   GUIGlobals.cutIconFile,
+      //   prefs.getKey("Cut")),
       delete = new GeneralAction("delete", "Delete", Globals.lang("Delete"),
                                  prefs.getKey("Delete")),
-      /*copy = new GeneralAction("copy", "Copy", Globals.lang("Copy"),
-                               GUIGlobals.copyIconFile,
-                               prefs.getKey("Copy")),*/
+      //copy = new GeneralAction("copy", "Copy", Globals.lang("Copy"),
+      //                         GUIGlobals.copyIconFile,
+      //                         prefs.getKey("Copy")),
       copy = new EditAction("copy", GUIGlobals.getIconUrl("copy")),
       paste = new EditAction("paste", GUIGlobals.getIconUrl("paste")),
       cut = new EditAction("cut", GUIGlobals.getIconUrl("cut")),
@@ -289,18 +291,21 @@ public class JabRefFrame extends JFrame implements OutputPrinter {
       writeXmpAction = new GeneralAction("writeXMP", "Write XMP-metadata to PDFs",
                                         Globals.lang("Will write XMP-metadata to the PDFs linked from selected entries."),
                                         prefs.getKey("Write XMP")),
+      openFolder = new GeneralAction("openFolder", "Open folder",
+                                        Globals.lang("Open folder"),
+                                        prefs.getKey("Open folder")),
       openFile = new GeneralAction("openExternalFile", "Open file",
-                                   Globals.lang("Open file"),
-                                   prefs.getKey("Open file")),
+                                   		Globals.lang("Open file"),
+                                   		prefs.getKey("Open file")),
       openPdf = new GeneralAction("openFile", "Open PDF or PS",
-                                   Globals.lang("Open PDF or PS"),
-                                   prefs.getKey("Open PDF or PS")),
+                                   		Globals.lang("Open PDF or PS"),
+                                   		prefs.getKey("Open PDF or PS")),
       openUrl = new GeneralAction("openUrl", "Open URL or DOI",
-                                  Globals.lang("Open URL or DOI"),
-                                  prefs.getKey("Open URL or DOI")),
+                                  		Globals.lang("Open URL or DOI"),
+                                  		prefs.getKey("Open URL or DOI")),
       openSpires = new GeneralAction("openSpires", "Open SPIRES entry",
-                                          Globals.lang("Open SPIRES entry"),
-                                          prefs.getKey("Open SPIRES entry")),
+                                        Globals.lang("Open SPIRES entry"),
+                                        prefs.getKey("Open SPIRES entry")),
       /*
 	   * It looks like this wasn't being implemented for spires anyway so we
 	   * comment it out for now.
@@ -352,6 +357,10 @@ public class JabRefFrame extends JFrame implements OutputPrinter {
     Cleanup = new GeneralAction("Cleanup", "Cleanup entries", 
 					Globals.lang("Cleanup entries"), 
 					GUIGlobals.getIconUrl("cleanupentries") ),
+          
+    mergeEntries = new GeneralAction("mergeEntries", "Merge entries", 
+					Globals.lang("Merge entries"),
+                                        GUIGlobals.getIconUrl("mergeentries")),
 					
     dbImport = new DbImportAction(this).getAction(),
     //downloadFullText = new GeneralAction("downloadFullText", "Look up full text document",
@@ -373,7 +382,9 @@ public class JabRefFrame extends JFrame implements OutputPrinter {
   			FindUnlinkedFilesDialog.ACTION_ICON,
   			prefs.getKey(FindUnlinkedFilesDialog.ACTION_COMMAND)
   	);
-    
+
+	AutoLinkFilesAction autoLinkFile = new AutoLinkFilesAction();
+
     PushToApplicationButton pushExternalButton;
 
     List<EntryFetcher> fetchers = new LinkedList<EntryFetcher>();
@@ -610,7 +621,32 @@ public class JabRefFrame extends JFrame implements OutputPrinter {
             sidePaneManager.show("search");
     }
 
-
+    // The OSXAdapter calls this method when a ".bib" file has been double-clicked from the Finder.
+    public void openAction(String filePath) {
+    	File file = new File(filePath);
+    	
+        // Check if the file is already open.
+    	for (int i=0; i<this.getTabbedPane().getTabCount(); i++) {
+    		BasePanel bp = this.baseAt(i);
+    		if ((bp.getFile() != null) && bp.getFile().equals(file)) {
+    			//The file is already opened, so just raising its tab.
+    			this.getTabbedPane().setSelectedComponent(bp);
+    			return;
+    		}
+    	}
+        
+    	if (file.exists()) {
+    		// Run the actual open in a thread to prevent the program
+    		// locking until the file is loaded.
+    		final File theFile = new File(filePath);
+    		(new Thread() {
+    			public void run() {
+    				open.openIt(theFile, true);
+    			}
+    		}).start();
+    	}
+    } 
+    
 AboutAction aboutAction = new AboutAction();
   class AboutAction
       extends AbstractAction {
@@ -815,28 +851,30 @@ public JabRefPreferences prefs() {
   private void macOSXRegistration() {
     if (Globals.osName.equals(Globals.MAC)) {
       try {
-        Class<?> osxAdapter = Class.forName("osxadapter.OSXAdapter");
-
-        Class<?>[] defArgs = {
-            JabRefFrame.class};
-        Method registerMethod = osxAdapter.getDeclaredMethod(
-            "registerMacOSXApplication", defArgs);
-        if (registerMethod != null) {
-          Object[] args = {
-              this};
-          registerMethod.invoke(osxAdapter, args);
-        }
-        // This is slightly gross.  to reflectively access methods with boolean args,
-        // use "boolean.class", then pass a Boolean object in as the arg, which apparently
-
-        defArgs[0] = boolean.class;
-        Method prefsEnableMethod = osxAdapter.getDeclaredMethod("enablePrefs",
-            defArgs);
-        if (prefsEnableMethod != null) {
-          Object args[] = {
-              Boolean.TRUE};
-          prefsEnableMethod.invoke(osxAdapter, args);
-        }
+    	  Class<?> osxAdapter = Class.forName("osxadapter.OSXAdapter");
+		  
+		  Class<?>[] defArgs = {Object.class, Method.class};
+		  Class<?> thisClass = JabRefFrame.class;
+		  Method registerMethod = osxAdapter.getDeclaredMethod("setAboutHandler", defArgs);
+		  if (registerMethod != null) {
+			  Object[] args = {this, thisClass.getDeclaredMethod("about", (Class[])null)};
+			  registerMethod.invoke(osxAdapter, args);
+		  }
+		  registerMethod = osxAdapter.getDeclaredMethod("setPreferencesHandler", defArgs);
+		  if (registerMethod != null) {
+			  Object[] args = {this, thisClass.getDeclaredMethod("preferences", (Class[])null)};
+			  registerMethod.invoke(osxAdapter, args);
+		  }
+		  registerMethod = osxAdapter.getDeclaredMethod("setQuitHandler", defArgs);
+		  if (registerMethod != null) {
+			  Object[] args = {this, thisClass.getDeclaredMethod("quit", (Class[])null)};
+			  registerMethod.invoke(osxAdapter, args);
+		  }
+		  registerMethod = osxAdapter.getDeclaredMethod("setFileHandler", defArgs);
+		  if (registerMethod != null) {
+			  Object[] args = {this, thisClass.getDeclaredMethod("openAction", new Class[] { String.class })};
+			  registerMethod.invoke(osxAdapter, args);
+		  }
       }
       catch (NoClassDefFoundError e) {
         // This will be thrown first if the OSXAdapter is loaded on a system without the EAWT
@@ -1364,6 +1402,7 @@ public JabRefPreferences prefs() {
       
       tools.add(makeKeyAction);
       tools.add(Cleanup);
+      tools.add(mergeEntries);
       //tools.add(downloadFullText);
       tools.add(newSubDatabaseAction);
       tools.add(writeXmpAction);
@@ -1374,11 +1413,13 @@ public JabRefPreferences prefs() {
       tools.addSeparator();
       tools.add(manageSelectors);
       tools.addSeparator();
+      tools.add(openFolder);
       tools.add(openFile);
       tools.add(openPdf);
       tools.add(openUrl);
       //tools.add(openSpires);
       tools.add(findUnlinkedFiles);
+      tools.add(autoLinkFile);
       tools.addSeparator();
       tools.add(abbreviateIso);
       tools.add(abbreviateMedline);
@@ -1429,7 +1470,7 @@ public JabRefPreferences prefs() {
       mb.add(pluginMenu);
 
 
-      //options.add(selectKeys);
+      options.add(selectKeys);
       mb.add(options);
 
       helpMenu.add(help);
@@ -1512,7 +1553,8 @@ public JabRefPreferences prefs() {
     tlb.addAction(editStrings);
     tlb.addAction(makeKeyAction);
     tlb.addAction(Cleanup);
-
+    tlb.addAction(mergeEntries);
+    
     tlb.addSeparator();
     tlb.addAction(mark);
     tlb.addAction(unmark);
@@ -1573,6 +1615,7 @@ public JabRefPreferences prefs() {
       //tlb.addAction(winEdtPushAction);
       tlb.add(pushExternalButton.getComponent());
 
+      tlb.addAction(openFolder);
       tlb.addAction(openFile);
     //tlb.addAction(openPdf);
     //tlb.addAction(openUrl);
@@ -1619,7 +1662,7 @@ public JabRefPreferences prefs() {
             incrementalSearch, replaceAll, importMenu, exportMenu,
 			/* openSpires wasn't being supported so no point in supporting
 			 * openInspire */
-                openPdf, openUrl, openFile, openSpires, /*openInspire,*/ togglePreview, dupliCheck, /*strictDupliCheck,*/ highlightAll,
+                openPdf, openUrl, openFolder, openFile, openSpires, /*openInspire,*/ togglePreview, dupliCheck, /*strictDupliCheck,*/ highlightAll,
             highlightAny, newEntryAction, plainTextImport, massSetField, manageKeywords,
             closeDatabaseAction, switchPreview, integrityCheckAction, autoSetPdf, autoSetPs,
             toggleHighlightAny, toggleHighlightAll, databaseProperties, abbreviateIso,
@@ -1761,7 +1804,7 @@ public JabRefPreferences prefs() {
       KeyBindingsDialog d = new KeyBindingsDialog
           ( new HashMap<String, String>(prefs.getKeyBindings()),
            prefs.getDefaultKeys());
-      d.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+      d.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
       d.pack(); //setSize(300,500);
       Util.placeDialog(d, JabRefFrame.this);
       d.setVisible(true);
@@ -1817,8 +1860,8 @@ public JabRefPreferences prefs() {
             }
 
             if (basePanel().isBaseChanged()) {
-                int answer = JOptionPane.showConfirmDialog(JabRefFrame.this, Globals
-                    .lang("Database has changed. Do you want to save " + "before closing?"),
+                int answer = JOptionPane.showConfirmDialog(JabRefFrame.this,
+                    Globals.lang("Database has changed. Do you want to save before closing?"),
                     Globals.lang("Save before closing"), JOptionPane.YES_NO_CANCEL_OPTION);
                 if ((answer == JOptionPane.CANCEL_OPTION) || (answer == JOptionPane.CLOSED_OPTION)) {
                     close = false; // The user has cancelled.
@@ -1901,7 +1944,7 @@ public JabRefPreferences prefs() {
         Util.placeDialog(dialog, JabRefFrame.this);
         dialog.setVisible(true) ;
 
-        if (dialog.okPressed())
+        if (dialog.generatePressed())
         {
           BasePanel bp = new BasePanel( JabRefFrame.this,
                                         dialog.getGenerateDB(),   // database
diff --git a/src/java/net/sf/jabref/JabRefPreferences.java b/src/java/net/sf/jabref/JabRefPreferences.java
index 6c4aebc..f1b5f09 100644
--- a/src/java/net/sf/jabref/JabRefPreferences.java
+++ b/src/java/net/sf/jabref/JabRefPreferences.java
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2003-2011 JabRef contributors.
+/*  Copyright (C) 2003-2012 JabRef contributors.
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
@@ -70,17 +70,28 @@ public class JabRefPreferences {
 
         SHOWONELETTERHEADINGFORICONCOLUMNS = "showOneLetterHeadingForIconColumns",
 
+        EDITOR_EMACS_KEYBINDINGS = "editorEMACSkeyBindings",
+        EDITOR_EMACS_KEYBINDINGS_REBIND_CA = "editorEMACSkeyBindingsRebindCA",
+
         SHORTEST_TO_COMPLETE = "shortestToComplete",
         AUTOCOMPLETE_FIRSTNAME_MODE = "autoCompFirstNameMode",
         // here are the possible values for _MODE:
         AUTOCOMPLETE_FIRSTNAME_MODE_BOTH = "both",
         AUTOCOMPLETE_FIRSTNAME_MODE_ONLY_FULL = "fullOnly",
-        AUTOCOMPLETE_FIRSTNAME_MODE_ONLY_ABBR = "abbrOnly";
+        AUTOCOMPLETE_FIRSTNAME_MODE_ONLY_ABBR = "abbrOnly",
+
+        WRITEFIELD_ADDSPACES = "writeFieldAddSpaces",
+        WRITEFIELD_CAMELCASENAME = "writeFieldCamelCase",
+
+        UPDATE_TIMESTAMP = "updateTimestamp";
 
     // This String is used in the encoded list in prefs of external file type
     // modifications, in order to indicate a removed default file type:
     public static final String FILE_TYPE_REMOVED_FLAG = "REMOVED";
 
+    private static final char[][] VALUE_DELIMITERS =
+            new char[][]{ {'"', '"'}, {'{', '}'} };
+
     public String WRAPPED_USERNAME, MARKING_WITH_NUMBER_PATTERN;
 
     Preferences prefs;
@@ -179,6 +190,9 @@ public class JabRefPreferences {
         	defaults.put(EMACS_23, false);
         	defaults.put(EMACS_ADDITIONAL_PARAMETERS, "-batch -eval");
 		}
+		defaults.put("useProxy", Boolean.FALSE);
+        defaults.put("proxyHostname", "my proxy host");
+        defaults.put("proxyPort", "my proxy port");
         defaults.put(PDF_PREVIEW, Boolean.FALSE);
         defaults.put("useDefaultLookAndFeel", Boolean.TRUE);
         defaults.put("lyxpipe", System.getProperty("user.home")+File.separator+".lyx/lyxpipe");
@@ -232,7 +246,6 @@ public class JabRefPreferences {
         defaults.put("defaultShowSource", Boolean.FALSE);
         defaults.put("showSource", Boolean.TRUE);
         defaults.put("defaultAutoSort", Boolean.FALSE);
-        defaults.put("enableSourceEditing", Boolean.TRUE);
         defaults.put("caseSensitiveSearch", Boolean.FALSE);
         defaults.put("searchReq", Boolean.TRUE);
         defaults.put("searchOpt", Boolean.TRUE);
@@ -242,13 +255,17 @@ public class JabRefPreferences {
         defaults.put("searchAutoComplete", Boolean.TRUE);
         defaults.put("saveInStandardOrder", Boolean.TRUE);
         defaults.put("saveInOriginalOrder", Boolean.FALSE);
+        defaults.put("saveInTitleOrder", Boolean.FALSE);
         defaults.put("exportInStandardOrder", Boolean.TRUE);
         defaults.put("exportInOriginalOrder", Boolean.FALSE);
+        defaults.put("exportInTitleOrder", Boolean.FALSE);
         defaults.put("selectS", Boolean.FALSE);
         defaults.put("regExpSearch", Boolean.TRUE);
         defaults.put("highLightWords", Boolean.TRUE);
         defaults.put("searchPanePosX", new Integer(0));
         defaults.put("searchPanePosY", new Integer(0));
+        defaults.put(EDITOR_EMACS_KEYBINDINGS, Boolean.FALSE);
+        defaults.put(EDITOR_EMACS_KEYBINDINGS_REBIND_CA, Boolean.TRUE);
         defaults.put("autoComplete", Boolean.TRUE);
         defaults.put("autoCompleteFields", "author;editor;title;journal;publisher;keywords;crossref");
         defaults.put("autoCompFF", Boolean.FALSE); // "Autocomplete names in 'Firstname Lastname' format only"
@@ -267,6 +284,7 @@ public class JabRefPreferences {
         defaults.put("groupExpandTree", Boolean.TRUE);
         defaults.put("groupAutoShow", Boolean.TRUE);
         defaults.put("groupAutoHide", Boolean.TRUE);
+        defaults.put(JabRefPreferences.GROUP_SHOW_NUMBER_OF_ELEMENTS, Boolean.FALSE);
         defaults.put("autoAssignGroup", Boolean.TRUE);
         defaults.put("groupKeywordSeparator", ", ");
         defaults.put(EDIT_GROUP_MEMBERSHIP_MODE, Boolean.FALSE);
@@ -323,6 +341,7 @@ public class JabRefPreferences {
         defaults.put("disableOnMultipleSelection", Boolean.FALSE);
         defaults.put("pdfColumn", Boolean.FALSE);
         defaults.put("urlColumn", Boolean.TRUE);
+        defaults.put("preferUrlDoi", Boolean.FALSE);
         defaults.put("fileColumn", Boolean.TRUE);
         defaults.put("arxivColumn", Boolean.FALSE);
         
@@ -409,8 +428,13 @@ public class JabRefPreferences {
         defaults.put("timeStampFormat", "yyyy.MM.dd");
 //        defaults.put("timeStampField", "timestamp");
         defaults.put("timeStampField", BibtexFields.TIMESTAMP);
+        defaults.put(UPDATE_TIMESTAMP, Boolean.FALSE);
         defaults.put("generateKeysBeforeSaving", Boolean.FALSE);
 
+        // behavior of JabRef before 2.10: both: false
+        defaults.put(WRITEFIELD_ADDSPACES, Boolean.TRUE);
+        defaults.put(WRITEFIELD_CAMELCASENAME, Boolean.TRUE);
+
         defaults.put("useRemoteServer", Boolean.FALSE);
         defaults.put("remoteServerPort", new Integer(6050));
 
@@ -434,7 +458,7 @@ public class JabRefPreferences {
         defaults.put("searchDialogWidth", new Integer(650));
         defaults.put("searchDialogHeight", new Integer(500));
         defaults.put("showFileLinksUpgradeWarning", Boolean.TRUE);
-        defaults.put("autolinkExactKeyOnly", Boolean.TRUE);
+        defaults.put(AUTOLINK_EXACT_KEY_ONLY, Boolean.TRUE);
         defaults.put("numericFields", "mittnum;author");
         defaults.put("runAutomaticFileSearch", Boolean.FALSE);
         defaults.put("useLockFiles", Boolean.TRUE);
@@ -444,6 +468,10 @@ public class JabRefPreferences {
         defaults.put("deletePlugins", "");
         defaults.put("enforceLegalBibtexKey", Boolean.TRUE);
         defaults.put("biblatexMode", Boolean.FALSE);
+        // Curly brackets ({}) are the default delimiters, not quotes (") as these cause trouble when they appear within the field value:
+        // Currently, JabRef does not escape them
+        defaults.put("valueDelimiters", 1);
+        defaults.put("includeEmptyFields", Boolean.FALSE);
         defaults.put("keyGenFirstLetterA", Boolean.TRUE);
         defaults.put("keyGenAlwaysAddLetter", Boolean.FALSE);
         defaults.put(JabRefPreferences.EMAIL_SUBJECT, Globals.lang("References"));
@@ -496,6 +524,7 @@ public class JabRefPreferences {
         defaults.put("useIEEEAbrv", Boolean.TRUE);
         defaults.put("useConvertToEquation", Boolean.FALSE);
         defaults.put("useCaseKeeperOnSearch", Boolean.TRUE);
+        defaults.put("useUnitFormatterOnSearch", Boolean.TRUE);
 
 	defaults.put("userFileDir", GUIGlobals.FILE_FIELD + "Directory");
 	try {
@@ -527,10 +556,13 @@ public class JabRefPreferences {
     public static final String DEFAULT_REG_EXP_SEARCH_EXPRESSION_KEY = "defaultRegExpSearchExpression";
     public static final String REG_EXP_SEARCH_EXPRESSION_KEY = "regExpSearchExpression";
     public static final String USE_REG_EXP_SEARCH_KEY = "useRegExpSearch";
+    public static final String AUTOLINK_EXACT_KEY_ONLY = "autolinkExactKeyOnly";
 
 	public static final String EMAIL_SUBJECT = "emailSubject";
 	public static final String OPEN_FOLDERS_OF_ATTACHED_FILES = "openFoldersOfAttachedFiles";
 
+    public static final String GROUP_SHOW_NUMBER_OF_ELEMENTS = "groupShowNumberOfElements";
+
 
 	public boolean putBracesAroundCapitals(String fieldName) {
         return putBracesAroundCapitalsFields.contains(fieldName);
@@ -554,6 +586,15 @@ public class JabRefPreferences {
 
     }
 
+    public char getValueDelimiters(int index) {
+        return getValueDelimiters()[index];
+    }
+
+    public char[] getValueDelimiters() {
+        return VALUE_DELIMITERS[getInt(
+                "valueDelimiters")];
+    }
+
     /**
      * Check whether a key is set (differently from null).
      * @param key The key to check.
@@ -906,7 +947,7 @@ public class JabRefPreferences {
 
         // First read the bindings, and their names.
         String[] bindNames = getStringArray("bindNames"),
-            bindings = getStringArray("bindings");
+                 bindings  = getStringArray("bindings");
 
         // Then set up the key bindings HashMap.
         if ((bindNames == null) || (bindings == null)
@@ -1007,7 +1048,7 @@ public class JabRefPreferences {
         defKeyBinds.put("Search ACM Portal", "ctrl shift F8");
         defKeyBinds.put("Fetch ArXiv.org", "shift F8");
         defKeyBinds.put("Search JSTOR", "shift F9");
-        defKeyBinds.put("Write XMP", "ctrl F4");
+        defKeyBinds.put("Write XMP", "ctrl F7");
         defKeyBinds.put("New file link", "ctrl N");
         defKeyBinds.put("Fetch SPIRES", "ctrl F8");
         defKeyBinds.put("Fetch INSPIRE", "ctrl F2");
@@ -1027,8 +1068,17 @@ public class JabRefPreferences {
     }
 
     private String getNextUnit(Reader data) throws IOException {
-        int c;
-        boolean escape = false, done = false;
+        // character last read
+        // -1 if end of stream
+        // initialization necessary, because of Java compiler
+        int c = -1;
+
+        // last character was escape symbol
+        boolean escape = false;
+
+        // true if a ";" is found
+        boolean done = false;
+
         StringBuffer res = new StringBuffer();
         while (!done && ((c = data.read()) != -1)) {
             if (c == '\\') {
@@ -1050,10 +1100,14 @@ public class JabRefPreferences {
                 escape = false;
             }
         }
-        if (res.length() > 0)
+        if (res.length() > 0) {
             return res.toString();
-        else
+        } else if (c ==-1) {
+            // end of stream
             return null;
+        } else {
+            return "";
+        }
     }
 
     private String makeEscape(String s) {
diff --git a/src/java/net/sf/jabref/KeyBindingsDialog.java b/src/java/net/sf/jabref/KeyBindingsDialog.java
index 2a7960a..8da9f58 100644
--- a/src/java/net/sf/jabref/KeyBindingsDialog.java
+++ b/src/java/net/sf/jabref/KeyBindingsDialog.java
@@ -20,6 +20,8 @@ import java.awt.Dimension;
 import java.awt.event.*;
 import java.util.HashMap;
 import java.util.Iterator;
+import java.util.Map.Entry;
+import java.util.Set;
 import java.util.TreeMap;
 
 import javax.swing.*;
@@ -28,21 +30,40 @@ import javax.swing.event.ListSelectionListener;
 import javax.swing.table.AbstractTableModel;
 import javax.swing.table.TableColumnModel;
 
-//
-class KeyBindingsDialog
-    extends JDialog {
-  KeystrokeTable table;
-  KeystrokeTableModel tableModel;
+/**
+ * Dialog to customize key bindings
+ */
+ at SuppressWarnings("serial")
+class KeyBindingsDialog extends JDialog {
+    private KeystrokeTable table;
+  private KeystrokeTableModel tableModel;
   //JList list = new JList();
-  JTextField keyTF = new JTextField();
-  JButton ok, cancel, grabB, defB;
-  HashMap<String, String> bindHM, defBinds;
-  boolean clickedSave = false;
-  int selectedRow = -1;
+
+  // displays the key binding of the currently selected entry
+  // currently not displayed as it does not get updated
+  private JTextField keyTF = new JTextField();
+
+  private JButton ok, cancel, grabB, defB;
+  
+  // stores the user-selected key bindings
+  private final HashMap<String, String> bindHM;
+
+  // stores default key bindings
+  private HashMap<String, String> defBinds;
+
+  private boolean clickedSave = false;
+
+  /**
+   * Checked by the caller whether user has confirmed the change
+   * @return true if the user wants the keybindings to be stored
+   */
   boolean getAction() {
     return clickedSave;
   }
 
+  /**
+   * Used by the caller to retrieve the keybindings
+   */
   HashMap<String, String> getNewKeyBindings() {
     return bindHM;
   }
@@ -54,6 +75,7 @@ class KeyBindingsDialog
     setModal(true); //this needs to be modal so that client knows when ok or cancel was clicked
     getContentPane().setLayout(new BorderLayout());
     bindHM = name2binding;
+    setupTable();
     setList();
     //JScrollPane listScroller = new JScrollPane(list);
     JScrollPane listScroller = new JScrollPane(table);
@@ -66,12 +88,6 @@ class KeyBindingsDialog
     grabB = new JButton(Globals.lang("Grab"));
     defB = new JButton(Globals.lang("Default"));
     grabB.addKeyListener(new JBM_CustomKeyBindingsListener());
-    /*grabB.addActionListener(new ActionListener() {
-      public void actionPerformed(ActionEvent e) {
-        selectedRow = (table.getSelectedRows())[0];
-        Util.pr(""+selectedRow);
-      }
-    });*/
     buttonBox.add(grabB);
     buttonBox.add(defB);
     buttonBox.add(ok);
@@ -82,6 +98,8 @@ class KeyBindingsDialog
     setButtons();
     keyTF.setEditable(false);
 
+    Util.bindCloseDialogKeyToCancelAction(getRootPane(), cancel.getAction());
+
     addWindowListener(new WindowAdapter() {
       public void windowClosing(WindowEvent e) {
         clickedSave = false;
@@ -90,7 +108,17 @@ class KeyBindingsDialog
     });
   }
 
-  void setTop() {
+  private void setupTable() {
+      table = new KeystrokeTable();
+      //table.setCellSelectionEnabled(false);
+      table.setRowSelectionAllowed(true);
+      table.setColumnSelectionAllowed(false);
+      table.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
+      table.setAutoCreateRowSorter(true);
+      // TODO: setup so that clicking on list will display the current binding
+  }
+
+  private void setTop() {
     Box topBox = new Box(BoxLayout.X_AXIS);
 
     topBox.add(new JLabel(Globals.lang("Binding") + ":", JLabel.RIGHT));
@@ -99,21 +127,16 @@ class KeyBindingsDialog
 
   }
 
-  //##################################################
-  // respond to grabKey and display the key binding
-  //##################################################
-  public class JBM_CustomKeyBindingsListener
+  /**
+   * respond to grabKey and display the key binding
+   */
+  private class JBM_CustomKeyBindingsListener
       extends KeyAdapter {
     public void keyPressed(KeyEvent evt) {
       // first check if anything is selected if not the return
       int selRow = table.getSelectedRow();
       if (selRow < 0)
         return;
-      //Util.pr("dei"+selectedRow+" "+table.getSelectedRow());
-      //Object[] selected = list.getSelectedValues();
-      //if (selected.length == 0) {
-      //  return;
-      //}
 
       String code = KeyEvent.getKeyText(evt.getKeyCode());
       String mod = KeyEvent.getKeyModifiersText(evt.getModifiers());
@@ -121,8 +144,8 @@ class KeyBindingsDialog
 
       if (mod.equals("")) {
         int kc = evt.getKeyCode();
-        if ( (kc < KeyEvent.VK_F1) && (kc > KeyEvent.VK_F12) &&
-            (kc != KeyEvent.VK_ESCAPE) && (kc != KeyEvent.VK_DELETE)) {
+        if (!(((kc >= KeyEvent.VK_F1) && (kc <= KeyEvent.VK_F12)) ||
+              (kc == KeyEvent.VK_ESCAPE) || (kc == KeyEvent.VK_DELETE))) {
           return; // need a modifier except for function keys
         }
       }
@@ -163,10 +186,10 @@ class KeyBindingsDialog
     }
   }
 
-  //##################################################
-  // put the corresponding key binding into keyTF
-  //##################################################
-  class MyListSelectionListener
+  /**
+   * put the corresponding key binding into keyTF
+   */
+  private class MyListSelectionListener
       implements ListSelectionListener {
     // This method is called each time the user changes the set of selected items
     public void valueChanged(ListSelectionEvent evt) {
@@ -189,9 +212,10 @@ class KeyBindingsDialog
 
   
 
-  //setup so that clicking on list will display the current binding
-  void setList() {
-
+  /**
+   * Puts the content of bindHM into the table
+   */
+  private void setList() {
     Iterator<String> it = bindHM.keySet().iterator();
     String[][] tableData = new String[bindHM.size()][3];
     int i=0;
@@ -208,26 +232,25 @@ class KeyBindingsDialog
      sorted.put(tableData[i][0], tableData[i]);
 
     tableModel = new KeystrokeTableModel(sorted);
-    table = new KeystrokeTable(tableModel);
-    //table.setCellSelectionEnabled(false);
-    table.setRowSelectionAllowed(true);
-    table.setColumnSelectionAllowed(false);
-    table.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
-
-    //list.setModel(listModel);
+    table.setModel(tableModel);
+    
+    // has to be done each time as the columnModel is dependend on the tableModel
     TableColumnModel cm = table.getColumnModel();
     cm.getColumn(0).setPreferredWidth(GUIGlobals.KEYBIND_COL_0);
     cm.getColumn(1).setPreferredWidth(GUIGlobals.KEYBIND_COL_1);
-    table.setRowSelectionInterval(0, 0); //select the first entry
+//    table.setRowSelectionInterval(0, 0); //select the first entry
+
   }
 
-  class KeystrokeTable extends JTable {
-    public KeystrokeTable(KeystrokeTableModel model) { super(model); }
+  @SuppressWarnings("serial")
+  private class KeystrokeTable extends JTable {
+    public KeystrokeTable() { super(); }
      public boolean isCellEditable(int row, int col) { return false; }
      public String getOriginalName(int row) { return ((KeystrokeTableModel)getModel()).data[row][2]; }
    }
 
-    class KeystrokeTableModel extends AbstractTableModel {
+  @SuppressWarnings("serial")
+  private class KeystrokeTableModel extends AbstractTableModel {
       String[][] data;
       //String[] trData;
       public KeystrokeTableModel(TreeMap<String, String[]> sorted) {
@@ -263,35 +286,59 @@ class KeyBindingsDialog
     }
 
   // listners
-  void setButtons() {
+  private void setButtons() {
     ok.addActionListener(new ActionListener() {
       public void actionPerformed(ActionEvent e) {
         // save all the key bindings
         dispose();
         clickedSave = true;
-        // message: key bindings will take into effect next time you start JBM
+        // also displays message: key bindings will take into effect next time you start JBM
       }
     });
     cancel.addActionListener(new ActionListener() {
       public void actionPerformed(ActionEvent e) {
         dispose();
         clickedSave = false;
-        //System.exit(-1);//get rid of this
       }
     });
     defB.addActionListener(new ActionListener() {
       public void actionPerformed(ActionEvent e) {
-        /*Object[] selected = list.getSelectedValues();
+        int[] selected = table.getSelectedRows();
         if (selected.length == 0) {
-          return;
+            int answer = JOptionPane.showOptionDialog(KeyBindingsDialog.this, Globals.lang("All key bindings will be reset to their defaults.")+" "+Globals.lang("Continue?"), Globals.lang("Resetting all key bindings"),
+                    JOptionPane.YES_NO_OPTION,
+                    JOptionPane.QUESTION_MESSAGE, null,
+                    new String[]{Globals.lang("Ok"), Globals.lang("Cancel")},
+                    Globals.lang("Ok"));
+            if (answer == JOptionPane.YES_OPTION) {
+                bindHM.clear();
+                Set<Entry<String, String>> entrySet = defBinds.entrySet();
+                for (Entry<String, String> entry: entrySet) {
+                    bindHM.put(entry.getKey(), entry.getValue());
+                }
+                setList();
+            }
+        } else {
+            for (int i=0; i<selected.length; i++) {
+                int row = selected[i];
+                String name = (String) table.getValueAt(row, 0);
+                String newKey = setToDefault(name);
+                keyTF.setText(newKey);
+                table.setValueAt(newKey, row, 1);
+                table.repaint();
+            }
         }
-        keyTF.setText(setToDefault( (String) list.getSelectedValue()));*/
       }
     });
 
   }
 
-  String setToDefault(String name) {
+  /**
+   * Resets a single accelerator key
+   * @param name the action name
+   * @return the default accelerator key
+   */
+  private String setToDefault(String name) {
     String defKey = defBinds.get(name);
     bindHM.put(name, defKey);
     return defKey;
diff --git a/src/java/net/sf/jabref/NetworkTab.java b/src/java/net/sf/jabref/NetworkTab.java
new file mode 100644
index 0000000..4c2de8d
--- /dev/null
+++ b/src/java/net/sf/jabref/NetworkTab.java
@@ -0,0 +1,146 @@
+/*  Copyright (C) 2013 JabRef contributors.
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+package net.sf.jabref;
+
+import java.awt.BorderLayout;
+import java.awt.Dimension;
+import java.awt.Insets;
+import javax.swing.BorderFactory;
+import javax.swing.JCheckBox;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.JLabel;
+import javax.swing.JTextField;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+
+import com.jgoodies.forms.builder.DefaultFormBuilder;
+import com.jgoodies.forms.layout.FormLayout;
+
+public class NetworkTab extends JPanel implements PrefsTab {
+
+    private JCheckBox
+    	useProxy;
+    private JTextField defProxyHostname, defProxyPort;
+    JabRefPreferences _prefs;
+    JabRefFrame _frame;
+//    private HelpAction ownerHelp, timeStampHelp;
+
+    public NetworkTab(JabRefFrame frame, JabRefPreferences prefs) {
+        _prefs = prefs;
+        _frame = frame;
+        
+		setLayout(new BorderLayout());
+
+        useProxy = new JCheckBox(Globals.lang("Use custom proxy configuration"));
+
+        defProxyHostname = new JTextField();
+		defProxyHostname.setEnabled(false);
+        defProxyPort = new JTextField();
+		defProxyPort.setEnabled(false);
+        
+        Insets marg = new Insets(0,12,3,0);
+        useProxy.setMargin(marg);
+        defProxyPort.setMargin(marg);
+
+        
+        // We need a listener on useImportInspector to enable and disable the
+        // import inspector related choices;
+        useProxy.addChangeListener(new ChangeListener() {
+            public void stateChanged(ChangeEvent event) {
+                //useProxy.setEnabled(useProxy.isSelected());
+                defProxyHostname.setEnabled(useProxy.isSelected());
+                defProxyPort.setEnabled(useProxy.isSelected());
+            }
+        });
+
+        FormLayout layout = new FormLayout
+				("1dlu, 8dlu, left:pref, 4dlu, fill:150dlu, 4dlu, fill:pref","");
+                //("right:pref, 10dlu, 50dlu, 5dlu, fill:60dlu", "");
+				//("10dlu, left:50dlu, 4dlu, fill:pref", "");
+        DefaultFormBuilder builder = new DefaultFormBuilder(layout);
+
+
+
+        builder.appendSeparator(Globals.lang("Network"));
+        builder.nextLine();
+        builder.append(useProxy, 5);
+        builder.nextLine();
+        builder.append(new JPanel());
+		JLabel lap = new JLabel(Globals.lang("Host") + ":");
+		builder.append(lap);
+		builder.append(defProxyHostname);
+        builder.nextLine();
+        builder.append(new JPanel());
+		JLabel lap2 = new JLabel(Globals.lang("Port") + ":");
+		builder.append(lap2);
+		//builder.append(new JPanel());
+        builder.append(defProxyPort);
+
+        JPanel pan = builder.getPanel();
+        pan.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
+        add(pan, BorderLayout.CENTER);
+
+    }
+
+    public void setValues() {
+        
+		useProxy.setSelected(_prefs.getBoolean("useProxy"));
+        //_prefs.putBoolean("defaultAutoSort", defSorrrt.isSelected());
+        defProxyHostname.setText(_prefs.get("proxyHostname"));
+		defProxyPort.setText(_prefs.get("proxyPort"));
+		
+    }
+
+    public void storeSettings() {
+        _prefs.putBoolean("useProxy", useProxy.isSelected());
+        //_prefs.putBoolean("defaultAutoSort", defSorrrt.isSelected());
+        _prefs.put("proxyHostname", defProxyHostname.getText().trim());
+        _prefs.put("proxyPort", defProxyPort.getText().trim());
+    }
+
+    public boolean readyToClose() {
+    	boolean validSetting;
+    	if (useProxy.isSelected()) {
+    		String host = defProxyHostname.getText();
+    		String port = defProxyPort.getText();
+    		if ((host == null) || (host.trim().equals("")) ||
+    			(port == null) || (port.trim().equals(""))) {
+    			validSetting = false;
+    		} else {
+    			Integer p;
+    			try {
+    				p = Integer.parseInt(port);
+        			validSetting = (p > 0);
+    			} catch (NumberFormatException e) {
+    				validSetting = false;
+    			}
+    		}
+    	} else {
+			validSetting = true;
+    	}
+    	if (!validSetting) {
+            JOptionPane.showMessageDialog
+                    (null, Globals.lang("Please specify both hostname and port"),
+                            Globals.lang("Invalid setting"),
+                            JOptionPane.ERROR_MESSAGE);
+        }
+    	return validSetting;
+    }
+
+	public String getTabName() {
+		return Globals.lang("Network");
+	}
+}
diff --git a/src/java/net/sf/jabref/PrefsDialog3.java b/src/java/net/sf/jabref/PrefsDialog3.java
index 5c5c14c..d9ce828 100644
--- a/src/java/net/sf/jabref/PrefsDialog3.java
+++ b/src/java/net/sf/jabref/PrefsDialog3.java
@@ -77,6 +77,7 @@ public class PrefsDialog3 extends JDialog {
 		// ----------------------------------------------------------------
 		ArrayList<PrefsTab> tabs = new ArrayList<PrefsTab>();
 		tabs.add(new GeneralTab(frame, prefs));
+		tabs.add(new NetworkTab(frame, prefs));
         tabs.add(new FileTab(frame, prefs));
         tabs.add(new EntryEditorPrefsTab(frame, prefs));
         tabs.add(new GroupsPrefsTab(prefs));
@@ -162,14 +163,14 @@ public class PrefsDialog3 extends JDialog {
 				File file = new File(filename);
 				if (!file.exists()
 					|| (JOptionPane.showConfirmDialog(PrefsDialog3.this, "'" + file.getName()
-						+ "' " + Globals.lang("exists. Overwrite file?"), Globals
-						.lang("Export preferences"), JOptionPane.OK_CANCEL_OPTION) == JOptionPane.OK_OPTION)) {
+						+ "' " + Globals.lang("exists. Overwrite file?"),
+                                                Globals.lang("Export preferences"), JOptionPane.OK_CANCEL_OPTION) == JOptionPane.OK_OPTION)) {
 
 					try {
 						prefs.exportPreferences(filename);
 					} catch (IOException ex) {
-						JOptionPane.showMessageDialog(PrefsDialog3.this, Globals
-							.lang("Could not export preferences")
+						JOptionPane.showMessageDialog(PrefsDialog3.this,
+                                                        Globals.lang("Could not export preferences")
 							+ ": " + ex.getMessage(), Globals.lang("Export preferences"),
 							JOptionPane.ERROR_MESSAGE);
 						// ex.printStackTrace();
@@ -194,8 +195,8 @@ public class PrefsDialog3 extends JDialog {
 					frame.removeCachedEntryEditors();
                     Globals.prefs.updateEntryEditorTabList();
                 } catch (IOException ex) {
-					JOptionPane.showMessageDialog(PrefsDialog3.this, Globals
-						.lang("Could not import preferences")
+					JOptionPane.showMessageDialog(PrefsDialog3.this,
+                                                Globals.lang("Could not import preferences")
 						+ ": " + ex.getMessage(), Globals.lang("Import preferences"),
 						JOptionPane.ERROR_MESSAGE);
 					// ex.printStackTrace();
diff --git a/src/java/net/sf/jabref/PreviewPanel.java b/src/java/net/sf/jabref/PreviewPanel.java
index 7678c23..309962a 100644
--- a/src/java/net/sf/jabref/PreviewPanel.java
+++ b/src/java/net/sf/jabref/PreviewPanel.java
@@ -216,8 +216,8 @@ public class PreviewPanel extends JPanel implements VetoableChangeListener, Sear
 						// Inform the user... we don't know what to do.
 						JOptionPane.showMessageDialog(PreviewPanel.this,
 							Globals.lang("Could not print preview") + ".\n"
-								+ e.getMessage(), Globals
-								.lang("Printing Entry Preview"),
+								+ e.getMessage(),
+                                                                Globals.lang("Printing Entry Preview"),
 							JOptionPane.ERROR_MESSAGE);
 					}
 				}
diff --git a/src/java/net/sf/jabref/PreviewPrefsTab.java b/src/java/net/sf/jabref/PreviewPrefsTab.java
index 23b4598..c27c41b 100644
--- a/src/java/net/sf/jabref/PreviewPrefsTab.java
+++ b/src/java/net/sf/jabref/PreviewPrefsTab.java
@@ -176,8 +176,8 @@ public class PreviewPrefsTab extends JPanel implements PrefsTab {
 				getTestEntry();
 				PreviewPanel testPanel = new PreviewPanel(null, entry, null, new MetaData(), layout2.getText());
 				testPanel.setPreferredSize(new Dimension(800, 350));
-				JOptionPane.showMessageDialog(null, new JScrollPane(testPanel), Globals
-					.lang("Preview"), JOptionPane.PLAIN_MESSAGE);
+				JOptionPane.showMessageDialog(null, new JScrollPane(testPanel),
+                                        Globals.lang("Preview"), JOptionPane.PLAIN_MESSAGE);
 			}
 		});
 	}
diff --git a/src/java/net/sf/jabref/RightClickMenu.java b/src/java/net/sf/jabref/RightClickMenu.java
index 05a7e43..6028162 100644
--- a/src/java/net/sf/jabref/RightClickMenu.java
+++ b/src/java/net/sf/jabref/RightClickMenu.java
@@ -18,6 +18,7 @@ package net.sf.jabref;
 import java.awt.Font;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+import java.util.logging.Logger;
 
 import javax.swing.*;
 import javax.swing.event.PopupMenuEvent;
@@ -35,6 +36,8 @@ import net.sf.jabref.specialfields.SpecialFieldsUtils;
 public class RightClickMenu extends JPopupMenu
         implements PopupMenuListener {
 
+	private static final Logger logger = Logger.getLogger(RightClickMenu.class.getName());
+
     BasePanel panel;
     MetaData metaData;
     JMenu groupAddMenu = new JMenu(Globals.lang("Add to group")),
@@ -43,6 +46,7 @@ public class RightClickMenu extends JPopupMenu
             rankingMenu = new JMenu(),
             priorityMenu = new JMenu(),
             typeMenu = new JMenu(Globals.lang("Change entry type"));
+    JMenuItem groupAdd, groupRemove;
     JCheckBoxMenuItem
             floatMarked = new JCheckBoxMenuItem(Globals.lang("Float marked entries"),
             Globals.prefs.getBoolean("floatMarkedEntries"));
@@ -65,21 +69,27 @@ public class RightClickMenu extends JPopupMenu
             public void actionPerformed(ActionEvent e) {
                 try {
                     panel.runCommand("copy");
-                } catch (Throwable ex) {}
+                } catch (Throwable ex) {
+                	logger.warning(ex.getMessage());
+                }
             }
         });
         add(new AbstractAction(Globals.lang("Paste"), GUIGlobals.getImage("paste")) {
             public void actionPerformed(ActionEvent e) {
                 try {
                     panel.runCommand("paste");
-                } catch (Throwable ex) {}
+                } catch (Throwable ex) {
+                	logger.warning(ex.getMessage());
+                }
             }
         });
         add(new AbstractAction(Globals.lang("Cut"), GUIGlobals.getImage("cut")) {
             public void actionPerformed(ActionEvent e) {
                 try {
                     panel.runCommand("cut");
-                } catch (Throwable ex) {}
+                } catch (Throwable ex) {
+                	logger.warning(ex.getMessage());
+                }
             }
         });
 
@@ -89,10 +99,11 @@ public class RightClickMenu extends JPopupMenu
              public void run() {*/
                 try {
                     panel.runCommand("delete");
-                } catch (Throwable ex) {}
+                } catch (Throwable ex) {
+                	logger.warning(ex.getMessage());
+                }
                 /*}
                }); */
-
             }
         });
         addSeparator();
@@ -101,14 +112,18 @@ public class RightClickMenu extends JPopupMenu
             public void actionPerformed(ActionEvent e) {
                 try {
                     panel.runCommand("exportToClipboard");
-                } catch (Throwable ex) {}
+                } catch (Throwable ex) {
+                	logger.warning(ex.getMessage());
+                }
             }
         });
         add(new AbstractAction(Globals.lang("Send as email")) {
             public void actionPerformed(ActionEvent e) {
                 try {
                     panel.runCommand("sendAsEmail");
-                } catch (Throwable ex) {}
+                } catch (Throwable ex) {
+                	logger.warning(ex.getMessage());
+                }
             }
         });
         addSeparator();
@@ -123,7 +138,9 @@ public class RightClickMenu extends JPopupMenu
                 public void actionPerformed(ActionEvent e) {
                     try {
                         panel.runCommand("markEntries");
-                    } catch (Throwable ex) {}
+                    } catch (Throwable ex) {
+                    	logger.warning(ex.getMessage());
+                    }
                 }
             });
 
@@ -133,7 +150,9 @@ public class RightClickMenu extends JPopupMenu
                 public void actionPerformed(ActionEvent e) {
                     try {
                         panel.runCommand("unmarkEntries");
-                    } catch (Throwable ex) {}
+                    } catch (Throwable ex) {
+                    	logger.warning(ex.getMessage());
+                    }
                 }
             });
             addSeparator();
@@ -144,7 +163,9 @@ public class RightClickMenu extends JPopupMenu
                     public void actionPerformed(ActionEvent e) {
                         try {
                             panel.runCommand("markEntries");
-                        } catch (Throwable ex) {}
+                        } catch (Throwable ex) {
+                        	logger.warning(ex.getMessage());
+                        }
                     }
                 });
 
@@ -155,7 +176,9 @@ public class RightClickMenu extends JPopupMenu
                     public void actionPerformed(ActionEvent e) {
                         try {
                             panel.runCommand("unmarkEntries");
-                        } catch (Throwable ex) {}
+                        } catch (Throwable ex) {
+                        	logger.warning(ex.getMessage());
+                        }
                     }
                 });
             }
@@ -186,11 +209,23 @@ public class RightClickMenu extends JPopupMenu
 	        addSeparator();
         }
         
+        add(new AbstractAction(Globals.lang("Open folder"), GUIGlobals.getImage("openFolder")) {
+            public void actionPerformed(ActionEvent e) {
+                try {
+                    panel.runCommand("openFolder");
+                } catch (Throwable ex) {
+                	logger.warning(ex.getMessage());
+                }
+            }
+        });
+        
         add(new AbstractAction(Globals.lang("Open file"), GUIGlobals.getImage("openExternalFile")) {
             public void actionPerformed(ActionEvent e) {
                 try {
                     panel.runCommand("openExternalFile");
-                } catch (Throwable ex) {}
+                } catch (Throwable ex) {
+                	logger.warning(ex.getMessage());
+                }
             }
         });
 
@@ -198,7 +233,9 @@ public class RightClickMenu extends JPopupMenu
             public void actionPerformed(ActionEvent e) {
                 try {
                     panel.runCommand("addFileLink");
-                } catch (Throwable ex) {}
+                } catch (Throwable ex) {
+                	logger.warning(ex.getMessage());
+                }
             }
         });
         /*add(new AbstractAction(Globals.lang("Open PDF or PS"), GUIGlobals.getImage("openFile")) {
@@ -213,7 +250,9 @@ public class RightClickMenu extends JPopupMenu
             public void actionPerformed(ActionEvent e) {
                 try {
                     panel.runCommand("openUrl");
-                } catch (Throwable ex) {}
+                } catch (Throwable ex) {
+                	logger.warning(ex.getMessage());
+                }
             }
         });
 
@@ -221,7 +260,9 @@ public class RightClickMenu extends JPopupMenu
             public void actionPerformed(ActionEvent e) {
                 try {
                     panel.runCommand("copyKey");
-                } catch (Throwable ex) {}
+                } catch (Throwable ex) {
+                	logger.warning(ex.getMessage());
+                }
             }
         });
 
@@ -229,7 +270,9 @@ public class RightClickMenu extends JPopupMenu
             public void actionPerformed(ActionEvent e) {
                 try {
                     panel.runCommand("copyCiteKey");
-                } catch (Throwable ex) {}
+                } catch (Throwable ex) {
+                	logger.warning(ex.getMessage());
+                }
             }
         });
 
@@ -242,7 +285,9 @@ public class RightClickMenu extends JPopupMenu
             public void actionPerformed(ActionEvent e) {
                 try {
                     panel.runCommand("importPlainText");
-                } catch (Throwable ex) {}
+                } catch (Throwable ex) {
+                	logger.warning(ex.getMessage());
+                }
             }
         });
         
@@ -251,6 +296,45 @@ public class RightClickMenu extends JPopupMenu
         
         addSeparator(); // for "add/move/remove to/from group" entries (appended here)
 
+        groupAdd = new JMenuItem(new AbstractAction(Globals.lang("Add to group"))
+        {
+            public void actionPerformed(ActionEvent e) {
+                try {
+                    panel.runCommand("addToGroup");
+
+                    //BibtexEntry[] bes = panel.getSelectedEntries();
+                    //JMenu groupMenu = buildGroupMenu(bes, true, false);
+
+                } catch (Throwable ex) {
+                	logger.warning(ex.getMessage());
+                }
+            }
+        });
+        add(groupAdd);
+        groupRemove = new JMenuItem(new AbstractAction(Globals.lang("Remove from group"))
+        {
+            public void actionPerformed(ActionEvent e) {
+                try {
+                    panel.runCommand("removeFromGroup");
+                } catch (Throwable ex) {
+                	logger.warning(ex.getMessage());
+                }
+            }
+        });
+        add(groupRemove);
+
+        add(new AbstractAction(Globals.lang("Remove from group"))
+        {
+            public void actionPerformed(ActionEvent e) {
+                try {
+                    panel.runCommand("removeFromGroup");
+                } catch (Throwable ex) {
+                	logger.warning(ex.getMessage());
+                }
+            }
+        });
+
+
         floatMarked.addActionListener(new ActionListener() {
             public void actionPerformed(ActionEvent e) {
                 Globals.prefs.putBoolean("floatMarkedEntries", floatMarked.isSelected());
@@ -290,37 +374,55 @@ public class RightClickMenu extends JPopupMenu
     public void popupMenuWillBecomeVisible(PopupMenuEvent e) {
         BibtexEntry[] bes = panel.getSelectedEntries();
         panel.storeCurrentEdit();
+        GroupTreeNode groups = panel.metaData().getGroups();
+        if (groups == null) {
+            groupAdd.setEnabled(false);
+            groupRemove.setEnabled(false);
+        } else {
+            groupAdd.setEnabled(true);
+            groupRemove.setEnabled(true);
+        }
+
+        addSeparator();
+        floatMarked.setSelected(Globals.prefs.getBoolean("floatMarkedEntries"));
+        add(floatMarked);
+    }
+
+    private JMenu buildGroupMenu(BibtexEntry[] bes, boolean add, boolean move) {
+        if (bes == null)
+            return null;
+        JMenu groupMenu = new JMenu();
         GroupTreeNode groups = metaData.getGroups();
         if (groups == null) {
             groupAddMenu.setEnabled(false);
             groupMoveMenu.setEnabled(false);
             groupRemoveMenu.setEnabled(false);
-            return;
+            return null;
         }
 
-        groupAddMenu.setEnabled(true);
+        /*groupAddMenu.setEnabled(true);
         groupMoveMenu.setEnabled(true);
         groupRemoveMenu.setEnabled(true);
         groupAddMenu.removeAll();
         groupMoveMenu.removeAll();
         groupRemoveMenu.removeAll();
 
-        if (bes == null)
-            return;
         add(groupAddMenu);
         add(groupMoveMenu);
         add(groupRemoveMenu);
 
         groupAddMenu.setEnabled(false);
         groupMoveMenu.setEnabled(false);
-        groupRemoveMenu.setEnabled(false);
-        insertNodes(groupAddMenu,metaData.getGroups(),bes,true,false);
+        groupRemoveMenu.setEnabled(false);*/
+
+        /*insertNodes(groupAddMenu,metaData.getGroups(),bes,true,false);
         insertNodes(groupMoveMenu,metaData.getGroups(),bes,true,true);
-        insertNodes(groupRemoveMenu,metaData.getGroups(),bes,false,false);
+        insertNodes(groupRemoveMenu,metaData.getGroups(),bes,false,false);*/
+
+        insertNodes(groupMenu,metaData.getGroups(),bes,add, move);
+
+        return groupMenu;
 
-        addSeparator();
-        floatMarked.setSelected(Globals.prefs.getBoolean("floatMarkedEntries"));
-        add(floatMarked);
     }
 
     /**
diff --git a/src/java/net/sf/jabref/SearchManager2.java b/src/java/net/sf/jabref/SearchManager2.java
index 3afa085..a8cd013 100644
--- a/src/java/net/sf/jabref/SearchManager2.java
+++ b/src/java/net/sf/jabref/SearchManager2.java
@@ -389,9 +389,9 @@ public class SearchManager2 extends SidePaneComponent
     /** force the search button to be large enough for
      * the longer of the two texts */
     private void setSearchButtonSizes() {
-        search.setText(Globals.lang("Search Specified Field(s)"));
+        search.setText(Globals.lang("Search specified field(s)"));
         Dimension size1 = search.getPreferredSize();
-        search.setText(Globals.lang("Search All Fields"));
+        search.setText(Globals.lang("Search all fields"));
         Dimension size2 = search.getPreferredSize();
         size2.width = Math.max(size1.width,size2.width);
         search.setMinimumSize(size2);
@@ -521,7 +521,8 @@ public class SearchManager2 extends SidePaneComponent
         worker.getWorker().run();
         worker.getCallBack().update();
         escape.setEnabled(true);
-        
+
+        frame.basePanel().mainTable.setSelected(0);
     }
     }
 
@@ -703,9 +704,8 @@ public class SearchManager2 extends SidePaneComponent
 
 
             if (incSearchPos >= panel.getDatabase().getEntryCount()) {
-            panel.output("'"+text+"' : "+Globals.lang
-
-                     ("Incremental search failed. Repeat to search from top.")+".");
+            panel.output("'"+text+"' : "+
+                    Globals.lang("Incremental search failed. Repeat to search from top.")+".");
             incSearchPos = -1;
             return;
             }
@@ -719,8 +719,8 @@ public class SearchManager2 extends SidePaneComponent
                 if (incSearchPos < panel.getDatabase().getEntryCount())
                     be = panel.mainTable.getEntryAt(incSearchPos);
             else {
-                panel.output("'"+text+"' : "+Globals.lang
-                     ("Incremental search failed. Repeat to search from top."));
+                panel.output("'"+text+"' : "+
+                     Globals.lang("Incremental search failed. Repeat to search from top."));
                 incSearchPos = -1;
                 return;
             }
@@ -728,9 +728,8 @@ public class SearchManager2 extends SidePaneComponent
             if (incSearchPos >= 0) {
 
             panel.selectSingleEntry(incSearchPos);
-            panel.output("'"+text+"' "+Globals.lang
-
-                     ("found")+".");
+            panel.output("'"+text+"' "+
+                     Globals.lang("found")+".");
 
             }
         }
@@ -763,8 +762,8 @@ public class SearchManager2 extends SidePaneComponent
                 searchField.getText(),
                 caseSensitive.isSelected(),
                 regExpSearch.isSelected()) != null
-                ? Globals.lang("Search Specified Field(s)")
-                : Globals.lang("Search All Fields"));
+                ? Globals.lang("Search specified field(s)")
+                : Globals.lang("Search all fields"));
     }
 
     /**
diff --git a/src/java/net/sf/jabref/SendAsEMailAction.java b/src/java/net/sf/jabref/SendAsEMailAction.java
index f9e49b5..0dd60f5 100644
--- a/src/java/net/sf/jabref/SendAsEMailAction.java
+++ b/src/java/net/sf/jabref/SendAsEMailAction.java
@@ -22,10 +22,7 @@ import java.io.StringWriter;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Iterator;
-
-import javax.swing.JOptionPane;
+import java.util.logging.Logger;
 
 import net.sf.jabref.export.LatexFieldFormatter;
 import net.sf.jabref.gui.FileListEntry;
@@ -42,6 +39,7 @@ import net.sf.jabref.gui.FileListTableModel;
  * preferences/external programs   
  */
 public class SendAsEMailAction extends AbstractWorker {
+    private static final Logger logger = Logger.getLogger(SendAsEMailAction.class.getName());
 
 	String message = null;
 	private JabRefFrame frame;
@@ -60,7 +58,7 @@ public class SendAsEMailAction extends AbstractWorker {
 		if (panel == null)
 			return;
 		if (panel.getSelectedEntries().length == 0) {
-			message = Globals.lang("No entries selected") + ".";
+			message = Globals.lang("No entries selected.");
 			return;
 		}
 
@@ -70,17 +68,11 @@ public class SendAsEMailAction extends AbstractWorker {
 		LatexFieldFormatter ff = new LatexFieldFormatter();
 
 		ArrayList<String> attachments = new ArrayList<String>();
-		HashSet<File> directories = new HashSet<File>();
 		
 		// open folders is needed to indirectly support email programs, which cannot handle
 		//   the unofficial "mailto:attachment" property 
 		boolean openFolders = JabRefPreferences.getInstance().getBoolean("openFoldersOfAttachedFiles");
 		
-		// Quick hack for Windows feature
-		// If OS is windows, then class Desktop is not used, but a direct call to explorer.exe
-		String osName = System.getProperty("os.name");
-		boolean isWindows = osName.startsWith("Windows");
-		
 		for (BibtexEntry entry : bes) {
 			try {
 				entry.write(sw, ff, true);
@@ -94,11 +86,10 @@ public class SendAsEMailAction extends AbstractWorker {
                 		// file exists
                 		attachments.add(f.getPath());
                 		if (openFolders) {
-                			if (isWindows) {
-                				String command = "explorer.exe /select,\"".concat(f.getAbsolutePath().concat("\""));
-                				Runtime.getRuntime().exec(command);
-                			} else {
-                				directories.add(f.getParentFile());
+                			try {
+                				Util.openFolderAndSelectFile(f.getAbsolutePath());
+                			} catch (IOException e) {
+                				logger.fine(e.getMessage());
                 			}
                 		}
                    	}
@@ -136,19 +127,6 @@ public class SendAsEMailAction extends AbstractWorker {
 			return;
 		}
 
-		if (openFolders) {
-			for (File d: directories) {
-				try {
-					desktop.open(d);
-				} catch (IOException e) {
-					// TODO Auto-generated catch block
-					e.printStackTrace();
-					message = String.format("%s: %s", Globals.lang("Could not open directory"), d.getAbsolutePath());
-					return;
-				}
-			}
-		}
-
 		message = String.format("%s: %d",
 				Globals.lang("Entries added to an email"), bes.length);
 	}
diff --git a/src/java/net/sf/jabref/SimpleUrlDragDrop.java b/src/java/net/sf/jabref/SimpleUrlDragDrop.java
index e0bfe94..1082d9f 100644
--- a/src/java/net/sf/jabref/SimpleUrlDragDrop.java
+++ b/src/java/net/sf/jabref/SimpleUrlDragDrop.java
@@ -116,9 +116,9 @@ public class SimpleUrlDragDrop implements DropTargetListener {
             return;
         }catch (UnsupportedFlavorException nfe){
             // if not an URL
-            JOptionPane.showMessageDialog((Component) editor, Globals
-                    .lang("Operation not supported"), Globals
-                    .lang("Drag and Drop Error"), JOptionPane.ERROR_MESSAGE);
+            JOptionPane.showMessageDialog((Component) editor, 
+                    Globals.lang("Operation not supported"),
+                    Globals.lang("Drag and Drop Error"), JOptionPane.ERROR_MESSAGE);
             logger.log(Level.WARNING, "Transfer exception", nfe);
         }catch (IOException ioex){
             logger.log(Level.WARNING, "!should not happen!", ioex);
diff --git a/src/java/net/sf/jabref/TableColumnsTab.java b/src/java/net/sf/jabref/TableColumnsTab.java
index 7005eb8..9b2e967 100644
--- a/src/java/net/sf/jabref/TableColumnsTab.java
+++ b/src/java/net/sf/jabref/TableColumnsTab.java
@@ -44,6 +44,8 @@ class TableColumnsTab extends JPanel implements PrefsTab {
     private JabRefFrame frame;
 
     private JCheckBox pdfColumn, urlColumn, fileColumn, arxivColumn;
+    private JRadioButton preferUrl, preferDoi;
+    private ButtonGroup preferUrlDoiGroup;
     
     private JCheckBox showOneLetterHeadingForIconColumns;
     private boolean oldShowOneLetterHeadingForIconColumns;
@@ -184,6 +186,19 @@ class TableColumnsTab extends JPanel implements PrefsTab {
         fileColumn = new JCheckBox(Globals.lang("Show file column"));
         pdfColumn = new JCheckBox(Globals.lang("Show PDF/PS column"));
 		urlColumn = new JCheckBox(Globals.lang("Show URL/DOI column"));
+                preferUrl = new JRadioButton(Globals.lang("Show URL first"));
+                preferDoi = new JRadioButton(Globals.lang("Show DOI first"));
+                preferUrlDoiGroup = new ButtonGroup();
+                preferUrlDoiGroup.add(preferUrl);
+		preferUrlDoiGroup.add(preferDoi);
+                
+                urlColumn.addChangeListener(new ChangeListener() {
+			@Override
+			public void stateChanged(ChangeEvent arg0) {
+				preferUrl.setEnabled(urlColumn.isSelected());
+                                preferDoi.setEnabled(urlColumn.isSelected());
+			}
+		});
 		arxivColumn = new JCheckBox(Globals.lang("Show ArXiv column"));
 
 		/*** begin: special table columns and special fields ***/
@@ -232,7 +247,7 @@ class TableColumnsTab extends JPanel implements PrefsTab {
 		builder.append(pan);
 
 		DefaultFormBuilder specialTableColumnsBuilder = new DefaultFormBuilder(new FormLayout(
-				"8dlu, 8dlu, 8cm, 8dlu, left:pref", "pref, pref, pref, pref, pref, pref, pref, pref, pref, pref"));
+				"8dlu, 8dlu, 8cm, 8dlu, 8dlu, left:pref:grow", "pref, pref, pref, pref, pref, pref, pref, pref, pref, pref"));
         CellConstraints cc = new CellConstraints();
 		
         specialTableColumnsBuilder.add(specialFieldsEnabled, cc.xyw(1, 1, 3));
@@ -246,10 +261,12 @@ class TableColumnsTab extends JPanel implements PrefsTab {
         specialTableColumnsBuilder.add(showOneLetterHeadingForIconColumns, cc.xyw(1, 9, 5));
 		specialTableColumnsBuilder.add(hlb, cc.xyw(1, 10, 2));
 
-		specialTableColumnsBuilder.add(fileColumn, cc.xy(5, 1));	
-		specialTableColumnsBuilder.add(pdfColumn, cc.xy(5, 2));	
-		specialTableColumnsBuilder.add(urlColumn, cc.xy(5, 3));	
-		specialTableColumnsBuilder.add(arxivColumn, cc.xy(5, 4));	
+		specialTableColumnsBuilder.add(fileColumn, cc.xyw(5, 1, 2));	
+		specialTableColumnsBuilder.add(pdfColumn, cc.xyw(5, 2, 2));	
+		specialTableColumnsBuilder.add(urlColumn, cc.xyw(5, 3, 2));	
+		specialTableColumnsBuilder.add(preferUrl, cc.xy(6, 4));	
+		specialTableColumnsBuilder.add(preferDoi, cc.xy(6, 5));	
+		specialTableColumnsBuilder.add(arxivColumn, cc.xyw(5, 6, 2));	
 
 		builder.append(specialTableColumnsBuilder.getPanel());
 		builder.nextLine();
@@ -280,6 +297,8 @@ class TableColumnsTab extends JPanel implements PrefsTab {
 		fileColumn.setSelected(_prefs.getBoolean("fileColumn"));
         pdfColumn.setSelected(_prefs.getBoolean("pdfColumn"));
 		urlColumn.setSelected(_prefs.getBoolean("urlColumn"));
+               preferUrl.setSelected(!_prefs.getBoolean("preferUrlDoi"));
+               preferDoi.setSelected(_prefs.getBoolean("preferUrlDoi"));
         fileColumn.setSelected(_prefs.getBoolean("fileColumn"));
         arxivColumn.setSelected(_prefs.getBoolean("arxivColumn"));
 
@@ -543,6 +562,7 @@ class TableColumnsTab extends JPanel implements PrefsTab {
         _prefs.putBoolean("fileColumn", fileColumn.isSelected());
         _prefs.putBoolean("pdfColumn", pdfColumn.isSelected());
 		_prefs.putBoolean("urlColumn", urlColumn.isSelected());
+		_prefs.putBoolean("preferUrlDoi", preferDoi.isSelected());
 		_prefs.putBoolean("arxivColumn", arxivColumn.isSelected());
 		
 		_prefs.putBoolean(JabRefPreferences.SHOWONELETTERHEADINGFORICONCOLUMNS, showOneLetterHeadingForIconColumns.isSelected());
diff --git a/src/java/net/sf/jabref/UrlDragDrop.java b/src/java/net/sf/jabref/UrlDragDrop.java
index 5a96e22..5c7ee92 100644
--- a/src/java/net/sf/jabref/UrlDragDrop.java
+++ b/src/java/net/sf/jabref/UrlDragDrop.java
@@ -140,14 +140,14 @@ public class UrlDragDrop implements DropTargetListener {
         try{
             URL url = (URL) tsf.getTransferData(dtURL);
             JOptionChoice res = (JOptionChoice) JOptionPane
-                    .showInputDialog(editor, "", Globals
-                            .lang("Select action"),
+                    .showInputDialog(editor, "",
+                            Globals.lang("Select action"),
                             JOptionPane.QUESTION_MESSAGE, null,
                             new JOptionChoice[] {
-                                    new JOptionChoice(Globals
-                                            .lang("Insert URL"), 0),
-                                    new JOptionChoice(Globals
-                                            .lang("Download file"), 1) },
+                                    new JOptionChoice(
+                                            Globals.lang("Insert URL"), 0),
+                                    new JOptionChoice(
+                                            Globals.lang("Download file"), 1) },
                             new JOptionChoice(Globals.lang("Insert URL"), 0));
             switch (res.getId()) {
             //insert URL
@@ -174,9 +174,9 @@ public class UrlDragDrop implements DropTargetListener {
                 }catch (IOException ioex){
                     logger.log(Level.SEVERE, "Error while downloading file",
                             ioex);
-                    JOptionPane.showMessageDialog(editor, Globals
-                            .lang("File download"), Globals
-                            .lang("Error while downloading file:"
+                    JOptionPane.showMessageDialog(editor, 
+                            Globals.lang("File download"),
+                            Globals.lang("Error while downloading file:"
                                     + ioex.getMessage()),
                             JOptionPane.ERROR_MESSAGE);
                 }
@@ -196,9 +196,9 @@ public class UrlDragDrop implements DropTargetListener {
                     .getTransferData(DataFlavor.javaFileListFlavor);
             if (filelist.size() > 1){
                 JOptionPane
-                        .showMessageDialog(editor, Globals
-                                .lang("Only one item is supported"), Globals
-                                .lang("Drag and Drop Error"),
+                        .showMessageDialog(editor,
+                                Globals.lang("Only one item is supported"),
+                                Globals.lang("Drag and Drop Error"),
                                 JOptionPane.ERROR_MESSAGE);
                 return;
             }
@@ -207,9 +207,9 @@ public class UrlDragDrop implements DropTargetListener {
             editor.updateField(feditor);
 
         }catch (UnsupportedFlavorException nfe){
-            JOptionPane.showMessageDialog(editor, Globals
-                    .lang("Operation not supported"), Globals
-                    .lang("Drag and Drop Error"), JOptionPane.ERROR_MESSAGE);
+            JOptionPane.showMessageDialog(editor,
+                    Globals.lang("Operation not supported"),
+                    Globals.lang("Drag and Drop Error"), JOptionPane.ERROR_MESSAGE);
             logger.log(Level.WARNING, "Transfer exception", nfe);
         }catch (IOException ioex){
             logger.log(Level.WARNING, "Transfer exception", ioex);
diff --git a/src/java/net/sf/jabref/Util.java b/src/java/net/sf/jabref/Util.java
index 636d29f..df8eede 100644
--- a/src/java/net/sf/jabref/Util.java
+++ b/src/java/net/sf/jabref/Util.java
@@ -22,6 +22,7 @@ import java.awt.BorderLayout;
 import java.awt.CardLayout;
 import java.awt.Color;
 import java.awt.Component;
+import java.awt.Desktop;
 import java.awt.Dimension;
 import java.awt.Font;
 import java.awt.event.ActionEvent;
@@ -50,7 +51,6 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.SortedSet;
 import java.util.StringTokenizer;
 import java.util.TreeSet;
 import java.util.Vector;
@@ -59,18 +59,22 @@ import java.util.regex.Pattern;
 
 import javax.swing.Action;
 import javax.swing.ActionMap;
+import javax.swing.BorderFactory;
 import javax.swing.Box;
 import javax.swing.InputMap;
 import javax.swing.JButton;
 import javax.swing.JComponent;
+import javax.swing.JDialog;
 import javax.swing.JFrame;
 import javax.swing.JLabel;
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
+import javax.swing.JProgressBar;
 import javax.swing.JRootPane;
 import javax.swing.JScrollPane;
 import javax.swing.JTextArea;
 import javax.swing.SwingUtilities;
+import javax.swing.undo.AbstractUndoableEdit;
 import javax.swing.undo.UndoableEdit;
 
 import net.sf.jabref.autocompleter.AbstractAutoCompleter;
@@ -79,6 +83,7 @@ import net.sf.jabref.export.layout.Layout;
 import net.sf.jabref.export.layout.LayoutHelper;
 import net.sf.jabref.external.ExternalFileType;
 import net.sf.jabref.external.ExternalFileTypeEntryEditor;
+import net.sf.jabref.external.RegExpFileSearch;
 import net.sf.jabref.external.UnknownExternalFileType;
 import net.sf.jabref.groups.AbstractGroup;
 import net.sf.jabref.groups.KeywordGroup;
@@ -126,7 +131,7 @@ public class Util {
     public static int MARK_COLOR_LEVELS = 6,
             MAX_MARKING_LEVEL = MARK_COLOR_LEVELS-1,
             IMPORT_MARK_LEVEL = MARK_COLOR_LEVELS;
-    public static Pattern markNumberPattern = Pattern.compile(Globals.prefs.MARKING_WITH_NUMBER_PATTERN);
+    public static Pattern markNumberPattern = Pattern.compile(JabRefPreferences.getInstance().MARKING_WITH_NUMBER_PATTERN);
 
 
     static {
@@ -296,7 +301,7 @@ public class Util {
 	public static String checkLegalKey(String key) {
 		if (key == null)
 			return null;
-        if (!Globals.prefs.getBoolean("enforceLegalBibtexKey")) {
+        if (!JabRefPreferences.getInstance().getBoolean("enforceLegalBibtexKey")) {
             // User doesn't want us to enforce legal characters. We must still look
             // for whitespace and some characters such as commas, since these would
             // interfere with parsing:
@@ -992,7 +997,7 @@ public static boolean openExternalFileUnknown(JabRefFrame frame, BibtexEntry ent
 			result.put(entry, new ArrayList<File>());
 		}
 
-        boolean exactOnly = Globals.prefs.getBoolean("autolinkExactKeyOnly");
+        boolean exactOnly = Globals.prefs.getBoolean(JabRefPreferences.AUTOLINK_EXACT_KEY_ONLY);
         // Now look for keys
 		nextFile:
 		for (File file : filesWithExtension){
@@ -3203,16 +3208,277 @@ public static boolean openExternalFileUnknown(JabRefFrame frame, BibtexEntry ent
 	 */
 	public static String getResults(URLConnection source) throws IOException {
 	    
-	    InputStream in = source.getInputStream();
+
+	    return getResultsWithEncoding(source, null);
+	}
+
+	/**
+	 * Download the URL using specified encoding and return contents as a String.
+	 * @param source
+         * encoding
+	 * @return
+	 * @throws IOException
+	 */
+	public static String getResultsWithEncoding(URLConnection source, String encoding) throws IOException {
+	    
+	    InputStreamReader in;
+            if(encoding != null) {
+                in = new InputStreamReader(source.getInputStream(), encoding);
+            } else {
+                in = new InputStreamReader(source.getInputStream());
+            }
+            
 	    StringBuffer sb = new StringBuffer();
-	    byte[] buffer = new byte[256];
 	    while(true) {
-	        int bytesRead = in.read(buffer);
-	        if(bytesRead == -1) break;
-	        for (int i=0; i<bytesRead; i++)
-	            sb.append((char)buffer[i]);
+	        int byteRead = in.read();
+	        if(byteRead == -1) break;
+                sb.append((char)byteRead);
 	    }
 	    return sb.toString();
 	}
+
+    public static boolean updateTimeStampIsSet() {
+        return (Globals.prefs.getBoolean("useTimeStamp") &&
+                Globals.prefs.getBoolean(JabRefPreferences.UPDATE_TIMESTAMP));
+    }
+
+    /**
+     * Updates the timestamp of the given entry,
+     * nests the given undaoableEdit in a named compound,
+     * and returns that named compound
+     */
+    public static NamedCompound doUpdateTimeStamp(BibtexEntry entry, AbstractUndoableEdit undoableEdit) {
+        NamedCompound ce = new NamedCompound(undoableEdit.getPresentationName());
+        ce.addEdit(undoableEdit);
+        String timeStampField = Globals.prefs.get("timeStampField");
+        String timestamp = Util.easyDateFormat();
+        Util.updateField(entry, timeStampField, timestamp, ce);
+        return ce;
+    }
+
+    /**
+     * Automatically add links for this set of entries, based on the globally stored list of
+     * external file types. The entries are modified, and corresponding UndoEdit elements
+     * added to the NamedCompound given as argument. Furthermore, all entries which are modified
+     * are added to the Set of entries given as an argument.
+     *
+     * The entries' bibtex keys must have been set - entries lacking key are ignored.
+     * The operation is done in a new thread, which is returned for the caller to wait for
+     * if needed.
+     *
+     * @param entries A collection of BibtexEntry objects to find links for.
+     * @param ce A NamedCompound to add UndoEdit elements to.
+     * @param changedEntries MODIFIED, optional. A Set of BibtexEntry objects to which all modified entries is added. This is used for status output and debugging
+     * @param singleTableModel UGLY HACK. The table model to insert links into. Already existing links are not duplicated or removed. This parameter has to be null if entries.count() != 1.
+     *   The hack has been introduced as a bibtexentry does not (yet) support the function getListTableModel() and the FileListEntryEditor editor holds an instance of that table model and does not reconstruct it after the search has succeeded. 
+     * @param metaData The MetaData providing the relevant file directory, if any.
+     * @param callback An ActionListener that is notified (on the event dispatch thread) when the search is
+     *  finished. The ActionEvent has id=0 if no new links were added, and id=1 if one or more links were added.
+     *  This parameter can be null, which means that no callback will be notified.
+     * @param diag An instantiated modal JDialog which will be used to display the progress of the autosetting.
+     *      This parameter can be null, which means that no progress update will be shown.
+     * @return the thread performing the autosetting
+     */
+    public static Thread autoSetLinks(final Collection<BibtexEntry> entries,
+                                      final NamedCompound ce,
+                                      final Set<BibtexEntry> changedEntries,
+                                      final FileListTableModel singleTableModel,
+                                      final MetaData metaData,
+                                      final ActionListener callback,
+                                      final JDialog diag) {
+        final ExternalFileType[] types = Globals.prefs.getExternalFileTypeSelection();
+        if (diag != null) {
+            final JProgressBar prog = new JProgressBar(JProgressBar.HORIZONTAL, 0, types.length-1);
+            final JLabel label = new JLabel(Globals.lang("Searching for files"));
+            prog.setIndeterminate(true);
+            prog.setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
+            diag.setTitle(Globals.lang("Autosetting links"));
+            diag.getContentPane().add(prog, BorderLayout.CENTER);
+            diag.getContentPane().add(label, BorderLayout.SOUTH);
+
+            diag.pack();
+            diag.setLocationRelativeTo(diag.getParent());
+        }
+
+        Runnable r = new Runnable() {
+            public void run() {
+
+                // determine directories to search in
+                ArrayList<File> dirs = new ArrayList<File>();
+                String[] dirsS = metaData.getFileDirectory(GUIGlobals.FILE_FIELD);
+                for (int i=0; i<dirsS.length; i++) {
+                    dirs.add(new File(dirsS[i]));
+                }
+
+                // determine extensions
+                Collection<String> extensions = new ArrayList<String>();
+                for (int i = 0; i < types.length; i++) {
+                    final ExternalFileType type = types[i];
+                    extensions.add(type.getExtension());
+                }
+                // Run the search operation:
+                Map<BibtexEntry, java.util.List<File>> result;
+                if (Globals.prefs.getBoolean(JabRefPreferences.USE_REG_EXP_SEARCH_KEY)) {
+                    String regExp = Globals.prefs.get(JabRefPreferences.REG_EXP_SEARCH_EXPRESSION_KEY);
+                    result = RegExpFileSearch.findFilesForSet(entries, extensions, dirs, regExp);
+                } else {
+                    result = Util.findAssociatedFiles(entries, extensions, dirs);
+                }
+
+
+                boolean foundAny = false;
+
+                // Iterate over the entries:
+                for (Iterator<BibtexEntry> i=result.keySet().iterator(); i.hasNext();) {
+                    BibtexEntry anEntry = i.next();
+                    FileListTableModel tableModel;
+                    String oldVal = anEntry.getField(GUIGlobals.FILE_FIELD);
+                    if (singleTableModel == null) {
+                        tableModel = new FileListTableModel();
+                        if (oldVal != null)
+                            tableModel.setContent(oldVal);
+                    } else {
+                        assert(entries.size() == 1);
+                        tableModel = singleTableModel;
+                    }
+                    List<File> files = result.get(anEntry);
+                    for (File f : files) {
+                        f = Util.shortenFileName(f, dirsS);
+                        boolean alreadyHas = false;
+                        //System.out.println("File: "+f.getPath());
+                        for (int j = 0; j < tableModel.getRowCount(); j++) {
+                            FileListEntry existingEntry = tableModel.getEntry(j);
+                            //System.out.println("Comp: "+existingEntry.getLink());
+                            if (new File(existingEntry.getLink()).equals(f)) {
+                                alreadyHas = true;
+                                break;
+                            }
+                        }
+                        if (!alreadyHas) {
+                            foundAny = true;
+                            ExternalFileType type;
+                            int index = f.getPath().lastIndexOf('.');
+                            if ((index >= 0) && (index < f.getPath().length()-1)) {
+                                type = Globals.prefs.getExternalFileTypeByExt
+                                    (f.getPath().substring(index+1).toLowerCase());
+                            } else {
+                                type = new UnknownExternalFileType("");
+                            }
+                            FileListEntry flEntry = new FileListEntry(f.getName(), f.getPath(), type);
+                            tableModel.addEntry(tableModel.getRowCount(), flEntry);
+
+                            String newVal = tableModel.getStringRepresentation();
+                            if (newVal.length() == 0)
+                                newVal = null;
+                            if (ce != null) {
+                                // store undo information
+                                UndoableFieldChange change = new UndoableFieldChange(anEntry,
+                                        GUIGlobals.FILE_FIELD, oldVal, newVal);
+                                ce.addEdit(change);
+                            }
+                            // hack: if table model is given, do NOT modify entry
+                            if (singleTableModel == null) {
+                                anEntry.setField(GUIGlobals.FILE_FIELD, newVal);
+                            }
+                            if (changedEntries != null)
+                                changedEntries.add(anEntry);
+                        }
+                    }
+                }
+                
+                // handle callbacks and dialog
+                final int id = foundAny ? 1 : 0;
+                SwingUtilities.invokeLater(new Runnable() {
+                    public void run() {
+                        if (diag != null)
+                            diag.dispose();
+                        if (callback != null)
+                            callback.actionPerformed(new ActionEvent(this, id, ""));
+                    }
+                });
+            }
+        };
+        Thread t = new Thread(r);
+        t.start();
+        if (diag != null) {
+            diag.setVisible(true);
+        }
+        return t;
+    }
+
+
+    /**
+     * Automatically add links for this entry to the table model given as an argument, based on
+     * the globally stored list of external file types. The entry itself is not modified. The entry's
+     * bibtex key must have been set.
+     * The operation is done in a new thread, which is returned for the caller to wait for
+     * if needed.
+     *
+     * @param entry The BibtexEntry to find links for.
+     * @param singleTableModel The table model to insert links into. Already existing links are not duplicated or removed.
+     * @param metaData The MetaData providing the relevant file directory, if any.
+     * @param callback An ActionListener that is notified (on the event dispatch thread) when the search is
+     *  finished. The ActionEvent has id=0 if no new links were added, and id=1 if one or more links were added.
+     *  This parameter can be null, which means that no callback will be notified. The passed ActionEvent is constructed with
+     *  (this, id, ""), where id is 1 if something has been done and 0 if nothing has been done.
+     * @param diag An instantiated modal JDialog which will be used to display the progress of the autosetting.
+     *      This parameter can be null, which means that no progress update will be shown.
+     * @return the thread performing the autosetting
+     */
+    public static Thread autoSetLinks(
+            final BibtexEntry entry, 
+            final FileListTableModel singleTableModel,
+            final MetaData metaData,
+            final ActionListener callback,
+            final JDialog diag) {
+        final Collection<BibtexEntry> entries = new ArrayList<BibtexEntry>();
+        entries.add(entry);
+        
+        return autoSetLinks(entries, null, null, singleTableModel, metaData, callback, diag);
+    }
+    
+    /**
+     * Opens a file browser of the folder of the given file. If possible, the file is selected
+     * @param fileLink the location of the file
+     * @throws IOException
+     */
+    public static void openFolderAndSelectFile(String fileLink) throws IOException {
+        if (Globals.ON_WIN) {
+            openFolderAndSelectFileOnWindows(fileLink);
+        } else if (Globals.ON_LINUX){
+            openFolderAndSelectFileOnLinux(fileLink);
+        } else {
+            openFolderAndSelectFileGeneric(fileLink);
+        }
+    }
+
+    private static void openFolderAndSelectFileOnLinux(String fileLink) throws IOException {
+        String desktopSession = System.getenv("DESKTOP_SESSION").toLowerCase();
+        
+        String cmd = "";
+        
+		if (desktopSession.contains("gnome")) {
+			cmd = "nautilus " + fileLink;
+		} else if (desktopSession.contains("kde")) {
+			cmd = "dolphin --select " + fileLink;
+		} else {
+			cmd = "xdg-open " + fileLink.substring(0, fileLink.lastIndexOf(File.separator));
+		}
+        
+        Runtime.getRuntime().exec(cmd);
+    }
+
+    private static void openFolderAndSelectFileGeneric(String fileLink) throws IOException {
+    	File f = new File(fileLink);
+        Desktop.getDesktop().open(f.getParentFile());
+    }
+
+    private static void openFolderAndSelectFileOnWindows(String link) throws IOException {
+        link = link.replace("&", "\"&\"");
+
+        String cmd = "explorer.exe /select,\"" + link + "\"";
+
+        Runtime.getRuntime().exec(cmd);
+    }
 }
 
diff --git a/src/java/net/sf/jabref/XmpPrefsTab.java b/src/java/net/sf/jabref/XmpPrefsTab.java
index 9447fad..e6af873 100644
--- a/src/java/net/sf/jabref/XmpPrefsTab.java
+++ b/src/java/net/sf/jabref/XmpPrefsTab.java
@@ -45,8 +45,8 @@ class XmpPrefsTab extends JPanel implements PrefsTab {
 
 	JTable table;
 
-	JCheckBox privacyFilterCheckBox = new JCheckBox(Globals
-		.lang("Do not write the following fields to XMP Metadata:"));
+	JCheckBox privacyFilterCheckBox = new JCheckBox(
+                Globals.lang("Do not write the following fields to XMP Metadata:"));
 
 	Vector<Object> tableRows = new Vector<Object>(10);
 
diff --git a/src/java/net/sf/jabref/collab/FileUpdateMonitor.java b/src/java/net/sf/jabref/collab/FileUpdateMonitor.java
index 2f58941..4dabe29 100644
--- a/src/java/net/sf/jabref/collab/FileUpdateMonitor.java
+++ b/src/java/net/sf/jabref/collab/FileUpdateMonitor.java
@@ -17,10 +17,12 @@ package net.sf.jabref.collab;
 
 import net.sf.jabref.Globals;
 import net.sf.jabref.Util;
+
 import java.util.HashMap;
 import java.io.File;
 import java.io.IOException;
 import java.util.Iterator;
+import java.util.logging.Logger;
 
 /**
  * This thread monitors a set of files, each associated with a FileUpdateListener, for changes
@@ -28,6 +30,8 @@ import java.util.Iterator;
  */
 public class FileUpdateMonitor extends Thread {
 
+	private static Logger logger = Logger.getLogger(FileUpdateMonitor.class.getName());
+
   final int WAIT = 4000;
   static int tmpNum = 0;
   int no = 0;
@@ -62,6 +66,12 @@ public class FileUpdateMonitor extends Thread {
       try {
         sleep(WAIT);
       } catch (InterruptedException ex) {
+    	  logger.finest("FileUpdateMonitor has been interrupted.");
+    	  /*  the (?) correct way to interrupt threads, according to
+    	   *  http://www.roseindia.net/javatutorials/shutting_down_threads_cleanly.shtml
+    	   */
+    	  Thread.currentThread().interrupt(); // very important
+    	  break;
       }
     }
   }
diff --git a/src/java/net/sf/jabref/export/ExportFormats.java b/src/java/net/sf/jabref/export/ExportFormats.java
index 773cc5e..aba13a9 100644
--- a/src/java/net/sf/jabref/export/ExportFormats.java
+++ b/src/java/net/sf/jabref/export/ExportFormats.java
@@ -67,6 +67,8 @@ public class ExportFormats {
                 "tablerefsabsbib", "tablerefsabsbib", "tablerefsabsbib", ".html"));
         putFormat(new ExportFormat(Globals.lang("Harvard RTF"), "harvard", "harvard",
                 "harvard", ".rtf"));
+        putFormat(new ExportFormat(Globals.lang("ISO 690"), "iso690rtf", "iso690RTF", "iso690rtf", ".rtf"));
+        putFormat(new ExportFormat(Globals.lang("ISO 690"), "iso690txt", "iso690", "iso690txt", ".txt"));
         putFormat(new ExportFormat(Globals.lang("Endnote"), "endnote", "EndNote",
                 "endnote", ".txt"));
         putFormat(new ExportFormat(Globals.lang("OpenOffice CSV"), "oocsv", "openoffice-csv",
diff --git a/src/java/net/sf/jabref/export/ExportToClipboardAction.java b/src/java/net/sf/jabref/export/ExportToClipboardAction.java
index f318d12..01184ad 100644
--- a/src/java/net/sf/jabref/export/ExportToClipboardAction.java
+++ b/src/java/net/sf/jabref/export/ExportToClipboardAction.java
@@ -51,7 +51,7 @@ public class ExportToClipboardAction extends AbstractWorker {
         if (panel == null)
             return;
         if (panel.getSelectedEntries().length == 0) {
-            message = Globals.lang("No entries selected") + ".";
+            message = Globals.lang("No entries selected.");
             getCallBack().update();
             return;
         }
diff --git a/src/java/net/sf/jabref/export/FileActions.java b/src/java/net/sf/jabref/export/FileActions.java
index dadd847..85ba170 100644
--- a/src/java/net/sf/jabref/export/FileActions.java
+++ b/src/java/net/sf/jabref/export/FileActions.java
@@ -56,7 +56,7 @@ public class FileActions
 {
 
     private static Pattern refPat = Pattern.compile("(#[A-Za-z]+#)"); // Used to detect string references in strings
-
+    private static BibtexString.Type previousStringType;
 
     private static void writePreamble(Writer fw, String preamble) throws IOException {
     if (preamble != null) {
@@ -74,6 +74,7 @@ public class FileActions
      * @throws IOException If anthing goes wrong in writing.
      */
     private static void writeStrings(Writer fw, BibtexDatabase database) throws IOException {
+        previousStringType = BibtexString.Type.AUTHOR;
         List<BibtexString> strings = new ArrayList<BibtexString>();
         for (String s : database.getStringKeySet()) {
             strings.add(database.getString(s));
@@ -81,18 +82,24 @@ public class FileActions
         Collections.sort(strings, new BibtexStringComparator(true));
         // First, make a Map of all entries:
         HashMap<String, BibtexString> remaining = new HashMap<String, BibtexString>();
+        int maxKeyLength = 0;
         for (Iterator<BibtexString> i=strings.iterator(); i.hasNext();) {
             BibtexString string = i.next();
             remaining.put(string.getName(), string);
+            maxKeyLength = Math.max(maxKeyLength, string.getName().length());
         }
-        for (Iterator<BibtexString> i = strings.iterator(); i.hasNext();) {
-            BibtexString bs = i.next();
-            if (remaining.containsKey(bs.getName()))
-                writeString(fw, bs, remaining);
+
+        for(BibtexString.Type t : BibtexString.Type.values()) {
+            for (Iterator<BibtexString> i = strings.iterator(); i.hasNext();) {
+                BibtexString bs = i.next();
+                if (remaining.containsKey(bs.getName()) && bs.getType() == t)
+                    writeString(fw, bs, remaining, maxKeyLength);
+            }
         }
+        fw.write(Globals.NEWLINE);
     }
 
-    private static void writeString(Writer fw, BibtexString bs, HashMap<String, BibtexString> remaining) throws IOException {
+    private static void writeString(Writer fw, BibtexString bs, HashMap<String, BibtexString> remaining, int maxKeyLength) throws IOException {
         // First remove this from the "remaining" list so it can't cause problem with circular refs:
         remaining.remove(bs.getName());
 
@@ -108,10 +115,19 @@ public class FileActions
             Object referred = remaining.get(foundLabel.substring(1, foundLabel.length()-1));
             // If the label we found exists as a key in the "remaining" Map, we go on and write it now:
             if (referred != null)
-                writeString(fw, (BibtexString)referred, remaining);
+                writeString(fw, (BibtexString)referred, remaining, maxKeyLength);
+        }
+
+        if (previousStringType != bs.getType()) {
+            fw.write(Globals.NEWLINE);
+            previousStringType = bs.getType();
         }
 
-        fw.write("@STRING{" + bs.getName() + " = ");
+        String suffix = "";
+        for(int i = maxKeyLength - bs.getName().length(); i > 0; i--) 
+            suffix += " ";
+
+        fw.write("@String { " + bs.getName() + suffix + " = ");
         if (!bs.getContent().equals("")) {
             try {
                 String formatted = (new LatexFieldFormatter()).format(bs.getContent(), Globals.BIBTEX_STRING);
@@ -126,7 +142,7 @@ public class FileActions
         else
             fw.write("{}");
 
-        fw.write("}" + Globals.NEWLINE + Globals.NEWLINE);
+        fw.write(" }" + Globals.NEWLINE);// + Globals.NEWLINE);
     }
 
     /**
@@ -268,6 +284,81 @@ public class FileActions
 
 	}
 
+    private enum SaveOrder {
+    	Standard, Original, Title, TableSort
+    }
+    
+    private static class SaveSettings {
+        public final String pri, sec, ter;
+        public final boolean priD, secD, terD;
+        
+        public SaveSettings(boolean isSaveOperation) {
+        	/* four options:
+        	 * 1. ordered by author/editor/year (saveInStandardOrder)
+        	 * 2. original order (saveInOriginalOrder) -- not hit here as SaveSettings is not called in that case
+        	 * 3. current table sort order (*everything else*)
+        	 * 4. ordered by title (saveInTitleOrder)
+        	 */
+        	SaveOrder saveOrder;
+        	String prefix = isSaveOperation ? "save" :  "export";
+        	if (Globals.prefs.getBoolean(prefix + "InStandardOrder")) {
+        		saveOrder = SaveOrder.Standard;
+        	} else if (Globals.prefs.getBoolean(prefix + "InTitleOrder")) {
+        		saveOrder = SaveOrder.Title;
+//        	} else if (Globals.prefs.getBoolean(prefix + "InOriginalOrder")) {
+        		// this case is never hit as SaveSettings() is never called if InOriginalOrder is true
+//        		saveOrder = SaveOrder.Original;
+        	} else {
+        		saveOrder = SaveOrder.TableSort;
+        	}
+
+        	switch (saveOrder) {
+        	case TableSort:
+                // The setting is to save according to the current table order.
+                pri = Globals.prefs.get("priSort");
+                sec = Globals.prefs.get("secSort");
+                // sorted as they appear on the screen.
+                ter = Globals.prefs.get("terSort");
+                priD = Globals.prefs.getBoolean("priDescending");
+                secD = Globals.prefs.getBoolean("secDescending");
+                terD = Globals.prefs.getBoolean("terDescending");
+                break;
+        	case Title:
+        		// The setting is to not save in standard order, but in title order: title, author, editor
+        		pri = "title";
+                sec = "author";
+                ter = "editor";
+                priD = false;
+                secD = false;
+                terD = false;
+                break;
+        	case Standard:
+        	default: // required to get rid of Java compile errors
+                pri = "author";
+                sec = "editor";
+                ter = "year";
+                priD = false;
+                secD = false;
+                terD = true;
+        		break;
+        	}
+        }
+    }
+    
+    private static List<Comparator<BibtexEntry>> getSaveComparators(boolean isSaveOperation) {
+        SaveSettings saveSettings = new SaveSettings(isSaveOperation);
+
+        List<Comparator<BibtexEntry>> comparators = new ArrayList<Comparator<BibtexEntry>>();
+        if (isSaveOperation)
+            comparators.add(new CrossRefEntryComparator());
+        comparators.add(new FieldComparator(saveSettings.pri, saveSettings.priD));
+        comparators.add(new FieldComparator(saveSettings.sec, saveSettings.secD));
+        comparators.add(new FieldComparator(saveSettings.ter, saveSettings.terD));
+        comparators.add(new FieldComparator(BibtexFields.KEY_FIELD));
+        
+        return comparators;
+    }
+    
     /**
 	 * Saves the database to file, including only the entries included in the
 	 * supplied input array bes.
@@ -316,34 +407,9 @@ public class FileActions
             // Comparator, that referred entries occur after referring
             // ones. Apart from crossref requirements, entries will be
             // sorted as they appear on the screen.
-        String pri, sec, ter;
-
-        boolean priD, secD, terD;
-        if (!prefs.getBoolean("saveInStandardOrder")) {
-        // The setting is to save according to the current table order.
-        pri = prefs.get("priSort");
-        sec = prefs.get("secSort");
-        // sorted as they appear on the screen.
-        ter = prefs.get("terSort");
-        priD = prefs.getBoolean("priDescending");
-        secD = prefs.getBoolean("secDescending");
-        terD = prefs.getBoolean("terDescending");
-        } else {
-        // The setting is to save in standard order: author, editor, year
-        pri = "author";
-        sec = "editor";
-        ter = "year";
-        priD = false;
-        secD = false;
-        terD = true;
-        }
 
-        List<Comparator<BibtexEntry>> comparators = new ArrayList<Comparator<BibtexEntry>>();
-        comparators.add(new CrossRefEntryComparator());
-        comparators.add(new FieldComparator(pri, priD));
-        comparators.add(new FieldComparator(sec, secD));
-        comparators.add(new FieldComparator(ter, terD));
-        comparators.add(new FieldComparator(BibtexFields.KEY_FIELD));
+        List<Comparator<BibtexEntry>> comparators = getSaveComparators(true);
+
         // Use glazed lists to get a sorted view of the entries:
         BasicEventList entryList = new BasicEventList();
         SortedList sorter = new SortedList(entryList, new FieldComparatorStack<BibtexEntry>(comparators));
@@ -446,55 +512,21 @@ public class FileActions
     */
     @SuppressWarnings("unchecked")
 	public static List<BibtexEntry> getSortedEntries(BibtexDatabase database, Set<String> keySet, boolean isSaveOperation) {
-        FieldComparatorStack<BibtexEntry> comparatorStack = null;
-
         boolean inOriginalOrder = isSaveOperation ? Globals.prefs.getBoolean("saveInOriginalOrder") :
             Globals.prefs.getBoolean("exportInOriginalOrder");
+        List<Comparator<BibtexEntry>> comparators;
         if (inOriginalOrder) {
             // Sort entries based on their creation order, utilizing the fact
             // that IDs used for entries are increasing, sortable numbers.
-            List<Comparator<BibtexEntry>> comparators = new ArrayList<Comparator<BibtexEntry>>();
+            comparators = new ArrayList<Comparator<BibtexEntry>>();
             comparators.add(new CrossRefEntryComparator());
             comparators.add(new IdComparator());
-            comparatorStack = new FieldComparatorStack<BibtexEntry>(comparators);
-
         } else {
-            String pri, sec, ter;
-            boolean priD, secD, terD = false;
-
-            boolean inStandardOrder = isSaveOperation ? Globals.prefs.getBoolean("saveInStandardOrder") :
-                Globals.prefs.getBoolean("exportInStandardOrder");
-            if (!inStandardOrder) {
-                // The setting is to save according to the current table order.
-                pri = Globals.prefs.get("priSort");
-                sec = Globals.prefs.get("secSort");
-                // sorted as they appear on the screen.
-                ter = Globals.prefs.get("terSort");
-                priD = Globals.prefs.getBoolean("priDescending");
-                secD = Globals.prefs.getBoolean("secDescending");
-                terD = Globals.prefs.getBoolean("terDescending");
-
-            } else {
-                // The setting is to save in standard order: author, editor, year
-                pri = "author";
-                sec = "editor";
-                ter = "year";
-                priD = false;
-                secD = false;
-                terD = true;
-            }
-            
-            List<Comparator<BibtexEntry>> comparators = new ArrayList<Comparator<BibtexEntry>>();
-            if (isSaveOperation)
-                comparators.add(new CrossRefEntryComparator());
-            comparators.add(new FieldComparator(pri, priD));
-            comparators.add(new FieldComparator(sec, secD));
-            comparators.add(new FieldComparator(ter, terD));
-            comparators.add(new FieldComparator(BibtexFields.KEY_FIELD));
-
-            comparatorStack = new FieldComparatorStack<BibtexEntry>(comparators);
+            comparators = getSaveComparators(isSaveOperation);
         }
+        
         // Use glazed lists to get a sorted view of the entries:
+        FieldComparatorStack<BibtexEntry> comparatorStack = new FieldComparatorStack<BibtexEntry>(comparators);
         BasicEventList entryList = new BasicEventList();
         SortedList sorter = new SortedList(entryList, comparatorStack);
 
@@ -511,7 +543,8 @@ public class FileActions
         return sorter;
     }
 
-    /** Returns true iff the entry has a nonzero value in its field.
+    /** 
+     * @return true iff the entry has a nonzero value in its field.
      */
     private static boolean nonZeroField(BibtexEntry be, String field)
     {
diff --git a/src/java/net/sf/jabref/export/LatexFieldFormatter.java b/src/java/net/sf/jabref/export/LatexFieldFormatter.java
index 3a47ca0..5ce5222 100644
--- a/src/java/net/sf/jabref/export/LatexFieldFormatter.java
+++ b/src/java/net/sf/jabref/export/LatexFieldFormatter.java
@@ -35,6 +35,8 @@ public class LatexFieldFormatter implements FieldFormatter {
 
     public String format(String text, String fieldName)
             throws IllegalArgumentException {
+        if (text == null) return Globals.prefs.getValueDelimiters(0)
+                + "" + Globals.prefs.getValueDelimiters(1);
 
         if (Globals.prefs.putBracesAroundCapitals(fieldName) && !Globals.BIBTEX_STRING.equals(fieldName)) {
             text = Util.putBracesAroundCapitals(text);
@@ -75,17 +77,18 @@ public class LatexFieldFormatter implements FieldFormatter {
             if (!ok)
                 throw new IllegalArgumentException("Curly braces { and } must be balanced.");
 
-            sb = new StringBuffer("{");
+            sb = new StringBuffer(
+                    Globals.prefs.getValueDelimiters(0) + "");
             // No formatting at all for these fields, to allow custom formatting?
             //if (Globals.prefs.getBoolean("preserveFieldFormatting"))
             //  sb.append(text);
             //else
-            if (!Globals.prefs.isNonWrappableField(fieldName))
-                sb.append(Util.wrap2(text, GUIGlobals.LINE_LENGTH));
-            else
+            //if (!Globals.prefs.isNonWrappableField(fieldName))
+            //    sb.append(Util.wrap2(text, GUIGlobals.LINE_LENGTH));
+            //else
                 sb.append(text);
 
-            sb.append('}');
+            sb.append(Globals.prefs.getValueDelimiters(1));
 
             return sb.toString();
         }
@@ -143,9 +146,9 @@ public class LatexFieldFormatter implements FieldFormatter {
             //if (tell++ > 10) System.exit(0);
         }
 
-        if (!Globals.prefs.isNonWrappableField(fieldName))
-            return Util.wrap2(sb.toString(), GUIGlobals.LINE_LENGTH);
-        else
+        //if (!Globals.prefs.isNonWrappableField(fieldName))
+        //    return Util.wrap2(sb.toString(), GUIGlobals.LINE_LENGTH);
+        //else
             return sb.toString();
 
 
@@ -156,7 +159,7 @@ public class LatexFieldFormatter implements FieldFormatter {
         /*sb.append("{");
         sb.append(text.substring(start_pos, end_pos));
         sb.append("}");*/
-        sb.append('{');
+        sb.append(Globals.prefs.getValueDelimiters(0));
         boolean escape = false, inCommandName = false, inCommand = false,
                 inCommandOption = false;
         int nestedEnvironments = 0;
@@ -221,7 +224,7 @@ public class LatexFieldFormatter implements FieldFormatter {
                 sb.append(c);
             escape = (c == '\\');
         }
-        sb.append('}');
+        sb.append(Globals.prefs.getValueDelimiters(1));
     }
 
     private void writeStringLabel(String text, int start_pos, int end_pos,
diff --git a/src/java/net/sf/jabref/export/OpenFolder.java b/src/java/net/sf/jabref/export/OpenFolder.java
new file mode 100644
index 0000000..09b7166
--- /dev/null
+++ b/src/java/net/sf/jabref/export/OpenFolder.java
@@ -0,0 +1,67 @@
+package net.sf.jabref.export;
+
+import java.util.logging.Logger;
+
+import net.sf.jabref.AbstractWorker;
+import net.sf.jabref.BasePanel;
+import net.sf.jabref.BibtexDatabase;
+import net.sf.jabref.BibtexEntry;
+import net.sf.jabref.Globals;
+import net.sf.jabref.JabRefFrame;
+import net.sf.jabref.Util;
+import net.sf.jabref.gui.FileListEntry;
+import net.sf.jabref.gui.FileListTableModel;
+
+public class OpenFolder extends AbstractWorker {
+    private static final Logger logger = Logger.getLogger(OpenFolder.class.getName());
+
+    String message;
+	private JabRefFrame frame;
+
+	public OpenFolder(JabRefFrame frame) {
+		this.frame = frame;
+	}
+
+	@Override		
+	
+	public void run() {
+		BasePanel panel = frame.basePanel();
+		if (panel == null) {
+			return;
+		}
+		
+		Integer selectedFilesCount = 0;
+		message = null;
+
+		if (panel.getSelectedEntries().length == 0) {
+			message = Globals.lang("No entries selected.");
+			return;
+		} else {
+			for (BibtexEntry entry : panel.getSelectedEntries()) {
+				try {
+					FileListTableModel tm = new FileListTableModel();
+					tm.setContent(entry.getField("file"));
+					for (int i = 0; i < tm.getRowCount(); i++) {
+						FileListEntry flEntry = tm.getEntry(i);
+						FileListEntry ent = flEntry;
+						logger.finer(ent.getLink());
+						Util.openFolderAndSelectFile(ent.getLink());
+						selectedFilesCount++;
+						break;
+					}
+				} catch (Exception ex) {
+					logger.warning(ex.getMessage());
+					message = ex.getMessage();
+				}
+			}
+		}
+		if (message == null) {
+			// no error occurred, just output the number of opened folders
+			message = Globals.lang("Opened %0 folder(s).", selectedFilesCount.toString());
+		}
+	}
+	
+	public void update() {
+		frame.output(message);
+	}
+}
diff --git a/src/java/net/sf/jabref/export/SaveDatabaseAction.java b/src/java/net/sf/jabref/export/SaveDatabaseAction.java
index c9d5879..f71a452 100644
--- a/src/java/net/sf/jabref/export/SaveDatabaseAction.java
+++ b/src/java/net/sf/jabref/export/SaveDatabaseAction.java
@@ -63,9 +63,9 @@ public class SaveDatabaseAction extends AbstractWorker {
                         + "What do you want to do?"), Globals.lang("File updated externally"),
                         JOptionPane.YES_NO_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE,
                         null, opts, opts[0]);
-                /*  int choice = JOptionPane.showConfirmDialog(frame, Globals.lang("File has been updated externally. "
-+"Are you sure you want to save?"), Globals.lang("File updated externally"),
-               JOptionPane.YES_NO_OPTION, JOptionPane.WARNING_MESSAGE);*/
+                //  int choice = JOptionPane.showConfirmDialog(frame, Globals.lang("File has been updated externally. "
+                // +"Are you sure you want to save?"), Globals.lang("File updated externally"),
+                // JOptionPane.YES_NO_OPTION, JOptionPane.WARNING_MESSAGE);
 
                 if (answer == JOptionPane.CANCEL_OPTION) {
                     cancelled = true;
diff --git a/src/java/net/sf/jabref/export/layout/format/Iso690FormatDate.java b/src/java/net/sf/jabref/export/layout/format/Iso690FormatDate.java
new file mode 100644
index 0000000..67c3d09
--- /dev/null
+++ b/src/java/net/sf/jabref/export/layout/format/Iso690FormatDate.java
@@ -0,0 +1,57 @@
+/*
+ * iso690FormatDate.java
+ *
+ * Creado el 10 de septiembre de 2009, 16:07
+ *
+ * Copyright 2009, Laura Hernández Gómez
+ *
+ * This file is part of Plugin ISO 690.
+ *
+ *  Plugin ISO 690 is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  Plugin ISO 690 is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with Plugin ISO 690.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package net.sf.jabref.export.layout.format;
+
+import net.sf.jabref.*;
+import net.sf.jabref.export.layout.*;
+/**
+ *
+ * @author Usuario
+ */
+public class Iso690FormatDate implements LayoutFormatter {
+    
+    /** Creates a new instance of iso690NamesAuthors */
+    public Iso690FormatDate() {
+    }
+
+    public String format(String s) {
+        
+        if ( s == null || s.trim().equals("") )
+         return "";
+        StringBuilder sb = new StringBuilder();
+        String[] date = s.split("de");
+        //parte el string en los distintos campos de la fecha
+        if ( date.length == 1 ){ //sólo pone el año
+             sb.append(date[0].trim());
+        } else if (date.length == 2){//primer campo mes, segundo campo año
+            //cambiamos al formato año - mes
+            sb.append(date[1].trim() + "-" + date[0].trim());
+        } else if ( date.length == 3){
+            //primer campo día, segundo campo mes y tercer campo año
+            // cambiamos al formato año-mes-día
+            sb.append(date[2].trim() + "-" + date[1].trim() + "-" + date[0].trim());
+        }
+        return sb.toString();//retorna el string creado con la fecha.
+    }
+}
\ No newline at end of file
diff --git a/src/java/net/sf/jabref/export/layout/format/Iso690NamesAuthors.java b/src/java/net/sf/jabref/export/layout/format/Iso690NamesAuthors.java
new file mode 100644
index 0000000..3730f30
--- /dev/null
+++ b/src/java/net/sf/jabref/export/layout/format/Iso690NamesAuthors.java
@@ -0,0 +1,116 @@
+/*
+ * iso690NamesAuthors.java
+ *
+ * Creado el 02 de agosto de 2009, 16:07
+ *
+ * Copyright 2009, Laura Hernández Gómez
+ *
+ * This file is part of Plugin ISO 690.
+ *
+ *  Plugin ISO 690 is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  Plugin ISO 690 is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with Plugin ISO 690.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package net.sf.jabref.export.layout.format;
+
+import net.sf.jabref.*;
+import net.sf.jabref.export.layout.*;
+/**
+ *
+ * @author Usuario
+ */
+public class Iso690NamesAuthors implements LayoutFormatter {
+    
+    /** Creates a new instance of iso690NamesAuthors */
+    public Iso690NamesAuthors() {
+    }
+    
+    
+    public String format(String s) {
+        
+        if ( s == null || s.trim().equals("") )
+         return "";
+        StringBuilder sb = new StringBuilder();
+        
+        String[] authors = s.split("and");
+        
+        //parte el string en los distintos autores
+        for (int i=0; i<authors.length; i++){
+            //parte el string author en varios campos, según el separador ","
+            String[] author = authors[i].split(",");
+            
+            // No separa apellidos y nombre con coma (,)
+            if ( author.length < 2 ) { // Caso 1: Nombre Apellidos
+                //parte el string author en varios campos, según el separador " "
+                author = authors[i].split(" ");
+                //declaramos y damos un valor para evitar problemas
+                String name = "", surname = ""; 
+                
+                if ( author.length == 1 ){// Caso 1.0: Sólo un campo
+                    sb.append(author[0].trim().toUpperCase());
+                    
+                } else if ( author.length == 2 ){// Caso 1.1: Nombre Apellido
+                    //primer campo Nombre
+                    name = author[0].trim(); 
+                    //Segundo campo Apellido
+                    surname = author[1].trim().toUpperCase();
+                    
+                     //añadimos los campos modificados al string final
+                    sb.append(surname); 
+                    sb.append(", ");
+                    sb.append(name);
+                    
+                } else if ( author.length == 3 ) {// Caso 1.2: Nombre Apellido1 Apellido2
+                    //primer campo Nombre
+                     name = author[0].trim();
+                     //Segundo y tercer campo Apellido1 Apellido2
+                     surname = author[1].trim().toUpperCase() + " " + author[2].trim().toUpperCase();
+                      
+                     //añadimos los campos modificados al string final
+                    sb.append(surname); 
+                    sb.append(", ");
+                    sb.append(name);
+                    
+                } else if ( author.length == 4 ){// Caso 1.3: Nombre SegundoNombre Apellido1 Apellido2
+                    //primer y segundo campo Nombre SegundoNombre
+                     name = author[0].trim() + " " + author[1].trim();
+                     //tercer y cuarto campo Apellido1 Apellido2
+                     surname = author[2].trim().toUpperCase() + " " + author[3].trim().toUpperCase();
+                      
+                     //añadimos los campos modificados al string final
+                    sb.append(surname); 
+                    sb.append(", ");
+                    sb.append(name);                    
+                }
+                
+            } else { // Caso 2: Apellidos, Nombre
+                // Campo 1 apellidos, lo pasamos a mayusculas
+                String surname = author[0].trim().toUpperCase();
+                // campo 2 nombre
+                String name = author[1].trim(); 
+                //añadimos los campos modificados al string final
+                sb.append(surname);
+                sb.append(", ");
+                sb.append(name);
+            }
+            if (i < authors.length-2) { //si hay mas de 2 autores, lo separamos por ", "
+                sb.append(", ");
+            } else if (i == authors.length-2) {// si hay 2 autores, lo separamos por " y "
+                sb.append(" y ");
+            }
+        }
+        return sb.toString();//retorna el string creado de autores.
+    }
+}
+
+
diff --git a/src/java/net/sf/jabref/export/layout/format/RTFChars.java b/src/java/net/sf/jabref/export/layout/format/RTFChars.java
index cced6db..955b736 100644
--- a/src/java/net/sf/jabref/export/layout/format/RTFChars.java
+++ b/src/java/net/sf/jabref/export/layout/format/RTFChars.java
@@ -15,6 +15,8 @@
 */
 package net.sf.jabref.export.layout.format;
 
+import java.util.logging.Logger;
+
 import net.sf.jabref.Globals;
 import net.sf.jabref.export.layout.LayoutFormatter;
 
@@ -32,12 +34,11 @@ import net.sf.jabref.export.layout.LayoutFormatter;
  *   4.) Take special care to save all unicode characters correctly.
  *
  *   5.) Replace --- by \emdash and -- by \endash.
- * 
- * @author $Author$
- * @version $Revision$ ($Date$)
- *
  */
 public class RTFChars implements LayoutFormatter {
+	
+    // Instantiate logger:
+    private static Logger logger = Logger.getLogger(RTFChars.class.toString());
 
 	public String format(String field) {
 
@@ -46,13 +47,13 @@ public class RTFChars implements LayoutFormatter {
 		boolean escaped = false, incommand = false;
 		for (int i = 0; i < field.length(); i++) {
 
-            /*System.out.println("incommand="+incommand+". escaped="+escaped
+            System.out.println("incommand="+incommand+". escaped="+escaped
                             +". currentCommand='"+(currentCommand!=null?currentCommand.toString():"")+"'");
-            System.out.println("sb: '"+sb.toString()+"'");*/
+            System.out.println("sb: '"+sb.toString()+"'");/**/
 
             char c = field.charAt(i);
 
-            //System.out.println("Char: '"+((char)c)+"'");
+            System.out.println("Char: '"+((char)c)+"'");
 
             if (escaped && (c == '\\')) {
 				sb.append('\\');
@@ -85,7 +86,7 @@ public class RTFChars implements LayoutFormatter {
 						c = field.charAt(i);
 						String combody;
 						if (c == '{') {
-							IntAndString part = getPart(field, i);
+							IntAndString part = getPart(field, i, true);
 							i += part.i;
 							combody = part.s;
 						} else {
@@ -110,6 +111,7 @@ public class RTFChars implements LayoutFormatter {
                     && (c != '}')))
 					sb.append(c);
 				else {
+					assert(incommand);
 
                     // First test for braces that may be part of a LaTeX command:
                     if ((c == '{') && (currentCommand.length() == 0)) {
@@ -133,18 +135,24 @@ public class RTFChars implements LayoutFormatter {
 					if (i >= field.length() - 1)
 						break testContent;
 
-					if ((c == '{') && (currentCommand.length() > 0)) {
+					if (((c == '{') || (c == ' ')) && (currentCommand.length() > 0)) {
                         String command = currentCommand.toString();
 						// Then test if we are dealing with a italics or bold
 						// command. If so, handle.
 						if (command.equals("em") || command.equals("emph") || command.equals("textit")) {
-							IntAndString part = getPart(field, i);
+							IntAndString part = getPart(field, i, (c == '{'));
 							i += part.i;
-							sb.append("}{\\i ").append(part.s).append("}{");
+							sb.append("{\\i ").append(part.s).append("}");
 						} else if (command.equals("textbf")) {
-							IntAndString part = getPart(field, i);
+							IntAndString part = getPart(field, i, (c == '{'));
 							i += part.i;
-							sb.append("}{\\b ").append(part.s).append("}{");
+							sb.append("{\\b ").append(part.s).append("}");
+						} else {
+							logger.fine("Unknown command " + command);
+						}
+						if (c == ' ') {
+							// command was separated with the content by ' '
+							// We have to add the space a
 						}
                     } else
 						sb.append(c);
@@ -170,21 +178,38 @@ public class RTFChars implements LayoutFormatter {
 		return sb.toString().replaceAll("---", "{\\\\emdash}").replaceAll("--", "{\\\\endash}").replaceAll("``", "{\\\\ldblquote}").replaceAll("''","{\\\\rdblquote}");
 	}
 
-	private IntAndString getPart(String text, int i) {
+	/**
+	 * @param text the text to extract the part from
+	 * @param i the position to start
+	 * @param commandNestedInBraces true if the command is nested in braces (\emph{xy}), false if spaces are sued (\emph xy) 
+	 * @return a tuple of number of added characters and the extracted part
+	 */
+	private IntAndString getPart(String text, int i, boolean commandNestedInBraces) {
 		char c;
 		int count = 0;
 		StringBuffer part = new StringBuffer();
-		while ((count >= 0) && (i < text.length())) {
+		loop: while ((count >= 0) && (i < text.length())) {
 			i++;
 			c = text.charAt(i);
-			if (c == '}')
-				count--;
-			else if (c == '{')
-				count++;
-
+			switch(c) {
+				case '}':
+					count--;
+					break;
+				case '{':
+					count++;
+					break;
+				case ' ':
+					if (commandNestedInBraces) {
+						// in any case, a space terminates the loop
+						break loop;
+					}
+					break;
+			}
 			part.append(c);
 		}
-		return new IntAndString(part.length(), format(part.toString()));
+		String res = part.toString();
+		// the wrong "}" at the end is removed by "format(res)"
+		return new IntAndString(part.length(), format(res));
 	}
 
 	private class IntAndString {
diff --git a/src/java/net/sf/jabref/external/DownloadExternalFile.java b/src/java/net/sf/jabref/external/DownloadExternalFile.java
index ff7982e..53d859b 100644
--- a/src/java/net/sf/jabref/external/DownloadExternalFile.java
+++ b/src/java/net/sf/jabref/external/DownloadExternalFile.java
@@ -73,8 +73,8 @@ public class DownloadExternalFile {
         try {
             url = new URL(res);
         } catch (MalformedURLException ex1) {
-            JOptionPane.showMessageDialog(frame, Globals.lang("Invalid URL"), Globals
-                .lang("Download file"), JOptionPane.ERROR_MESSAGE);
+            JOptionPane.showMessageDialog(frame, Globals.lang("Invalid URL"),
+                Globals.lang("Download file"), JOptionPane.ERROR_MESSAGE);
             return;
         }
 
diff --git a/src/java/net/sf/jabref/external/DroppedFileHandler.java b/src/java/net/sf/jabref/external/DroppedFileHandler.java
index a700d90..234c8c3 100644
--- a/src/java/net/sf/jabref/external/DroppedFileHandler.java
+++ b/src/java/net/sf/jabref/external/DroppedFileHandler.java
@@ -361,9 +361,9 @@ public class DroppedFileHandler {
         return true;
     }
 
-    /**
-     * @return true if user pushed "OK", false otherwise
-     */
+    //
+    // @return true if user pushed "Ok", false otherwise
+    //
     public boolean showLinkMoveCopyRenameDialog(String linkFileName, ExternalFileType fileType,
         BibtexEntry entry, boolean newEntry, final boolean multipleEntries, BibtexDatabase database) {
     	String citeKey = entry.getCiteKey();
@@ -377,7 +377,7 @@ public class DroppedFileHandler {
                 break;
             }
         if (found < 0) {
-            destDirLabel.setText(Globals.lang("File directory is not set or does not exist."));
+            destDirLabel.setText(Globals.lang("File directory is not set or does not exist!"));
             copyRadioButton.setEnabled(false);
             moveRadioButton.setEnabled(false);
             renameToTextBox.setEnabled(false);
@@ -402,14 +402,12 @@ public class DroppedFileHandler {
 		};
 
 		if (multipleEntries) {
-			linkInPlace.setText(Globals
-					.lang("Leave files in their current directory."));
+			linkInPlace.setText(Globals.lang("Leave files in their current directory."));
 			copyRadioButton.setText(Globals.lang("Copy files to file directory."));
 
 			moveRadioButton.setText(Globals.lang("Move files to file directory."));
 		} else {
-			linkInPlace.setText(Globals
-					.lang("Leave file in its current directory."));
+			linkInPlace.setText(Globals.lang("Leave file in its current directory."));
 			copyRadioButton.setText(Globals.lang("Copy file to file directory."));
 			moveRadioButton.setText(Globals.lang("Move file to file directory."));
 		}
diff --git a/src/java/net/sf/jabref/external/ExternalFilePanel.java b/src/java/net/sf/jabref/external/ExternalFilePanel.java
index 20b591d..c1a40b7 100644
--- a/src/java/net/sf/jabref/external/ExternalFilePanel.java
+++ b/src/java/net/sf/jabref/external/ExternalFilePanel.java
@@ -198,7 +198,7 @@ public class ExternalFilePanel extends JPanel {
 					
 				} catch (TransformerException e) {
 					JOptionPane.showMessageDialog(editor.getParent(), 
-            Globals.lang("Error converting Bibtex to XMP: %0", e.getLocalizedMessage()), 
+            Globals.lang("Error converting BibTeX to XMP: %0", e.getLocalizedMessage()), 
             Globals.lang("Writing XMP"), JOptionPane.ERROR_MESSAGE);
 					  Globals.logger(Globals.lang("Error while converting BibtexEntry to XMP %0",
 						finalFile.getAbsolutePath()));
@@ -255,8 +255,8 @@ public class ExternalFilePanel extends JPanel {
 	public void downLoadFile(final String fieldName, final FieldEditor fieldEditor,
 		final Component parent) {
 
-		final String res = JOptionPane.showInputDialog(parent, Globals
-			.lang("Enter URL to download"));
+		final String res = JOptionPane.showInputDialog(parent,
+                        Globals.lang("Enter URL to download"));
 
 		if (res == null || res.trim().length() == 0)
 			return;
@@ -282,8 +282,8 @@ public class ExternalFilePanel extends JPanel {
 				if (getKey() != null)
 					plannedName = getKey() + suffix;
 				else {
-					plannedName = JOptionPane.showInputDialog(parent, Globals
-						.lang("BibTeX key not set. Enter a name for the downloaded file"));
+					plannedName = JOptionPane.showInputDialog(parent,
+                                                Globals.lang("BibTeX key not set. Enter a name for the downloaded file"));
 					if (plannedName != null && !off.accept(plannedName))
 						plannedName += suffix;
 				}
@@ -396,8 +396,8 @@ public class ExternalFilePanel extends JPanel {
 					}
 
 				} catch (MalformedURLException e1) {
-					JOptionPane.showMessageDialog(parent, Globals.lang("Invalid URL"), Globals
-						.lang("Download file"), JOptionPane.ERROR_MESSAGE);
+					JOptionPane.showMessageDialog(parent, Globals.lang("Invalid URL"),
+                                                Globals.lang("Download file"), JOptionPane.ERROR_MESSAGE);
 				} finally {
 					// If stuff goes wrong along the road, put back original
 					// value
diff --git a/src/java/net/sf/jabref/external/PushToLyx.java b/src/java/net/sf/jabref/external/PushToLyx.java
index f8724d7..bd00888 100644
--- a/src/java/net/sf/jabref/external/PushToLyx.java
+++ b/src/java/net/sf/jabref/external/PushToLyx.java
@@ -73,8 +73,8 @@ public class PushToLyx implements PushToApplication {
 
 
 	    t.start();
-	    /*new Timeout(2000, t, Globals.lang("Error")+": "+
-            Globals.lang("unable to access LyX-pipe"));*/
+	    //new Timeout(2000, t, Globals.lang("Error")+": "+
+            //Globals.lang("unable to access LyX-pipe"));
         try {
             t.join();
         } catch (InterruptedException e) {
diff --git a/src/java/net/sf/jabref/external/SynchronizeFileField.java b/src/java/net/sf/jabref/external/SynchronizeFileField.java
index 4a44488..3193ea0 100644
--- a/src/java/net/sf/jabref/external/SynchronizeFileField.java
+++ b/src/java/net/sf/jabref/external/SynchronizeFileField.java
@@ -19,7 +19,6 @@ import com.jgoodies.forms.builder.ButtonBarBuilder;
 import com.jgoodies.forms.builder.DefaultFormBuilder;
 import com.jgoodies.forms.layout.FormLayout;
 import net.sf.jabref.*;
-import net.sf.jabref.gui.FileListEditor;
 import net.sf.jabref.gui.FileListEntry;
 import net.sf.jabref.gui.FileListEntryEditor;
 import net.sf.jabref.gui.FileListTableModel;
@@ -99,8 +98,6 @@ public class SynchronizeFileField extends AbstractWorker {
         //ExternalFilePanel extPan = new ExternalFilePanel(fieldName, panel.metaData(), null, null, off);
         //FieldTextField editor = new FieldTextField(fieldName, "", false);
 
-        // Find the default directory for this field type:
-        String[] dirsS = panel.metaData().getFileDirectory(GUIGlobals.FILE_FIELD);
         Set<BibtexEntry> changedEntries = new HashSet<BibtexEntry>();
 
         // First we try to autoset fields
@@ -110,13 +107,8 @@ public class SynchronizeFileField extends AbstractWorker {
                 entries.add(sel[i]);
             }
 
-            // We need to specify which directories to search in:
-            ArrayList<File> dirs = new ArrayList<File>();
-            for (int i=0; i<dirsS.length; i++)
-                dirs.add(new File(dirsS[i]));
-
             // Start the autosetting process:                
-            Thread t = FileListEditor.autoSetLinks(entries, ce, changedEntries, dirs);
+            Thread t = Util.autoSetLinks(entries, ce, changedEntries, null, panel.metaData(), null, null);
             // Wait for the autosetting to finish:
             try {
                 t.join();
@@ -158,6 +150,13 @@ public class SynchronizeFileField extends AbstractWorker {
                 if ((old != null) && !old.equals("")) {
                     FileListTableModel tableModel = new FileListTableModel();
                     tableModel.setContentDontGuessTypes(old);
+
+                    // We need to specify which directories to search in for Util.expandFilename:
+                    String[] dirsS = panel.metaData().getFileDirectory(GUIGlobals.FILE_FIELD);
+                    ArrayList<File> dirs = new ArrayList<File>();
+                    for (int k=0; k<dirsS.length; k++)
+                        dirs.add(new File(dirsS[k]));
+
                     for (int j=0; j<tableModel.getRowCount(); j++) {
                         FileListEntry flEntry = tableModel.getEntry(j);
                         // See if the link looks like an URL:
@@ -269,14 +268,13 @@ public class SynchronizeFileField extends AbstractWorker {
             }
         }
 
-        entriesChangedCount = changedEntries.size();
 	//for (BibtexEntry entr : changedEntries)
 	//    System.out.println(entr.getCiteKey());
-        if (entriesChangedCount > 0) {
+        if (!changedEntries.isEmpty()) {
             // Add the undo edit:
             ce.end();
             panel.undoManager.addEdit(ce);
-            
+            panel.markBaseChanged();
         }
     }
 
diff --git a/src/java/net/sf/jabref/external/WriteXMPAction.java b/src/java/net/sf/jabref/external/WriteXMPAction.java
index 6a460a6..aed9a0d 100644
--- a/src/java/net/sf/jabref/external/WriteXMPAction.java
+++ b/src/java/net/sf/jabref/external/WriteXMPAction.java
@@ -62,27 +62,25 @@ public class WriteXMPAction extends AbstractWorker {
 
 	public void init() {
 
+		database = panel.getDatabase();
 		// Get entries and check if it makes sense to perform this operation
 		entries = panel.getSelectedEntries();
 
 		if (entries.length == 0) {
 
-			database = panel.getDatabase();
 			entries = database.getEntries().toArray(new BibtexEntry[]{});
 
 			if (entries.length == 0) {
 
-				JOptionPane.showMessageDialog(panel, Globals
-					.lang("This operation requires at least one entry."), Globals
-					.lang("Write XMP-metadata"), JOptionPane.ERROR_MESSAGE);
+				JOptionPane.showMessageDialog(panel, Globals.lang("This operation requires at least one entry."),
+                                        Globals.lang("Write XMP-metadata"), JOptionPane.ERROR_MESSAGE);
 				goOn = false;
 				return;
 
 			} else {
 
-				int response = JOptionPane.showConfirmDialog(panel, Globals
-					.lang("Write XMP-metadata for all PDFs in current database?"), Globals
-					.lang("Write XMP-metadata"), JOptionPane.YES_NO_CANCEL_OPTION,
+				int response = JOptionPane.showConfirmDialog(panel, Globals.lang("Write XMP-metadata for all PDFs in current database?"),
+                                        Globals.lang("Write XMP-metadata"), JOptionPane.YES_NO_CANCEL_OPTION,
 					JOptionPane.QUESTION_MESSAGE);
 
 				if (response != JOptionPane.YES_OPTION) {
@@ -189,8 +187,8 @@ public class WriteXMPAction extends AbstractWorker {
 
 		private static final long serialVersionUID = 7459164400811785958L;
 
-		JButton okButton = new JButton(Globals.lang("Ok")), cancelButton = new JButton(Globals
-			.lang("Cancel"));
+		JButton okButton = new JButton(Globals.lang("Ok")), cancelButton = new JButton(
+                        Globals.lang("Cancel"));
 
 		boolean canceled;
 
diff --git a/src/java/net/sf/jabref/groups/AutoGroupDialog.java b/src/java/net/sf/jabref/groups/AutoGroupDialog.java
index 7941043..6b421f7 100644
--- a/src/java/net/sf/jabref/groups/AutoGroupDialog.java
+++ b/src/java/net/sf/jabref/groups/AutoGroupDialog.java
@@ -124,8 +124,7 @@ class AutoGroupDialog extends JDialog implements CaretListener {
                 }
 
                 m_groupsRoot.add(autoGroupsRoot);
-                NamedCompound ce = new NamedCompound(Globals
-                        .lang("Autogenerate groups"));
+                NamedCompound ce = new NamedCompound(Globals.lang("Autogenerate groups"));
                 UndoableAddOrRemoveGroup undo = new UndoableAddOrRemoveGroup(
                         gs, m_groupsRoot, autoGroupsRoot,
                         UndoableAddOrRemoveGroup.ADD_NODE);
diff --git a/src/java/net/sf/jabref/groups/ExplicitGroup.java b/src/java/net/sf/jabref/groups/ExplicitGroup.java
index d352eeb..6f20886 100644
--- a/src/java/net/sf/jabref/groups/ExplicitGroup.java
+++ b/src/java/net/sf/jabref/groups/ExplicitGroup.java
@@ -24,7 +24,7 @@ import net.sf.jabref.util.QuotedStringTokenizer;
 
 /**
  * @author jzieren
- * 
+ *
  */
 public class ExplicitGroup extends AbstractGroup implements SearchRule {
     public static final String ID = "ExplicitGroup:";
@@ -209,8 +209,7 @@ public class ExplicitGroup extends AbstractGroup implements SearchRule {
     }
 
     public static String getDescriptionForPreview() {
-        return Globals
-                .lang("This group contains entries based on manual assignment. "
+        return Globals.lang("This group contains entries based on manual assignment. "
                         + "Entries can be assigned to this group by selecting them "
                         + "then using either drag and drop or the context menu. "
                         + "Entries can be removed from this group by selecting them "
@@ -234,7 +233,7 @@ public class ExplicitGroup extends AbstractGroup implements SearchRule {
         }
         return sb.toString();
     }
-    
+
     /**
      * Update the group to handle the situation where the group
      * is applied to a different BibtexDatabase than it was created for.
@@ -267,4 +266,9 @@ public class ExplicitGroup extends AbstractGroup implements SearchRule {
     public String getTypeId() {
         return ID;
     }
+
+	public int getNumEntries() {
+		return m_entries.size();
+	}
+
 }
diff --git a/src/java/net/sf/jabref/groups/GroupDialog.java b/src/java/net/sf/jabref/groups/GroupDialog.java
index d7014f8..5c89023 100644
--- a/src/java/net/sf/jabref/groups/GroupDialog.java
+++ b/src/java/net/sf/jabref/groups/GroupDialog.java
@@ -58,12 +58,12 @@ class GroupDialog extends JDialog {
         private static final int TEXTFIELD_LENGTH = 30;
         // for all types
         private JTextField m_name = new JTextField(TEXTFIELD_LENGTH);
-        private JRadioButton m_explicitRadioButton = new JRadioButton(Globals
-                        .lang("Statically group entries by manual assignment"));
+        private JRadioButton m_explicitRadioButton = new JRadioButton(
+                        Globals.lang("Statically group entries by manual assignment"));
         private JRadioButton m_keywordsRadioButton = new JRadioButton(
                         Globals.lang("Dynamically group entries by searching a field for a keyword"));
-        private JRadioButton m_searchRadioButton = new JRadioButton(Globals
-                        .lang("Dynamically group entries by a free-form search expression"));
+        private JRadioButton m_searchRadioButton = new JRadioButton(
+                        Globals.lang("Dynamically group entries by a free-form search expression"));
         private JRadioButton m_independentButton = new JRadioButton( // JZTODO lyrics
                         Globals.lang("Independent group: When selected, view only this group's entries"));
         private JRadioButton m_intersectionButton = new JRadioButton( // JZTODO lyrics
@@ -74,16 +74,16 @@ class GroupDialog extends JDialog {
         private JTextField m_kgSearchField = new JTextField(TEXTFIELD_LENGTH);
         private FieldTextField m_kgSearchTerm = new FieldTextField("keywords", "",
                         false);
-        private JCheckBox m_kgCaseSensitive = new JCheckBox(Globals
-                        .lang("Case sensitive"));
-        private JCheckBox m_kgRegExp = new JCheckBox(Globals
-                        .lang("Regular Expression"));
+        private JCheckBox m_kgCaseSensitive = new JCheckBox(
+                        Globals.lang("Case sensitive"));
+        private JCheckBox m_kgRegExp = new JCheckBox(
+                        Globals.lang("Regular Expression"));
         // for SearchGroup
         private JTextField m_sgSearchExpression = new JTextField(TEXTFIELD_LENGTH);
-        private JCheckBox m_sgCaseSensitive = new JCheckBox(Globals
-                        .lang("Case sensitive"));
-        private JCheckBox m_sgRegExp = new JCheckBox(Globals
-                        .lang("Regular Expression"));
+        private JCheckBox m_sgCaseSensitive = new JCheckBox(
+                        Globals.lang("Case sensitive"));
+        private JCheckBox m_sgRegExp = new JCheckBox(
+                        Globals.lang("Regular Expression"));
         // for all types
         private JButton m_ok = new JButton(Globals.lang("Ok"));
         private JButton m_cancel = new JButton(Globals.lang("Cancel"));
@@ -408,8 +408,8 @@ class GroupDialog extends JDialog {
                         s2 = m_kgSearchTerm.getText().trim();
                         okEnabled = okEnabled && s2.length() > 0;
                         if (!okEnabled) {
-                                setDescription(Globals
-                                                .lang("Please enter the field to search (e.g. <b>keywords</b>) and the keyword to search it for (e.g. <b>electrical</b>)."));
+                                setDescription(
+                                            Globals.lang("Please enter the field to search (e.g. <b>keywords</b>) and the keyword to search it for (e.g. <b>electrical</b>)."));
                         } else {
                                 if (m_kgRegExp.isSelected()) {
                                         try {
@@ -432,8 +432,8 @@ class GroupDialog extends JDialog {
                         s1 = m_sgSearchExpression.getText().trim();
                         okEnabled = okEnabled & s1.length() > 0;
                         if (!okEnabled) {
-                                setDescription(Globals
-                                                .lang("Please enter a search term. For example, to search all fields for <b>Smith</b>, enter%c<p>"
+                                setDescription(
+                                                Globals.lang("Please enter a search term. For example, to search all fields for <b>Smith</b>, enter%c<p>"
                                                                 + "<tt>smith</tt><p>"
                                                                 + "To search the field <b>Author</b> for <b>Smith</b> and the field <b>Title</b> for <b>electrical</b>, enter%c<p>"
                                                                 + "<tt>author%esmith and title%eelectrical</tt>"));
@@ -467,8 +467,8 @@ class GroupDialog extends JDialog {
          */
         private void addPreviousEntries() {
                 // JZTODO lyrics...
-                int i = JOptionPane.showConfirmDialog(m_basePanel.frame(), Globals
-                                .lang("Assign the original group's entries to this group?"),
+                int i = JOptionPane.showConfirmDialog(m_basePanel.frame(),
+                                Globals.lang("Assign the original group's entries to this group?"),
                                 Globals.lang("Change of Grouping Method"),
                                 JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE);
                 if (i == JOptionPane.NO_OPTION)
diff --git a/src/java/net/sf/jabref/groups/GroupSelector.java b/src/java/net/sf/jabref/groups/GroupSelector.java
index fa0ff35..4700d13 100644
--- a/src/java/net/sf/jabref/groups/GroupSelector.java
+++ b/src/java/net/sf/jabref/groups/GroupSelector.java
@@ -80,6 +80,9 @@ import net.sf.jabref.SidePaneManager;
 import net.sf.jabref.help.HelpAction;
 import net.sf.jabref.undo.NamedCompound;
 
+/**
+ * The whole UI component holding the groups tree and the buttons
+ */
 public class GroupSelector extends SidePaneComponent implements
         TreeSelectionListener, ActionListener, ErrorMessageDisplay {
     private static Logger logger = Logger.getLogger(GroupSelector.class.getName());
@@ -112,6 +115,8 @@ public class GroupSelector extends SidePaneComponent implements
             false), select = new JCheckBoxMenuItem(Globals.lang("Select matches"), false);
     JCheckBoxMenuItem showOverlappingGroups = new JCheckBoxMenuItem(
                     Globals.lang("Highlight overlapping groups")); // JZTODO lyrics
+    JCheckBoxMenuItem showNumberOfElements = new JCheckBoxMenuItem(
+            Globals.lang("Show number of elements contained in each group"));
 	JCheckBoxMenuItem autoAssignGroup = new JCheckBoxMenuItem(
 			Globals.lang("Automatically assign new entry to selected groups")); 
     ButtonGroup bgr = new ButtonGroup();
@@ -201,6 +206,17 @@ public class GroupSelector extends SidePaneComponent implements
             andCb.setSelected(false);
         }
 
+        showNumberOfElements.addChangeListener(new ChangeListener() {
+            @Override
+            public void stateChanged(ChangeEvent e) {
+                Globals.prefs.putBoolean(JabRefPreferences.GROUP_SHOW_NUMBER_OF_ELEMENTS, showNumberOfElements.isSelected());
+                if (groupsTree != null) {
+                    groupsTree.invalidate();
+                    groupsTree.validate();
+                    groupsTree.repaint();
+                }
+            }
+        });
         
         autoAssignGroup.addChangeListener(new ChangeListener() {
         	public void stateChanged(ChangeEvent event) {
@@ -213,6 +229,7 @@ public class GroupSelector extends SidePaneComponent implements
         select.setSelected(Globals.prefs.getBoolean("groupSelectMatches"));
         editModeIndicator = Globals.prefs.getBoolean(JabRefPreferences.EDIT_GROUP_MEMBERSHIP_MODE);
         editModeCb.setSelected(editModeIndicator);
+        showNumberOfElements.setSelected(Globals.prefs.getBoolean(JabRefPreferences.GROUP_SHOW_NUMBER_OF_ELEMENTS));
         autoAssignGroup.setSelected(Globals.prefs.getBoolean("autoAssignGroup"));
 
         openset.setMargin(new Insets(0, 0, 0, 0));
@@ -230,6 +247,7 @@ public class GroupSelector extends SidePaneComponent implements
         settings.addSeparator();
         settings.add(showOverlappingGroups);
         settings.addSeparator();
+        settings.add(showNumberOfElements);
         settings.add(autoAssignGroup);
         // settings.add(moreRow);
         // settings.add(lessRow);
@@ -241,6 +259,7 @@ public class GroupSelector extends SidePaneComponent implements
                     // settings.setVisible(false);
                 } else {
                     JButton src = (JButton) e.getSource();
+                    showNumberOfElements.setSelected(Globals.prefs.getBoolean(JabRefPreferences.GROUP_SHOW_NUMBER_OF_ELEMENTS));
                     autoAssignGroup.setSelected(Globals.prefs.getBoolean("autoAssignGroup")); 
                     settings.show(src, 0, openset.getHeight());
                 }
diff --git a/src/java/net/sf/jabref/groups/GroupTreeCellRenderer.java b/src/java/net/sf/jabref/groups/GroupTreeCellRenderer.java
index f4a12bf..7284ad4 100644
--- a/src/java/net/sf/jabref/groups/GroupTreeCellRenderer.java
+++ b/src/java/net/sf/jabref/groups/GroupTreeCellRenderer.java
@@ -23,14 +23,17 @@ import javax.swing.JLabel;
 import javax.swing.JTree;
 import javax.swing.tree.DefaultTreeCellRenderer;
 
+import net.sf.jabref.BibtexEntry;
 import net.sf.jabref.GUIGlobals;
 import net.sf.jabref.Globals;
+import net.sf.jabref.JabRef;
+import net.sf.jabref.JabRefPreferences;
 import net.sf.jabref.Util;
 
 /**
  * Renders a GroupTreeNode using its group's getName() method, rather that its
  * toString() method.
- * 
+ *
  * @author jzieren
  */
 public class GroupTreeCellRenderer extends DefaultTreeCellRenderer {
@@ -56,7 +59,7 @@ public class GroupTreeCellRenderer extends DefaultTreeCellRenderer {
             selected = true; // show as selected
         Component c = super.getTreeCellRendererComponent(tree, value, selected,
                 expanded, leaf, row, hasFocus);
-        // this is sometimes called from deep within somewhere, with a dummy 
+        // this is sometimes called from deep within somewhere, with a dummy
         // value (probably for layout etc.), so we've got to check here!
         if (!(value instanceof GroupTreeNode))
             return c;
@@ -102,6 +105,18 @@ public class GroupTreeCellRenderer extends DefaultTreeCellRenderer {
         if (italics)
             sb.append("<i>");
         sb.append(Util.quoteForHTML(name));
+        if (Globals.prefs.getBoolean(JabRefPreferences.GROUP_SHOW_NUMBER_OF_ELEMENTS)) {
+        	if (group instanceof ExplicitGroup) {
+        	    sb.append(" [").append(((ExplicitGroup) group).getNumEntries()).append("]");
+        	} else if ((group instanceof KeywordGroup) || (group instanceof SearchGroup)) {
+        		int hits = 0;
+        		for (BibtexEntry entry : JabRef.jrf.basePanel().getDatabase().getEntries()){
+        		    if (group.contains(entry))
+        			hits++;
+        		}
+        		sb.append(" [").append(hits).append("]");
+        	}
+        }
         if (italics)
             sb.append("</i>");
         if (underline)
@@ -137,7 +152,7 @@ public class GroupTreeCellRenderer extends DefaultTreeCellRenderer {
 
     /**
      * For use when dragging: The sepcified cell is always rendered as selected.
-     * 
+     *
      * @param cell
      *            The cell over which the user is currently dragging.
      */
@@ -162,7 +177,7 @@ public class GroupTreeCellRenderer extends DefaultTreeCellRenderer {
     }
 
     /**
-     * Highlights the specified cells (by drawing a border around it), 
+     * Highlights the specified cells (by drawing a border around it),
      * or disables highlight if highlightBorderCell == null.
      */
     void setHighlightBorderCell(Object highlightBorderCell) {
diff --git a/src/java/net/sf/jabref/groups/GroupsTree.java b/src/java/net/sf/jabref/groups/GroupsTree.java
index 5516740..e58a567 100644
--- a/src/java/net/sf/jabref/groups/GroupsTree.java
+++ b/src/java/net/sf/jabref/groups/GroupsTree.java
@@ -74,8 +74,11 @@ public class GroupsTree extends JTree implements DragSourceListener,
 
 	private final GroupTreeCellRenderer cellRenderer = new GroupTreeCellRenderer();
 
+	/**
+	 * @param groupSelector the parent UI component
+	 */
 	public GroupsTree(GroupSelector groupSelector) {
-	    // Adjust hight according to http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=4760081
+	    // Adjust height according to http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=4760081
 	    FontMetrics metrics = getFontMetrics(getFont());
 	    setRowHeight(Math.max(getRowHeight(), metrics.getHeight()));
 
diff --git a/src/java/net/sf/jabref/groups/KeywordGroup.java b/src/java/net/sf/jabref/groups/KeywordGroup.java
index 786b3f2..21907bf 100644
--- a/src/java/net/sf/jabref/groups/KeywordGroup.java
+++ b/src/java/net/sf/jabref/groups/KeywordGroup.java
@@ -146,8 +146,8 @@ public class KeywordGroup extends AbstractGroup implements SearchRule {
 		if (!supportsAdd())
 			return null;
 		if ((entries != null) && (entries.length > 0)) {
-			NamedCompound ce = new NamedCompound(Globals
-					.lang("add entries to group"));
+			NamedCompound ce = new NamedCompound(
+                                        Globals.lang("add entries to group"));
 			boolean modified = false;
 			for (int i = 0; i < entries.length; i++) {
 				if (applyRule(null, entries[i]) == 0) {
@@ -179,8 +179,7 @@ public class KeywordGroup extends AbstractGroup implements SearchRule {
 			return null;
 
 		if ((entries != null) && (entries.length > 0)) {
-			NamedCompound ce = new NamedCompound(Globals
-					.lang("remove from group"));
+			NamedCompound ce = new NamedCompound(Globals.lang("remove from group"));
 			boolean modified = false;
 			for (int i = 0; i < entries.length; ++i) {
 				if (applyRule(null, entries[i]) > 0) {
diff --git a/src/java/net/sf/jabref/gui/CleanUpAction.java b/src/java/net/sf/jabref/gui/CleanUpAction.java
index a3ab1eb..0fb80bd 100644
--- a/src/java/net/sf/jabref/gui/CleanUpAction.java
+++ b/src/java/net/sf/jabref/gui/CleanUpAction.java
@@ -40,6 +40,7 @@ import net.sf.jabref.Util;
 import net.sf.jabref.external.ExternalFileType;
 import net.sf.jabref.imports.HTMLConverter;
 import net.sf.jabref.imports.CaseKeeper;
+import net.sf.jabref.imports.UnitFormatter;
 import net.sf.jabref.undo.NamedCompound;
 import net.sf.jabref.undo.UndoableFieldChange;
 
@@ -62,8 +63,10 @@ public class CleanUpAction extends AbstractWorker {
 		CLEANUP_SUPERSCRIPTS = "CleanUpSuperscripts",
 	        CLEANUP_HTML = "CleanUpHTML",
 		CLEANUP_CASE = "CleanUpCase",
-                CLEANUP_LATEX = "CleanUpLaTeX";
-	
+                CLEANUP_LATEX = "CleanUpLaTeX",
+                CLEANUP_UNITS = "CleanUpUnits",
+                CLEANUP_UNICODE = "CleanUpUnicode";
+                
 	public static void putDefaults(HashMap<String, Object> defaults) {
 		defaults.put(AKS_AUTO_NAMING_PDFS_AGAIN, Boolean.TRUE);
 		defaults.put(CLEANUP_SUPERSCRIPTS, Boolean.TRUE);
@@ -78,6 +81,8 @@ public class CleanUpAction extends AbstractWorker {
                 defaults.put(CLEANUP_HTML, Boolean.TRUE);
                 defaults.put(CLEANUP_CASE, Boolean.TRUE);
                 defaults.put(CLEANUP_LATEX, Boolean.TRUE);
+                defaults.put(CLEANUP_UNITS, Boolean.TRUE);
+                defaults.put(CLEANUP_UNICODE, Boolean.TRUE);
 	}
 	
 	private JCheckBox cleanUpSuperscrips;
@@ -91,6 +96,8 @@ public class CleanUpAction extends AbstractWorker {
 	private JCheckBox cleanUpHTML;
 	private JCheckBox cleanUpCase;
         private JCheckBox cleanUpLaTeX;
+	private JCheckBox cleanUpUnits;
+	private JCheckBox cleanUpUnicode;
 	private JPanel optionsPanel = new JPanel();
 	private BasePanel panel;
 	private JabRefFrame frame;
@@ -121,27 +128,31 @@ public class CleanUpAction extends AbstractWorker {
 		cleanUpUpgradeExternalLinks = new JCheckBox(Globals.lang("Upgrade external PDF/PS links to use the '%0' field.", GUIGlobals.FILE_FIELD));
 		cleanUpHTML = new JCheckBox(Globals.lang("Run HTML converter on title"));
 		cleanUpCase = new JCheckBox(Globals.lang("Run filter on title keeping the case of selected words"));
-		cleanUpLaTeX = new JCheckBox(Globals.lang("Remove unneccessary $, {, and }")); // and move adjacent numbers into equations"));
+		cleanUpLaTeX = new JCheckBox(Globals.lang("Remove unneccessary $, {, and } and move adjacent numbers into equations"));
+		cleanUpUnits = new JCheckBox(Globals.lang("Add brackets and replace separators with their non-breaking version for units"));
+		cleanUpUnicode = new JCheckBox(Globals.lang("Run Unicode converter on title, author(s), and abstract"));
 		optionsPanel = new JPanel();
 		retrieveSettings();
 
-		FormLayout layout = new FormLayout("left:15dlu,pref:grow", "pref, pref, pref, pref, pref, pref, pref, pref, pref, pref, pref, pref");
+		FormLayout layout = new FormLayout("left:15dlu,pref:grow", "pref, pref, pref, pref, pref, pref, pref, pref, pref, pref, pref, pref, pref, pref");
         DefaultFormBuilder builder = new DefaultFormBuilder(layout,	optionsPanel);
         builder.setDefaultDialogBorder();
         CellConstraints cc = new CellConstraints();
         builder.add(cleanUpHTML, cc.xyw(1,1,2));
-        builder.add(cleanUpCase, cc.xyw(1,2,2));
-        builder.add(cleanUpLaTeX, cc.xyw(1,3,2));
-        builder.add(cleanUpSuperscrips, cc.xyw(1,4,2));
-        builder.add(cleanUpDOI, cc.xyw(1,5,2));
-        builder.add(cleanUpMonth, cc.xyw(1,6,2));
-        builder.add(cleanUpPageNumbers, cc.xyw(1,7,2));
-        builder.add(cleanUpUpgradeExternalLinks, cc.xyw(1, 8, 2));
-        builder.add(cleanUpMakePathsRelative, cc.xyw(1,9,2));
-        builder.add(cleanUpRenamePDF, cc.xyw(1,10,2));
+        builder.add(cleanUpUnicode, cc.xyw(1,2,2));
+        builder.add(cleanUpCase, cc.xyw(1,3,2));
+        builder.add(cleanUpLaTeX, cc.xyw(1,4,2));
+        builder.add(cleanUpUnits, cc.xyw(1,5,2));
+        builder.add(cleanUpSuperscrips, cc.xyw(1,6,2));
+        builder.add(cleanUpDOI, cc.xyw(1,7,2));
+        builder.add(cleanUpMonth, cc.xyw(1,8,2));
+        builder.add(cleanUpPageNumbers, cc.xyw(1,9,2));
+        builder.add(cleanUpUpgradeExternalLinks, cc.xyw(1, 10, 2));
+        builder.add(cleanUpMakePathsRelative, cc.xyw(1,11,2));
+        builder.add(cleanUpRenamePDF, cc.xyw(1,12,2));
         String currentPattern = Globals.lang("File name format pattern").concat(": ").concat(Globals.prefs.get(ImportSettingsTab.PREF_IMPORT_FILENAMEPATTERN));
-        builder.add(new JLabel(currentPattern), cc.xyw(2,11,1));
-        builder.add(cleanUpRenamePDFonlyRelativePaths, cc.xyw(2,12,1));
+        builder.add(new JLabel(currentPattern), cc.xyw(2,13,1));
+        builder.add(cleanUpRenamePDFonlyRelativePaths, cc.xyw(2,14,1));
 	}
 	
 	private void retrieveSettings() {
@@ -157,6 +168,8 @@ public class CleanUpAction extends AbstractWorker {
                 cleanUpHTML.setSelected(Globals.prefs.getBoolean(CLEANUP_HTML));
                 cleanUpCase.setSelected(Globals.prefs.getBoolean(CLEANUP_CASE));
                 cleanUpLaTeX.setSelected(Globals.prefs.getBoolean(CLEANUP_LATEX));
+                cleanUpUnits.setSelected(Globals.prefs.getBoolean(CLEANUP_UNITS));
+                cleanUpUnicode.setSelected(Globals.prefs.getBoolean(CLEANUP_UNICODE));
 	}
 	
 	private void storeSettings() {
@@ -171,6 +184,8 @@ public class CleanUpAction extends AbstractWorker {
                 Globals.prefs.putBoolean(CLEANUP_HTML, cleanUpHTML.isSelected());
                 Globals.prefs.putBoolean(CLEANUP_CASE, cleanUpCase.isSelected());
                 Globals.prefs.putBoolean(CLEANUP_LATEX, cleanUpLaTeX.isSelected());
+                Globals.prefs.putBoolean(CLEANUP_UNITS, cleanUpUnits.isSelected());
+                Globals.prefs.putBoolean(CLEANUP_UNICODE, cleanUpUnicode.isSelected());
 	}
 
 	private int showCleanUpDialog() {
@@ -218,7 +233,10 @@ public class CleanUpAction extends AbstractWorker {
 		choiceRenamePDF = cleanUpRenamePDF.isSelected(),
 	        choiceConvertHTML = cleanUpHTML.isSelected(),
                 choiceConvertCase = cleanUpCase.isSelected(),
-                choiceConvertLaTeX = cleanUpLaTeX.isSelected();
+                choiceConvertLaTeX = cleanUpLaTeX.isSelected(),
+                choiceConvertUnits = cleanUpUnits.isSelected(),
+                choiceConvertUnicode = cleanUpUnicode.isSelected();
+   
     	
     	if (choiceRenamePDF && Globals.prefs.getBoolean(AKS_AUTO_NAMING_PDFS_AGAIN)) { 
 	        CheckBoxMessage cbm = new CheckBoxMessage(Globals.lang("Auto-generating PDF-Names does not support undo. Continue?"),
@@ -257,8 +275,10 @@ public class CleanUpAction extends AbstractWorker {
         	if (choiceMakePathsRelative) doMakePathsRelative(entry, ce);
         	if (choiceRenamePDF) doRenamePDFs(entry, ce);
 		if (choiceConvertHTML) doConvertHTML(entry, ce);
-		if (choiceConvertCase) doConvertCase(entry, ce);
+		if (choiceConvertUnits) doConvertUnits(entry, ce);
+        	if (choiceConvertCase) doConvertCase(entry, ce);
         	if (choiceConvertLaTeX) doConvertLaTeX(entry, ce);
+        	if (choiceConvertUnicode) doConvertUnicode(entry, ce);
         	
             ce.end();
             if (ce.hasEdits()) {
@@ -537,6 +557,25 @@ public class CleanUpAction extends AbstractWorker {
     }
 
 	/**
+	 * Converts Unicode characters to LaTeX code
+	 */
+        private void doConvertUnicode(BibtexEntry entry, NamedCompound ce) {
+        final String[] fields = {"title", "author", "abstract"};
+        for(int i=0;i<fields.length;i++) {
+            String oldValue = entry.getField(fields[i]);
+            if (oldValue == null) {
+                return;
+            }
+            final HTMLConverter htmlConverter = new HTMLConverter();
+            String newValue = htmlConverter.formatUnicode(oldValue);
+            if (!oldValue.equals(newValue)) {
+                entry.setField(fields[i], newValue);
+                ce.addEdit(new UndoableFieldChange(entry, fields[i], oldValue, newValue));
+            }   
+        }
+    }
+
+	/**
 	 * Adds curly brackets {} around keywords
 	 */
     private void doConvertCase(BibtexEntry entry, NamedCompound ce) {
@@ -553,6 +592,20 @@ public class CleanUpAction extends AbstractWorker {
         }
     }
 
+    private void doConvertUnits(BibtexEntry entry, NamedCompound ce) {
+        final String field = "title";
+        String oldValue = entry.getField(field);
+        if (oldValue == null) {
+            return;
+        }
+        final UnitFormatter unitFormatter = new UnitFormatter();
+        String newValue = unitFormatter.format(oldValue);
+        if (!oldValue.equals(newValue)) {
+            entry.setField(field, newValue);
+            ce.addEdit(new UndoableFieldChange(entry, field, oldValue, newValue));
+        }
+    }
+
     private void doConvertLaTeX(BibtexEntry entry, NamedCompound ce) {
         final String field = "title";
         String oldValue = entry.getField(field);
@@ -560,8 +613,27 @@ public class CleanUpAction extends AbstractWorker {
             return;
         }
         String newValue = oldValue;
-        // Remove redundant $, {, and }
+
+        // Remove redundant $, {, and }, but not if the } is part of a command argument: \mbox{-}{GPS} should not be adjusted
         newValue = newValue.replace("$$","").replaceAll("(?<!\\\\[\\p{Alpha}]{0,100}\\{[^\\}]{0,100})\\}([-/ ]?)\\{","$1");
+        // Move numbers, +, -, /, and brackets into equations
+        // System.err.println(newValue);
+        newValue = newValue.replaceAll("(([^$]|\\\\\\$)*)\\$","$1@@"); // Replace $, but not \$ with @@
+        // System.err.println(newValue);
+        newValue = newValue.replaceAll("([^@]*)@@([^@]*)@@", "$1\\$$2@@"); // Replace every other @@ with $
+        // System.err.println(newValue);
+        //newValue = newValue.replaceAll("([0-9\\(\\.]+) \\$","\\$$1\\\\ "); // Move numbers followed by a space left of $ inside the equation, e.g., 0.35 $\mu$m
+        // System.err.println(newValue);
+        newValue = newValue.replaceAll("([0-9\\(\\.]+[ ]?[-+/]?[ ]?)\\$","\\$$1"); // Move numbers, possibly with operators +, -, or /,  left of $ into the equation
+        // System.err.println(newValue);
+        newValue = newValue.replaceAll("@@([ ]?[-+/]?[ ]?[0-9\\)\\.]+)"," $1@@"); // Move numbers right of @@ into the equation
+        // System.err.println(newValue);
+        newValue = newValue.replace("@@","$"); // Replace all @@ with $
+        // System.err.println(newValue);
+        newValue = newValue.replace("  "," "); // Clean up
+        newValue = newValue.replace("$$","");
+        newValue = newValue.replace(" )$",")$");
+
         if (!oldValue.equals(newValue)) {
             entry.setField(field, newValue);
             ce.addEdit(new UndoableFieldChange(entry, field, oldValue, newValue));
diff --git a/src/java/net/sf/jabref/gui/EntryCustomizationDialog2.java b/src/java/net/sf/jabref/gui/EntryCustomizationDialog2.java
index 5c2897a..e00408d 100644
--- a/src/java/net/sf/jabref/gui/EntryCustomizationDialog2.java
+++ b/src/java/net/sf/jabref/gui/EntryCustomizationDialog2.java
@@ -101,7 +101,7 @@ public class EntryCustomizationDialog2 extends JDialog implements ListSelectionL
 
         //right.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(), Globals.lang("Fields")));
         right.setBorder(BorderFactory.createEtchedBorder());
-        ok = new JButton("OK");
+        ok = new JButton("Ok");
         cancel = new JButton(Globals.lang("Cancel"));
         apply = new JButton(Globals.lang("Apply"));
         ok.addActionListener(this);
diff --git a/src/java/net/sf/jabref/gui/FieldWeightDialog.java b/src/java/net/sf/jabref/gui/FieldWeightDialog.java
index a8e8985..ea87d1e 100644
--- a/src/java/net/sf/jabref/gui/FieldWeightDialog.java
+++ b/src/java/net/sf/jabref/gui/FieldWeightDialog.java
@@ -44,7 +44,7 @@ public class FieldWeightDialog extends JDialog {
 
     JabRefFrame frame;
     HashMap<JSlider, SliderInfo> sliders = new HashMap<JSlider, SliderInfo>();
-    JButton ok = new JButton(Globals.lang("OK")),
+    JButton ok = new JButton(Globals.lang("Ok")),
         cancel = new JButton(Globals.lang("Cancel"));
 
    public static void main(String[] args) {
diff --git a/src/java/net/sf/jabref/gui/FileDialogs.java b/src/java/net/sf/jabref/gui/FileDialogs.java
index 765951d..32d9c65 100644
--- a/src/java/net/sf/jabref/gui/FileDialogs.java
+++ b/src/java/net/sf/jabref/gui/FileDialogs.java
@@ -210,7 +210,9 @@ public class FileDialogs {
         fc.setVisible(true); // fc.show(); -> deprecated since 1.5
 
         if (fc.getFile() != null) {
-            Globals.prefs.put("workingDirectory", fc.getDirectory() + fc.getFile());
+            if (updateWorkingDirectory) {
+                Globals.prefs.put("workingDirectory", fc.getDirectory() + fc.getFile());
+            }
             return fc.getDirectory() + fc.getFile();
         } else {
             return null;
diff --git a/src/java/net/sf/jabref/gui/FileListEditor.java b/src/java/net/sf/jabref/gui/FileListEditor.java
index 5ffac62..35c98d7 100644
--- a/src/java/net/sf/jabref/gui/FileListEditor.java
+++ b/src/java/net/sf/jabref/gui/FileListEditor.java
@@ -18,26 +18,14 @@ package net.sf.jabref.gui;
 import java.awt.BorderLayout;
 import java.awt.Color;
 import java.awt.Insets;
-import java.awt.datatransfer.DataFlavor;
-import java.awt.datatransfer.Transferable;
-import java.awt.datatransfer.UnsupportedFlavorException;
-import java.awt.dnd.DnDConstants;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
-import java.io.File;
 import java.io.IOException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.logging.Logger;
 
 import javax.swing.AbstractAction;
-import javax.swing.BorderFactory;
 import javax.swing.JButton;
 import javax.swing.JComponent;
 import javax.swing.JDialog;
@@ -46,20 +34,14 @@ import javax.swing.JMenuItem;
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 import javax.swing.JPopupMenu;
-import javax.swing.JProgressBar;
 import javax.swing.JScrollPane;
 import javax.swing.JTable;
 import javax.swing.KeyStroke;
-import javax.swing.SwingUtilities;
 import javax.swing.TransferHandler;
 import javax.swing.event.UndoableEditListener;
 
 import net.sf.jabref.*;
 import net.sf.jabref.external.*;
-import net.sf.jabref.groups.EntryTableTransferHandler;
-import net.sf.jabref.undo.NamedCompound;
-import net.sf.jabref.undo.UndoableFieldChange;
-
 import com.jgoodies.forms.builder.DefaultFormBuilder;
 import com.jgoodies.forms.layout.FormLayout;
 
@@ -68,6 +50,7 @@ import com.jgoodies.forms.layout.FormLayout;
  */
 public class FileListEditor extends JTable implements FieldEditor,
         DownloadExternalFile.DownloadCallback {
+    private static final Logger logger = Logger.getLogger(FileListEditor.class.getName());
 
     FieldNameLabel label;
     FileListEntryEditor editor = null;
@@ -82,7 +65,8 @@ public class FileListEditor extends JTable implements FieldEditor,
     private JPopupMenu menu = new JPopupMenu();
 
     private JMenuItem openLink = new JMenuItem(Globals.lang("Open"));
-    private JMenuItem rename = new JMenuItem(Globals.lang("Move/rename file"));
+    private JMenuItem openFolder = new JMenuItem(Globals.lang("Open folder"));
+    private JMenuItem rename = new JMenuItem(Globals.lang("Move/Rename file"));
     private JMenuItem moveToFileDir = new JMenuItem(Globals.lang("Move to file directory"));
 
     public FileListEditor(JabRefFrame frame, MetaData metaData, String fieldName, String content,
@@ -202,6 +186,23 @@ public class FileListEditor extends JTable implements FieldEditor,
                 openSelectedFile();
             }
         });
+        
+        menu.add(openFolder);
+        openFolder.addActionListener(new ActionListener() {
+			@Override
+			public void actionPerformed(ActionEvent e) {
+		        int row = getSelectedRow();
+		        if (row >= 0) {
+		            FileListEntry entry = tableModel.getEntry(row);
+		            try {
+		            	Util.openFolderAndSelectFile(entry.getLink());
+		            } catch (IOException ex) {
+		                logger.fine(ex.getMessage());
+		            }
+		        }
+			}
+		});
+        
         menu.add(rename);
         rename.addActionListener(new MoveFileAction(frame, entryEditor, this, false));
 
@@ -337,11 +338,11 @@ public class FileListEditor extends JTable implements FieldEditor,
         return editor.okPressed();
     }
 
-    private void autoSetLinks() {
+    public void autoSetLinks() {
         auto.setEnabled(false);
         BibtexEntry entry = entryEditor.getEntry();
         JDialog diag = new JDialog(frame, true);
-        autoSetLinks(entry, tableModel, metaData, new ActionListener() {
+        Util.autoSetLinks(entry, tableModel, metaData, new ActionListener() {
             public void actionPerformed(ActionEvent e) {
                 auto.setEnabled(true);
                 if (e.getID() > 0) {
@@ -356,224 +357,6 @@ public class FileListEditor extends JTable implements FieldEditor,
     }
 
     /**
-     * Automatically add links for this set of entries, based on the globally stored list of
-     * external file types. The entries are modified, and corresponding UndoEdit elements
-     * added to the NamedCompound given as argument. Furthermore, all entries which are modified
-     * are added to the Set of entries given as an argument.
-     *
-     * The entries' bibtex keys must have been set - entries lacking key are ignored.
-     * The operation is done in a new thread, which is returned for the caller to wait for
-     * if needed.
-     *
-     * @param entries A collection of BibtexEntry objects to find links for.
-     * @param ce A NamedCompound to add UndoEdit elements to.
-     * @param changedEntries A Set of BibtexEntry objects to which all modified entries is added.
-     * @return the thread performing the autosetting
-     */
-    public static Thread autoSetLinks(final Collection<BibtexEntry> entries, final NamedCompound ce,
-                                      final Set<BibtexEntry> changedEntries,
-                                      final ArrayList<File> dirs) {
-
-        Runnable r = new Runnable() {
-
-            public void run() {
-                ExternalFileType[] types = Globals.prefs.getExternalFileTypeSelection();
-                Collection<String> extensions = new ArrayList<String>();
-                for (int i = 0; i < types.length; i++) {
-                    final ExternalFileType type = types[i];
-                    extensions.add(type.getExtension());
-                }
-                // Run the search operation:
-                Map<BibtexEntry, java.util.List<File>> result;
-                if (Globals.prefs.getBoolean(JabRefPreferences.USE_REG_EXP_SEARCH_KEY)) {
-                    String regExp = Globals.prefs.get(JabRefPreferences.REG_EXP_SEARCH_EXPRESSION_KEY);
-                    result = RegExpFileSearch.findFilesForSet(entries, extensions, dirs, regExp);
-                }
-                else
-                    result = Util.findAssociatedFiles(entries, extensions, dirs);
-
-
-                // Iterate over the entries:
-                for (Iterator<BibtexEntry> i=result.keySet().iterator(); i.hasNext();) {
-                    BibtexEntry anEntry = i.next();
-                    FileListTableModel tableModel = new FileListTableModel();
-                    String oldVal = anEntry.getField(GUIGlobals.FILE_FIELD);
-                    if (oldVal != null)
-                        tableModel.setContent(oldVal);
-                    List<File> files = result.get(anEntry);
-                    for (File f : files) {
-			            f = relativizePath(f, dirs);
-                        boolean alreadyHas = false;
-			            //System.out.println("File: "+f.getPath());
-                        for (int j = 0; j < tableModel.getRowCount(); j++) {
-                            FileListEntry existingEntry = tableModel.getEntry(j);
-                            //System.out.println("Comp: "+existingEntry.getLink());
-                            if (new File(existingEntry.getLink()).equals(f)) {
-                                alreadyHas = true;
-                                break;
-                            }
-                        }
-                        if (!alreadyHas) {
-                            int index = f.getPath().lastIndexOf('.');
-                            if ((index >= 0) && (index < f.getPath().length()-1)) {
-                                ExternalFileType type = Globals.prefs.getExternalFileTypeByExt
-                                    (f.getPath().substring(index+1).toLowerCase());
-                                FileListEntry flEntry = new FileListEntry(f.getName(), f.getPath(), type);
-                                tableModel.addEntry(tableModel.getRowCount(), flEntry);
-                            } else {
-                                FileListEntry flEntry = new FileListEntry(f.getName(), f.getPath(),
-                                        new UnknownExternalFileType(""));
-                                tableModel.addEntry(tableModel.getRowCount(), flEntry);
-                            }
-                            String newVal = tableModel.getStringRepresentation();
-                            if (newVal.length() == 0)
-                                newVal = null;
-                            UndoableFieldChange change = new UndoableFieldChange(anEntry,
-                                    GUIGlobals.FILE_FIELD, oldVal, newVal);
-                            ce.addEdit(change);
-                            anEntry.setField(GUIGlobals.FILE_FIELD, newVal);
-                            changedEntries.add(anEntry);
-                        }
-                    }
-                }
-            }
-        };
-        Thread t = new Thread(r);
-        t.start();
-        return t;
-    }
-
-
-    /**
-     * Automatically add links for this entry to the table model given as an argument, based on
-     * the globally stored list of external file types. The entry itself is not modified. The entry's
-     * bibtex key must have been set.
-     * The operation is done in a new thread, which is returned for the caller to wait for
-     * if needed.
-     *
-     * @param entry The BibtexEntry to find links for.
-     * @param tableModel The table model to insert links into. Already existing links are not duplicated or removed.
-     * @param metaData The MetaData providing the relevant file directory, if any.
-     * @param callback An ActionListener that is notified (on the event dispatch thread) when the search is
-     *  finished. The ActionEvent has id=0 if no new links were added, and id=1 if one or more links were added.
-     *  This parameter can be null, which means that no callback will be notified.
-     * @param diag An instantiated modal JDialog which will be used to display the progress of the autosetting.
-     *      This parameter can be null, which means that no progress update will be shown.
-     * @return the thread performing the autosetting
-     */
-    public static Thread autoSetLinks(final BibtexEntry entry, final FileListTableModel tableModel,
-                                      final MetaData metaData, final ActionListener callback,
-                                      final JDialog diag) {
-
-        final Collection<BibtexEntry> entries = new ArrayList<BibtexEntry>();
-        entries.add(entry);
-        final ExternalFileType[] types = Globals.prefs.getExternalFileTypeSelection();
-        final JProgressBar prog = new JProgressBar(JProgressBar.HORIZONTAL, 0, types.length-1);
-        prog.setIndeterminate(true);
-        prog.setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
-        final JLabel label = new JLabel(Globals.lang("Searching for files"));
-        if (diag != null) {
-            diag.setTitle(Globals.lang("Autosetting links"));
-            diag.getContentPane().add(prog, BorderLayout.CENTER);
-            diag.getContentPane().add(label, BorderLayout.SOUTH);
-
-            diag.pack();
-            diag.setLocationRelativeTo(diag.getParent());
-        }
-        Runnable r = new Runnable() {
-
-            public void run() {
-                boolean foundAny = false;
-                ExternalFileType[] types = Globals.prefs.getExternalFileTypeSelection();
-                ArrayList<File> dirs = new ArrayList<File>();
-                String[] dirsS = metaData.getFileDirectory(GUIGlobals.FILE_FIELD);
-                for (int i=0; i<dirsS.length; i++) {
-                    dirs.add(new File(dirsS[i]));
-                }
-                Collection<String> extensions = new ArrayList<String>();
-                for (int i = 0; i < types.length; i++) {
-                    final ExternalFileType type = types[i];
-                    extensions.add(type.getExtension());
-                }
-                // Run the search operation:
-                Map<BibtexEntry, java.util.List<File>> result;
-                if (Globals.prefs.getBoolean(JabRefPreferences.USE_REG_EXP_SEARCH_KEY)) {
-                    String regExp = Globals.prefs.get(JabRefPreferences.REG_EXP_SEARCH_EXPRESSION_KEY);
-                    result = RegExpFileSearch.findFilesForSet(entries, extensions, dirs, regExp);
-                }
-                else
-                    result = Util.findAssociatedFiles(entries, extensions, dirs);
-
-                // Iterate over the entries:
-                for (Iterator<BibtexEntry> i=result.keySet().iterator(); i.hasNext();) {
-                    BibtexEntry anEntry = i.next();
-                    List<File> files = result.get(anEntry);
-                    for (File f : files) {
-    			        f = relativizePath(f, dirs);
-                        boolean alreadyHas = false;
-                        for (int j = 0; j < tableModel.getRowCount(); j++) {
-                            FileListEntry existingEntry = tableModel.getEntry(j);
-                            if (new File(existingEntry.getLink()).equals(f)) {
-                                alreadyHas = true;
-                                break;
-                            }
-                        }
-                        if (!alreadyHas) {
-                            int index = f.getPath().lastIndexOf('.');
-                            if ((index >= 0) && (index < f.getPath().length()-1)) {
-                                ExternalFileType type = Globals.prefs.getExternalFileTypeByExt
-                                    (f.getPath().substring(index+1));
-                                FileListEntry flEntry = new FileListEntry(f.getName(), f.getPath(), type);
-                                tableModel.addEntry(tableModel.getRowCount(), flEntry);
-                                foundAny = true;
-                            } else {
-                                FileListEntry flEntry = new FileListEntry(f.getName(), f.getPath(),
-                                        new UnknownExternalFileType(""));
-                                tableModel.addEntry(tableModel.getRowCount(), flEntry);
-                                foundAny = true;
-                            }
-                        }
-                    }
-                }
-                final int id = foundAny ? 1 : 0;
-                SwingUtilities.invokeLater(new Runnable() {
-                    public void run() {
-                        if (diag != null)
-                            diag.dispose();
-                        if (callback != null)
-                            callback.actionPerformed(new ActionEvent(this, id, ""));
-                    }
-                });
-
-            }
-        };
-        Thread t = new Thread(r);
-        t.start();
-        if (diag != null) {
-            diag.setVisible(true);
-        }
-        return t;
-    }
-
-    /**
-     * If the file is below one of the directories in a list, return a File specifying
-     * a path relative to that directory.
-     */
-    public static File relativizePath(File f, ArrayList<File> dirs) {
-	String pth = f.getPath();
-	for (File dir : dirs) {
-	    if ((dir.getPath().length() > 0) && pth.startsWith(dir.getPath())) {
-            String subs = pth.substring(dir.getPath().length());
-            if ((subs.length() > 0) && ((subs.charAt(0) == '/') || (subs.charAt(0) == '\\')))
-                subs = subs.substring(1);
-            return new File(subs);
-	    }
-	}
-	return f;
-    }
-
-
-    /**
      * Run a file download operation.
      */
     private void downloadFile() {
diff --git a/src/java/net/sf/jabref/gui/FileListEntryEditor.java b/src/java/net/sf/jabref/gui/FileListEntryEditor.java
index f71e234..7e2a6e8 100644
--- a/src/java/net/sf/jabref/gui/FileListEntryEditor.java
+++ b/src/java/net/sf/jabref/gui/FileListEntryEditor.java
@@ -19,7 +19,6 @@ import java.awt.BorderLayout;
 import java.awt.event.*;
 import java.io.File;
 import java.io.IOException;
-import java.util.ArrayList;
 import java.util.regex.Pattern;
 
 import javax.swing.*;
@@ -341,13 +340,8 @@ public class FileListEntryEditor {
                 Globals.prefs.put("fileWorkingDirectory", newFile.getParent());
 
                 // If the file is below the file directory, make the path relative:
-                ArrayList<File> dirs = new ArrayList<File>();
                 String[] dirsS = metaData.getFileDirectory(GUIGlobals.FILE_FIELD);
-                for (int i=0; i<dirsS.length; i++)
-                    dirs.add(new File(dirsS[i]));
-                if (dirs.size() > 0) {
-                    newFile = FileListEditor.relativizePath(newFile, dirs);
-                }
+                newFile = Util.shortenFileName(newFile, dirsS);
 
                 comp.setText(newFile.getPath());
                 comp.requestFocus();
diff --git a/src/java/net/sf/jabref/gui/GroupAddRemoveDialog.java b/src/java/net/sf/jabref/gui/GroupAddRemoveDialog.java
new file mode 100644
index 0000000..da86520
--- /dev/null
+++ b/src/java/net/sf/jabref/gui/GroupAddRemoveDialog.java
@@ -0,0 +1,102 @@
+package net.sf.jabref.gui;
+
+import com.jgoodies.forms.builder.ButtonBarBuilder;
+import net.sf.jabref.BaseAction;
+import net.sf.jabref.BasePanel;
+import net.sf.jabref.BibtexEntry;
+import net.sf.jabref.Globals;
+import net.sf.jabref.groups.AllEntriesGroup;
+import net.sf.jabref.groups.GroupTreeCellRenderer;
+import net.sf.jabref.groups.GroupTreeNode;
+
+import javax.swing.*;
+import java.awt.*;
+
+/**
+ * Created with IntelliJ IDEA.
+ * User: alver
+ * Date: 1/22/13
+ * Time: 6:24 PM
+ * To change this template use File | Settings | File Templates.
+ */
+public class GroupAddRemoveDialog extends BaseAction {
+
+    private BasePanel panel;
+    private boolean add;
+
+    public GroupAddRemoveDialog(BasePanel panel, boolean add) {
+        this.panel = panel;
+
+        this.add = add;
+    }
+    @Override
+    public void action() throws Throwable {
+        GroupTreeNode groups = panel.metaData().getGroups();
+        if (groups == null) {
+            return;
+        }
+
+        JDialog diag = new JDialog(panel.frame(),
+                Globals.lang(add ? "Add to group" : "Remove from group"), true);
+        JButton ok = new JButton(Globals.lang("Ok")),
+                cancel = new JButton(Globals.lang("Cancel"));
+        JTree tree = new JTree(groups);
+        tree.setCellRenderer(new GroupTreeCellRenderer());
+        tree.setVisibleRowCount(18);
+
+        ButtonBarBuilder bb = new ButtonBarBuilder();
+        bb.addGlue();
+        bb.addButton(ok);
+        bb.addButton(cancel);
+        bb.addGlue();
+        bb.getPanel().setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
+
+        diag.getContentPane().add(new JScrollPane(tree), BorderLayout.CENTER);
+        diag.getContentPane().add(bb.getPanel(), BorderLayout.SOUTH);
+        diag.pack();
+        diag.setLocationRelativeTo(panel.frame());
+        diag.setVisible(true);
+
+
+    }
+
+    /**
+     * @param move For add: if true, remove from previous groups
+
+    public void insertNodes(JMenu menu, GroupTreeNode node, BibtexEntry[] selection,
+                            boolean add, boolean move) {
+        final AbstractAction action = getAction(node,selection,add,move);
+
+        if (node.getChildCount() == 0) {
+            JMenuItem menuItem = new JMenuItem(action);
+            setGroupFontAndIcon(menuItem, node.getGroup());
+            menu.add(menuItem);
+            if (action.isEnabled())
+                menu.setEnabled(true);
+            return;
+        }
+
+        JMenu submenu = null;
+        if (node.getGroup() instanceof AllEntriesGroup) {
+            for (int i = 0; i < node.getChildCount(); ++i) {
+                insertNodes(menu,(GroupTreeNode) node.getChildAt(i), selection, add, move);
+            }
+        } else {
+            submenu = new JMenu("["+node.getGroup().getName()+"]");
+            setGroupFontAndIcon(submenu, node.getGroup());
+            // setEnabled(true) is done above/below if at least one menu
+            // entry (item or submenu) is enabled
+            submenu.setEnabled(action.isEnabled());
+            JMenuItem menuItem = new JMenuItem(action);
+            setGroupFontAndIcon(menuItem, node.getGroup());
+            submenu.add(menuItem);
+            submenu.add(new JPopupMenu.Separator());
+            for (int i = 0; i < node.getChildCount(); ++i)
+                insertNodes(submenu,(GroupTreeNode) node.getChildAt(i), selection, add, move);
+            menu.add(submenu);
+            if (submenu.isEnabled())
+                menu.setEnabled(true);
+        }
+    }
+     */
+}
diff --git a/src/java/net/sf/jabref/gui/ImportInspectionDialog.java b/src/java/net/sf/jabref/gui/ImportInspectionDialog.java
index f88ff30..92e6f9f 100644
--- a/src/java/net/sf/jabref/gui/ImportInspectionDialog.java
+++ b/src/java/net/sf/jabref/gui/ImportInspectionDialog.java
@@ -127,8 +127,8 @@ public class ImportInspectionDialog extends JDialog implements ImportInspector,
 
     protected JProgressBar progressBar = new JProgressBar(JProgressBar.HORIZONTAL);
 
-    protected JButton ok = new JButton(Globals.lang("Ok")), cancel = new JButton(Globals
-        .lang("Cancel")), generate = new JButton(Globals.lang("Generate now"));
+    protected JButton ok = new JButton(Globals.lang("Ok")), cancel = new JButton(
+            Globals.lang("Cancel")), generate = new JButton(Globals.lang("Generate now"));
 
     protected EventList<BibtexEntry> entries = new BasicEventList<BibtexEntry>();
 
@@ -217,8 +217,7 @@ public class ImportInspectionDialog extends JDialog implements ImportInspector,
         this.newDatabase = newDatabase;
         preview = new PreviewPanel(null, metaData, Globals.prefs.get("preview0"));
 
-        duplLabel.setToolTipText(Globals
-            .lang("Possible duplicate of existing entry. Click to resolve."));
+        duplLabel.setToolTipText(Globals.lang("Possible duplicate of existing entry. Click to resolve."));
 
         sortedList = new SortedList<BibtexEntry>(entries);
         EventTableModel<BibtexEntry> tableModelGl = new EventTableModel<BibtexEntry>(sortedList,
@@ -644,8 +643,7 @@ public class ImportInspectionDialog extends JDialog implements ImportInspector,
                     // is indicated by the entry's group hit status:
                     if (entry.isGroupHit()) {
                         CheckBoxMessage cbm = new CheckBoxMessage(
-                            Globals
-                                .lang("There are possible duplicates (marked with a 'D' icon) that haven't been resolved. Continue?"),
+                            Globals.lang("There are possible duplicates (marked with a 'D' icon) that haven't been resolved. Continue?"),
                             Globals.lang("Disable this confirmation dialog"), false);
                         int answer = JOptionPane.showConfirmDialog(ImportInspectionDialog.this,
                             cbm, Globals.lang("Duplicates found"), JOptionPane.YES_NO_OPTION);
@@ -723,8 +721,7 @@ public class ImportInspectionDialog extends JDialog implements ImportInspector,
                             int answer = JOptionPane
                                 .showConfirmDialog(
                                     ImportInspectionDialog.this,
-                                    Globals
-                                        .lang("Cannot add entries to group without generating keys. Generate keys now?"),
+                                    Globals.lang("Cannot add entries to group without generating keys. Generate keys now?"),
                                     Globals.lang("Add to group"), JOptionPane.YES_NO_OPTION);
                             if (answer == JOptionPane.YES_OPTION) {
                                 generateKeys(false);
@@ -754,9 +751,6 @@ public class ImportInspectionDialog extends JDialog implements ImportInspector,
                     try {
                         entry.setId(Util.createNeutralId());
                         panel.database().insertEntry(entry);
-                        // Let the autocompleters, if any, harvest words from
-                        // the entry:
-                        Util.updateCompletersForEntry(panel.getAutoCompleters(), entry);
                         ce.addEdit(new UndoableInsertEntry(panel.database(), entry, panel));
                     } catch (KeyCollisionException e) {
                         e.printStackTrace();
@@ -1138,8 +1132,8 @@ public class ImportInspectionDialog extends JDialog implements ImportInspector,
             if (selectionModel.getSelected().size() != 1)
                 return;
             BibtexEntry entry = selectionModel.getSelected().get(0);
-            String result = JOptionPane.showInputDialog(ImportInspectionDialog.this, Globals
-                .lang("Enter URL"), entry.getField("url"));
+            String result = JOptionPane.showInputDialog(ImportInspectionDialog.this,
+                    Globals.lang("Enter URL"), entry.getField("url"));
             entries.getReadWriteLock().writeLock().lock();
             if (result != null) {
                 if (result.equals("")) {
@@ -1169,9 +1163,9 @@ public class ImportInspectionDialog extends JDialog implements ImportInspector,
             entry = selectionModel.getSelected().get(0);
             String bibtexKey = entry.getCiteKey();
             if (bibtexKey == null) {
-                int answer = JOptionPane.showConfirmDialog(frame, Globals
-                    .lang("This entry has no BibTeX key. Generate key now?"), Globals
-                    .lang("Download file"), JOptionPane.OK_CANCEL_OPTION,
+                int answer = JOptionPane.showConfirmDialog(frame,
+                        Globals.lang("This entry has no BibTeX key. Generate key now?"),
+                        Globals.lang("Download file"), JOptionPane.OK_CANCEL_OPTION,
                     JOptionPane.QUESTION_MESSAGE);
                 if (answer == JOptionPane.OK_OPTION) {
                     generateKeySelectedEntry();
@@ -1213,9 +1207,9 @@ public class ImportInspectionDialog extends JDialog implements ImportInspector,
             final BibtexEntry entry = selectionModel.getSelected().get(0);
             String bibtexKey = entry.getCiteKey();
             if (bibtexKey == null) {
-                int answer = JOptionPane.showConfirmDialog(frame, Globals
-                    .lang("This entry has no BibTeX key. Generate key now?"), Globals
-                    .lang("Download file"), JOptionPane.OK_CANCEL_OPTION,
+                int answer = JOptionPane.showConfirmDialog(frame,
+                        Globals.lang("This entry has no BibTeX key. Generate key now?"),
+                        Globals.lang("Download file"), JOptionPane.OK_CANCEL_OPTION,
                     JOptionPane.QUESTION_MESSAGE);
                 if (answer == JOptionPane.OK_OPTION) {
                     generateKeySelectedEntry();
@@ -1230,7 +1224,7 @@ public class ImportInspectionDialog extends JDialog implements ImportInspector,
             // We have a static utility method for searching for all relevant
             // links:
             JDialog diag = new JDialog(ImportInspectionDialog.this, true);
-            FileListEditor.autoSetLinks(entry, model, metaData, new ActionListener() {
+            Util.autoSetLinks(entry, model, metaData, new ActionListener() {
 
                 public void actionPerformed(ActionEvent e) {
                     if (e.getID() > 0) {
diff --git a/src/java/net/sf/jabref/gui/MainTable.java b/src/java/net/sf/jabref/gui/MainTable.java
index e79ac7b..32b439c 100644
--- a/src/java/net/sf/jabref/gui/MainTable.java
+++ b/src/java/net/sf/jabref/gui/MainTable.java
@@ -462,6 +462,23 @@ public class MainTable extends JTable {
         return selectionModel.getSelected();
     }
 
+    /**
+     * Selects the given row
+     *
+     * @param row the row to select
+     */
+    public void setSelected(int row) {
+    	selectionModel.setSelectionInterval(row, row);
+    }
+
+    /**
+     * Adds the given row to the selection
+     * @param row the row to add to the selection
+     */
+    public void addSelection(int row)  {
+    	this.selectionModel.addSelectionInterval(row, row);
+    }
+
     public int findEntry(BibtexEntry entry) {
         //System.out.println(sortedForGrouping.indexOf(entry));
         return sortedForGrouping.indexOf(entry);
diff --git a/src/java/net/sf/jabref/gui/MainTableFormat.java b/src/java/net/sf/jabref/gui/MainTableFormat.java
index f3d5ccd..96c6615 100644
--- a/src/java/net/sf/jabref/gui/MainTableFormat.java
+++ b/src/java/net/sf/jabref/gui/MainTableFormat.java
@@ -52,7 +52,8 @@ public class MainTableFormat implements TableFormat<BibtexEntry> {
     // These values are also used to put a heading into the table; see getColumnName(int)
     public static final String[]
     PDF = {"pdf", "ps"},
-    URL_ = {"url", "doi"},
+    URL_FIRST = {"url", "doi"},
+    DOI_FIRST = {"doi", "url"},
     CITESEER = {"citeseerurl"},
     ARXIV = {"eprint"},
     RANKING = {SpecialFieldsUtils.FIELDNAME_RANKING},
@@ -217,8 +218,12 @@ public class MainTableFormat implements TableFormat<BibtexEntry> {
             for (int i = 0; i < fld.length; i++) {
                 if (fld[i].equals(GUIGlobals.TYPE_HEADER))
                     o = be.getType().getName();
-                else
+                else {
                     o = be.getField(fld[i]);
+                    if (getColumnName(col).equals("Author") && o != null) {
+                        o = panel.database().resolveForStrings((String) o);
+                    }
+                }
                 if (o != null) {
                     j = i;
                     break;
@@ -303,8 +308,15 @@ public class MainTableFormat implements TableFormat<BibtexEntry> {
             iconCols.put(coln++, FILE);
         if (Globals.prefs.getBoolean("pdfColumn"))
             iconCols.put(coln++, PDF);
-        if (Globals.prefs.getBoolean("urlColumn"))
-            iconCols.put(coln++, URL_);
+        if (Globals.prefs.getBoolean("urlColumn")) {
+            if(Globals.prefs.getBoolean("preferUrlDoi")) {
+                iconCols.put(coln++, DOI_FIRST);
+            } else {
+                iconCols.put(coln++, URL_FIRST);
+            }
+           
+        }
+            
         if (Globals.prefs.getBoolean("arxivColumn"))
             iconCols.put(coln++, ARXIV);
 
diff --git a/src/java/net/sf/jabref/gui/MergeEntriesDialog.java b/src/java/net/sf/jabref/gui/MergeEntriesDialog.java
new file mode 100644
index 0000000..3f40682
--- /dev/null
+++ b/src/java/net/sf/jabref/gui/MergeEntriesDialog.java
@@ -0,0 +1,433 @@
+/*  Copyright (C) 2012 JabRef contributors.
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+package net.sf.jabref.gui;
+
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.io.IOException;
+import java.io.StringWriter;
+import java.util.Set;
+import java.util.TreeSet;
+
+import javax.swing.*;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+
+import net.sf.jabref.export.LatexFieldFormatter;
+import net.sf.jabref.BasePanel;
+import net.sf.jabref.BibtexEntry;
+import net.sf.jabref.BibtexEntryType;
+import net.sf.jabref.Globals;
+import net.sf.jabref.JabRefFrame;
+import net.sf.jabref.MetaData;
+import net.sf.jabref.PreviewPanel;
+import net.sf.jabref.Util;
+import net.sf.jabref.undo.NamedCompound;
+import net.sf.jabref.undo.UndoableInsertEntry;
+import net.sf.jabref.undo.UndoableRemoveEntry;
+
+import com.jgoodies.forms.builder.ButtonBarBuilder;
+import com.jgoodies.forms.layout.CellConstraints;
+import com.jgoodies.forms.layout.FormLayout;
+import com.jgoodies.forms.layout.RowSpec;
+import com.jgoodies.forms.layout.ColumnSpec;
+
+// created by : ?
+//
+// modified : r.nagel 2.09.2004
+//            - insert close button
+public class MergeEntriesDialog extends JDialog {
+
+    // private String [] preferedOrder = {"author", "title", "journal", "booktitle", "volume", "number", "pages", "year", "month"};
+    private String[] columnHeadings = {Globals.lang("Field"),
+        Globals.lang("First entry"),
+        Globals.lang("Use 1st"),
+        Globals.lang("None"),
+        Globals.lang("Use 2nd"),
+        Globals.lang("Second entry")};
+    private final Dimension DIM = new Dimension(800, 800);
+    private PreviewPanel preview;
+    private BasePanel panel;
+    private JabRefFrame frame;
+    private JRadioButton[][] rb;
+    private ButtonGroup[] rbg;
+    private Boolean[] identical;
+    private boolean block = true;
+    private CellConstraints cc = new CellConstraints();
+    private BibtexEntry mergedEntry = new BibtexEntry();
+    private BibtexEntry one;
+    private BibtexEntry two;
+    private JTextArea jta;
+    private PreviewPanel pp;
+    private Boolean doneBuilding = false;
+    private Set<String> joint;
+    private String[] jointStrings;
+    private NamedCompound ce;
+
+    public MergeEntriesDialog(BasePanel panel) {
+        super(panel.frame(), Globals.lang("Merge entries"), true);
+
+        this.panel = panel;
+        this.frame = panel.frame();
+
+        // Start setting up the dialog
+        init(panel.getSelectedEntries());
+        Util.placeDialog(this, this.frame);
+    }
+
+    private void init(BibtexEntry[] selected) {
+
+        // Check if there are two entries selected
+        if (selected.length != 2) { // None selected. Inform the user to select entries first.
+            JOptionPane.showMessageDialog(frame, Globals.lang("You have to choose exactly two entries to merge."),
+                    Globals.lang("Merge entries"), JOptionPane.INFORMATION_MESSAGE);
+            this.dispose();
+            return;
+        }
+        
+        // Store the two entries
+        one = selected[0];
+        two = selected[1];
+
+        // Create undo-compound
+        ce = new NamedCompound(Globals.lang("Merge entries"));
+
+        joint = new TreeSet<String>(one.getAllFields());
+        joint.addAll(two.getAllFields());
+
+        // Remove field starting with __
+        Set<String> toberemoved = new TreeSet<String>();
+        for (String field : joint) {
+            if(field.startsWith("__")) {
+                toberemoved.add(field);
+            }
+        }
+        
+        for (String field: toberemoved) {
+            joint.remove(field);
+        }
+
+        // Create storage arrays
+        rb = new JRadioButton[3][joint.size() + 1];
+        rbg = new ButtonGroup[joint.size() + 1];
+        identical = new Boolean[joint.size() + 1];
+        jointStrings = new String[joint.size()];
+        
+        // Create layout
+        String colSpec = "left:pref, 5px, fill:4cm:grow, 5px, right:pref, 3px, center:pref, 3px, left:pref, 5px, fill:4cm:grow";
+        StringBuilder rowBuilder = new StringBuilder("pref, 10px, pref, ");
+        for (int i = 0; i < joint.size(); i++) {
+            rowBuilder.append("pref, ");
+        }
+        rowBuilder.append("10px, top:4cm:grow, 10px, pref");
+
+        FormLayout layout = new FormLayout(colSpec, rowBuilder.toString());
+        // layout.setColumnGroups(new int[][] {{3, 11}});
+        this.setLayout(layout);
+        
+        
+        // Set headings
+        for (int i = 0; i < 6; i++) {
+            JLabel label = new JLabel(columnHeadings[i]);
+            Font font = label.getFont();
+            label.setFont(font.deriveFont(font.getStyle() | Font.BOLD));
+            this.add(label, cc.xy(1 + i * 2, 1));
+
+        }
+
+        this.add(new JSeparator(), cc.xyw(1, 2, 11));
+
+        
+        // Start with entry type
+        BibtexEntryType type1 = one.getType();
+        BibtexEntryType type2 = two.getType();
+
+        mergedEntry.setType(type1);
+        JLabel label = new JLabel(Globals.lang("Entry type"));
+        Font font = label.getFont();
+        label.setFont(font.deriveFont(font.getStyle() | Font.BOLD));
+        this.add(label, cc.xy(1, 3));
+
+        JTextArea type1ta = new JTextArea(type1.getName());
+        type1ta.setEditable(false);
+        this.add(type1ta, cc.xy(3, 3));
+        if (type1.compareTo(type2) != 0) {
+            identical[0] = false;
+            rbg[0] = new ButtonGroup();
+            for (int k = 0; k < 3; k += 2) {
+                rb[k][0] = new JRadioButton();
+                rbg[0].add(rb[k][0]);
+                this.add(rb[k][0], cc.xy(5 + k * 2, 3));
+                rb[k][0].addChangeListener(new ChangeListener() {
+                    public void stateChanged(ChangeEvent e) {
+                        updateAll();
+                    }
+                });
+            }
+            rb[0][0].setSelected(true);
+        } else {
+            identical[0] = true;
+        }
+        JTextArea type2ta = new JTextArea(type2.getName());
+        type2ta.setEditable(false);
+        this.add(type2ta, cc.xy(11, 3));
+
+
+
+        // For all fields in joint add a row and possibly radio buttons
+        int row = 4;
+        for (String field : joint) {
+            jointStrings[row - 4] = field;
+            label = new JLabel(Util.toUpperFirstLetter(field));
+            font = label.getFont();
+            label.setFont(font.deriveFont(font.getStyle() | Font.BOLD));
+            this.add(label, cc.xy(1, row));
+            String string1 = one.getField(field);
+            String string2 = two.getField(field);
+            identical[row - 3] = false;
+            if ((string1 != null) && (string2 != null)) {
+                if (string1.equals(string2)) {
+                    identical[row - 3] = true;
+                }
+            }
+
+            if (field.equals("abstract")) {
+            // Treat the abstract field special, maybe more fields? Review? Note?
+                JTextArea tf = new JTextArea();
+                tf.setLineWrap(true);
+                tf.setEditable(false);
+                JScrollPane jsptf = new JScrollPane(tf);
+
+                layout.setRowSpec(row, RowSpec.decode("center:2cm:grow"));
+                this.add(jsptf, cc.xy(3, row, "f, f"));
+                tf.setText(string1);
+                tf.setCaretPosition(0);
+
+
+            } else {
+                JTextArea tf = new JTextArea(string1);
+                this.add(tf, cc.xy(3, row));
+                tf.setCaretPosition(0);
+                tf.setEditable(false);
+            }
+
+            // Add radio buttons if the two entries do not have identical fields
+            if (!identical[row - 3]) {
+                rbg[row - 3] = new ButtonGroup();
+                for (int k = 0; k < 3; k++) {
+                    rb[k][row - 3] = new JRadioButton();
+                    rbg[row - 3].add(rb[k][row - 3]);
+                    this.add(rb[k][row - 3], cc.xy(5 + k * 2, row));
+                    rb[k][row - 3].addChangeListener(new ChangeListener() {
+                        public void stateChanged(ChangeEvent e) {
+                            updateAll();
+                        }
+                    });
+                }
+                if (string1 != null) {
+                    mergedEntry.setField(field, string1);
+                    rb[0][row - 3].setSelected(true);
+                } else {
+                    mergedEntry.setField(field, string2);
+                    rb[2][row - 3].setSelected(true);
+                }
+            } else {
+                mergedEntry.setField(field, string1);
+            }
+            if (field.equals("abstract")) {
+                // Again, treat abstract special
+                JTextArea tf = new JTextArea();
+                tf.setLineWrap(true);
+                tf.setEditable(false);
+                JScrollPane jsptf = new JScrollPane(tf);
+
+                this.add(jsptf, cc.xy(11, row, "f, f"));
+                tf.setText(string2);
+                tf.setCaretPosition(0);
+
+            } else {
+                JTextArea tf = new JTextArea(string2);
+                this.add(tf, cc.xy(11, row));
+                tf.setCaretPosition(0);
+                tf.setEditable(false);
+            }
+
+            row++;
+        }
+
+        this.add(new JSeparator(), cc.xyw(1, row, 11));
+        row++;
+
+        // Setup a PreviewPanel and a Bibtex source box for the merged entry
+        label = new JLabel(Globals.lang("Merged entry"));
+        font = label.getFont();
+        label.setFont(font.deriveFont(font.getStyle() | Font.BOLD));
+        this.add(label, cc.xy(1, row));
+
+        String layoutString = Globals.prefs.get("preview0");
+        pp = new PreviewPanel(null, mergedEntry, null, new MetaData(), layoutString);
+        // JScrollPane jsppp = new JScrollPane(pp);
+        this.add(pp, cc.xyw(3, row, 3));
+
+        jta = new JTextArea();
+        jta.setLineWrap(true);
+        JScrollPane jspta = new JScrollPane(jta);
+        this.add(jspta, cc.xyw(9, row, 3));
+        jta.setEditable(false);
+        StringWriter sw = new StringWriter();
+        try {
+            mergedEntry.write(sw, new LatexFieldFormatter(), false);
+        } catch (IOException ex) {
+            System.err.println(Globals.lang("Error in entry" + ": " + ex.getMessage()));
+        }
+        jta.setText(sw.getBuffer().toString());
+        jta.setCaretPosition(0);
+        row++;
+        this.add(new JSeparator(), cc.xyw(1, row, 11));
+        row++;
+
+        // Create buttons
+        ButtonBarBuilder bb = new ButtonBarBuilder();
+        bb.addGlue();
+        JButton cancel = new JButton(Globals.lang("Cancel"));
+        cancel.setActionCommand("cancel");
+        cancel.addActionListener(new ActionListener() {
+            public void actionPerformed(ActionEvent e) {
+                buttonPressed(e.getActionCommand());
+            }
+        });
+
+        JButton newentry = new JButton(Globals.lang("Add new entry and keep both old entries"));
+        newentry.setActionCommand("newentry");
+        newentry.addActionListener(new ActionListener() {
+            public void actionPerformed(ActionEvent e) {
+                buttonPressed(e.getActionCommand());
+            }
+        });
+
+        JButton replaceentries = new JButton(Globals.lang("Replace old entries with new entry"));
+        replaceentries.setActionCommand("replace");
+        replaceentries.addActionListener(new ActionListener() {
+            public void actionPerformed(ActionEvent e) {
+                buttonPressed(e.getActionCommand());
+            }
+        });
+
+        bb.addButton(new JButton[]{replaceentries, newentry, cancel});
+        this.add(bb.getPanel(), cc.xyw(1, row, 11));
+
+        // Add some margin around the layout
+        layout.appendRow(RowSpec.decode("10px"));
+        layout.appendColumn(ColumnSpec.decode("10px"));
+        layout.insertRow(1, RowSpec.decode("10px"));
+        layout.insertColumn(1, ColumnSpec.decode("10px"));
+
+        pack();
+
+        if (getHeight() > DIM.height) {
+            setSize(new Dimension(getWidth(), DIM.height));
+        }
+        if (getWidth() > DIM.width) {
+            setSize(new Dimension(DIM.width, getHeight()));
+        }
+        
+        // Everything done, allow any action to actually update the merged entry
+        doneBuilding = true;
+        
+        // Show what we've got
+        setVisible(true);
+
+
+    }
+
+    private void buttonPressed(String button) {
+        if (button.equals("cancel")) {
+            // Cancelled, throw it away
+            panel.output(Globals.lang("Cancelled merging entries"));
+            
+            dispose();
+        } else if (button.equals("newentry")) {
+            // Create a new entry and add it to the undo stack
+            // Keep the other two entries
+            panel.insertEntry(mergedEntry);
+            ce.addEdit(new UndoableInsertEntry(panel.database(), mergedEntry, panel));
+            ce.end();
+            panel.undoManager.addEdit(ce);
+            panel.output(Globals.lang("Merged entries into a new and kept the old"));
+            dispose();
+        } else if (button.equals("replace")) {
+            // Create a new entry and add it to the undo stack
+            // Remove the other two entries and add them to the undo stack (which is not working...)
+            panel.insertEntry(mergedEntry);
+            ce.addEdit(new UndoableInsertEntry(panel.database(), mergedEntry, panel));
+            ce.addEdit(new UndoableRemoveEntry(panel.database(), one, panel));
+            panel.database().removeEntry(one.getId());
+            ce.addEdit(new UndoableRemoveEntry(panel.database(), two, panel));
+            panel.database().removeEntry(two.getId());
+            ce.end();
+            panel.undoManager.addEdit(ce);
+            panel.output(Globals.lang("Merged entries into a new and removed the old"));
+            dispose();
+        }
+    }
+
+    private void updateAll() {
+        if (!doneBuilding) {
+            // If we've not done adding everything, do not do anything...
+            return;
+        }
+        // Check if the type is changed
+        if (!identical[0]) {
+            if (rb[0][0].isSelected()) {
+                mergedEntry.setType(one.getType());
+            } else {
+                mergedEntry.setType(two.getType());
+            }
+        }
+
+        // Check all fields
+        for (int i = 0; i < joint.size(); i++) {
+            if (!identical[i + 1]) {
+                if (rb[0][i + 1].isSelected()) {
+                    mergedEntry.setField(jointStrings[i], one.getField(jointStrings[i]));
+                } else if (rb[2][i + 1].isSelected()) {
+                    mergedEntry.setField(jointStrings[i], two.getField(jointStrings[i]));
+                } else {
+                    mergedEntry.setField(jointStrings[i], null);
+                }
+            }
+        }
+        
+        // Update the PreviewPanel
+        pp.setEntry(mergedEntry);
+
+        
+        // Update the Bibtex source view
+        StringWriter sw = new StringWriter();
+        try {
+            mergedEntry.write(sw, new LatexFieldFormatter(), false);
+        } catch (IOException ex) {
+            System.err.println(Globals.lang("Error in entry" + ": " + ex.getMessage()));
+        }
+        jta.setText(sw.getBuffer().toString());
+        jta.setCaretPosition(0);
+    }
+
+    public boolean isBlocking() {
+        return block;
+    }
+}
diff --git a/src/java/net/sf/jabref/gui/WaitForSaveOperation.java b/src/java/net/sf/jabref/gui/WaitForSaveOperation.java
index 8501ad6..4793562 100644
--- a/src/java/net/sf/jabref/gui/WaitForSaveOperation.java
+++ b/src/java/net/sf/jabref/gui/WaitForSaveOperation.java
@@ -43,7 +43,7 @@ public class WaitForSaveOperation implements ActionListener {
         prog = new JProgressBar(0);
         prog.setIndeterminate(true);
         prog.setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
-        diag = new JDialog(frame, Globals.lang("Please wait"), true);
+        diag = new JDialog(frame, Globals.lang("Please wait..."), true);
 
         ButtonBarBuilder bb = new ButtonBarBuilder();
         bb.addGlue();
diff --git a/src/java/net/sf/jabref/imports/ACMPortalFetcher.java b/src/java/net/sf/jabref/imports/ACMPortalFetcher.java
index d7b1813..a07e453 100644
--- a/src/java/net/sf/jabref/imports/ACMPortalFetcher.java
+++ b/src/java/net/sf/jabref/imports/ACMPortalFetcher.java
@@ -38,6 +38,7 @@ public class ACMPortalFetcher implements PreviewEntryFetcher {
 	private OutputPrinter status;
     private final HTMLConverter htmlConverter = new HTMLConverter();
     final CaseKeeper caseKeeper = new CaseKeeper();
+    final UnitFormatter unitFormatter = new UnitFormatter();
     private String terms;
     
     private static final String startUrl = "http://portal.acm.org/";
@@ -177,6 +178,13 @@ public class ACMPortalFetcher implements PreviewEntryFetcher {
                         if (title != null) {
                             title = title.replaceAll("\\\\&", "&").replaceAll("\\\\#","#");
                             title = convertHTMLChars(title);
+                                        
+                            // Unit formatting
+                            if (Globals.prefs.getBoolean("useUnitFormatterOnSearch")) {
+                                title = unitFormatter.format(title);
+                            }
+            
+                            // Case keeping
                             if (Globals.prefs.getBoolean("useCaseKeeperOnSearch")) {
                                 title = caseKeeper.format(title);
                             }
diff --git a/src/java/net/sf/jabref/imports/BibtexImporter.java b/src/java/net/sf/jabref/imports/BibtexImporter.java
new file mode 100644
index 0000000..c22ffd0
--- /dev/null
+++ b/src/java/net/sf/jabref/imports/BibtexImporter.java
@@ -0,0 +1,69 @@
+/*
+ *  This file is part of JabRef.
+ *
+ *  JabRef is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  JabRef is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with JAbRef.  If not, see <http://www.gnu.org/licenses/>. 
+ */
+
+package net.sf.jabref.imports;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.util.ArrayList;
+import java.util.List;
+
+import net.sf.jabref.BibtexEntry;
+import net.sf.jabref.OutputPrinter;
+
+/**
+ * Imported requried to support --importToOpen someEntry.bib 
+ */
+public class BibtexImporter extends ImportFormat {
+
+    /**
+     * @return false as that does not cause any harm in the current implementation of JabRef
+     */
+    @Override
+    public boolean isRecognizedFormat(InputStream in) throws IOException {
+        return BibtexParser.isRecognizedFormat(new InputStreamReader(in));
+    }
+
+    /**
+     * Parses the given input stream.
+     * Only plain bibtex entries are returned.
+     * That especially means that metadata is ignored.
+     * 
+     * @param in the inputStream to read from
+     * @param status the OutputPrinter to put status to
+     * @return a list of BibTeX entries contained in the given inputStream
+     */
+    @Override
+    public List<BibtexEntry> importEntries(InputStream in, OutputPrinter status)
+            throws IOException {
+        ParserResult pr = BibtexParser.parse(new InputStreamReader(in));
+        List<BibtexEntry> res = new ArrayList<BibtexEntry>(pr.getDatabase().getEntries());
+        return res;
+    }
+
+    @Override
+    public String getFormatName() {
+        return "BibTeX";
+    }
+
+    @Override
+    public String getExtensions() {
+        return "bib";
+    }
+
+}
diff --git a/src/java/net/sf/jabref/imports/BibtexParser.java b/src/java/net/sf/jabref/imports/BibtexParser.java
index ae13878..74a3516 100644
--- a/src/java/net/sf/jabref/imports/BibtexParser.java
+++ b/src/java/net/sf/jabref/imports/BibtexParser.java
@@ -356,9 +356,9 @@ public class BibtexParser {
 						boolean duplicateKey = _db.insertEntry(be);
 						if (duplicateKey) // JZTODO lyrics
                             _pr.addDuplicateKey(be.getCiteKey());
-							/*_pr.addWarning(Globals.lang("duplicate BibTeX key") + ": "
-								+ be.getCiteKey() + " ("
-								+ Globals.lang("grouping may not work for this entry") + ")");                        */
+							// _pr.addWarning(Globals.lang("duplicate BibTeX key") + ": "
+							//	+ be.getCiteKey() + " ("
+							//	+ Globals.lang("grouping may not work for this entry") + ")");                        
 						else if (be.getCiteKey() == null || be.getCiteKey().equals("")) {
 							_pr.addWarning(Globals.lang("empty BibTeX key") + ": "
 								+ be.getAuthorTitleYear(40) + " ("
diff --git a/src/java/net/sf/jabref/imports/CaseKeeperList.java b/src/java/net/sf/jabref/imports/CaseKeeperList.java
index 12e6816..31bf340 100644
--- a/src/java/net/sf/jabref/imports/CaseKeeperList.java
+++ b/src/java/net/sf/jabref/imports/CaseKeeperList.java
@@ -116,12 +116,14 @@ public class CaseKeeperList {
         "CMOS",
         "CMRR",
         "CMS",
+        "CNF",
         "CNN",
         "CO2",
 	"CORDIC",
         "COTS",
         "CP",
         "CPE",
+        "CPM",
         "CPLD",
         "CPU",
         "CRC",
@@ -212,6 +214,7 @@ public class CaseKeeperList {
         "FBAR",
         "FDE",
         "FDI",
+        "FDMA",
         "FDTD",
         "FEC",
         "FEM",
@@ -235,10 +238,10 @@ public class CaseKeeperList {
         "FinFET",
         "Fokker",
         "Fourier",
+        "Frobenius",
         "GALS",
         "GCM",
         "GF",
-        "GHz",
         "GIS",
         "GM",
         "GMD",
@@ -250,15 +253,12 @@ public class CaseKeeperList {
         "GPU",
         "GSM",
         "GSPS",
-        "GS",
         "GaAs",
         "GaN",
         "Gabor",
         "Galileo",
         "Galois",
         "Gauss",
-        "Gb",
-        "GeV",
         "Gram-Schmidt",
         "H.264",
         "HARQ",
@@ -278,16 +278,17 @@ public class CaseKeeperList {
         "HRV",
         "HSPA",
         "HSDPA",
+        "HTML",
         "HVAC",
         "HVDC",
         "HW",
         "Haar",
         "Hadamard",
         "Hamming",
+        "Hankel",
         "Hartley",
         "Hermit",  // Hermitian, Hermite, Hermit
         "Hilbert",
-        "Hz",
         "I-V",
         "I/O",
         "I/Q",
@@ -299,7 +300,9 @@ public class CaseKeeperList {
         "IDCT",
         "IDFT",
         "IEC",
+        "IEE",
         "IEEE",
+        "IET",
         "IFFT",
         "IFIR",
         "IF",
@@ -326,6 +329,7 @@ public class CaseKeeperList {
         "ISM",
         "ISO",
         "ISS",
+        "ITE",
         "InGaAs",
         "InGaN",
         "InP",
@@ -372,6 +376,7 @@ public class CaseKeeperList {
         "Laplace",
         "Lempel",
         "Lyapunov",
+        "M2M",
         "MAC",
         "MANET",
         "MAP",
@@ -386,12 +391,12 @@ public class CaseKeeperList {
         "MDST",
         "MEMS",
         "MESFET",
-        "MHz",
         "MILP",
         "MIMO",
         "MISO",
         "MIT",
         "ML",
+        "MLSD",
         "MMIC",
         "MMS",
         "MMSE",
@@ -411,7 +416,6 @@ public class CaseKeeperList {
         "MSD",
         "MSE",
         "MSPS",
-        "MS",
         "MTCMOS",
         "MTD",
         "MTI",
@@ -422,9 +426,7 @@ public class CaseKeeperList {
         "Markov",
         "Massey",
         "Maxwell",
-        "Mb",
         "McClellan",
-        "MeV",
         "Miller",
         "Monte",
         "Montgomery",
@@ -459,6 +461,7 @@ public class CaseKeeperList {
         "PCM",
         "PCMCIA",
         "PC",
+        "PDF",
         "PDP",
         "PET",
         "PFA",
@@ -479,6 +482,7 @@ public class CaseKeeperList {
         "PSNR",
         "PSO",
         "PSRR",
+        "PTL",
         "PV",
         "PWB",
         "PWM",
@@ -579,6 +583,7 @@ public class CaseKeeperList {
         "Solomon",
         "SystemC",
         "TCP",
+        "TDC",
         "TDM",
         "TDMA",
         "TDS",
@@ -657,32 +662,332 @@ public class CaseKeeperList {
         "ZVS",
         "ZigBee",
         "Ziv",
-        "ZnO",
-        "dB",
-        "eV",
-        "kA",
-        "keV",
-        "kHz",
-        "kS",
-        "kV",
-        "kW",
-        "mA",
-        "mJ",
-        "mW",
-        "mV",
-        "nJ",
-        "nV",
-        "nW",
-        "pJ",
-        "pV",
-        "pW",
         "xDSL"
    };
     
+   // Weekdays and months
+   public String[] wordListDayMonth = new String[]{
+       "Monday",
+       "Tuesday",
+       "Wednesday",
+       "Thursday",
+       "Friday",
+       "Saturday",
+       "Sunday",
+       "January",
+       "February",
+       "March",
+       "April",
+       "May",
+       "June",
+       "July",
+       "August",
+       "September",
+       "October",
+       "November",
+       "December"
+   };
+   
+   private String[] wordListCountries = new String[] {
+        "Andorra",
+        "United Arab Emirates",
+        "UAE",
+        "Afghanistan",
+        "Antigua and Barbuda",
+        "Anguilla",
+        "Albania",
+        "Armenia",
+        "Netherlands Antilles",
+        "Angola",
+        "Antarctica",
+        "Argentina",
+        "American Samoa",
+        "Austria",
+        "Australia",
+        "Aruba",
+        "Aland Islands",
+        "Aland",
+        "Azerbaijan",
+        "Bosnia and Herzegovina",
+        "Barbados",
+        "Bangladesh",
+        "Belgium",
+        "Burkina Faso",
+        "Bulgaria",
+        "Bahrain",
+        "Burundi",
+        "Benin",
+        "Saint Barthelemy",
+        "Bermuda",
+        "Brunei",
+        "Bolivia",
+        "British Antarctic Territory",
+        "Brazil",
+        "Bahamas",
+        "Bhutan",
+        "Bouvet Island",
+        "Botswana",
+        "Belarus",
+        "Belize",
+        "Canada",
+        "Cocos Islands",
+        "Keeling Islands",
+        "Congo",
+        "Congo - Kinshasa",
+        "Central African Republic",
+        "Congo - Brazzaville",
+        "Democratic Republic of Congo",
+        "Switzerland",
+        "Cote d'Ivoire",
+        "Cook Islands",
+        "Chile",
+        "Cameroon",
+        "China",
+        "Colombia",
+        "Costa Rica",
+        "Serbia and Montenegro",
+        "Canton and Enderbury Islands",
+        "Cuba",
+        "Cape Verde",
+        "Christmas Island",
+        "Cyprus",
+        "Czech Republic",
+        "East Germany",
+        "Germany",
+        "Djibouti",
+        "Denmark",
+        "Dominica",
+        "Dominican Republic",
+        "Algeria",
+        "Ecuador",
+        "Estonia",
+        "Egypt",
+        "Western Sahara",
+        "Eritrea",
+        "Spain",
+        "Ethiopia",
+        "Finland",
+        "Fiji",
+        "Falkland Islands",
+        "Micronesia",
+        "Faroe Islands",
+        "French Southern and Antarctic Territories",
+        "France",
+        "Metropolitan France",
+        "Gabon",
+        "United Kingdom",
+        "Great Britain",
+        "Britain",
+        "England",
+        "Wales",
+        "Scotland",
+        "Northern Ireland",
+        "Grenada",
+        "Georgia",
+        "French Guiana",
+        "Guernsey",
+        "Ghana",
+        "Gibraltar",
+        "Greenland",
+        "Gambia",
+        "Guinea",
+        "Guadeloupe",
+        "Equatorial Guinea",
+        "Greece",
+        "South Georgia and the South Sandwich Islands",
+        "Guatemala",
+        "Guam",
+        "Guinea-Bissau",
+        "Guyana",
+        "Hong Kong SAR China",
+        "Heard Island and McDonald Islands",
+        "Honduras",
+        "Croatia",
+        "Haiti",
+        "Hungary",
+        "Indonesia",
+        "Ireland",
+        "Israel",
+        "Isle of Man",
+        "India",
+        "British Indian Ocean Territory",
+        "Iraq",
+        "Iran",
+        "Iceland",
+        "Italy",
+        "Jersey",
+        "Jamaica",
+        "Jordan",
+        "Japan",
+        "Johnston Island",
+        "Kenya",
+        "Kyrgyzstan",
+        "Cambodia",
+        "Kiribati",
+        "Comoros",
+        "Saint Kitts and Nevis",
+        "North Korea",
+        "South Korea",
+        "Kuwait",
+        "Cayman Islands",
+        "Kazakhstan",
+        "Laos",
+        "Lebanon",
+        "Saint Lucia",
+        "Liechtenstein",
+        "Sri Lanka",
+        "Liberia",
+        "Lesotho",
+        "Lithuania",
+        "Luxembourg",
+        "Latvia",
+        "Libya",
+        "Morocco",
+        "Monaco",
+        "Moldova",
+        "Montenegro",
+        "Saint Martin",
+        "Madagascar",
+        "Marshall Islands",
+        "Midway Islands",
+        "Macedonia",
+        "Mali",
+        "Myanmar",
+        "Burma",
+        "Mongolia",
+        "Macau SAR China",
+        "Northern Mariana Islands",
+        "Martinique",
+        "Mauritania",
+        "Montserrat",
+        "Malta",
+        "Mauritius",
+        "Maldives",
+        "Malawi",
+        "Mexico",
+        "Malaysia",
+        "Mozambique",
+        "Namibia",
+        "New Caledonia",
+        "Niger",
+        "Norfolk Island",
+        "Nigeria",
+        "Nicaragua",
+        "Netherlands",
+        "Norway",
+        "Nepal",
+        "Dronning Maud Land",
+        "Nauru",
+        "Neutral Zone",
+        "Niue",
+        "New Zealand",
+        "Oman",
+        "Panama",
+        "Pacific Islands Trust Territory",
+        "Peru",
+        "French Polynesia",
+        "Papua New Guinea",
+        "Philippines",
+        "Pakistan",
+        "Poland",
+        "Saint Pierre and Miquelon",
+        "Pitcairn Islands",
+        "Puerto Rico",
+        "Palestinian Territories",
+        "Portugal",
+        "U.S. Miscellaneous Pacific Islands",
+        "Palau",
+        "Paraguay",
+        "Panama Canal Zone",
+        "Qatar",
+        "Reunion",
+        "Romania",
+        "Serbia",
+        "Russia",
+        "Rwanda",
+        "Saudi Arabia",
+        "Solomon Islands",
+        "Seychelles",
+        "Sudan",
+        "Sweden",
+        "Singapore",
+        "Saint Helena",
+        "Slovenia",
+        "Svalbard and Jan Mayen",
+        "Svalbard",
+        "Jan Mayen",
+        "Slovakia",
+        "Sierra Leone",
+        "San Marino",
+        "Senegal",
+        "Somalia",
+        "Suriname",
+        "Sao Tome and Principe",
+        "Union of Soviet Socialist Republics",
+        "USSR",
+        "El Salvador",
+        "Syria",
+        "Swaziland",
+        "Turks and Caicos Islands",
+        "Chad",
+        "French Southern Territories",
+        "Togo",
+        "Thailand",
+        "Tajikistan",
+        "Tokelau",
+        "Timor-Leste",
+        "Turkmenistan",
+        "Tunisia",
+        "Tonga",
+        "Turkey",
+        "Trinidad and Tobago",
+        "Tuvalu",
+        "Taiwan",
+        "Tanzania",
+        "Ukraine",
+        "Uganda",
+        "U.S. Minor Outlying Islands",
+        "United States",
+        "USA",
+        "Uruguay",
+        "Uzbekistan",
+        "Vatican City",
+        "Saint Vincent and the Grenadines",
+        "North Vietnam",
+        "Venezuela",
+        "British Virgin Islands",
+        "U.S. Virgin Islands",
+        "Vietnam",
+        "Vanuatu",
+        "Wallis and Futuna",
+        "Wake Island",
+        "Samoa",
+        "People's Democratic Republic of Yemen",
+        "Yemen",
+        "Yugoslavia",
+        "Mayotte",
+        "South Africa",
+        "Zambia",
+        "Zimbabwe",
+        "Asia",
+        "Oceania",
+        "Europe",
+        "America",
+        "Africa",
+        "South America",
+        "North America"
+   };
    
    // List of all keyword lists
    private String[][] allLists = new String[][] {
-       wordListIEEEXplore
+       wordListIEEEXplore,
+       wordListDayMonth,
+       wordListCountries
+   };
+   
+   private String[][] genericLists = new String[][] {
+       wordListDayMonth,
+       wordListCountries
    };
    
    public CaseKeeperList () {
diff --git a/src/java/net/sf/jabref/imports/DOItoBibTeXFetcher.java b/src/java/net/sf/jabref/imports/DOItoBibTeXFetcher.java
index 9a2e543..543a982 100644
--- a/src/java/net/sf/jabref/imports/DOItoBibTeXFetcher.java
+++ b/src/java/net/sf/jabref/imports/DOItoBibTeXFetcher.java
@@ -36,6 +36,7 @@ public class DOItoBibTeXFetcher implements EntryFetcher {
 	
     private static final String URL_PATTERN = "http://dx.doi.org/%s"; 
     final CaseKeeper caseKeeper = new CaseKeeper();
+    final UnitFormatter unitFormatter = new UnitFormatter();
     
 	@Override
     public void stopFetching() {
@@ -44,68 +45,10 @@ public class DOItoBibTeXFetcher implements EntryFetcher {
 
 	@Override
     public boolean processQuery(String query, ImportInspector inspector, OutputPrinter status) {
-		String q;
-		try {
-	        q = URLEncoder.encode(query, "UTF-8");
-        } catch (UnsupportedEncodingException e) {
-        	// this should never happen
-        	status.setStatus(Globals.lang("Error"));
-	        e.printStackTrace();
-	        return false;
-        }
-		
-        String urlString = String.format(URL_PATTERN, q);
 
-        // Send the request
-        URL url;
-        try {
-            url = new URL(urlString);
-        } catch (MalformedURLException e) {
-            e.printStackTrace();
-            return false;
-        }
-
-        URLConnection conn;
-        try {
-	        conn = url.openConnection();
-        } catch (IOException e) {
-	        e.printStackTrace();
-	        return false;
-        }
-        
-        conn.setRequestProperty("Accept", "text/bibliography; style=bibtex");
-        
-        
-       String bibtexString;
-        try {
-	        bibtexString = Util.getResults(conn);
-        } catch (FileNotFoundException e) {
-               status.showMessage(Globals.lang("Unknown DOI: '%0'.",
-                        query),
-                        Globals.lang("Get BibTeX entry from DOI"), JOptionPane.INFORMATION_MESSAGE);
-	        return false;
-        }
-        catch (IOException e) {
-	        e.printStackTrace();
-	        return false;
-        }
-        
-       
-        
-        BibtexEntry entry = BibtexParser.singleFromString(bibtexString);
-        
-        if(entry != null) {
-            // Optionally add curly brackets around key words to keep the case
-            String title = (String)entry.getField("title");
-            if (title != null) {
-                if (Globals.prefs.getBoolean("useCaseKeeperOnSearch")) {
-                    title = caseKeeper.format(title);
-                }
-                entry.setField("title", title);
-            }
-            
-            // Do not use the provided key
-            // entry.setField(BibtexFields.KEY_FIELD,null);
+       BibtexEntry entry = getEntryFromDOI(query, status);
+       if (entry != null)
+       {
             inspector.addEntry(entry);
 	    return true;
         } else {
@@ -142,5 +85,75 @@ public class DOItoBibTeXFetcher implements EntryFetcher {
 	    return null;
     }
 
+    public BibtexEntry getEntryFromDOI(String doi, OutputPrinter status) {
+        String q;
+        try {
+            q = URLEncoder.encode(doi, "UTF-8");
+        } catch (UnsupportedEncodingException e) {
+            // this should never happen
+            e.printStackTrace();
+            return null;
+        }
+
+        String urlString = String.format(URL_PATTERN, q);
+
+        // Send the request
+        URL url;
+        try {
+            url = new URL(urlString);
+        } catch (MalformedURLException e) {
+            e.printStackTrace();
+            return null;
+        }
+
+        URLConnection conn;
+        try {
+            conn = url.openConnection();
+        } catch (IOException e) {
+            e.printStackTrace();
+            return null;
+        }
+
+        conn.setRequestProperty("Accept", "text/bibliography; style=bibtex");
+
+
+        String bibtexString;
+        try {
+            bibtexString = Util.getResults(conn);
+        } catch (FileNotFoundException e) {
+
+            if (status != null) {
+                status.showMessage(Globals.lang("Unknown DOI: '%0'.",
+                        doi),
+                        Globals.lang("Get BibTeX entry from DOI"), JOptionPane.INFORMATION_MESSAGE);
+            }
+            return null;
+        } catch (IOException e) {
+            e.printStackTrace();
+            return null;
+        }
+
 
-}
+
+        BibtexEntry entry = BibtexParser.singleFromString(bibtexString);
+
+        if (entry != null) {
+            // Optionally add curly brackets around key words to keep the case
+            String title = (String) entry.getField("title");
+            if (title != null) {
+
+                // Unit formatting
+                if (Globals.prefs.getBoolean("useUnitFormatterOnSearch")) {
+                    title = unitFormatter.format(title);
+                }
+
+                // Case keeping
+                if (Globals.prefs.getBoolean("useCaseKeeperOnSearch")) {
+                    title = caseKeeper.format(title);
+                }
+                entry.setField("title", title);
+            }
+        }
+        return entry;
+    }
+}
\ No newline at end of file
diff --git a/src/java/net/sf/jabref/imports/DiVAtoBibTeXFetcher.java b/src/java/net/sf/jabref/imports/DiVAtoBibTeXFetcher.java
index ee23e3a..89e9f8d 100644
--- a/src/java/net/sf/jabref/imports/DiVAtoBibTeXFetcher.java
+++ b/src/java/net/sf/jabref/imports/DiVAtoBibTeXFetcher.java
@@ -37,6 +37,8 @@ public class DiVAtoBibTeXFetcher implements EntryFetcher {
     private static final String URL_PATTERN = "http://www.diva-portal.org/smash/getreferences?referenceFormat=BibTex&pids=%s"; 
     private static final String ABSTRACT_URL_PATTERN = "http://www.diva-portal.org/smash/record.jsf?pid=%s"; 
     final CaseKeeper caseKeeper = new CaseKeeper();
+    final UnitFormatter unitFormatter = new UnitFormatter();
+    final HTMLConverter htmlConverter = new HTMLConverter();
     
 	@Override
     public void stopFetching() {
@@ -79,7 +81,7 @@ public class DiVAtoBibTeXFetcher implements EntryFetcher {
         
        String bibtexString;
         try {
-	        bibtexString = Util.getResults(conn);
+	        bibtexString = Util.getResultsWithEncoding(conn,"UTF-8");
         } catch (FileNotFoundException e) {
                status.showMessage(Globals.lang("Unknown DiVA entry: '%0'.",
                         query),
@@ -95,12 +97,24 @@ public class DiVAtoBibTeXFetcher implements EntryFetcher {
         if (entry != null) {
             // Optionally add curly brackets around key words to keep the case
             String title = (String)entry.getField("title");
-            if (title != null) {
+            if (title != null) {                           
+                // Unit formatting
+                if (Globals.prefs.getBoolean("useUnitFormatterOnSearch")) {
+                    title = unitFormatter.format(title);
+                }
+            
+                // Case keeping
                 if (Globals.prefs.getBoolean("useCaseKeeperOnSearch")) {
                     title = caseKeeper.format(title);
                 }
                 entry.setField("title", title);
             }
+            
+            String institution = (String) entry.getField("institution");
+            if (institution!=null) {
+                institution = htmlConverter.formatUnicode(institution);
+                entry.setField("institution",institution);
+            }
             // Do not use the provided key
             // entry.setField(BibtexFields.KEY_FIELD,null);
             inspector.addEntry(entry);
diff --git a/src/java/net/sf/jabref/imports/GeneralFetcher.java b/src/java/net/sf/jabref/imports/GeneralFetcher.java
index b721b66..59ad176 100644
--- a/src/java/net/sf/jabref/imports/GeneralFetcher.java
+++ b/src/java/net/sf/jabref/imports/GeneralFetcher.java
@@ -53,8 +53,8 @@ public class GeneralFetcher extends SidePaneComponent implements ActionListener
     GridBagLayout gbl = new GridBagLayout();
     GridBagConstraints con = new GridBagConstraints();
     JButton go = new JButton(Globals.lang("Fetch")), helpBut = new JButton(
-			GUIGlobals.getImage("helpSmall")), reset = new JButton(Globals
-			.lang("Reset"));
+			GUIGlobals.getImage("helpSmall")), reset = new JButton(
+                                Globals.lang("Reset"));
     JComboBox fetcherChoice;
     CardLayout optionsCards = new CardLayout();
     JPanel optionsPanel = new JPanel(optionsCards);
diff --git a/src/java/net/sf/jabref/imports/HTMLConverter.java b/src/java/net/sf/jabref/imports/HTMLConverter.java
index 9513aec..56d8b43 100644
--- a/src/java/net/sf/jabref/imports/HTMLConverter.java
+++ b/src/java/net/sf/jabref/imports/HTMLConverter.java
@@ -500,10 +500,11 @@ public class HTMLConverter implements LayoutFormatter {
         {"8364", "euro", "\\{\\\\texteuro\\}"}, // euro sign, U+20AC NEW 
             
         /* Manually added */
+        {"24", "dollar", "\\\\$"}, // Percent
         {"37", "percnt", "\\\\%"}, // Percent
-        {"39", "", "'"}, // Apostrophe
-        {"40", "", "("}, // Left bracket
-        {"41", "", ")"}, // Right bracket
+        {"39", "apos", "'"}, // Apostrophe
+        {"40", "lpar", "("}, // Left bracket
+        {"41", "rpar", ")"}, // Right bracket
         {"43", "plus", "\\+"}, // Plus
         {"44", "comma", ","}, // Comma
         {"45", "hyphen", "-"}, // Hyphen
@@ -511,6 +512,7 @@ public class HTMLConverter implements LayoutFormatter {
         {"47", "slash", "/"}, // Slash (solidus)
         {"58", "colon", ":"}, // Colon
         {"59", "semi", ";"}, // Semi colon
+        {"61", "equals", "="}, // Equals to
         {"91", "lsqb", "\\["}, // Left square bracket
         {"92", "bsol", "\\{\\\\textbackslash\\}"}, // Backslash
         {"93", "rsqb", "\\]"}, // Right square bracket
@@ -557,6 +559,8 @@ public class HTMLConverter implements LayoutFormatter {
         {"322", "lstrok", "\\{\\\\l\\}"},    // lower case l with stroke
         {"370", "Uogon", "\\{\\\\k\\{U\\}\\}"}, // capital U with ogonek
         {"371", "uogon", "\\{\\\\k\\{u\\}\\}"}, // small u with ogonek
+        {"381", "Zcaron", "\\{\\\\v\\{Z\\}\\}"}, // capital Z with caron
+        {"382", "zcaron", "\\{\\\\v\\{z\\}\\}"}, // small z with caron
         {"490", "Oogon", "\\{\\\\k\\{O\\}\\}"},    // capital letter O with ogonek
         {"491", "oogon", "\\{\\\\k\\{o\\}\\}"},    // small letter o with ogonek
         {"492", "", "\\{\\\\k\\{\\\\=\\{O\\}\\}\\}"},    // capital letter O with ogonek and macron
@@ -609,6 +613,7 @@ public class HTMLConverter implements LayoutFormatter {
         {"8542", "frac78", "\\$\\\\sfrac\\{7\\}\\{8\\}\\$"},    // Vulgar fraction seven eighths
         {"8710", "", "\\$\\\\triangle\\$"},    // Increment - could use a more appropriate symbol
         {"8714", "", "\\$\\\\in\\$"},    // Small element in
+        {"8723", "mp", "\\$\\\\mp\\$"},    // Minus-plus
         {"8729", "bullet", "\\$\\\\bullet\\$"},    // Bullet operator
         {"8758", "ratio", ":"},    // Colon/ratio
         {"8771", "sime", "\\$\\\\simeq\\$"}, // almost equal to = asymptotic to, 
@@ -617,18 +622,24 @@ public class HTMLConverter implements LayoutFormatter {
         {"", "Lt", "\\$\\\\ll\\$"}, // Much less than 
         {"8811", "gg", "\\$\\\\gg\\$"}, // Much greater than 
         {"", "Gt", "\\$\\\\gg\\$"}, // Much greater than 
+        {"8818", "lsim", "\\$\\\\lesssim\\$"}, // Less than or equivalent to
         {"8819", "gsim", "\\$\\\\gtrsim\\$"}, // Greater than or equivalent to
+        {"8862", "boxplus", "\\$\\\\boxplus\\$"}, // Boxed plus -- requires amssymb 
+        {"8863", "boxminus", "\\$\\\\boxminus\\$"}, // Boxed minus -- requires amssymb 
+        {"8864", "boxtimes", "\\$\\\\boxtimes\\$"}, // Boxed times -- requires amssymb 
         {"8882", "vltri", "\\$\\\\triangleleft\\$"}, // Left triangle
         {"8883", "vrtri", "\\$\\\\triangleright\\$"}, // Right triangle
         {"8896", "xwedge", "\\$\\\\bigwedge\\$"}, // Big wedge
         {"8897", "xvee", "\\$\\\\bigvee\\$"}, // Big vee
-        {"9426", "", "\\{\\\\copyright\\}"}, // circled small letter C
+        {"9426", "circledc", "\\{\\\\copyright\\}"}, // circled small letter C
         {"9633", "square", "\\$\\\\square\\$"}, // White square
+        {"9651", "xutri", "\\$\\\\bigtriangleup\\$"}, // White up-pointing big triangle 
         {"9653", "utri", "\\$\\\\triangle\\$"}, // White up-pointing small triangle -- \vartriangle probably
                                                 // better but requires amssymb
         {"10877", "les", "\\$\\\\leqslant\\$"},    // Less than slanted equal -- requires amssymb 
         {"10878", "ges", "\\$\\\\geqslant\\$"},    // Less than slanted equal -- requires amssymb 
-        {"119978", "Oscr", "\\$\\\\mathcal\\{O\\}\\$"} // script capital O -- possibly use \mathscr
+        {"119978", "Oscr", "\\$\\\\mathcal\\{O\\}\\$"}, // script capital O -- possibly use \mathscr
+        {"119984", "Uscr", "\\$\\\\mathcal\\{U\\}\\$"} // script capital U -- possibly use \mathscr
         
     };
     
@@ -721,6 +732,7 @@ public class HTMLConverter implements LayoutFormatter {
         private HashMap<String, String> escapedSymbols = new HashMap<String, String>();
         private HashMap<Integer, String> escapedAccents = new HashMap<Integer, String>();
         private HashMap<Integer, String> numSymbols = new HashMap<Integer, String>();
+        private HashMap<Character, String> unicodeSymbols = new HashMap<Character, String>();
         
         
 	
@@ -733,6 +745,11 @@ public class HTMLConverter implements LayoutFormatter {
                         }
                         if (conversionList[i][0].length() >= 1) {
                             numSymbols.put(Integer.decode(conversionList[i][0]) , conversionList[i][2]);
+                            if(Integer.decode(conversionList[i][0]).intValue()>128) {
+                                Character c = new Character((char) Integer.decode(conversionList[i][0]).intValue());
+                                unicodeSymbols.put(c, conversionList[i][2]);
+                                // System.err.println(Integer.decode(conversionList[i][0]).toString() + ": " + c.toString() + ": "+ conversionList[i][2]);
+                            }
                         }
                     }
                 }
@@ -741,6 +758,17 @@ public class HTMLConverter implements LayoutFormatter {
                 }
 	}
         
+    public String formatUnicode(String text) {
+        if (text == null)
+            return null;    
+        Set<Character> chars = unicodeSymbols.keySet();
+        for (Character character: chars) {
+                // System.err.println(new Integer((int) character).toString() + ": " + character.toString() + ": " + unicodeSymbols.get(character));
+        	text = text.replaceAll(character.toString(), unicodeSymbols.get(character));
+        }
+        return text;
+    };
+        
     public String format(String text) {
         if (text == null)
             return null;
@@ -749,11 +777,11 @@ public class HTMLConverter implements LayoutFormatter {
         // If the result is in text or equation form can be controlled
         // From the "Advanced settings" tab
         if(Globals.prefs.getBoolean("useConvertToEquation")) {
-            text = text.replaceAll("<sup>([^<]+)</sup>", "\\$\\^\\{$1\\}\\$");
-            text = text.replaceAll("<sub>([^<]+)</sub>", "\\$_\\{$1\\}\\$");
+            text = text.replaceAll("<[ ]?sup>([^<]+)</sup>", "\\$\\^\\{$1\\}\\$");
+            text = text.replaceAll("<[ ]?sub>([^<]+)</sub>", "\\$_\\{$1\\}\\$");
         } else {
-            text = text.replaceAll("<sup>([^<]+)</sup>", "\\\\textsuperscript\\{$1\\}");
-            text = text.replaceAll("<sub>([^<]+)</sub>", "\\\\textsubscript\\{$1\\}");
+            text = text.replaceAll("<[ ]?sup>([^<]+)</sup>", "\\\\textsuperscript\\{$1\\}");
+            text = text.replaceAll("<[ ]?sub>([^<]+)</sub>", "\\\\textsubscript\\{$1\\}");
         }
         
         // TODO: maybe rewrite this based on regular expressions instead
@@ -828,7 +856,8 @@ public class HTMLConverter implements LayoutFormatter {
         return text.trim();
     }
 
-    private final int MAX_TAG_LENGTH = 30;
+    private final int MAX_TAG_LENGTH = 100;
+    /*private final int MAX_TAG_LENGTH = 30;*/
     /*private final int MAX_CHAR_LENGTH = 10;
 
     private int readHtmlChar(String text, StringBuffer sb, int position) {
diff --git a/src/java/net/sf/jabref/imports/IEEEXploreFetcher.java b/src/java/net/sf/jabref/imports/IEEEXploreFetcher.java
index 16eea3b..cd5328d 100644
--- a/src/java/net/sf/jabref/imports/IEEEXploreFetcher.java
+++ b/src/java/net/sf/jabref/imports/IEEEXploreFetcher.java
@@ -60,6 +60,7 @@ public class IEEEXploreFetcher implements EntryFetcher {
 
     final CaseKeeperList caseKeeperList = new CaseKeeperList();
     final CaseKeeper caseKeeper = new CaseKeeper();
+    final UnitFormatter unitFormatter = new UnitFormatter();
     
     ImportInspector dialog = null;
 	OutputPrinter status;
@@ -109,7 +110,8 @@ public class IEEEXploreFetcher implements EntryFetcher {
     	CookieHandler.setDefault(cm);
         
     	fieldPatterns.put("title", "<a\\s*href=[^<]+>\\s*(.+)\\s*</a>");
-        fieldPatterns.put("author", "</h3>\\s*(.+)");
+        //fieldPatterns.put("author", "</h3>\\s*(.+)");
+        fieldPatterns.put("author", "(?s)</h3>\\s*(.+)</br>");
         fieldPatterns.put("volume", "Volume:\\s*([A-Za-z-]*\\d+)");
         fieldPatterns.put("number", "Issue:\\s*(\\d+)");
         //fieldPatterns.put("part", "Part (\\d+), (.+)");
@@ -373,9 +375,15 @@ public class IEEEXploreFetcher implements EntryFetcher {
 
             // Replace \infin with \infty
             title = title.replaceAll("\\\\infin", "\\\\infty");
+            
+            // Unit formatting
+            if (Globals.prefs.getBoolean("useUnitFormatterOnSearch")) {
+                title = unitFormatter.format(title);
+            }
+            
             // Automatic case keeping
             if (Globals.prefs.getBoolean("useCaseKeeperOnSearch")) {
-                title = caseKeeper.format(title, caseKeeperList.wordListIEEEXplore);
+                title = caseKeeper.format(title);
             }
             // Write back
             entry.setField("title", title);
@@ -387,6 +395,7 @@ public class IEEEXploreFetcher implements EntryFetcher {
 	    if (author.indexOf("a href=") >= 0) {  // Author parsing failed because it was empty
 		entry.setField("author","");  // Maybe not needed anymore due to another change
 	    } else {
+	    	author = author.replaceAll("\\s+", " ");
 	    	author = author.replaceAll("\\.", ". ");
 	    	author = author.replaceAll("([^;]+),([^;]+),([^;]+)","$1,$3,$2"); // Change order in case of Jr. etc
 	    	author = author.replaceAll("  ", " ");
diff --git a/src/java/net/sf/jabref/imports/ImportCustomizationDialog.java b/src/java/net/sf/jabref/imports/ImportCustomizationDialog.java
index ba670b9..1aeccec 100644
--- a/src/java/net/sf/jabref/imports/ImportCustomizationDialog.java
+++ b/src/java/net/sf/jabref/imports/ImportCustomizationDialog.java
@@ -191,7 +191,7 @@ public class ImportCustomizationDialog extends JDialog {
            JOptionPane.showMessageDialog(frame, Globals.lang("Could not instantiate %0 %1", importer.getName() + ":\n", exc.getMessage()));
          }
        } else {
-         JOptionPane.showMessageDialog(frame, Globals.lang("Please select an importer"));
+         JOptionPane.showMessageDialog(frame, Globals.lang("Please select an importer."));
        }
      }
     });
diff --git a/src/java/net/sf/jabref/imports/ImportFormat.java b/src/java/net/sf/jabref/imports/ImportFormat.java
index 7bc0a9c..1f13157 100644
--- a/src/java/net/sf/jabref/imports/ImportFormat.java
+++ b/src/java/net/sf/jabref/imports/ImportFormat.java
@@ -61,6 +61,8 @@ public abstract class ImportFormat implements Comparable<ImportFormat> {
      * If importing in a specified format, and null or an empty list is returned, JabRef reports
      * that no entries were found. If an IOException is thrown, JabRef displays the exception's
      * message in unmodified form.
+     *
+     * TODO the return type should be changed to "ParseResult" as the parser could use a different encoding than the default encoding
      */
     public abstract List<BibtexEntry> importEntries(InputStream in, OutputPrinter status) throws IOException;
 
diff --git a/src/java/net/sf/jabref/imports/ImportFormatReader.java b/src/java/net/sf/jabref/imports/ImportFormatReader.java
index a900eb4..b3efe58 100644
--- a/src/java/net/sf/jabref/imports/ImportFormatReader.java
+++ b/src/java/net/sf/jabref/imports/ImportFormatReader.java
@@ -58,6 +58,7 @@ public class ImportFormatReader {
     formats.add(new PdfXmpImporter());
     formats.add(new CopacImporter());
     formats.add(new MsBibImporter());
+    formats.add(new BibtexImporter());
 
     /**
      * Get import formats that are plug-ins
diff --git a/src/java/net/sf/jabref/imports/ImportMenuItem.java b/src/java/net/sf/jabref/imports/ImportMenuItem.java
index c3009d7..d00ff48 100644
--- a/src/java/net/sf/jabref/imports/ImportMenuItem.java
+++ b/src/java/net/sf/jabref/imports/ImportMenuItem.java
@@ -28,7 +28,6 @@ import javax.swing.JMenuItem;
 import javax.swing.JOptionPane;
 
 import net.sf.jabref.*;
-import net.sf.jabref.external.DroppedFileHandler;
 import net.sf.jabref.gui.ImportInspectionDialog;
 import net.sf.jabref.gui.FileDialogs;
 import net.sf.jabref.labelPattern.LabelPatternUtil;
@@ -231,9 +230,6 @@ public class ImportMenuItem extends JMenuItem implements ActionListener {
                                         LabelPatternUtil.makeLabel(bibtexResult.getMetaData(), toAddTo, entry);
                                         //System.out.println("gen:"+entry.getCiteKey());
                                     }
-                                    // Let the autocompleters, if any, harvest words from the entry: 
-                                    Util.updateCompletersForEntry(panel.getAutoCompleters(), entry);
-
                                     ce.addEdit(new UndoableInsertEntry(toAddTo, entry, panel));
                                 }
                             } catch (KeyCollisionException e) {
diff --git a/src/java/net/sf/jabref/imports/JSTORFetcher2.java b/src/java/net/sf/jabref/imports/JSTORFetcher2.java
index 99079e0..c1c2da9 100644
--- a/src/java/net/sf/jabref/imports/JSTORFetcher2.java
+++ b/src/java/net/sf/jabref/imports/JSTORFetcher2.java
@@ -42,8 +42,12 @@ public class JSTORFetcher2 implements EntryFetcher {
     protected static final String SEARCH_URL = JSTOR_URL + "/action/doBasicSearch?Query=";
     protected static final String SEARCH_URL_END = "&x=0&y=0&wc=on";
     protected static final String SINGLE_CIT_ENC =
-            "http://www.jstor.org/action/exportSingleCitation?singleCitation=true&suffix=";
-            //"http%3A%2F%2Fwww.jstor.org%2Faction%2FexportSingleCitation%3FsingleCitation"
+            //"http://www.jstor.org/action/exportSingleCitation?singleCitation=true&suffix=";
+            "http://www.jstor.org/action/exportSingleCitation?singleCitation=true&doi=10.2307/";
+    // suffix doesn't work anymore (March 2013), changed to doi=10.2307/citations but only if it a doi
+    // to be improved...
+
+    //"http%3A%2F%2Fwww.jstor.org%2Faction%2FexportSingleCitation%3FsingleCitation"
             //+"%3Dtrue%26suffix%3D";
     protected static final Pattern idPattern = Pattern.compile(
             "<a class=\"title\" href=\"/stable/(\\d+)\\?");
diff --git a/src/java/net/sf/jabref/imports/MedlineFetcher.java b/src/java/net/sf/jabref/imports/MedlineFetcher.java
index 64d7bf6..0ca4c4e 100644
--- a/src/java/net/sf/jabref/imports/MedlineFetcher.java
+++ b/src/java/net/sf/jabref/imports/MedlineFetcher.java
@@ -234,8 +234,8 @@ public class MedlineFetcher implements EntryFetcher {
             }
             return true;
         }
-        frame.showMessage(Globals
-            .lang("Please enter a comma separated list of Medline IDs (numbers) or search terms."),
+        frame.showMessage(
+            Globals.lang("Please enter a comma separated list of Medline IDs (numbers) or search terms."),
             Globals.lang("Input error"), JOptionPane.ERROR_MESSAGE);
         return false;
     }
diff --git a/src/java/net/sf/jabref/imports/MedlineHandler.java b/src/java/net/sf/jabref/imports/MedlineHandler.java
index db02400..05d6451 100644
--- a/src/java/net/sf/jabref/imports/MedlineHandler.java
+++ b/src/java/net/sf/jabref/imports/MedlineHandler.java
@@ -27,6 +27,7 @@ import org.xml.sax.helpers.DefaultHandler;
 
 public class MedlineHandler extends DefaultHandler
 {
+    static HTMLConverter htmlConverter = new HTMLConverter();
     ArrayList<BibtexEntry> bibitems= new ArrayList<BibtexEntry>();
     boolean inTitle=false,			inYear = false,
 		inJournal = false,			inMonth = false,
@@ -169,10 +170,12 @@ public class MedlineHandler extends DefaultHandler
 			BibtexEntry b=new BibtexEntry(Util.createNeutralId(),//Globals.DEFAULT_BIBTEXENTRY_ID,
 										  Globals.getEntryType("article")); // id assumes an existing database so don't create one here
 			if (!author.equals("")) { 
-			    b.setField("author",ImportFormatReader.expandAuthorInitials(author));
+			    b.setField("author",htmlConverter.formatUnicode(ImportFormatReader.expandAuthorInitials(author)));
+			    // b.setField("author",Util.replaceSpecialCharacters(ImportFormatReader.expandAuthorInitials(author)));
 			    author = "";
 			}
-			if (!title.equals("")) b.setField("title",title);
+			if (!title.equals("")) b.setField("title",htmlConverter.formatUnicode(title));
+			// if (!title.equals("")) b.setField("title",Util.replaceSpecialCharacters(title));
 			if (!journal.equals("")) b.setField("journal",journal);
 			if (!year.equals("")) b.setField("year",year);
                         // PENDING jeffrey.kuhn at yale.edu 2005-05-27 : added call to fixPageRange
diff --git a/src/java/net/sf/jabref/imports/UnitFormatter.java b/src/java/net/sf/jabref/imports/UnitFormatter.java
new file mode 100644
index 0000000..8ea8ce0
--- /dev/null
+++ b/src/java/net/sf/jabref/imports/UnitFormatter.java
@@ -0,0 +1,142 @@
+/*  Copyright (C) 2012 JabRef contributors.
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+package net.sf.jabref.imports;
+
+import java.util.Arrays;
+
+import net.sf.jabref.export.layout.LayoutFormatter;
+
+public class UnitFormatter implements LayoutFormatter {
+    
+    private String[] unitList = new String[] {
+        "A",  // Ampere
+        "Ah",  // Ampere hours
+        "B", // Byte
+        "Bq", // Bequerel
+        "C", // Coulomb
+        "F",  // Farad
+        "Gy",  // Gray
+        "H",  // Henry
+        "Hz", // Hertz
+        "J", // Joule
+        "K", // Kelvin
+        "N", // Newton
+        "\\$\\\\Omega\\$", // Ohm
+        "Pa", // Pascal
+        "S", // Siemens, Samples
+        "Sa", // Samples
+        "Sv",  // Sv
+        "T", // Tesla
+        "V", // Volt
+        "VA", // Volt ampere
+        "W",  // Watt
+        "Wb", // Weber
+        "Wh",  // Watt hours
+        "bar", // bar
+        "b",  // bit
+        "cd", // candela
+        "dB",  // decibel
+        "dBm", // decibel
+        "dBc",  //decibel
+        "eV",  // electron volts
+        "inch", // inch
+        "kat", // katal
+        "lm",  // lumen
+        "lx",  // lux
+        "m",  // meters
+        "mol", // mol
+        "rad",  // radians
+        "s",  // seconds
+        "sr", // steradians
+    };
+    
+    private String[] unitPrefixList = new String[] {
+        "y", // yocto
+        "z", // zepto
+        "a", // atto
+        "f", // femto
+        "p", // pico
+        "n", // nano
+        "\\$\\\\mu\\$", // micro
+        "u",  // micro
+        "m",  // milli
+        "c",  // centi
+        "d",  // deci
+        "",  // no prefix
+        "da",  // deca
+        "h",  // hekto
+        "k",  // kilo
+        "M",  // mega
+        "G",  // giga
+        "T",  // tera
+        "P",  // peta
+        "E",  // exa
+        "Z", // zetta
+        "Y", // yotta
+    };
+    
+    private String[] unitCombinations;
+    
+    public UnitFormatter() {
+	super();
+        int uLLength = unitList.length;
+        int uPLLength = unitPrefixList.length;
+        int uCLength = uLLength*uPLLength;
+        unitCombinations = new String[uCLength];
+        for(int i = 0; i < uLLength; i++) {
+            for(int j = 0; j < uPLLength; j++) {
+                unitCombinations[i*uPLLength+j] = unitPrefixList[j] + unitList[i];
+            }
+        }
+        
+    }
+    
+    public String format(String text, String [] listOfWords) {
+	if (text == null) {
+	    return null;
+        }
+        
+        Arrays.sort(listOfWords, new LengthComparator());  // LengthComparator from CaseKeeper.java
+        
+        // Replace the hyphen in 12-bit etc with a non-breaking hyphen, will also avoid bad casing of 12-Bit
+        text = text.replaceAll("([0-9,\\.]+)-([Bb][Ii][Tt])","$1\\\\mbox\\{-\\}$2");
+        
+        // Replace the space in 12 bit etc with a non-breaking space, will also avoid bad casing of 12 Bit
+        text = text.replaceAll("([0-9,\\.]+) ([Bb][Ii][Tt])","$1~$2");
+        
+        // For each word in the list
+	for (int i = 0; i < listOfWords.length; i++) {
+            // Add {} if the character before is a space, -, /, (, [, or } or if it is at the start of the string but not if it is followed by a }
+	    text = text.replaceAll("([0-9])("+listOfWords[i]+")","$1\\{$2\\}"); // Only add brackets to keep case
+            text = text.replaceAll("([0-9])-("+listOfWords[i]+")","$1\\\\mbox\\{-\\}\\{$2\\}"); // Replace hyphen with non-break hyphen
+            text = text.replaceAll("([0-9]) ("+listOfWords[i]+")","$1~\\{$2\\}"); // Replace space with a hard space
+            
+	}
+        
+        return text;
+    }
+    
+
+    public String format(String text) {
+	if (text == null) {
+	    return null;
+        }
+        return this.format(text,unitCombinations);
+    }
+    
+
+}
+
diff --git a/src/java/net/sf/jabref/imports/fetcher/ISBNtoBibTeXFetcher.java b/src/java/net/sf/jabref/imports/fetcher/ISBNtoBibTeXFetcher.java
index 269b7bd..5980e3f 100644
--- a/src/java/net/sf/jabref/imports/fetcher/ISBNtoBibTeXFetcher.java
+++ b/src/java/net/sf/jabref/imports/fetcher/ISBNtoBibTeXFetcher.java
@@ -33,6 +33,7 @@ import net.sf.jabref.imports.BibtexParser;
 import net.sf.jabref.imports.CaseKeeper;
 import net.sf.jabref.imports.EntryFetcher;
 import net.sf.jabref.imports.ImportInspector;
+import net.sf.jabref.imports.UnitFormatter;
 
 /**
  * This class uses Manas Tungare's ISBN to BibTeX Converter to convert an ISBN to a BibTeX entry <br />
@@ -42,6 +43,7 @@ public class ISBNtoBibTeXFetcher implements EntryFetcher {
 	
 	private static final String URL_PATTERN = "http://manas.tungare.name/software/isbn-to-bibtex/isbn-service?isbn=%s"; 
         final CaseKeeper caseKeeper = new CaseKeeper();
+        final UnitFormatter unitFormatter = new UnitFormatter();
    
 	@Override
     public void stopFetching() {
@@ -97,7 +99,13 @@ public class ISBNtoBibTeXFetcher implements EntryFetcher {
         if(entry != null)  {
             // Optionally add curly brackets around key words to keep the case
             String title = (String)entry.getField("title");
-            if (title != null) {
+            if (title != null) {           
+                // Unit formatting
+                if (Globals.prefs.getBoolean("useUnitFormatterOnSearch")) {
+                    title = unitFormatter.format(title);
+                }
+            
+                // Case keeping
                 if (Globals.prefs.getBoolean("useCaseKeeperOnSearch")) {
                     title = caseKeeper.format(title);
                 }
diff --git a/src/java/net/sf/jabref/labelPattern/LabelPatternUtil.java b/src/java/net/sf/jabref/labelPattern/LabelPatternUtil.java
index d83273a..e02eaca 100644
--- a/src/java/net/sf/jabref/labelPattern/LabelPatternUtil.java
+++ b/src/java/net/sf/jabref/labelPattern/LabelPatternUtil.java
@@ -19,8 +19,11 @@ import java.util.ArrayList;
 import java.util.StringTokenizer;
 import java.util.Arrays;
 import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 import net.sf.jabref.*;
+import net.sf.jabref.AuthorList.Author;
 import net.sf.jabref.export.layout.format.RemoveLatexCommands;
 
 /**
@@ -46,6 +49,304 @@ public class LabelPatternUtil {
     public static void updateDefaultPattern() {
         DEFAULT_LABELPATTERN = split(JabRefPreferences.getInstance().get("defaultLabelPattern"));
     }
+    
+    /**
+     * Required fro LabelPatternUtilTest
+     * 
+     * @param db the DB to use as global database
+     */
+    public static void setDataBase(BibtexDatabase db) {
+    	_db = db;
+    }
+
+    private static String normalize(String content) {
+        List<String> tokens = new ArrayList<String>();
+        int b = 0;
+        String and = "";
+        String token = "";
+        for (int p=0; p<content.length(); p++) {
+            if (b == 0) {
+                if (and.equals("") && content.charAt(p) == 'a'
+                        || and.equals("a") && content.charAt(p) == 'n'
+                        || and.equals("an") && content.charAt(p) == 'd') {
+                    and += content.charAt(p);
+                } else if (and.equals("and") && content.charAt(p) == ' ') {
+                    and = "";
+                    tokens.add(token.trim());
+                    token = "";
+                } else {
+                    if (content.charAt(p) == '{') b++;
+                    if (content.charAt(p) == '}') b--;
+                    token += and;
+                    and = "";
+                    token += content.charAt(p);
+                }
+            } else {
+                token += content.charAt(p);
+            }
+        }
+        tokens.add(token);
+        StringBuilder normalized = new StringBuilder("");
+
+        for (int i=0; i<tokens.size(); i++) {
+            if (i>0)
+                normalized.append(" and ");
+
+            normalized.append(isInsitution(tokens.get(i))
+                    ? generateInstitutionKey(tokens.get(i))
+                            : removeDiacritics(tokens.get(i)));
+        }
+        return normalized.toString();
+    }
+
+    /**
+     * Will remove diacritics from the content.
+     *
+     * Replaces umlaut: \"x with xe, e.g. \"o -> oe, \"u -> ue, etc.
+     * Removes all other diacritics: \?x -> x, e.g. \'a -> a, etc.
+     *
+     * @param content The content.
+     * @return The content without diacritics.
+     */
+    private static String removeDiacritics(String content) {
+        if (content == null) return null;
+
+        // Replace umaut with '?e'
+        content = content.replaceAll("\\{\\\\\"([a-zA-Z])\\}","$1e");
+        content = content.replaceAll("\\\\\"\\{([a-zA-Z])\\}","$1e");
+        content = content.replaceAll("\\\\\"([a-zA-Z])","$1e");
+        // Remove diacritics
+        content = content.replaceAll("\\{\\\\.([a-zA-Z])\\}","$1");
+        content = content.replaceAll("\\\\.\\{([a-zA-Z])\\}","$1");
+        content = content.replaceAll("\\\\.([a-zA-Z])","$1");
+        return content;
+    }
+
+    /**
+     * Unifies umlauts.
+     *
+     * Replaces: $\ddot{\mathrm{X}}$ (an alternative umlaut) with: {\"X}
+     * Replaces: \?{X} and \?X with {\?X}, where ? is a diacritic symbol
+     *
+     * @param content The content.
+     * @return The content with unified diacritics.
+     */
+    private static String unifyDiacritics(String content) {
+        if (content == null) return null;
+        return content.replaceAll(
+                "\\$\\\\ddot\\{\\\\mathrm\\{([^\\}])\\}\\}\\$",
+                "{\\\"$1}").replaceAll(
+                        "(\\\\[^\\-a-zA-Z])\\{?([a-zA-Z])\\}?",
+                        "{$1$2}");
+    }
+
+    /**
+     * Check if a value is institution.
+     *
+     * This is usable for distinguishing between persons and institutions in
+     * the author or editor fields.
+     *
+     * A person:
+     *   - "John Doe"
+     *   - "Doe, John"
+     *
+     * An institution:
+     *   - "{The Big Company or Institution Inc.}"
+     *   - "{The Big Company or Institution Inc. (BCI)}"
+     *
+     * @param author Author or editor.
+     * @return True if the author or editor is an institution.
+     */
+    private static boolean isInsitution(String author) {
+        Author a = AuthorList.getAuthorList(author).getAuthor(0);
+        return author.charAt(0) == '{'
+                && author.charAt(author.length()-1) == '}';
+    }
+
+    /**
+	 * <p>
+	 * An author or editor may be and institution not a person. In that case the
+	 * key generator builds very long keys, e.g.: for “The Attributed
+	 * Graph Grammar System (AGG)” ->
+	 * “TheAttributedGraphGrammarSystemAGG”.
+	 * </p>
+	 * 
+	 * <p>
+	 * An institution name should be inside <code>{}</code> brackets. If the
+	 * institution name also includes its abbreviation this abbreviation should
+	 * be also in <code>{}</code> brackets. For the previous example the value
+	 * should look like:
+	 * <code>{The Attributed Graph Grammar System ({AGG})}</code>.
+	 * </p>
+	 * 
+	 * <p>
+	 * If an institution includes its abbreviation, i.e. "...({XYZ})", first
+	 * such abbreviation should be used as the key value part of such author.
+	 * </p>
+	 * 
+	 * <p>
+	 * If an institution does not include its abbreviation the key should be
+	 * generated form its name in the following way:
+	 * </p>
+	 * 
+	 * <p>
+	 * The institution value can contain: institution name, part of the
+	 * institution, address, etc. Those information should be separated by
+	 * comma. Name of the institution and possible part of the institution
+	 * should be on the beginning, while address and secondary information
+	 * should be on the end.
+	 * </p>
+	 * 
+	 * Each part is examined separately:
+	 * <ol>
+	 * <li>We remove all tokens of a part which are one of the defined ignore
+	 * words (the, press), which end with a dot (ltd., co., ...) and which first
+	 * character is lowercase (of, on, di, ...).</li>
+	 * <li>We detect a type of the part: university, technology institute,
+	 * department, school, rest
+	 * <ul>
+	 * <li>University: <code>"Uni[NameOfTheUniversity]"</code></li>
+	 * <li>Department: will be an abbreviation of all words beginning with the
+	 * uppercase letter except of words: <code>d[ei]part.*</code>, school,
+	 * faculty</li>
+	 * <li>School: same as department</li>
+	 * <li>Rest: If there are less than 3 tokens in such part than the result
+	 * will be by concatenating those tokens, otherwise the result will be build
+	 * from the first letters of words starting with and uppercase letter.</li>
+	 * </ul>
+	 * </ol>
+	 * 
+	 * Parts are concatenated together in the following way:
+	 * <ul>
+	 * <li>If there is a university part use it otherwise use the rest part.</li>
+	 * <li>If there is a school part append it.</li>
+	 * <li>If there is a department part and it is not same as school part
+	 * append it.</li>
+	 * </ul>
+	 * 
+	 * Rest part is only the first part which do not match any other type. All
+	 * other parts (address, ...) are ignored.
+	 * 
+	 * @param content the institution to generate a Bibtex key for
+	 * @return <ul>
+	 *         <li>the institutation key</li>
+	 *         <li>"" in the case of a failure</li>
+	 *         <li>null if content is null</li>
+	 *         </ul>
+	 */
+    private static String generateInstitutionKey(String content) {
+        if (content == null) return null;
+        content = unifyDiacritics(content);
+        List<String> ignore = Arrays.asList(new String[]{ "press", "the" });
+        content = content.replaceAll("^\\{", "").replaceAll("\\}$", "");
+        Pattern regex = Pattern.compile(".*\\(\\{([A-Z]+)\\}\\).*");
+        Matcher matcher = regex.matcher(content);
+        if (matcher.matches())
+            return matcher.group(1);
+
+        content = removeDiacritics(content);
+        String[] parts = content.split(",");
+
+        // Key parts
+        String university = null;
+        String department = null;
+        String school     = null;
+        String rest       = null;
+
+        for(int index=0; index<parts.length; index++) {
+            List<String> part = new ArrayList<String>();
+
+            // Cleanup: remove unnecessary words.
+            for(String k : parts[index].replaceAll("\\{[A-Z]+\\}", "").split("[ \\-_]")) {
+                if ( !k.equals("") // remove empty
+                        && !ignore.contains(k.toLowerCase()) // remove ignored words
+                        && k.charAt(k.length()-1) != '.' // remove ltd., co., ...
+                        && (k.charAt(0)+"").matches("[A-Z]") // remove of, di, ...
+                        || k.length()>=3 && k.toLowerCase().substring(0, 2).equals("uni")) {
+                    part.add(k);
+                }
+            }
+
+            boolean isUniversity = false; // university
+            boolean isTechnology = false; // technology institute
+            boolean isDepartment = false; // departments
+            boolean isSchool     = false; // schools
+
+            // Deciding about a part type...
+            for (String k : part) {
+                if (k.length()>=5 && k.toLowerCase().substring(0, 5).equals("univ"))
+                    isUniversity = true;
+                if (k.length()>=6 && k.toLowerCase().substring(0, 6).equals("techn"))
+                    isTechnology = true;
+                if (k.toLowerCase().equals("school"))
+                    isSchool = true;
+                if (k.length()>=7 && k.toLowerCase().substring(0, 7).matches("d[ei]part")
+                        || k.length()>=4 && k.toLowerCase().substring(0, 4).equals("lab"))
+                    isDepartment = true;
+            }
+            if (isTechnology) isUniversity = false; // technology institute isn't university :-)
+
+            // University part looks like: Uni[NameOfTheUniversity]
+            //
+            // If university is detected than the previous part is suggested
+            // as department
+            if (isUniversity) {
+                university = "Uni";
+                for (String k : part) {
+                    if (k.length()>=5 && !k.toLowerCase().substring(0, 5).equals("univ"))
+                        university += k;
+                }
+                if (index > 0 && department == null)
+                    department = parts[index-1];
+
+            // School is an abbreviation of all the words beginning with a
+            // capital letter excluding: department, school and faculty words.
+            //
+            // Explicitly defined department part is build the same way as
+            // school
+            } else if (isSchool || isDepartment) {
+                if (isSchool)
+                    school = "";
+                if (isDepartment)
+                    department = "";
+
+                for (String k : part) {
+                    if (k.length()>=7 && !k.toLowerCase().substring(0, 7).matches("d[ei]part")
+                            && !k.toLowerCase().equals("school")
+                            && !k.toLowerCase().equals("faculty")
+                            && !k.replaceAll("[^A-Z]", "").equals("")) {
+                        if (isSchool)
+                            school += k.replaceAll("[^A-Z]", "");
+                        if (isDepartment)
+                            department += k.replaceAll("[^A-Z]", "");
+                    }
+                }
+            // A part not matching university, department nor school.
+            } else if (rest == null) {
+                rest = "";
+                // Less than 3 parts -> concatenate those
+                if (part.size() < 3) {
+                    for (String k : part)
+                        rest += k;
+                // More than 3 parts -> use 1st letter abbreviation
+                } else {
+                    for (String k : part) {
+                        k = k.replaceAll("[^A-Z]", "");
+                        if (!k.equals(""))
+                            rest += k;
+                    }
+                }
+            }
+        }
+
+        // Putting parts together.
+        String result = (university==null ? rest : university)
+                + (school == null ? "" : school)
+                + ((department == null
+                    || (school != null && department.equals(school))) ?
+                            "" : department);
+        return result;
+    }
 
     /**
      * This method takes a string of the form [field1]spacer[field2]spacer[field3]...,
@@ -110,9 +411,9 @@ public class LabelPatternUtil {
     /**
      * Generates a BibTeX label according to the pattern for a given entry type, and
      * returns the <code>Bibtexentry</code> with the unique label.
-     * 
+     *
      * The given database is used to avoid duplicate keys.
-     * 
+     *
      * @param database a <code>BibtexDatabase</code>
      * @param _entry a <code>BibtexEntry</code>
      * @return modified Bibtexentry
@@ -274,8 +575,7 @@ public class LabelPatternUtil {
                         return modifier.substring(1, modifier.length()-1);
 
                 } else {
-                    Globals
-                        .logger("Key generator warning: unknown modifier '"
+                    Globals.logger("Key generator warning: unknown modifier '"
                             + modifier + "'.");
                 }
             }
@@ -298,6 +598,8 @@ public class LabelPatternUtil {
                  * substitution of editor.
                  */
                 String authString = _entry.getField("author");
+                if (authString != null)
+                    authString = normalize(_db.resolveForStrings(authString));
 
                 if (val.startsWith("pure")) {
                     // remove the "pure" prefix so the remaining
@@ -306,6 +608,9 @@ public class LabelPatternUtil {
                 } else {
                     if (authString == null || authString.equals("")) {
                         authString = _entry.getField("editor");
+                        if (authString != null)
+                            authString = normalize(
+                                    _db.resolveForStrings(authString));
                     }
                 }
 
@@ -313,6 +618,8 @@ public class LabelPatternUtil {
                 // have to check all the time.
                 if (val.equals("auth")) {
                     return firstAuthor(authString);
+                } else if (val.equals("authForeIni")) {
+                	return firstAuthorForenameInitials(authString);
                 } else if (val.equals("authors")) {
                     return allAuthors(authString);
                 } else if (val.equals("authorsAlpha")) {
@@ -321,6 +628,8 @@ public class LabelPatternUtil {
                 // Last author's last name
                 else if (val.equals("authorLast")) {
                     return lastAuthor(authString);
+                } else if (val.equals("authorLastForeIni")) {
+                	return lastAuthorForenameInitials(authString);
                 } else if (val.equals("authorIni")) {
                     String s = oneAuthorPlusIni(authString);
                     return s == null ? "" : s;
@@ -332,7 +641,10 @@ public class LabelPatternUtil {
                     String s = authAuthEa(authString);
                     return s == null ? "" : s;
                 } else if (val.equals("auth.etal")) {
-                    String s = authEtal(authString);
+                    String s = authEtal(authString, ".", ".etal");
+                    return s == null ? "" : s;
+                } else if (val.equals("authEtAl")) {
+                    String s = authEtal(authString, "", "EtAl");
                     return s == null ? "" : s;
                 } else if (val.equals("authshort")) {
                     String s = authshort(authString);
@@ -367,11 +679,15 @@ public class LabelPatternUtil {
                 // don't have to check all the time.
                 if (val.equals("edtr")) {
                     return firstAuthor(_entry.getField("editor").toString());
+                } else if (val.equals("edtrForeIni")) {
+                	return firstAuthorForenameInitials(_entry.getField("editor").toString());
                 } else if (val.equals("editors")) {
                     return allAuthors(_entry.getField("editor").toString());
                 // Last author's last name
                 } else if (val.equals("editorLast")) {
                     return lastAuthor(_entry.getField("editor").toString());
+                } else if (val.equals("editorLastForeIni")) {
+                	return lastAuthorForenameInitials(_entry.getField("editor").toString());
                 } else if (val.equals("editorIni")) {
                     String s = oneAuthorPlusIni(_entry.getField("editor")
                         .toString());
@@ -525,10 +841,14 @@ public class LabelPatternUtil {
 
     /**
      * Tests whether a given label is unique.
+     * 
+     * This method is private as it is currently used nowhere.
+     * The issue with this method is that it uses the global variable "_db", which might be undefined when calling the method.
+     *
      * @param label a <code>String</code>
      * @return <code>true</code> if and only if the <code>label</code> is unique
      */
-    public static boolean isLabelUnique(String label) {
+    private static boolean isLabelUnique(String label) {
         boolean _isUnique = true;
         BibtexEntry _entry;
         int _dbSize = _db.getEntryCount();
@@ -572,6 +892,25 @@ public class LabelPatternUtil {
         return s != null ? s : "";
 
     }
+    
+    /**
+     * Gets the first name initals of the first author/editor
+     * 
+     * @param authorField
+     *            a <code>String</code>
+     * @return the first name initial of an author/editor or "" if no author was found
+     *    This method is guaranteed to never return null.
+     * 
+     * @throws NullPointerException
+     *             if authorField == null
+     */
+    public static String firstAuthorForenameInitials(String authorField) {
+        AuthorList al = AuthorList.getAuthorList(authorField);
+        if (al.size() == 0)
+            return "";
+        String s = al.getAuthor(0).getFirstAbbr();
+        return s != null ? s.substring(0,1) : "";
+    }
 
     /**
      * Gets the von part and the last name of the first author/editor
@@ -616,6 +955,25 @@ public class LabelPatternUtil {
     }
 
     /**
+     * Gets the forename initals of the last author/editor
+     * 
+     * @param authorField
+     *            a <code>String</code>
+     * @return the forename initial of an author/editor or "" if no author was found
+     *    This method is guaranteed to never return null.
+     * 
+     * @throws NullPointerException
+     *             if authorField == null
+     */
+    public static String lastAuthorForenameInitials(String authorField) {
+        AuthorList al = AuthorList.getAuthorList(authorField);
+        if (al.size() == 0)
+            return "";
+        String s = al.getAuthor(al.size()-1).getFirstAbbr();
+        return s != null ? s.substring(0,1) : "";
+    }
+
+    /**
      * Gets the last name of all authors/editors
      * @param authorField a <code>String</code>
      * @return the sur name of all authors/editors
@@ -755,14 +1113,20 @@ public class LabelPatternUtil {
     }
 
     /**
-     * auth.etal format:
+     * auth.etal, authEtAl, ... format:
      * Isaac Newton and James Maxwell and Albert Einstein (1960)
      * Isaac Newton and James Maxwell (1960)
-     *  give:
+     *
+     *  auth.etal give (delim=".", append=".etal"):
      * Newton.etal
      * Newton.Maxwell
+     *
+     *  authEtAl give (delim="", append="EtAl"):
+     * NewtonEtAl
+     * NewtonMaxwell
      */
-    private static String authEtal(String authorField) {
+    private static String authEtal(String authorField, String delim,
+            String append) {
         authorField = AuthorList.fixAuthorForAlphabetization(authorField);
         StringBuffer author = new StringBuffer();
 
@@ -772,9 +1136,9 @@ public class LabelPatternUtil {
         }
         author.append((tokens[0].split(","))[0]);
         if (tokens.length == 2)
-            author.append(".").append((tokens[1].split(","))[0]);
+            author.append(delim).append((tokens[1].split(","))[0]);
         else if (tokens.length > 2)
-            author.append(".etal");
+            author.append(append);
 
         return author.toString();
     }
@@ -957,7 +1321,7 @@ public class LabelPatternUtil {
             return String.valueOf(result);
     }
 
-    /**
+    	/**
          * Parse a field marker with modifiers, possibly containing a parenthesised modifier,
          * as well as escaped colons and parentheses.
          * @param arg The argument string.
diff --git a/src/java/net/sf/jabref/oo/OpenOfficePanel.java b/src/java/net/sf/jabref/oo/OpenOfficePanel.java
index bbfe565..0ee35d7 100644
--- a/src/java/net/sf/jabref/oo/OpenOfficePanel.java
+++ b/src/java/net/sf/jabref/oo/OpenOfficePanel.java
@@ -36,6 +36,7 @@ import java.net.URLClassLoader;
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.Map;
+import java.util.prefs.BackingStoreException;
 
 /**
  * This test panel can be opened by reflection from JabRef, passing the JabRefFrame as an
@@ -515,11 +516,6 @@ public class OpenOfficePanel extends AbstractWorker implements SidePanePlugin, P
             }
         }
 
-        //String unoilDir = "/opt/openoffice.org/basis3.0/program/classes";
-        //String ooBaseDirectory = Globals.prefs.get("ooJarsPath");//"/usr/share/java/openoffice";
-        //String sOffice = Globals.prefs.get("ooExecutablePath");
-        //System.getProperty( "os.name" ).startsWith( "Windows" ) ? "soffice.exe" : "soffice";
-
         // Add OO jars to the classpath:
         try {
             File[] jarFiles = new File[] {
@@ -850,6 +846,8 @@ public class OpenOfficePanel extends AbstractWorker implements SidePanePlugin, P
                 (Globals.lang("Look up BibTeX entries in the active tab only"));
         final JRadioButtonMenuItem useAllBases = new JRadioButtonMenuItem
                 (Globals.lang("Look up BibTeX entries in all open databases"));
+        final JMenuItem clearConnectionSettings = new JMenuItem
+                (Globals.lang("Clear connection settings"));
         ButtonGroup bg = new ButtonGroup();
         bg.add(useActiveBase);
         bg.add(useAllBases);
@@ -873,10 +871,29 @@ public class OpenOfficePanel extends AbstractWorker implements SidePanePlugin, P
                 Globals.prefs.putBoolean("useAllOpenBases", !useActiveBase.isSelected());
             }
         });
+        clearConnectionSettings.addActionListener(new ActionListener() {
+            public void actionPerformed(ActionEvent actionEvent) {
+                try {
+                    Globals.prefs.clear("ooPAth");
+                    Globals.prefs.clear("ooExecutablePath");
+                    Globals.prefs.clear("ooJarsPath");
+                    Globals.prefs.clear("connectToOO3");
+                    Globals.prefs.clear("ooUnoilPath");
+                    Globals.prefs.clear("ooJurtPath");
+                    frame.output(Globals.lang("Cleared connection settings."));
+                } catch (BackingStoreException ex) {
+                    ex.printStackTrace();
+                }
+            }
+        });
+
+
         menu.add(autoSync);
         menu.addSeparator();
         menu.add(useActiveBase);
         menu.add(useAllBases);
+        menu.addSeparator();
+        menu.add(clearConnectionSettings);
         menu.show(settingsB, 0, settingsB.getHeight());
     }
 
diff --git a/src/java/net/sf/jabref/plugin/PluginCore.java b/src/java/net/sf/jabref/plugin/PluginCore.java
index 7d1cca9..9acdf8c 100644
--- a/src/java/net/sf/jabref/plugin/PluginCore.java
+++ b/src/java/net/sf/jabref/plugin/PluginCore.java
@@ -153,8 +153,8 @@ public class PluginCore {
 
             if (plugins.size() <= 0) {
                 log
-                    .warning(Globals
-                        .lang("No plugins were found in the following folders:") +
+                    .warning(
+                        Globals.lang("No plugins were found in the following folders:") +
                         "\n  " +
                         Util.join(directoriesToSearch
                             .toArray(new String[directoriesToSearch.size()]),
@@ -165,8 +165,7 @@ public class PluginCore {
                         Util.join(jarLocationsToSearch, "\n  ", 0,
                             jarLocationsToSearch.length) +
                         "\n" +
-                        Globals
-                            .lang("At least the plug-in 'net.sf.jabref.core' should be there."));
+                        Globals.lang("At least the plug-in 'net.sf.jabref.core' should be there."));
             } else {
                 result.publishPlugins(plugins.toArray(new PluginLocation[] {}));
 
@@ -188,8 +187,7 @@ public class PluginCore {
 
         } catch (Exception e) {
             log
-                .severe(Globals
-                    .lang("Error in starting plug-in system. Starting without, but some functionality may be missing.") +
+                .severe(Globals.lang("Error in starting plug-in system. Starting without, but some functionality may be missing.") +
                     "\n" + e.getLocalizedMessage());
         }
         return result;
diff --git a/src/java/net/sf/jabref/sql/DBConnectDialog.java b/src/java/net/sf/jabref/sql/DBConnectDialog.java
index 55dea4f..426ef64 100644
--- a/src/java/net/sf/jabref/sql/DBConnectDialog.java
+++ b/src/java/net/sf/jabref/sql/DBConnectDialog.java
@@ -64,7 +64,7 @@ public class DBConnectDialog extends JDialog {
     /** Creates a new instance of DBConnectDialog */
     public DBConnectDialog( JFrame parent, DBStrings dbs) {
 
-        super(parent, Globals.lang("Connect to SQL Database"), true);
+        super(parent, Globals.lang("Connect to SQL database"), true);
 
         this.setResizable(false);
         this.setLocationRelativeTo(parent);
diff --git a/src/java/net/sf/jabref/undo/UndoableFieldChange.java b/src/java/net/sf/jabref/undo/UndoableFieldChange.java
index 813018d..fc7c8ee 100644
--- a/src/java/net/sf/jabref/undo/UndoableFieldChange.java
+++ b/src/java/net/sf/jabref/undo/UndoableFieldChange.java
@@ -18,6 +18,7 @@ package net.sf.jabref.undo;
 import javax.swing.undo.AbstractUndoableEdit;
 
 import net.sf.jabref.BibtexEntry;
+import net.sf.jabref.Globals;
 import net.sf.jabref.Util;
 
 /**
@@ -39,12 +40,19 @@ public class UndoableFieldChange extends AbstractUndoableEdit {
 	this.newValue = newValue;
     }
 
+    @Override
+    public String getPresentationName() {
+        return Globals.lang("change field");
+    }
+
+    @Override
     public String getUndoPresentationName() {
-	return "Undo: change field";
+    return Globals.lang("Undo")+": "+Globals.lang("change field");
     }
 
+    @Override
     public String getRedoPresentationName() {
-	return "Redo: change field";
+    return Globals.lang("Redo")+": "+Globals.lang("change field");
     }
 
     public void undo() {
diff --git a/src/java/net/sf/jabref/undo/UndoableKeyChange.java b/src/java/net/sf/jabref/undo/UndoableKeyChange.java
index 0a23829..1c7d889 100644
--- a/src/java/net/sf/jabref/undo/UndoableKeyChange.java
+++ b/src/java/net/sf/jabref/undo/UndoableKeyChange.java
@@ -39,10 +39,17 @@ public class UndoableKeyChange extends AbstractUndoableEdit {
 	this.newValue = newValue;
     }
 
+    @Override
+    public String getPresentationName() {
+        return Globals.lang("change key");
+    }
+
+    @Override
     public String getUndoPresentationName() {
 	return Globals.lang("Undo")+": "+Globals.lang("change key");
     }
 
+    @Override
     public String getRedoPresentationName() {
 	return Globals.lang("Redo")+": "+Globals.lang("change key");
     }
diff --git a/src/java/net/sf/jabref/util/XMPUtil.java b/src/java/net/sf/jabref/util/XMPUtil.java
index 4e8e5b9..9cc5af0 100644
--- a/src/java/net/sf/jabref/util/XMPUtil.java
+++ b/src/java/net/sf/jabref/util/XMPUtil.java
@@ -601,10 +601,21 @@ public class XMPUtil {
 		if (database != null)
 			entry = database.resolveForStrings(entry, false);
 
+		// Query privacy filter settings
+		JabRefPreferences prefs = JabRefPreferences.getInstance();
+		boolean useXmpPrivacyFilter =
+			prefs.getBoolean("useXmpPrivacyFilter");
+		// Fields for which not to write XMP data later on:
+		TreeSet<String> filters = new TreeSet<String>(Arrays.asList(prefs.getStringArray("xmpPrivacyFilters")));
+
 		// Set all the values including key and entryType
 		
 		for (String field : entry.getAllFields()){
 
+			if (useXmpPrivacyFilter && filters.contains(field)) {
+				continue;
+			}
+
 			if (field.equals("editor")) {
 				String o = entry.getField(field.toString()).toString();
 
diff --git a/src/java/net/sf/jabref/wizard/auximport/gui/FromAuxDialog.java b/src/java/net/sf/jabref/wizard/auximport/gui/FromAuxDialog.java
index a1e1547..e18b838 100644
--- a/src/java/net/sf/jabref/wizard/auximport/gui/FromAuxDialog.java
+++ b/src/java/net/sf/jabref/wizard/auximport/gui/FromAuxDialog.java
@@ -42,6 +42,7 @@ import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
 import java.awt.Insets;
 import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 import java.io.File;
 import java.io.IOException;
 import java.net.URL;
@@ -71,11 +72,13 @@ import com.jgoodies.forms.builder.DefaultFormBuilder;
 import com.jgoodies.forms.layout.FormLayout;
 import net.sf.jabref.BasePanel;
 import net.sf.jabref.BibtexDatabase;
+import net.sf.jabref.BibtexEntry;
 import net.sf.jabref.GUIGlobals;
 import net.sf.jabref.Globals;
 import net.sf.jabref.JabRef;
 import net.sf.jabref.JabRefFrame;
 import net.sf.jabref.gui.FileDialogs;
+import net.sf.jabref.gui.MainTable;
 import net.sf.jabref.wizard.auximport.AuxSubGenerator;
 
 import com.jgoodies.forms.builder.ButtonBarBuilder;
@@ -84,9 +87,10 @@ public class FromAuxDialog
         extends JDialog {
     private JPanel statusPanel = new JPanel();
     private JPanel buttons = new JPanel();
-    private JButton okButton = new JButton();
-    private JButton cancelButton = new JButton();
+    private JButton selectInDBButton = new JButton();
     private JButton generateButton = new JButton();
+    private JButton cancelButton = new JButton();
+    private JButton parseButton = new JButton();
 
     private JComboBox dbChooser = new JComboBox();
     private JTextField auxFileField;
@@ -98,7 +102,7 @@ public class FromAuxDialog
     // all open databases from JabRefFrame
     private JTabbedPane parentTabbedPane;
 
-    private boolean okPressed = false;
+    private boolean generatePressed = false;
 
     private AuxSubGenerator auxParser;
 
@@ -123,13 +127,21 @@ public class FromAuxDialog
         JPanel panel1 = new JPanel();
 
         panel1.setLayout(new BorderLayout());
-        okButton.setText(Globals.lang("Ok"));
-        okButton.setEnabled(false);
-        okButton.addActionListener(new FromAuxDialog_ok_actionAdapter(this));
-        cancelButton.setText(Globals.lang("Cancel"));
-        cancelButton.addActionListener(new FromAuxDialog_Cancel_actionAdapter(this));
+        selectInDBButton.setText(Globals.lang("Select"));
+        selectInDBButton.setEnabled(false);
+        selectInDBButton.addActionListener(new ActionListener() {
+			@Override
+			public void actionPerformed(ActionEvent arg0) {
+				FromAuxDialog.this.select_actionPerformed();
+			}
+		});
         generateButton.setText(Globals.lang("Generate"));
+        generateButton.setEnabled(false);
         generateButton.addActionListener(new FromAuxDialog_generate_actionAdapter(this));
+        cancelButton.setText(Globals.lang("Cancel"));
+        cancelButton.addActionListener(new FromAuxDialog_Cancel_actionAdapter(this));
+        parseButton.setText(Globals.lang("Parse"));
+        parseButton.addActionListener(new FromAuxDialog_parse_actionAdapter(this));
 
         initPanels(parent);
 
@@ -139,9 +151,10 @@ public class FromAuxDialog
         buttonPanel.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
 
         bb.addGlue();
-        bb.addButton(generateButton);
+        bb.addButton(parseButton);
         bb.addRelatedGap();
-        bb.addButton(okButton);
+        bb.addButton(selectInDBButton);
+        bb.addButton(generateButton);
         bb.addButton(cancelButton);
         bb.addGlue();
         this.setModal(true);
@@ -212,7 +225,7 @@ public class FromAuxDialog
 
         b = new DefaultFormBuilder(new FormLayout(
                 "fill:pref:grow, 4dlu, fill:pref:grow", "pref, pref, fill:pref:grow"), statusPanel);
-        b.appendSeparator(Globals.lang("Unknown bibtex entries")+":");
+        b.appendSeparator(Globals.lang("Result"));
         b.append(Globals.lang("Unknown bibtex entries")+":");
         b.append(Globals.lang("Messages")+":");
         b.nextLine();
@@ -221,17 +234,32 @@ public class FromAuxDialog
         b.getPanel().setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
     }
 
-    void ok_actionPerformed(ActionEvent e) {
-        okPressed = true;
+    void generate_actionPerformed(ActionEvent e) {
+        generatePressed = true;
         dispose();
     }
 
-    void Cancel_actionPerformed(ActionEvent e) {
+    void cancel_actionPerformed(ActionEvent e) {
         dispose();
     }
 
-    void generate_actionPerformed(ActionEvent e) {
-        generateButton.setEnabled(false);
+    private void select_actionPerformed() {
+    	BibtexDatabase db = getGenerateDB();
+    	MainTable mainTable = JabRef.jrf.basePanel().mainTable;
+    	BibtexDatabase database = JabRef.jrf.basePanel().getDatabase();
+    	mainTable.clearSelection();
+    	for (BibtexEntry newEntry: db.getEntries()) {
+    		// the entries are not the same objects as in the original database
+    		// therefore, we have to search for the entries in the original database
+    		// to be able to find them in the maintable
+    		BibtexEntry origEntry = database.getEntryByKey(newEntry.getCiteKey());
+    		int row = mainTable.findEntry(origEntry);
+    		mainTable.addSelection(row);
+    	}
+    }
+
+    void parse_actionPerformed(ActionEvent e) {
+        parseButton.setEnabled(false);
         BasePanel bp = (BasePanel) parentTabbedPane.getComponentAt(
                 dbChooser.getSelectedIndex());
         notFoundList.removeAll();
@@ -262,21 +290,22 @@ public class FromAuxDialog
                             nested);
                 }
 
-                okButton.setEnabled(true);
+                selectInDBButton.setEnabled(true);
+                generateButton.setEnabled(true);
             }
         }
 
-        // the generated database contains no entries -> no active ok-button
+        // the generated database contains no entries -> no active generate-button
         if (auxParser.getGeneratedDatabase().getEntryCount() < 1) {
             statusInfos.append("\n" + Globals.lang("empty database"));
-            okButton.setEnabled(false);
+            generateButton.setEnabled(false);
         }
 
-        generateButton.setEnabled(true);
+        parseButton.setEnabled(true);
     }
-
-    public boolean okPressed() {
-        return okPressed;
+    
+    public boolean generatePressed() {
+        return generatePressed;
     }
 
     public BibtexDatabase getGenerateDB() {
@@ -315,16 +344,16 @@ public class FromAuxDialog
 }
 
 // ----------- helper class -------------------
-class FromAuxDialog_ok_actionAdapter
+class FromAuxDialog_generate_actionAdapter
         implements java.awt.event.ActionListener {
     FromAuxDialog adaptee;
 
-    FromAuxDialog_ok_actionAdapter(FromAuxDialog adaptee) {
+    FromAuxDialog_generate_actionAdapter(FromAuxDialog adaptee) {
         this.adaptee = adaptee;
     }
 
     public void actionPerformed(ActionEvent e) {
-        adaptee.ok_actionPerformed(e);
+        adaptee.generate_actionPerformed(e);
     }
 }
 
@@ -337,19 +366,19 @@ class FromAuxDialog_Cancel_actionAdapter
     }
 
     public void actionPerformed(ActionEvent e) {
-        adaptee.Cancel_actionPerformed(e);
+        adaptee.cancel_actionPerformed(e);
     }
 }
 
-class FromAuxDialog_generate_actionAdapter
+class FromAuxDialog_parse_actionAdapter
         implements java.awt.event.ActionListener {
     FromAuxDialog adaptee;
 
-    FromAuxDialog_generate_actionAdapter(FromAuxDialog adaptee) {
+    FromAuxDialog_parse_actionAdapter(FromAuxDialog adaptee) {
         this.adaptee = adaptee;
     }
 
     public void actionPerformed(ActionEvent e) {
-        adaptee.generate_actionPerformed(e);
+        adaptee.parse_actionPerformed(e);
     }
 }
diff --git a/src/java/org/xnap/commons/gui/shortcut/EmacsKeyBindings.java b/src/java/org/xnap/commons/gui/shortcut/EmacsKeyBindings.java
new file mode 100644
index 0000000..735bbd7
--- /dev/null
+++ b/src/java/org/xnap/commons/gui/shortcut/EmacsKeyBindings.java
@@ -0,0 +1,831 @@
+/*
+ *  This file is part of JabRef and is based on XNap Commons.
+ *  This file may be used under the LGPL 2.1 license if used without JabRef.
+
+ *  JabRef is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  JabRef is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with JabRef.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ *
+ *  XNap Commons - EmacsKeyBindings
+ *
+ *  Copyright (C) 2005  Steffen Pingel
+ *  Copyright (C) 2005  Felix Berger
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+package org.xnap.commons.gui.shortcut;
+
+import java.awt.event.ActionEvent;
+import java.awt.event.InputEvent;
+import java.awt.event.KeyEvent;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import javax.swing.Action;
+import javax.swing.JEditorPane;
+import javax.swing.JTextArea;
+import javax.swing.JTextField;
+import javax.swing.JTextPane;
+import javax.swing.KeyStroke;
+import javax.swing.text.BadLocationException;
+import javax.swing.text.DefaultEditorKit;
+import javax.swing.text.Document;
+import javax.swing.text.JTextComponent;
+import javax.swing.text.Keymap;
+import javax.swing.text.TextAction;
+import javax.swing.text.Utilities;
+
+import net.sf.jabref.JabRefPreferences;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * Generic class which activates Emacs keybindings for java input {@link
+ * JTextComponent}s.
+ * 
+ * The inner class actions can also be used independently.
+ *
+ * @author Felix Berger
+ */
+public class EmacsKeyBindings
+{
+
+    public static final String killLineAction = "emacs-kill-line";
+
+    public static final String killRingSaveAction = "emacs-kill-ring-save";
+
+    public static final String killRegionAction = "emacs-kill-region";
+
+    public static final String backwardKillWordAction 
+		= "emacs-backward-kill-word";
+
+    public static final String capitalizeWordAction = "emacs-capitalize-word";
+
+    public static final String downcaseWordAction = "emacs-downcase-word";
+    
+    public static final String killWordAction = "emacs-kill-word";
+
+    public static final String setMarkCommandAction 
+		= "emacs-set-mark-command";
+
+    public static final String yankAction = "emacs-yank";
+
+    public static final String yankPopAction = "emacs-yank-pop";
+
+    public static final String upcaseWordAction = "emacs-upcase-word";
+
+    public static final JTextComponent.KeyBinding[] EMACS_KEY_BINDINGS_BASE = {
+		new JTextComponent.
+			KeyBinding(KeyStroke.getKeyStroke(KeyEvent.VK_E,
+											  InputEvent.CTRL_MASK),
+					   DefaultEditorKit.endLineAction),
+		new JTextComponent.
+			KeyBinding(KeyStroke.getKeyStroke(KeyEvent.VK_D,
+											  InputEvent.CTRL_MASK),
+					   DefaultEditorKit.deleteNextCharAction),
+		new JTextComponent.
+			KeyBinding(KeyStroke.getKeyStroke(KeyEvent.VK_N,
+											  InputEvent.CTRL_MASK),
+					   DefaultEditorKit.downAction),
+		new JTextComponent.
+			KeyBinding(KeyStroke.getKeyStroke(KeyEvent.VK_P,
+											  InputEvent.CTRL_MASK),
+					   DefaultEditorKit.upAction),
+		new JTextComponent.
+			KeyBinding(KeyStroke.getKeyStroke(KeyEvent.VK_B,
+											  InputEvent.ALT_MASK),
+					   DefaultEditorKit.previousWordAction),
+		new JTextComponent.
+			KeyBinding(KeyStroke.getKeyStroke(KeyEvent.VK_LESS,
+											  InputEvent.ALT_MASK),
+					   DefaultEditorKit.beginAction),
+		new JTextComponent.
+			KeyBinding(KeyStroke.getKeyStroke(KeyEvent.VK_LESS,
+											  InputEvent.ALT_MASK 
+											  + InputEvent.SHIFT_MASK),
+					   DefaultEditorKit.endAction),
+		new JTextComponent.
+			KeyBinding(KeyStroke.getKeyStroke(KeyEvent.VK_F,
+											  InputEvent.ALT_MASK),
+					   DefaultEditorKit.nextWordAction),
+		new JTextComponent.
+			KeyBinding(KeyStroke.getKeyStroke(KeyEvent.VK_F,
+											  InputEvent.CTRL_MASK),
+					   DefaultEditorKit.forwardAction),
+		new JTextComponent.
+			KeyBinding(KeyStroke.getKeyStroke(KeyEvent.VK_B,
+											  InputEvent.CTRL_MASK),
+					   DefaultEditorKit.backwardAction),
+// CTRL+V and ALT+V are disabled as CTRL+V is also "paste"
+//		new JTextComponent.
+//			KeyBinding(KeyStroke.getKeyStroke(KeyEvent.VK_V,
+//											  InputEvent.CTRL_MASK),
+//					   DefaultEditorKit.pageDownAction),
+//		new JTextComponent.
+//			KeyBinding(KeyStroke.getKeyStroke(KeyEvent.VK_V,
+//											  InputEvent.ALT_MASK),
+//					   DefaultEditorKit.pageUpAction),
+		new JTextComponent.
+			KeyBinding(KeyStroke.getKeyStroke(KeyEvent.VK_D,
+											  InputEvent.ALT_MASK),
+					   EmacsKeyBindings.killWordAction),
+		new JTextComponent.
+			KeyBinding(KeyStroke.getKeyStroke(KeyEvent.VK_BACK_SPACE,
+											  InputEvent.ALT_MASK),
+					   EmacsKeyBindings.backwardKillWordAction),
+		new JTextComponent.
+			KeyBinding(KeyStroke.getKeyStroke(KeyEvent.VK_SPACE,
+											  InputEvent.CTRL_MASK),
+					   EmacsKeyBindings.setMarkCommandAction),
+		new JTextComponent.
+			KeyBinding(KeyStroke.getKeyStroke(KeyEvent.VK_W,
+											  InputEvent.ALT_MASK),
+					   EmacsKeyBindings.killRingSaveAction),
+		new JTextComponent.
+			KeyBinding(KeyStroke.getKeyStroke(KeyEvent.VK_W,
+											  InputEvent.CTRL_MASK),
+					   EmacsKeyBindings.killRegionAction),
+	
+		new JTextComponent.
+			KeyBinding(KeyStroke.getKeyStroke(KeyEvent.VK_K,
+											  InputEvent.CTRL_MASK),
+					   EmacsKeyBindings.killLineAction),
+	
+		new JTextComponent.
+			KeyBinding(KeyStroke.getKeyStroke(KeyEvent.VK_Y,
+											  InputEvent.CTRL_MASK),
+					   EmacsKeyBindings.yankAction),
+
+		new JTextComponent.
+			KeyBinding(KeyStroke.getKeyStroke(KeyEvent.VK_Y,
+											  InputEvent.ALT_MASK),
+					   EmacsKeyBindings.yankPopAction),
+	
+		new JTextComponent.
+			KeyBinding(KeyStroke.getKeyStroke(KeyEvent.VK_C,
+											  InputEvent.ALT_MASK),
+					   EmacsKeyBindings.capitalizeWordAction),
+	    
+		new JTextComponent.
+			KeyBinding(KeyStroke.getKeyStroke(KeyEvent.VK_L,
+											  InputEvent.ALT_MASK),
+					   EmacsKeyBindings.downcaseWordAction),
+	    
+		new JTextComponent.
+			KeyBinding(KeyStroke.getKeyStroke(KeyEvent.VK_U,
+											  InputEvent.ALT_MASK),
+					   EmacsKeyBindings.upcaseWordAction),
+    };
+
+    public static final JTextComponent.KeyBinding EMACS_KEY_BINDING_C_A = new JTextComponent.KeyBinding(KeyStroke.getKeyStroke(KeyEvent.VK_A,
+            InputEvent.CTRL_MASK),
+            DefaultEditorKit.beginLineAction);
+
+    private static final TextAction[] EMACS_ACTIONS = {
+		new KillWordAction(killWordAction),
+		new BackwardKillWordAction(backwardKillWordAction),
+		new SetMarkCommandAction(setMarkCommandAction),
+		new KillRingSaveAction(killRingSaveAction),
+		new KillRegionAction(killRegionAction),
+		new KillLineAction(killLineAction),
+		new YankAction(yankAction),
+		new YankPopAction(yankPopAction),
+		new CapitalizeWordAction(capitalizeWordAction),
+		new DowncaseWordAction(downcaseWordAction),
+		new UpcaseWordAction(upcaseWordAction)
+    };
+
+
+    // components to modify
+	private static final JTextComponent[] JTCS = new JTextComponent[] {
+			new JTextArea(),
+			new JTextPane(),
+			new JTextField(),
+			new JEditorPane(),
+		};
+
+	private static Log logger = LogFactory.getLog(EmacsKeyBindings.class);
+
+	/**
+	 * Loads the emacs keybindings for all common <code>JTextComponent</code>s.
+	 * 
+	 * The shared keymap instances of the concrete subclasses of 
+	 * {@link JTextComponent} are fed with the keybindings.
+	 *
+	 * The original keybindings are stored in a backup array.
+	 */
+	public static void load()
+	{
+		createBackup();
+		loadEmacsKeyBindings();
+	}
+
+	private static void createBackup() {
+		Keymap oldBackup = JTextComponent.getKeymap(JTCS[0].getClass().getName());
+		if (oldBackup != null) {
+			// if there is already a backup, do not create a new backup
+			return;
+		}
+
+		for (int i = 0; i < JTCS.length; i++) {
+			Keymap orig = JTCS[i].getKeymap();
+			Keymap backup = JTextComponent.addKeymap
+				(JTCS[i].getClass().getName(), null);
+			Action[] bound = orig.getBoundActions();
+			for (int j = 0; j < bound.length; j++) {
+				KeyStroke[] strokes = orig.getKeyStrokesForAction(bound[j]);
+				for (int k = 0; k < strokes.length; k++) {
+					backup.addActionForKeyStroke(strokes[k], bound[j]);
+				}
+			}
+			backup.setDefaultAction(orig.getDefaultAction());
+		}
+	}
+
+	/**
+	 * Restores the original keybindings for the concrete subclasses of
+	 * {@link JTextComponent}.
+	 *
+	 */
+	public static void unload()
+	{
+		for (int i = 0; i < JTCS.length; i++) {
+			Keymap backup = JTextComponent.getKeymap
+				(JTCS[i].getClass().getName());
+
+			if (backup != null) {
+				Keymap current = JTCS[i].getKeymap();
+				current.removeBindings();
+
+				Action[] bound = backup.getBoundActions();
+				for (int j = 0; j < bound.length; j++) {
+					KeyStroke[] strokes = 
+						backup.getKeyStrokesForAction(bound[i]);
+					for (int k = 0; k < strokes.length; k++) {
+						current.addActionForKeyStroke(strokes[k], bound[j]);
+					}
+				}
+				current.setDefaultAction(backup.getDefaultAction());
+			}
+		}
+	}
+
+    /**
+     * Activates Emacs keybindings for all text components extending {@link
+     * JTextComponent}.
+     */
+    private static void loadEmacsKeyBindings()
+    {
+		logger.debug("Loading emacs keybindings");
+		
+
+		for (int i = 0; i < JTCS.length; i++) {
+			Action[] origActions = JTCS[i].getActions();
+			Action[] actions = new Action[origActions.length + EMACS_ACTIONS.length];
+			System.arraycopy(origActions,   0, actions, 0,                  origActions.length);
+			System.arraycopy(EMACS_ACTIONS, 0, actions, origActions.length, EMACS_ACTIONS.length);
+			
+			Keymap k = JTCS[i].getKeymap();
+
+			JTextComponent.KeyBinding[] keybindings;
+			if (JabRefPreferences.getInstance().getBoolean(JabRefPreferences.EDITOR_EMACS_KEYBINDINGS_REBIND_CA)) {
+			    int size = EMACS_KEY_BINDINGS_BASE.length + 1;
+			    keybindings = new JTextComponent.KeyBinding[size];
+	            System.arraycopy(EMACS_KEY_BINDINGS_BASE, 0, keybindings, 0, EMACS_KEY_BINDINGS_BASE.length);
+	            keybindings[EMACS_KEY_BINDINGS_BASE.length] = EMACS_KEY_BINDING_C_A;
+			} else {
+			    keybindings = EMACS_KEY_BINDINGS_BASE;
+			}
+			JTCS[i].loadKeymap(k, keybindings, actions);
+		}
+    }
+
+    /**
+     * This action kills the next word.
+     * 
+     * It removes the next word on the right side of the cursor from the active
+     * text component and adds it to the clipboard. 
+     */
+    @SuppressWarnings("serial")
+    public static class KillWordAction extends TextAction
+    {
+		public KillWordAction(String nm)
+		{
+			super(nm);
+		}
+
+		public void actionPerformed(ActionEvent e)
+		{
+			JTextComponent jtc = getTextComponent(e);
+			if (jtc != null) {
+				try {
+					int offs = jtc.getCaretPosition();
+					jtc.setSelectionStart(offs);
+					offs = getWordEnd(jtc, offs);
+					jtc.setSelectionEnd(offs);
+					KillRing.getInstance().add(jtc.getSelectedText());
+					jtc.cut();
+				}
+				catch (BadLocationException ble) {
+					jtc.getToolkit().beep();
+				}
+			}
+		}
+    }
+
+    /**
+     * This action kills the previous word.
+     * 
+     * It removes the previous word on the left side of the cursor from the 
+     * active text component and adds it to the clipboard.
+     */
+    @SuppressWarnings("serial")
+    public static class BackwardKillWordAction extends TextAction
+    {
+		public BackwardKillWordAction(String nm)
+		{
+			super(nm);
+		}
+
+		public void actionPerformed(ActionEvent e)
+		{
+			JTextComponent jtc = getTextComponent(e);
+			if (jtc != null) {
+				try {
+					int offs = jtc.getCaretPosition();
+					jtc.setSelectionEnd(offs);
+					offs = Utilities.getPreviousWord(jtc, offs);
+					jtc.setSelectionStart(offs);
+					KillRing.getInstance().add(jtc.getSelectedText());
+					jtc.cut();
+				}
+				catch (BadLocationException ble) {
+					jtc.getToolkit().beep();
+				}
+			}
+		}
+    }
+
+    /**
+     * This action copies the marked region and stores it in the killring.
+     */
+    @SuppressWarnings("serial")
+    public static class KillRingSaveAction extends TextAction
+    {
+		public KillRingSaveAction(String nm)
+		{
+			super(nm);
+		}
+
+		public void actionPerformed(ActionEvent e)
+		{
+			JTextComponent jtc = getTextComponent(e);
+			EmacsKeyBindings.doCopyOrCut(jtc, true);
+		}
+    }
+
+    /**
+     * This action Kills the marked region and stores it in the killring.
+     */
+    @SuppressWarnings("serial")
+    public static class KillRegionAction extends TextAction
+    {
+		public KillRegionAction(String nm)
+		{
+			super(nm);
+		}
+
+		public void actionPerformed(ActionEvent e)
+		{
+			JTextComponent jtc = getTextComponent(e);
+			EmacsKeyBindings.doCopyOrCut(jtc, false);
+		}
+    }
+
+    private static void doCopyOrCut(JTextComponent jtc, boolean copy) {
+		if (jtc != null) {
+			int caretPosition = jtc.getCaretPosition();
+			String text = jtc.getSelectedText();
+			if (text != null) {
+				// user has manually marked a text without using CTRL+W
+				// we obey that selection and copy it.
+			} else if (SetMarkCommandAction.isMarked(jtc)) {
+				int beginPos = caretPosition;
+				int endPos = SetMarkCommandAction.getCaretPosition();
+				if (beginPos > endPos) {
+					int tmp = endPos;
+					endPos = beginPos;
+					beginPos = tmp;
+				}
+				jtc.select(beginPos, endPos);
+				SetMarkCommandAction.reset();
+			}
+			text = jtc.getSelectedText();
+			if (text != null) {
+				if (copy) {
+					jtc.copy();
+					// clear the selection
+					jtc.select(caretPosition, caretPosition);
+				} else {
+					int newCaretPos = jtc.getSelectionStart();
+					jtc.cut();
+					// put the cursor to the beginning of the text to cut
+					jtc.setCaretPosition(newCaretPos);
+				}
+				KillRing.getInstance().add(text);
+			} else {
+				jtc.getToolkit().beep();
+			}
+		}
+    }
+    
+    /**
+     * This actin kills text up to the end of the current line and stores it in 
+     * the killring.
+     */
+    @SuppressWarnings("serial")
+    public static class KillLineAction extends TextAction
+    {
+		public KillLineAction(String nm)
+		{
+			super(nm);
+		}
+
+		public void actionPerformed(ActionEvent e)
+		{
+			JTextComponent jtc = getTextComponent(e);
+			if (jtc != null) {
+				try {
+					int start = jtc.getCaretPosition();
+					int end = Utilities.getRowEnd(jtc, start);
+					if (start == end && jtc.isEditable()) {
+						Document doc = jtc.getDocument();
+						doc.remove(end, 1);
+					}
+					else {
+						jtc.setSelectionStart(start);
+						jtc.setSelectionEnd(end);
+						KillRing.getInstance().add(jtc.getSelectedText());
+						jtc.cut();
+						// jtc.replaceSelection("");
+					}
+				}
+				catch (BadLocationException ble) {
+					jtc.getToolkit().beep();
+				}
+			}
+		}
+    }
+
+    /**
+     * This action sets a beginning mark for a selection.
+     */
+    @SuppressWarnings("serial")
+    public static class SetMarkCommandAction extends TextAction
+    {
+		private static int position = -1;
+		private static JTextComponent jtc;
+	
+		public SetMarkCommandAction(String nm)
+		{
+			super(nm);
+		}
+	
+		public void actionPerformed(ActionEvent e)
+		{
+			jtc = getTextComponent(e);
+			if (jtc != null) {
+				position = jtc.getCaretPosition();
+			}
+		}
+
+		public static boolean isMarked(JTextComponent jt)
+		{
+			return (jtc == jt && position != -1);
+		}
+
+		public static void reset()
+		{
+			jtc = null;
+			position = -1;
+		}
+
+		public static int getCaretPosition()
+		{
+			return position;
+		}
+    }
+
+    /**
+     * This action pastes text from the killring.
+     */
+    @SuppressWarnings("serial")
+    public static class YankAction extends TextAction
+    {
+		public static int start = -1;
+		public static int end = -1;
+	
+		public YankAction(String nm)
+		{
+			super(nm);
+		}
+	
+		public void actionPerformed(ActionEvent event)
+		{
+			JTextComponent jtc = getTextComponent(event);
+	    
+			if (jtc != null) {
+				try {
+					start = jtc.getCaretPosition();
+					jtc.paste();
+					end = jtc.getCaretPosition();
+					KillRing.getInstance().add(jtc.getText(start, end));
+					KillRing.getInstance().setCurrentTextComponent(jtc);
+				}
+				catch (Exception e) {
+				}
+			}
+		}
+    }
+	
+    /**
+     * This action pastes an element from the killring cycling through it.
+     */
+    @SuppressWarnings("serial")
+    public static class YankPopAction extends TextAction
+    {
+
+		public YankPopAction(String nm)
+		{
+			super(nm);
+		}
+
+		public void actionPerformed(ActionEvent event)
+		{
+			JTextComponent jtc = getTextComponent(event);
+			boolean jtcNotNull = (jtc != null);
+			boolean jtcIsCurrentTextComponent = (KillRing.getInstance().getCurrentTextComponent() == jtc);
+			boolean caretPositionIsEndOfLastYank = (jtc.getCaretPosition() == YankAction.end);
+			boolean killRingNotEmpty = (!KillRing.getInstance().isEmpty());
+			if (jtcNotNull && jtcIsCurrentTextComponent && caretPositionIsEndOfLastYank && killRingNotEmpty) {
+				jtc.setSelectionStart(YankAction.start);
+				jtc.setSelectionEnd(YankAction.end);
+				String toYank = KillRing.getInstance().next();
+				if (toYank != null) {
+					jtc.replaceSelection(toYank);
+					YankAction.end = jtc.getCaretPosition();
+				}
+				else {
+					jtc.getToolkit().beep();
+				}
+			}
+		}
+    }
+    
+    /**
+     * Manages all killed (cut) text pieces in a ring which is accessible
+     * through {@link YankPopAction}.
+     * <p>
+     * Also provides an unmodifiable copy of all cut pieces. 
+     */
+    public static class KillRing
+    {
+    	private JTextComponent jtc;
+    	private LinkedList<String> ring = new LinkedList<String>();
+    	Iterator<String> iter = ring.iterator();
+    	
+    	private static final KillRing instance = new KillRing();
+    	
+    	public static KillRing getInstance()
+    	{
+    		return instance;
+    	}
+    	
+    	void setCurrentTextComponent(JTextComponent jtc)
+    	{
+    		this.jtc = jtc;
+    	}
+    	
+    	JTextComponent getCurrentTextComponent()
+    	{
+    		return jtc;
+    	}
+    	
+    	/**
+    	 * Adds text to the front of the kill ring.
+    	 * <p>
+    	 * Deviating from the Emacs implementation we make sure the 
+    	 * exact same text is not somewhere else in the ring.
+    	 */
+    	void add(String text)
+    	{
+    		if (text.length() == 0) {
+    			return;
+    		}
+    		
+    		ring.remove(text);
+    		ring.addFirst(text);
+    		while (ring.size() > 60) {
+    			ring.removeLast();
+    		}
+    		iter = ring.iterator();
+    		// skip first entry, the one we just added
+    		iter.next();
+    	}
+    	
+    	/**
+    	 * Returns an unmodifiable version of the ring list which contains
+    	 * the killed texts.
+    	 * @return the content of the kill ring
+    	 */
+    	public List<String> getRing()
+    	{
+    		return Collections.unmodifiableList(ring);
+    	}
+    	
+    	public boolean isEmpty()
+    	{
+    		return ring.isEmpty();
+    	}
+
+    	/**
+    	 * Returns the next text element which is to be yank-popped.
+    	 * @return <code>null</code> if the ring is empty
+    	 */
+    	String next()
+    	{
+    		if (ring.isEmpty()) {
+    			return null;
+    		}
+    		else if (iter.hasNext()) {
+    			return iter.next();
+    		}
+    		else {
+    			iter = ring.iterator();
+    			// guaranteed to not throw an exception, since ring is not empty
+    			return iter.next();
+    		}
+    	}
+    }
+
+    /**
+     * This action capitalizes the next word on the right side of the caret.
+     */
+    @SuppressWarnings("serial")
+    public static class CapitalizeWordAction extends TextAction
+    {
+		public CapitalizeWordAction(String nm)
+		{
+			super(nm);
+		}
+
+		/**
+		 * At first the same code as in {@link
+		 * EmacsKeyBindings.DowncaseWordAction} is performed, to ensure the
+		 * word is in lower case, then the first letter is capialized.
+		 */
+		public void actionPerformed(ActionEvent event)
+		{
+			JTextComponent jtc = getTextComponent(event);
+
+			if (jtc != null) {
+				try {
+					/* downcase code */
+					int start = jtc.getCaretPosition();
+					int end = getWordEnd(jtc, start);
+					jtc.setSelectionStart(start);
+					jtc.setSelectionEnd(end);
+					String word = jtc.getText(start, end - start);
+					jtc.replaceSelection(word.toLowerCase());
+
+					/* actual capitalize code */
+					int offs = Utilities.getWordStart(jtc, start);
+					// get first letter
+					String c = jtc.getText(offs, 1);
+					// we're at the end of the previous word
+					if (c.equals(" ")) {
+						/* ugly java workaround to get the beginning of the
+                           word.  */
+						offs = Utilities.getWordStart(jtc, ++offs);
+						c = jtc.getText(offs, 1);
+					}
+					if (Character.isLetter(c.charAt(0))) {
+						jtc.setSelectionStart(offs);
+						jtc.setSelectionEnd(offs + 1);
+						jtc.replaceSelection(c.toUpperCase());
+					}
+					end = Utilities.getWordEnd(jtc, offs);
+					jtc.setCaretPosition(end);
+				}
+				catch (BadLocationException ble) {
+					jtc.getToolkit().beep();
+				}
+			}
+		}
+    }
+
+    /**
+     * This action renders all characters of the next word to lowercase.
+     */
+    @SuppressWarnings("serial")
+    public static class DowncaseWordAction extends TextAction
+    {
+		public DowncaseWordAction(String nm)
+		{
+			super(nm);
+		}
+
+		public void actionPerformed(ActionEvent event)
+		{
+			JTextComponent jtc = getTextComponent(event);
+
+			if (jtc != null) {
+				try {
+					int start = jtc.getCaretPosition();
+					int end = getWordEnd(jtc, start);
+					jtc.setSelectionStart(start);
+					jtc.setSelectionEnd(end);
+					String word = jtc.getText(start, end - start);
+					jtc.replaceSelection(word.toLowerCase());
+					jtc.setCaretPosition(end);
+				}
+				catch (BadLocationException ble) {
+					jtc.getToolkit().beep();
+				}
+			}
+		}
+    }
+
+    /**
+     * This action renders all characters of the next word to upppercase.
+     */
+    @SuppressWarnings("serial")
+    public static class UpcaseWordAction extends TextAction
+    {
+		public UpcaseWordAction(String nm)
+		{
+			super(nm);
+		}
+
+		public void actionPerformed(ActionEvent event)
+		{
+			JTextComponent jtc = getTextComponent(event);
+
+			if (jtc != null) {
+				try {
+					int start = jtc.getCaretPosition();
+					int end = getWordEnd(jtc, start);
+					jtc.setSelectionStart(start);
+					jtc.setSelectionEnd(end);
+					String word = jtc.getText(start, end - start);
+					jtc.replaceSelection(word.toUpperCase());
+					jtc.setCaretPosition(end);
+				}
+				catch (BadLocationException ble) {
+					jtc.getToolkit().beep();
+				}
+			}
+		}
+    }
+    
+    private static int getWordEnd(JTextComponent jtc, int start)
+    	throws BadLocationException
+    {
+    	try {
+    		return Utilities.getNextWord(jtc, start);
+    	}
+    	catch (BadLocationException ble) {
+    		int end = jtc.getText().length();
+			if (start < end) {
+				return end;
+			}
+			else {
+				throw ble;
+			}
+    	}
+    }
+}
diff --git a/src/java/org/xnap/commons/gui/shortcut/package-info.java b/src/java/org/xnap/commons/gui/shortcut/package-info.java
new file mode 100644
index 0000000..faba338
--- /dev/null
+++ b/src/java/org/xnap/commons/gui/shortcut/package-info.java
@@ -0,0 +1,5 @@
+/**
+ * This package is a subset of the same package of XNap Commons (http://xnap-commons.sourceforge.net/)
+ * License: LGPL 2.1
+ */
+package org.xnap.commons.gui.shortcut;
\ No newline at end of file
diff --git a/src/java/spl/PdfImporter.java b/src/java/spl/PdfImporter.java
index 264b695..6e2ed7f 100644
--- a/src/java/spl/PdfImporter.java
+++ b/src/java/spl/PdfImporter.java
@@ -9,12 +9,9 @@ import javax.swing.*;
 
 import net.sf.jabref.*;
 import net.sf.jabref.external.DroppedFileHandler;
-import net.sf.jabref.external.ExternalFileType;
-import net.sf.jabref.gui.FileListEditor;
 import net.sf.jabref.gui.FileListEntry;
 import net.sf.jabref.gui.FileListTableModel;
 import net.sf.jabref.gui.MainTable;
-import net.sf.jabref.imports.ImportMenuItem;
 import net.sf.jabref.imports.PdfContentImporter;
 import net.sf.jabref.imports.PdfXmpImporter;
 import net.sf.jabref.labelPattern.LabelPatternUtil;
@@ -27,11 +24,6 @@ import spl.filter.PdfFileFilter;
 import spl.gui.ImportDialog;
 import spl.gui.MetaDataListDialog;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Set;
-
 
 /**
  * Created by IntelliJ IDEA.
@@ -89,11 +81,7 @@ public class PdfImporter {
         int globalChoice = Globals.prefs.getInt(ImportSettingsTab.PREF_IMPORT_DEFAULT_PDF_IMPORT_STYLE);
 
         // Get a list of file directories:
-        ArrayList<File> dirs = new ArrayList<File>();
         String[] dirsS = panel.metaData().getFileDirectory(GUIGlobals.FILE_FIELD);
-        for (int i=0; i<dirsS.length; i++) {
-            dirs.add(new File(dirsS[i]));
-        }
 
         for(String fileName : fileNames){
             List<BibtexEntry> xmpEntriesInFile = readXmpEntries(fileName);
@@ -145,7 +133,7 @@ public class PdfImporter {
                     FileListTableModel tm = new FileListTableModel();
                     File toLink = new File(fileName);
                     tm.addEntry(0, new FileListEntry(toLink.getName(),
-                            FileListEditor.relativizePath(toLink, dirs).getPath(),
+                            Util.shortenFileName(toLink, dirsS).getPath(),
                             Globals.prefs.getExternalFileTypeByName("pdf")));
                     entry.setField(GUIGlobals.FILE_FIELD, tm.getStringRepresentation());
 
diff --git a/src/java/tests/net/sf/jabref/FileBasedTestCase.java b/src/java/tests/net/sf/jabref/FileBasedTestCase.java
index c7dd0c7..e68fda9 100644
--- a/src/java/tests/net/sf/jabref/FileBasedTestCase.java
+++ b/src/java/tests/net/sf/jabref/FileBasedTestCase.java
@@ -14,10 +14,6 @@ import net.sf.jabref.imports.ParserResult;
 /**
  * A base class for Testing in JabRef that comes along with some useful
  * functions.
- * 
- * @author $Author$
- * @version $Revision$ ($Date$)
- * 
  */
 public class FileBasedTestCase extends TestCase {
 
@@ -109,6 +105,8 @@ public class FileBasedTestCase extends TestCase {
 	private String oldPdfDirectory;
 
 	private boolean oldUseRegExp;
+	
+	private boolean oldAutoLinkExcatKeyOnly;
 
 	public static BibtexEntry getBibtexEntry() {
 
@@ -144,9 +142,11 @@ public class FileBasedTestCase extends TestCase {
 
 		Globals.prefs = JabRefPreferences.getInstance();
 		oldUseRegExp = Globals.prefs.getBoolean(JabRefPreferences.USE_REG_EXP_SEARCH_KEY);
+		oldAutoLinkExcatKeyOnly = Globals.prefs.getBoolean(JabRefPreferences.AUTOLINK_EXACT_KEY_ONLY);
 		oldPdfDirectory = Globals.prefs.get("pdfDirectory");
 
 		Globals.prefs.putBoolean(JabRefPreferences.USE_REG_EXP_SEARCH_KEY, false);
+		Globals.prefs.putBoolean(JabRefPreferences.AUTOLINK_EXACT_KEY_ONLY, false);
 		
 		getBibtexEntry();
 		assertNotNull(database);
@@ -209,10 +209,10 @@ public class FileBasedTestCase extends TestCase {
 			File graphicsSubDir = new File(graphicsDir, "subDir");
 			graphicsSubDir.mkdir();
 			
-			File jpg = new File(graphicsSubDir, "testHipKro03test.jpg");
+			File jpg = new File(graphicsSubDir, "HipKro03test.jpg");
 			jpg.createNewFile();
 
-			File png = new File(graphicsSubDir, "testHipKro03test.png");
+			File png = new File(graphicsSubDir, "HipKro03test.png");
 			png.createNewFile();
 			
 		} catch (Exception e) {
@@ -222,6 +222,7 @@ public class FileBasedTestCase extends TestCase {
 
 	public void tearDown() {
 		deleteRecursive(root);
+		Globals.prefs.putBoolean(JabRefPreferences.AUTOLINK_EXACT_KEY_ONLY, oldAutoLinkExcatKeyOnly);
 		Globals.prefs.putBoolean(JabRefPreferences.USE_REG_EXP_SEARCH_KEY, oldUseRegExp);
 		Globals.prefs.put("pdfDirectory", oldPdfDirectory);
 		// TODO: This is not a great way to do this, sure ;-)
diff --git a/src/java/tests/net/sf/jabref/UtilFindFileTest.java b/src/java/tests/net/sf/jabref/UtilFindFileTest.java
index dced24b..7718c2c 100644
--- a/src/java/tests/net/sf/jabref/UtilFindFileTest.java
+++ b/src/java/tests/net/sf/jabref/UtilFindFileTest.java
@@ -77,8 +77,8 @@ public class UtilFindFileTest extends FileBasedTestCase {
 		Map<BibtexEntry, List<File>> results = Util.findAssociatedFiles(entries, extensions, dirs);
 		
 		assertEquals(2, results.get(entry).size());
-		assertTrue(results.get(entry).contains(new File(root.getAbsoluteFile() + "/graphicsDir/subDir/testHipKro03test.jpg")));
-		assertFalse(results.get(entry).contains(new File(root.getAbsoluteFile() + "/graphicsDir/subDir/testHipKro03test.png")));
+		assertTrue(results.get(entry).contains(new File(root.getAbsoluteFile() + "/graphicsDir/subDir/HipKro03test.jpg")));
+		assertFalse(results.get(entry).contains(new File(root.getAbsoluteFile() + "/graphicsDir/subDir/HipKro03test.png")));
 		assertTrue(results.get(entry).contains(new File(root.getAbsoluteFile() + "/pdfs/sub/HipKro03-sub.pdf")));
 	}
 	
diff --git a/src/java/tests/net/sf/jabref/UtilTest.java b/src/java/tests/net/sf/jabref/UtilTest.java
index 1059470..a2e4ac6 100644
--- a/src/java/tests/net/sf/jabref/UtilTest.java
+++ b/src/java/tests/net/sf/jabref/UtilTest.java
@@ -25,25 +25,25 @@ public class UtilTest extends TestCase {
 	}
 
 	public void testGetPublicationDate(){
-	
+
 		assertEquals("2003-02", Util.getPublicationDate(BibtexParser
 			.singleFromString("@ARTICLE{HipKro03, year = {2003}, month = #FEB# }")));
-		
+
 		assertEquals("2003-03", Util.getPublicationDate(BibtexParser
 			.singleFromString("@ARTICLE{HipKro03, year = {2003}, month = 3 }")));
-		
+
 		assertEquals("2003", Util.getPublicationDate(BibtexParser
 			.singleFromString("@ARTICLE{HipKro03, year = {2003}}")));
-		
+
 		assertEquals(null, Util.getPublicationDate(BibtexParser
 			.singleFromString("@ARTICLE{HipKro03, month = 3 }")));
-		
+
 		assertEquals(null, Util.getPublicationDate(BibtexParser
 			.singleFromString("@ARTICLE{HipKro03, author={bla}}")));
 
 		assertEquals("2003-12", Util.getPublicationDate(BibtexParser
 			.singleFromString("@ARTICLE{HipKro03, year = {03}, month = #DEC# }")));
-		
+
 	}
 
 	public void testCheckName() {
@@ -55,14 +55,14 @@ public class UtilTest extends TestCase {
 	}
 
 	public void testCreateNeutralId() {
-		
+
 		HashSet<String> set = new HashSet<String>();
 		for (int i = 0; i < 10000; i++){
 			String string = Util.createNeutralId();
 			assertFalse(set.contains(string));
 			set.add(string);
 		}
-		
+
 	}
 
 	public void testPlaceDialog() {
@@ -70,37 +70,37 @@ public class UtilTest extends TestCase {
 		d.setSize(50, 50);
 		Container c = new JWindow();
 		c.setBounds(100, 200, 100, 50);
-		
+
 		Util.placeDialog(d, c);
 		assertEquals(125, d.getX());
 		assertEquals(200, d.getY());
-		
+
 		// Test upper left corner
 		c.setBounds(0,0,100,100);
 		d.setSize(200, 200);
-		
+
 		Util.placeDialog(d, c);
 		assertEquals(0, d.getX());
 		assertEquals(0, d.getY());
 	}
 
 	public void testParseField() {
-	
+
 		assertEquals("", Util.parseField(""));
-		
+
 		// Three basic types (references, { } and " ")
 		assertEquals("#hallo#", Util.parseField("hallo"));
 		assertEquals("hallo", Util.parseField("{hallo}"));
 		assertEquals("bye", Util.parseField("\"bye\""));
-		
+
 		// Concatenation
 		assertEquals("longlonglonglong", Util.parseField("\"long\" # \"long\" # \"long\" # \"long\""));
-		
+
 		assertEquals("hallo#bye#", Util.parseField("{hallo} # bye"));
 	}
 
 	public void testShaveString() {
-		
+
 		assertEquals(null, Util.shaveString(null));
 		assertEquals("", Util.shaveString(""));
 		assertEquals("aaa", Util.shaveString("   aaa\t\t\n\r"));
@@ -115,29 +115,29 @@ public class UtilTest extends TestCase {
 
 		assertEquals("AAAA", Util.checkLegalKey("AA AA"));
 		assertEquals("SPECIALCHARS", Util.checkLegalKey("SPECIAL CHARS#{\\\"}~,^"));
-		assertEquals("AeaeaAAA", Util.checkLegalKey("������"));
+		assertEquals("AeaeaAAA", Util.checkLegalKey("������"));
 		assertEquals("", Util.checkLegalKey("\n\t\r"));
 	}
 
 	public void testReplaceSpecialCharacters() {
-		// Shouldn't German � be resolved to Ae
-		assertEquals("AeaeaAAA", Util.replaceSpecialCharacters("������"));
+		// Shouldn't German � be resolved to Ae
+		assertEquals("AeaeaAAA", Util.replaceSpecialCharacters("������"));
 		assertEquals("Hallo Arger", Util.replaceSpecialCharacters("Hallo Arger"));
 	}
 
 	public void testJoin() {
 		String[] s = "ab/cd/ed".split("/");
 		assertEquals("ab\\cd\\ed", Util.join(s, "\\", 0, s.length));
-		
+
 		assertEquals("cd\\ed", Util.join(s, "\\", 1, s.length));
-		
+
 		assertEquals("ed", Util.join(s, "\\", 2, s.length));
-		
-		assertEquals("", Util.join(s, "\\", 3, s.length)); 
-		
+
+		assertEquals("", Util.join(s, "\\", 3, s.length));
+
 		assertEquals("", Util.join(new String[]{}, "\\", 0, 0));
 	}
-	
+
 	public void testStripBrackets() {
 		assertEquals("foo", Util.stripBrackets("[foo]"));
 		assertEquals("[foo]", Util.stripBrackets("[[foo]]"));
@@ -148,36 +148,36 @@ public class UtilTest extends TestCase {
 		assertEquals("", Util.stripBrackets("["));
 		assertEquals("", Util.stripBrackets("]"));
 		assertEquals("f[]f", Util.stripBrackets("f[]f"));
-	
+
 		try {
 			Util.stripBrackets(null);
 			fail();
 		} catch(NullPointerException npe){
-			
+
 		}
 	}
-	
+
 	BibtexDatabase database;
 	BibtexEntry entry;
-	
+
 	public void setUp(){
-		
+
 		StringReader reader = new StringReader(
-				"@ARTICLE{HipKro03," + "\n" + 
-				"  author = {Eric von Hippel and Georg von Krogh}," + "\n" + 
-				"  title = {Open Source Software and the \"Private-Collective\" Innovation Model: Issues for Organization Science}," + "\n" + 
-				"  journal = {Organization Science}," + "\n" + 
-				"  year = {2003}," + "\n" + 
-				"  volume = {14}," + "\n" + 
-				"  pages = {209--223}," + "\n" + 
-				"  number = {2}," + "\n" + 
-				"  address = {Institute for Operations Research and the Management Sciences (INFORMS), Linthicum, Maryland, USA}," + "\n" + 
-				"  doi = {http://dx.doi.org/10.1287/orsc.14.2.209.14992}," + "\n" + 
-				"  issn = {1526-5455}," + "\n" + 
-				"  publisher = {INFORMS}" + "\n" + 
+				"@ARTICLE{HipKro03," + "\n" +
+				"  author = {Eric von Hippel and Georg von Krogh}," + "\n" +
+				"  title = {Open Source Software and the \"Private-Collective\" Innovation Model: Issues for Organization Science}," + "\n" +
+				"  journal = {Organization Science}," + "\n" +
+				"  year = {2003}," + "\n" +
+				"  volume = {14}," + "\n" +
+				"  pages = {209--223}," + "\n" +
+				"  number = {2}," + "\n" +
+				"  address = {Institute for Operations Research and the Management Sciences (INFORMS), Linthicum, Maryland, USA}," + "\n" +
+				"  doi = {http://dx.doi.org/10.1287/orsc.14.2.209.14992}," + "\n" +
+				"  issn = {1526-5455}," + "\n" +
+				"  publisher = {INFORMS}" + "\n" +
 				"}");
 
-		BibtexParser parser = new BibtexParser(reader); 
+		BibtexParser parser = new BibtexParser(reader);
 		ParserResult result = null;
 		try {
 			result = parser.parse();
@@ -186,114 +186,114 @@ public class UtilTest extends TestCase {
 		}
 		database = result.getDatabase();
 		entry = database.getEntriesByKey("HipKro03")[0];
-		
+
 		assertNotNull(database);
 		assertNotNull(entry);
 	}
 
 	public void testParseMethodCalls(){
-		
+
 		assertEquals(1, Util.parseMethodsCalls("bla").size());
 		assertEquals("bla", ((Util.parseMethodsCalls("bla").get(0)))[0]);
-		
+
 		assertEquals(1, Util.parseMethodsCalls("bla,").size());
 		assertEquals("bla", ((Util.parseMethodsCalls("bla,").get(0)))[0]);
 
 		assertEquals(1, Util.parseMethodsCalls("_bla.bla.blub,").size());
 		assertEquals("_bla.bla.blub", ((Util.parseMethodsCalls("_bla.bla.blub,").get(0)))[0]);
 
-		
+
 		assertEquals(2, Util.parseMethodsCalls("bla,foo").size());
 		assertEquals("bla", ((Util.parseMethodsCalls("bla,foo").get(0)))[0]);
 		assertEquals("foo", ((Util.parseMethodsCalls("bla,foo").get(1)))[0]);
-		
+
 		assertEquals(2, Util.parseMethodsCalls("bla(\"test\"),foo(\"fark\")").size());
 		assertEquals("bla", ((Util.parseMethodsCalls("bla(\"test\"),foo(\"fark\")").get(0)))[0]);
 		assertEquals("foo", ((Util.parseMethodsCalls("bla(\"test\"),foo(\"fark\")").get(1)))[0]);
 		assertEquals("test", ((Util.parseMethodsCalls("bla(\"test\"),foo(\"fark\")").get(0)))[1]);
 		assertEquals("fark", ((Util.parseMethodsCalls("bla(\"test\"),foo(\"fark\")").get(1)))[1]);
-		
+
 		assertEquals(2, Util.parseMethodsCalls("bla(test),foo(fark)").size());
 		assertEquals("bla", ((Util.parseMethodsCalls("bla(test),foo(fark)").get(0)))[0]);
 		assertEquals("foo", ((Util.parseMethodsCalls("bla(test),foo(fark)").get(1)))[0]);
 		assertEquals("test", ((Util.parseMethodsCalls("bla(test),foo(fark)").get(0)))[1]);
 		assertEquals("fark", ((Util.parseMethodsCalls("bla(test),foo(fark)").get(1)))[1]);
 	}
-	
-	
+
+
 	public void testFieldAndFormat(){
 		assertEquals("Eric von Hippel and Georg von Krogh", Util.getFieldAndFormat("[author]", entry, database));
-		
+
 		assertEquals("Eric von Hippel and Georg von Krogh", Util.getFieldAndFormat("author", entry, database));
-		
+
 		assertEquals(null, Util.getFieldAndFormat("[unknownkey]", entry, database));
-		
+
 		assertEquals(null, Util.getFieldAndFormat("[:]", entry, database));
-		
+
 		assertEquals(null, Util.getFieldAndFormat("[:lower]", entry, database));
-		
+
 		assertEquals("eric von hippel and georg von krogh", Util.getFieldAndFormat("[author:lower]", entry, database));
-		
+
 		assertEquals("HipKro03", Util.getFieldAndFormat("[bibtexkey]", entry, database));
-		
+
 		assertEquals("HipKro03", Util.getFieldAndFormat("[bibtexkey:]", entry, database));
 	}
-	
+
 	public void testUserFieldAndFormat(){
-	
+
 		String[] names = Globals.prefs.getStringArray(NameFormatterTab.NAME_FORMATER_KEY);
 		if (names == null)
 			names = new String[]{};
-		
+
 		String[] formats = Globals.prefs.getStringArray(NameFormatterTab.NAME_FORMATTER_VALUE);
 		if (formats == null)
 			formats = new String[]{};
-		
+
 		try {
-		
+
 			List<String> f = new LinkedList<String>(Arrays.asList(formats));
 			List<String> n = new LinkedList<String>(Arrays.asList(names));
-			
+
 			n.add("testMe123454321");
 			f.add("*@*@test");
 
 			String[] newNames = n.toArray(new String[n.size()]);
 			String[] newFormats = f.toArray(new String[f.size()]);
-			
+
 			Globals.prefs.putStringArray(NameFormatterTab.NAME_FORMATER_KEY, newNames);
 			Globals.prefs.putStringArray(NameFormatterTab.NAME_FORMATTER_VALUE, newFormats);
-			
+
 			assertEquals("testtest", Util.getFieldAndFormat("[author:testMe123454321]", entry, database));
-		
+
 		} finally {
 			Globals.prefs.putStringArray(NameFormatterTab.NAME_FORMATER_KEY, names);
 			Globals.prefs.putStringArray(NameFormatterTab.NAME_FORMATTER_VALUE, formats);
 		}
 	}
-	
-	
-	
+
+
+
 	public void testExpandBrackets(){
-				
+
 		assertEquals("", Util.expandBrackets("", entry, database));
-		
+
 		assertEquals("dropped", Util.expandBrackets("drop[unknownkey]ped", entry, database));
-		
-		assertEquals("Eric von Hippel and Georg von Krogh", 
+
+		assertEquals("Eric von Hippel and Georg von Krogh",
 				Util.expandBrackets("[author]", entry, database));
-		
-		assertEquals("Eric von Hippel and Georg von Krogh are two famous authors.", 
+
+		assertEquals("Eric von Hippel and Georg von Krogh are two famous authors.",
 				Util.expandBrackets("[author] are two famous authors.", entry, database));
 
-		assertEquals("Eric von Hippel and Georg von Krogh are two famous authors.", 
+		assertEquals("Eric von Hippel and Georg von Krogh are two famous authors.",
 				Util.expandBrackets("[author] are two famous authors.", entry, database));
 
-		assertEquals("Eric von Hippel and Georg von Krogh have published Open Source Software and the \"Private-Collective\" Innovation Model: Issues for Organization Science in Organization Science.", 
+		assertEquals("Eric von Hippel and Georg von Krogh have published Open Source Software and the \"Private-Collective\" Innovation Model: Issues for Organization Science in Organization Science.",
 				Util.expandBrackets("[author] have published [title] in [journal].", entry, database));
 	}
 
     public void testSanitizeUrl() {
-    
+
             assertEquals("http://www.vg.no", Util.sanitizeUrl("http://www.vg.no"));
             assertEquals("http://www.vg.no/fil%20e.html",
                     Util.sanitizeUrl("http://www.vg.no/fil e.html"));
@@ -304,7 +304,7 @@ public class UtilTest extends TestCase {
 
             assertEquals("www.vg.no/fil%20e.html",
                 Util.sanitizeUrl("\\url{www.vg.no/fil%20e.html}"));
-            
+
             /**
              * DOI Test cases
              */
@@ -312,12 +312,12 @@ public class UtilTest extends TestCase {
             assertEquals("http://dx.doi.org/10.1109/VLHCC.2004.20", Util.sanitizeUrl("doi://10.1109/VLHCC.2004.20"));
             assertEquals("http://dx.doi.org/10.1109/VLHCC.2004.20", Util.sanitizeUrl("doi:/10.1109/VLHCC.2004.20"));
             assertEquals("http://dx.doi.org/10.1109/VLHCC.2004.20", Util.sanitizeUrl("doi:10.1109/VLHCC.2004.20"));
-    
+
             /**
              * Additional testcases provided by Hannes Restel and Micha Beckmann.
              */
             assertEquals("ftp://www.vg.no", Util.sanitizeUrl("ftp://www.vg.no"));
-            assertEquals("file://doof.txt", Util.sanitizeUrl("file://doof.txt"));            
+            assertEquals("file://doof.txt", Util.sanitizeUrl("file://doof.txt"));
             assertEquals("file:///", Util.sanitizeUrl("file:///"));
             assertEquals("/src/doof.txt", Util.sanitizeUrl("/src/doof.txt"));
             assertEquals("/", Util.sanitizeUrl("/"));
@@ -339,12 +339,12 @@ public class UtilTest extends TestCase {
     	assertEquals("1932", Util.toFourDigitYear("32", 2001));
     	assertEquals("1944", Util.toFourDigitYear("44", 2001));
     	assertEquals("2011", Util.toFourDigitYear("11", 2001));
-    	
+
     	int thisYear = Calendar.getInstance().get(Calendar.YEAR);
     	int d2 = thisYear % 100;
 
     	NumberFormat f = new DecimalFormat("00");
-    	
+
     	for (int i = 0; i <= 30; i++){
     		assertTrue("" + i, thisYear <= Integer.parseInt(Util.toFourDigitYear(f.format((d2 + i) % 100))));
     	}
@@ -352,7 +352,7 @@ public class UtilTest extends TestCase {
     		assertTrue("" + i, thisYear >= Integer.parseInt(Util.toFourDigitYear(f.format((d2 - i + 100) % 100))));
     	}
     }
-    
+
     public void testToMonthNumber(){
 
     	assertEquals(0, Util.getMonthNumber("jan"));
@@ -367,7 +367,7 @@ public class UtilTest extends TestCase {
     	assertEquals(9, Util.getMonthNumber("oct"));
     	assertEquals(10,Util.getMonthNumber("nov"));
     	assertEquals(11,Util.getMonthNumber("dec"));
-    	
+
     	assertEquals(0, Util.getMonthNumber("#jan#"));
     	assertEquals(1, Util.getMonthNumber("#feb#"));
     	assertEquals(2, Util.getMonthNumber("#mar#"));
@@ -380,7 +380,7 @@ public class UtilTest extends TestCase {
     	assertEquals(9, Util.getMonthNumber("#oct#"));
     	assertEquals(10,Util.getMonthNumber("#nov#"));
     	assertEquals(11,Util.getMonthNumber("#dec#"));
-    	
+
     	assertEquals(0, Util.getMonthNumber("January"));
     	assertEquals(1, Util.getMonthNumber("February"));
     	assertEquals(2, Util.getMonthNumber("March"));
@@ -404,7 +404,7 @@ public class UtilTest extends TestCase {
     	assertEquals(7, Util.getMonthNumber("08"));
     	assertEquals(8, Util.getMonthNumber("09"));
     	assertEquals(9, Util.getMonthNumber("10"));
-    	
+
     	assertEquals(0, Util.getMonthNumber("1"));
     	assertEquals(1, Util.getMonthNumber("2"));
     	assertEquals(2, Util.getMonthNumber("3"));
@@ -414,7 +414,7 @@ public class UtilTest extends TestCase {
     	assertEquals(6, Util.getMonthNumber("7"));
     	assertEquals(7, Util.getMonthNumber("8"));
     	assertEquals(8, Util.getMonthNumber("9"));
-    	    	
+
     	assertEquals(10,Util.getMonthNumber("11"));
     	assertEquals(11,Util.getMonthNumber("12"));
 
@@ -423,44 +423,44 @@ public class UtilTest extends TestCase {
     	assertEquals(-1,Util.getMonthNumber("#test#"));
     	assertEquals(-1,Util.getMonthNumber(""));
     }
-    
+
     public void testToUpperCharFirst(){
-    	
+
     	assertEquals("", Util.toUpperFirstLetter(""));
     	assertEquals("A", Util.toUpperFirstLetter("a"));
     	assertEquals("A", Util.toUpperFirstLetter("A"));
     	assertEquals("An", Util.toUpperFirstLetter("an"));
     	assertEquals("AN", Util.toUpperFirstLetter("AN"));
     	assertEquals("TestTest", Util.toUpperFirstLetter("testTest"));
-        
+
     }
-    
+
     /**
-     * Tests Util.checkForDOI(...) for right functionality 
+     * Tests Util.checkForDOI(...) for right functionality
      */
 	public void testCheckForDoi(){
 		assertEquals(true, Util.checkForDOIwithHTTPprefix("http://doi.acm.org/10.1145/1294928.1294933"));
-		assertEquals(true, Util.checkForDOIwithHTTPprefix("http://dx.doi.org/10.1007/978-3-642-15618-2_19"));	
-		assertEquals(true, Util.checkForDOIwithHTTPprefix("http://dx.doi.org/10.1000/182"));	
-		
-		assertEquals(false, Util.checkForDOIwithHTTPprefix("http://www.xyz.com"));	
-		assertEquals(false, Util.checkForDOIwithHTTPprefix("http://dx.doing.org/fjdlfdsjfdlfdj.htm"));	
-		assertEquals(false, Util.checkForDOIwithHTTPprefix("thfjtfjglkjjlkk�lm5476576658796"));	
+		assertEquals(true, Util.checkForDOIwithHTTPprefix("http://dx.doi.org/10.1007/978-3-642-15618-2_19"));
+		assertEquals(true, Util.checkForDOIwithHTTPprefix("http://dx.doi.org/10.1000/182"));
+
+		assertEquals(false, Util.checkForDOIwithHTTPprefix("http://www.xyz.com"));
+		assertEquals(false, Util.checkForDOIwithHTTPprefix("http://dx.doing.org/fjdlfdsjfdlfdj.htm"));
+		assertEquals(false, Util.checkForDOIwithHTTPprefix("thfjtfjglkjjlkkölm5476576658796"));
 
 		assertEquals(true, Util.checkForDOIwithHTTPprefix("http://doii.acm.org/10.1145/1294928.1294933"));
-		assertEquals(true, Util.checkForDOIwithHTTPprefix("http://dx.ddoi.org/10.1007/978-3-642-15618-2_19"));	
-		assertEquals(true, Util.checkForDOIwithHTTPprefix("http://dx.eoi.org/10.1000/182"));	
+		assertEquals(true, Util.checkForDOIwithHTTPprefix("http://dx.ddoi.org/10.1007/978-3-642-15618-2_19"));
+		assertEquals(true, Util.checkForDOIwithHTTPprefix("http://dx.eoi.org/10.1000/182"));
 	}
-	
+
     /**
-     * Tests Util.parseDOI(...) for right functionality 
+     * Tests Util.parseDOI(...) for right functionality
      */
 	public void testParseDoi(){
 		assertEquals("10.1145/1294928.1294933", Util.getDOI("http://doi.acm.org/10.1145/1294928.1294933"));
 		assertEquals("10.1145/1294928.1294933", Util.getDOI("http://doi.acm.net/10.1145/1294928.1294933"));
 		assertEquals("10.1145/1294928.1294933", Util.getDOI("http://doi.acm.com/10.1145/1294928.1294933"));
 		assertEquals("10.1145/1294928.1294933", Util.getDOI("http://doi.acm.de/10.1145/1294928.1294933"));
-		
+
 		assertEquals("10.1007/978-3-642-15618-2_19", Util.getDOI("http://dx.doi.org/10.1007/978-3-642-15618-2_19"));
 		assertEquals("10.1007/978-3-642-15618-2_19", Util.getDOI("http://dx.doi.net/10.1007/978-3-642-15618-2_19"));
 		assertEquals("10.1007/978-3-642-15618-2_19", Util.getDOI("http://dx.doi.com/10.1007/978-3-642-15618-2_19"));
diff --git a/src/java/tests/net/sf/jabref/bst/BibtexNameFormatterTest.java b/src/java/tests/net/sf/jabref/bst/BibtexNameFormatterTest.java
index c32bf29..e62e6a1 100644
--- a/src/java/tests/net/sf/jabref/bst/BibtexNameFormatterTest.java
+++ b/src/java/tests/net/sf/jabref/bst/BibtexNameFormatterTest.java
@@ -19,7 +19,7 @@ public class BibtexNameFormatterTest extends TestCase {
 				}
 			}));
 		}
-		
+
 		{
 			AuthorList al = AuthorList
 				.getAuthorList("Charles Louis Xavier Joseph de la Vall{\\'e}e Poussin");
@@ -55,7 +55,7 @@ public class BibtexNameFormatterTest extends TestCase {
 					}
 				}));
 		}
-		
+
 		assertNameFormatA("Meyer, J?", "Jonathan Meyer and Charles Louis Xavier Joseph de la Vall{\\'e}e Poussin");
 			assertNameFormatB("J.~Meyer", "Jonathan Meyer and Charles Louis Xavier Joseph de la Vall{\\'e}e Poussin");
 			assertNameFormatC("Jonathan Meyer", "Jonathan Meyer and Charles Louis Xavier Joseph de la Vall{\\'e}e Poussin");
@@ -65,10 +65,10 @@ public class BibtexNameFormatterTest extends TestCase {
 			assertNameFormatA("{\\\"{U}}nderwood, U?", "Ulrich {\\\"{U}}nderwood and Ned {\\~N}et and Paul {\\={P}}ot");
 			assertNameFormatB("U.~{\\\"{U}}nderwood", "Ulrich {\\\"{U}}nderwood and Ned {\\~N}et and Paul {\\={P}}ot");
 			assertNameFormatC("Ulrich {\\\"{U}}nderwood", "Ulrich {\\\"{U}}nderwood and Ned {\\~N}et and Paul {\\={P}}ot");
-			assertNameFormatA("Victor, P.~{\\'E}?", "Paul {\\'E}mile Victor and and de la Cierva y Codorn{\\�\\i}u, Juan");
-			assertNameFormatB("P.~{\\'E}. Victor", "Paul {\\'E}mile Victor and and de la Cierva y Codorn{\\�\\i}u, Juan");
-			assertNameFormatC("Paul~{\\'E}mile Victor", "Paul {\\'E}mile Victor and and de la Cierva y Codorn{\\�\\i}u, Juan");
-		
+			assertNameFormatA("Victor, P.~{\\'E}?", "Paul {\\'E}mile Victor and and de la Cierva y Codorn{\\’\\i}u, Juan");
+			assertNameFormatB("P.~{\\'E}. Victor", "Paul {\\'E}mile Victor and and de la Cierva y Codorn{\\’\\i}u, Juan");
+			assertNameFormatC("Paul~{\\'E}mile Victor", "Paul {\\'E}mile Victor and and de la Cierva y Codorn{\\’\\i}u, Juan");
+
 	}
 
 	private void assertNameFormat(String string, String string2, int which, String format){
@@ -79,7 +79,7 @@ public class BibtexNameFormatterTest extends TestCase {
 				}
 			}));
 	}
-	
+
 	private void assertNameFormatC(String string, String string2) {
 		assertNameFormat(string, string2, 1, "{ff }{vv }{ll}{ jj}");
 	}
diff --git a/src/java/tests/net/sf/jabref/bst/TestVM.java b/src/java/tests/net/sf/jabref/bst/TestVM.java
index 18c39c5..aa6a47e 100644
--- a/src/java/tests/net/sf/jabref/bst/TestVM.java
+++ b/src/java/tests/net/sf/jabref/bst/TestVM.java
@@ -451,7 +451,7 @@ public class TestVM extends TestCase {
 		vm.run(v);
 
 		assertEquals(4, vm.getStack().size());
-		assertEquals("Inproceedings", vm.getStack().pop());
+		assertEquals("InProceedings", vm.getStack().pop());
 		assertEquals("Misc", vm.getStack().pop());
 		assertEquals("Book", vm.getStack().pop());
 		assertEquals("Article", vm.getStack().pop());
diff --git a/src/java/tests/net/sf/jabref/export/layout/HTMLCharsTest.java b/src/java/tests/net/sf/jabref/export/layout/HTMLCharsTest.java
index 0d968d3..9917a9e 100644
--- a/src/java/tests/net/sf/jabref/export/layout/HTMLCharsTest.java
+++ b/src/java/tests/net/sf/jabref/export/layout/HTMLCharsTest.java
@@ -14,18 +14,18 @@ public class HTMLCharsTest extends TestCase {
 
 		assertEquals("hallo", layout.format("hallo"));
 
-		assertEquals("R�flexions sur le timing de la quantit�", layout
-			.format("R�flexions sur le timing de la quantit�"));
+		assertEquals("Réflexions sur le timing de la quantité", layout
+			.format("Réflexions sur le timing de la quantité"));
 
 		assertEquals("hállo", layout.format("h\\'allo"));
-		
+
 		assertEquals("ı ı", layout.format("\\i \\i"));
 		assertEquals("ı", layout.format("\\i"));
 		assertEquals("ı", layout.format("\\{i}"));
 		assertEquals("ıı", layout.format("\\i\\i"));
-		
+
 		assertEquals("Ŀı", layout.format("\\Lmidot\\i"));
-		
+
 		assertEquals("ñ ñ í ı ı", layout.format("\\~{n} \\~n \\'i \\i \\i"));
 	}
 
diff --git a/src/java/tests/net/sf/jabref/export/layout/LayoutTest.java b/src/java/tests/net/sf/jabref/export/layout/LayoutTest.java
index f8c1cc3..cb98fe3 100644
--- a/src/java/tests/net/sf/jabref/export/layout/LayoutTest.java
+++ b/src/java/tests/net/sf/jabref/export/layout/LayoutTest.java
@@ -80,7 +80,7 @@ public class LayoutTest extends TestCase {
 		layoutText = layout("\\begin{author}\\format[HTMLChars]{\\author}\\end{author} ",
 			"@other{bla, author={This\nis\na\n\ntext}}");
 
-		assertEquals("This is a<p>text ", layoutText);
+		assertEquals("This is a<br>text ", layoutText);
 	}
 	
 	public void testPluginLoading() throws Exception {
diff --git a/src/java/tests/net/sf/jabref/export/layout/RTFCharsTest.java b/src/java/tests/net/sf/jabref/export/layout/RTFCharsTest.java
index 12ce481..43627ba 100644
--- a/src/java/tests/net/sf/jabref/export/layout/RTFCharsTest.java
+++ b/src/java/tests/net/sf/jabref/export/layout/RTFCharsTest.java
@@ -15,7 +15,7 @@ public class RTFCharsTest extends TestCase {
 		assertEquals("hallo", layout.format("hallo"));
 
 		// We should be able to replace the ? with e
-		assertEquals("R\\u233?flexions sur le timing de la quantit\\u233?", layout.format("R�flexions sur le timing de la quantit�"));
+		assertEquals("R\\u233?flexions sur le timing de la quantit\\u233?", layout.format("Réflexions sur le timing de la quantité"));
 
 		assertEquals("h\\u225allo", layout.format("h\\'allo"));
 		assertEquals("h\\u225allo", layout.format("h\\'allo"));
@@ -38,7 +38,7 @@ public class RTFCharsTest extends TestCase {
 	public void testComplicated() {
 		LayoutFormatter layout = new RTFChars();
 
-		assertEquals("R\\u233eflexions sur le timing de la quantit\\u233e \\u230ae should be \\u230ae", layout.format("R�flexions sur le timing de la quantit� \\ae should be �"));
+		assertEquals("R\\u233eflexions sur le timing de la quantit\\u233e \\u230ae should be \\u230ae", layout.format("Réflexions sur le timing de la quantité \\ae should be æ"));
 
 		assertEquals("h\\u225all{\\uc2\\u339oe}", layout.format("h\\'all\\oe "));
 	}
@@ -47,40 +47,40 @@ public class RTFCharsTest extends TestCase {
 
 		LayoutFormatter layout = new RTFChars();
 
-		assertEquals("\\u243o", layout.format("\\'{o}")); // �
-		assertEquals("\\'f2", layout.format("\\`{o}")); // �
-		assertEquals("\\'f4", layout.format("\\^{o}")); // �
-		assertEquals("\\'f6", layout.format("\\\"{o}")); // �
-		assertEquals("\\u245o", layout.format("\\~{o}")); // �
+		assertEquals("\\u243o", layout.format("\\'{o}")); // ó
+		assertEquals("\\'f2", layout.format("\\`{o}")); // ò
+		assertEquals("\\'f4", layout.format("\\^{o}")); // ô
+		assertEquals("\\'f6", layout.format("\\\"{o}")); // ö
+		assertEquals("\\u245o", layout.format("\\~{o}")); // õ
 		assertEquals("\\u333o", layout.format("\\={o}"));
 		assertEquals("\\u334O", layout.format("\\u{o}"));
-		assertEquals("\\u231c", layout.format("\\c{c}")); // �
+		assertEquals("\\u231c", layout.format("\\c{c}")); // ç
 		assertEquals("{\\uc2\\u339oe}", layout.format("\\oe"));
 		assertEquals("{\\uc2\\u338OE}", layout.format("\\OE"));
-		assertEquals("{\\uc2\\u230ae}", layout.format("\\ae")); // �
-		assertEquals("{\\uc2\\u198AE}", layout.format("\\AE")); // �
+		assertEquals("{\\uc2\\u230ae}", layout.format("\\ae")); // æ
+		assertEquals("{\\uc2\\u198AE}", layout.format("\\AE")); // Æ
 
 		assertEquals("", layout.format("\\.{o}")); // ???
 		assertEquals("", layout.format("\\v{o}")); // ???
-		assertEquals("", layout.format("\\H{a}")); // � // ???
+		assertEquals("", layout.format("\\H{a}")); // ã // ???
 		assertEquals("", layout.format("\\t{oo}"));
 		assertEquals("", layout.format("\\d{o}")); // ???
 		assertEquals("", layout.format("\\b{o}")); // ???
-		assertEquals("", layout.format("\\aa")); // �
-		assertEquals("", layout.format("\\AA")); // �
-		assertEquals("", layout.format("\\o")); // �
-		assertEquals("", layout.format("\\O")); // �
+		assertEquals("", layout.format("\\aa")); // å
+		assertEquals("", layout.format("\\AA")); // Å
+		assertEquals("", layout.format("\\o")); // ø
+		assertEquals("", layout.format("\\O")); // Ø
 		assertEquals("", layout.format("\\l"));
 		assertEquals("", layout.format("\\L"));
-		assertEquals("{\\uc2\\u223ss}", layout.format("\\ss")); // �
-		assertEquals("", layout.format("?`")); // �
-		assertEquals("", layout.format("!`")); // �
+		assertEquals("{\\uc2\\u223ss}", layout.format("\\ss")); // ß
+		assertEquals("", layout.format("?`")); // ¿
+		assertEquals("", layout.format("!`")); // ¡
 
 		assertEquals("", layout.format("\\dag"));
 		assertEquals("", layout.format("\\ddag"));
-		assertEquals("", layout.format("\\S")); // �
-		assertEquals("", layout.format("\\P")); // �
-		assertEquals("", layout.format("\\copyright")); // �
-		assertEquals("", layout.format("\\pounds")); // �
+		assertEquals("", layout.format("\\S")); // §
+		assertEquals("", layout.format("\\P")); // ¶
+		assertEquals("", layout.format("\\copyright")); // ©
+		assertEquals("", layout.format("\\pounds")); // £
 	}
 }
diff --git a/src/java/tests/net/sf/jabref/imports/CopacImporterTest.java b/src/java/tests/net/sf/jabref/imports/CopacImporterTest.java
index 4f24211..558ebb7 100644
--- a/src/java/tests/net/sf/jabref/imports/CopacImporterTest.java
+++ b/src/java/tests/net/sf/jabref/imports/CopacImporterTest.java
@@ -53,10 +53,10 @@ public class CopacImporterTest extends TestCase {
 			.getResourceAsStream("CopacImporterTest1.txt"), new OutputPrinterToNull());
 		assertEquals(1, entries.size());
 		BibtexEntry entry = entries.get(0);
-		
+
 		assertEquals("The SIS project : software reuse with a natural language approach", entry.getField("title"));
 		assertEquals(
-			"Prechelt, Lutz and Universit�t Karlsruhe. Fakult�t f�r Informatik",
+			"Prechelt, Lutz and Universität Karlsruhe. Fakultät für Informatik",
 			entry.getField("author"));
 		assertEquals("Interner Bericht ; Nr.2/92", entry.getField("series"));
 		assertEquals("1992", entry.getField("year"));
@@ -71,11 +71,11 @@ public class CopacImporterTest extends TestCase {
 			.getResourceAsStream("CopacImporterTest2.txt"), new OutputPrinterToNull());
 		assertEquals(2, entries.size());
 		BibtexEntry one = entries.get(0);
-		
+
 		assertEquals("Computing and operational research at the London Hospital", one.getField("title"));
-		
+
 		BibtexEntry two = entries.get(1);
-	
+
 		assertEquals("Real time systems : management and design", two.getField("title"));
 	}
 }
diff --git a/src/java/tests/net/sf/jabref/imports/OAI2ImportTest.java b/src/java/tests/net/sf/jabref/imports/OAI2ImportTest.java
index 43f0b37..9e7e73f 100644
--- a/src/java/tests/net/sf/jabref/imports/OAI2ImportTest.java
+++ b/src/java/tests/net/sf/jabref/imports/OAI2ImportTest.java
@@ -14,13 +14,13 @@ import org.xml.sax.SAXException;
 
 /**
  * Test for OAI2-Handler and Fetcher.
- * 
+ *
  * @author Ulrich Stärk
  * @author Christian Kopf
  * @author Christopher Oezbek
- * 
+ *
  * @version $Revision$ ($Date$)
- * 
+ *
  */
 public class OAI2ImportTest extends TestCase {
 
@@ -51,7 +51,7 @@ public class OAI2ImportTest extends TestCase {
 		try {
 			saxParser.parse(this.getClass().getResourceAsStream("oai2.xml"), handler);
 			assertEquals("hep-ph/0408155", be.getField("eprint"));
-			assertEquals("G. F. Giudice and A. Riotto and A. Zaffaroni and J. L�pez-Pe�a",
+			assertEquals("G. F. Giudice and A. Riotto and A. Zaffaroni and J. López-Peña",
 				be.getField("author"));
 			assertEquals("Nucl.Phys. B", be.getField("journal"));
 			assertEquals("710", be.getField("volume"));
@@ -83,7 +83,7 @@ public class OAI2ImportTest extends TestCase {
 	public void testOai23xml() throws Throwable {
 		try {
             saxParser.parse(this.getClass().getResourceAsStream("oai23.xml"), handler);
-			assertEquals("Javier L�pez Pe�a and Gabriel Navarro", be.getField("author").toString());
+			assertEquals("Javier López Peña and Gabriel Navarro", be.getField("author").toString());
 		} catch (SAXException e) {
 			throw e.getException();
 		}
@@ -122,7 +122,7 @@ public class OAI2ImportTest extends TestCase {
 			assertEquals("math/0612188", be.getField("eprint"));
 			assertEquals("On the classification and properties of noncommutative duplicates", be
 				.getField("title").toString());
-			assertEquals("Javier L�pez Pe�a and Gabriel Navarro", be.getField("author").toString());
+			assertEquals("Javier López Peña and Gabriel Navarro", be.getField("author").toString());
 			assertEquals("2007", be.getField("year").toString());
 
 			Thread.sleep(20000);
@@ -154,7 +154,7 @@ public class OAI2ImportTest extends TestCase {
 			OAI2Fetcher fetcher = new OAI2Fetcher();
 			be = fetcher.importOai2Entry("hep-ph/0408155");
 			assertNotNull(be);
-			
+
 			assertEquals("hep-ph/0408155", be.getField("eprint"));
 			  Thread.sleep(20000);
         }
@@ -163,7 +163,7 @@ public class OAI2ImportTest extends TestCase {
             OAI2Fetcher fetcher = new OAI2Fetcher();
             be = fetcher.importOai2Entry("0709.3040");
             assertNotNull(be);
-            
+
             assertEquals("2007", be.getField("year"));
             assertEquals("#sep#", be.getField("month"));
         }
diff --git a/src/java/tests/net/sf/jabref/labelPattern/LabelPatternUtilTest.java b/src/java/tests/net/sf/jabref/labelPattern/LabelPatternUtilTest.java
index 30be4c2..9274e3d 100644
--- a/src/java/tests/net/sf/jabref/labelPattern/LabelPatternUtilTest.java
+++ b/src/java/tests/net/sf/jabref/labelPattern/LabelPatternUtilTest.java
@@ -1,12 +1,16 @@
 package tests.net.sf.jabref.labelPattern;
 
 import junit.framework.TestCase;
+import net.sf.jabref.BibtexDatabase;
 import net.sf.jabref.BibtexEntry;
 import net.sf.jabref.imports.BibtexParser;
 import net.sf.jabref.labelPattern.LabelPatternUtil;
 
 public class LabelPatternUtilTest extends TestCase {
 
+    public void setUp() {
+    	LabelPatternUtil.setDataBase(new BibtexDatabase());
+    }
 
     /**
      * Test for https://sourceforge.net/forum/message.php?msg_id=4498555
diff --git a/src/osx/osxadapter/OSXAdapter.java b/src/osx/osxadapter/OSXAdapter.java
index 8d8ea27..1822a90 100644
--- a/src/osx/osxadapter/OSXAdapter.java
+++ b/src/osx/osxadapter/OSXAdapter.java
@@ -1,133 +1,204 @@
 /*
-  File:    OSXAdapter.java
 
-  Description:A single class with clear, static entry points for hooking existing preferences,
-        about, quit functionality from an existing Java app into handlers for the Mac OS X
-        application menu.  Useful for developers looking to support
-        multiple platforms with a single codebase, and support Mac OS X features with
-        minimal impact.
-
-        This sample is designed for Java 1.4.1 and later on Mac OS X.
-
-  Author:    mdrance
-
-  Copyright:   � Copyright 2003 Apple Computer, Inc. All rights reserved.
-
-  Disclaimer:  IMPORTANT:  This Apple software is supplied to you by Apple Computer, Inc.
-        ("Apple") in consideration of your agreement to the following terms, and your
-        use, installation, modification or redistribution of this Apple software
-        constitutes acceptance of these terms.  If you do not agree with these terms,
-        please do not use, install, modify or redistribute this Apple software.
-
-        In consideration of your agreement to abide by the following terms, and subject
-        to these terms, Apple grants you a personal, non-exclusive license, under Apple's
-        copyrights in this original Apple software (the "Apple Software"), to use,
-        reproduce, modify and redistribute the Apple Software, with or without
-        modifications, in source and/or binary forms; provided that if you redistribute
-        the Apple Software in its entirety and without modifications, you must retain
-        this notice and the following text and disclaimers in all such redistributions of
-        the Apple Software.  Neither the name, trademarks, service marks or logos of
-        Apple Computer, Inc. may be used to endorse or promote products derived from the
-        Apple Software without specific prior written permission from Apple.  Except as
-        expressly stated in this notice, no other rights or licenses, express or implied,
-        are granted by Apple herein, including but not limited to any patent rights that
-        may be infringed by your derivative works or by other works in which the Apple
-        Software may be incorporated.
-
-        The Apple Software is provided by Apple on an "AS IS" basis.  APPLE MAKES NO
-        WARRANTIES, EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION THE IMPLIED
-        WARRANTIES OF NON-INFRINGEMENT, MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-        PURPOSE, REGARDING THE APPLE SOFTWARE OR ITS USE AND OPERATION ALONE OR IN
-        COMBINATION WITH YOUR PRODUCTS.
-
-        IN NO EVENT SHALL APPLE BE LIABLE FOR ANY SPECIAL, INDIRECT, INCIDENTAL OR
-        CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
-        GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-        ARISING IN ANY WAY OUT OF THE USE, REPRODUCTION, MODIFICATION AND/OR DISTRIBUTION
-        OF THE APPLE SOFTWARE, HOWEVER CAUSED AND WHETHER UNDER THEORY OF CONTRACT, TORT
-        (INCLUDING NEGLIGENCE), STRICT LIABILITY OR OTHERWISE, EVEN IF APPLE HAS BEEN
-        ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-  Change History (most recent first):
-    04092003  mdrance    added comments
+File: OSXAdapter.java
+
+Abstract: Hooks existing preferences/about/quit functionality from an
+    existing Java app into handlers for the Mac OS X application menu.
+    Uses a Proxy object to dynamically implement the 
+    com.apple.eawt.ApplicationListener interface and register it with the
+    com.apple.eawt.Application object.  This allows the complete project
+    to be both built and run on any platform without any stubs or 
+    placeholders. Useful for developers looking to implement Mac OS X 
+    features while supporting multiple platforms with minimal impact.
+			
+Version: 2.0
+
+Disclaimer: IMPORTANT:  This Apple software is supplied to you by 
+Apple Inc. ("Apple") in consideration of your agreement to the
+following terms, and your use, installation, modification or
+redistribution of this Apple software constitutes acceptance of these
+terms.  If you do not agree with these terms, please do not use,
+install, modify or redistribute this Apple software.
+
+In consideration of your agreement to abide by the following terms, and
+subject to these terms, Apple grants you a personal, non-exclusive
+license, under Apple's copyrights in this original Apple software (the
+"Apple Software"), to use, reproduce, modify and redistribute the Apple
+Software, with or without modifications, in source and/or binary forms;
+provided that if you redistribute the Apple Software in its entirety and
+without modifications, you must retain this notice and the following
+text and disclaimers in all such redistributions of the Apple Software. 
+Neither the name, trademarks, service marks or logos of Apple Inc. 
+may be used to endorse or promote products derived from the Apple
+Software without specific prior written permission from Apple.  Except
+as expressly stated in this notice, no other rights or licenses, express
+or implied, are granted by Apple herein, including but not limited to
+any patent rights that may be infringed by your derivative works or by
+other works in which the Apple Software may be incorporated.
+
+The Apple Software is provided by Apple on an "AS IS" basis.  APPLE
+MAKES NO WARRANTIES, EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION
+THE IMPLIED WARRANTIES OF NON-INFRINGEMENT, MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE, REGARDING THE APPLE SOFTWARE OR ITS USE AND
+OPERATION ALONE OR IN COMBINATION WITH YOUR PRODUCTS.
+
+IN NO EVENT SHALL APPLE BE LIABLE FOR ANY SPECIAL, INDIRECT, INCIDENTAL
+OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) ARISING IN ANY WAY OUT OF THE USE, REPRODUCTION,
+MODIFICATION AND/OR DISTRIBUTION OF THE APPLE SOFTWARE, HOWEVER CAUSED
+AND WHETHER UNDER THEORY OF CONTRACT, TORT (INCLUDING NEGLIGENCE),
+STRICT LIABILITY OR OTHERWISE, EVEN IF APPLE HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+
+Copyright (C) 2003-2007 Apple, Inc., All Rights Reserved
 
 */
-/*package osxadapter;
-
-import net.sf.jabref.JabRefFrame;
-import com.apple.eawt.*;
 
-public class OSXAdapter extends ApplicationAdapter {
+package osxadapter;
+import java.lang.reflect.*;
 
-  // pseudo-singleton model; no point in making multiple instances
-  // of the EAWT application or our adapter
-  private static OSXAdapter            theAdapter;
-  private static com.apple.eawt.Application    theApplication;
 
-  // reference to the app where the existing quit, about, prefs code is
-  private JabRefFrame mainApp;
+public class OSXAdapter implements InvocationHandler {
 
-  private OSXAdapter (JabRefFrame inApp) {
-    mainApp = inApp;
-  }
+    protected Object targetObject;
+    protected Method targetMethod;
+    protected String proxySignature;
+    
+    static Object macOSXApplication;
 
-  // implemented handler methods.  These are basically hooks into existing
-  // functionality from the main app, as if it came over from another platform.
-  public void handleAbout(ApplicationEvent ae) {
-    if (mainApp != null) {
-      ae.setHandled(true);
-      mainApp.about();
-    } else {
-      throw new IllegalStateException("handleAbout: MyApp instance detached from listener");
+    // Pass this method an Object and Method equipped to perform application shutdown logic
+    // The method passed should return a boolean stating whether or not the quit should occur
+    public static void setQuitHandler(Object target, Method quitHandler) {
+        setHandler(new OSXAdapter("handleQuit", target, quitHandler));
     }
-  }
-
-  public void handlePreferences(ApplicationEvent ae) {
-    if (mainApp != null) {
-      mainApp.preferences();
-      ae.setHandled(true);
-    } else {
-      throw new IllegalStateException("handlePreferences: MyApp instance detached from listener");
+    
+    // Pass this method an Object and Method equipped to display application info
+    // They will be called when the About menu item is selected from the application menu
+    public static void setAboutHandler(Object target, Method aboutHandler) {
+        boolean enableAboutMenu = (target != null && aboutHandler != null);
+        if (enableAboutMenu) {
+            setHandler(new OSXAdapter("handleAbout", target, aboutHandler));
+        }
+        // If we're setting a handler, enable the About menu item by calling
+        // com.apple.eawt.Application reflectively
+        try {
+            Method enableAboutMethod = macOSXApplication.getClass().getDeclaredMethod("setEnabledAboutMenu", new Class[] { boolean.class });
+            enableAboutMethod.invoke(macOSXApplication, new Object[] { Boolean.valueOf(enableAboutMenu) });
+        } catch (Exception ex) {
+            System.err.println("OSXAdapter could not access the About Menu");
+            ex.printStackTrace();
+        }
     }
-  }
-
-  public void handleQuit(ApplicationEvent ae) {
-    if (mainApp != null) {
-      /*
-      /  You MUST setHandled(false) if you want to delay or cancel the quit.
-      /  This is important for cross-platform development -- have a universal quit
-      /  routine that chooses whether or not to quit, so the functionality is identical
-      /  on all platforms.  This example simply cancels the AppleEvent-based quit and
-      /  defers to that universal method.
-      *//*
-      ae.setHandled(false);
-      mainApp.quit();
-    } else {
-      throw new IllegalStateException("handleQuit: MyApp instance detached from listener");
+    
+    // Pass this method an Object and a Method equipped to display application options
+    // They will be called when the Preferences menu item is selected from the application menu
+    public static void setPreferencesHandler(Object target, Method prefsHandler) {
+        boolean enablePrefsMenu = (target != null && prefsHandler != null);
+        if (enablePrefsMenu) {
+            setHandler(new OSXAdapter("handlePreferences", target, prefsHandler));
+        }
+        // If we're setting a handler, enable the Preferences menu item by calling
+        // com.apple.eawt.Application reflectively
+        try {
+            Method enablePrefsMethod = macOSXApplication.getClass().getDeclaredMethod("setEnabledPreferencesMenu", new Class[] { boolean.class });
+            enablePrefsMethod.invoke(macOSXApplication, new Object[] { Boolean.valueOf(enablePrefsMenu) });
+        } catch (Exception ex) {
+            System.err.println("OSXAdapter could not access the About Menu");
+            ex.printStackTrace();
+        }
     }
-  }
-
-
-  // The main entry-point for this functionality.  This is the only method
-  // that needs to be called at runtime, and it can easily be done using
-  // reflection (see MyApp.java)
-  public static void registerMacOSXApplication(JabRefFrame inApp) {
-    if (theApplication == null) {
-      theApplication = new com.apple.eawt.Application();
+    
+    // Pass this method an Object and a Method equipped to handle document events from the Finder
+    // Documents are registered with the Finder via the CFBundleDocumentTypes dictionary in the 
+    // application bundle's Info.plist
+    public static void setFileHandler(Object target, Method fileHandler) {
+        setHandler(new OSXAdapter("handleOpenFile", target, fileHandler) {
+            // Override OSXAdapter.callTarget to send information on the
+            // file to be opened
+            public boolean callTarget(Object appleEvent) {
+                if (appleEvent != null) {
+                    try {
+                        Method getFilenameMethod = appleEvent.getClass().getDeclaredMethod("getFilename", (Class[])null);
+                        String filename = (String) getFilenameMethod.invoke(appleEvent, (Object[])null);
+                        this.targetMethod.invoke(this.targetObject, new Object[] { filename });
+                    } catch (Exception ex) {
+                        
+                    }
+                }
+                return true;
+            }
+        });
     }
-
-    if (theAdapter == null) {
-      theAdapter = new OSXAdapter(inApp);
+    
+    // setHandler creates a Proxy object from the passed OSXAdapter and adds it as an ApplicationListener
+    public static void setHandler(OSXAdapter adapter) {
+        try {
+            Class<?> applicationClass = Class.forName("com.apple.eawt.Application");
+            if (macOSXApplication == null) {
+                macOSXApplication = applicationClass.getConstructor((Class[])null).newInstance((Object[])null);
+            }
+            Class<?> applicationListenerClass = Class.forName("com.apple.eawt.ApplicationListener");
+            Method addListenerMethod = applicationClass.getDeclaredMethod("addApplicationListener", new Class[] { applicationListenerClass });
+            // Create a proxy object around this handler that can be reflectively added as an Apple ApplicationListener
+            Object osxAdapterProxy = Proxy.newProxyInstance(OSXAdapter.class.getClassLoader(), new Class[] { applicationListenerClass }, adapter);
+            addListenerMethod.invoke(macOSXApplication, new Object[] { osxAdapterProxy });
+        } catch (ClassNotFoundException cnfe) {
+            System.err.println("This version of Mac OS X does not support the Apple EAWT.  ApplicationEvent handling has been disabled (" + cnfe + ")");
+        } catch (Exception ex) {  // Likely a NoSuchMethodException or an IllegalAccessException loading/invoking eawt.Application methods
+            System.err.println("Mac OS X Adapter could not talk to EAWT:");
+            ex.printStackTrace();
+        }
     }
-    theApplication.addApplicationListener(theAdapter);
-  }
 
-  // Another static entry point for EAWT functionality.  Enables the
-  // "Preferences..." menu item in the application menu.
-  public static void enablePrefs(boolean enabled) {
-    if (theApplication == null) {
-      theApplication = new com.apple.eawt.Application();
+    // Each OSXAdapter has the name of the EAWT method it intends to listen for (handleAbout, for example),
+    // the Object that will ultimately perform the task, and the Method to be called on that Object
+    protected OSXAdapter(String proxySignature, Object target, Method handler) {
+        this.proxySignature = proxySignature;
+        this.targetObject = target;
+        this.targetMethod = handler;
+    }
+    
+    // Override this method to perform any operations on the event 
+    // that comes with the various callbacks
+    // See setFileHandler above for an example
+    public boolean callTarget(Object appleEvent) throws InvocationTargetException, IllegalAccessException {
+        Object result = targetMethod.invoke(targetObject, (Object[])null);
+        if (result == null) {
+            return true;
+        }
+        return Boolean.valueOf(result.toString()).booleanValue();
+    }
+    
+    // InvocationHandler implementation
+    // This is the entry point for our proxy object; it is called every time an ApplicationListener method is invoked
+    public Object invoke (Object proxy, Method method, Object[] args) throws Throwable {
+        if (isCorrectMethod(method, args)) {
+            boolean handled = callTarget(args[0]);
+            setApplicationEventHandled(args[0], handled);
+        }
+        // All of the ApplicationListener methods are void; return null regardless of what happens
+        return null;
+    }
+    
+    // Compare the method that was called to the intended method when the OSXAdapter instance was created
+    // (e.g. handleAbout, handleQuit, handleOpenFile, etc.)
+    protected boolean isCorrectMethod(Method method, Object[] args) {
+        return (targetMethod != null && proxySignature.equals(method.getName()) && args.length == 1);
+    }
+    
+    // It is important to mark the ApplicationEvent as handled and cancel the default behavior
+    // This method checks for a boolean result from the proxy method and sets the event accordingly
+    protected void setApplicationEventHandled(Object event, boolean handled) {
+        if (event != null) {
+            try {
+                Method setHandledMethod = event.getClass().getDeclaredMethod("setHandled", new Class[] { boolean.class });
+                // If the target method returns a boolean, use that as a hint
+                setHandledMethod.invoke(event, new Object[] { Boolean.valueOf(handled) });
+            } catch (Exception ex) {
+                System.err.println("OSXAdapter was unable to handle an ApplicationEvent: " + event);
+                ex.printStackTrace();
+            }
+        }
     }
-    theApplication.setEnabledPreferencesMenu(enabled);
-  }
-}   */
+}
\ No newline at end of file
diff --git a/src/resource/IntegrityMessage_es.properties b/src/resource/IntegrityMessage_es.properties
new file mode 100644
index 0000000..65df9b0
--- /dev/null
+++ b/src/resource/IntegrityMessage_es.properties
@@ -0,0 +1,12 @@
+#!
+#!_created/edited_by_Popeye_version_0.55_(https://github.com/koppor/popeye)
+#!_encoding:ISO-8859-1
+ITEXT_1=existe_ayuda
+ITEXT_1001=atenci\u00f3n
+ITEXT_2001=fallo
+ITEXT_1010=comienzo_del_campo_$FIELD
+ITEXT_1011=final_incorrecto_(campo_$FIELD)
+ITEXT_1012=el_campo_$FIELD_puede_contener_errores
+ITEXT_10=hay_may\u00fasculas_sin_m\u00e1scara_{}_en_el_campo_$FIELD
+ITEXT_11=el_campo_$FIELD_deber\u00eda_contener_un_n\u00famero_de_cuatro_d\u00edgitos
+ITEXT_2010=el_campo_$FIELD_contiene_una_llave_}_de_cierre_no_esperada
\ No newline at end of file
diff --git a/src/resource/IntegrityMessage_ru.properties b/src/resource/IntegrityMessage_ru.properties
new file mode 100644
index 0000000..d798ffd
--- /dev/null
+++ b/src/resource/IntegrityMessage_ru.properties
@@ -0,0 +1,11 @@
+#! created/edited by Popeye version 0.51 sunshine (popeye.sourceforge.net)
+
+ITEXT_1=���� ���������
+ITEXT_1001=��������������
+ITEXT_2001=������
+ITEXT_1010=������ ���� $FIELD
+ITEXT_1011=�������� ����� (���� $FIELD)
+ITEXT_1012=�������� ������� ������ � ���� $FIELD
+ITEXT_10=���� ������ � �������������� ��� ����� {} � ���� $FIELD
+ITEXT_11=���� $FIELD ���� ������ ��������� ������ �����
+ITEXT_2010=�������������� ����������� } � ���� $FIELD
diff --git a/src/resource/JabRef_da.properties b/src/resource/JabRef_da.properties
index 67b665c..0b5c08b 100644
--- a/src/resource/JabRef_da.properties
+++ b/src/resource/JabRef_da.properties
@@ -107,7 +107,6 @@ Background_color_for_optional_fields=Baggrundsfarve_for_valgfrie_felter
 Background_color_for_required_fields=Baggrundsfarve_for_obligatoriske_felter
 Backup_old_file_when_saving=Lav_sikkerhedskopi_ved_gemning
 Beta_version=Betaversion
-Bibkey_to_filename_conversion=Konvertering_af_BibTeX-n\u00f8gle_til_filnavn
 BibTeX_key=BibTeX-n\u00f8gle
 BibTeX_key_is_unique.=BibTeX-n\u00f8glen_er_unik
 BibTeX_key_not_set._Enter_a_name_for_the_downloaded_file=BibTeX-n\u00f8gle_er_ikke_sat._Angiv_et_navn_for_den_hentede_file
@@ -117,7 +116,6 @@ Binding=Genvejstast
 Broken_link=Ugyldigt_link
 Browse=Gennemse
 by=med
-Calling_external_viewer...=Kalder_eksternt_program...
 Cancel=Annuller
 Cannot_add_entries_to_group_without_generating_keys._Generate_keys_now?=Kan_ikke_f\u00f8je_poster_til_en_gruppe_uden_at_generere_n\u00f8gler._Vil_du_generere_n\u00f8gler_nu?
 Cannot_merge_this_change=Kan_ikke_inkorporere_denne_\u00e6ndring
@@ -172,7 +170,6 @@ Command_line_id=Kommandolinje-id
 Complete_record=Komplet_post
 Connect=Tilslut
 Connect_to_SQL_database=Tilslut_til_SQL-database
-Connect_to_SQL_Database=Tilslut_til_SQL-Database
 Connection_to_IEEEXplore_failed=Tilslutning_til_IEEExplore_mislykkedes
 Contained_in=Indeholdt_i
 Content=Indhold
@@ -187,8 +184,6 @@ Copy_files_to_file_directory.=Kopier_filer_til_filbibliotek.
 
 Copy_to_clipboard=Kopier_til_udklipsholder
 Could_not_call_executable=Kunne_ikke_kalde_programfilen
-Could_not_connect_to_a_running_gnuserv_process._Make_sure_that_Emacs_or_XEmacs_is_running,<BR>and_that_the_server_has_been_started_(by_running_the_command_'gnuserv-start').=Kunne_ikke_kontakte_en_igangv\u00e6rende_gnuserv-proces._Kontroller_at_Emacs_eller_XEmacs_k\u00f8rer<BR>og_at_serveren_er_startet_(med_kommandoen_'gnuserv-start').
-Could_not_connect_to_host_=Kunne_ikke_forbinde_til_v\u00e6rt_
 Could_not_connect_to_Vim_server._Make_sure_that_Vim_is_running<BR>with_correct_server_name.=Kunne_ikke_forbinde_til_Vim-server._Tjek_at_Vim_kj\u00f8rer<BR>med_korrekt_servernavn.
 Could_not_export_file=Kunne_ikke_eksportere
 Could_not_export_preferences=Kunne_ikke_eksportere_indstillinger
@@ -210,7 +205,6 @@ Could_not_print_preview=Kunne_ikke_printe_forh\u00e5ndsvisning
 Could_not_run_the_'vim'_program.=Kunne_ikke_k\u00f8re_'vim'-programmet
 Could_not_save_file=Kunne_ikke_gemme_fil
 Could_not_save_file._Character_encoding_'%0'_is_not_supported.=Kunne_ikke_gemme_fil._Tegnkodingen_'%0'_er_ikke_underst\u00f8ttet.
-Create_group=Opret_gruppe
 Created_groups.=Oprettede_grupper.
 
 crossreferenced_entries_included=refererede_poster_inkluderet
@@ -218,8 +212,6 @@ Current_content=Nuv\u00e6rende_indhold
 Current_value=Nuv\u00e6rende_v\u00e6rdi
 Custom_entry_types=Brugerdefinerede_posttyper
 Custom_entry_types_found_in_file=Fandt_brugerdefinerede_posttyper_i_filen
-Custom_icon_theme=Brugerdefineret_ikons\u00e6t
-Custom_icon_theme_file=Ikons\u00e6t-fil
 Custom_importers=Brugerdefinerede_importformater
 Customize_entry_types=Tilpas_posttyper
 Customize_key_bindings=Ops\u00e6tning_af_genvejstaster
@@ -229,7 +221,6 @@ cut_entry=klip_post
 Cut_pr=Klippede
 Database_\:=Database:
 Database_encoding=Tegnkoding_for_database
-Database_has_changed._Do_you_want_to_save_before_closing?=Databasen_er_\u00e6ndret._Vil_du_gemme,_f\u00f8r_du_lukker_den?
 Database_properties=Databaseegenskaber
 Date_format=Datoformat
 Default=Standard
@@ -285,8 +276,6 @@ Downloading...=Downloader...
 
 Drag_and_Drop_Error=Fejl_ved_tr\u00e6k-og-slip
 Drop_%0=Slip_%0
-duplicate_BibTeX_key=dubleret_BibTeX-n\u00f8gle
-Duplicate_BibTeX_key.=Dubleret_BibTeX-n\u00f8gle.
 Duplicate_BibTeX_key._Grouping_may_not_work_for_this_entry.=BibTeX-n\u00f8glen_er_ikke_unik._Gruppering_kan_fejle_for_denne_post.
 Duplicate_Key_Warning=Advarsel:_Ikke-unik_n\u00f8gle
 Duplicate_pairs_found=Dubletpar_fundet
@@ -309,10 +298,8 @@ Edit_preamble=Rediger_pr\u00e6ambel
 Edit_strings=Rediger_tekststrenge
 Editor_options=Alternativer_for_redigering
 empty_BibTeX_key=tom_BibTeX-n\u00f8gle
-Empty_BibTeX_key.=Tom_BibTeX-n\u00f8gle
 Empty_BibTeX_key._Grouping_may_not_work_for_this_entry.=Tom_BibTeX-n\u00f8gle._Gruppering_kan_fejle_for_denne_post.
 empty_database=tom_database
-Enable_source_editing=Tillad_redigering_af_kildekode
 Enable_word/name_autocompletion=Aktiver_autokomplettering_af_navn/ord
 Endnote=Endnote
 Enter_URL=Skriv_URL
@@ -336,7 +323,7 @@ Entry_types=Posttyper
 Error=Fejl
 Error\:_=Fejl:_
 
-Error_converting_Bibtex_to_XMP\:_%0=Fejl_ved_konvertering_af_BibTeX_til_XMP:_%0
+Error_converting_BibTeX_to_XMP\:_%0=Fejl_ved_konvertering_af_BibTeX_til_XMP:_%0
 Error_converting_XMP_to_'%0'...=Fejl_ved_konvertering_af_XMP_for_'%0'...
 Error_exporting_to_clipboard=Fejl_ved_eksport_til_udklipsholder
 Error_in_field=Fejl_i_felt
@@ -346,7 +333,6 @@ Error_opening_file=Fejl_ved_\u00e5bning_af_fil
 Error_setting_field=Problem_med_at_s\u00e6tte_felt
 Error_while_converting_BibtexEntry_to_XMP_%0=Fejl_ved_konvertering_af_BibTeX-posten_til_XMP_%0
 Error_while_downloading_file\:=Fejl_under_hentning_af_fil:
-Error_while_fetching_from_OIA2=Fejl_ved_hentning_fra_OIA2
 Error_while_writing=En_fejl_opstod_ved_skrivning
 
 Error_writing_to_%0_file(s).=Fejl_ved_skrivning_til_%0_fil(er).
@@ -385,7 +371,6 @@ Field_sizes=Feltst\u00f8rrelser
 
 Field_to_filter=Felt_som_skal_filtreres
 Field_to_group_by=Grupperingsfelt
-Fields=Felter
 File=Fil
 file=fil
 
@@ -512,17 +497,13 @@ Insert_selected_citations_into_LyX/Kile=Send_valgte_poster_til_LyX/Kile
 Insert_selected_citations_into_WinEdt=Send_valgte_poster_til_WinEdt
 insert_string_=inds\u00e6t_streng_
 Insert_URL=Inds\u00e6t_URL
-integrity=integritet
 Integrity_check=Integritetstjek
 Intersection=F\u00e6llesm\u00e6nge
 Invalid_BibTeX_key=Ugyldig_BibTeX-n\u00f8gle
 Invalid_date_format=Ugyldigt_datoformat
 Invalid_URL=Ugyldig_URL
 Inverted=Inverteret
-is_a_standard_type.=er_en_standardtype.
 ISO_abbreviation=ISO-forkortelse
-Item_list_for_field=Ordliste_for_felt
-jabref=jabref
 JabRef_help=JabRef-hj\u00e6lp
 JabRef_preferences=JabRef-indstillinger
 Journal_abbreviations=Tidsskriftsforkortelser
@@ -558,7 +539,6 @@ Listen_for_remote_operation_on_port=Lyt_efter_fjernoperationer_p\u00e5_port
 Load_and_Save_preferences_from/to_jabref.xml_on_start-up_(memory_stick_mode)=Hent_og_gem_indstillinger_fra/til_jabref.xml_ved_opstart_(memory_stick-tilstand)
 Load_session=Hent_session
 Loading_session...=Henter_session...
-localhost=localhost
 Look_and_feel=Udseende
 Looking_for_pdf...=Leder_efter_pdf...
 lower=sm\u00e5_bogstaver
@@ -629,7 +609,6 @@ No_entries_found._Please_make_sure_you_are_using_the_correct_import_filter.=Inge
 No_entries_found_for_the_search_string_'%0'=Fandt_ingen_poster_for_s\u00f8geteksten_'%0'
 No_entries_imported.=Ingen_poster_importeret.
 No_entries_or_multiple_entries_selected.=Ingen_eller_flere_poster_valgt.
-No_entries_selected=Ingen_poster_valgt
 No_entries_selected.=Ingen_poster_valgt.
 No_exceptions_have_ocurred.=Der_er_ikke_sket_nogen_undtagelser.
 No_files_found.=Ingen_filer_fundet.
@@ -654,7 +633,6 @@ Nothing_to_undo=Ingenting_at_fortryde
 # The next is used like in "References found: 1  Number of references to fetch?"
 Number_of_references_to_fetch?=Antal_referencer_som_skal_hentes?
 occurences=forekomster
-OK=OK
 Ok=OK
 One_or_more_file_links_are_of_the_type_'%0',_which_is_undefined._What_do_you_want_to_do?=Et_eller_flere_links_er_af_typen_'%0',_som_er_udefineret._Hvad_vil_du_g\u00f8re?
 One_or_more_keys_will_be_overwritten._Continue?=En_eller_flere_n\u00f8gler_vil_blive_overskrevet._Forts\u00e6t?
@@ -709,12 +687,10 @@ PDF_directory=PDF-bibliotek
 PDF_does_not_exist=PDF-filen_findes_ikke
 Personal_journal_list=Personlig_tidsskriftsliste
 Plain_text_import=Import_fra_ren_tekst
-Please_check_your_network_connection_to_this_machine.=Tjek_venligst_maskinens_netv\u00e6rksforbindelse.
 Please_enter_a_name_for_the_group.=Skriv_et_navn_til_gruppen.
 Please_enter_a_search_term._For_example,_to_search_all_fields_for_<b>Smith</b>,_enter%c<p><tt>smith</tt><p>To_search_the_field_<b>Author</b>_for_<b>Smith</b>_and_the_field_<b>Title</b>_for_<b>electrical</b>,_enter%c<p><tt>author%esmith_and_title%eelectrical</tt>=Skriv_et_s\u00f8geudtryk._For_eksempel,_for_at_s\u00f8ge_i_alle_felter_efter_<b>Olsen</b>,_skriv%c<p><tt>olsen</tt><p>For_at_s\u00f8ge_i_<b>Author</b>-feltet_efter_<b>Olsen</b>_og_i_<b>Title</b>-feltet_efter_<b>electrical</b>,_sk [...]
 Please_enter_the_field_to_search_(e.g._<b>keywords</b>)_and_the_keyword_to_search_it_for_(e.g._<b>electrical</b>).=Skriv_venligsts_feltet_som_skal_s\u00f8ges_i_(f.eks._<b>keywords</b>)_og_n\u00f8gleordet_at_s\u00f8ge_efter_(f.eks._<b>electrical</b>).
 Please_enter_the_string's_label=Skriv_et_navn_for_strengen
-Please_select_an_importer=V\u00e6lg_venligst_et_importformat
 Please_select_an_importer.=V\u00e6lg_venligst_et_importfilter.
 Please_select_exactly_one_group_to_move.=V\u00e6lg_pr\u00e6cis_\u00e9n_gruppe_til_flytning.
 Please_specify_the_=Angiv_venligst_
@@ -786,7 +762,6 @@ Removed_group_"%0"_and_its_subgroups.=Fjernede_gruppen_"%0"_og_dens_undergrupper
 Removed_string=Streng_fjernet
 
 Renamed_string=\u00e6ndrede_navn_p\u00e5_streng
-Replace=Erstat
 Replace_(regular_expression)=Erstat_(regul\u00e6rudtryk)
 Replace_string=Erstat_streng
 Replace_with=Erstat_med
@@ -802,7 +777,6 @@ Revert_to_original_source=Ret_tilbage_til_oprindelig_kildekode
 Review=Kommentarer
 Review_changes=Gennemse_\u00e6ndringer
 Right=H\u00f8jre
-root=root
 Save=Gem
 Save_all_finished.=Alle_databaser_gemt
 
@@ -825,18 +799,15 @@ Saving_database=Gemmer_database
 # Integrity check is a process that checks for indications of wrongly filled out bibtex fields. "Scan" is the button that starts the check.
 Scan=S\u00f8g
 Search=S\u00f8g
-Search_All_Fields=S\u00f8g_i_alle_felter
 Search_all_fields=S\u00f8g_i_alle_felter
 Search_error=Fejl_ved_s\u00f8gning
 Search_expression=S\u00f8geudtryk
 Search_for=S\u00f8g_efter
 Search_general_fields=S\u00f8g_i_generelle_felter
 Search_IEEEXplore=S\u00f8g_i_IEEEXplore
-
-Search_IEEExplore=S\u00f8g_i_IEEExplore
 Search_optional_fields=S\u00f8g_i_valgfrie_felter
 Search_required_fields=S\u00f8g_i_obligatoriske_felter
-Search_Specified_Field(s)=S\u00f8g_specificerede_felt(er)
+Search_specified_field(s)=S\u00f8g_specificerede_felt(er)
 Searched_database._Global_number_of_hits=Database_gennems\u00f8gt._Globalt_antal_match
 Searched_database._Number_of_hits=Database_gennems\u00f8gt._Antal_match
 Searching_for_%0_file=S\u00f8ger_efter_%0-fil
@@ -860,7 +831,6 @@ Select_matches=V\u00e6lg_match
 Select_new_ImportFormat_Subclass=V\u00e6lg_klasse_til_nyt_importformat
 Select_the_tree_nodes_to_view_and_accept_or_reject_changes=V\u00e6lg_forgreningerne_for_at_inspicere_og_acceptere_eller_forkaste_\u00e6ndringer
 Selected_entries=Valgte_poster
-Selector_enabled_fields=Felter_med_ordliste
 Server_Hostname_\:=Server_v\u00e6rtsnavn:
 Server_Type_\:=Server-type:
 
@@ -940,12 +910,10 @@ Target_file_cannot_be_a_directory.=Angivet_fil_kan_ikke_v\u00e6re_et_bibliotek.
 Tertiary_sort_criterion=Terti\u00e6rt_sorteringskriterium
 Test=Test
 Text_Input_Area=Indtastningsfelt
-The_#_character_is_not_allowed_in_BibTeX_fields=#-tegnet_er_ikke_tilladt_i_BibTeX-felter
 #The_application_'%0'_associated_with_the_file_type_'%1'_could_not_be_called.=Applikationen_'%0'_associeret_med_filtypen_'%1'_kunne_ikke_startes.
 The_chosen_date_format_for_new_entries_is_not_valid=Det_valgte_datoformat_er_ugyldigt
 
 The_chosen_encoding_'%0'_could_not_encode_the_following_characters\:_=Den_valgte_tegnkodning_'%0'_kunne_ikke_kode_de_f\u00f8lgende_tegn:_
-The_CiteSeer_fetch_operation_returned_zero_results.=Hentning_fra_CiteSeerX_gav_ingen_resultater.
 The_current_version_features_a_new_way_of_handling_links_to_external_files.<br>To_take_advantage_of_this,_your_links_must_be_changed_into_the_new_format,_and<br>JabRef_must_be_configured_to_show_the_new_links.=Denne_version_tilbyder_en_ny_m\u00e5de_at_h\u00e5ndtere_links_til_eksterne_filer.<br>For_at_benytte_dette,_skal_dine_links_\u00e6ndres_til_det_nye_format,_og<br>JabRef_skal_konfigureres_til_at_vise_de_nye_links.
 the_field_<b>%0</b>=feltet_<b>%0</b>
 The_file<BR>'%0'<BR>has_been_modified<BR>externally!=Filen<BR>'%0'<BR>er_blevet_\u00e6ndret<BR>eksternt!
@@ -960,7 +928,6 @@ The_search_is_case_insensitive.=S\u00f8gningen_skelner_ikke_mellem_store_og_sm\u
 The_search_is_case_sensitive.=S\u00f8gningen_skelner_mellem_store_og_sm\u00e5_bogstaver.
 The_string_has_been_removed_locally=Strengen_er_blevet_slettet_lokalt
 There_are_possible_duplicates_(marked_with_a_'D'_icon)_that_haven't_been_resolved._Continue?=Der_findes_mulige_dubletter_(m\u00e6rket_med_et_'D'-ikon)_som_ikke_er_blevet_h\u00e5ndteret._Forts\u00e6t?
-this_button_will_update=denne_knap_vil_opdatere
 This_database_was_written_using_an_older_version_of_JabRef.=Denne_database_blev_gemt_i_en_\u00e6ldre_version_af_JabRef.
 This_entry_has_no_BibTeX_key._Generate_key_now?=Denne_post_har_ingen_BibTeX-n\u00f8gle._Generer_n\u00f8gle_nu?
 This_entry_is_incomplete=Denne_post_er_ufuldst\u00e6ndig
@@ -972,14 +939,12 @@ This_group_contains_entries_in_which_any_field_contains_the_regular_expression_<
 This_group_contains_entries_in_which_any_field_contains_the_term_<b>%0</b>=Denne_gruppe_indeholder_poster,_som_har_teksten_<b>%0</b>_i_et_hvilket_som_helst_felt
 This_group_contains_entries_whose_<b>%0</b>_field_contains_the_keyword_<b>%1</b>=Denne_gruppe_indeholder_poster_hvis_<b>%0</b>-felt_indeholder_n\u00f8gleordet_<b>%1</b>
 This_group_contains_entries_whose_<b>%0</b>_field_contains_the_regular_expression_<b>%1</b>=Denne_gruppe_indeholder_poster,_hvis_<b>%0</b>-felt_stemmer_med_regul\u00e6rudtrykket_<b>%1</b>
-This_is_a_simple_copy_and_paste_dialog_for_import_some_fields_from_normal_text.=Dette_er_et_enkelt_klip-og-inds\u00e6t-vindue._Indtast_eller_kopier_f\u00f8rst_tekst_til_indtastningsfeltet._Derefter_kan_du_markere_tekst_og_tildele_den_til_et_BibTeX-felt.
 
 This_makes_JabRef_look_up_each_%0_link_and_check_if_the_file_exists._If_not,_you_will_be_given_options<BR>to_resolve_the_problem.=Dette_f\u00e5r_JabRef_til_at_sl\u00e5_hvert_%0-link_op_og_tjekke,_om_filen_eksisterer._Hvis_ikke_vil_du_f\u00e5_mulighed_for_at<br>l\u00f8se_problemet.
 #This_makes_JabRef_look_up_each_%0_link_and_check_if_the_file_exists._If_not,_you_will_be_given_options<BR>to_resolve_the_problem.=Dette_f\u00e5r_JabRef_til_at_unders\u00f8ge_hvert_%0-link_og_tjekke,_om_filen_eksisterer._Hvis_ikke_vil_du_f\u00e5_mulighed<BR>for_at_l\u00f8se_problemet.
 This_operation_requires_all_selected_entries_to_have_BibTex_keys_defined.=Denne_operation_kr\u00e6ver,_at_alle_valgte_poster_har_definerede_BibTeX-n\u00f8gler.
 This_operation_requires_at_least_one_entry.=Denne_operation_kr\u00e6ver_mindst_en_post.
 This_operation_requires_one_or_more_entries_to_be_selected.=Denne_operation_kr\u00e6ver,_at_en_eller_flere_poster_er_valgt.
-This_will_move_all_external_links_from_the_'pdf'_and_'ps'_fields_into_the_'%0'_field._Proceed?=Denne_operation_vil_flytte_alle_eskterne_links_fra_'pdf'-_og_'ps'-felterne_til_'%0'-feltet._Forts\u00e6t?
 To_set_up,_go_to_<B>Tools_->_Manage_journal_abbreviations</B>=For_at_s\u00e6tte_op,_g\u00e5_til_<B>V\u00e6rkt\u00f8jer_->_Ops\u00e6t_tidsskriftsforkortelser</b>
 Toggle_abbreviation=Forkort/ekspander
 Toggle_entry_preview=Vis/skjul_forh\u00e5ndsvisning
@@ -989,7 +954,6 @@ Try_different_encoding=Pr\u00f8v_en_anden_tegnkodning
 Type_set_to_'other'=Type_sat_til_'other'
 Unabbreviate_journal_names_of_the_selected_entries=Ekspander_tidsskriftsnavn_for_de_valgte_poster
 Unabbreviated_%0_journal_names.=Ekspanderede_%0_tidsskriftsnavn.
-unable_to_access_LyX-pipe=ingen_adgang_til_LyX-pipe
 Unable_to_create_graphical_interface=Kunne_ikke_oprette_grafisk_brugerflade
 Unable_to_open_file.=Kan_ikke_\u00e5bne_fil.
 Unable_to_open_link._The_application_'%0'_associated_with_the_file_type_'%1'_could_not_be_called.=Kan_ikke_\u00e5bne_link._Applikationen_'%0'_associeret_med_filtypen_'%1'_kunne_ikke_kaldes.
@@ -1014,7 +978,6 @@ untitled=uden_navn
 Up=Op
 Update_to_current_column_widths=Brug_nuv\u00e6rende_kolonnebredder
 Updated_group_selection=Gruppevalg_opdateret
-Upgrade_external_links=Opgrader_eksterne_links
 Upgrade_external_PDF/PS_links_to_use_the_'%0'_field.=Opgrader_eksterne_PDF-_og_PS-links_til_at_bruge_'%0'-feltet.
 Upgrade_file=Opgrader_fil
 Upgrade_old_external_file_links_to_use_the_new_feature=Opgrader_gamle_eksterne_links_for_at_bruge_den_nye_funktion
@@ -1023,16 +986,13 @@ UPPER=STORE_BOGSTAVER
 Upper_Each_First=Stort_Forbogstav
 Upper_first=Stort_f\u00f8rste_forbogstav
 usage=brug
-Use_antialiasing_font=Brug_udglattet_skrifttype
 Use_autocompletion_for_the_following_fields=Brug_autoudfyldning_for_f\u00f8lgende_felter
-Use_custom_icon_theme=Benyt_brugerdefineret_ikons\u00e6t
 Use_default_viewer=Brug_standardprogram_for_filtypen
 Use_inspection_window_also_when_a_single_entry_is_imported.=Brug_ogs\u00e5_inspektionsvindue,_n\u00e5r_kun_\u00e9n_post_importeres.
 Use_native_file_dialog=Brug_system-fildialog
 Use_other_look_and_feel=Brug_andet_udseende
 Use_Regular_Expression_Search=Brug_s\u00f8gning_med_regul\u00e6rudtryk
 Use_regular_expressions=Brug_regul\u00e6rudtryk
-Use_the_following_delimiter_character(s)=Brug_f\u00f8lgende_separatortegn
 Username_\:=Brugernavn:
 Value_cleared_externally=V\u00e6rdi_slettet_eksternt
 Value_set_externally=V\u00e6rdi_sat_eksternt
@@ -1083,7 +1043,6 @@ Your_new_key_bindings_have_been_stored.=Dine_nye_genvejstaster_er_blevet_gemt.
 The_following_fetchers_are_available\:=F\u00f8lgende_hentev\u00e6rkt\u00f8jer_er_tilg\u00e6ngelige:
 Could_not_find_fetcher_'%0'=Kunne_ikke_finde_hentev\u00e6rkt\u00f8jet_'%0'
 Running_Query_'%0'_with_fetcher_'%1'.=K\u00f8rer_foresp\u00f8rgsel_'%0'_med_hentev\u00e6rkt\u00f8jet_'%1'.
-Please_wait!=Vent_venligst!
 Query_'%0'_with_fetcher_'%1'_did_not_return_any_results.=Foresp\u00f8rgsel_'%0'_med_hentev\u00e6rkt\u00f8jet_'%1'_returnerede_ingen_resultater.
 Open_SPIRES_entry=\u00c5bn_SPIRES_post
 Move/Rename_file=Flyt/omd\u00f8b_fil
@@ -1091,7 +1050,6 @@ File_moved=Fil_flyttet
 Move_file_failed=Flytning_af_fil_mislykkedes
 Could_not_move_file=Kunne_ikke_flytte_fil
 Could_not_find_file_'%0'.=Kunne_ikke_finde_filen_'%0'.
-Move/rename_file=Flyt/omd\u00f8b_fil
 Number_of_entries_successfully_imported=Antal_poster_korrekt_importeret
 Import_canceled_by_user=Import_afbrudt_af_bruger
 Progress\:_%0_of_%1=Fremskridt:_%0_af_%1
@@ -1201,11 +1159,9 @@ Version=Version
 Unknown=Ukendt
 Not_loaded=Ikke_indl\u00e6st
 Loaded=Indl\u00e6st
-Could_not_determine_version_of_=Kunne_ikke_fastsl\u00e5_version_af_
 Install_anyway?=Installer_alligevel?
 
 Looking_for_full_text_document...=S\u00f8ger_efter_tekstdokument...
-Follow_DOI_or_URL_link_and_try_to_locate_PDF_full_text_document=F\u00f8lg_DOI-_eller_URL-link_og_fors\u00f8g_at_lokalisere_PDF-tekstdokument
 Unable_to_find_full_text_article._No_search_algorithm_defined_for_the_'%0'_web_site.=Kunne_ikke_finde_tekstdokument._Ingen_s\u00f8gealgoritme_defineret_for_webstedet_'%0'.
 Found_pdf_link,_but_received_the_wrong_MIME_type._This_could_indicate_that_you_don't_have_access_to_the_fulltext_article.=PDF-link_fundet,_men_forkert_MIME-type_modtaget._Dette_kan_indikere,_at_du_ikke_har_adgang_til_tekstdokumentet.
 
@@ -1252,8 +1208,6 @@ Before_saving,_please_edit_any_strings_containing_the_#_character.=Ret_venligst_
 
 Save_without_backup?=Gem_uden_sikkerhedskopi?
 Unable_to_create_backup=Kan_ikke_oprette_sikkerhedskopi
-
-File_directory_is_not_set_or_does_not_exist.=Filbibliotek_er_ikke_specificeret_eller_eksisterer_ikke.
 Move_file_to_file_directory.=Flyt_fil_til_filbibliotek.
 Rename_file_to=Omd\u00f8b_fil_til
 <b>All_Entries</b>_(this_group_cannot_be_edited_or_removed)=<b>Alle_poster</b>_(denne_gruppe_kan_ikke_redigeres_eller_flyttes)
@@ -1274,7 +1228,6 @@ Error_initializing_custom_export_format_from_string_'%0'=Fejl_ved_initialisering
 
 BibLaTeX_mode=BibLaTeX-tilstand
 Optional_fields_2=Valgfri_felter_2
-Please_wait=Vent_venligst
 Waiting_for_save_operation_to_finish=Venter_p\u00e5_gemme-operation
 Resolving_duplicate_BibTeX_keys...=Udreder_dublerede_BibTeX-n\u00f8gler...
 Finished_resolving_duplicate_BibTeX_keys._%0_entries_modified.=Udredning_af_dublerede_BibTeX-n\u00f8gler_afsluttet._%0_poster_\u00e6ndret.
@@ -1287,7 +1240,6 @@ Duplicate_BibTeX_key=Dubleret_BibTeX-n\u00f8gle
 Duplicate_key=Dubleret_n\u00f8gle
 Generate_key=Generer_n\u00f8gle
 Import_marking_color=Farve_til_m\u00e6rkning_af_importerede_poster
-%0_entries_found._To_reduce_server_load,_only_%1_will_be_downloaded._It_will_be_very_slow,_in_order_to_make_ACM_happy.=%0_poster_fundet._For_at_reducere_serverbelastningen_vil_kun_%1_poster_blive_hentet._Det_vil_g\u00e5_meget_langsomt_for_g\u00f8re_ACM_glade.
 BibTeX_importer=BibTeX-import\u00f8r
 Always_add_letter_(a,_b,_...)_to_generated_keys=Tilf\u00f8j_altid_bogstav_(a,_b,_...)_til_genererede_n\u00f8gler
 
@@ -1304,7 +1256,6 @@ An_autosave_file_was_found_for_this_database._This_could_indicate_=En_automatisk
 that_JabRef_didn't_shut_down_cleanly_last_time_the_file_was_used.=at_JabRef_ikke_lukkede_korrekt_ned,_sidst_filen_var_i_brug.
 General_file_directory=Generelt_filbibliotek
 User-specific_file_directory=Brugerspecifikt_filbibliotek
-Error_setting_look_and_feel=Fejl_i_indstilling_af_"look_and_feel"
 Search_failed\:_illegal_search_expression=S\u00f8gning_fejlede:_illegalt_s\u00f8geudtryk
 Show_ArXiv_column=Vis_ArXiv-kolonne
 <HTML>Unpack_the_zip_file_containing_import/export_filters_for_Endnote,<BR>for_optimal_interoperability_with_JabRef</HTML>=<HTML>Udpak_zip-filen_med_import-/eksport-filtre_til_Endnote,<BR>for_optimal_interoperabilitet_med_JabRef</HTML>
@@ -1320,7 +1271,6 @@ Create_entry_based_on_XMP_data=Opret_post_baseret_p\u00e5_XMP-data
 Create_entry_based_on_data_fetched_from=Opret_post_baseret_p\u00e5_data_fra
 Create_blank_entry_linking_the_PDF=Opret_tom_post_med_link_til_PDF-filen
 Only_attach_PDF=Tilf\u00f8j_kun_PDF
-Mr._dLib_Metadata_Entries_Associated_With\:=Mr._dLib_metadata_poster_associeret_med:
 Mr._dLib_Metadata_Entries_Associated_With_PDF_File=Mr._dLib_metadata_poster_associeret_med_PDF-fil
 Title=Titel
 Author(s)=Forfatter(e)
@@ -1339,21 +1289,18 @@ Update_Existing_Entry=Opdater_eksisterende_post
 Mr._dLib=Mr._dLib
 More_information=Mere_information
 Fetching_Metadata...=Henter_metadata...
-Metadata=Metadata
 Autocomplete_names_in_'Firstname_Lastname'_format_only=Autofuldf\u00f8r_kun_navne_i_formatet_'Fornavn_Efternavn'
 Autocomplete_names_in_'Lastname,_Firstname'_format_only=Autofuldf\u00f8r_kun_navne_i_formatet_'Efternavn,_Fornavn'
 Autocomplete_names_in_both_formats=Autofuldf\u00f8r_navne_i_begge_formater
 Marking_color_%0=M\u00e6rkningsfarve_%0
 The_name_'comment'_can_not_be_used_as_an_entry_type_name.=Navnet_'comment'_kan_ikke_bruges_som_navn_p\u00e5_en_posttype.
 You_must_enter_an_integer_value_in_the_text_field_for=Der_skal_indtastes_et_heltal_i_tekstfeltet_til
-File_directory=Filbibliotek
 Send_as_email=Send_som_email
 References=Referencer
 Sending_of_emails=Afsendelse_af_emails
 Subject_for_sending_an_email_with_references=Emne_for_afsendelse_af_en_email_med_referencer
 Automatically_open_folders_of_attached_files=\u00c5bn_automatisk_biblioteker_for_vedh\u00e6ftede_filer
 Create_entry_based_on_content=Opret_post_baseret_p\u00e5_indhold
-Store_choice_as_default=Gem_valg_som_standard
 Do_not_show_this_box_again_for_this_import=Vis_ikke_denne_dialogboks_igen_for_denne_import
 Always_use_this_PDF_import_style_(and_do_not_ask_for_each_import)=Brug_altid_denne_PDF-importstil_(og_sp\u00f8rg_ikke_for_hver_enkelt_import)
 Error_creating_email=Fejl_ved_oprettelse_af_email
@@ -1379,7 +1326,6 @@ Extra_information_(e.g._page_number)=Ekstra_information_(f.eks._sidenr.)
 Manage_citations=Administrer_referencer
 Problem_modifying_citation=Der_opstod_et_problem_med_at_\u00e6ndre_referencen
 Citation=Reference
-Context=Kontekst
 Extra_information=Ekstra_information
 Could_not_resolve_BibTeX_entry_for_citation_marker_'%0'.=Kunne_ikke_udrede_BibTeX-post_for_referencen_'%0'.
 Styles=Stile
@@ -1405,12 +1351,10 @@ Combine_pairs_of_citations_that_are_separated_by_spaces_only=Kombiner_referencep
 Autodetection_failed=Autodetektion_fejlede
 Connecting=Tilslutter
 Please_wait...=Vent_venligst...
-Unable_to_connect=Kunne_ikke_tilslutte
 Set_connection_parameters=Ops\u00e6t_forbindelsesindstillinger
 Path_to_OpenOffice_directory=Sti_til_OpenOffice-bibliotek
 Path_to_OpenOffice_executable=Sti_til_OpenOffice-programfil
 Path_to_OpenOffice_library_dir=Sti_til_OpenOffice-biblioteksfil
-Autodetect=Autodetekter
 Connection_lost=Forbindelse_tabt
 The_paragraph_format_is_controlled_by_the_property_'ReferenceParagraphFormat'_or_'ReferenceHeaderParagraphFormat'_in_the_style_file.=Afsnitsformatet_styres_af_indstillingen_'ReferenceParagraphFormat'_eller_'ReferenceHeaderParagraphFormat'_i_stil-filen.
 The_character_format_is_controlled_by_the_citation_property_'CitationCharacterFormat'_in_the_style_file.=Tegnformatet_styres_af_referenceindstillingen_'CitationCharacterFormat'_i_stil-filen.
@@ -1433,7 +1377,6 @@ JSTOR_import_cancelled=JSTOR_import_afbrudt
 HTML_list=HTML-liste
 Click_group_to_toggle_membership_of_selected_entries=Klik_p\u00e5_gruppe_for_at_\u00e6ndre_medlemsskab_for_de_valgte_poster
 Use_EMACS_23_insertion_string=Brug_EMACS_23-inds\u00e6tningstekststreng
-Normalize_to_BibTeX_name_format=
 If_possible,_normalize_this_list_of_names_to_conform_to_standard_BibTeX_name_formatting=
 Could_not_open_%0=Kunne_ikke_\u00e5bne_%0
 Unknown_import_format=
@@ -1442,7 +1385,6 @@ An_Error_occurred_while_fetching_from_INSPIRE_source_(%0)\:=
 Error_while_fetching_from_Inspire\:_=
 Web_search=
 Autocomplete_names=
-You_must_select_either_a_valid_style_file,_or_use_the_default_style.=
 
 Default_style=
 Choose_style_file_directly=
@@ -1485,7 +1427,6 @@ Autocompletion_options=
 Autocomplete_after_following_number_of_characters=
 Name_format_used_for_autocompletion=
 Treatment_of_first_names=
-No_icon_found_for_%0=
 Cleanup_entries=
 Automatically_assign_new_entry_to_selected_groups=
 Move_DOIs_from_note_and_URL_field_to_DOI_field_and_remove_http_prefix=
@@ -1499,11 +1440,8 @@ Doing_a_cleanup_for_%0_entries...=
 No_entry_needed_a_clean_up=
 One_entry_needed_a_clean_up=
 %0_entries_needed_a_clean_up=
-Imported_=
 Error_importing_from_database=
 Minimize_to_system_tray=
-Incomplete_search_results=
-%0_entries_were_found,_but_only_%1_of_these_could_be_resolved.=
 
 Error_downloading_file_'%0'=
 Download_failed=
@@ -1529,10 +1467,9 @@ Unable_to_clear_preferences.=
 
 Reset_preferences_(key1,key2,..._or_'all')=
 Find_unlinked_files=
-Select_All=
-Unselect_All=
-Expand_All=
-Collapse_All=
+Unselect_all=
+Expand_all=
+Collapse_all=
 Select_Directory=
 Choose_Directory=
 Use_the_selected_directory_to_start_with_the_search.=
@@ -1592,7 +1529,6 @@ Priority_medium=
 Quality=
 Rank=
 Relevance=
-Set_priority=
 Set_priority_to_high=
 Set_priority_to_low=
 Set_priority_to_medium=
@@ -1624,7 +1560,6 @@ Correct_the_entry,_and_reopen_editor_to_display/edit_source.=
 Could_not_connect_to_a_running_gnuserv_process._Make_sure_that_Emacs_or_XEmacs_is_running,<BR>and_that_the_server_has_been_started_(by_running_the_command_'server-start'/'gnuserv-start').=
 Could_not_connect_to_running_OpenOffice.\nMake_sure_you_have_installed_OpenOffice_with_Java_support.\nIf_connecting_manually,_please_verify_program_and_library_paths.\n\nError_message\:_=
 Created_group_"%0".=
-File_has_been_updated_externally._Are_you_sure_you_want_to_save?=
 If_a_pasted_or_imported_entry_already_has_the_field_set,_overwrite.=
 Import_Metadata_From_PDF=
 Not_connected_to_any_Writer_document._Please_make_sure_a_document_is_open,_and_use_the_'Select_Writer_document'_button_to_connect_to_it.=
@@ -1659,4 +1594,62 @@ An_Error_occurred_while_parsing_abstract=
 Unknown_DiVA_entry\:_'%0'.=
 Get_BibTeX_entry_from_DiVA=
 Log=
-Remove_unneccessary_$,_{,_and_}=
+
+ISO_690=
+
+Add_brackets_and_replace_separators_with_their_non-breaking_version_for_units=
+Add_new_entry_and_keep_both_old_entries=
+Cancelled_merging_entries=
+Error_in_entry=
+First_entry=
+Format_units_by_adding_non-breaking_separators_and_keeping_the_correct_case_on_search=
+Merge_entries=
+Merged_entries_into_a_new_and_kept_the_old=
+Merged_entries_into_a_new_and_removed_the_old=
+Merged_entry=
+None=
+Parse=
+Remove_unneccessary_$,_{,_and_}_and_move_adjacent_numbers_into_equations=
+Replace_old_entries_with_new_entry=
+Result=
+Second_entry=
+Show_DOI_first=
+Show_URL_first=
+Use_1st=
+Use_2nd=
+Use_Emacs_key_bindings=
+You_have_to_choose_exactly_two_entries_to_merge.=
+
+Update_timestamp_on_modification=
+change_field=
+
+All_key_bindings_will_be_reset_to_their_defaults.=
+Automatically_set_file_links=
+Continue?=
+Resetting_all_key_bindings=
+Save_entries_ordered_by_title=
+Export_entries_ordered_by_title=
+Quotes=
+Curly_Brackets=
+Include_empty_fields=
+Field_saving_options=
+Field_value_delimiter._E.g.,_"author\={x}"_or_"author\='x'"=
+Run_Unicode_converter_on_title,_author(s),_and_abstract=
+
+Database_has_changed._Do_you_want_to_save_before_closing?=
+Host=
+Invalid_setting=
+Network=
+Please_specify_both_hostname_and_port=
+Port=
+Start_field_contents_in_same_column=
+Use_camel_case_for_field_names_(e.g.,_"HowPublished"_instead_of_"howpublished")=
+Use_custom_proxy_configuration=
+Clear_connection_settings=
+Cleared_connection_settings.=
+Rebind_C-a,_too=
+
+Show_number_of_elements_contained_in_each_group=
+
+Open_folder=
+Opened_%0_folder(s).=
diff --git a/src/resource/JabRef_de.properties b/src/resource/JabRef_de.properties
index ec0f68a..e1fcd5e 100644
--- a/src/resource/JabRef_de.properties
+++ b/src/resource/JabRef_de.properties
@@ -190,8 +190,6 @@ Background_color_for_required_fields=Hintergrundfarbe_f\u00fcr_ben\u00f6tigte_Fe
 Backup_old_file_when_saving=Beim_Speichern_ein_Backup_der_alten_Datei_anlegen
 Beta_version=Beta-Version
 
-Bibkey_to_filename_conversion=Konvertierung_von_BibTeX-Key_zu_Dateiname
-
 BibTeX_key=BibTeX-Key
 
 BibTeX_key_is_unique.=Der_BibTeX-Key_ist_eindeutig.
@@ -209,8 +207,6 @@ Browse=Durchsuchen
 
 by=durch
 
-Calling_external_viewer...=Externes_Anzeigeprogramm_wird_aufgerufen
-
 Cancel=Abbrechen
 
 Cannot_add_entries_to_group_without_generating_keys._Generate_keys_now?=Eintr\u00e4ge_k\u00f6nnen_einer_Gruppe_nicht_hinzugef\u00fcgt_werden,_ohne_Keys_zu_generieren._Sollen_die_Keys_jetzt_generiert_werden?
@@ -312,7 +308,6 @@ Command_line_id=Kommandozeilen_ID
 Complete_record=Kompletter_Eintrag
 Connect=Verbinden
 Connect_to_SQL_database=Mit_SQL-Datenbank_verbinden
-Connect_to_SQL_Database=Mit_SQL-Datenbank_verbinden
 Connection_to_IEEEXplore_failed=Verbindung_zu_IEEEXplore_fehlgeschlagen
 
 Contained_in=Enthalten_in
@@ -336,11 +331,6 @@ Copy_files_to_file_directory.=Dateien_in_das_Dateiverzeichnis_kopieren.
 Copy_to_clipboard=In_die_Zwischenablage_kopieren
 
 Could_not_call_executable=Konnte_das_Programm_nicht_aufrufen
-
-Could_not_connect_to_a_running_gnuserv_process._Make_sure_that_Emacs_or_XEmacs_is_running,<BR>and_that_the_server_has_been_started_(by_running_the_command_'gnuserv-start').=Konnte_zu_keinem_aktiven_gnuserv-Prozess_verbinden._Vergewissern_Sie_sich,_dass_(X)Emacs_l\u00e4uft,<BR>und_dass_der_Server_gestartet_wurde_(mit_dem_Befehl_'gnuserv-start').
-
-# I have reformulated the following lines, because the 1st person form is not suitable:
-Could_not_connect_to_host_=Verbindung_zum_Host_fehlgeschlagen
 Could_not_connect_to_Vim_server._Make_sure_that_Vim_is_running<BR>with_correct_server_name.=Verbindung_zum_Vim-Server_fehlgeschlagen._Vergewissern_Sie_sich,<br>dass_Vim_mit_korrektem_Servernamen_l\u00e4uft.
 
 Could_not_export_file=Konnte_Datei_nicht_exportieren
@@ -369,8 +359,6 @@ Could_not_run_the_'vim'_program.=Das_Programm_'vim'_konnte_nicht_gestartet_werde
 Could_not_save_file=Datei_konnte_nicht_gespeichert_werden
 Could_not_save_file._Character_encoding_'%0'_is_not_supported.=Die_Datei_konnte_nicht_gespeichert_werden._Die_Zeichenkodierung_'%0'_wird_nicht_unterst\u00fctzt.
 
-Create_group=Gruppe_anlegen
-
 Created_groups.=Gruppen_erstellt.
 
 crossreferenced_entries_included=Inklusive_querverwiesenen_Eintr\u00e4gen
@@ -382,8 +370,6 @@ Current_value=Aktueller_Wert
 Custom_entry_types=Benutzerdefinierte_Eintragstypen
 
 Custom_entry_types_found_in_file=Benutzerdefinierte_Eintragstypen_gefunden
-Custom_icon_theme=Pers\u00f6nliches_Icon-Theme
-Custom_icon_theme_file=Datei_des_pers\u00f6nlichen_Icon-Themes
 
 Custom_importers=Externe_Importfilter
 
@@ -402,8 +388,6 @@ Database_\:=Datenbank:
 
 Database_encoding=Zeichenkodierung_der_Datei
 
-Database_has_changed._Do_you_want_to_save_before_closing?=Die_Datei_wurde_ge\u00e4ndert._Wollen_Sie_vor_dem_Beenden_speichern?
-
 Database_properties=Eigenschaften_der_Datei
 
 Date_format=Datumsformat
@@ -503,10 +487,6 @@ Downloading...=Download_l\u00e4uft
 Drag_and_Drop_Error='Drag_&_Drop'-Fehler
 Drop_%0=%0_streichen
 
-duplicate_BibTeX_key=doppelter_BibTeX-Key
-
-Duplicate_BibTeX_key.=Doppelter_BibTeX-Key.
-
 Duplicate_BibTeX_key._Grouping_may_not_work_for_this_entry.=Doppelter_BibTeX-Key._Es_kann_sein,_dass_die_Gruppierung_f\u00fcr_diesen_Eintrag_nicht_funktioniert.
 
 Duplicate_Key_Warning=Warnung:_Key_bereits_vorhanden
@@ -546,13 +526,9 @@ Editor_options=Herausgeber-Optionen
 
 empty_BibTeX_key=leerer_BibTeX-Key
 
-Empty_BibTeX_key.=Leerer_BibTeX-Key.
-
 Empty_BibTeX_key._Grouping_may_not_work_for_this_entry.=Leerer_BibTeX-Key._Es_kann_sein,_dass_die_Gruppierung_f\u00fcr_diesen_Eintrag_nicht_funktioniert.
 
 empty_database=leere_Datenbank
-
-Enable_source_editing=Bearbeiten_von_Sourcecode_zulassen
 Enable_word/name_autocompletion=Autovervollst\u00e4ndigung_aktivieren
 
 Endnote=Endnote
@@ -593,7 +569,7 @@ Entry_types=Eintragstypen
 
 Error=Fehler
 Error\:_=Fehler:_
-Error_converting_Bibtex_to_XMP\:_%0=Fehler_beim_Konvertieren_von_BibTeX_nach_XMP:_%0
+Error_converting_BibTeX_to_XMP\:_%0=Fehler_beim_Konvertieren_von_BibTeX_nach_XMP:_%0
 Error_converting_XMP_to_'%0'...=Fehler_beim_Konvertieren_von_XMP_nach_'%0'...
 Error_exporting_to_clipboard=Fehler_beim_Exportieren_in_die_Zwischenablage
 
@@ -607,7 +583,6 @@ Error_opening_file=Fehler_beim_\u00d6ffnen_der_Datei
 Error_setting_field=Fehler_beim_Erstellen_des_Feldes
 Error_while_converting_BibtexEntry_to_XMP_%0=Fehler_beim_Konvertieren_des_BibTeX-Eintrags_nach_XMP_%0
 Error_while_downloading_file\:=Fehler_beim_Herunterladen_der_Datei:
-Error_while_fetching_from_OIA2=Fehler_beim_Abrufen_von_OIA2
 Error_while_writing=Fehler_beim_Schreiben
 
 Error_writing_to_%0_file(s).=Fehler_beim_Schreiben_in_%0_Datei(en).
@@ -670,8 +645,6 @@ Field_to_filter=Feld_f\u00fcr_Filter
 
 Field_to_group_by=Sortierfeld
 
-Fields=Felder
-
 File=Datei
 
 file=Datei
@@ -888,8 +861,6 @@ insert_string_=String_einf\u00fcgen_
 
 Insert_URL=URL_einf\u00fcgen
 
-integrity=Integrit\u00e4t
-
 # Integrity check is a process that checks for indications of wrongly filled out bibtex fields. "Scan" is the button that starts the check.
 Integrity_check=Integrit\u00e4ts\u00fcberpr\u00fcfung
 
@@ -903,13 +874,8 @@ Invalid_URL=Ung\u00fcltige_URL
 
 Inverted=Invertiert
 
-is_a_standard_type.=ist_ein_Standardtyp
-
 ISO_abbreviation=ISO-Abk\u00fcrzung
 
-Item_list_for_field=Wortliste_f\u00fcr_Feld
-jabref=jabref
-
 JabRef_help=JabRef_Hilfe
 
 JabRef_preferences=JabRef_Einstellungen
@@ -968,7 +934,6 @@ Load_and_Save_preferences_from/to_jabref.xml_on_start-up_(memory_stick_mode)=Ein
 Load_session=Sitzung_laden
 
 Loading_session...=Lade_Sitzung...
-localhost=localhost
 
 Look_and_feel=Aussehen
 Looking_for_pdf...=Suche_nach_pdf...
@@ -1093,8 +1058,6 @@ No_entries_found_for_the_search_string_'%0'=F\u00fcr_den_Suchausdruck_'%0'_wurde
 No_entries_imported.=Keine_Eintr\u00e4ge_importiert.
 
 No_entries_or_multiple_entries_selected.=Keine_oder_mehrere_Eintr\u00e4ge_ausgew\u00e4hlt.
-
-No_entries_selected=Keine_Eintr\u00e4ge_ausgew\u00e4hlt.
 No_entries_selected.=Keine_Eintr\u00e4ge_ausgew\u00e4hlt.
 
 No_exceptions_have_ocurred.=Es_sind_keine_Ausnahmen_aufgetreten.
@@ -1137,8 +1100,6 @@ Number_of_references_to_fetch?=Anzahl_der_abzurufenden_Literaturangaben?
 
 occurences=Ausdr\u00fccke
 
-OK=OK
-
 Ok=OK
 
 One_or_more_file_links_are_of_the_type_'%0',_which_is_undefined._What_do_you_want_to_do?=Mindestens_ein_Dateilink_ist_vom_Typ_'%0',_der_nicht_definiert_ist._Was_wollen_Sie_tun?
@@ -1229,8 +1190,6 @@ Personal_journal_list=Pers\u00f6nliche_Zeitschriftenliste
 
 Plain_text_import=Klartext_importieren
 
-Please_check_your_network_connection_to_this_machine.=Bitte_\u00fcberpr\u00fcfen_Sie_die_Netzwerkverbindung_ihres_Computers.
-
 Please_enter_a_name_for_the_group.=Bitte_geben_Sie_einen_Namen_f\u00fcr_die_Gruppe_ein.
 
 Please_enter_a_search_term._For_example,_to_search_all_fields_for_<b>Smith</b>,_enter%c<p><tt>smith</tt><p>To_search_the_field_<b>Author</b>_for_<b>Smith</b>_and_the_field_<b>Title</b>_for_<b>electrical</b>,_enter%c<p><tt>author%esmith_and_title%eelectrical</tt>=Bitte_geben_Sie_einen_Suchausdruck_ein._Um_zum_Beispiel_alle_Felder_nach_<b>Smith</b>_zu_durchsuchen,_geben_Sie_ein%c<p><tt>smith</tt><p>Um_das_Feld_<b>Author</b>_nach_<b>Smith</b>_und_das_Feld_<b>Title</b>_nach_<b>electrical</b> [...]
@@ -1239,8 +1198,6 @@ Please_enter_the_field_to_search_(e.g._<b>keywords</b>)_and_the_keyword_to_searc
 
 Please_enter_the_string's_label=Geben_Sie_bitte_den_Namen_des_Strings_ein.
 
-Please_select_an_importer=Bitte_Importer_ausw\u00e4hlen
-
 Please_select_an_importer.=Bitte_Importer_ausw\u00e4hlen.
 
 Please_select_exactly_one_group_to_move.=Bitte_genau_eine_zu_bewegende_Gruppe_ausw\u00e4hlen.
@@ -1371,8 +1328,6 @@ Removed_string=String_gel\u00f6scht
 
 Renamed_string=String_umbenannt
 
-Replace=Ersetzen
-
 Replace_(regular_expression)=Ersetzen_(regul\u00e4rer_Ausdruck)
 
 Replace_string=String_ersetzen
@@ -1400,7 +1355,6 @@ Review=\u00dcberpr\u00fcfung
 Review_changes=\u00c4nderungen_\u00fcberpr\u00fcfen
 
 Right=Rechts
-root=root
 
 Save=Speichern
 Save_all_finished.=Speichern_aller_Dateien_beendet
@@ -1438,8 +1392,6 @@ Scan=\u00dcberpr\u00fcfen
 
 Search=Suchen
 
-Search_All_Fields=Durchsuche_alle_Felder
-
 Search_all_fields=Alle_Felder_durchsuchen
 
 Search_error=Suchfehler
@@ -1451,13 +1403,12 @@ Search_for=Suchen_nach
 Search_general_fields=Allgemeine_Felder_durchsuchen
 
 Search_IEEEXplore=IEEEXplore_durchsuchen
-Search_IEEExplore=IEEExplore-Suche
 
 Search_optional_fields=Optionale_Felder_durchsuchen
 
 Search_required_fields=Ben\u00f6tigte_Felder_durchsuchen
 
-Search_Specified_Field(s)=Durchsuche_diese(s)_Feld(er)
+Search_specified_field(s)=Durchsuche_diese(s)_Feld(er)
 
 Searched_database._Global_number_of_hits=Datenbank_durchsucht._Anzahl_Treffer
 
@@ -1499,8 +1450,6 @@ Select_new_ImportFormat_Subclass=Klasse_ausw\u00e4hlen
 
 Select_the_tree_nodes_to_view_and_accept_or_reject_changes=W\u00e4hlen_Sie_die_Verzweigungen_aus,_um_die_\u00c4nderungen_zu_sehen_und_anzunehmen_oder_zu_verwerfen
 Selected_entries=Ausgew\u00e4hlte_Eintr\u00e4ge
-
-Selector_enabled_fields=Felder_mit_Wortliste
 Server_Hostname_\:=Hostname_des_Servers:
 Server_Type_\:=Servertyp
 
@@ -1642,14 +1591,10 @@ Test=Test
 
 Text_Input_Area=Text_einf\u00fcgen
 
-The_#_character_is_not_allowed_in_BibTeX_fields=Das_Zeichen_#_ist_in_BibTeX-Feldern_nicht_erlaubt
-
 The_chosen_date_format_for_new_entries_is_not_valid=Das_Datumsformat_f\u00fcr_neue_Eintr\u00e4ge_ist_nicht_g\u00fcltig
 
 The_chosen_encoding_'%0'_could_not_encode_the_following_characters\:_=Die_gew\u00e4hlte_Kodierung_'%0'_konnte_folgende_Buchstaben_nicht_darstellen:_
 
-The_CiteSeer_fetch_operation_returned_zero_results.=Das_Importieren_von_CiteSeerX_ergab_keine_Ergebnisse.
-
 The_current_version_features_a_new_way_of_handling_links_to_external_files.<br>To_take_advantage_of_this,_your_links_must_be_changed_into_the_new_format,_and<br>JabRef_must_be_configured_to_show_the_new_links.=Die_aktuelle_Version_hat_eine_neue_Methode,_Links_zu_externen_Dateien_zu_behandeln.<br>Um_sie_zu_nutzen,_m\u00fcssen_Ihre_Links_in_das_neue_Format_\u00fcbertragen_werden<br>und_JabRef_muss_konfiguriert_werden,_um_die_neuen_Links_anzuzeigen.
 
 the_field_<b>%0</b>=das_Feld_<b>%0</b>
@@ -1676,8 +1621,6 @@ The_search_is_case_sensitive.=Gro\u00df-/Kleinschreibung_wird_unterschieden.
 The_string_has_been_removed_locally=Der_String_wurde_lokal_entfernt
 
 There_are_possible_duplicates_(marked_with_a_'D'_icon)_that_haven't_been_resolved._Continue?=Es_gibt_m\u00f6gliche_Duplikate_(markiert_mit_'D'),_die_nicht_gekl\u00e4rt_werden_konnten._Fortfahren?
-
-this_button_will_update=Dieser_Button_\u00e4ndert_die_verwendete<BR>Spaltenbreite_in_der_Tabelle_der_Eintr\u00e4ge
 This_database_was_written_using_an_older_version_of_JabRef.=Diese_Datei_wurde_mit_einer_\u00e4lteren_JabRef-Version_erstellt.
 This_entry_has_no_BibTeX_key._Generate_key_now?=Dieser_Eintrag_hat_keinen_BibTeX-Key._Soll_jetzt_einer_erstellt_werden?
 
@@ -1697,8 +1640,6 @@ This_group_contains_entries_in_which_any_field_contains_the_term_<b>%0</b>=Diese
 This_group_contains_entries_whose_<b>%0</b>_field_contains_the_keyword_<b>%1</b>=Diese_Gruppe_enth\u00e4lt_Eintrage,_deren_Feld_<b>%0</b>_das_Stichwort_<b>%1</b>_enth\u00e4lt
 
 This_group_contains_entries_whose_<b>%0</b>_field_contains_the_regular_expression_<b>%1</b>=Diese_Gruppe_enth\u00e4lt_Eintrage,_deren_Feld_<b>%0</b>_den_regul\u00e4ren_Ausdruck_<b>%1</b>_enth\u00e4lt
-
-This_is_a_simple_copy_and_paste_dialog_for_import_some_fields_from_normal_text.=Dies_ist_ein_einfacher_Copy_&_Paste_Dialog_zum_Einf\u00fcgen_von_Feldern_aus_normalem_Text.
 This_makes_JabRef_look_up_each_%0_link_and_check_if_the_file_exists._If_not,_you_will_be_given_options<BR>to_resolve_the_problem.=JabRef_untersucht_damit_jeden_%0-Link_und_\u00fcberpr\u00fcft,_ob_die_Datei_existiert._Falls_nicht,_werden_Ihnen_Optionen_gegeben,<BR>um_das_Problem_zu_l\u00f6sen.
 
 This_operation_requires_all_selected_entries_to_have_BibTex_keys_defined.=F\u00fcr_diesen_Vorgang_m\u00fcssen_alle_ausgew\u00e4hlen_Eintr\u00e4ge_einen_BibTeX-Key_haben.
@@ -1706,8 +1647,6 @@ This_operation_requires_at_least_one_entry.=Dieser_Vorgang_ben\u00f6tigt_mindest
 
 This_operation_requires_one_or_more_entries_to_be_selected.=F\u00fcr_diesen_Vorgang_muss_mindestens_ein_Eintrag_ausgew\u00e4hlt_sein.
 
-This_will_move_all_external_links_from_the_'pdf'_and_'ps'_fields_into_the_'%0'_field._Proceed?=Alle_externen_Links_werden_aus_den_PDF-_und_PS-Feldern_in_das_Feld_'%0'_verschoben._Fortfahren?
-
 To_set_up,_go_to_<B>Tools_->_Manage_journal_abbreviations</B>=Einstellungen_unter_<B>Optionen_->_Einstellungen_der_Zeitschriften_verwalten</B>
 
 Toggle_abbreviation=Abk\u00fcrzung_an-/abschalten
@@ -1721,8 +1660,6 @@ Type_set_to_'other'=Typ_als_'other'_deklariert
 Unabbreviate_journal_names_of_the_selected_entries=Abk\u00fcrzung_der_Zeitschriftentitel_der_ausgew\u00e4hlten_Eintr\u00e4ge_aufheben
 Unabbreviated_%0_journal_names.=Bei_%0_Zeitschriftentiteln_wurde_die_Abk\u00fcrzung_aufgehoben.
 
-unable_to_access_LyX-pipe=LyX-pipe_nicht_gefunden
-
 Unable_to_create_graphical_interface=Grafische_Benutzeroberfl\u00e4che_konnte_nicht_erzeugt_werden
 Unable_to_open_file.=Datei_kann_nicht_ge\u00f6ffnet_werden.
 Unable_to_open_link._The_application_'%0'_associated_with_the_file_type_'%1'_could_not_be_called.=\u00d6ffnen_des_Links_nicht_m\u00f6glich._Die_Anwendung_'%0',_die_dem_Dateityp_'%1'_zugeordnet_ist,_konnte_nicht_aufgerufen_werden.
@@ -1765,7 +1702,6 @@ Up=Hoch
 Update_to_current_column_widths=Aktuelle_Spaltenbreiten_verwenden
 
 Updated_group_selection=Gruppenauswahl_aktualisiert
-Upgrade_external_links=Externe_Links_aktualisieren
 Upgrade_external_PDF/PS_links_to_use_the_'%0'_field.=Externe_PDF/PS-Links_aktualisieren,_um_das_Feld_'%0'_zu_benutzen.
 Upgrade_file=Datei_aktualisiert
 Upgrade_old_external_file_links_to_use_the_new_feature=Alte_Links_zu_externen_Dateien_aktualisieren,_um_die_neue_Funktion_zu_nutzen
@@ -1775,10 +1711,7 @@ Upper_Each_First=Jeden_Ersten_Buchstaben_Gro\u00df
 Upper_first=Ersten_Buchstaben_gro\u00df
 
 usage=Benutzung
-
-Use_antialiasing_font=Antialias-Schrift_benutzen
 Use_autocompletion_for_the_following_fields=Autovervollst\u00e4ndigung_f\u00fcr_folgende_Felder_benutzen
-Use_custom_icon_theme=Angepasstes_Icon-Theme_verwenden
 Use_default_viewer=Standard-Anwendung_benutzen
 
 Use_inspection_window_also_when_a_single_entry_is_imported.=Kontrollfenster_benutzen,_auch_wenn_nur_ein_Eintrag_importiert_wird
@@ -1789,8 +1722,6 @@ Use_other_look_and_feel=anderes_"look_and_feel"_benutzen
 Use_Regular_Expression_Search=Suche_mit_regul\u00e4rem_Ausdruck_benutzen
 
 Use_regular_expressions=Regul\u00e4re_Ausdr\u00fccke_benutzen
-
-Use_the_following_delimiter_character(s)=Folgende(s)_Trennzeichen_benutzen
 Username_\:=Benutzername:
 
 Value_cleared_externally=Wert_extern_gel\u00f6scht
@@ -1863,7 +1794,6 @@ Your_new_key_bindings_have_been_stored.=Ihre_neuen_Tastenk\u00fcrzel_wurden_gesp
 The_following_fetchers_are_available\:=Folgende_Recherchetools_stehen_zur_Verf\u00fcgung:
 Could_not_find_fetcher_'%0'=Recherchetool_'%0'_konnte_nicht_gefunden_werden
 Running_Query_'%0'_with_fetcher_'%1'.=Abfrage_'%0'_wird_mit_dem_Recherchetool_'%1'_durchgef\u00fchrt.
-Please_wait!=Bitte_warten!
 Query_'%0'_with_fetcher_'%1'_did_not_return_any_results.=Die_Abfrage_'%0'_mit_dem_Recherchetool_'%1'_lieferte_keine_Ergebnisse.
 Open_SPIRES_entry=SPIRES-Eintrag_\u00f6ffnen
 Move/Rename_file=Datei_verschieben/umbenennen
@@ -1871,7 +1801,6 @@ File_moved=Datei_verschoben
 Move_file_failed=Fehler_beim_Verschieben_der_Datei
 Could_not_move_file=Datei_konnte_nicht_verschoben_werden
 Could_not_find_file_'%0'.=Datei_'%0'_nicht_gefunden.
-Move/rename_file=Datei_verschieben/umbenennen
 Number_of_entries_successfully_imported=Zahl_der_erfolgreich_importierten_Eintr\u00e4ge
 Import_canceled_by_user=Import_durch_Benutzer_abgebrochen
 Progress\:_%0_of_%1=Fortschritt:_%0_von_%1
@@ -1985,11 +1914,9 @@ Version=Version
 Unknown=Unbekannt
 Not_loaded=Nicht_geladen
 Loaded=Geladen
-Could_not_determine_version_of_=Version_konnte_nicht_bestimmt_werden_von
 Install_anyway?=Trotzdem_installieren?
 
 Looking_for_full_text_document...=Suche_Volltext-Dokument...
-Follow_DOI_or_URL_link_and_try_to_locate_PDF_full_text_document=Folge_DOI-_oder_URL-Link_und_versuche,_PDF-Volltext_zu_lokalisieren
 Unable_to_find_full_text_article._No_search_algorithm_defined_for_the_'%0'_web_site.=Volltext-Dokument_konnte_nicht_gefunden_werden._F\u00fcr_die_Webseite_'0%'_ist_kein_Suchalgorithmus_definiert.
 Found_pdf_link,_but_received_the_wrong_MIME_type._This_could_indicate_that_you_don't_have_access_to_the_fulltext_article.=PDF-Link_gefunden,_aber_es_wurde_ein_falscher_MIME-Typ_\u00fcbertragen._M\u00f6glicherweise_haben_Sie_keinen_Zugang_zum_Volltext-Dokument.
 
@@ -2036,8 +1963,6 @@ Before_saving,_please_edit_any_strings_containing_the_#_character.=Entfernen_Sie
 
 Save_without_backup?=Ohne_Backup_Speichern?
 Unable_to_create_backup=Erstellen_des_Backups_fehlgeschlagen
-
-File_directory_is_not_set_or_does_not_exist.=Dateiverzeichnis_wurde_nicht_angegeben_oder_existiert_nicht
 Move_file_to_file_directory.=Datei_ins_Dateiverzeichnis_verschieben
 Rename_file_to=Datei_umbenennen_in
 <b>All_Entries</b>_(this_group_cannot_be_edited_or_removed)=<b>Alle_Eintr\u00e4ge</b>_(diese_Gruppe_kann_nicht_ver\u00e4ndert_oder_gel\u00f6scht_werden)
@@ -2059,7 +1984,6 @@ Error_initializing_custom_export_format_from_string_'%0'=Fehler_beim_Initialisie
 
 BibLaTeX_mode=BibLaTeX-Modus
 Optional_fields_2=Optionale_Felder_2
-Please_wait=Bitte_warten
 Waiting_for_save_operation_to_finish=Das_Ende_des_Speichervorgangs_wird_abgewartet
 Resolving_duplicate_BibTeX_keys...=Beseitige_doppelte_BibTeX-Keys...
 Finished_resolving_duplicate_BibTeX_keys._%0_entries_modified.=Beseitigen_doppelter_BibTeX-Keys_abgeschlossen._%0_Eintr\u00e4ge_ge\u00e4ndert.
@@ -2073,8 +1997,6 @@ Duplicate_key=Doppelter_Key
 Generate_key=Key_erstellen
 
 Import_marking_color=Farbe_zum_Markieren_von_importierten_Eintr\u00e4gen
-
-%0_entries_found._To_reduce_server_load,_only_%1_will_be_downloaded._It_will_be_very_slow,_in_order_to_make_ACM_happy.=%0_Eintr\u00e4ge_gefunden._Um_die_Serverlast_zu_verringern,_werden_nur_%1_Datens\u00e4tze_heruntergeladen._Es_wird_sehr_langsam_sein,_um_keine_Probleme_mit_ACM_zu_bekommen.
 BibTeX_importer=BibTeX-Import-Filter
 
 Always_add_letter_(a,_b,_...)_to_generated_keys=Immer_einen_Buchstaben_(a,_b,_...)_zum_BibTeX-Key_hinzuf\u00fcgen
@@ -2090,7 +2012,6 @@ An_autosave_file_was_found_for_this_database._This_could_indicate_=Es_wurde_eine
 that_JabRef_didn't_shut_down_cleanly_last_time_the_file_was_used.=dass_JabRef_nicht_korrekt_beendet_wurde,_als_diese_Datei_zuletzt_in_Gebrauch_war.
 General_file_directory=Standard-Dateiverzeichnis
 User-specific_file_directory=Benutzerdefiniertes_Dateiverzeichnis
-Error_setting_look_and_feel=Fehler_in_den_Look_and_Feel-Einstellungen
 Search_failed\:_illegal_search_expression=Suche_fehlgeschlagen\:_Ung\u00fcltiger_Suchausdruck
 Show_ArXiv_column=ArXiv-Spalte_anzeigen
 <HTML>Unpack_the_zip_file_containing_import/export_filters_for_Endnote,<BR>for_optimal_interoperability_with_JabRef</HTML>=<HTML>Entpacke_die_Zip-Datei_mit_den_Import-/Export-Filtern_f\u00fcr_Endnote,_<BR>um_eine_optimale_Interfunktion_mit_JabRef_zu_gew\u00e4hrleisten.
@@ -2104,7 +2025,6 @@ Create_entry_based_on_XMP_data=Eintrag_aus_XMP-Daten_erstellen
 Create_entry_based_on_data_fetched_from=Eintrag_erstellen_aus_Daten_von
 Create_blank_entry_linking_the_PDF=Leeren_Eintrag_erstellen_mit_Link_zum_PDF
 Only_attach_PDF=Nur_PDF_anh\u00e4ngen
-Mr._dLib_Metadata_Entries_Associated_With\:=Mr._dLib_Metadaten-Eintr\u00e4ge_verkn\u00fcfen_mit:
 Mr._dLib_Metadata_Entries_Associated_With_PDF_File=Mr._dLib_Metadaten-Eintr\u00e4ge_mit_PDF-Datei_verkn\u00fcpfen
 Title=Titel
 Author(s)=Autor(en)
@@ -2123,21 +2043,18 @@ Update_Existing_Entry=Bestehenden_Eintrag_aktualisieren
 Mr._dLib=Mr._dLib
 More_information=Weitere_Informationen
 Fetching_Metadata...=Lade_Metadaten...
-Metadata=Metadaten
 Autocomplete_names_in_'Firstname_Lastname'_format_only=Automatische_Vervollst\u00e4ndigung_von_Namen_nur_im_Format_'Vorname_Nachname'
 Autocomplete_names_in_'Lastname,_Firstname'_format_only=Automatische_Vervollst\u00e4ndigung_von_Namen_nur_im_Format_'Nachname,_Vorname'
 Autocomplete_names_in_both_formats=Automatische_Vervollst\u00e4ndigung_von_Namen_in_beiden_Formaten
 Marking_color_%0=Markierungsfarbe_%0
 The_name_'comment'_can_not_be_used_as_an_entry_type_name.=Der_Name_'comment'_kann_nicht_als_Name_f\u00fcr_einen_Eintragstyp_verwendet_werden.
 You_must_enter_an_integer_value_in_the_text_field_for=Sie_m\u00fcssen_einen_Zahlwert_eintragen_im_Textfeld_f\u00fcr
-File_directory=Dateiverzeichnis
 Send_as_email=Als_E-Mail_senden
 References=Literaturverweise
 Sending_of_emails=Senden_der_E-Mails
 Subject_for_sending_an_email_with_references=Betreff_zum_Senden_einer_E-Mail_mit_Literaturverweisen
 Automatically_open_folders_of_attached_files=Ordner_mit_angeh\u00e4ngten_Dateien_automatisch_\u00f6ffnen
 Create_entry_based_on_content=Eintrag_anhand_von_Inhalt_erstellen
-Store_choice_as_default=Auswahl_als_Standard_speichern
 Do_not_show_this_box_again_for_this_import=Dialog_f\u00fcr_diesen_Import_nicht_wieder_anzeigen
 Always_use_this_PDF_import_style_(and_do_not_ask_for_each_import)=Immer_diesen_PDF-Importstil_benutzen_(nicht_bei_jedem_Import_nachfragen)
 Error_creating_email=Fehler_beim_Erstellen_der_E-Mail
@@ -2163,7 +2080,6 @@ Extra_information_(e.g._page_number)=Zusatzinformation_(z.B._Seitenzahl)
 Manage_citations=Literaturverweise_verwalten
 Problem_modifying_citation=Problem_beim_\u00c4ndern_des_Literaturverweises
 Citation=Literaturverweis
-Context=Kontext
 Extra_information=Zusatzinformation
 Could_not_resolve_BibTeX_entry_for_citation_marker_'%0'.=BibTeX-Eintrag_f\u00fcr_Verweismarker_'0%'_konnte_nicht_aufgel\u00f6st_werden.
 Styles=Stile
@@ -2189,12 +2105,10 @@ Combine_pairs_of_citations_that_are_separated_by_spaces_only=Verbinde_Paare_von_
 Autodetection_failed=Automatische_Erkennung_fehlgeschlagen
 Connecting=Verbindung_wird_hergestellt
 Please_wait...=Bitte_warten...
-Unable_to_connect=Verbindung_fehlgeschlagen
 Set_connection_parameters=Verbindungsparameter_einstellen
 Path_to_OpenOffice_directory=Pfad_zum_OpenOffice-Ordner
 Path_to_OpenOffice_executable=Pfad_zum_OpenOffice-Programm
 Path_to_OpenOffice_library_dir=Pfad_zu_OpenOffice_Library-Ordner
-Autodetect=Automatische_Erkennung
 Connection_lost=Verbindung_verloren
 The_paragraph_format_is_controlled_by_the_property_'ReferenceParagraphFormat'_or_'ReferenceHeaderParagraphFormat'_in_the_style_file.=Das_Abschnittsformat_wird_von_der_Eigenschaft_'ReferenceParagraphFormat'_oder_'ReferenceHeaderParagraphFormat'_in_der_Stildatei_bestimmt.
 The_character_format_is_controlled_by_the_citation_property_'CitationCharacterFormat'_in_the_style_file.=Das_Zeichenformat_wird_von_der_Eigenschaft_'CitationCharacterFormat'_in_der_Stildatei_bestimmt.
@@ -2218,7 +2132,6 @@ JSTOR_import_cancelled=JSTOR-Import_abgebrochen
 HTML_list=HTML-Liste
 Click_group_to_toggle_membership_of_selected_entries=Gruppe_anklicken,_um_die_Zugeh\u00f6rigkeit_der_ausgew\u00e4hlten_Eintr\u00e4ge_zu_\u00e4ndern
 Use_EMACS_23_insertion_string=EMACS_23_Einf\u00fcgungs-Ausdruck_benutzen
-Normalize_to_BibTeX_name_format=Ins_BibTeX-Namensformat_normalisieren
 If_possible,_normalize_this_list_of_names_to_conform_to_standard_BibTeX_name_formatting=Diese_Namensliste_soll_nach_M\u00f6glichkeit_so_normalisiert_werden,_dass_sie_sich_nach_der_\u00fcblichen_BibTeX-Namensformatierung_richtet
 Could_not_open_%0=%0_konnte_nicht_ge\u00f6ffnet_werden
 Unknown_import_format=Unbekanntes_Import-Format
@@ -2227,7 +2140,6 @@ An_Error_occurred_while_fetching_from_INSPIRE_source_(%0)\:=Beim_Abrufen_von_INS
 Error_while_fetching_from_Inspire\:_=Fehler_beim_Abrufen_von_INSPIRE\:
 Web_search=Internetrecherche
 Autocomplete_names=Namen_automatisch_vervollst\u00e4ndigen
-You_must_select_either_a_valid_style_file,_or_use_the_default_style.=Sie_m\u00fcssen_entweder_eine_g\u00fcltige_Stildatei_ausw\u00e4hlen_oder_den_Standard-Stil_nutzen.
 Default_style=Standard-Stil
 Choose_style_file_directly=Stildatei_direkt_w\u00e4hlen
 Choose_from_a_directory=Aus_einem_Ordner_w\u00e4hlen
@@ -2271,7 +2183,6 @@ Autocompletion_options=Autovervollst\u00e4ndigungs-Optionen
 Autocomplete_after_following_number_of_characters=Autovervollst\u00e4ndigung_nach_der_folgenden_Anzahl_an_Zeichen
 Name_format_used_for_autocompletion=Namensformat_f\u00fcr_die_Autovervollst\u00e4ndigung
 Treatment_of_first_names=Behandlung_von_Vornamen
-No_icon_found_for_%0=Kein_Icon_gefunden_f\u00fcr_%0
 Cleanup_entries=Eintr\u00e4ge_werden_aufger\u00e4umt
 Automatically_assign_new_entry_to_selected_groups=Neuen_Eintrag_automatisch_den_ausgew\u00e4hlten_Gruppen_zuordnen
 Move_DOIs_from_note_and_URL_field_to_DOI_field_and_remove_http_prefix=DOIs_von_den_Feldern_note_und_URL_ins_DOI-Feld_verschieben_und_das_http-Pr\u00e4fix_l\u00f6schen
@@ -2285,13 +2196,9 @@ Doing_a_cleanup_for_%0_entries...=Aufr\u00e4umen_von_%0_Eintr\u00e4gen...
 No_entry_needed_a_clean_up=Aufr\u00e4umen_bei_keinem_Eintrag_n\u00f6tig
 One_entry_needed_a_clean_up=Aufr\u00e4umen_bei_einem_Eintrag_n\u00f6tig
 %0_entries_needed_a_clean_up=Aufr\u00e4umen_bei_%0_Eintr\u00e4gen_n\u00f6tig
-Imported_=Importiert_wurden_
 Error_importing_from_database=Fehler_beim_Import_von_der_Datei
 Minimize_to_system_tray=In_den_Infobereich_minimieren
 
-Incomplete_search_results=Unvollst\u00e4ndiges_Suchergebnis
-%0_entries_were_found,_but_only_%1_of_these_could_be_resolved.=Es_wurden_%0_Eintr\u00e4ge_gefunden,_aber_nur_%1_konnten_gekl\u00e4rt_werden.
-
 Error_downloading_file_'%0'=Fehler_beim_Herunterladen_der_Datei_'%0'
 Download_failed=Download_fehlgeschlagen
 %0_databases_will_be_imported=%0_Dateien_werden_importiert
@@ -2316,10 +2223,9 @@ Unable_to_clear_preferences.=Einstellungen_konnten_nicht_zur\u00fcckgesetzt_werd
 
 Reset_preferences_(key1,key2,..._or_'all')=Einstellungen_zur\u00fccksetzen_(key1,key2,..._oder_'all')
 Find_unlinked_files=Nicht_verlinkte_Dateien_finden
-Select_All=Alle_ausw\u00e4hlen
-Unselect_All=Auswahl_aufheben
-Expand_All=Alle_aufklappen
-Collapse_All=Alle_einklappen
+Unselect_all=Auswahl_aufheben
+Expand_all=Alle_aufklappen
+Collapse_all=Alle_einklappen
 Select_Directory=Ordner_ausw\u00e4hlen
 Choose_Directory=Ordner_w\u00e4hlen
 Use_the_selected_directory_to_start_with_the_search.=Den_ausgew\u00e4hlten_Ordner_f\u00fcr_die_Suche_benutzen.
@@ -2380,7 +2286,6 @@ Priority_medium=Mittlere_Priorit\u00e4t
 Quality=Qualit\u00e4t
 Rank=Rang
 Relevance=Relevanz
-Set_priority=Priort\u00e4t_setzen
 Set_priority_to_high=Priorit\u00e4t_auf_hoch_setzen
 Set_priority_to_low=Priorit\u00e4t_auf_niedrig_setzen
 Set_priority_to_medium=Priorit\u00e4t_auf_mittel_setzen
@@ -2412,7 +2317,6 @@ Correct_the_entry,_and_reopen_editor_to_display/edit_source.=Eintrag_korrigieren
 Could_not_connect_to_a_running_gnuserv_process._Make_sure_that_Emacs_or_XEmacs_is_running,<BR>and_that_the_server_has_been_started_(by_running_the_command_'server-start'/'gnuserv-start').=Keine_Verbindung_zu_einem_laufenden_gnuserv-Prozess_m\u00f6glich._Vergewissern_Sie_sich,_dass_Emacs_oder_XEmacs_l\u00e4uft<BR>und_dass_der_Server_gestartet_wurde_(mit_dem_Befehl_'server-start'/'gnuserv-start').
 Could_not_connect_to_running_OpenOffice.\nMake_sure_you_have_installed_OpenOffice_with_Java_support.\nIf_connecting_manually,_please_verify_program_and_library_paths.\n\nError_message\:_=Verbindung_zu_OpenOffice_fehlgeschlagen.\nVergewissern_Sie_sich,_dass_Sie_OpenOffice_mit_Java-Unterst\u00fctzung_installiert_haben.\nBei_manueller_Verbindung_\u00fcberpr\u00fcfen_Sie_bitte_die_Programm-_und_Library-Pfade.\n\nFehlermeldung:_
 Created_group_"%0".=Gruppe_"%0"_wurde_erstellt.
-File_has_been_updated_externally._Are_you_sure_you_want_to_save?=Die_Datei_wurde_extern_ge\u00e4ndert._Sind_Sie_sicher,_dass_Sie_speichern_m\u00f6chten?
 If_a_pasted_or_imported_entry_already_has_the_field_set,_overwrite.=Falls_bei_einem_eingef\u00fcgten_oder_importierten_Eintrag_das_Feld_bereits_belegt_ist,_\u00fcberschreiben.
 Import_Metadata_From_PDF=Metadaten_aus_PDF_importieren
 Not_connected_to_any_Writer_document._Please_make_sure_a_document_is_open,_and_use_the_'Select_Writer_document'_button_to_connect_to_it.=Keine_Verbindung_zu_einem_Writer-Dokument._Bitte_vergewissern_Sie_sich,_dass_ein_Dokument_ge\u00f6ffnet_ist,_und_benutzen_Sie_die_Schaltfl\u00e4che_'Writer-Dokument_w\u00e4hlen',_um_eine_Verbindung_herzustellen.
@@ -2447,4 +2351,62 @@ An_Error_occurred_while_parsing_abstract=Beim_Parsen_der_Zusammenfassung_ist_ein
 Unknown_DiVA_entry\:_'%0'.=Unbekannter_DiVA-Eintrag:_'0%'.
 Get_BibTeX_entry_from_DiVA=BibTeX-Eintrag_aus_DiVA_erstellen
 Log=Protokoll
-Remove_unneccessary_$,_{,_and_}=\u00dcberfl\u00fcssige_$,_{_und_}_entfernen
+
+ISO_690=ISO_690
+
+Add_brackets_and_replace_separators_with_their_non-breaking_version_for_units=Bei_Einheiten_Klammern_hinzuf\u00fcgen_und_Trennzeichen_durch_ihre_nicht-umbrechenden_Varianten_ersetzen
+Add_new_entry_and_keep_both_old_entries=Neuen_Eintrag_hinzuf\u00fcgen_und_beide_alten_Eintr\u00e4ge_behalten
+Cancelled_merging_entries=Zusammenf\u00fchren_der_Eintr\u00e4ge_abgebrochen
+Error_in_entry=Fehler_im_Eintrag
+First_entry=Erster_Eintrag
+Format_units_by_adding_non-breaking_separators_and_keeping_the_correct_case_on_search=Einheiten_formatieren:_nicht-umbrechende_Trennzeichen_hinzuf\u00fcgen_und_bei_der_Suche_Gro\u00df-/Kleinschreibung_beibehalten
+Merge_entries=Eintr\u00e4ge_zusammenf\u00fchren
+Merged_entries_into_a_new_and_kept_the_old=Die_Eintr\u00e4ge_wurden_in_einen_neuen_zusammengef\u00fchrt_und_die_alten_behalten
+Merged_entries_into_a_new_and_removed_the_old=Die_Eintr\u00e4ge_wurden_in_einen_neuen_zusammengef\u00fchrt_und_die_alten_gel\u00f6scht
+Merged_entry=Eintrag_zusammengef\u00fchrt
+None=Kein(e/r)
+Parse=Parsen
+Remove_unneccessary_$,_{,_and_}_and_move_adjacent_numbers_into_equations=Unn\u00f6tige_$,_{_und_}_entfernen_und_benachbarte_Ziffern_in_Gleichungen_verschieben
+Replace_old_entries_with_new_entry=Alte_Eintr\u00e4ge_durch_einen_neuen_ersetzen
+Result=Ergebnis
+Second_entry=Zweiter_Eintrag
+Show_DOI_first=DOI_zuerst_anzeigen
+Show_URL_first=URL_zuerst_anzeigen
+Use_1st=Benutze_1.
+Use_2nd=Benutze_2.
+Use_Emacs_key_bindings=Emacs-Tastaturk\u00fcrzel_benutzen
+You_have_to_choose_exactly_two_entries_to_merge.=Sie_m\u00fcssen_genau_zwei_Eintr\u00e4ge_ausw\u00e4hlen,_die_zusammengef\u00fchrt_werden_sollen.
+
+Update_timestamp_on_modification=Zeitstempel_bei_\u00c4nderung_aktualisieren
+change_field=\u00e4ndere_Feld
+
+All_key_bindings_will_be_reset_to_their_defaults.=Alle_Tastaturk\u00fcrzel_werden_auf_den_Standard_zur\u00fcckgesetzt.
+Automatically_set_file_links=Dateilinks_automatisch_setzen
+Continue?=Fortfahren?
+Resetting_all_key_bindings=Alle_Tastaturk\u00fcrzel_werden_zur\u00fcckgesetzt
+Save_entries_ordered_by_title=Eintr\u00e4ge_nach_Titel_sortiert_speichern
+Export_entries_ordered_by_title=Eintr\u00e4ge_nach_Titel_sortiert_exportieren
+Quotes=Anf\u00fchrungszeichen
+Curly_Brackets=Geschweifte_Klammern
+Include_empty_fields=Leere_Felder_ber\u00fccksichtigen
+Field_saving_options=Optionen_beim_Speichern_von_Feldern
+Field_value_delimiter._E.g.,_"author\={x}"_or_"author\='x'"=Begrenzungszeichen_der_Felder._Z._B._"author={x}"_oder_"author='x'"
+Run_Unicode_converter_on_title,_author(s),_and_abstract=Unicode-Konvertierer_f\u00fcr_Titel,_Autor(en)_und_Zusammenfassung_ausf\u00fchren
+
+Database_has_changed._Do_you_want_to_save_before_closing?=Die_Datenbank_wurde_ge\u00e4ndert._Wollen_Sie_vor_dem_Schlie\u00dfen_speichern?
+Host=Host
+Invalid_setting=Ung\u00fcltige_Einstellung
+Network=Netzwerk
+Please_specify_both_hostname_and_port=Bitte_geben_Sie_den_Namen_des_Hosts_und_den_Port_an
+Port=Port
+Start_field_contents_in_same_column=Feldinhalte_in_derselben_Spalte_beginnen
+Use_camel_case_for_field_names_(e.g.,_"HowPublished"_instead_of_"howpublished")=Binnenmajuskeln_f\u00fcr_Feldnamen_benutzen_(z._B._"HowPublished"_statt_"howpublished")
+Use_custom_proxy_configuration=Benutzerdefinierte_Proxy-Konfiguration_verwenden
+Clear_connection_settings=Verbindungseinstellungen_zur\u00fccksetzen
+Cleared_connection_settings.=Verbindungseinstellungen_wurden_zur\u00fcckgesetzt.
+Rebind_C-a,_too=C-a_ebenfalls_neu_zuweisen
+
+Show_number_of_elements_contained_in_each_group=Anzahl_der_Elemente_jeder_Gruppe_anzeigen
+
+Open_folder=Ordner_\u00f6ffnen
+Opened_%0_folder(s).=%0_Ordner_ge\u00f6ffnet.
diff --git a/src/resource/JabRef_en.properties b/src/resource/JabRef_en.properties
index 75cb7f9..aa67074 100644
--- a/src/resource/JabRef_en.properties
+++ b/src/resource/JabRef_en.properties
@@ -188,8 +188,6 @@ Background_color_for_required_fields=Background_color_for_required_fields
 Backup_old_file_when_saving=Backup_old_file_when_saving
 Beta_version=Beta_version
 
-Bibkey_to_filename_conversion=Bibkey_to_filename_conversion
-
 BibTeX_key=BibTeX_key
 
 BibTeX_key_is_unique.=BibTeX_key_is_unique.
@@ -207,8 +205,6 @@ Browse=Browse
 
 by=by
 
-Calling_external_viewer...=Calling_external_viewer...
-
 Cancel=Cancel
 
 Cannot_add_entries_to_group_without_generating_keys._Generate_keys_now?=Cannot_add_entries_to_group_without_generating_keys._Generate_keys_now?
@@ -306,7 +302,6 @@ Command_line_id=Command_line_id
 Complete_record=Complete_record
 Connect=Connect
 Connect_to_SQL_database=Connect_to_SQL_database
-Connect_to_SQL_Database=Connect_to_SQL_Database
 Connection_to_IEEEXplore_failed=Connection_to_IEEEXplore_failed
 
 Contained_in=Contained_in
@@ -330,10 +325,6 @@ Copy_files_to_file_directory.=Copy_files_to_file_directory.
 Copy_to_clipboard=Copy_to_clipboard
 
 Could_not_call_executable=Could_not_call_executable
-
-Could_not_connect_to_a_running_gnuserv_process._Make_sure_that_Emacs_or_XEmacs_is_running,<BR>and_that_the_server_has_been_started_(by_running_the_command_'gnuserv-start').=Could_not_connect_to_a_running_gnuserv_process._Make_sure_that_Emacs_or_XEmacs_is_running,<BR>and_that_the_server_has_been_started_(by_running_the_command_'gnuserv-start').
-
-Could_not_connect_to_host_=Could_not_connect_to_host_
 Could_not_connect_to_Vim_server._Make_sure_that_Vim_is_running<BR>with_correct_server_name.=Could_not_connect_to_Vim_server._Make_sure_that_Vim_is_running<BR>with_correct_server_name.
 
 Could_not_export_file=Could_not_export_file
@@ -361,8 +352,6 @@ Could_not_run_the_'vim'_program.=Could_not_run_the_'vim'_program.
 Could_not_save_file=Could_not_save_file
 Could_not_save_file._Character_encoding_'%0'_is_not_supported.=Could_not_save_file._Character_encoding_'%0'_is_not_supported.
 
-Create_group=Create_group
-
 Created_groups.=Created_groups.
 
 crossreferenced_entries_included=crossreferenced_entries_included
@@ -374,8 +363,6 @@ Current_value=Current_value
 Custom_entry_types=Custom_entry_types
 
 Custom_entry_types_found_in_file=Custom_entry_types_found_in_file
-Custom_icon_theme=Custom_icon_theme
-Custom_icon_theme_file=Custom_icon_theme_file
 
 Custom_importers=Custom_importers
 
@@ -394,8 +381,6 @@ Database_\:=Database:
 
 Database_encoding=Database_encoding
 
-Database_has_changed._Do_you_want_to_save_before_closing?=Database_has_changed._Do_you_want_to_save_before_closing?
-
 Database_properties=Database_properties
 
 Date_format=Date_format
@@ -492,10 +477,6 @@ Downloading...=Downloading...
 Drag_and_Drop_Error=Drag_and_Drop_Error
 Drop_%0=Drop_%0
 
-duplicate_BibTeX_key=duplicate_BibTeX_key
-
-Duplicate_BibTeX_key.=Duplicate_BibTeX_key.
-
 Duplicate_BibTeX_key._Grouping_may_not_work_for_this_entry.=Duplicate_BibTeX_key._Grouping_may_not_work_for_this_entry.
 
 Duplicate_Key_Warning=Duplicate_Key_Warning
@@ -535,13 +516,9 @@ Editor_options=Editor_options
 
 empty_BibTeX_key=empty_BibTeX_key
 
-Empty_BibTeX_key.=Empty_BibTeX_key.
-
 Empty_BibTeX_key._Grouping_may_not_work_for_this_entry.=Empty_BibTeX_key._Grouping_may_not_work_for_this_entry.
 
 empty_database=empty_database
-
-Enable_source_editing=Enable_source_editing
 Enable_word/name_autocompletion=Enable_word/name_autocompletion
 
 Endnote=Endnote
@@ -582,7 +559,7 @@ Entry_types=Entry_types
 
 Error=Error
 Error\:_=Error:_
-Error_converting_Bibtex_to_XMP\:_%0=Error_converting_Bibtex_to_XMP:_%0
+Error_converting_BibTeX_to_XMP\:_%0=Error_converting_Bibtex_to_XMP:_%0
 Error_converting_XMP_to_'%0'...=Error_converting_XMP_to_'%0'...
 Error_exporting_to_clipboard=Error_exporting_to_clipboard
 
@@ -596,7 +573,6 @@ Error_opening_file=Error_opening_file
 Error_setting_field=Error_setting_field
 Error_while_converting_BibtexEntry_to_XMP_%0=Error_while_converting_BibtexEntry_to_XMP_%0
 Error_while_downloading_file\:=Error_while_downloading_file:
-Error_while_fetching_from_OIA2=Error_while_fetching_from_OIA2
 Error_while_writing=Error_while_writing
 Error_writing_to_%0_file(s).=Error_writing_to_%0_file(s).
 Error_writing_XMP_to_file\:_%0=Error_writing_XMP_to_file:_%0
@@ -658,8 +634,6 @@ Field_to_filter=Field_to_filter
 
 Field_to_group_by=Field_to_group_by
 
-Fields=Fields
-
 File=File
 
 file=file
@@ -870,8 +844,6 @@ insert_string_=insert_string_
 
 Insert_URL=Insert_URL
 
-integrity=integrity
-
 #Integritycheckisaprocessthatchecksforindicationsofwronglyfilledoutbibtexfields."Scan"isthebuttonthatstartsthecheck.
 Integrity_check=Integrity_check
 
@@ -885,13 +857,8 @@ Invalid_URL=Invalid_URL
 
 Inverted=Inverted
 
-is_a_standard_type.=is_a_standard_type.
-
 ISO_abbreviation=ISO_abbreviation
 
-Item_list_for_field=Item_list_for_field
-jabref=jabref
-
 JabRef_help=JabRef_help
 
 JabRef_preferences=JabRef_preferences
@@ -951,7 +918,6 @@ Load_and_Save_preferences_from/to_jabref.xml_on_start-up_(memory_stick_mode)=Loa
 Load_session=Load_session
 
 Loading_session...=Loading_session...
-localhost=localhost
 
 Look_and_feel=Look_and_feel
 Looking_for_pdf...=Looking_for_pdf...
@@ -1076,8 +1042,6 @@ No_entries_found_for_the_search_string_'%0'=No_entries_found_for_the_search_stri
 No_entries_imported.=No_entries_imported.
 
 No_entries_or_multiple_entries_selected.=No_entries_or_multiple_entries_selected.
-
-No_entries_selected=No_entries_selected
 No_entries_selected.=No_entries_selected.
 
 No_exceptions_have_ocurred.=No_exceptions_have_occurred.
@@ -1119,8 +1083,6 @@ Number_of_references_to_fetch?=Number_of_references_to_fetch?
 
 occurences=occurences
 
-OK=OK
-
 Ok=OK
 One_or_more_file_links_are_of_the_type_'%0',_which_is_undefined._What_do_you_want_to_do?=One_or_more_file_links_are_of_the_type_'%0',_which_is_undefined._What_do_you_want_to_do?
 
@@ -1135,6 +1097,8 @@ Open_database=Open_database
 
 Open_editor_when_a_new_entry_is_created=Open_editor_when_a_new_entry_is_created
 
+Open_folder=Open_folder
+
 Open_file=Open_file
 
 Open_last_edited_databases_at_startup=Open_last_edited_databases_at_startup
@@ -1211,8 +1175,6 @@ Personal_journal_list=Personal_journal_list
 
 Plain_text_import=Plain_text_import
 
-Please_check_your_network_connection_to_this_machine.=Please_check_your_network_connection_to_this_machine.
-
 Please_enter_a_name_for_the_group.=Please_enter_a_name_for_the_group.
 
 Please_enter_a_search_term._For_example,_to_search_all_fields_for_<b>Smith</b>,_enter%c<p><tt>smith</tt><p>To_search_the_field_<b>Author</b>_for_<b>Smith</b>_and_the_field_<b>Title</b>_for_<b>electrical</b>,_enter%c<p><tt>author%esmith_and_title%eelectrical</tt>=Please_enter_a_search_term._For_example,_to_search_all_fields_for_<b>Smith</b>,_enter%c<p><tt>smith</tt><p>To_search_the_field_<b>Author</b>_for_<b>Smith</b>_and_the_field_<b>Title</b>_for_<b>electrical</b>,_enter%c<p><tt>author% [...]
@@ -1221,8 +1183,6 @@ Please_enter_the_field_to_search_(e.g._<b>keywords</b>)_and_the_keyword_to_searc
 
 Please_enter_the_string's_label=Please_enter_the_string's_label
 
-Please_select_an_importer=Please_select_an_importer
-
 Please_select_an_importer.=Please_select_an_importer.
 
 Please_select_exactly_one_group_to_move.=Please_select_exactly_one_group_to_move.
@@ -1352,8 +1312,6 @@ Removed_string=Removed_string
 
 Renamed_string=Renamed_string
 
-Replace=Replace
-
 Replace_(regular_expression)=Replace_(regular_expression)
 
 Replace_string=Replace_string
@@ -1381,7 +1339,6 @@ Review=Review
 Review_changes=Review_changes
 
 Right=Right
-root=root
 
 Save=Save
 Save_all_finished.=Save_all_finished.
@@ -1419,8 +1376,6 @@ Scan=Scan
 
 Search=Search
 
-Search_All_Fields=Search_All_Fields
-
 Search_all_fields=Search_all_fields
 
 Search_error=Search_error
@@ -1432,13 +1387,12 @@ Search_for=Search_for
 Search_general_fields=Search_general_fields
 
 Search_IEEEXplore=Search_IEEEXplore
-Search_IEEExplore=Search_IEEExplore
 
 Search_optional_fields=Search_optional_fields
 
 Search_required_fields=Search_required_fields
 
-Search_Specified_Field(s)=Search_Specified_Field(s)
+Search_specified_field(s)=Search_specified_field(s)
 
 Searched_database._Global_number_of_hits=Searched_database._Global_number_of_hits
 
@@ -1480,8 +1434,6 @@ Select_new_ImportFormat_Subclass=Select_new_ImportFormat_Subclass
 
 Select_the_tree_nodes_to_view_and_accept_or_reject_changes=Select_the_tree_nodes_to_view_and_accept_or_reject_changes
 Selected_entries=Selected_entries
-
-Selector_enabled_fields=Selector_enabled_fields
 Server_Hostname_\:=Server_Hostname:
 Server_Type_\:=Server_Type:
 Set_field=Set_field
@@ -1620,14 +1572,10 @@ Test=Test
 
 Text_Input_Area=paste_text_here
 
-The_#_character_is_not_allowed_in_BibTeX_fields=The_#_character_is_not_allowed_in_BibTeX_fields
-
 The_chosen_date_format_for_new_entries_is_not_valid=The_chosen_date_format_for_new_entries_is_not_valid
 
 The_chosen_encoding_'%0'_could_not_encode_the_following_characters\:_=The_chosen_encoding_'%0'_could_not_encode_the_following_characters:_
 
-The_CiteSeer_fetch_operation_returned_zero_results.=The_CiteSeerX_fetch_operation_returned_zero_results.
-
 
 The_current_version_features_a_new_way_of_handling_links_to_external_files.<br>To_take_advantage_of_this,_your_links_must_be_changed_into_the_new_format,_and<br>JabRef_must_be_configured_to_show_the_new_links.=The_current_version_features_a_new_way_of_handling_links_to_external_files.<br>To_take_advantage_of_this,_your_links_must_be_changed_into_the_new_format,_and<br>JabRef_must_be_configured_to_show_the_new_links.
 
@@ -1655,8 +1603,6 @@ The_search_is_case_sensitive.=The_search_is_case_sensitive.
 The_string_has_been_removed_locally=The_string_has_been_removed_locally
 
 There_are_possible_duplicates_(marked_with_a_'D'_icon)_that_haven't_been_resolved._Continue?=There_are_possible_duplicates_(marked_with_a_'D'_icon)_that_haven't_been_resolved._Continue?
-
-this_button_will_update=this_button_will_update
 This_database_was_written_using_an_older_version_of_JabRef.=This_database_was_written_using_an_older_version_of_JabRef.
 
 This_entry_has_no_BibTeX_key._Generate_key_now?=This_entry_has_no_BibTeX_key._Generate_key_now?
@@ -1678,8 +1624,6 @@ This_group_contains_entries_in_which_any_field_contains_the_term_<b>%0</b>=This_
 This_group_contains_entries_whose_<b>%0</b>_field_contains_the_keyword_<b>%1</b>=This_group_contains_entries_whose_<b>%0</b>_field_contains_the_keyword_<b>%1</b> 
 
 This_group_contains_entries_whose_<b>%0</b>_field_contains_the_regular_expression_<b>%1</b>=This_group_contains_entries_whose_<b>%0</b>_field_contains_the_Regular_Expression_<b>%1</b> 
-
-This_is_a_simple_copy_and_paste_dialog_for_import_some_fields_from_normal_text.=This_is_a_simple_copy_and_paste_dialog_for_import_some_fields_from_normal_text.
 This_makes_JabRef_look_up_each_%0_link_and_check_if_the_file_exists._If_not,_you_will_be_given_options<BR>to_resolve_the_problem.=This_makes_JabRef_look_up_each_%0_link_and_check_if_the_file_exists._If_not,_you_will_be_given_options<BR>to_resolve_the_problem.
 
 This_operation_requires_all_selected_entries_to_have_BibTex_keys_defined.=This_operation_requires_all_selected_entries_to_have_BibTex_keys_defined.
@@ -1687,8 +1631,6 @@ This_operation_requires_at_least_one_entry.=This_operation_requires_at_least_one
 
 This_operation_requires_one_or_more_entries_to_be_selected.=This_operation_requires_one_or_more_entries_to_be_selected.
 
-This_will_move_all_external_links_from_the_'pdf'_and_'ps'_fields_into_the_'%0'_field._Proceed?=This_will_move_all_external_links_from_the_'pdf'_and_'ps'_fields_into_the_'%0'_field._Proceed?
-
 To_set_up,_go_to_<B>Tools_->_Manage_journal_abbreviations</B>=To_set_up,_go_to_<B>Options_->_Manage_journal_abbreviations</B>
 
 Toggle_abbreviation=Toggle_abbreviation
@@ -1702,8 +1644,6 @@ Type_set_to_'other'=Type_set_to_'other'
 Unabbreviate_journal_names_of_the_selected_entries=Unabbreviate_journal_names_of_the_selected_entries
 Unabbreviated_%0_journal_names.=Unabbreviated_%0_journal_names.
 
-unable_to_access_LyX-pipe=unable_to_access_LyX-pipe
-
 Unable_to_create_graphical_interface=Unable_to_create_graphical_interface
 
 Unable_to_open_file.=Unable_to_open_file.
@@ -1747,7 +1687,6 @@ Up=Up
 Update_to_current_column_widths=Update_to_current_column_widths
 
 Updated_group_selection=Updated_group_selection
-Upgrade_external_links=Upgrade_external_links
 Upgrade_external_PDF/PS_links_to_use_the_'%0'_field.=Upgrade_external_PDF/PS_links_to_use_the_'%0'_field.
 Upgrade_file=Upgrade_file
 Upgrade_old_external_file_links_to_use_the_new_feature=Upgrade_old_external_file_links_to_use_the_new_feature
@@ -1757,10 +1696,7 @@ Upper_Each_First=Upper_Each_First
 Upper_first=Upper_first
 
 usage=usage
-
-Use_antialiasing_font=Use_antialiasing_font
 Use_autocompletion_for_the_following_fields=Use_autocompletion_for_the_following_fields
-Use_custom_icon_theme=Use_custom_icon_theme
 Use_default_viewer=Use_default_viewer
 
 Use_inspection_window_also_when_a_single_entry_is_imported.=Use_inspection_window_also_when_a_single_entry_is_imported.
@@ -1770,8 +1706,6 @@ Use_other_look_and_feel=Use_other_look_and_feel
 Use_Regular_Expression_Search=Use_Regular_Expression_Search
 
 Use_regular_expressions=Use_Regular_Expressions
-
-Use_the_following_delimiter_character(s)=Use_the_following_delimiter_character(s)
 Username_\:=Username:
 
 Value_cleared_externally=Value_cleared_externally
@@ -1846,7 +1780,6 @@ Your_new_key_bindings_have_been_stored.=Your_new_key_bindings_have_been_stored.
 The_following_fetchers_are_available\:=The_following_fetchers_are_available:
 Could_not_find_fetcher_'%0'=Could_not_find_fetcher_'%0'
 Running_Query_'%0'_with_fetcher_'%1'.=Running_Query_'%0'_with_fetcher_'%1'.
-Please_wait!=Please_wait!
 Query_'%0'_with_fetcher_'%1'_did_not_return_any_results.=Query_'%0'_with_fetcher_'%1'_did_not_return_any_results.
 Open_SPIRES_entry=Open_SPIRES_entry
 Move/Rename_file=Move/Rename_file
@@ -1854,7 +1787,6 @@ File_moved=File_moved
 Move_file_failed=Move_file_failed
 Could_not_move_file=Could_not_move_file
 Could_not_find_file_'%0'.=Could_not_find_file_'%0'.
-Move/rename_file=Move/rename_file
 Number_of_entries_successfully_imported=Number_of_entries_successfully_imported
 Import_canceled_by_user=Import_canceled_by_user
 Progress\:_%0_of_%1=Progress:_%0_of_%1
@@ -1971,11 +1903,9 @@ Version=Version
 Unknown=Unknown
 Not_loaded=Not_loaded
 Loaded=Loaded
-Could_not_determine_version_of_=Could_not_determine_version_of_
 Install_anyway?=Install_anyway?
 
 Looking_for_full_text_document...=Looking_for_full_text_document...
-Follow_DOI_or_URL_link_and_try_to_locate_PDF_full_text_document=Follow_DOI_or_URL_link_and_try_to_locate_PDF_full_text_document
 Unable_to_find_full_text_article._No_search_algorithm_defined_for_the_'%0'_web_site.=Unable_to_find_full_text_article._No_search_algorithm_defined_for_the_'%0'_web_site.
 Found_pdf_link,_but_received_the_wrong_MIME_type._This_could_indicate_that_you_don't_have_access_to_the_fulltext_article.=Found_pdf_link,_but_received_the_wrong_MIME_type._This_could_indicate_that_you_don't_have_access_to_the_fulltext_article.
 
@@ -2023,8 +1953,6 @@ Before_saving,_please_edit_any_strings_containing_the_#_character.=Before_saving
 
 Save_without_backup?=Save_without_backup?
 Unable_to_create_backup=Unable_to_create_backup
-
-File_directory_is_not_set_or_does_not_exist.=File_directory_is_not_set_or_does_not_exist.
 Move_file_to_file_directory.=Move_file_to_file_directory.
 Rename_file_to=Rename_file_to
 <b>All_Entries</b>_(this_group_cannot_be_edited_or_removed)=<b>All_Entries</b>_(this_group_cannot_be_edited_or_removed)
@@ -2045,7 +1973,6 @@ Error_while_fetching_from_ScienceDirect=Error_while_fetching_from_ScienceDirect
 Error_initializing_custom_export_format_from_string_'%0'=Error_initializing_custom_export_format_from_string_'%0'
 BibLaTeX_mode=BibLaTeX_mode
 Optional_fields_2=Optional_fields_2
-Please_wait=Please_wait
 Waiting_for_save_operation_to_finish=Waiting_for_save_operation_to_finish
 Resolving_duplicate_BibTeX_keys...=Resolving_duplicate_BibTeX_keys...
 Finished_resolving_duplicate_BibTeX_keys._%0_entries_modified.=Finished_resolving_duplicate_BibTeX_keys._%0_entries_modified.
@@ -2058,8 +1985,6 @@ Duplicate_BibTeX_key=Duplicate_BibTeX_key
 Duplicate_key=Duplicate_key
 Generate_key=Generate_key
 Import_marking_color=Import_marking_color
-
-%0_entries_found._To_reduce_server_load,_only_%1_will_be_downloaded._It_will_be_very_slow,_in_order_to_make_ACM_happy.=%0_entries_found._To_reduce_server_load,_only_%1_will_be_downloaded._It_will_be_very_slow,_in_order_to_make_ACM_happy.
 BibTeX_importer=BibTeX_importer
 Always_add_letter_(a,_b,_...)_to_generated_keys=Always_add_letter_(a,_b,_...)_to_generated_keys
 
@@ -2076,7 +2001,6 @@ An_autosave_file_was_found_for_this_database._This_could_indicate_=An_autosave_f
 that_JabRef_didn't_shut_down_cleanly_last_time_the_file_was_used.=that_JabRef_didn't_shut_down_cleanly_last_time_the_file_was_used.
 General_file_directory=General_file_directory
 User-specific_file_directory=User-specific_file_directory
-Error_setting_look_and_feel=Error_setting_look_and_feel
 Search_failed\:_illegal_search_expression=Search_failed:_illegal_search_expression
 Show_ArXiv_column=Show_ArXiv_column
 <HTML>Unpack_the_zip_file_containing_import/export_filters_for_Endnote,<BR>for_optimal_interoperability_with_JabRef</HTML>=<HTML>Unpack_the_zip_file_containing_import/export_filters_for_Endnote,<BR>for_optimal_interoperability_with_JabRef</HTML>
@@ -2090,7 +2014,6 @@ Create_entry_based_on_XMP_data=Create_entry_based_on_XMP_data
 Create_entry_based_on_data_fetched_from=Create_entry_based_on_data_fetched_from
 Create_blank_entry_linking_the_PDF=Create_blank_entry_linking_the_PDF
 Only_attach_PDF=Only_attach_PDF
-Mr._dLib_Metadata_Entries_Associated_With\:=Mr._dLib_Metadata_Entries_Associated_With:
 Mr._dLib_Metadata_Entries_Associated_With_PDF_File=Mr._dLib_Metadata_Entries_Associated_With_PDF_File
 Title=Title
 Author(s)=Author(s)
@@ -2109,21 +2032,18 @@ Update_Existing_Entry=Update_Existing_Entry
 Mr._dLib=Mr._dLib
 More_information=More_Information
 Fetching_Metadata...=Fetching_Metadata...
-Metadata=Metadata
 Autocomplete_names_in_'Firstname_Lastname'_format_only=Autocomplete_names_in_'Firstname_Lastname'_format_only
 Autocomplete_names_in_'Lastname,_Firstname'_format_only=Autocomplete_names_in_'Lastname,_Firstname'_format_only
 Autocomplete_names_in_both_formats=Autocomplete_names_in_both_formats
 Marking_color_%0=Marking_color_%0
 The_name_'comment'_can_not_be_used_as_an_entry_type_name.=The_name_'comment'_can_not_be_used_as_an_entry_type_name.
 You_must_enter_an_integer_value_in_the_text_field_for=You_must_enter_an_integer_value_in_the_text_field_for
-File_directory=File_directory
 Send_as_email=Send_as_email
 References=References
 Sending_of_emails=Sending_of_emails
 Subject_for_sending_an_email_with_references=Subject_for_sending_an_email_with_references
 Automatically_open_folders_of_attached_files=Automatically_open_folders_of_attached_files
 Create_entry_based_on_content=Create_entry_based_on_content
-Store_choice_as_default=Store_choice_as_default
 Do_not_show_this_box_again_for_this_import=Do_not_show_this_box_again_for_this_import
 Always_use_this_PDF_import_style_(and_do_not_ask_for_each_import)=Always_use_this_PDF_import_style_(and_do_not_ask_for_each_import)
 Error_creating_email=Error_creating_email
@@ -2149,7 +2069,6 @@ Extra_information_(e.g._page_number)=Extra_information_(e.g._page_number)
 Manage_citations=Manage_citations
 Problem_modifying_citation=Problem_modifying_citation
 Citation=Citation
-Context=Context
 Extra_information=Extra_information
 Could_not_resolve_BibTeX_entry_for_citation_marker_'%0'.=Could_not_resolve_BibTeX_entry_for_citation_marker_'%0'.
 Styles=Styles
@@ -2175,12 +2094,10 @@ Combine_pairs_of_citations_that_are_separated_by_spaces_only=Combine_pairs_of_ci
 Autodetection_failed=Autodetection_failed
 Connecting=Connecting
 Please_wait...=Please_wait...
-Unable_to_connect=Unable_to_connect
 Set_connection_parameters=Set_connection_parameters
 Path_to_OpenOffice_directory=Path_to_OpenOffice_directory
 Path_to_OpenOffice_executable=Path_to_OpenOffice_executable
 Path_to_OpenOffice_library_dir=Path_to_OpenOffice_library_dir
-Autodetect=Autodetect
 Connection_lost=Connection_lost
 The_paragraph_format_is_controlled_by_the_property_'ReferenceParagraphFormat'_or_'ReferenceHeaderParagraphFormat'_in_the_style_file.=The_paragraph_format_is_controlled_by_the_property_'ReferenceParagraphFormat'_or_'ReferenceHeaderParagraphFormat'_in_the_style_file.
 The_character_format_is_controlled_by_the_citation_property_'CitationCharacterFormat'_in_the_style_file.=The_character_format_is_controlled_by_the_citation_property_'CitationCharacterFormat'_in_the_style_file.
@@ -2204,8 +2121,6 @@ JSTOR_import_cancelled=JSTOR_import_cancelled
 HTML_list=HTML_list
 Click_group_to_toggle_membership_of_selected_entries=Click_group_to_toggle_membership_of_selected_entries
 Use_EMACS_23_insertion_string=Use_EMACS_23_insertion_string
-
-Normalize_to_BibTeX_name_format=Normalize_to_BibTeX_name_format
 If_possible,_normalize_this_list_of_names_to_conform_to_standard_BibTeX_name_formatting=If_possible,_normalize_this_list_of_names_to_conform_to_standard_BibTeX_name_formatting
 Could_not_open_%0=Could_not_open_%0
 Unknown_import_format=Unknown_import_format
@@ -2214,7 +2129,6 @@ An_Error_occurred_while_fetching_from_INSPIRE_source_(%0)\:=An_Error_occurred_wh
 Error_while_fetching_from_Inspire\:_=Error_while_fetching_from_Inspire\:_
 Web_search=Web_search
 Autocomplete_names=Autocomplete_names
-You_must_select_either_a_valid_style_file,_or_use_the_default_style.=You_must_select_either_a_valid_style_file,_or_use_the_default_style.
 Default_style=Default_style
 Choose_style_file_directly=Choose_style_file_directly
 Choose_from_a_directory=Choose_from_a_directory
@@ -2256,7 +2170,6 @@ Autocompletion_options=Autocompletion_options
 Autocomplete_after_following_number_of_characters=Autocomplete_after_following_number_of_characters
 Name_format_used_for_autocompletion=Name_format_used_for_autocompletion
 Treatment_of_first_names=Treatment_of_first_names
-No_icon_found_for_%0=No_icon_found_for_%0
 Cleanup_entries=Cleanup_entries
 Automatically_assign_new_entry_to_selected_groups=Automatically_assign_new_entry_to_selected_groups
 
@@ -2271,15 +2184,11 @@ Doing_a_cleanup_for_%0_entries...=Doing_a_cleanup_for_%0_entries...
 No_entry_needed_a_clean_up=No_entry_needed_a_clean_up
 One_entry_needed_a_clean_up=One_entry_needed_a_clean_up
 %0_entries_needed_a_clean_up=%0_entries_needed_a_clean_up
-Imported_=Imported_
 Error_importing_from_database=Error_importing_from_database
 %0_databases_will_be_imported=%0_databases_will_be_imported
 Imported_%0_databases_successfully=Imported_%0_databases_successfully
 Minimize_to_system_tray=Minimize_to_system_tray
 
-Incomplete_search_results=Incomplete_search_results
-%0_entries_were_found,_but_only_%1_of_these_could_be_resolved.=%0_entries_were_found,_but_only_%1_of_these_could_be_resolved.
-
 Error_downloading_file_'%0'=Error_downloading_file_'%0'
 Download_failed=Download_failed
 
@@ -2302,10 +2211,9 @@ Unable_to_clear_preferences.=Unable_to_clear_preferences.
 
 Reset_preferences_(key1,key2,..._or_'all')=Reset_preferences_(key1,key2,..._or_'all')
 Find_unlinked_files=Find_unlinked_files
-Select_All=Select_All
-Unselect_All=Unselect_All
-Expand_All=Expand_All
-Collapse_All=Collapse_All
+Unselect_all=Unselect_all
+Expand_all=Expand_all
+Collapse_all=Collapse_all
 Select_Directory=Select_Directory
 Choose_Directory=Choose_Directory
 Use_the_selected_directory_to_start_with_the_search.=Use_the_selected_directory_to_start_with_the_search.
@@ -2340,7 +2248,6 @@ Not_overwriting_existing_key._To_change_this_setting,_open_Options_->_Prefereren
 How_would_you_like_to_link_to_'%0'?=How_would_you_like_to_link_to_'%0'?
 Marked_entries_as_relevant=Marked_entries_as_relevant
 Marked_entries'_quality_as_good=Marked_entries'_quality_as_good
-Set_priority=Set_priority
 no_preview_available=no_preview_available
 Enable_PDF_preview=Enable_PDF_preview
 Show_one_letter_heading_for_icon_columns=Show_one_letter_heading_for_icon_columns
@@ -2396,7 +2303,6 @@ If_a_pasted_or_imported_entry_already_has_the_field_set,_overwrite.=If_a_pasted_
 To_disable_the_memory_stick_mode_rename_or_remove_the_jabref.xml_file_in_the_same_folder_as_JabRef.=To_disable_the_memory_stick_mode_rename_or_remove_the_jabref.xml_file_in_the_same_folder_as_JabRef.
 Please_note_that_this_is_an_early_beta_version._Do_not_use_it_without_backing_up_your_files!=Please_note_that_this_is_an_early_beta_version._Do_not_use_it_without_backing_up_your_files!
 A_string_with_that_label_already_exists=A_string_with_that_label_already_exists
-File_has_been_updated_externally._Are_you_sure_you_want_to_save?=File_has_been_updated_externally._Are_you_sure_you_want_to_save?
 Could_not_connect_to_a_running_gnuserv_process._Make_sure_that_Emacs_or_XEmacs_is_running,<BR>and_that_the_server_has_been_started_(by_running_the_command_'server-start'/'gnuserv-start').=Could_not_connect_to_a_running_gnuserv_process._Make_sure_that_Emacs_or_XEmacs_is_running,<BR>and_that_the_server_has_been_started_(by_running_the_command_'server-start'/'gnuserv-start').
 Use_the_following_delimiter_character(s)\:=Use_the_following_delimiter_character(s):
 Created_group_"%0".=Created_group_"%0".
@@ -2432,4 +2338,63 @@ An_Error_occurred_while_parsing_abstract=An_Error_occurred_while_parsing_abstrac
 Unknown_DiVA_entry\:_'%0'.=Unknown_DiVA_entry:_'%0'.
 Get_BibTeX_entry_from_DiVA=Get_BibTeX_entry_from_DiVA
 Log=Log
-Remove_unneccessary_$,_{,_and_}=Remove_unneccessary_$,_{,_and_}
+
+ISO_690=ISO_690
+
+Format_units_by_adding_non-breaking_separators_and_keeping_the_correct_case_on_search=Format_units_by_adding_non-breaking_separators_and_keeping_the_correct_case_on_search
+Use_Emacs_key_bindings=Use_Emacs_key_bindings
+Merge_entries=Merge_entries
+Show_URL_first=Show_URL_first
+Show_DOI_first=Show_DOI_first
+Remove_unneccessary_$,_{,_and_}_and_move_adjacent_numbers_into_equations=Remove_unneccessary_$,_{,_and_}_and_move_adjacent_numbers_into_equations
+Add_brackets_and_replace_separators_with_their_non-breaking_version_for_units=Add_brackets_and_replace_separators_with_their_non-breaking_version_for_units
+First_entry=First_entry
+Use_1st=Use_1st
+None=None
+Use_2nd=Use_2nd
+Second_entry=Second_entry
+You_have_to_choose_exactly_two_entries_to_merge.=You_have_to_choose_exactly_two_entries_to_merge.
+Merged_entry=Merged_entry
+Error_in_entry=Error_in_entry
+Add_new_entry_and_keep_both_old_entries=Add_new_entry_and_keep_both_old_entries
+Replace_old_entries_with_new_entry=Replace_old_entries_with_new_entry
+Cancelled_merging_entries=Cancelled_merging_entries
+Merged_entries_into_a_new_and_kept_the_old=Merged_entries_into_a_new_and_kept_the_old
+Merged_entries_into_a_new_and_removed_the_old=Merged_entries_into_a_new_and_removed_the_old
+Parse=Parse
+Result=Result
+
+Update_timestamp_on_modification=Update_timestamp_on_modification
+change_field=change_field
+
+Automatically_set_file_links=Automatically_set_file_links
+All_key_bindings_will_be_reset_to_their_defaults.=All_key_bindings_will_be_reset_to_their_defaults.
+Continue?=Continue?
+Resetting_all_key_bindings=Resetting_all_key_bindings
+Save_entries_ordered_by_title=Save_entries_ordered_by_title
+Export_entries_ordered_by_title=Export_entries_ordered_by_title
+Quotes=Quotes
+Curly_Brackets=Curly_Brackets
+Include_empty_fields=Include_empty_fields
+Field_saving_options=Field_saving_options
+Field_value_delimiter._E.g.,_"author\={x}"_or_"author\='x'"=Field_value_delimiter._E.g.,_"author={x}"_or_"author='x'"
+Run_Unicode_converter_on_title,_author(s),_and_abstract=Run_Unicode_converter_on_title,_author(s),_and_abstract
+
+Start_field_contents_in_same_column=Start_field_contents_in_same_column
+Use_camel_case_for_field_names_(e.g.,_"HowPublished"_instead_of_"howpublished")=Use_camel_case_for_field_names_(e.g.,_"HowPublished"_instead_of_"howpublished")
+Database_has_changed._Do_you_want_to_save_before_closing?=Database_has_changed._Do_you_want_to_save_before_closing?
+Use_custom_proxy_configuration=Use_custom_proxy_configuration
+Network=Network
+Host=Host
+Port=Port
+Please_specify_both_hostname_and_port=Please_specify_both_hostname_and_port
+Invalid_setting=Invalid_setting
+Clear_connection_settings=Clear_connection_settings
+Cleared_connection_settings.=Cleared_connection_settings.
+
+Rebind_C-a,_too=Rebind_C-a,_too
+
+Show_number_of_elements_contained_in_each_group=Show_number_of_elements_contained_in_each_group
+
+Opened_%0_folder(s).=Opened_%0_folder(s).
+
diff --git a/src/resource/JabRef_es.properties b/src/resource/JabRef_es.properties
new file mode 100644
index 0000000..79362e4
--- /dev/null
+++ b/src/resource/JabRef_es.properties
@@ -0,0 +1,1592 @@
+#!
+#!_created/edited_by_Popeye_version_0.55_(https://github.com/koppor/popeye)
+#!_encoding:ISO-8859-1
+%0_contains_the_Regular_Expression_<b>%1</b>=%0%0 contiene_la_expresi\u00f3n_regular_<b>%1</b>
+%0_contains_the_term_<b>%1</b>=%0%nbsp;contiene_el_t\u00e9rmino_<b>%1</b>
+%0_doesn't_contain_the_Regular_Expression_<b>%1</b>=%0_no_contiene_la_Expresi\u00f3n_Regular_<b>&1</b>
+%0_doesn't_contain_the_term_<b>%1</b>=%0_no_contiene_el_t\u00e9rmino_<b>%1</b>
+%0_doesn't_match_the_Regular_Expression_<b>%1</b>=%0_no_satisface_la_Expresi\u00f3n_Regular_<b>%1</b>
+%0_doesn't_match_the_term_<b>%1</b>=%0_no_coincide_con_el_t\u00e9rmino_<b>%1</b>
+%0_export_successful=%0_exportado_con_\u00e9xito
+%0_field_set=Campo_%0_establecido
+%0_matches_the_Regular_Expression_<b>%1</b>=%0_coincidencias_con_la_Expresi\u00f3n_Regular_<b>%1</b>
+%0_matches_the_term_<b>%1</b>=%0_coincidencias_con_el_t\u00e9rmino_<b>%1</b>
+<field_name>=<nombre_del_campo>
+<HTML>Could_not_find_file_'%0'<BR>linked_from_entry_'%1'</HTML>=<HTML>No_se_encuentra_el_archivo_'%0'<BR>enlazado_desde_la_entrada_'%1'</HTML>
+<no_field>=<sin_campo>
+<select>=<seleccionar>
+<select_word>=<seleccionar_palabra>
+A_string_with_this_label_already_exists=Ya_existe_una_cadena_con_esta_etiqueta
+Abbreviate_journal_names_of_the_selected_entries_(ISO_abbreviation)=Abreviar_nombres_de_revistas_de_las_entradas_seleccionadas_(Abreviatura_ISO)
+Abbreviate_journal_names_of_the_selected_entries_(MEDLINE_abbreviation)=Abreviar_nombres_de_revistas_de_las_entradas_seleccionadas_(Abreviatura_MEDLINE)
+Abbreviate_names=Abreviar_nombres
+Abbreviated_%0_journal_names.=Se_han_abreviado_%0_nombres_de_revistas
+Abbreviation=Abreviatura
+About_JabRef=Acerca_de_JabRef
+Abstract=Resumen
+Accept=Aceptar
+Accept_change=Aceptar_cambio
+Action=Acci\u00f3n
+Add=A\u00f1adir
+Add_a_(compiled)_custom_ImportFormat_class_from_a_class_path._\nThe_path_need_not_be_on_the_classpath_of_JabRef.=A\u00f1adir_una_clase_personalizada_(compilada)_ImportFormat_desde_una_classpath._\n_La_ruta_no_debe_estar_en_la_classpath_de_JabRef.
+Add_a_(compiled)_custom_ImportFormat_class_from_a_Zip-archive.\nThe_Zip-archive_need_not_be_on_the_classpath_of_JabRef.=A\u00f1adir_una_clase_personalizada_(compilada)_ImportFormat_desde_un_archivo_Zip.\n_El_archivo_Zip_no_tiene_por_qu\u00e9_estar_en_la_classpath_de_JabRef.
+add_entries_to_group=A\u00f1adir_entradas_a_grupo
+Add_entry_selection_to_this_group=A\u00f1adir_selecci\u00f3n_de_entrada_al_grupo
+Add_from_folder=A\u00f1adir_desde_carpeta
+Add_from_jar=A\u00f1adir_desde_jar
+add_group=a\u00f1adir_grupo
+Add_Group=A\u00f1adir_grupo
+Add_new=A\u00f1adir_nuevo
+Add_Subgroup=A\u00f1adir_subgrupo
+Add_to_group=A\u00f1adir_a_grupo
+Added_group_"%0".=Grupo_"%0"_a\u00f1adido
+Added_new=Nuevo_a\u00f1adido
+Added_string=Cadena_a\u00f1adida
+Additionally,_entries_whose_<b>%0</b>_field_does_not_contain_<b>%1</b>_can_be_assigned_manually_to_this_group_by_selecting_them_then_using_either_drag_and_drop_or_the_context_menu._This_process_adds_the_term_<b>%1</b>_to_each_entry's_<b>%0</b>_field._Entries_can_be_removed_manually_from_this_group_by_selecting_them_then_using_the_context_menu._This_process_removes_the_term_<b>%1</b>_from_each_entry's_<b>%0</b>_field.=Adicionalmente,_entradas_cuyo_campo_<b>%0</b>_no_contenga_<b>%1</b>&nbs [...]
+Advanced=Avanzado
+All_custom_file_types_will_be_lost._Proceed?=Todos_los_tipos_de_archivo_personalizados_se_perder\u00e1n..._\u00bfContinuar?
+All_Entries=Todas_las_entradas
+All_entries=Todas_las_entradas
+All_entries_of_this_type_will_be_declared_typeless._Continue?=Todas_las_entradas_de_este_tipo_ser\u00e1n_declaradas_Sin_Tipo._\u00bfContinuar?
+All_fields=Todos_los_campos
+All_subgroups_(recursively)=Todos_los_subgrupos(Recursivamente)
+Allow_editing_in_table_cells=Permitir_la_edici\u00f3n_en_celdas_de_tabla
+An_Error_occurred_while_fetching_from_OAI2_source_(%0)\:=Ocurri\u00f3_un_error_mientras_se_recuperaba_desde_la_fuente_OAl2_(%0):
+An_Exception_ocurred_while_accessing_'%0'=Ocurri\u00f3_una_Excepci\u00f3n_mientras_se_acced\u00eda_a_'%0'
+An_SAXException_ocurred_while_parsing_'%0'\:=Ocurri\u00f3_una_Excepci\u00f3n_SAX_mientras_se_analizaba_la_sintaxis_de_'%0':
+and= y
+and_inside_the_JabRef-jar\:=y_en_el_interior_del_jar_de_JabRef:
+and_the_class_must_be_available_in_your_classpath_next_time_you_start_JabRef.=y_la_clase_debe_estar_disponible_en_su_classpath_la_pr\u00f3xima_vez_que_inicie_JabRef.
+any_field_that_matches_the_regular_expression_<b>%0</b>=cualquier_campo_que_satisfaga_la_Expresi\u00f3n_Regular_<b>%0</b>
+Appearance=Aspecto
+Append=A\u00f1adir
+Append_contents_from_a_BibTeX_database_into_the_currently_viewed_database=Agregar_contenidos_desde_una_base_de_datos_BibTex_a_la_base_de_datos_actual
+Append_database=Agregar_base_de_datos
+append_the_selected_text_to_bibtex_key=agregar_el_texto_seleccionado_a_la_clave_bibtex
+Application=Aplicaci\u00f3n
+Apply=Aplicar
+Arguments_passed_on_to_running_JabRef_instance._Shutting_down.=Argumentos_pasados_a_una_instancia_JabRef_en_ejecuci\u00f3n._Cerrando_el_programa.
+Assign_entry_selection_exclusively_to_this_group=Asignar_la_seleccion_de_entradas_exclusivamente_a_este_grupo
+Assign_new_file=Asignar_nuevo_archivo
+Assign_the_original_group's_entries_to_this_group?=\u00bfAsignar_las_entradas_del_grupo_original_a_este_grupo?
+Assigned_%0_entries_to_group_"%1".=Se_han_asignado_%0_entradas_al_grupo_"%1"
+Assigned_1_entry_to_group_"%0".=Asignada_una_entrada_al_grupo_"%0".
+At_least_the_plug-in_'net.sf.jabref.core'_should_be_there.=Al_menos_el_plugin_'net.sf.jabref.core'_deber\u00eda_estar_ah\u00ed.
+Attach_%0_file=Adjuntar_el_archivo_%0
+Attach_URL=Adjuntar_URL
+Attempt_to_autoset_%0_links_for_your_entries._Autoset_works_if_a_%0_file_in_your_%0_directory_or_a_subdirectory<BR>is_named_identically_to_an_entry's_BibTeX_key,_plus_extension.=Intentar_establecer_autom\u00e1ticamente_%0_enlaces_para_sus_entradas._El_establecimiento_autom\u00e1tico_funciona_si_un_archivo_%0_en_la_carpeta_%0_o_un_subdirectrio_<BR>_tiene_nombre_id\u00e9ntico_a_una_entrada_Bibtex_m\u00e1s_la_extensi\u00f3n.
+Attempting_SQL_export...=Intentando_la_exportaci\u00f3n_SQL...
+Auto=Auto
+Autodetect_format=Autodetectar_formato
+Autogenerate_BibTeX_key=Autogenerar_clave_BibTex
+Autogenerate_BibTeX_keys=Autogenerar_claves_BibTex
+Autogenerate_groups=Autogenerar_grupos
+autogenerate_keys=autogenerar_claves
+Autolink_files_with_names_starting_with_the_BibTeX_key=Autoenlazar_con_nombres_comenzando_por_la_clave_BibTex
+Autolink_only_files_that_match_the_BibTeX_key=Autoenlazar_s\u00f3lo_archivos_cuyo_nombre_coincida_con_la_clave_BibTex
+Automatically_create_groups=Crear_grupos_autom\u00e1ticamente
+Automatically_create_groups_for_database.=Crear_grupos_para_base_de_datos_autom\u00e1ticamente
+Automatically_created_groups=Grupos_autom\u00e1ticamente_creados
+Automatically_hide_groups_interface_when_switching_to_a_database_that_contains_no_groups=Ocultar_autom\u00e1ticamente_el_interfaz_de_grupos_cuando_se_cambie_a_una_base_de_datos_que_no_contenga_grupos
+Automatically_remove_exact_duplicates=Eliminar_autom\u00e1ticamente_duplicados_exactos
+Automatically_show_groups_interface_when_switching_to_a_database_that_contains_groups=Mostrar_autom\u00e1ticamente_el_interfaz_de_grupos_cuando_se_cambie_a_una_base_de_datos_que_contenga_grupos
+Autoset=Establecer_autom\u00e1ticamente
+Autoset_%0_field=Establecer_autom\u00e1ticamente_el_campo_%0
+Autoset_%0_links._Allow_overwriting_existing_links.=Establecer_autom\u00e1ticamente_%0_enlaces._Permitir_sobreescribir_enlaces_existentes.
+Autoset_%0_links._Do_not_overwrite_existing_links.=Establecer_autom\u00e1ticamente_%0_enlaces._No_sobreescribir_enlaces_existentes.
+Autoset_external_links=Establecer_autom\u00e1ticamente_enlaces_externos
+Autosetting_links=Estableciendo_autom\u00e1ticamente_enlaces
+AUX_file_import=Importar_archivo_AUX
+Available_export_formats=Formatos_para_exportaci\u00f3n_disponibles
+Available_fields=Campos_Disponibles
+Available_import_formats=Formatos_disponibles_para_importar
+Background_color_for_optional_fields=Color_de_fondo_campos_opcionales
+Background_color_for_required_fields=Color_de_fondo_campos_requeridos
+Backup_old_file_when_saving=Hacer_copia_de_respaldo_del_archivo_antiguo_al_grabar
+Beta_version=Versi\u00f3n_Beta
+BibTeX_key=Clave_BibTex
+BibTeX_key_is_unique.=La_clave_BibTex_es_\u00fanica
+BibTeX_key_not_set._Enter_a_name_for_the_downloaded_file=Clave_BibTex_no_establecida._Introduzca_un_nombre_para_el_archivo_descargado
+BibTeX_source=Origen_BibTex
+BibTeXML=BibTeXML
+Binding=Combinando
+Broken_link=Enlace_roto
+Browse=Explorar
+by=por
+Cancel=Cancelar
+Cannot_add_entries_to_group_without_generating_keys._Generate_keys_now?=No_se_pueden_a\u00f1adir_entradas_a_un_grupo_sin_generar_claves._\u00bfGenerar_claves_ahora?
+Cannot_merge_this_change=No_se_puede_incorporar_este_cambio
+Cannot_move_group_"%0"_down.=No_se_puede_mover_el_grupo_"%0"_hacia_abajo.
+Cannot_move_group_"%0"_left.=No_se_puede_mover_el_grupo_"%0"_hacia_la_izquierda
+Cannot_move_group_"%0"_right.=No_se_puede_mover_el_grupo_"%0"_hacia_la_derecha.
+Cannot_move_group_"%0"_up.=No_se_puede_mover_el_grupo_"%0"_hacia_arriba.
+case_insensitive=insensible_al_uso_de_may\u00fasculas/min\u00fasculas
+case_sensitive=sensible_al_uso_de_may\u00fasculas/min\u00fasculas
+Case_sensitive=Sensible_al_uso_de_may\u00fasculas/min\u00fasculas
+change_assignment_of_entries=Cambiar_asignaci\u00f3n_de_entradas
+Change_case=Cambiar_may\u00fasculas/min\u00fasculas
+Change_entry_type=Cambiar_tipo_de_entrada
+Change_file_type=Cambiar_tipo_de_archivo
+change_key=cambiar_clave
+Change_of_Grouping_Method=Cambiar_m\u00e9todo_de_agrupamiento
+change_preamble=cambiar_pre\u00e1mbulo
+change_string_content=cambiar_contenido_de_la_cadena
+change_string_name=cambiar_nombre_de_la_cadena
+Change_table_column_and_General_fields_settings_to_use_the_new_feature=Cambiar_los_ajustes_de_columna_de_tabla_y_campos_generales_para_usar_la_nueva_carater\u00edstica
+change_type=cambiar_tipo
+changed_=cambiado
+Changed_font_settings=Ajustes_de_tipo_de_letra_cambiados
+Changed_language_settings=Ajustes_de_lenguaje_cambiados
+Changed_look_and_feel_settings=Ajustes_de_aspecto_cambiados
+Changed_preamble=Pre\u00e1mbulo_cambiado
+Changed_type_to=Tipo_cambiado_a
+Characters_to_ignore=Caracteres_a_ignorar
+Check_existing_%0_links=Comprobar_%0_enlaces_existentes
+Check_links=Comprobar_enlaces
+Choose_the_URL_to_download._The_default_value_points_to_a_list_provided_by_the_JabRef_developers.=Seleccionar_URL_a_descargar._El_valor_por_defecto_apunta_a_una_lista_facilitada_por_los_desarrolladores_de_JabRef.
+Cite_command=Comando_Citar
+Class_name=Nombre_de_clase
+Clear=Limpiar
+clear_all_groups=Limpiar_todos_los_grupos
+Clear_field=Limpiar_campo
+Clear_fields=Limpiar_campos
+Clear_highlight=Limpiar_resaltado
+Close=Cerrar
+Close_dialog=Cerrar_di\u00e1logo
+Close_the_current_database=Cerrar_la_base_de_datos_actual
+Close_the_help_window=Cerrar_la_ventana_de_ayuda
+Close_window=Cerrar_ventana
+Closed_database=Base_de_datos_cerrada
+Collapse_subtree=Colapsar_sub\u00e1rbol
+Color_codes_for_required_and_optional_fields=C\u00f3digos_de_color_para_campos_requeridos_y_opcionales
+Color_for_marking_incomplete_entries=Color_para_marcar_entradas_incompletas
+Column_width=Ancho_de_columna
+Command_line_id=Id_de_l\u00ednea_de_comando
+Complete_record=Completar_registro
+Connect=Conectar
+Connect_to_SQL_database=Conectar_a_base_de_datos_SQL
+Connect_to_SQL_Database=Conectar_a_Base_de_Datos_SQL
+Connection_to_IEEEXplore_failed=Ha_fallado_la_conexi\u00f3n_a_IEEEXplore
+Contained_in=Contenido_en
+Content=Contenido
+Copied=Copiado
+Copied_cell_contents=Contenido_de_celda_copiado
+Copied_key=Clave_copiada
+Copied_keys=Claves_copiadas
+Copy=Copiar
+Copy_BibTeX_key=Copiar_clave_BibText
+Copy_file_to_file_directory.=Copiar_archivos_a_carpeta
+Copy_files_to_file_directory.=Copiar_archivos_al_directorio_de_archivos
+Copy_to_clipboard=Copiar_al_portapapeles
+Could_not_call_executable=No_se_puede_llamar_al_ejecutable
+Could_not_connect_to_host_=No_se_puede_conectar_con_el_host
+Could_not_connect_to_Vim_server._Make_sure_that_Vim_is_running<BR>with_correct_server_name.=No_se_puede_conectar_con_el_servidor_Vim._Aseg\u00farese_de_que_Vim_est\u00e1_corriendo<BR>_con_el_nombre_de_servidor_correcto.
+Could_not_export_file=No_se_puede_exportar_el_archivo
+Could_not_export_preferences=No_se_pueden_exportar_las_preferencias
+Could_not_find_a_suitable_import_format.=No_se_encuentra_un_formato_de_importaci\u00f3n_apropiado.
+Could_not_find_directory_for_%0-files\:_%1=No_se_puede_encontrar_directorio_para_%0-archivos:_%1
+Could_not_find_image_file=No_se_puede_encontrar_el_archivo_de_imagen
+Could_not_find_layout_file=No_se_encuentra_el_archivo_de_dise\u00f1o
+Could_not_import_preferences=No_se_pueden_importar_las_preferencias
+Could_not_instantiate_%0=No_se_puede_instanciar_%0
+Could_not_instantiate_%0_%1=No_se_puede_instanciar_%0_%1
+Could_not_instantiate_%0._Have_you_chosen_the_correct_package_path?=No_se_puede_instanciar_%0._\u00bfHa_escogido_la_ruta_del_paquete_correctamente?
+Could_not_open_link=No_se_puede_abrir_el_enlace
+Could_not_parse_number_of_hits=No_se_puede_analizar_el_n\u00famero_de_aciertos
+Could_not_print_preview=No_se_puede_imprimir_la_vista_previa
+Could_not_run_the_'vim'_program.=No_se_puede_ejecutar_Vim
+Could_not_save_file=No_se_puede_guardar_el_archivo
+Could_not_save_file._Character_encoding_'%0'_is_not_supported.=No_se_puede_guardar_el_archivo._La_codificaci\u00f3nd_de_caracteres_'%0'_no_est\u00e1_soportada.
+Create_group=Crear_grupo
+Created_groups.=Grupos_creados.
+crossreferenced_entries_included=entradas_de_referencia_cruzada_inclu\u00eddas
+Current_content=Contenido_actual
+Current_value=Valor_actual
+Custom_entry_types=Tipos_de_entrada_personalizados
+Custom_entry_types_found_in_file=Se_han_encontrado_tipos_de_entrada_personalizados_en_el_archivo
+Custom_icon_theme=Tema_de_icono_personalizado
+Custom_icon_theme_file=Archivo_con_tema_de_iconos_personalizado
+Custom_importers=Importador_personalizado
+Customize_entry_types=Tipos_de_entrada_personalizados
+Customize_key_bindings=Pesonalizar_combinaciones_de_tecla
+Cut=Cortar
+cut_entries=Cortar_entradas
+cut_entry=Cortar_entrada
+Cut_pr=Cortar
+Database_\:=Base_de_datos:
+Database_encoding=Codificaci\u00f3n_de_la_Base_de_Datos
+Database_properties=Propiedades_de_la_Base_de_Datos
+Date_format=Formato_de_fecha
+Default=Por_defecto
+Default_encoding=Codificaci\u00f3n_por_defecto
+Default_grouping_field=Campo_de_agrupaci\u00f3n_por_defecto
+Default_look_and_feel=Aspecto_por_defecto
+Default_pattern=Patr\u00f3n_por_defecto
+Default_sort_criteria=Criterio_de_ordenaci\u00f3n_por_defecto
+Define_'%0'=Definir_'%0'
+Delete=Borrar
+Delete_custom_format=Borrar_formato_por_defecto
+delete_entries=borrar_entradas
+Delete_entry=Borrar_entrada
+delete_entry=borrar_entrada
+Delete_multiple_entries=Borrar_entradas_m\u00faltiples
+Delete_rows=Borrar_filas
+Delete_strings=Borrar_cadenas
+Deleted=Borrado
+Delimit_fields_with_semicolon,_ex.=Delimitar_campos_con_punto_y_coma
+Descending=Descendiente
+Description=Descripci\u00f3n
+Deselect_all=Deseleccionar_todos
+Deselect_all_duplicates=Deseleccionar_todos_los_duplicados
+Details=Detalles
+Disable_entry_editor_when_multiple_entries_are_selected=Deshabilitar_el_editor_de_entradas_cuando_hayan_m\u00faltiples_entradas_seleccionadas
+Disable_this_confirmation_dialog=Deshabilitar_este_di\u00e1logo_de_confirmaci\u00f3n
+Disable_this_warning_dialog=Deshabilitar_este_di\u00e1logo_de_aviso
+Display_all_entries_belonging_to_one_or_more_of_the_selected_groups.=Mostrar_todas_las_entradas_pertenecientes_a_uno_o_m\u00e1s_de_los_grupos_seleccionados.
+Display_all_error_messages=Mostrar_todos_los_mensajes_de_error
+Display_help_on_command_line_options=Mosrar_ayuda_en_las_opciones_de_l\u00ednea_de_comando
+Display_imported_entries_in_an_inspection_window_before_they_are_added.=Mostrar_entradas_importadas_en_ventana_de_inspecci\u00f3n_antes_de_que_sean_a\u00f1adidas.
+Display_only_entries_belonging_to_all_selected_groups.=Mostrar_s\u00f3lo_entradas_pertenecientes_a_todos_los_grupos_seleccionados.
+Display_version=Mostrar_versi\u00f3n
+Displaying_no_groups=No_se_muestran_grupos
+Do_not_abbreviate_names=No_abreviar_nombres
+Do_not_autoset=No_establecer_autom\u00e1ticamente
+Do_not_import_entry=No_importar_entrada
+Do_not_open_any_files_at_startup=No_abrir_ning\u00fan_archivo_al_arrancar
+Do_not_overwrite_existing_keys=No_sobreescribir_claves_existentes
+Do_not_show_splash_window_at_startup=No_mostrar_la
+Do_not_show_these_options_in_the_future=No_mostrar_estas_ospciones_en_el_futuro
+Do_not_wrap_the_following_fields_when_saving=No_envolver_los_siguientes_campos_al_guardar
+Do_not_write_the_following_fields_to_XMP_Metadata\:=No_escribir_los_campos_a_continuaci\u00f3n_a_los_metadatos_XMP
+Do_you_want_JabRef_to_do_the_following_operations?=\u00bfQuiere_que_JabRef_efect\u00fae_las_siguientes_operaciones?
+DocBook=DocBook
+Down=Abajo
+Download=Descargar
+Download_completed=Descarga_completa
+Download_file=Descargar_archivo
+Downloading...=Descargando...
+Drag_and_Drop_Error=Error_al_arrastrar_y_soltar
+Drop_%0=Soltar_%0
+duplicate_BibTeX_key=clave_BibText_duplicada
+Duplicate_BibTeX_key.=Clave_BibTex_duplicada
+Duplicate_BibTeX_key._Grouping_may_not_work_for_this_entry.=Clave_BibText_duplicada._El_agrupamiento_puede_no_funcionar_para_esta_entrada.
+Duplicate_Key_Warning=Alerta_de_Clave_Duplicada
+Duplicate_pairs_found=Se_encontrarion_pares_duplicados
+duplicate_removal=eliminaci\u00f3n_de_duplicados
+Duplicate_string_name=Nombre_de_cadena_duplicado
+Duplicates_found=Se_han_encontrado_duplicados
+Duplicates_removed=Duplicados_eliminados
+Dynamic_groups=Grupos_din\u00e1micos
+Dynamically_group_entries_by_a_free-form_search_expression=Agrupar_entradas_din\u00e1micamente_por_una_expresi\u00f3n_de_b\u00fasqueda_libre
+Dynamically_group_entries_by_searching_a_field_for_a_keyword=Agrupar_entradas_din\u00e1micamente_buscando_palabra_clave_en_campo
+Each_line_must_be_on_the_following_form=Cada_l\u00ednea_debe_tener_la_siguiente_forma
+Edit=Editar
+Edit_custom_export=Editar_exportaci\u00f3n_personalizada
+Edit_entry=Editar_entrada
+Edit_file_link=Editar_enlace_a_archivo
+Edit_file_type=Editar_tipo_de_archivo
+Edit_group=Editar_grupo
+Edit_journal=Editar_revista
+Edit_preamble=Editar_pre\u00e1mbulo
+Edit_strings=Editar_cadenas
+Editor_options=Opciones_del_editor
+empty_BibTeX_key=clave_BibText_vac\u00eda
+Empty_BibTeX_key.=Clave_BibTex_vac\u00eda.
+Empty_BibTeX_key._Grouping_may_not_work_for_this_entry.=Clave_BibText_vac\u00eda._El_agrupamiento_puede_no_funcionar_para_esta_entrada.
+empty_database=base_de_datos_vac\u00eda
+Enable_source_editing=Permitir_la_edici\u00f3n_de_fuente
+Enable_word/name_autocompletion=Permitir_autocompletado_de_palabra/nombre
+Endnote=Endnote
+Enter_URL=Introducir_URL
+Enter_URL_to_download=Introducir_URL_a_descargar
+entries=entradas
+Entries_cannot_be_manually_assigned_to_or_removed_from_this_group.=Las_entradas_no_se_pueden_asignar_o_eliminar_manualmente_de_este_grupo.
+Entries_exported_to_clipboard=Entradas_exportadas_a_portapapeles
+entries_have_undefined_BibTeX_key=entradas_tienen_la_clave_BibText_sin_definir
+entries_into_new_database=entradas_en_nueva_base_de_datos
+entry=entrada
+Entry_editor=Editor_de_entrada
+Entry_in_current_database=Entrada_en_la_base_de_datos_actual
+Entry_in_import=Entrada_en_importaci\u00f3n
+Entry_preview=Vista_previa_de_la_entrada
+Entry_table=Tabla_de_entrada
+Entry_table_columns=Columnas_de_la_tabla_de_entrada
+Entry_type=Tipo_de_entrada
+Entry_type_names_are_not_allowed_to_contain_white_space_or_the_following_characters=No_se_permiten_espacios_ni_los_caracteres_siguientes_en_el_nombre_de_tipo_de_entrada
+Entry_types=Tipos_de_entrada
+Error=Error
+Error\:_=Error:
+Error_converting_Bibtex_to_XMP\:_%0=Error_convirtiendo_BibTex_a_XMP:_%0
+Error_converting_XMP_to_'%0'...=Error_convirtiendo_XMP_a_'%0'...
+Error_exporting_to_clipboard=Error_exportando_al_portapapeles
+Error_in_field=Error_en_campo
+Error_in_starting_plug-in_system._Starting_without,_but_some_functionality_may_be_missing.=Error_al_iniciar_el_sistema_de_plugins._Se_arrancar\u00e1_JabRef,_pero_podr\u00eda_perderse_alguna_funcionalidad.
+Error_occured_when_parsing_entry=Ocurri\u00f3_un_error_al_analizar_la_entrada
+Error_opening_file=Error_al_abrir_el_archivo
+Error_setting_field=Error_estableciendo_el_campo
+Error_while_converting_BibtexEntry_to_XMP_%0=Error_al_convertir_la_entrada_BibTex_a_XMP_%0
+Error_while_downloading_file\:=Error_al_descargar_el_archivo:
+Error_while_writing=Error_al_escribir
+Error_writing_to_%0_file(s).=Error_escribiendo_%0_archivo(s).
+Error_writing_XMP_to_file\:_%0=Error_escribiendo_XMP_al_archivo:_%0
+Establishing_SQL_connection...=Estableciendo_conexi\u00f3n_SQL...
+Exceptions=Excepciones
+Existing_file=Fichero_existente
+exists._Overwrite_file?=existe._\u00bfSobreescribir?
+exists._Overwrite?=existe._\u00bfSobreescribir?
+Expand_subtree=Expandir_sub\u00e1rbol
+Export=Exportar
+Export_name=Exportar_nombre
+Export_preferences=Exportar_preferencias
+Export_preferences_to_file=Exportar_preferencias_a_archivo
+Export_properties=Exportar_propiedades
+Export_to_clipboard=Exportar_al_portapapeles
+Export_to_SQL_database=Exportar_a_base_de_datos_SQL
+Exporting=Exportando
+Extension=Extensi\u00f3n
+External_changes=Cambios_externos
+External_file_links=Enlaces_a_archivos_externos
+External_files=Archivos_externos
+External_programs=Programas_externos
+External_viewer_called=Se_ha_lanzado_el_visor_externo
+Failed_to_read_groups_data_(unsupported_version\:_%0)=Error_durante_la_lectura_de_los_datos_de_los_grupos_(versi\u00f3n_no_soportada:_%0)
+Fetch=Recuperar
+Field=Campo
+field=campo
+Field_content=Contenido_del_campo
+Field_name=Nombre_del_campo
+Field_names_are_not_allowed_to_contain_white_space_or_the_following_characters=No_se_permiten_los_espacios_o_los_siguientes_caracteres_en_los_nombres_de_campo
+Field_sizes=Tama\u00f1o_de_campo
+Field_to_filter=Filtro_a_partir_de_campo
+Field_to_group_by=Agrupar_a_partir_de_campo
+Fields=Campos
+File=Archivo
+file=archivo
+File_'%0'_is_already_open.=El_archivo_'%0'_ya_est\u00e1_abierto.
+File_'%0'_not_found=No_se_encuentra_el_archivo_'%'
+File_changed=Fichero_cambiado
+File_directory_is_'%0'\:=La_carpeta_de_archivos_es_'%0':
+File_directory_is_not_set_or_does_not_exist!=\u00a1La_carpeta_de_archivos_no_et\u00e1_establecida_o_no_existe!
+File_download=Descargar_archivo
+File_exists=El_archivo_ya_existe
+File_extension=Extensi\u00f3n_de_archivo
+File_has_been_updated_externally._What_do_you_want_to_do?=El_archivo_ha_sido_editado
+File_not_found=No_se_ha_encontrado_el_archivo
+File_type=Tipo_de_archivo
+File_updated_externally=Archivo_actualizado_externamente
+filename=nombre_de_archivo
+Files_opened=Archivos_abiertos
+Filter=Filtro
+Finished_autosetting_external_links.=Se_ha_finalizado_la_configuraci\u00f3n_autom\u00e1tica_de_enlaces_esternos.
+Finished_synchronizing_%0_links._Entries_changed%c_%1.=Se_ha_finalizado_la_sincronizaci\u00f3n_de_%0_enlaces._Se_cambiaron_%c_%1_entradas.
+Finished_writing_XMP-metadata._Wrote_to_%0_file(s).=Se_ha_finalizado_la_escritura_de_los_metadtos_XMP._Se_escribi\u00f3_en_%0_archivo(s).
+Finished_writing_XMP_for_%0_file_(%1_skipped,_%2_errors).=Se_finaliz\u00f3_la_escritura_XMP_en_archivo_%0_(%1_evitados,_%2_errores).
+First_select_the_entries_you_want_keys_to_be_generated_for.Sele=Seleccione_primero_las_entradas_para_las_que_quiera_generar_claves.
+Fit_table_horizontally_on_screen=Ajustar_la_tabla_al_ancho_de_pantalla
+Float=Flotar
+Float_marked_entries=Flotar_entradas_marcadas
+Font_Family=Tipo_de_letra
+Font_Preview=Vista_previa_del_tipo_de_letra
+Font_Size=Tama\u00f1o_de_tipo_de_letra
+Font_Style=Estilo_de_tipo_de_letra
+FontSelector=Selector_tipo_de_letra
+for=para
+Format_of_author_and_editor_names=Formato_de_los_nombres_de_autor_y_editor
+Format_String=Formatear_cadena
+Format_used=Formato_usado
+Formatter_Name=Nombre_del_formateador
+Formatter_not_found=No_se_encuentra_formateador
+found=encontrado
+Found_%0_plugin(s)=Se_ha(n)_encontrado_%0_plugin(s)
+found_in_aux_file=encontrado_en_archivo_aux
+Full_name=Nombre_completo
+General=General
+General_fields=Generar_campos
+Generate=Generar
+Generate_BibTeX_key=Generar_clave_BibTeX
+Generate_keys=Generar_claves
+Generate_keys_before_saving_(for_entries_without_a_key)=Generar_claves_antes_de_guardar_(para_entradas_sin_clave)
+Generate_keys_for_imported_entries=Generar_claves_para_claves_importadas
+Generate_now=Generar_ahora
+Generated_BibTeX_key_for=Generar_clabe_BibTex_para
+Generating_BibTeX_key_for=Generarando_clave_BibTeX_para
+Grab=Coger
+Gray_out_entries_not_in_group_selection=Poner_en_gris_entradas_que_no_est\u00e9n_en_el_grupo_de_selecci\u00f3n
+Gray_out_non-hits=Poner_en_gris_los_no_encontrados
+Gray_out_non-matching_entries=Poner_en_gris_las_entradas_no_coincidentes
+Group_properties=Propiedades_de_grupo
+grouping_may_not_work_for_this_entry=El_agrupamiento_pudiera_no_funcionar_para_esta_entrada
+Groups=Grupos
+Harvard_RTF=Harvard_RTF
+Have_you_chosen_the_correct_package_path?=\u00bfHa_escogido_la_ruta_de_paquetes_correcta?
+Help=Ayuda
+Help_contents=Contenidos_de_la_ayuda
+Help_on_groups=Ayuda_sobre_grupos
+Help_on_key_patterns=Ayuda_sobre_patrones_de_teclas
+Help_on_Preview_Settings=Ayuda_sobre_ajustes_de_previsualizaci\u00f3n
+Help_on_Regular_Expression_Search=Ayuda_sobre_b\u00fasqueda_mediante_expresi\u00f3n_regular
+Hide_non-hits=Esconder_los_no-aciertos
+Hide_non-matching_entries=Ocultar_entradas_no_coincidentes
+Hierarchical_context=Contexto_jer\u00e1rquico
+Highlight=Resaltar
+Highlight_groups_matching_all_selected_entries=Resaltar_grupos_donde_coincidan_todas_las_entradas_seleccionadas
+Highlight_groups_matching_any_selected_entry=Resaltar_grupos_donde_coincida_cualquier_entrada_seccionada
+Highlight_overlapping_groups=Resaltar_grupos_solapados
+Hint%c_To_search_specific_fields_only,_enter_for_example%c<p><tt>author%esmith_and_title%eelectrical</tt>=Pista_%c_Para_buscar_s\u00f3lo_campos_espec\u00edficos,_introduzca,_por_ejemplo,_%c_<p><tt>author%esmith_and_title%eelectrical</tt>
+HTML=HTML
+HTML_table=Tabla_HTML
+HTML_table_(with_Abstract_&_BibTeX)=Tabla_HTML_(con_Abstract_BibTex)
+Icon=Icono
+Ignore=Ignorar
+Immediate_subgroups=Subgrupos_inmediatos
+Import=Importar
+Import_and_keep_old_entry=Importar_y_conservar_entrada_antigua
+Import_and_remove_old_entry=Importar_y_eliminar_antigua_entrada
+Import_entries=Importar_entradas
+Import_failed=Fall\u00f3_la_importaci\u00f3n
+Import_file=Importar_archivo
+Import_group_definitions=Importar_definiciones_de_grupo
+Import_name=Importar_nombre
+Import_preferences=Importar_preferencias
+Import_preferences_from_file=Importar_preferencias_desde_archivo
+Import_strings=Importar_cadenas
+Import_to_open_tab=Importar_en_pesta\u00f1a_abierta
+Import_word_selector_definitions=Importar_definiciones_de_selector_de_palabras
+Imported_database=Base_de_datos_importada
+Imported_entries=Importar_entradas
+Imported_from_database=Importado_desde_base_de_datos
+ImportFormat_class=Importar_formato_de_clase
+Importing=Importando
+Importing_in_unknown_format=Importando_en_formato_desconocido
+In_JabRef,_use_pairs_of_#_characters_to_indicate_a_string.=Usar_pares_de_#_para_indicar_una_caden_en_JabRef
+Include_abstracts=Incluir_abstracts
+Include_entries=Incluir_entradas
+Include_subgroups\:_When_selected,_view_entries_contained_in_this_group_or_its_subgroups=Incluir_subgrupos:_Ver_entradas_contenidas_es_este_grupo_o_sus_subgrupos_cuando_est\u00e9n_seleccionadas.
+Incremental=Incremental
+Incremental_search=B\u00fasqueda_incremental
+Incremental_search_failed._Repeat_to_search_from_top.=Error_durante_la_b\u00fasqueda_incremental._Repita_para_buscar_desde_el_principio.
+Independent_group\:_When_selected,_view_only_this_group's_entries=Grupo_independiente:_ver_s\u00f3lo_las_entradas_de_este_grupo_cuando_est\u00e9_seleccionado.
+Initially_show_groups_tree_expanded=Mostrar_inicialmente_\u00e1rbol_de_grupos_extendido
+Input=Opciones_de_trabajo
+Input_error=Error_de_entrada
+Insert=Insertar
+Insert_rows=Insertar_filas
+Insert_selected_citations_into_LyX/Kile=Insertar_citas_seleccionadas_en_LyX/Kile
+Insert_selected_citations_into_WinEdt=Insertar_citas_seleccionadas_en_WidEdt
+insert_string_=Insertar_cadena
+Insert_URL=Insertar_URL
+integrity=Integridad
+Integrity_check=Comprobaci\u00f3n_de_integridad
+Intersection=Intersecci\u00f3n
+Invalid_BibTeX_key=Clave_BibTeX_inv\u00e1lida
+Invalid_date_format=Formato_de_fecha_no_v\u00e1lido
+Invalid_URL=URL_no_v\u00e1lida
+Inverted=Invertido
+ISO_abbreviation=Abreviatura_ISO
+Item_list_for_field=lista_de_elementos_para_campo
+jabref=jabref
+JabRef_help=Ayuda_de_JabRef
+JabRef_preferences=Preferencias_de_JabRef
+Journal_abbreviations=Abreviaturas_de_publicaciones
+Journal_list_preview=Vista_previa_de_la_lista_de_publicaciones
+Journal_name=Nombre_de_la_revista
+Keep=Mantener
+Keep_both=Mantener_ambos
+Keep_lower=Mantener_inferior
+Keep_upper=Mantener_superior
+Key_bindings=Combinaciones_de_teclas
+Key_bindings_changed=Combinaciones_de_teclas_cambiadas
+Key_generator_settings=Ajustes_del_generador_de_claves
+Key_pattern=Patr\u00f3n_de_clave
+keys_in_database=claves_en_la_base_de_datos
+Keyword=Palabra_clave
+Label=Etiqueta
+Language=Idioma
+Last_modified=Modificado_por_\u00faltima_vez
+LaTeX_AUX_file=Archivo_LaTeX_AUX
+Leave_file_in_its_current_directory.=Dejar_el_archivo_en_su_directorio_actual
+Leave_files_in_their_current_directory.=Dejar_archivos_en_su_carpeta_actual
+Left=Dejar
+License=Licencia
+Limit_to_fields=Limitar_a_los_campos
+Limit_to_selected_entries=Limitar_a_las_entradas_seleccionadas
+Link=Enlace
+Link_local_file=Enlazar_archivo_local
+Link_to_file_%0=Enlazar_al_archivo_%0
+Listen_for_remote_operation_on_port=Escuchar_para_operaci\u00f3n_remota_en_el_puerto
+Load_and_Save_preferences_from/to_jabref.xml_on_start-up_(memory_stick_mode)=Cargar_y_guardar_preferencias_desde/a_jabref.xml_al_arrancar_(modo_l\u00e1piz_de_memoria)
+Load_session=Cargar_sesi\u00f3n
+Loading_session...=Cargando_sesi\u00f3n...
+localhost=localhost
+Look_and_feel=Aspecto
+Looking_for_pdf...=Buscando_pdf...
+lower=inferior
+Main_file_directory=Carpeta_del_archivo_principal
+Main_layout_file=Archivo_de_configuraci\u00f3n_principal
+Main_PDF_directory=ACaroeta_de_PDF_principal
+Main_PS_directory=Carpeta_de_PS_principal
+Manage=Administrar
+Manage_custom_exports=Administrar_esportaciones_personalizadas
+Manage_custom_imports=Administrar_importaciones_personalizadas
+Manage_external_file_types=Administrar_tipos_de_archivo_externos
+Manage_journal_abbreviations=Administrar_abreviaturas_de_revistas
+Mark_entries=Marcar_entradas
+Mark_entry=Marcar_entrada
+Mark_new_entries_with_addition_date=Marcar_nuevas_entradas_con_fecha_de_incorporaci\u00f3n
+Mark_new_entries_with_owner_name=Marcar_nuevas_entradas_con_nombre_de_propietario
+Marked_selected=Marcar_seleccionadas
+Memory_Stick_Mode=Modo_l\u00e1piz_de_memoria
+Menu_and_label_font_size=Tama\u00f1o_de_tipo_de_letra_para_men\u00fa_y_etiquetas
+Merged_external_changes=Cambios_externos_incorporados
+Messages=Mensajes
+Messages_and_Hints=Sugerencias_y_advertencias
+Modification_of_field=Modificaci\u00f3n_de_campo
+Modified_group_"%0".=Se_ha_modificado_el_grupo_"%0".
+Modified_groups=Grupos_modificados
+Modified_string=Cadena_modificada
+Modify=Modificar
+modify_group=Modificar_grupo
+MODS=MODS
+Move=Mover
+Move_down=Mover_hacia_abajo
+Move_entries_in_group_selection_to_the_top=Mover_entradas_en_el_grupo_seleccionado_al_inicio
+Move_external_links_to_'file'_field=Mover_enlaces_externos_al_campo_'archivo'
+Move_files_to_file_directory.=Mover_archivos_al_directorio_de_archivos.
+move_group=Mover_grupo
+Move_string_down=Mover_cadena_hacia_abajo
+Move_string_up=Mover_cadena_hacia_arriba
+Move_up=Mover_hacia_arriba
+Moved_group_"%0".=Se_ha_movido_el_grupo_"%0".
+MS_Office_2007=MS_Office_2007
+MySQL=MySQL
+MySQL_database=Base_de_datos_MySQL
+Name=Nombre
+Name_formatter=Formateador_de_nombre
+Natbib_style=Estilo_Natbib
+nested_aux_files=Archivos_aux_anidados
+New=Nuevo
+new=new
+New_BibTeX_database=Nueva_base_de_datos_Bibtex
+New_BibTeX_entry=Nueva_entrada_BibTeX
+New_BibTeX_subdatabase=Nueva_base_de_datos_secundaria_BibTeX
+New_content=Nuevo_contenido
+New_database_created.=Nueva_base_de_datos_creada.
+New_field_value=Nuevo_valor_de_campo
+New_file=Nuevo_archivo
+New_file_link_(INSERT)=Nuevo_enlace_a_archivo_(INSERTAR)
+New_group=Nuevo_grupo
+New_string=Nueva_cadena
+Next_entry=Entrada_siguiente
+No_%0_found=Ning\u00fan_%0_encontrado
+No_actual_changes_found.=No_se_han_encontrado_cambios_actuales.
+no_base-bibtex-file_specified=no_se_ha_especificado_archiv_base_bibtex
+no_database_generated=No_se_gener\u00f3_base_de_datos
+No_duplicates_found=No_se_han_encontrado_duplicados
+No_entries_found._Please_make_sure_you_are_using_the_correct_import_filter.=No_se_han_encontrado_entradas._Aseg\u00farese_de_que_est\u00e1_usando_el_filtro_de_importaci\u00f3n_correcto.
+No_entries_found_for_the_search_string_'%0'=No_se_han_encontrado_entdas_para_la_cadena_de_b\u00fasqueda_'%0'
+No_entries_imported.=No_se_han_importado_entradas.
+No_entries_or_multiple_entries_selected.=Ninguna_o_m\u00faltiples_entradas_seleccionadas
+No_entries_selected=No_se_han_seleccionado_entradas.
+No_entries_selected.=No_se_han_seleccionado_entradas.
+No_exceptions_have_ocurred.=No_han_ocurrido_excepciones.
+No_files_found.=No_se_han_encontrado_archivos.
+No_GUI._Only_process_command_line_options.=Sin_GUI._Procesar_s\u00f3lo_opciones_de_la_l\u00ednea_de_comandos.
+No_journal_names_could_be_abbreviated.=No_se_pudieron_abreviar_nombres_de_revistas.
+No_journal_names_could_be_unabbreviated.=No_se_pudieron_expandir_nombres_de_revistas.
+No_PDF_linked=Ning\u00fan_PDF_enlazado
+No_pdf_or_ps_defined,_and_no_file_matching_Bibtex_key_found=No_hay_pdf_o_ps_definido_y_no_hay_archivos_coincidentes_con_la_clave_BibTeX
+No_plugins_were_found_in_the_following_folders\:=No_se_han_encontrado_plugins_en_las_siguientes_carpetas\:
+No_references_found=No_se_han_encontrado_referencias
+No_saved_session_found.=No_se_ha_encontrado_ningunas_sesi\u00f3n_guardada.
+No_url_defined=Ninguna_URL_definida
+No_XMP_metadata_found_in_=No_se_han_encontrado_metadatos_XMP_en
+not=no
+not_found=no_encontrado
+Not_saved_(empty_session)=No_guardado_(Sesi\u00f3n_vac\u00eda)
+Note_that_the_entry_causing_the_problem_has_been_selected.=Tenga_en_cuenta_que_la_entrada_causante_de_problemas_ha_sido_seleccionada.
+Note_that_you_must_specify_the_fully_qualified_class_name_for_the_look_and_feel,=Tenga_en_cuenta_que_debe_especificar_el_nombre_completo_de_clase_para_la_apariencia.
+Nothing_to_redo=Nada_que_rehacer
+Nothing_to_undo=Nada_que_deshacer
+Number_of_references_to_fetch?=\u00bfN\u00famero_de_apariciones_a_recuperar?
+occurences=apariciones
+OK=OK
+Ok=Ok
+One_or_more_file_links_are_of_the_type_'%0',_which_is_undefined._What_do_you_want_to_do?=Uno_o_m\u00e1s_archivos_son_del_tipo_'%0',_que_no_est\u00e1_definido._\u00bfQu\u00e9_desea_hacer?
+One_or_more_keys_will_be_overwritten._Continue?=Una_o_claves_se_sobreescribir\u00e1n._\u00bfContinuar?
+Only_one_item_is_supported=S\u00f3lo_un_elemento_soportado.
+Open=Abrir
+Open_BibTeX_database=Abrir_base_de_datos_BIbTeX
+Open_database=Abrir_base_de_datos
+Open_editor_when_a_new_entry_is_created=Abrir_editor_al_crear_nueva_entrada
+Open_file=Abrir_archivo
+Open_last_edited_databases_at_startup=Abrir_las_\u00faltimas_bases_de_datos_editadas_al_arrancar
+Open_PDF_or_PS=Abrir_PDF_o_PS
+Open_right-click_menu_with_Ctrl+left_button=Abrir_el_men\u00fa_contextual_con_Ctrl+Bot\u00f3n_izquierdo
+Open_URL_or_DOI=Abril_URL_o_DOI
+OpenDocument_Spreadsheet=Hoja_de_c\u00e1lculo_OpenDocument
+Opened_database=Base_de_datos_abierta
+Opening=Abriendo
+Opening_preferences...=Preferencias_de_apertura
+OpenOffice_Calc=OpenOffice_Calc
+OpenOffice_CSV=OpenOffice_CSV
+Operation_canceled.\n=Operaci\u00f3n_cancelada.\n
+Operation_not_supported=Operaci\u00f3n_no_soportada
+Optional_fields=Campos_opcionales
+Options=Opciones
+or=o
+out_of=de
+Output=Salida
+Output_or_export_file=Sacar_o_exportar_archivo,
+Override=Ignorar
+Override_default_file_directories=Ignorar_carpetas_de_archivo_por_defecto
+Override_default_font_settings=Ignorar_ajustes_de_tipo_de_letra_por_defecto
+override_the_bibtex_key_by_the_selected_text=Ignorar_la_clave_bibtex_por_el_texto_seleccionado
+Overwrite=Sobreescribir
+Overwrite_existing_field_values=Sobreescribir_valores_de_campo_existentes
+Overwrite_keys=Sobreescribir_claves
+pairs_processed=pares_procesados
+Password_\:=Contrase\u00f1a:
+Paste=Pegar
+paste_entries=pegar_entradas
+paste_entry=pegar_entrada
+Paste_from_clipboard=Pegar_desde_el_portapapeles
+Pasted=Pegado
+Path_to_%0_not_defined=Ruta_hasta_%0_sin_definir
+Path_to_LatexEditor_(LEd.exe)=Ruta_hasta_LatexEditor_(LEd.exe)
+Path_to_LyX_pipe=Ruta_hasta_el_pipe_LyX
+Path_to_Vim=Ruta_hasta_Vim
+Path_to_WinEdt.exe=Ruta_hasta_WinEdt.exe
+PDF_directory=Carpeta_PDF
+PDF_does_not_exist=No_existe_el_PDF
+Personal_journal_list=Lista_personal_de_revistas
+Plain_text_import=Importar_texto_plano
+Please_enter_a_name_for_the_group.=Introduzca_un_nombre_para_el_grupo.
+Please_enter_a_search_term._For_example,_to_search_all_fields_for_<b>Smith</b>,_enter%c<p><tt>smith</tt><p>To_search_the_field_<b>Author</b>_for_<b>Smith</b>_and_the_field_<b>Title</b>_for_<b>electrical</b>,_enter%c<p><tt>author%esmith_and_title%eelectrical</tt>=Introduzca_un_t\u00e9rmino_de_b\u00fasqueda._Por_ejemplo,_para_buscar_en_todos_los_campos_<b>Garc\u00eda</b>,_introduzca%c<p><tt>garc\u00eda</tt><p>_Para_buscar_<b>Garc\u00eda</b>_dentro_del_campo_<b>Author</b>_y_<b>el\u00e9ctric [...]
+Please_enter_the_field_to_search_(e.g._<b>keywords</b>)_and_the_keyword_to_search_it_for_(e.g._<b>electrical</b>).=Introduzca_el_campo_en_que_buscar_(p.e._<b>keywords</b>)_y_la_palabra_clave_a_buscar_(p.e._<b>el\u00e9ctrico</b>).
+Please_enter_the_string's_label=Introduzca_la_etiqueta_de_la_cadena
+Please_select_an_importer=Seleccionar_un_importador
+Please_select_an_importer.=Seleccionar_un_importador.
+Please_select_exactly_one_group_to_move.=Seleccione_exactamente_un_grupo_para_mover.
+Please_specify_the_=Especifique_el
+Possible_duplicate_entries=Posibles_entradas_duplicadas
+Possible_duplicate_of_existing_entry._Click_to_resolve.=Posible_duplicado_de_entrada_existente._Clique_para_resolver.
+Preamble=Pre\u00e1mbulo
+Preferences=Preferencias
+Preferences_recorded.=Preferencias_guardadas.
+Preview=Vista_previa
+Previous_entry=Entrada_anterior
+Primary_sort_criterion=Criterio_de_ordenaci\u00f3n_primario
+Print_Preview=Vista_previa_de_impresi\u00f3n
+Printing_Entry_Preview=Imprimiendo_la_vista_previa_de_las_entradas
+Problem_with_parsing_entry=Problemas_analizando_entradas
+Processing_=Procesando
+Program_output=Salida_del_programa
+PS_directory=Carpeta_PS
+Push_entries_to_external_application_(%0)=Enviar_entradas_a_aplicaci\u00f3n_externa_(%0)
+Push_selection_to_Emacs=Enviar_entradas_a_Emacs
+Push_selection_to_LyX/Kile=Enviar_entradas_a_LyX/Kile
+Push_selection_to_Vim=Enviar_entradas_a_Vim
+Push_selection_to_WinEdt=Enviar_entradas_a_WinEdt
+Push_to_LatexEditor=Enviar_entradas_a_LatexEditor
+Pushed_citations_to_%0=Se_han_enviado_las_citas_a_%0
+Pushed_citations_to_Emacs=Entradas_enviadas_a_Emacs
+Pushed_citations_to_Vim=Entradas_enviadas_a_Vim
+Pushed_citations_to_WinEdt=Entradas_enviadas_a_WinEdt
+Pushed_the_citations_for_the_following_rows_to=Las_citas_para_las_siguentes_filas_se_enviaron_a
+Quit_JabRef=Salir_de_JabRef
+Quit_synchronization=Dejar_de_sincronizar
+Raw_source=Furente_de_datos_en_bruto
+Really_delete_the_selected=\u00bfEst\u00e1_seguro_de_querer_borrar_los_seleccionados?
+Rearrange_tabs_alphabetically_by_title=Disponer_las_pesta\u00f1as_alfab\u00e9ticamente_por_t\u00edtulo
+Redo=Rehacer
+Reference_database=Base_de_datos_de_referencia
+References_found=Referencias_encontradas
+Refine_supergroup\:_When_selected,_view_entries_contained_in_both_this_group_and_its_supergroup=Refinar_supergrupo:_Ver_entradas_contenidas_en_este_grupo_y_sus_subgrupos_cuando_est\u00e9n_seleccionadas
+Refresh_view=Refrescar_vista
+Regular_Expression=Expresi\u00f3n_Regular
+Remember_these_entry_types?=\u00bfRecordar_estos_tipos_de_entrada?
+Remote_operation=Operaci\u00f3n_remota
+Remote_server_port=Puerto_remoto_del_servidor
+Remove=Eliminar
+Remove_all?=\u00bfEliminar_todos?
+Remove_all_subgroups=Eliminar_subgrupos
+Remove_all_subgroups_of_"%0"?=\u00bfEliminar_todos_los_subrgrupos_de_"%0"?
+Remove_double_braces_around_BibTeX_fields_when_loading.=Eliminar_doble_llave_alrededor_de_los_campos_BibTeX__al_cargar.
+Remove_duplicates=Eliminar_duplicados
+Remove_entry_from_import=Eliminar_entrada_de_lo_importado
+Remove_entry_selection_from_this_group=Eliminar_selecci\u00f3n_de_entradas_de_este_grupo
+Remove_entry_type=Eliminar_tipo_de_entrada
+Remove_file_link_(DELETE)=Eliminar_enlace_a_archivo_(BORRAR)
+remove_from_group=eliminar_del_grupo
+Remove_from_group=Eliminar_del_grupo
+Remove_group=Eliminar_grupo
+Remove_group,_keep_subgroups=Eliminar_grupo,_mantener_subgrupos
+Remove_group_"%0"?=\u00bfEliminar_el_grupo_"%0%?
+Remove_group_"%0"_and_its_subgroups?=\u00bfEna_grupo_250"_y_sus_subgrupos?
+remove_group_(keep_subgroups)=eliminar_grupo_(mantener_subgrupos)
+remove_group_and_subgroups=eliminar_grupo_y_subgrupos
+Remove_group_and_subgroups=Eliminar_grupo_y_subgrupos
+Remove_link=Eliminar_enlace
+Remove_old_entry=Eliminar_vieja_entrada
+Remove_selected_strings=Eliminar_cadenas_seleccionadas
+remove_string_=eliminar_cadena
+Removed_group_"%0".=el_grupo_"%0"_se_ha_eliminado.
+Removed_group_"%0"_and_its_subgroups.=Se_ha_eliminado_el_grupo_"%0"_y_sus_subgrupos.
+Removed_string=Cadena_eliminada
+Renamed_string=Cadena_renombrada
+Replace=Reemplazar
+Replace_(regular_expression)=Reemplazar_(Expresi\u00f3n_regular)
+Replace_string=Reemplazar_cadena
+Replace_with=Reemplazar_con
+Replaced=Reemplazado
+Required_fields=Campos_requeridos
+Reset_all=Restablecer_todos
+Reset_file_type_definitons=Restablecer_todas_las_definiciones_de_tipo
+Resolve_strings_for_all_fields_except=Resolver_cadenas_para_todos_los_campos_excepto
+Resolve_strings_for_standard_BibTeX_fields_only=Resolver_cadenas_\u00fanicamente_para_los_campos_BibTeX_est\u00e1ndar
+resolved=resuelto
+Results=Resultados
+Revert_to_original_source=Volver_a_la_fuente_original
+Review=Revisar
+Review_changes=Revisar_cambios
+Right=Derecha
+Save=Guardar
+Save_all_finished.=Guardar_todos_los_finalizados
+Save_all_open_databases=Guardar_todas_las_bases_de_datos_abiertas
+Save_before_closing=Guardar_antres_de_cerrar
+Save_database=Guardar_base_de_datos
+Save_database_as_...=Guardar_base_de_datos_como...
+Save_entries_in_their_original_order=Guardar_entradas_en_el_orden_original
+Save_failed=Fall\u00f3n_el_guardado
+Save_failed_during_backup_creation=Error_durante_el_guardado_mientras_se_creaba_la_copia_de_seguridad
+Save_failed_while_committing_changes=Error_mientras_se_efectuaban_los_cambios
+Save_ordered_by_author/editor/year=Guardar_ordenado_por_autor/editor/a\u00f1o
+Save_selected_as_...=Guardar_seleccionado_como...
+Saved_database=Base_de_datos_guardada
+Saved_selected_to=Guardar_seleccionados_a
+Saved_session=Sesi\u00f3n_guardada
+Saving=Guardando
+Saving_all_databases...=Guardando_todas_las_bases_de_datos...
+Saving_database=Guardando_base_de_datos
+Scan=Ecanear
+Search=Buscar
+Search_All_Fields=Buscar_en_todos_los_campos
+Search_all_fields=Buscar_en_todos_los_campos
+Search_error=Error_en_la_b\u00fasqueda
+Search_expression=Buscar_expresi\u00f3n
+Search_for=Buscar
+Search_general_fields=Buscar_en_campos_generales
+Search_IEEEXplore=Buscar_en_IEEEXplore
+Search_IEEExplore=Buscar_IEEExplore
+Search_optional_fields=Buscar_en_campos_opcionales
+Search_required_fields=Buscar_en_requeridos
+Search_Specified_Field(s)=Buscar_en_campo(s)_espec\u00edfico(s)
+Searched_database._Global_number_of_hits=Se_ha_buscado_en_la_base_de_datos._N\u00famero_global_de_coincidencias
+Searched_database._Number_of_hits=Se_ha_buscado_en_la_base_de_datos._N\u00famero_de_aciertos
+Searching_for_%0_file=Buscando_el_archivo_%0
+Searching_for_duplicates...=Buscando_duplicados...
+Searching_for_files=Buscando_archivos
+Secondary_sort_criterion=Criterio_secundario_de_ordenaci\u00f3n
+Select=Seleccionar
+Select_a_Zip-archive=Seleccione_un_archivo_ZIP
+Select_action=Seleccionar_acci\u00f3n
+Select_all=Seleccionar_todo
+Select_Classpath_of_New_Importer=Seleccionar_classpath_del_nuevo_importador
+Select_encoding=Seleccionar_codificaci\u00f3n
+Select_entries_in_group_selection=Seleccionar_entradas_dentro_de_la_selecci\u00f3n_de_grupo
+Select_entry_type=Seleccionar_tipo_de_entrada
+Select_external_application=Seleccionar_aplicaci\u00f3n_externa
+Select_file_from_ZIP-archive=Seleccionar_archivo_desde_archivo_ZIP
+Select_format=Seleccionar_formato
+Select_icon=Seleccionar_icono
+Select_matches=Seleccionar_coincidencias
+Select_new_ImportFormat_Subclass=Seleccionar_nueva_subclase_de_formato_de_importaci\u00f3n
+Select_the_tree_nodes_to_view_and_accept_or_reject_changes=Seleccionar_nodos_de_\u00e1rbol_para_ver_y_aceptar_o_rechazar_los_cambios.
+Selected_entries=Entradas_seleccionadas
+Selector_enabled_fields=Campos_del_selector_habilitados
+Server_Hostname_\:=Nombre_de_host_del_servidor:
+Server_Type_\:=Tipo_de_servidor:
+Set_field=Establecer_campo
+Set_fields=Establecer_campos
+Set_general_fields=Establecer_campos_generales
+Set_main_external_file_directory=Establecer_carpeta_de_archivo_externo_principal
+Set_table_font=Establecer_tipo_dera_para_las_tablas
+Settings=Ajustes
+Setup_selectors=Configurar_selectores
+Short_form=Forma_abreviada
+Shortcut=Atajo
+Show/edit_BibTeX_source=Mostrar/editar_fuente_BibTeX
+Show_'Firstname_Lastname'=Mostrar_'Nombre_Apellido'
+Show_'Lastname,_Firstname'=Mostrar_'Apellido,_Nombre'
+Show_BibTeX_source_by_default=Mostrar_fuente_BibTeX_por_defecto
+Show_BibTeX_source_panel=Mostrar_el_panel_de_la_fuente_BibTeX
+Show_confirmation_dialog_when_deleting_entries=Mostra_di\u00e1logo_de_confirmaci\u00f3n_al_borrar_entradas
+Show_description=Mostrar_descripci\u00f3n
+Show_dynamic_groups_in_<i>italics</i>=Mostrar_grupos_din\u00e1micos_en_<i>cursiva</i>
+Show_entries_*not*_in_group_selection=Mostrar_entradas_que_NO_est\u00e9n_en_la_selecci\u00f3n_de_grupo
+Show_file_column=Mostrar_columna_de_archivo
+Show_icons_for_groups=Mostrar_iconos_para_grupos
+Show_last_names_only=Mostrar_s\u00f3lo_apellidos
+Show_names_unchanged=Mostrar_nombres_sin_cambios
+Show_one_less_rows=Mostrar_una_fila_menos
+Show_one_more_row=Mostrar_una_fila_m\u00e1s
+Show_optional_fields=Mostrar_campos_opcionales
+Show_PDF/PS_column=Mostrar_columna_PDF/PS
+Show_required_fields=Mostrar_campos_requeridos
+Show_URL/DOI_column=Mostrar_columna_URL/DOI
+Show_warning_dialog_when_a_duplicate_BibTeX_key_is_entered=Mostrar_di\u00e1logo_de_advertencia_cuando_se_introduzca_una_clave_BibTeX_duplicada
+Show_warning_dialog_when_an_empty_BibTeX_key_is_entered=Mostrar_di\u00e1logo_de_advertencia_cuando_se_introduzca_una_entrada_BibTeX_vac\u00eda
+Simple_HTML=HTML_sencillo
+Size=Tama\u00f1o
+Skip=Omitir
+Skipped_-_No_PDF_linked=Omitido_-_No_se_enlaz\u00f3_PDF
+Skipped_-_PDF_does_not_exist=Omitido_-_No_existe_el_PDF
+Skipped_entry.=Entrada_omitida.
+Sort_alphabetically=Ordenar_alfab\u00e9ticamente
+Sort_Automatically=Ordenar_autom\u00e1ticamente
+Sort_order=M\u00e9todo_de_ordenaci\u00f3n
+sort_subgroups=ordenar_subgrupos
+Sorted_all_subgroups_recursively.=Ordenar_todos_los_subgrupos_recursivamente.
+Sorted_immediate_subgroups.=Subgrupos_inmediatos_ordenados.
+source_edit=editar_fuente
+Special_Name_Formatters=Formateadores_con_nombre_especial
+Special_table_columns=Columna_de_tabla_especiales
+SQL_connection_established.=Conexi\u00f3n_SQL_establecida
+Start_incremental_search=Comenzar_b\u00fasqueda_incremental
+Start_search=Comenzar_b\u00fasqueda
+Starting_import=Comenzando_a_importar
+Statically_group_entries_by_manual_assignment=Agrupar_entradas_estad\u00edsticamente_mediante_asgnaci\u00f3n_manual
+Status=Estado
+Stop=Parar
+Store_journal_abbreviations=Almacenar_abreviaturas_de_revista
+Store_string=Almacenar_cadena
+Store_the_following_fields_with_braces_around_capital_letters=Guardar_los_campos_a_continuaci\u00f3n_con_llaves_alrededor_de_las_may\u00fasculas
+Stored_entry=Entrada_almacenada
+Strings=Cadenas
+Strings_for_database=Cadenas_para_base_de_datos
+Subdatabase_from_aux=Base_de_datos_secundaria_desde_aux
+Suggest=Sugerir
+Switches_between_full_and_abbreviated_journal_name_if_the_journal_name_is_known.=Cambia_entre_nombre_completo_y_abreviatura_de_la_revista_si_se_conoce_en_nombe_de_la_revista.
+Synchronize_%0_links=Sincronizar_%0_enlaces
+Synchronize_file_links=Sincronizar_enlaces_de_archivo
+Synchronizing_%0_links...=Sincronizando_%0_enlaces...
+Table_appearance=Aspecto_de_la_tabla
+Table_background_color=Color_de_fondo_de_la_tabla
+Table_grid_color=Color_de_las_l\u00edneas_de_la_tabla
+Table_text_color=Color_del_texto_de_la_tabla
+Tabname=Nombre_de_pesta\u00f1a
+Target_file_cannot_be_a_directory.=El_archivo_de_destino_no_puede_ser_una_carpeta.
+Tertiary_sort_criterion=Criterio_de_ordenaci\u00f3n_terciario
+Test=Prueba
+Text_Input_Area=\u00c1rea_de_entrada_de_texto
+The_chosen_date_format_for_new_entries_is_not_valid=El_forma-to_de_fecha_escogido_para_nuevas_entradas_no_es_correcto
+The_chosen_encoding_'%0'_could_not_encode_the_following_characters\:_=La_codificaci\u00f3n_de_caracteres_'%'_no_puede_codificar_los_siguientes_caracteres:
+The_current_version_features_a_new_way_of_handling_links_to_external_files.<br>To_take_advantage_of_this,_your_links_must_be_changed_into_the_new_format,_and<br>JabRef_must_be_configured_to_show_the_new_links.=Esta_versi\u00f3n_proporciona_una_nueva_manera_de_manejar_enlaces_a_archivos_externos.<br>Para_tomar_ventaja_de_esto,_sus_enlaces_deben_ser_transformados_al_nuevo_formato,__<br>JabRef_debe_ser_configurado_para_mostrar_los_nuevos_enlaces.
+the_field_<b>%0</b>=el_campo_<b>%0</b>
+The_file<BR>'%0'<BR>has_been_modified<BR>externally!=\u00a1El_archivo<BR>'%0'<BR>ha_sido_modificado<BR>_externamente!
+The_group_"%0"_already_contains_the_selection.=El_grupo_"%0"_ya_contiene_la_selecci\u00f3n.
+The_label_of_the_string_can_not_be_a_number.=La_etiqueta_de_la_cadena_no_puede_ser_un_n\u00famero.
+The_label_of_the_string_can_not_contain_spaces.=La_etiqueta_de_la_cadena_no_puede_contener_espacios.
+The_label_of_the_string_can_not_contain_the_'#'_character.=La_etiqueta_de_la_cadena_no_puede_contener_el_caracter_'#'.
+The_output_option_depends_on_a_valid_import_option.=La_opci\u00f3n_de_salida_depende_de_una_opci\u00f3n_de_importaci\u00f3n_v\u00e1lida.
+The_PDF_contains_one_or_several_bibtex-records.\nDo_you_want_to_import_these_as_new_entries_into_the_current_database?=El_PDF_contiene_uno_o_m\u00e1s_registros_bibtex.\n\u00bfDesea_importarlos_como_nuevas_entradas_en_la_base_de_datos_actual?
+The_regular_expression_<b>%0</b>_is_invalid%c=La_expresi\u00f3n_regular_<b>%0</b>_no_es_v\u00e1lida%c
+The_search_is_case_insensitive.=La_b\u00fasqueda_no_distingue_may\u00fasculas/min\u00fasculas
+The_search_is_case_sensitive.=La_b\u00fasqueda_distingue_may\u00fasculas/min\u00fasculas
+The_string_has_been_removed_locally=La_cadena_ha_sido_eliminada_localmente
+There_are_possible_duplicates_(marked_with_a_'D'_icon)_that_haven't_been_resolved._Continue?=Hay_posibles_duplicados_(marcados_con_el_icono_'D')_que_no_han_sido_resueltos._\u00bfContinuar?
+This_database_was_written_using_an_older_version_of_JabRef.=Esta_base_de_datos_fue_escrita_con_una_versi\u00f3n_antigua_de_JabRef.
+This_entry_has_no_BibTeX_key._Generate_key_now?=Esta_entrada_no_tiene_clave_BibTex._\u00bfGenerar_ahora?
+This_entry_is_incomplete=Esta_entrada_est\u00e1_incompleta\u00a1u+
+This_entry_type_cannot_be_removed.=Este_tipo_de_entrada_no_puede_ser_eliminada.
+This_external_link_is_of_the_type_'%0',_which_is_undefined._What_do_you_want_to_do?=El_enlace_externo_es_del_tipo_'%0',_que_no_est\u00e1_definido._\u00bfQu\u00e9_desea_hacer?
+This_group_contains_entries_based_on_manual_assignment._Entries_can_be_assigned_to_this_group_by_selecting_them_then_using_either_drag_and_drop_or_the_context_menu._Entries_can_be_removed_from_this_group_by_selecting_them_then_using_the_context_menu._Every_entry_assigned_to_this_group_must_have_a_unique_key._The_key_may_be_changed_at_any_time_as_long_as_it_remains_unique.=Este_grupo_contiene_entradas_basadas_en_asignaci\u00f3n_manual._Las_entradas_pueden_ser_asignadas_a_este_grupo_selecc [...]
+This_group_contains_entries_in_which=Este_grupo_contiene_entradas_en_las_cuales
+This_group_contains_entries_in_which_any_field_contains_the_regular_expression_<b>%0</b>=Este_grupo_contiene_entradas_en_las_que_cualquier_campo_contiene_la_expresi\u00f3n_regular_<b>%0</b> 
+This_group_contains_entries_in_which_any_field_contains_the_term_<b>%0</b>=Este_grupo_contiene_entradas_en_las_que_cualquier_campo_contiene_el_t\u00e9rmino_<b>%0</b>%nbsp;
+This_group_contains_entries_whose_<b>%0</b>_field_contains_the_keyword_<b>%1</b>=Este_grupo_contiene_entradas_cuyo_campo_<b>%0</b>_contiene_la_palabra_clave_<b>%1</b> 
+This_group_contains_entries_whose_<b>%0</b>_field_contains_the_regular_expression_<b>%1</b>=Este_grupo_contiene_entradas_cuyo_campo_<b>%0</b>_contiene_la<_expresi\u00f3n_regular_<b>%1</b> 
+This_makes_JabRef_look_up_each_%0_link_and_check_if_the_file_exists._If_not,_you_will_be_given_options<BR>to_resolve_the_problem.=JabRef_inspeccionar\u00e1_cada_enlace_%0_y_comprobar\u00e1_si_el_archivo_existe._En_caso_contrario,_se_le_ofrecer\u00e1n_opciones_<BR>_para_solucionar_el_problema.
+This_operation_requires_all_selected_entries_to_have_BibTex_keys_defined.=Esta_operaci\u00f3n_requiere_que_todas_las_entradas_seleccionadas_tengan_claves_BibTex_definidas.
+This_operation_requires_at_least_one_entry.=Esta_operaci\u00f3n_requiere_como_m\u00ednimo_una_entrada.
+This_operation_requires_one_or_more_entries_to_be_selected.=Esta_operaci\u00f3n_requiere_seleccionar_una_o_m\u00e1s_entradas.
+To_set_up,_go_to_<B>Tools_->_Manage_journal_abbreviations</B>=Para_configurar,_vaya_a_<B>Opciones_->_Administrar_abreviaturas_de_revistas</B>
+Toggle_abbreviation=Usar_abreviatura_si/no
+Toggle_entry_preview=Usar_vista_previa_de_la_entrada_si/no
+Toggle_groups_interface=Usar_interfaz_de_grupos_si/no
+Toggle_search_panel=Usar_panel_de_b\u00fasqueda_s\u00ed/no
+Try_different_encoding=Probar_una_codificaci\u00f3n_diferente
+Type_set_to_'other'=Se_ha_configurado_el_tipo_como_'otro'
+Unabbreviate_journal_names_of_the_selected_entries=Desabreviar_nombre_de_revista_de_las_entradas_seleccionadas
+Unabbreviated_%0_journal_names.=%0_nombres_de_revista_desabreviados
+unable_to_access_LyX-pipe=No_se_puede_acceder_al_canal_LyX
+Unable_to_create_graphical_interface=No_se_puede_crear_la_interfaz_gr\u00e1fica
+Unable_to_open_file.=No_se_puede_abrir_el_archivo
+Unable_to_open_link._The_application_'%0'_associated_with_the_file_type_'%1'_could_not_be_called.=No_se_puede_abrir_el_enlace._La_aplicaci\u00f3n_'%'_asociada_con_el_tipo_de_archivo_'%1'_no_puede_ser_lanzada.
+Unable_to_read_default_icon_theme.=No_se_puede_leer_el_tema_de_icono_por_defecto.
+Unable_to_read_icon_theme_file=No_se_puede_leer_el_archivo_de_tema_de_icono
+unable_to_write_to=no_se_puede_escribir_en
+Undefined_file_type=Tipo_de_archivo_no_definido
+Undo=Deshacer
+Union=Uni\u00f3n
+Unknown_bibtex_entries=Entradas_bibtex_desconocidas
+unknown_edit=edici\u00f3n_desconocida
+unknown_entry_type=Tipo_de_entrada_desconocido
+Unknown_export_format=Formato_de_exportaci\u00f3n_desconocido
+Unmark_all=Desmarcar_todos
+Unmark_entries=Desmarcar_entradas
+Unmark_entry=Desmarcar_entrada
+Unmarked_selected=Desmarcar_seleccionadas
+Unpack_EndNote_filter_set=Desempaquetar_juego_de_filtros_EndNote
+Unpacked_file.=Fichero_desempaquetado.
+Unsupported_version_of_class_%0\:_%1=La_versi\u00f3n_%1_de_la_clase_%0_no_est\u00e1_soportada
+untitled=sin_t\u00edtulo
+Up=Arriba
+Update_to_current_column_widths=Actualizar_a_anchos_de_columna_actuales
+Updated_group_selection=Actualizar_selecci\u00f3n_de_grupo
+Upgrade_external_PDF/PS_links_to_use_the_'%0'_field.=Actualizar_enlaces_a_PDF/PS_externos_para_usar_el_campo_'%0'.
+Upgrade_file=Actualizar_archivo
+Upgrade_old_external_file_links_to_use_the_new_feature=Actualizar_enlaces_a_archivos_externos_para_usar_la_nueva_caracter\u00edstica.
+Upgraded_links.=Enlaces_actualizados.
+UPPER=SUPERIOR
+Upper_Each_First=Mayúsculas_En_Iniciales_De_Palabra
+Upper_first=Sólo_mayúscula_inicial
+usage=Uso
+Use_autocompletion_for_the_following_fields=Usar_autocompletar_para_los_siguientes_campos
+Use_default_viewer=Usar_visualizador_por_defecto
+Use_inspection_window_also_when_a_single_entry_is_imported.=Usar_tambi\u00e9n_ventana_de_inspecci\u00f3n_cuando_una_entrada_individual_es_importada.
+Use_native_file_dialog=Usar_di\u00e1logos_de_archivo_nativos
+Use_other_look_and_feel=Usar_otro_aspecto
+Use_Regular_Expression_Search=Usar_b\u00fasqueda_de_expresi\u00f3n_regular
+Use_regular_expressions=Usar_expresi\u00f3n_regular
+Username_\:=Nombre_de_usuario:
+Value_cleared_externally=Valor_limpiado_externamente
+Value_set_externally=Valor_establecido_externamente
+verify_that_LyX_is_running_and_that_the_lyxpipe_is_valid=virificar_que_LyX_est\u00e1_funcionando_y_que_lyxpipe_es_v\u00e1lido
+View=Ver
+Vim_Server_Name=Nombre_de_servidor_Vim
+Waiting_for_ArXiv...=Esperando_a_ArXiv
+Warn_about_unresolved_duplicates_when_closing_inspection_window=Advertir_sobre_duplicados_sin_resolver_cuando_al_cerrar_la_ventana_de_inspecci\u00f3n
+Warn_before_overwriting_existing_keys=Advertir_antes_de_sobreescribir_claves_existentes
+Warning=Advertencia
+Warning\:_could_not_complete_file_repair;_your_file_may_have_been_corrupted._Error_message=Advertencia:_No_se_puede_completar_la_reparaci\u00f3n_del_archivo:_Posible_archivo_corrupto._Mensaje_de_error
+Warning_there_is_a_duplicate_key=Advertir_de_que_hay_una_clave_duplicado
+Warnings=Advertencias
+web_link=enlace_a_web
+What_do_you_want_to_do?=\u00bfQu\u00e9_desea_hacer?
+When_adding/removing_keywords,_separate_them_by=Cuando_se_eliminen/a\u00f1adan_palabras_clave,_separar_por
+Will_write_XMP-metadata_to_the_PDFs_linked_from_selected_entries.=Escribir\u00e1_metadatos_XMP_a_los_PDF's_enlazados_desde_las_entradas_seleccionadas.
+with=con
+Word=Palabra
+Write_BibtexEntry_as_XMP-metadata_to_PDF.=Escribir_entrada_BibTeX_como_metadatos_XMP_al_PDF.
+Write_XMP=Escribir_XMP
+Write_XMP-metadata=Escribir_metadatos_XMP
+Write_XMP-metadata_for_all_PDFs_in_current_database?=\u00bfEscribir_metadatos_XMP_para_todos_los_PDF_en_la_base_de_datos_actual?
+Writing_XMP=Escribir_XMP
+Writing_XMP_metadata...=Escribiendo_metadatos_XMP
+Writing_XMP_metadata_for_selected_entries...=Escribiendo_metadatos_XMP_para_las_entradas_seleccionadas...
+Writing_XMP_to_'%0'...=Escribiendo_XMP_a_'%0'...
+Wrong_file_format=Formato_de_archivo_incorrecto
+Wrote_XMP-metadata=Se_han_escrito_los_metadatos_XMP
+Wrote_XMP_to_'%0'.=XMP_escrito_en_'%0'
+XMP-annotated_PDF=PDF_con_anotaciones_XMP
+XMP_Export_Privacy_Settings=Ajustes_de_privacidad_en_exportaci\u00f3n_XMP
+XMP_metadata=Metadatos_XMP
+XMP_metadata_found_in_PDF\:_%0=Metadatos_XMP_encontrados_en_PDF:_'%0'
+You_must_restart_JabRef_for_this_to_come_into_effect.=Debe_reiniciar_JabRef_para_que_los_cambios_surtan_efecto.
+You_have_changed_the_language_setting.=Ha_cambiado_el_ajuste_de_lenguaje.
+You_have_changed_the_look_and_feel_setting.=Ha_cambiado_el_ajuste_de_aspecto.
+You_have_cleared_this_field._Original_value=Ha_limpiado_este_campo._Valor_original
+You_have_entered_an_invalid_search_'%0'.=Ha_introducido_una_b\u00fasqueda_inv\u00e1lida_'%0'
+You_must_choose_a_file_name_to_store_journal_abbreviations=Debe_escoger_un_nombre_de_archivo_para_almacenar_abreviaturas_de_revistas.
+You_must_restart_JabRef_for_the_new_key_bindings_to_work_properly.=Debe_reiniciar_JabRef_para_que_las_nuevas_combinaciones_de_teclas_funcionen_correctamente.
+You_must_set_both_BibTeX_key_and_%0_directory=Debe_establecer_tanto_la_clave_BibTeX_como_la_carpeta_%0
+Your_new_key_bindings_have_been_stored.=Sus_nuevas_combinaciones_de_teclas_han_sido_almacenadas.
+The_following_fetchers_are_available\:=Est\u00e1n_disponibles_los_siguientes_recuperadores_de_datos:
+Could_not_find_fetcher_'%0'=No_se_puede_encontrar_el_recuperador_de_datos_'%0'
+Running_Query_'%0'_with_fetcher_'%1'.=Ejecutando_consulta_'%0'_con_recuperador_'%1'
+Please_wait!=Espere,_por_favor
+Query_'%0'_with_fetcher_'%1'_did_not_return_any_results.=La_consulta_'%0'_con_el_recuperador_\u00a1%1'_no_devolvi\u00f3_ning\u00fan_resultado.
+Open_SPIRES_entry=Abrir_entrada_SPIRES
+Move/Rename_file=Mover/renombrar_archivo
+File_moved=Archivo_movido
+Move_file_failed=Error_al_mover_de_archivos
+Could_not_move_file=No_se_puede_mover_el_archivo
+Could_not_find_file_'%0'.=No_se_encuentra_el_archivo_'%0'.
+Move/rename_file=Mover(renombrar_archivo
+Number_of_entries_successfully_imported=N\u00famero_de_entradas_importadas_con_\u00e9xito
+Import_canceled_by_user=Importaci\u00f3n_cancelada_por_el_usuario
+Progress\:_%0_of_%1=Progreso:_%0_de_%1
+Error_while_fetching_from_JSTOR=Error_al_recuperar_desde_JSTOR
+Fetching_Medline_by_id...=Recuperando_desde_Medline_por_id...
+Fetching_Medline_by_term...=Recuperando_desde_Medline_por_t\u00e9rmino...
+Medline_import_canceled=Importaci\u00f3n_desde_Medline_cancelada
+Please_enter_a_valid_number=Por_favor,_introduzca_un_n\u00famero_v\u00e1lido
+Please_enter_a_comma_separated_list_of_Medline_IDs_(numbers)_or_search_terms.=Por_favor,_introduzca_una_lista_de_valores_separados_por_coma_de_IDs_de_Medline_(n\u00fameros)_o_t\u00e9rminos_de_b\u00fasqueda.
+An_Error_occurred_while_fetching_from_SPIRES_source_(%0)\:=Ocurri\u00f3_un_error_al_mientras_se_recuperaban_datos_desde_la_fuente_SPIRES_(%0)\:
+Error_while_fetching_from_Spires\:_=Error_al_recuperar_datos_desde_Spires
+Connect_to_external_SQL_database=Conectar_a_base_de_datos_SQL_externa
+Export_to_external_SQL_database=Exportar_a_base_de_datos_SQL_externa
+Show_results_in_dialog=Mostrar_resultados_en_di\u00e1logo
+Global_search=B\u00fasqueda_global
+Show_search_results_in_a_window=Mostrar_los_resultados_de_la_b\u00fasqueda_en_una_ventana
+Search_results=Resultados_de_la_b\u00fasqueda
+Move_file_to_file_directory?=\u00bfMover_archivo_a_la_carpeta_de_archivos?
+Rename_to_'%0'=Renombrar_a_'%0'
+Move_to_file_directory=Mover_a_la_carpeta_de_archivos
+You_have_changed_the_menu_and_label_font_size.=Ha_cambiado_el_tama\u00f1o_de_tipo_de_letra_para_el_menu_y_etiqueta.
+Database_is_protected._Cannot_save_until_external_changes_have_been_reviewed.=La_base_de_datos_est\u00e1_protegida._No_se_puede_guardar_hasta_que_los_cambios_externos_hayan_sido_revisados.
+Protected_database=Base_de_datos_protegida
+Refuse_to_save_the_database_before_external_changes_have_been_reviewed.=Rechazar_guadar_la_base_de_datos_antes_qde_que_los_cambios_externos_hayan_sido_revisado.
+Database_protection=Proteccion_de_la_base_de_datos
+Unable_to_save_database=No_es_posible_guardar_la_base_de_datos
+BibTeX_key_generator=Generador_de_claves_BibTeX
+Unable_to_open_link.=No_es_posible_abrir_el_enlace.
+Search_JSTOR=Buscar_en_JSTOR
+Attempting_SQL_import...=Intentando_importaci\u00f3n_SQL
+BibO_RDF=BibO_RDF
+HTML_parser=Analizador_HTML
+Move_the_keyboard_focus_to_the_entry_table=Mover_el_foco_del_teclado_a_la_tabla_de_entradas
+MIME_type=Tipo_MIME
+This_feature_lets_new_files_be_opened_or_imported_into_an_already_running_instance_of_JabRef<BR>instead_of_opening_a_new_instance._For_instance,_this_is_useful_when_you_open_a_file_in_JabRef<br>from_your_web_browser.<BR>Note_that_this_will_prevent_you_from_running_more_than_one_instance_of_JabRef_at_a_time.=Esta_funci\u00f3n_permite_que_nuevos_archivos_seasn_abiertos_o_importados_en_una_instancia_de_JabRef_que_ya_se_est\u00e9_ejecutando,<BR>en_lugar_de_abrir_una_nueva_instancia._Esto_es_ [...]
+Note_that_these_settings_are_used_for_the_legacy_<b>pdf</b>_and_<b>ps</b>_fields_only.<br>For_most_users,_setting_the_<b>Main_file_directory</b>_above_should_be_sufficient.=Tenga_en_cuenta_que_estos_ajustes_se_usan_s\u00f3lamente_para_el_antiguo_campo_<b>pdf</b>_y_<b>ps</b>,_Para_la_mayor\u00eda_de_usuarios,_ajustar_la_<b>Carpeta_principal_de_archivos</b>_m\u00e1s_arriba_deber\u00eda_ser_suficiente.
+Legacy_file_fields=Antiguos_campos_de_archivo
+This_makes_JabRef_look_up_each_%0_extension_and_check_if_the_file_exists._If_not,_you_will_be_given_options<BR>to_resolve_the_problem.=Esto_hace_que_JabRef_busque_cada_extensi\u00f3n_%0_y_compruebe_que_el_archivo_existe._En_caso_contrario,_se_le_dar\u00e1n_opciones_<BR>_para_resolve_el_problema.
+Run_Fetcher,_e.g._"--fetch\=Medline\:cancer"=Ejecutar_recuperador,_por_ejemplo_"--fetch=Medline:cancer"
+The_ACM_Digital_Library=La_Biblioteca_Digital_ACM
+Reset=Restablecer
+Use_IEEE_LaTeX_abbreviations=Usar_abreviaturas_LaTeX_IEEE
+The_Guide_to_Computing_Literature=The_Guide_to_Computing_Literature
+Search_ACM_Portal=Buscar_en_el_portal_ACM
+Connection_to_ACM_Portal_failed=Fall\u00f3_la_conexi\u00f3n_al_portal_ACM
+When_opening_file_link,_search_for_matching_file_if_no_link_is_defined=Al_abrir_el_enlace_al_archivo,_buscar_por_archivo_coincidente_si_no_hay_enlace_definido
+Settings_for_%0=Ajustes_para_%0
+Insert_selected_citations_into_Vim=Insertar_la_cita_seleccionada_en_Vim
+RIS=RIS
+Assign_exclusively_to_group=Asignar_exclusivamente_al_grupo
+Bad_Request_'%0'.=Solicitud_inv\u00e1lida_'%0'.
+Mark_entries_imported_into_an_existing_database=Marcar_entradas_importadas_en_una_base_de_datos_existente
+Unmark_all_entries_before_importing_new_entries_into_an_existing_database=Desmarcar_todas_las_entradas_antes_de_importar_nuevas_entradas_en_una_base_de_datos_existente
+Forward=Adelante
+Back=Atr\u00e1s
+Sort_the_following_fields_as_numeric_fields=Ordenar_los_siguientes_campos_como_campos_num\u00e9ricos
+Line_%0\:_Found_corrupted_BibTeX-key.=L\u00ednea_%0\:_Se_ha_encontrado_una_clave_BibTeX_corrupta.
+Line_%0\:_Found_corrupted_BibTeX-key_(contains_whitespaces).=L\u00ednea_%0\:_Se_ha_encontrado_una_clave_BibTeX_corrupta_(contiene_espacios_en_blanco)
+Line_%0\:_Found_corrupted_BibTeX-key_(comma_missing).=L\u00ednea_%0\:_Se_ha_encontrado_clave_BibTeX_corrupta_(falta_coma).
+Finished_downloading_full_text_document=Se_ha_finalizado_la_descarga_del_texto_completo_del_documento
+Unable_to_find_full_text_document_in_the_linked_web_page.=No_es_posible_encontrar_el_texto_completo_del_documento_en_la_p\u00e1gina_enlazada.
+Connection_error_when_trying_to_find_full_text_document.=Error_de_conexi\u00f3n_al_tratar_de_encontrar_el_texto_completo_del_documento.
+This_entry_provides_no_URL_or_DOI_links.=Esta_entrada_no_proporciona_enlaces_URL_o_DOI.
+Full_text_article_download_failed=Fall\u00f3_la_descarga_del_texto_completo_del_art\u00edculo
+Update_to_current_column_order=Actualizar_al_orden_de_columnas_actual
+Rename_field=Renombrar_campo
+Set/clear/rename_fields=Establecer/limpiar/renombrar_campos
+Rename_field_to\:=Renombrar_campo_a\:
+Move_contents_of_a_field_into_a_field_with_a_different_name=Mover_contenidos_de_un_campo_en_un_campo_con_nombre_diferente
+You_can_only_rename_one_field_at_a_time=S\u00f3lo_puede_renombrar_un_campo_a_la_vez
+Remove_all_broken_links=Eliminar_todos_los_enlaces_rotos
+Cannot_use_port_%0_for_remote_operation;_another_application_may_be_using_it._Try_specifying_another_port.=No_se_puede_usar_el_puerto_%0_para_operaci\u00f3n_remota:_Puede_estar_en_uso_por_otra_aplicaci\u00f3n._Pruebe_a_especificar_otro_puerto.
+Plugin_installer=Instalador_de_plugin
+Unable_to_create_plugin_directory=No_es_posible_crear_el_directorio_de_plugin
+Unable_to_copy_file=No_es_posible_copiar_el_archivo
+Plugin_installed_successfully._You_must_restart_JabRef_to_load_the_new_plugin.=Plugin_instalado_con_\u00e9xito._Debe_reiniciar_JabRef_para_cargar_el_nuevo_plugin.
+Unable_to_create_user_plugin_directory=No_es_posible_crear_la_carpeta_de_plugins_de_usuario
+Plugin_installation_failed.=Fall\u00f3_la_instalaci\u00f3n_del_plugin.
+The_same_version_of_this_plugin_is_already_installed.=Ya_est\u00e1_instalada_la_misma_versi\u00f3n_del_plugin.
+A_newer_version_of_this_plugin_is_already_installed.=Se_ha_instalado_una_nueva_versi\u00f3n_del_plugin.
+One_or_more_older_versions_of_this_plugin_is_installed._Delete_old_versions?=Una_o_m\u00e1s_versiones_anteriores_de_este_plugin_est\u00e1n_instaladas._\u00bfBorrar_las_versiones_antiguas?
+Old_versions_deleted_successfully.=Versiones_antiguas_borradas_con_\u00e9xito.
+Install_plugin=Instalar_plugin
+Download_plugin=Descargar_plugin
+Plugin_manager=Administrador_de_plugins
+Delete_the_%0_selected_plugins?=\u00bfBorrar_los_plugins_seleccionados_%0?
+Delete_plugins=Borrar_plugins
+Delete_the_selected_plugin?=\u00bfBorrar_el_plugin_seleccionado?
+Delete_plugin=Borrar_plugin
+Enter_download_URL=Introducir_URL_de_descarga
+Plugin_name=Nombre_de_plugin
+Version=Versi\u00f3n
+Unknown=Desconocido
+Not_loaded=No_cargado
+Loaded=Cargado
+Could_not_determine_version_of_=No_se_puede_determinar_la_versi\u00f3n_de
+Install_anyway?=\u00bfInstalar_de_todas_formas?
+Looking_for_full_text_document...=Buscando_texto_completo_de_documento...
+Unable_to_find_full_text_article._No_search_algorithm_defined_for_the_'%0'_web_site.=No_se_puede_encontrar_el_texto_completo_del_art\u00edculo._No_se_ha_definido_un_algoritmo_de_b\u00fasqueda_para_el_sitio_web_'%0'.
+Found_pdf_link,_but_received_the_wrong_MIME_type._This_could_indicate_that_you_don't_have_access_to_the_fulltext_article.=Se_ha_encontrado_enlace_a_PDF,_pero_se_recibi\u00f3_el_tipo_MIME_incorrecto._Esto_puede_indicar_que_usted_no_tiene_acceso_al_texto_completo_del_art\u00edculo.
+Autosave=Autoguardado
+Prompt_before_recovering_a_database_from_an_autosave_file=Preguntar_antes_de_recuperar_una_base_de_datos_desde_un_archivo_autoguardado
+Autosave_interval_(minutes)=Intervalo_de_autoguardado_(minutos)
+Do_you_want_to_recover_the_database_from_the_autosave_file?=\u00bfQuiere_recuperar_la_base_de_datos_desde_el_archivo_autoguardado?
+Recover_from_autosave=Recuperar_desde_archivo_autoguardado
+%0_warnings=%0_advertencias
+Save_in_current_table_sort_order=Guardar_con_el_criterio_de_ordenaci\u00f3n_actual
+Export_in_current_table_sort_order=Exportar_con_el_criterio_de_ordenaci\u00f3n_actual
+Export_ordered_by_author/editor/year=Exportar_ordenado_por_autor/editor/a\u00f1o
+Export_entries_in_their_original_order=Exportar_entradas_en_su_orden_original
+Error_opening_file_'%0'.=Error_abriendo_el_archivo_'%0'.
+Autosave_of_file_'%0'=Autoguardado_del_archivo_'%0'
+Error_opening_autosave_of_'%0'._Trying_to_load_'%0'_instead.=Error_abriendo_el_archivo_autoguardado_de_'%0'._Intentando_cargar_'%0'_en_su_lugar.
+Plugins_installed_in_your_user_plugin_directory_(%0)\:=Plugins_instalados_en_su_carpeta_de_plugins_de_usuario_(%0):
+Plugins_installed_in_other_locations\:=Plugins_instalados_en_otras_localizaciones:
+Plugins_will_be_deleted_next_time_JabRef_starts_up.=Los_plugins_se_borrar\u00e1n_la_pr\u00f3xima_vez_que_inicie_JabRef.
+Plugin_will_be_deleted_next_time_JabRef_starts_up.=El_plugin_se_borrar\u00e1_la_pr\u00f3xima_vexz_que_inicie_JabRef.
+Old_plugin_versions_will_be_deleted_next_time_JabRef_starts_up.=Las_versiones_antiguas_de_los_plugins_ser\u00e1n_borrados_la_pr\u00f3xima_vez_que_JabRef_se_inicie.
+Formatter_not_found\:_%0=Formateador_no_encontrado\:_%0
+The_following_formatters_could_not_be_found=Los_siguientes_formateadores_no_se_pueden_encontrar
+Clear_inputarea=Limpiar_\u00e1rea_de_entrada
+Automatically_set_file_links_for_this_entrynb=Establecer_los_enlaces_de_archivo_autom\u00e1ticamente_para_esta_entrada
+Could_not_save,_file_locked_by_another_JabRef_instance.=No_se_puede_guardar._Fichero_bloqueado_por_otra_instancia_JabRef.
+File_is_locked_by_another_JabRef_instance.=El_archivo_est\u00e1_bloqueado_por_otra_instancia_de_JabRef.
+Do_you_want_to_override_the_file_lock?=\u00bfQuiere_saltarse_el_bloqueo_de_archivo?
+File_locked=Archivo_bloqueado
+Current_tmp_value=Valor_temporal_actual
+Metadata_change=Cambio_de_metadatos
+Changes_have_been_made_to_the_following_metadata_elements=Se_han_efectuado_los_cambios_a_los_siguientes_elementos_de_los_metadatos
+Generate_groups_for_author_last_names=Generar_grupos_para_apellidos_de_autor
+Generate_groups_for_editor_last_names=Generar_grupos_para_apellidos_de_editor
+Generate_groups_from_keywords_in_a_BibTeX_field=Generar_grupos_desde_palabras_claves_de_un_campo_BibTex
+Enforce_legal_characters_in_BibTeX_keys=Uso_obligado_de_caracteres_legales_en_claves_BibTex
+The_#_character_is_not_allowed_in_BibTeX_strings_unless_escaped_as_in_'\\#'.=El_caracter_#_no_est\u00e1_permitido_en_cadenas_BibTeX_si_no_est\u00e1_escapado_como_en_'\\#'._\u00bfEscapado?
+Before_saving,_please_edit_any_strings_containing_the_#_character.=Por_favor,_edite_todas_las_cadenas_conteniendo_#_anters_de_guardar.
+Save_without_backup?=\u00bfGuardar_sin_copia_de_seguridad?
+Unable_to_create_backup=No_es_posible_crear_la_copia_de_seguridad
+File_directory_is_not_set_or_does_not_exist.=La_carpeta_de_archivo_no_est\u00e1_establecida_o_no_existe.
+Move_file_to_file_directory.=Mover_archivo_al_directorio_de_archivos.
+Rename_file_to=Renombrar_archivo_a
+<b>All_Entries</b>_(this_group_cannot_be_edited_or_removed)=<b>Todas_las_entradas</b>_(este_grupo_no_puede_ser_editado_o_eliminado)
+static_group=grupo_est\u00e1tico
+includes_subgroups=incluye_subgrupos
+refines_supergroup=afina_supergrupo
+dynamic_group=grupo_din\u00e1mico
+contains=contiene
+search_expression=expresi\u00f3n_de_b\u00fasqueda
+Disable_file_renaming_in_non-native_file_dialog=Deshabilitar_renombrado_de_archivo_en_di\u00e1logo_de_archivo_no_nativo.
+File_dialog=Di\u00e1logo_de_archivo
+No_entries_found._It_looks_like_you_do_not_have_access_to_search_JStor.=No_se_encuentran_entradas._Parece_que_no_tiene_acceso_para_b\u00fasquedas_en_JStor.
+Search_ScienceDirect=Buscar_en_ScienceDirect
+Error_while_fetching_from_ScienceDirect=Error_al_recuperar_desde_ScienceDirect
+Error_initializing_custom_export_format_from_string_'%0'=Error_inicializando_formato_de_exportaci\u00f3n_personalizado_a_partir_de_la_cadena_'%0'
+BibLaTeX_mode=Modo_BibLaTex
+Optional_fields_2=Campos_opcionales_2
+Please_wait=Por_favor,_espere
+Waiting_for_save_operation_to_finish\u00ba\u00ba=Esperando_a_finalizar_el_guardado_para_salir
+Resolving_duplicate_BibTeX_keys...=Resolviendo_claves_BibTeX_duplicadas...
+Finished_resolving_duplicate_BibTeX_keys._%0_entries_modified.=Resoluci\u00f3n_de_claves_BibTeX_duplicadas_finalizada._%0_entradas_modificadas.
+This_database_contains_one_or_more_duplicated_BibTeX_keys.=Esta_base_de_datos_contiene_una_o_m\u00e1s_claves_BibTeX_duplicadas.
+Do_you_want_to_resolve_duplicate_keys_now?=\u00bfQuiere_resolver_las_claves_duplicadas_ahora?
+Find_and_remove_duplicate_BibTeX_keys=Encontrar_y_eliminar_entradas_BibTeX_duplicadas
+Expected_syntax_for_--fetch\='<name_of_fetcher>\:<query>'=Sintaxis_esperada_para_--fetch='<nombre_del_recuperador>:<consulta>'
+Duplicate_BibTeX_key=Clave_BibTeX_duplicada
+Duplicate_key=Clave_duplicada
+Generate_key=Generar_clave
+Import_marking_color=Importar_color_para_marcas
+BibTeX_importer=Importador_BibTeX
+Always_add_letter_(a,_b,_...)_to_generated_keys=Siempre_a\u00f1adir_letra_(a,b,_...)_a_las_claves_generadas
+Ensure_unique_keys_using_letters_(a,_b,_...)=Asegurar_unicidad_de_claves_usando_letras_(a,b,_...)
+Ensure_unique_keys_using_letters_(b,_c,_...)=Asegurar_unicidad_de_claves_usando_letras_(b,c,_...)
+Entry_editor_active_background_color=Color_de_fondo_del_editor_de_entradas_para_celdas_activas
+Entry_editor_background_color=Color_de_fondo_del_editor_de_entradas
+Entry_editor_font_color=Color_de_tipo_de_letra_del_editor_de_entradas
+Entry_editor_invalid_field_color=Color_de_campo_inv\u00e1lido_del_editor_de_entradas
+Table_and_entry_editor_colors=Colores_de_tabla_y_editor_de_entradas
+An_autosave_file_was_found_for_this_database._This_could_indicate_=Un_fichero_autoguardado_se_ha_encontrado_para_esta_base_de_datos._Esto_podr\u00eda_indicar
+that_JabRef_didn't_shut_down_cleanly_last_time_the_file_was_used.=que_JabRef_no_se_cerr\u00f3_apropiadamente_la_\u00faltima_vez_que_se_us\u00f3_el_archivo.
+General_file_directory=Carpeta_general_de_archivos.
+User-specific_file_directory=Carpeta_de_archivos_de_usuario
+Search_failed\:_illegal_search_expression=La_b\u00fasqueda_ha_fallado._Expresi\u00f3n_de_b\u00fasqueda_ilegal
+Show_ArXiv_column=Mostrar_columna_ArXiv
+<HTML>Unpack_the_zip_file_containing_import/export_filters_for_Endnote,<BR>for_optimal_interoperability_with_JabRef</HTML>=<HTML>Descomprimir_el_archivo_zip_conteniendo_filtros_de_importaci\u00f3n/exportaci\u00f3n_para_Endnote,<BR>para_optimizar_la_interoperabilidad_con_JabRef</HTML>
+Highlight_groups_that_contain_entries_contained_in_any_currently_selected_group=Resaltar_grupos_con_entradas_contenidas_en_cualquier_grupo_seleccionado_actualmente.
+You_must_enter_an_integer_value_in_the_interval_1025-65535_in_the_text_field_for=Es_preciso_introducir_un_valor_entero_comprendido_entre_1025_y_65535_en_el_campo_de_texto_para
+Automatically_open_browse_dialog_when_creating_new_file_link=Abrir_autom\u00e1ticamente_el_di\u00e1logo_de_exploraci\u00f3n_al_crear_nuevo_enlace_a_archivo
+Import_Metadata_from\:=Importar_metadatos_desde\:
+Choose_the_source_for_the_metadata_import=Escoger_fuente_para_importar_metadatos
+Create_entry_based_on_XMP_data=Crear_entradas_a_partir_de_datos_XMP
+Create_entry_based_on_data_fetched_from=Crear_entrada_a_partir_de_datos_recuperados_desde
+Create_blank_entry_linking_the_PDF=Crear_entrada_en_blanco_enlazando_el_PDF
+Only_attach_PDF=S\u00f3lo_adjnntar_PDF
+Mr._dLib_Metadata_Entries_Associated_With_PDF_File=Entradas_de_metadatos_Mr._dLib_asociadas_con_el_archivo_PDF
+Title=T\u00edtulo
+Author(s)=Autor(es)
+Published_Year=A\u00f1o_de_revista
+No_metadata_found.=No_se_encontraron_metadatos
+Mr._dLib_web_service_is_temporarily_unavailable.=El_servicio_Mr._dLib_no_est\u00e1_disponible_temporalmente.
+Mr._dLib_web_service_is_temporarily_down._Please_try_again_later.=El_servicio_web_Mr._dLib_est\u00e1_temporalmente_fuera_de_servicio._Pruebe_m\u00e1s_tarde,_por_favor.
+You_are_not_connected_to_the_Internet._To_access_Mr._dLib_web_service_an_internet_connection_is_needed.=No_est\u00e1_conectado_a_Internet._Para_acceder_al_servicio_web_Mr._dLibes_necesaria_una_conexi\u00f3n_a_internet.
+No_Internet_Connection.=_Sin_conexi\u00f3n_a_Internet.
+This_JabRef_version_is_trying_to_access_an_old_version_of_Mr._dLib's_webservice_that_is_not_working_any_more.\nPlease_visit_http\://jabref.sourceforge.net_or_http\://www.mr-dlib.org_for_more_information_and_updates.=Esta_versi\u00f3n_de_JabRef_est\u00e1_intentando_acceder_a_una_versi\u00f3n_antigua_del_servicio_web_Mr._dLib_que_ya_no_est\u00e1_disponible.\nPor_favor,_visite_http://jabref.sourceforge.net_o_http://mr-dlib.org_para_m\u00e1s_informaci\u00f3n_y_actualizaciones.
+Web_Service_Version_Outdated=Versi\u00f3n_del_Servicio_Web_caducada
+The_Mr._dLib_web_service_version_you_trying_to_access_is_outdated.=La_versi\u00f3n_del_servicio_web_Mr._dLib_a_la_que_intenta_acceder_est\u00e1_caducada.
+Update_empty_fields_with_data_fetched_from=Actualizar_campos_vac\u00edos_con_datos_recuperados_desde
+Create_New_Entry=Crear_nueva_entrada
+Update_Existing_Entry=Actualizar_entrada_existente
+Mr._dLib=Mr._dLib
+More_information=M\u00e1s_informaci\u00f3n
+Fetching_Metadata...=Recuperando_metadatos...
+Metadata=Metadatos
+Autocomplete_names_in_'Firstname_Lastname'_format_only=Autocompletar_nombres_s\u00f3lo_en_el_formato_'Nombre_Apellidos'
+Autocomplete_names_in_'Lastname,_Firstname'_format_only=Autocompletar_nombres_s\u00f3lo_en_el_formato_'Apellidos,_Nombre'
+Autocomplete_names_in_both_formats=Autocompletar_nombres_en_ambos_formatos
+Marking_color_%0=Marcando_color_%0
+The_name_'comment'_can_not_be_used_as_an_entry_type_name.=El_nombre_'comment'_no_puede_ser_usado_como_nombre_de_tipo_de_entrada.
+You_must_enter_an_integer_value_in_the_text_field_for=Es_preciso_introducir_un_valor_entero_en_el_campo_de_texto_para
+File_directory=Carpeta_de_archivos
+Send_as_email=Enviar_como_email
+References=Referencias
+Sending_of_emails=Env\u00edo_de_emails
+Subject_for_sending_an_email_with_references=Asunto_para_enviar_email_con_referencias:
+Automatically_open_folders_of_attached_files=Abrir_carpetas_de_los_archivos_adjuntos_autom\u00e1ticamente
+Create_entry_based_on_content=Crear_entrada_basada_en_contenido
+Do_not_show_this_box_again_for_this_import=No_mostrar_este_mensaje_de_nuevo_para_esta_importaci\u00f3n
+Always_use_this_PDF_import_style_(and_do_not_ask_for_each_import)=Usar_siempre_este_estilo_de_importaci\u00f3n_de_PDF_(no_preguntar_cada_vez)
+Error_creating_email=Error_creando_email
+Could_not_open_directory=No_se_puede_abrir_la_carpeta
+Entries_added_to_an_email=Entradas_a\u00f1adidas_al_email
+exportFormat=Formato_de_exportación
+Output_file_missing=Fichero_de_salida_no_encontrado
+No_search_matches.=No_hay_coincidencias_en_la_b\u00fasqueda.
+The_output_option_depends_on_a_valid_input_option.=La_opci\u00f3n_de_salida_depende_de_una_opci\u00f3n_de_entrada_v\u00e1lida.
+Default_import_style_for_drag&drop_of_PDFs=Estilo_de_importaci\u00f3n_por_defecto_para_arrastrar-soltar_PDFs
+Default_PDF_file_link_action=Acci\u00f3n_por_defecto_del_enlace_a_PDF
+File_name_format_pattern=Patr\u00f3n_de_formato_de_nombre_de_archivo
+PostgreSQL_database=Base_de_Datos_PostgreSQL
+DIN_1505=DIN_1505
+Wrong_Format=Formato_err\u00f3neo
+Path_to_gnuclient_or_emacsclient=Ruta_a_gnuclient_o_emacsclient
+Additional_parameters=Par\u00e1metros_adicionales
+Encrypted_documents_are_not_supported=No_se_soportan_documentos_encriptados
+Cite_selected_entries=Citar_entradas_seleccionadas
+Cite_selected_entries_with_in-text_citation=Citar_entradas_seleccionadas_con_citas_en_el_texto
+Cite_special=Cita_especial
+Extra_information_(e.g._page_number)=Informaci\u00f3n_extra_(p.e._n\u00famero_de_p\u00e1gina)
+Manage_citations=Administrar_citas
+Problem_modifying_citation=Problema_al_modificar_cita
+Citation=Cita
+Context=Contexto
+Extra_information=Informaci\u00f3n_extra
+Could_not_resolve_BibTeX_entry_for_citation_marker_'%0'.=No_se_puede_resolver_la_entrada_BibTeX_para_el_marcador_de_citas_'%0'
+Styles=Estilos
+Select_style=Seleccionar_estilo
+This_is_the_list_of_available_styles._Select_the_one_you_want_to_use.=Esta_es_la_lista_de_estilos_disponibles._Seleccione_el_que_desea_usar.
+Journals=Publicaciones
+Cite=Citar
+Cite_in-text=Citar_en_el_texto
+Insert_empty_citation=Insertar_cita_vac\u00eda
+Merge_citations=Fundir_citas
+Manual_connect=Conexi\u00f3n_manual
+Select_Writer_document=Seleccionar_documento_Writer
+Sync_OO_bibliography=Sincronizar_bibliograf\u00eda_OO
+OpenOffice=OpenOffice/LibreOffice
+Select_which_open_Writer_document_to_work_on=Seleccionar_el_ducomento_Writer_para_trabajar
+Connected_to_document=Conectado_al_documento
+Insert_a_citation_without_text_(the_entry_will_appear_in_the_reference_list)=Insertar_una_cita_sin_texto_(la_entrada_aparecer\u00e1_en_la_lista_de_referencias)
+Cite_selected_entries_with_extra_information=Citar_los_papeles_seleccionados_con_informaci\u00f3n_extra
+Ensure_that_the_bibliography_is_up-to-date=Asegurar_que_la_bibliograf\u00eda_est\u00e1_actualizada
+Your_OpenOffice_document_references_the_BibTeX_key_'%0',_which_could_not_be_found_in_your_current_database.=Su_documento_OpenOffice_hace_referencia_a_la_clave_BibTex_'%0'_que_no_puede_ser_encontrada_en_la_base_de_datos_actual.
+Unable_to_synchronize_bibliography=No_es_posible_sincronizar_la_bibliograf\u00eda
+Combine_pairs_of_citations_that_are_separated_by_spaces_only=Combinar_pares_de_citas_que_est\u00e1n_separadas_\u00fanicamente_por_espacios
+Autodetection_failed=Fall\u00f3_la_autodetecci\u00f3n
+Connecting=Conectando...
+Please_wait...=Por_favor,_espere...
+Unable_to_connect=No_es_posible_conectar
+Set_connection_parameters=Establecer_par\u00e1metros_de_conexi\u00f3n
+Path_to_OpenOffice_directory=Ruta_al_directorio_OpenOffice/LibreOffice
+Path_to_OpenOffice_executable=Ruta_al_ejecutable_de_OpenOffice/LibreOffice
+Path_to_OpenOffice_library_dir=Ruta_a_la_carpeta_de_librer\u00edas_OpenOffice/LibreOffice
+Autodetect=Autodetectar
+Connection_lost=Se_ha_perdido_la_conexi\u00f3n
+The_paragraph_format_is_controlled_by_the_property_'ReferenceParagraphFormat'_or_'ReferenceHeaderParagraphFormat'_in_the_style_file.=El_formato_de_p\u00e1rrafo_est\u00e1_controlado_por_la_propiedad_'ReferenceParagraphFormat'_o_'_ReferenceHeaderParagraphFormat'_en_el_archivo_de_estilo.
+The_character_format_is_controlled_by_the_citation_property_'CitationCharacterFormat'_in_the_style_file.=El_formato_de_tipo_de_letra_est\u00e1_controlado_por_la_propiedad_de_la_cita_'CitationCharacterFormat0_en_el_archivo_de_estilo.
+Automatically_sync_bibliography_when_inserting_citations=Sincronizar_autom\u00e1ticamente_la_bibliograf\u00eda_al_insertar_citas
+Look_up_BibTeX_entries_in_the_active_tab_only=Buscar_entradas_BibTeX_s\u00f3lo_en_la_pesta\u00f1a_activa
+Look_up_BibTeX_entries_in_all_open_databases=Buscar_entradas_BibTeX_en_todas_las_bases_de_datos_abiertas
+Use_in-parenthesis_citation=Usar_cita_entre_par\u00e9ntesis
+Use_in-text_citation=Usar_cita_en_el_texto
+Autodetecting_paths...=Autodetectando_rutas...
+Unable_to_autodetect_OpenOffice_installation._Please_choose_the_installation_directory_manually.=No_es_posible_autodetectar_la_instalaci\u00f3n_de_OpenOffice/LibreOffice._Por_favor,_seleccione_el_directorio_de_instalaci\u00f3n_manualmente.
+Could_not_find_OpenOffice_installation=No_se_encuentra_la_instalaci\u00f3n_de_OpenOffice/LibreOffice
+Directories=Carpetas
+Found_more_than_one_OpenOffice_executable._Please_choose_which_one_to_connect_to\:=Se_ha_encontrado_m\u00e1s_de_un_ejecutable_OpenOffice/LibreOffice._Seleccione_al_que_se_desea_conectar:
+Choose_OpenOffice_executable=Escoger_ejecutable_OpenOffice/LibreOffice
+Select_document=Seleccionar_documento
+Edit_Group_Membership=Editar_pertenecia_a_grupo
+PostgreSQL=PostgreSQL
+Highlight_Words=Resaltar_palabras
+JSTOR_import_cancelled=Importaci\u00f3n_desde_JSTOR_cancelada
+HTML_list=Listado_HTML
+Click_group_to_toggle_membership_of_selected_entries=Haga_click_sobre_el_grupo_para_cambiar_el_grupo_al_que_pertenecen_las_entradas_seleccionadas
+Use_EMACS_23_insertion_string=Usar_la_cadena_de_inserci\u00f3n_EMACS_23
+If_possible,_normalize_this_list_of_names_to_conform_to_standard_BibTeX_name_formatting=Normalizar_esta_lista_de_nombres_para_cumplir_con_el_formato_de_nombre_BibTeX_est\u00e1ndar
+Could_not_open_%0=No_se_puede_abrir_%0
+Unknown_import_format=Formato_de_importaci\u00f3n_desconocido
+Open_INSPIRE_entry=Abrir_entrada_INSPIRE
+An_Error_occurred_while_fetching_from_INSPIRE_source_(%0)\:=Ocurri\u00f3_un_error_al_recuperar_desde_fuente_INSPIRE_(%0)\:
+Error_while_fetching_from_Inspire\:_=Error_al_recuperar_desde_Inspire\:
+Web_search=B\u00fasqueda_web
+Autocomplete_names=Autocompletar_nombres
+Default_style=Estilo_por_defecto
+Choose_style_file_directly=Escoger_fichero_de_estilo_directamente
+Choose_from_a_directory=Escoger_desde_una_carpeta
+No_directory_defined_for_%0-files=No_hay_carpeta_definida_para_%0_archivos
+Allow_file_links_relative_to_each_bib_file's_location=Permitir_enlaces_a_archivos_relativos_a_la_ubicaci\u00f3n_de_cada_archivo_bib
+Style_selection=Selecci\u00f3n_de_estilo
+The_panel_below_shows_the_definition_of_the_default_style.=El_panel_de_debajo_muestra_la_definici\u00f3n_del_estilo_por_defecto.
+If_you_want_to_use_it_as_a_template_for_a_new_style,_you_can_copy_the_contents_into_a_new_.jstyle_file=Si_quiere_usarlo_como_plantilla_para_un_nuevo_estilo,_puede_copiar_los_contenidos_en_un_nuevo_archivo_.jstyle
+Default_style_(author-year_citations)=Estilo_por_defecto_(citas_autor-a\u00f1o)
+Default_style_(numerical_citations)=Estilo_por_defecto_(citas_num\u00e9ricas)
+No_valid_style_file_defined=No_se_ha_definido_un_archivo_de_estilo_v\u00e1lido
+Choose_pattern=Escoger_patr\u00f3n
+Use_the_bib_file_location_as_primary_file_directory=Usar_la_ubicaci\u00f3n_del_archivo_bib_como_carpeta_de_archivos_primaria
+Could_not_run_the_gnuclient/emacsclient_program._Make_sure_you_have_the_emacsclient/gnuclient_program_installed_and_available_in_the_PATH.=No_se_puede_ejecutar_el_programa_gnuclient/emacsclient._Aseg\u00farese_de_que_est\u00e1n_instalados_y_disponibles_en_el_PATH.
+Built-in_journal_list=Lista_de_revistas_preincluida
+OpenOffice/LibreOffice_connection=Conexi\u00f3n_OpenOffice/LibreOffice
+You_can_add_additional_journal_names_by_setting_up_a_personal_journal_list,<br>as_well_as_linking_to_external_journal_lists.=Puede_a\u00f1adir_nombres_de_revista_adicionales_estabeciendo_una_lista_de_publicaciones_personal,<br>as\u00ed_como_enlazando_con_una_lista_externa.
+JabRef_includes_a_built-in_list_of_journal_abbreviations.=JabRef_incluye_una_lista_de_abreviaturas_preincluida
+You_must_select_either_a_valid_style_file,_or_use_one_of_the_default_styles.=Debe_seleccionar_un_archivo_de_estilo_v\u00e1lido_o_usar_uno_de_los_estilos_por_defecto.
+You_must_select_either_a_valid_style_file,_or_use_a_default_style.=Debe_seleccionar_un_archivo_de_estilo_v\u00e1lido_o_usar_uno_estilo_por_defecto.
+Show=Mostrar
+This_is_a_simple_copy_and_paste_dialog._First_load_or_paste_some_text_into_the_text_input_area.<br>After_that,_you_can_mark_text_and_assign_it_to_a_BibTeX_field.=Este_es_un_di\u00e1logo_de_copia-pega_simple._Primero,_cargue_o_pegue_algo_de_texto_en_el_\u00e1rea_de_entrada_de_texto.<br>Posteriormente,_puede_marcar_texto_y_asignarlo_a_un_campo_BibTeX.
+Java_Bouncy_Castle_library_not_found._Please_download_and_install_it._For_more_information_see_http\://www.bouncycastle.org/.=No_se_encuentra_la_librer\u00eda_Java_Bouncy_Castle._Por_favor,_desc\u00e1rguela_e_inst\u00e1lela._Para_m\u00e1s_informaci\u00f3n,_vea_http://bouncycastle.org/.
+This_feature_generates_a_new_database_based_on_which_entries_are_needed_in_an_existing_LaTeX_document.=Esta_funcionalidad_genera_una_nueva_base_de_datos_basada_en_las_entradas_que_se_necesitan_en_un_documento_LaTeX_existente.
+You_need_to_select_one_of_your_open_databases_from_which_to_choose_entries,_as_well_as_the_AUX_file_produced_by_LaTeX_when_compiling_your_document.=Necesita_seleccionar_una_de_sus_bases_de_datos_abiertas_desde_la_que_se_escoger\u00e1n_entradas,_as\u00ed_como_el_archivo_AUX_generado_por_LaTeX_al_compilar_su_documento.
+First_select_entries_to_clean_up.=Seleccione_las_entradas_a_limpiar_en_primer_lugar.
+Cleanup_entry=Limpiar_entradas
+Autogenerate_PDF_Names=Autogenerar_nombres_de_PDF
+Auto-generating_PDF-Names_does_not_support_undo._Continue?=La_autogeneraci\u00f3n_de_nombres_de_PDF_no_se_puede_deshacer._\u00bfContinuar?
+File_rename_failed_for=Ha_fallado_el_renombrado_del_archivo
+You_have_toggled_the_BibLaTeX_mode.=Ha_cambiado_el_modo_BibLaTeX.
+Use_full_firstname_whenever_possible=Usar_nombre_de_pila_completo_cuando_sea_posible
+Use_abbreviated_firstname_whenever_possible=Usar_nombre_de_pila_abreviado_cuando_sea_posible
+Use_abbreviated_and_full_firstname=Usar_apellido_completo_y_abreviado
+Autocompletion_options=Opciones_de_autocompletar
+Autocomplete_after_following_number_of_characters=Autocompletar_despu\u00e9s_del_siguiente_n\u00famero_de_caracteres
+Name_format_used_for_autocompletion=Formato_de_nombre_usado_para_autocompletar
+Treatment_of_first_names=Tratamiento_de_nombres_de_pila
+Cleanup_entries=Limpiar_entradas
+Automatically_assign_new_entry_to_selected_groups=Asignar_autom\u00e1ticamente_nueva_entrada_a_los_grupos_seleccionados
+Move_DOIs_from_note_and_URL_field_to_DOI_field_and_remove_http_prefix=Mover_DOIs_desde_los_campos_nota_y_URL_al_campo_DOI_y_eliminar_el_prefijo_http
+Format_content_of_month_field_to_#mon#=Formatear_el_contenido_del_campo_mes_a_#mon#
+Ensure_that_page_ranges_are_of_the_form_num1--num2=Asegurarse_de_que_los_rangos_de_p\u00e1gina_son_de_la_forma_num1--num2
+Make_paths_of_linked_files_relative_(if_possible)=Hacer_rutas_de_los_ficheros_enlazados_relativas_(si_es_posible)
+Rename_PDFs_to_given_file_name_format_pattern=Renombrar_PDFs_al_patron_de_formato_de_nombre_archivo_proporcionado
+Rename_only_PDFs_having_a_relative_path=Renombrar_s\u00f3lo_los_PDF_con_ruta_relativa
+What_would_you_like_to_clean_up?=\u00bfQu\u00e9_desea_limpiar?
+Doing_a_cleanup_for_%0_entries...=Haciendo_la_limpieza_de_%0_entradas
+No_entry_needed_a_clean_up=Ninguna_entrada_necesit\u00f3_de_limpieza
+One_entry_needed_a_clean_up=S\u00f3lo_una_entrada_necesit\u00f3_limpieza
+%0_entries_needed_a_clean_up=%0_entradas_necesitarion_limpieza
+Imported_=Importado
+Error_importing_from_database=Error_al_importar_desde_base_de_datos
+%0_databases_will_be_imported=%0_bases_de_datos_ser\u00e1n_importadas
+Imported_%0_databases_successfully=%0_bases_de_datos_importadas_con_\u00e9xito
+Minimize_to_system_tray=Minimizar_a_la_bandeja_del_sistema
+Incomplete_search_results=Resultados_de_b\u00fasqueda_incompletos
+Error_downloading_file_'%0'=Error_descargando_el_archivo_'%0'
+Download_failed=Fall\u00f3_la_descarga
+Importing_cancelled=Importaci\u00f3n_cancelada
+There_are_no_available_databases_to_be_imported=No_hay_bases_de_datos_disaponibles_para_importar
+Import_from_SQL_database=Importar_desde_base_de_datos_SQL
+<_CREATE_NEW_DATABASE_>=<_CREAR_NUEVA_BASE_DE_DATOS_>
+Remove_Selected=Eliminar_seleccionados
+SQL_Database_Exporter=Exportador_a_base_de_datos_SQL
+Select_target_SQL_database\:=Seleccionar_base_de_datos_SQL_de_destino:
+SQL_Database_Importer=Importador_de_base_de_datos_SQL
+Please_select_which_JabRef_databases_do_you_want_to_import\:=Por_favor,_selecciones_las_bases_de_datos_JabRef_que_desea_importar:
+Group_tree_could_not_be_parsed._If_you_save_the_BibTeX_database,_all_groups_will_be_lost.=El_arbol_de_grupo_no_puede_ser_examinado._Si_guarda_la_base_de_datos_BibTeX,_todos_los_grupos_se_perder\u00e1n.
+Attach_file=Adjuntar_archivo
+Setting_all_preferences_to_default_values.=Estableciendo_todas_las_preferencias_a_los_valores_por_defecto.
+Resetting_preference_key_'%0'=Reestableciendo_la_preferencia_con_clave_'%0'
+Unknown_preference_key_'%0'=Clave_de_preferencia_desconocida_'%0'
+Unable_to_clear_preferences.=No_es_posible_limpiar_preferencias.
+Reset_preferences_(key1,key2,..._or_'all')=Restablecer_preferencias_(key1,key2,..._or_'todas')
+Find_unlinked_files=Buscar_archivos_desenlazados
+Select_All=Seleccionar_todo
+Unselect_All=Deseleccionar_todo
+Expand_All=Expandir_todo
+Collapse_All=Colapsar_todo
+Select_Directory=Seleccionar_directorio
+Choose_Directory=Escoger_directorio
+Use_the_selected_directory_to_start_with_the_search.=Usar_la_carpeta_seleccionada_para_comenzar_la_b\u00fasqueda.
+Browse...=Explorar...
+Opens_the_file_browser.=Abre_el_explorador_de_archivos.
+Scan_directory=Escanear_directorio
+Searches_the_selected_directory_for_unlinked_files.=Busca_archivos_sin_enlazar_en_la_carpeta_seleccionada.
+Starts_the_import_of_bibtex_entries.=Comienza_la_importaci\u00f3n_de_entradas_BibTeX.
+Leave_this_dialog.=Dejar_este_di\u00e1logo.
+Create_directory_based_keywords=Crear_palabras_clave_basadas_en_carpeta
+Creates_keywords_in_created_entrys_with_directory_pathnames=Crea_palabras_clave_en_entradas_creadas_con_nombres_de_ruta_de_carpeta.
+Select_a_directory_where_the_search_shall_start.=Seleccione_el_directorio_donde_deber\u00eda_comenzar_la_b\u00fasqueda.
+Select_file_type\:=Seleccione_el_tipo_de_archivo:
+These_files_are_not_linked_in_the_active_database.=Estos_archivos_no_est\u00e1n_enlazados_en_la__base_de_datos_activa.
+Entry_type_to_be_created\:=Tipo_de_entrada_a_crear:
+Searching_file_system...=Buscando_en_el_sistema_de_archivos...
+Importing_into_Database...=Importando_en_base_de_datos...
+Select_directory=Seleccionar_carpeta
+Select_files=Seleccionar_archivos
+Bibtex_entry_creation=Creaci\u00f3n_de_entrada_BibTeX
+<No_selection>=<No_hay_selecci\u00f3n>
+Push_selection_to_TeXstudio=Enviar_selecci\u00f3n_a_TeXstudio
+Path_to_TeXstudio=Ruta_hacia_TeXstudio
+Program_'%0'_not_found=No_se_encuentra_el_programa_'%0'
+Pushed_citations_to_TeXstudio=Citas_enviadas_a_TeXstudio
+Unable_to_connect_to_freecite_online_service.=No_es_posible_conectar_con_el_servicio_online_FreeCite.
+Parse_with_FreeCite=Analizar_con_FreeCite
+Insert_selected_citations_into_TeXstudio=Insertar_las_citas_seleccionadas_en_TeXstudio
+The_current_BibTeX_key_will_be_overwritten._Continue?=La_clave_BibTeX_actual_va_a_ser_sobreescrita._\u00bfContinuar?
+Overwrite_key=Sobreescribir_clave
+Not_overwriting_existing_key._To_change_this_setting,_open_Options_->_Prefererences_->_BibTeX_key_generator=No_se_sobreescribir\u00e1_clave_existente._Para_cambiar_este_ajuste,_seleccione_Opciones->Preferencias->Generador_de_claves_BiBTeX
+How_would_you_like_to_link_to_'%0'?=\u00bfC\u00f3mo_desea_enlazar_'%0'?
+Marked_entries_as_relevant=Entradas_marcadas_como_relevantes
+Marked_entries'_quality_as_good=Calidad_de_las_entradas_marcadas_como_buenas
+Set_priority=Establecer_prioridad
+no_preview_available=sin_vista_previa
+Enable_PDF_preview=Habilitar_vista_previa_de_PDF
+Show_one_letter_heading_for_icon_columns=Mostrar_encabezamiento_de_una_letra_para_columnas_de_icono
+Help_on_special_fields=Ayuda_sobre_campos_especiales
+Enable_special_fields=Habilitar_campos_especiales
+Show_rank=Mostrar_rango
+Compact_rank=Compactar_rango
+Show_quality=Mostrar_cualidad
+Show_priority=Mostrar_prioridad
+Show_relevance=Mostrar_relevancia
+Synchronize_with_keywords=Sincronizar_con_palabras_clave
+Write_values_of_special_fields_as_separate_fields_to_BibTeX=Escribir_valores_de_campos_especiales_como_campos_separados_en_BibTeX
+You_have_changed_settings_for_special_fields.=Ha_cambiado_los_ajustes_para_campos_especiales.
+Changed_special_field_settings=Ajustes_de_campos_especiales_cambiados
+Bibtex_key_patterns=Patrones_de_clave_BibTeX
+Convert_1st,_2nd,_..._to_real_superscripts=Convertir_1st,_2nd,_..._a_super\u00edndices
+Manage_content_selectors=Getionar_selectores_de_contenido
+Dropped_comment_from_database=Eliminado_comentario_de_la_base_de_datos
+Synchronized_special_fields_based_on_keywords=Sincronizar_campos_especiales_basados_en_palabras_clave
+Clear_priority=Limpiar_prioridad
+No_priority_information=Sin_informaci\u00f3n_de_prioridad
+Set_priority_to_high=Establecer_prioridad_alta
+Priority_high=Prioridad_alta
+Set_priority_to_medium=Establecer_prioridad_media
+Priority_medium=Prioridad_media
+Set_priority_to_low=Establecer_prioridad_baja
+Priority_low=Prioridad_baja
+Priority=Prioridad
+Toogle_quality_assured=Conmutar_calidad_asegurada
+Quality=Calidad
+Rank=Rango
+Clear_rank=Limpiar_rango
+No_rank_information=Sin_informaci\u00f3n_de_rango
+Set_rank_to_one_star=Establecer_rango_en_una_estrella
+One_star=Una_estrella
+Set_rank_to_two_stars=Establecer_rango_en_dos_estrellas
+Two_stars=Dos_estrellas
+Set_rank_to_three_stars=Establecer_rango_en_tres_estrellas
+Three_stars=Tres_estrellas
+Set_rank_to_four_stars=Establecer_rango_en_cuatro_estrellas
+Four_stars=Cuatro_estrellas
+Set_rank_to_five_stars=Establecer_rango_en_cinco_estrellas
+Five_stars=Cinco_estrellas
+Toggle_relevance=Conmutar_relevancia
+Relevance=Relevancia
+Manage_keywords=Administrar_palabras_clave
+Keywords_of_selected_entries=Palabras_clave_de_las_entradas_seleccionadas
+Update_keywords=Actualizar_palabras_clave
+Correct_the_entry,_and_reopen_editor_to_display/edit_source.=Corregir_la_entrada_y_reabrir_el_editor_para_mostrar/editar_fuente.
+When_downloading_files,_or_moving_linked_files_to_the_file_directory,_prefer_the_bib_file_location_rather_than_the_file_directory_set_above=Al_descargar_archivos_o_mover_archivos_enlazados_a_la_carpeta_de_archivos,_preferir_la_ubicaci\u00f3n_del_archivo_bib_antes_que_el_directorio_de_archivos_establecido_arriba.
+If_a_pasted_or_imported_entry_already_has_the_field_set,_overwrite.=Si_una_entrada_importada_o_pegada_ya_tiene_el_campo_establecido,_sobreescribir.
+To_disable_the_memory_stick_mode_rename_or_remove_the_jabref.xml_file_in_the_same_folder_as_JabRef.=Para_deshabilitar_el_modo_l\u00e1piz_de_memoria,_renombre_o_elimine_el_archivo_jabrf.xml_en_la_misma_carpeta_que_JabRef.
+Please_note_that_this_is_an_early_beta_version._Do_not_use_it_without_backing_up_your_files!=Tenga_en_cuanta_que_es_una_versi\u00f3n_beta_temprana._\u00a1No_la_use_sin_hacer_una_copia_de_seguridad_de_sus_archivos!
+A_string_with_that_label_already_exists=Una_cadena_con_esa_etiqueta_ya_existe
+File_has_been_updated_externally._Are_you_sure_you_want_to_save?=El_archivo_se_ha_actualizado_externamente._\u00bfEst\u00e1_seguro_de_querer_guardar?
+Could_not_connect_to_a_running_gnuserv_process._Make_sure_that_Emacs_or_XEmacs_is_running,<BR>and_that_the_server_has_been_started_(by_running_the_command_'server-start'/'gnuserv-start').=No_se_puede_conectar_con_un_proceso_gnuserv_ejecut\u00e1ndose._Aseg\u00farese_de_que_Emacs_o_XEmacs_est\u00e1_ejecut\u00e1ndose,<BR>y_que_el_servidor_se_ha_arrancado_(ejecutando_el_comando_'server-start'/'gnuserv-start').
+Use_the_following_delimiter_character(s)\:=Usar_como_caracter(es)_delimitador(es):
+Created_group_"%0".=Creado_grupo_"%0".
+Removed_all_subgroups_of_group_"%0".=Eliminados_todos_los_subgrupos_del_grupo_"%0".
+%0_entries_found._To_reduce_server_load,_only_%1_will_be_downloaded.=%0_entradas_encontradas._Para_reducir_la_carga_del_servidor,_s\u00f3lo_%1_ser\u00e1(n)_descargada(s).
+Unable_to_connect._One_possible_reason_is_that_JabRef_and_OpenOffice/LibreOffice_are_not_both_running_in_either_32_bit_mode_or_64_bit_mode.=No_es_posible_conectar._Una_posible_raz\u00f3n_es_que_JabRef_y_OpenOffice/LibreOffice_no_est\u00e1n_funcionado_en_modo_32_bit_o_64_bit.
+Could_not_connect_to_running_OpenOffice.\nMake_sure_you_have_installed_OpenOffice_with_Java_support.\nIf_connecting_manually,_please_verify_program_and_library_paths.\n\nError_message\:_=No_se_puede_conectar_a_un_OpenOffice/LibreOffice_en_ejecuci\u00f3n.\nAseg\u00farese_de_que_tiene_OpenOffice/LibreOffice_instalado_con_soporte_para_Java.\nlf__connecting_manually,_por_favor_verifique_las_ruta_de_programa_y_librer\u00edas.\n\nMensaje_de_error:_
+Not_connected_to_any_Writer_document._Please_make_sure_a_document_is_open,_and_use_the_'Select_Writer_document'_button_to_connect_to_it.=No_conectado_a_ning\u00fan_documento_Writer._Aseg\u00farese_de_que_un_documento_est\u00e1_abierto_y_use_el_bot\u00f3n_"Seleccionar_documento_Writer'_para_conectar_con_\u00e9l.
+Connection_to_OpenOffice_has_been_lost._Please_make_sure_OpenOffice_is_running,_and_try_to_reconnect.=La_conexi\u00f3n_con_OpenOffice/LibreOffice_se_ha_perdido._Aseg\u00farese_de_que_OpenOffice/LibreOffice_est\u00e1_ejecut\u00e1ndose_e_intente_reconectar.
+Your_style_file_specifies_the_paragraph_format_'%0',_which_is_undefined_in_your_current_OpenOffice_document.=Su_archivo_de_estilo_especifica_el_formato_de_p\u00e1rrafo_'%0',_que_no_est\u00e1_definido_en_su_documento_OpenOffice/LibreOffice.
+Your_style_file_specifies_the_character_format_'%0',_which_is_undefined_in_your_current_OpenOffice_document.=Su_archivo_de_estilo_especifica_el_formato_de_car\u00e1cter_'%0',_que_no_est\u00e1_definido_en_su_documento_OpenOffice_actual.
+Unable_to_determine_plugin_name_and_version._This_may_not_be_a_valid_JabRef_plugin.=No_es_posible_determinar_el_nombre_y_versi\u00f3n_del_plugin._Puede_que_no_sea_un_plugin_JabRef_v\u00e1lido.
+Import_Metadata_From_PDF=Importar_metadatos_desde_PDF
+Run_HTML_converter_on_title=Ejecutar_conversor_HTML_en_t\u00edtulo
+Searching...=Buscando...
+Error_fetching_from_Google_Scholar=Error_recuperando_desde_Google_Scholar
+You_have_selected_more_than_%0_entries_for_download._Some_web_sites_might_block_you_if_you_make_too_many_rapid_downloads._Do_you_want_to_continue?=Ha_seleccionado_m\u00e1s_de_%0_entradas_para_descargar._Algunos_sitios_web_podr\u00edan_bloquearle_si_hace_demasiadas_descargas._\u00bfDesea_continuar?
+Confirm_selection=Confirmar_selecci\u00f3n
+Unknown_DOI\:_'%0'.=DOI_desconocido:_'%0'.
+Get_BibTeX_entry_from_DOI=Obtener_entrada_BibTeX_desde_DOI
+Prefer_converting_subscripts_and_superscripts_to_equations_rather_than_text=Preferir_convertir_sub\u00edndices_y_super\u00edndices_a_ecuaci\u00f3nantes_que_a_texto
+Add_{}_to_specified_title_words_on_search_to_keep_the_correct_case=A\u00f1adir_{}_para_especificar_las_palabras_del_t\u00edtulo_para_mantener_may\u00fasculas/min\u00fasculas_correctamente
+Import_conversions=Importar_conversiones
+Run_filter_on_title_keeping_the_case_of_selected_words=Ejecutar_filtro_en_t\u00edtulo_manteniendo_las_may\u00fasculas/min\u00fasculas_en_las_palabras_seleccionadas
+Intermittent_errors_on_the_IEEE_Xplore_server._Please_try_again_in_a_while.=Errores_intermitentes_en_el_servidor_IEEE_Xplore._Por_favor,_int\u00e9ntelo_m\u00e1s_tarde.
+Please_enter_a_search_string=Introduzca_una_cadena_de_b\u00fasqueda,_por_favor
+Please_open_or_start_a_new_database_before_searching=Abra_o_cree_una_nueva_base_de_datos_antes_de_buscar,_por_favor
+An_Error_occurred_while_fetching_from_ADS_(%0)\:=Ocurri\u00f3_un_error_al_recuperar_desde_ADS_(%0):
+Error_while_fetching_from_ADS=Error_al_recuperar_desde_ADS
+Error_while_fetching_from_OAI2=Error_al_recuperar_desde_OAI2
+An_Error_occurred_while_parsing_abstract=Ocurri\u00f3_un_error_mientras_se_analizaba_el_resumen
+Unknown_DiVA_entry\:_'%0'.=Entrada_DiVA_desconocida:_'%0'.
+Get_BibTeX_entry_from_DiVA=Obtener_entrada_BibTeX_desde_DiVA
+Log=Registro
+ISO_690=ISO_690
+Format_units_by_adding_non-breaking_separators_and_keeping_the_correct_case_on_search=Formatear_unidades_a\u00f1adiendo_separadores_no_divisores_y_manteniendo_may\u00fasculas/min\u00fasculas_correctamente_en_la_b\u00fasqueda
+Use_Emacs_key_bindings=Usar_combinaciones_de_teclas_de_Emacs
+Merge_entries=Fusionar_entradas
+Show_URL_first=Mostrar_URL_en_primer_lugar
+Show_DOI_first=Mostrar_DOI_en_primer_lugar
+Remove_unneccessary_$,_{,_and_}_and_move_adjacent_numbers_into_equations=Eliminar_$,_{_y_}_innecesarios_y_mover_n\u00fameros_adyacentes_a_ecuaciones
+Add_brackets_and_replace_separators_with_their_non-breaking_version_for_units=A\u00f1adir_par\u00e9ntesis_y_reemplazar_separadores_con_sus_versiones_no_divisoras_para_unidades.
+First_entry=Primera_entrada
+Use_1st=Usar_primero
+None=Ning\u00fan
+Use_2nd=Usar_segundo
+Second_entry=Segunda_entrada
+You_have_to_choose_exactly_two_entries_to_merge.=Tiene_que_escoger_exactamente_dos_entradas_para_fusionar.
+Merged_entry=Entrada_fusionada
+Error_in_entry=Error_en_la_entrada
+Add_new_entry_and_keep_both_old_entries=A\u00f1adir_nueva_entrada_y_mantener_las_dos_entradas_antiguas
+Replace_old_entries_with_new_entry=Reemplazar_viejas_entradas_con_la_nueva
+Cancelled_merging_entries=Cancelar_fusionado_de_entradas
+Merged_entries_into_a_new_and_kept_the_old=Fusionar_entradas_en_una_nueva_y_mantener_la_antigua
+Merged_entries_into_a_new_and_removed_the_old=Entradas_fusionadas_en_una_nueva_y_eliminada_la_antigua
+Parse=Analizar
+Result=Resultado
+Update_timestamp_on_modification=Actualizar_marca_de_tiempo_al_modificar
+change_field=cambiar_campo
+Automatically_set_file_links=Establecer_enlaces_de_archivo_autom\u00e1ticamente
+All_key_bindings_will_be_reset_to_their_defaults.=Todas_las_combinaciones_de_teclas_ser\u00e1n_restablecidas_a_su_configuraci\u00f3n_por_defecto
+Continue?=\u00bfContinuar?
+Resetting_all_key_bindings=Reestableciendo_todas_las_combinaciones_de_teclas
+Save_entries_ordered_by_title=Guardar_entradas_ordenadas_por_t\u00edtulo
+Export_entries_ordered_by_title=Exportar_entradas_ordenadas_por_t\u00edtulo
+Quotes=Citas
+Curly_Brackets=Llaves
+Include_empty_fields=Incluir_campos_vac\u00edos
+Field_saving_options=Opciones_de_guardado_de_campo
+Field_value_delimiter._E.g.,_"author\={x}"_or_"author\='x'"=Delimitador_de_valor_de_campo._Ej._"author={x}"_o_"author='x'"
+Run_Unicode_converter_on_title,_author(s),_and_abstract=Ejecutar_conversor_Unicode_en_t\u00edtulo,_autor(es)_y_resumen
+Start_field_contents_in_same_column=Comenzar_los_contenidos_del_campo_en_la_misma_columna
+Use_camel_case_for_field_names_(e.g.,_"HowPublished"_instead_of_"howpublished")=Usar_camel_case_para_nombres_de_campo_UEj._"VistaHermosa"_en_lugar_de_"vistahermosa")
+Database_has_changed._Do_you_want_to_save_before_closing?=La_base_de_datos_ha_cambiado._\u00bfDesea_guardar_antes_de_cerra?
+Use_custom_proxy_configuration=Usar_configuraci\u00f3n_de_proxy_personalizada
+Network=Red
+Host=Host
+Port=Puerto
+Please_specify_both_hostname_and_port=Especifique_tanto_nombre_de_host_como_puerto
+Invalid_setting=Ajuste_inv\u00e1lido
+Automatically_set_file_links_for_this_entry=Ajustar enlaces de archivo automáticamente para esta entrada
+Clear_connection_settings=Limpiar ajustes de conexión
+Cleared_connection_settings.=Ajustes de conexi\u00f3n limpiados
+Collapse_all=Colapsar todo
+Error_converting_BibTeX_to_XMP\:_%0=Error convirtiendo BibTeX a XMP:_%0
+Expand_all=Expandir todo
+First_select_the_entries_you_want_keys_to_be_generated_for.=En primer lugar, seleccione las entradas para las que desea generar claves
+Rebind_C-a,_too=Volver a combinar C-a también
+Search_specified_field(s)=Buscar en campo(s) especificado(s)
+Unselect_all=Deseleccionar todo
+Waiting_for_save_operation_to_finish=Esperando a que acabe la operaci\u00f3n de guardado
+Show_number_of_elements_contained_in_each_group=Mostrar n\u00famero de elementos contenidos en cada grupo
+
+Open_folder=
+Opened_%0_folder(s).=
diff --git a/src/resource/JabRef_fr.properties b/src/resource/JabRef_fr.properties
index 0c5772a..07100ea 100644
--- a/src/resource/JabRef_fr.properties
+++ b/src/resource/JabRef_fr.properties
@@ -105,7 +105,6 @@ Background_color_for_optional_fields=Couleur_d'arri\u00e8re-plan_pour_les_champs
 Background_color_for_required_fields=Couleur_d'arri\u00e8re-plan_pour_les_champs_requis
 Backup_old_file_when_saving=Cr\u00e9er_une_copie_de_sauvegarde_lors_de_l'enregistrement
 Beta_version=Version_Beta
-Bibkey_to_filename_conversion=Conversion_de_la_clef_BibTeX_en_nom_de_fichier
 BibTeX_key=Clef_BibTeX
 BibTeX_key_is_unique.=La_clef_BibTeX_est_unique.
 BibTeX_key_not_set._Enter_a_name_for_the_downloaded_file=Clef_BibTeX_ind\u00e9finie._Entrer_un_nom_pour_le_fichier_t\u00e9l\u00e9charg\u00e9
@@ -115,7 +114,6 @@ Binding=Affectation
 Broken_link=Lien_invalide
 Browse=Explorer
 by=par_
-Calling_external_viewer...=Lancement_de_l'afficheur_externe...
 Cancel=Annuler
 Cannot_add_entries_to_group_without_generating_keys._Generate_keys_now?=Les_entr\u00e9es_ne_peuvent_pas_\u00eatre_ajout\u00e9es_au_groupe_sans_g\u00e9n\u00e9rer_des_clefs._Voulez-vous_g\u00e9n\u00e9rer_des_clefs_maintenant_?
 Cannot_merge_this_change=Cette_modification_ne_peut_pas_\u00eatre_fusionn\u00e9e
@@ -168,7 +166,6 @@ Command_line_id=Identifiant_de_la_ligne_de_commande
 Complete_record=Compl\u00e9ter_l'enregistrement
 Connect=Connexion_automatique
 Connect_to_SQL_database=Se_connecter_\u00e0_une_base_SQL
-Connect_to_SQL_Database=Se_connecter_\u00e0_une_base_SQL
 Connection_to_IEEEXplore_failed=Echec_de_la_connexion_\u00e0_IEEEXplore
 Contained_in=Contenu_dans
 Content=Contenu
@@ -182,8 +179,6 @@ Copy_file_to_file_directory.=Copier_le_fichier_vers_le_r\u00e9pertoire_de_fichie
 Copy_files_to_file_directory.=Copier_les_fichiers_vers_le_r\u00e9pertoire_de_fichiers.
 Copy_to_clipboard=Copier_dans_le_presse-papier
 Could_not_call_executable=L'ex\u00e9cutable_n'a_pas_pu_\u00eatre_lanc\u00e9
-Could_not_connect_to_a_running_gnuserv_process._Make_sure_that_Emacs_or_XEmacs_is_running,<BR>and_that_the_server_has_been_started_(by_running_the_command_'gnuserv-start').=La_connexion_\u00e0_un_processus_gnuserv_actif_a_\u00e9chou\u00e9._Assurez-vous_qu'Emacs_ou_XEmacs_soit_actif,<BR>et_que_le_serveur_a_\u00e9t\u00e9_d\u00e9marr\u00e9_(avec_la_commande_'gnuserv-start').
-Could_not_connect_to_host_=La_connexion_\u00e0_l'ordinateur_h\u00f4te_a_\u00e9chou\u00e9_
 Could_not_connect_to_Vim_server._Make_sure_that_Vim_is_running<BR>with_correct_server_name.=La_connexion_au_serveur_Vim_a_\u00e9chou\u00e9._Assurez-vous_que_Vim_tourne<BR>avec_le_bon_nom_de_serveur.
 Could_not_export_file=Le_fichier_n'a_pas_pu_\u00eatre_export\u00e9
 Could_not_export_preferences=L'exportation_des_pr\u00e9f\u00e9rences_a_\u00e9chou\u00e9
@@ -201,15 +196,12 @@ Could_not_print_preview=Echec_de_l'impression_de_l'aper\u00e7u
 Could_not_run_the_'vim'_program.=Le_programme_'vim'_n'a_pas_pu_\u00eatre_lanc\u00e9.
 Could_not_save_file=Le_fichier_n'a_pas_pu_\u00eatre_enregistr\u00e9_
 Could_not_save_file._Character_encoding_'%0'_is_not_supported.=Le_fichier_n'a_pas_pu_\u00eatre_enregistr\u00e9._L'encodage_de_caract\u00e8res_'%0'_n'est_pas_support\u00e9.
-Create_group=Cr\u00e9er_le_groupe
 Created_groups.=Groupes_cr\u00e9\u00e9s.
 crossreferenced_entries_included=Entr\u00e9es_avec_r\u00e9f\u00e9rences_crois\u00e9es_incluses
 Current_content=Contenu_actuel
 Current_value=Valeur_actuelle_
 Custom_entry_types=Types_d'entr\u00e9es_personnalis\u00e9es
 Custom_entry_types_found_in_file=Types_d'entr\u00e9es_personnalis\u00e9es_trouv\u00e9es_dans_le_fichier
-Custom_icon_theme=Th\u00e8me_d'ic\u00f4nes_personnalis\u00e9
-Custom_icon_theme_file=Fichier_de_th\u00e8me_d'ic\u00f4nes_personnalis\u00e9
 Custom_importers=Filtres_d'importation_personnalis\u00e9s
 Customize_entry_types=Personnaliser_les_types_d'entr\u00e9es
 Customize_key_bindings=Personnaliser_les_affectations_de_touches
@@ -219,7 +211,6 @@ cut_entry=supprimer_l'entr\u00e9e
 Cut_pr=Couper
 Database_\:=Base_de_donn\u00e9es_:
 Database_encoding=Encodage_de_la_base_de_donn\u00e9es
-Database_has_changed._Do_you_want_to_save_before_closing?=Base_modifi\u00e9e._Voulez-vous_l'enregistrer_avant_de_fermer_?
 Database_properties=Propri\u00e9t\u00e9s_de_la_base_de_donn\u00e9es
 Date_format=Format_de_date_
 Default=D\u00e9faut
@@ -272,8 +263,6 @@ Download_file=T\u00e9l\u00e9charger_le_fichier
 Downloading...=T\u00e9l\u00e9chargement...
 Drag_and_Drop_Error=Erreur_de_Glisser-D\u00e9poser
 Drop_%0=D\u00e9poser_%0
-duplicate_BibTeX_key=Clef_BibTeX_dupliqu\u00e9e
-Duplicate_BibTeX_key.=Dupliquer_la_clef_BibTeX.
 Duplicate_BibTeX_key._Grouping_may_not_work_for_this_entry.=Clef_BibTeX_dupliqu\u00e9e._Les_groupes_pourraient_ne_pas_fonctionner_pour_cette_entr\u00e9e.
 Duplicate_Key_Warning=Avertissement_:_Clef_dupliqu\u00e9e
 Duplicate_pairs_found=Doublons_trouv\u00e9s
@@ -296,10 +285,8 @@ Edit_preamble=Editer_le_pr\u00e9ambule
 Edit_strings=Editer_les_cha\u00eenes
 Editor_options=Options_d'\u00e9diteur
 empty_BibTeX_key=Clef_BibTeX_vide
-Empty_BibTeX_key.=Clef_BibTeX_vide.
 Empty_BibTeX_key._Grouping_may_not_work_for_this_entry.=Clef_BibTeX_vide._La_gestion_des_groupes_pourrait_ne_plus_fonctionner_pour_cette_entr\u00e9e.
 empty_database=base_vide
-Enable_source_editing=Autoriser_l'\u00e9dition_du_source
 Enable_word/name_autocompletion=Autoriser_l'auto-g\u00e9n\u00e9ration_des_mots/noms
 Endnote=Endnote
 Enter_URL=Entrer_l'URL
@@ -321,7 +308,7 @@ Entry_type_names_are_not_allowed_to_contain_white_space_or_the_following_charact
 Entry_types=Types_d'entr\u00e9es
 Error=Erreur
 Error\:_=Erreur_:_
-Error_converting_Bibtex_to_XMP\:_%0=Erreur_lors_de_la_conversion_de_BibTeX_en_XMP_:_%0
+Error_converting_BibTeX_to_XMP\:_%0=Erreur_lors_de_la_conversion_de_BibTeX_en_XMP_:_%0
 Error_converting_XMP_to_'%0'...=Erreur_lors_de_la_conversion_d'XMP_en_'%0'
 Error_exporting_to_clipboard=Erreur_lors_de_l'exportation_vers_le_presse-papiers
 Error_in_field=Erreur_dans_le_champ
@@ -331,7 +318,6 @@ Error_opening_file=Erreur_lors_de_l'ouverture_du_fichier
 Error_setting_field=Erreur_de_configuration_du_champ
 Error_while_converting_BibtexEntry_to_XMP_%0=Erreur_lors_de_la_conversion_de_l'entr\u00e9e_BibTeX_en_XMP_%0
 Error_while_downloading_file\:=Erreur_lors_du_t\u00e9l\u00e9chargement_du_fichier_:
-Error_while_fetching_from_OIA2=Erreur_lors_de_la_recherche_OIA2
 Error_while_writing=Erreur_lors_de_l'\u00e9criture
 Error_writing_to_%0_file(s).=Erreur_lors_de_l'\u00e9criture_de_%0_fichier(s).
 Error_writing_XMP_to_file\:_%0=Erreur_lors_de_l'\u00e9criture_des_XMP_dans_le_fichier_%0
@@ -365,7 +351,6 @@ Field_names_are_not_allowed_to_contain_white_space_or_the_following_characters=L
 Field_sizes=Tailles_des_champs
 Field_to_filter=Champ_vers_filtre
 Field_to_group_by=Champ_\u00e0_grouper_par
-Fields=Champs
 File=Fichier
 file=fichier
 File_'%0'_is_already_open.=Le_fichier_'%0'_est_d\u00e9j\u00e0_ouvert.
@@ -481,17 +466,13 @@ Insert_selected_citations_into_LyX/Kile=Envoyer_les_citations_s\u00e9lectionn\u0
 Insert_selected_citations_into_WinEdt=Envoyer_les_citations_s\u00e9lectionn\u00e9es_dans_&WinEdt
 insert_string_=ins\u00e9rer_la_cha\u00eene
 Insert_URL=Ins\u00e9rer_l'URL
-integrity=int\u00e9grit\u00e9
 Integrity_check=V\u00e9rification_d'int\u00e9grit\u00e9
 Intersection=Intersection
 Invalid_BibTeX_key=Clef_BibTeX_invalide
 Invalid_date_format=Format_de_date_invalide
 Invalid_URL=URL_invalide
 Inverted=Compl\u00e9mentaire
-is_a_standard_type.=est_un_type_standard.
 ISO_abbreviation=Abr\u00e9viation_ISO
-Item_list_for_field=Liste_des_choix_pour_le_champ
-jabref=jabref
 JabRef_help=Aide_de_JabRef
 JabRef_preferences=Pr\u00e9f\u00e9rences_pour_JabRef
 Journal_abbreviations=Abr\u00e9viations_de_journaux
@@ -524,7 +505,6 @@ Listen_for_remote_operation_on_port=Ecouter_le_port_pour_des_op\u00e9rations_\u0
 Load_and_Save_preferences_from/to_jabref.xml_on_start-up_(memory_stick_mode)=Charger_et_enregistrer_les_pr\u00e9f\u00e9rences_de/vers_jabref.xml_au_d\u00e9marrage_(mode_clef_m\u00e9moire)
 Load_session=Charger_la_session
 Loading_session...=Chargement_de_la_session...
-localhost=localhost
 Look_and_feel=Apparence
 Looking_for_pdf...=Recherche_de_pdf...
 lower=minuscule
@@ -593,7 +573,6 @@ No_entries_found._Please_make_sure_you_are_using_the_correct_import_filter.=Pas_
 No_entries_found_for_the_search_string_'%0'=Pas_d'entr\u00e9e_pour_la_cha\u00eene_de_recherche_'%0'
 No_entries_imported.=Pas_d'entr\u00e9es_import\u00e9es.
 No_entries_or_multiple_entries_selected.=Pas_d'entr\u00e9e_s\u00e9lectionn\u00e9e_ou_s\u00e9lection_de_plusieurs_entr\u00e9es.
-No_entries_selected=Pas_d'entr\u00e9es_s\u00e9lectionn\u00e9es
 No_entries_selected.=Pas_d'entr\u00e9es_s\u00e9lectionn\u00e9es.
 No_exceptions_have_ocurred.=Aucune_exception_n'est_survenue.
 No_files_found.=Fichiers_non_trouv\u00e9s.
@@ -616,7 +595,6 @@ Nothing_to_redo=Rien_\u00e0_r\u00e9p\u00e9ter
 Nothing_to_undo=Rien_\u00e0_annuler
 Number_of_references_to_fetch?=Nombre_de_r\u00e9f\u00e9rences_\u00e0_r\u00e9cup\u00e9rer_?
 occurences=occurrences
-OK=OK
 Ok=Ok
 One_or_more_file_links_are_of_the_type_'%0',_which_is_undefined._What_do_you_want_to_do?=Un_ou_plusieurs_liens_de_fichier_sont_du_type_'%0',_qui_est_ind\u00e9fini._Que_voulez-vous_faire_?
 One_or_more_keys_will_be_overwritten._Continue?=Une_ou_plusieurs_clefs_seront_\u00e9cras\u00e9es._Continuer_?
@@ -667,12 +645,10 @@ PDF_directory=R\u00e9pertoire_PDF
 PDF_does_not_exist=Le_PDF_n'existe_pas
 Personal_journal_list=Liste_personnelle_de_journaux
 Plain_text_import=Importation_de_texte_brut
-Please_check_your_network_connection_to_this_machine.=SVP,_v\u00e9rifiez_votre_connexion_r\u00e9seau_\u00e0_cette_machine.
 Please_enter_a_name_for_the_group.=SVP,_entrez_un_nom_pour_le_groupe.
 Please_enter_a_search_term._For_example,_to_search_all_fields_for_<b>Smith</b>,_enter%c<p><tt>smith</tt><p>To_search_the_field_<b>Author</b>_for_<b>Smith</b>_and_the_field_<b>Title</b>_for_<b>electrical</b>,_enter%c<p><tt>author%esmith_and_title%eelectrical</tt>=SVP,_entrez_un_terme_\u00e0_recherche._Par_exemple,_pour_rechercher_<b>Smith</b>_dans_tout_les_champs,_entrez %c<p><tt>smith</tt><p>Pour_rechercher_<b>Smith</b>_dans_le_champ_<b>Author</b>_et_<b>\u00e9lectrique</b>_dans_le_c [...]
 Please_enter_the_field_to_search_(e.g._<b>keywords</b>)_and_the_keyword_to_search_it_for_(e.g._<b>electrical</b>).=SVP,_entrez_le_champ_de_recherche_(par_ex._<b>keywords</b>)_et_le_mot-clef_\u00e0_rechercher_(par_ex._<b>\u00e9lectrique</b>).
 Please_enter_the_string's_label=SVP,_entrez_le_nom_de_la_cha\u00eene
-Please_select_an_importer=S\u00e9lectionner_un_filtre_d'importation,_SVP
 Please_select_an_importer.=S\u00e9lectionner_un_filtre_d'importation,_SVP.
 Please_select_exactly_one_group_to_move.=SVP,_s\u00e9lectionnez_uniquement_un_groupe_\u00e0_d\u00e9placer.
 Please_specify_the_=Merci_de_sp\u00e9cifier_le_
@@ -742,7 +718,6 @@ Removed_group_"%0".=Groupe_"%0"_supprim\u00e9.
 Removed_group_"%0"_and_its_subgroups.=Groupe_"%0"_et_ses_sous-groupes_supprim\u00e9s.
 Removed_string=Cha\u00eene_supprim\u00e9e
 Renamed_string=Cha\u00eene_renomm\u00e9e
-Replace=Remplacer
 Replace_(regular_expression)=Remplacer_(expression_r\u00e9guli\u00e8re)_
 Replace_string=Remplacer_la_cha\u00eene
 Replace_with=Remplacer_par
@@ -758,7 +733,6 @@ Revert_to_original_source=R\u00e9tablir_le_contenu_initial
 Review=Remarques
 Review_changes=Revoir_les_changements
 Right=Droite
-root=root
 Save=Enregistrer
 Save_all_finished.=Enregistrement_de_tout_termin\u00e9e.
 Save_all_open_databases=Enregistrement_toutes_les_bases_ouvertes
@@ -779,17 +753,15 @@ Saving_all_databases...=Enregistrement_de_toutes_les_bases...
 Saving_database=Enregistrement_de_la_base_en_cours
 Scan=D\u00e9marrer
 Search=Recherche
-Search_All_Fields=Recherche_dans_tous_les_champs
 Search_all_fields=Recherche_dans_tous_les_champs
 Search_error=Erreur_de_recherche
 Search_expression=Expression_\u00e0_rechercher_
 Search_for=Rechercher
 Search_general_fields=Recherche_dans_les_champs_g\u00e9n\u00e9raux
 Search_IEEEXplore=Recherche_IEEEXplore
-Search_IEEExplore=Recherche_IEEExplore
 Search_optional_fields=Recherche_dans_les_champs_optionnels
 Search_required_fields=Recherche_dans_les_champs_requis
-Search_Specified_Field(s)=Recherche_dans_les_champs_sp\u00e9cifi\u00e9s
+Search_specified_field(s)=Recherche_dans_les_champs_sp\u00e9cifi\u00e9s
 Searched_database._Global_number_of_hits=Recherche_effectu\u00e9e._Nombre_total_de_r\u00e9sultats
 Searched_database._Number_of_hits=Recherche_effectu\u00e9e._Nombre_de_r\u00e9sultats_trouv\u00e9s
 Searching_for_%0_file=Recherche_de_%0
@@ -812,7 +784,6 @@ Select_matches=S\u00e9lectionner_les_correspondances
 Select_new_ImportFormat_Subclass=S\u00e9lectionner_une_nouvelle_sous-classe_ImportFormat
 Select_the_tree_nodes_to_view_and_accept_or_reject_changes=S\u00e9lectionner_les_noeuds_de_l'arborescence_pour_voir,_et_accepter_ou_rejeter,_les_modifications
 Selected_entries=Les_entr\u00e9es_s\u00e9lectionn\u00e9es
-Selector_enabled_fields=Champs_de_s\u00e9lecteur_actifs
 Server_Hostname_\:=Nom_de_l'h\u00f4te_du_serveur_:
 Server_Type_\:=Type_de_serveur_:
 Set_field=Configurer_le_champ
@@ -888,10 +859,8 @@ Target_file_cannot_be_a_directory.=Le_fichier_cible_ne_peut_pas_\u00eatre_un_r\u
 Tertiary_sort_criterion=Crit\u00e8re_tertiaire_de_tri
 Test=Test
 Text_Input_Area=Zone_de_saisie_du_texte
-The_#_character_is_not_allowed_in_BibTeX_fields=Le_caract\u00e8re_#_est_interdit_dans_un_champ_BibTeX
 The_chosen_date_format_for_new_entries_is_not_valid=Le_format_de_date_choisi_pour_les_nouvelles_entr\u00e9es_n'est_pas_valide
 The_chosen_encoding_'%0'_could_not_encode_the_following_characters\:_=L'encodage_'%0'_choisi_ne_peut_pas_encoder_les_caract\u00e8res_suivants_:_
-The_CiteSeer_fetch_operation_returned_zero_results.=La_recherche_CiteSeerX_n'a_retourn\u00e9_aucun_r\u00e9sultat.
 The_current_version_features_a_new_way_of_handling_links_to_external_files.<br>To_take_advantage_of_this,_your_links_must_be_changed_into_the_new_format,_and<br>JabRef_must_be_configured_to_show_the_new_links.=La_version_actuelle_a_une_nouvelle_fa\u00e7on_de_g\u00e9rer_les_liens_vers_des_fichiers_externes.<br>Pour_en_profiter,_vos_liens_doivent_\u00eatre_convertis_en_un_autre_format<br>et_JabRef_doit_\u00eatre_configur\u00e9_pour_afficher_les_nouveaux_liens.
 the_field_<b>%0</b>=le_champ_<b>%0</b>
 The_file<BR>'%0'<BR>has_been_modified<BR>externally!=Le_fichier<BR>'%0'<BR>a_\u00e9t\u00e9_modifi\u00e9_<BR>externalement !
@@ -906,7 +875,6 @@ The_search_is_case_insensitive.=La_recherche_n'est_pas_sensible_\u00e0_la_casse.
 The_search_is_case_sensitive.=La_recherche_est_sensible_\u00e0_la_casse.
 The_string_has_been_removed_locally=La_cha\u00eene_a_\u00e9t\u00e9_supprim\u00e9e_localement
 There_are_possible_duplicates_(marked_with_a_'D'_icon)_that_haven't_been_resolved._Continue?=Il_y_a_des_doublons_potentiels_(marqu\u00e9_avec_un_ic\u00f4ne_'D')_qui_n'ont_pas_\u00e9t\u00e9_trait\u00e9s._Continuer_?
-this_button_will_update=Ce_bouton_sera_mis_\u00e0_jour
 This_database_was_written_using_an_older_version_of_JabRef.=Cette_base_a_\u00e9t\u00e9_\u00e9crite_par_une_version_ant\u00e9rieure_de_JabRef.
 This_entry_has_no_BibTeX_key._Generate_key_now?=Cette_entr\u00e9e_n'a_pas_de_clef_BibTeX._En_g\u00e9n\u00e9rer_une_maintenant_?
 This_entry_is_incomplete=Cette_entr\u00e9e_est_incompl\u00e8te
@@ -918,12 +886,10 @@ This_group_contains_entries_in_which_any_field_contains_the_regular_expression_<
 This_group_contains_entries_in_which_any_field_contains_the_term_<b>%0</b>=Ce_groupe_contient_des_entr\u00e9es_dans_lesquelles_un_champ_contient_le_terme_<b>%0</b> 
 This_group_contains_entries_whose_<b>%0</b>_field_contains_the_keyword_<b>%1</b>=Ce_groupe_contient_des_entr\u00e9es_dont_le_champ_<b>%0</b>_contient_le_mot-clef_<b>%1</b> 
 This_group_contains_entries_whose_<b>%0</b>_field_contains_the_regular_expression_<b>%1</b>=Ce_groupe_contient_des_entr\u00e9es_dont_le_champ_<b>%0</b>_contient_l'expression_r\u00e9guli\u00e8re_<b>%1</b> 
-This_is_a_simple_copy_and_paste_dialog_for_import_some_fields_from_normal_text.=Ceci_est_simplement_une_fen\u00eatre_de_copier-coller_pour_importer_certains_champs_\u00e0_partir_d'un_texte_normal
 This_makes_JabRef_look_up_each_%0_link_and_check_if_the_file_exists._If_not,_you_will_be_given_options<BR>to_resolve_the_problem.=JabRef_cherche_chaque_%0_lien_et_v\u00e9rifie_si_le_fichier_existe._Si_non,_des_options_vous_seront_propos\u00e9es<BR>pour_r\u00e9soudre_le_probl\u00e8me.
 This_operation_requires_all_selected_entries_to_have_BibTex_keys_defined.=Cette_op\u00e9ration_n\u00e9cessite_que_toutes_les_entr\u00e9es_s\u00e9lectionn\u00e9es_aient_des_clefs_BibTeX_d\u00e9finies
 This_operation_requires_at_least_one_entry.=Cette_op\u00e9ration_n\u00e9cessite_au_moins_une_entr\u00e9e.
 This_operation_requires_one_or_more_entries_to_be_selected.=Cette_op\u00e9ration_n\u00e9cessite_qu'une_ou_plusieurs_entr\u00e9es_soient_s\u00e9lectionn\u00e9es.
-This_will_move_all_external_links_from_the_'pdf'_and_'ps'_fields_into_the_'%0'_field._Proceed?=Ceci_d\u00e9placera_tous_les_liens_externes_des_champs_'pdf'_et_'ps'_dans_le_champ_'%0'._Continuer_?
 To_set_up,_go_to_<B>Tools_->_Manage_journal_abbreviations</B>=Pour_configurer,_voir_<B>Options_->_G\u00e9rer_les_abr\u00e9viations_de_journaux</B>
 Toggle_abbreviation=Afficher/Masquer_l'abr\u00e9viation
 Toggle_entry_preview=Afficher/Masquer_l'aper\u00e7u
@@ -933,7 +899,6 @@ Try_different_encoding=Essayer_un_encodage_diff\u00e9rent
 Type_set_to_'other'=Type_configur\u00e9_comme_'other'_(autre)
 Unabbreviate_journal_names_of_the_selected_entries=D\u00e9velopper_les_noms_de_journaux_des_entr\u00e9es_s\u00e9lectionn\u00e9es
 Unabbreviated_%0_journal_names.=%0_noms_de_journaux_d\u00e9velopp\u00e9s.
-unable_to_access_LyX-pipe=Impossible_d'acc\u00e9der_au_canal_de_transmission_LyX
 Unable_to_create_graphical_interface=Impossible_de_cr\u00e9er_l'interface_graphique
 Unable_to_open_file.=Impossible_d'ouvrir_le_fichier
 Unable_to_open_link._The_application_'%0'_associated_with_the_file_type_'%1'_could_not_be_called.=Impossible_d'ouvrir_un_lien._L'application_'%0'_associ\u00e9e_avec_le_type_de_fichier_'%1'_n'a_pu_\u00eatre_appel\u00e9e.
@@ -958,7 +923,6 @@ untitled=sans_titre
 Up=Haut
 Update_to_current_column_widths=Figer_les_largeurs_actuelles_des_colonnes
 Updated_group_selection=S\u00e9lection_de_groupe_mise_\u00e0_jour
-Upgrade_external_links=Mettre_\u00e0_jour_les_liens_externes
 Upgrade_external_PDF/PS_links_to_use_the_'%0'_field.=Mettre_\u00e0_jour_les_liens_externes_PDF/PS_pour_utiliser_le_champ_'%0'.
 Upgrade_file=Mettre_\u00e0_jour_le_fichier
 Upgrade_old_external_file_links_to_use_the_new_feature=Mettre_\u00e0_jour_les_anciens_liens_vers_les_fichiers_externes_pour_utiliser_cette_nouvelle_fonction
@@ -967,16 +931,13 @@ UPPER=MAJUSCULE
 Upper_Each_First=Majuscule_Chaque_Premi\u00e8re
 Upper_first=Majuscule_premi\u00e8re
 usage=usage
-Use_antialiasing_font=Utiliser_une_police_liss\u00e9e
 Use_autocompletion_for_the_following_fields=Utiliser_l'auto-g\u00e9n\u00e9ration_pour_les_champs_suivants
-Use_custom_icon_theme=Utiliser_un_th\u00e8me_d'ic\u00f4nes_personnalis\u00e9
 Use_default_viewer=Utiliser_l'afficheur_par_d\u00e9faut
 Use_inspection_window_also_when_a_single_entry_is_imported.=Utiliser_la_fen\u00eatre_d'inspection_m\u00eame_quand_une_seule_entr\u00e9e_est_import\u00e9e.
 Use_native_file_dialog=Utiliser_le_s\u00e9lectionneur_de_fichiers_natif
 Use_other_look_and_feel=Utiliser_une_autre_apparence
 Use_Regular_Expression_Search=Utiliser_l'expression_r\u00e9guli\u00e8re_pour_la_recherche
 Use_regular_expressions=Utiliser_les_expressions_r\u00e9guli\u00e8res
-Use_the_following_delimiter_character(s)=Utiliser_le(s)_caract\u00e8re(s)_de_s\u00e9paration_suivant(s)
 Username_\:=Nom_d'utilisateur_:
 Value_cleared_externally=Valeur_supprim\u00e9e_externalement
 Value_set_externally=Valeur_param\u00e9tr\u00e9e_externalement_
@@ -1023,7 +984,6 @@ Your_new_key_bindings_have_been_stored.=Votre_nouvelle_affectation_de_touche_a_\
 The_following_fetchers_are_available\:=Les_outils_de_recherche_suivants_sont_disponible_:
 Could_not_find_fetcher_'%0'=L'outil_de_recherche_'%0'_n'a_pas_pu_\u00eatre_trouv\u00e9
 Running_Query_'%0'_with_fetcher_'%1'.=Execution_de_la_requ\u00eate_'%0'_avec_l'outil_de_recherche_'%1'.
-Please_wait!=Attendez_SVP_!
 Query_'%0'_with_fetcher_'%1'_did_not_return_any_results.=Le_requ\u00eate_'%0'_pour_l'outil_de_recherche_'%1'_n'a_retourn\u00e9_aucun_r\u00e9sultats.
 Open_SPIRES_entry=Ouvrir_l'entr\u00e9e_SPIRES
 Move/Rename_file=D\u00e9placer/Renommer_le_fichier
@@ -1031,7 +991,6 @@ File_moved=Fichier_d\u00e9plac\u00e9
 Move_file_failed=Echec_du_d\u00e9placement_du_fichier
 Could_not_move_file=Le_fichier_n'a_pas_pu_\u00eatre_d\u00e9plac\u00e9
 Could_not_find_file_'%0'.=Le_fichier_'%0'_n'a_pas_pu_\u00eatre_trouv\u00e9.
-Move/rename_file=D\u00e9placer/renommer_le_fichier
 Number_of_entries_successfully_imported=Nombre_d'entr\u00e9es_import\u00e9es_avec_succ\u00e8s
 Import_canceled_by_user=Importation_interrompue_par_l'utilisateur
 Progress\:_%0_of_%1=Progr\u00e8s_:_%0_de_%1
@@ -1133,11 +1092,9 @@ Version=Version
 Unknown=Inconnu
 Not_loaded=Non_charg\u00e9
 Loaded=Charg\u00e9
-Could_not_determine_version_of_=Echec_de_la_d\u00e9termination_de_la_version_de_
 Install_anyway?=Install\u00e9_quand_m\u00eame ?
 
 Looking_for_full_text_document...=T\u00e9l\u00e9chargement_du_document_cit\u00e9
-Follow_DOI_or_URL_link_and_try_to_locate_PDF_full_text_document=Suit_le_DOI_ou_le_lien_URL_et_tente_de_localiser_le_fichier_PDF_du_document_cit\u00e9
 Unable_to_find_full_text_article._No_search_algorithm_defined_for_the_'%0'_web_site.=Impossible_de_trouver_le_fichier_PDF_du_document_cit\u00e9._Aucun_algorithme_n'est_d\u00e9fini_pour_le_site_internet_'%0'.
 Found_pdf_link,_but_received_the_wrong_MIME_type._This_could_indicate_that_you_don't_have_access_to_the_fulltext_article.=Lien_PDF_trouv\u00e9,_mais_r\u00e9ception_d'un_mauvais_type_MIME._Cela_pourrait_indiquer_que_vous_n'avez_pas_acc\u00e8s_au_fichier_PDF_du_document_cit\u00e9.
 
@@ -1151,7 +1108,7 @@ Recover_from_autosave=R\u00e9cup\u00e9ration_\u00e0_partir_d'une_sauvegarde_auto
 Save_in_current_table_sort_order=Enregistrer_dans_l'ordre_de_tri_actuel_de_la_table
 Export_in_current_table_sort_order=Exporter_dans_l'ordre_de_tri_actuel_de_la_table
 Export_ordered_by_author/editor/year=Exporter_selon_l'ordre_author/editor/year
-Export_entries_in_their_original_order=Exporter_les_entr\u00e9es_dans_leur_l'ordre_original
+Export_entries_in_their_original_order=Exporter_les_entr\u00e9es_dans_leur_ordre_original
 Error_opening_file_'%0'.=Erreur_lors_de_l'ouverture_du_fichier_'%0'.
 Autosave_of_file_'%0'=Sauvegarde_automatique_du_fichier_'%0'
 Error_opening_autosave_of_'%0'._Trying_to_load_'%0'_instead.=Erreur_lors_de_la_sauvegarde_automatique_de_'%0'._A_la_place,_essai_d'ouverture_de_'%0'.
@@ -1185,8 +1142,6 @@ Before_saving,_please_edit_any_strings_containing_the_#_character.=Avant_l'enreg
 
 Save_without_backup?=Enregistrer_sans_sauvegarde_de_secours?
 Unable_to_create_backup=Impossible_de_cr\u00e9er_une_sauvegarde_de_secours
-
-File_directory_is_not_set_or_does_not_exist.=Le_r\u00e9pertoire_de_fichiers_n'est_pas_configur\u00e9_ou_n'existe_pas.
 Move_file_to_file_directory.=D\u00e9placer_le_fichier_vers_le_r\u00e9pertoire_de_fichiers.
 Rename_file_to=Renommer_le_fichier_en
 <b>All_Entries</b>_(this_group_cannot_be_edited_or_removed)=<b>Toutes_les_entr\u00e9es</b>_(ce_groupe_ne_peut_pas_\u00eatre_\u00e9dit\u00e9_ou_supprim\u00e9)
@@ -1197,7 +1152,7 @@ includes_subgroups=incluant_les_sous-groupes
 contains=contient
 search_expression=expression_de_recherche
 
-Disable_file_renaming_in_non-native_file_dialog=D\u00e9sactiver_le_renommage_des_fichiers_pour_les_fen\u00eatres_de_fichier_non-native
+Disable_file_renaming_in_non-native_file_dialog=D\u00e9sactiver_le_renommage_des_fichiers_pour_les_fen\u00eatres_de_fichier_non-natives
 File_dialog=Fen\u00eatre_de_fichiers
 No_entries_found._It_looks_like_you_do_not_have_access_to_search_JStor.=Pas_d'entr\u00e9es_trouv\u00e9es._Il_semble_que_vous_n'avez_pas_acc\u00e8s_\u00e0_la_recherche_JStor
 
@@ -1208,7 +1163,6 @@ Error_initializing_custom_export_format_from_string_'%0'=Erreur_lors_de_l'initia
 
 BibLaTeX_mode=mode_BibLaTeX
 Optional_fields_2=Champs_optionnels_2
-Please_wait=Patientez,_s'il_vous_pla\u00eet
 Waiting_for_save_operation_to_finish=Attente_de_la_fin_de_l'op\u00e9ration_de_sauvegarde
 Resolving_duplicate_BibTeX_keys...=Traitement_des_clefs_BibTeX_dupliqu\u00e9es...
 Finished_resolving_duplicate_BibTeX_keys._%0_entries_modified.=Traitement_des_clefs_BibTeX_dupliqu\u00e9es_termin\u00e9._%0_entr\u00e9es_modifi\u00e9es.
@@ -1221,7 +1175,6 @@ Duplicate_BibTeX_key=Clef_BibTeX_dupliqu\u00e9e
 Duplicate_key=Clef_dupliqu\u00e9e
 Generate_key=G\u00e9n\u00e9rer_une_clef
 Import_marking_color=Importer_les_couleurs_de_marquage
-%0_entries_found._To_reduce_server_load,_only_%1_will_be_downloaded._It_will_be_very_slow,_in_order_to_make_ACM_happy.=%0_entr\u00e9es_trouv\u00e9es._Pour_r\u00e9duire_la_charge_du_serveur,_seulement_%1_seront_t\u00e9l\u00e9charg\u00e9es._Cela_sera_tr\u00e8s_lent_pour_ne_pas_poser_de_probl\u00e8me_avec_ACM.
 BibTeX_importer=Filtres_d'importation_BibTeX
 Always_add_letter_(a,_b,_...)_to_generated_keys=Toujours_ajouter_une_lettre_(a,_b,_...)_aux_clefs_g\u00e9n\u00e9r\u00e9es
 
@@ -1238,7 +1191,6 @@ An_autosave_file_was_found_for_this_database._This_could_indicate_=Un_fichier_de
 that_JabRef_didn't_shut_down_cleanly_last_time_the_file_was_used.=que_JabRef_ne_s'est_pas_arr\u00e9t\u00e9_proprement_lors_de_la_derni\u00e8re_utilisation_de_ce_fichier.
 General_file_directory=R\u00e9pertoire_g\u00e9n\u00e9ral
 User-specific_file_directory=R\u00e9pertoire_sp\u00e9cifique_\u00e0_l'utilisateur
-Error_setting_look_and_feel=Erreur_dans_les_param\u00e8tres_d'apparence
 Search_failed\:_illegal_search_expression=Echec_de_la_recherche_:_Expression_de_recherche_ill\u00e9gale
 Show_ArXiv_column=Montrer_la_colonne_ArXiv
 <HTML>Unpack_the_zip_file_containing_import/export_filters_for_Endnote,<BR>for_optimal_interoperability_with_JabRef</HTML>=<HTML>D\u00e9compacter_le_fichier_zip_contenant_les_filtres_d'importation/exportation_pour_Endnote,<BR>pour_une_interop\u00e9rabilit\u00e9_optimale_avec_JabRef</HTML>
@@ -1255,7 +1207,6 @@ Create_entry_based_on_XMP_data=Cr\u00e9er_une_entr\u00e9e_bas\u00e9e_sur_les_don
 Create_entry_based_on_data_fetched_from=Cr\u00e9er_une_entr\u00e9e_bas\u00e9e_sur_les_donn\u00e9es_r\u00e9cup\u00e9r\u00e9es_depuis
 Create_blank_entry_linking_the_PDF=Cr\u00e9er_une_entr\u00e9e_vide_li\u00e9e_au_PDF
 Only_attach_PDF=Lier_uniquement_le_PDF
-Mr._dLib_Metadata_Entries_Associated_With\:=Entr\u00e9es_de_m\u00e9tadonn\u00e9es_Mr._dLib_associ\u00e9es_avec_:
 Mr._dLib_Metadata_Entries_Associated_With_PDF_File=Entr\u00e9es_de_m\u00e9tadonn\u00e9es_Mr._dLib_associ\u00e9e_avec_un_fichier_PDF
 Title=Titre
 Author(s)=Auteur(s)
@@ -1274,7 +1225,6 @@ Update_Existing_Entry=Mettre_\u00e0_jour_une_entr\u00e9e_existante
 Mr._dLib=Mr._dLib
 More_information=Plus_d'information
 Fetching_Metadata...=R\u00e9cup\u00e9ration_des_m\u00e9tadonn\u00e9es...
-Metadata=M\u00e9tadonn\u00e9es
 Autocomplete_names_in_'Firstname_Lastname'_format_only=Compl\u00e9tion_automatique_des_noms_uniquement_dans_le_format_'Pr\u00e9nom_Nom'
 Autocomplete_names_in_'Lastname,_Firstname'_format_only=Compl\u00e9tion_automatique_des_noms_uniquement_dans_le_format_'Nom,_Pr\u00e9nom'
 Autocomplete_names_in_both_formats=Compl\u00e9tion_automatique_des_noms_dans_les_2_formats
@@ -1282,14 +1232,12 @@ Marking_color_%0=Marquage_de_la_couleur_%0
 
 The_name_'comment'_can_not_be_used_as_an_entry_type_name.=Le_nom_'comment'_ne_peut_pas_\u00eatre_utilis\u00e9_comme_nom_de_type_d'entr\u00e9e.
 You_must_enter_an_integer_value_in_the_text_field_for=Vous_devez_entrer_une_valeur_enti\u00e8re_dans_le_champ_texte_pour
-File_directory=R\u00e9pertoire_de_fichiers
 Send_as_email=Exp\u00e9dier_par_courriel
 References=R\u00e9f\u00e9rences
 Sending_of_emails=Envoi_des_courriels
 Subject_for_sending_an_email_with_references=Sujet_pour_l'envoi_d'un_courriel_avec_des_r\u00e9f\u00e9rences
 Automatically_open_folders_of_attached_files=Ouvrir_automatiquement_les_r\u00e9pertoires_des_fichiers_attach\u00e9s
 Create_entry_based_on_content=Cr\u00e9er_une_entr\u00e9e_sur_la_base_du_contenu
-Store_choice_as_default=Enregistrer_comme_choix_par_d\u00e9faut
 Do_not_show_this_box_again_for_this_import=Ne_plus_afficher_cette_bo\u00eete_de_dialogue_pour_cette_importation
 Always_use_this_PDF_import_style_(and_do_not_ask_for_each_import)=Toujours_utiliser_ce_style_d'importation_PDF_(et_ne_plus_demander_\u00e0_chaque_importation)
 Error_creating_email=Erreur_lors_de_la_cr\u00e9ation_du_courriel
@@ -1315,7 +1263,6 @@ Extra_information_(e.g._page_number)=Informations_compl\u00e9mentaires_(ex_:_num
 Manage_citations=G\u00e9rer_les_citations
 Problem_modifying_citation=Probl\u00e8me_lors_de_la_modification_de_la_citation
 Citation=Citation
-Context=Context
 Extra_information=Informations_compl\u00e9mentaires
 Could_not_resolve_BibTeX_entry_for_citation_marker_'%0'.=L'entr\u00e9e_BibTeX_pour_la_marqueur_de_citation_'%0'_n'a_pas_pu_\u00eatre_trait\u00e9e.
 Styles=Styles
@@ -1341,12 +1288,10 @@ Combine_pairs_of_citations_that_are_separated_by_spaces_only=Combiner_les_paires
 Autodetection_failed=La_d\u00e9tection_automatique_a_\u00e9chou\u00e9e
 Connecting=Connexion_en_cours
 Please_wait...=Patientez_s'il_vous_plait...
-Unable_to_connect=Connexion_impossible
 Set_connection_parameters=D\u00e9finir_les_param\u00e8tres_de_connexion
 Path_to_OpenOffice_directory=Chemin_vers_le_r\u00e9pertoire_d'OpenOffice
 Path_to_OpenOffice_executable=Chemin_vers_l'ex\u00e9cutable_d'OpenOffice
 Path_to_OpenOffice_library_dir=Chemin_vers_le_r\u00e9pertoire_biblioth\u00e8que_d'OpenOffice
-Autodetect=D\u00e9tecter_automatiquement
 Connection_lost=Connexion_perdue
 The_paragraph_format_is_controlled_by_the_property_'ReferenceParagraphFormat'_or_'ReferenceHeaderParagraphFormat'_in_the_style_file.=Le_format_de_paragraphe_est_control\u00e9_par_le_propri\u00e9t\u00e9_'ReferenceParagraphFormat'_ou_'ReferenceHeaderParagraphFormat'_du_fichier_de_style.
 The_character_format_is_controlled_by_the_citation_property_'CitationCharacterFormat'_in_the_style_file.=Le_format_de_caract\u00e8res_est_control\u00e9_par_la_propri\u00e9t\u00e9_de_citation_'CitationCharacterFormat'_du_fichier_de_style.
@@ -1369,7 +1314,6 @@ JSTOR_import_cancelled=Importation_JSTOR_annul\u00e9e
 HTML_list=Liste_HTML
 Click_group_to_toggle_membership_of_selected_entries=Cliquer_sur_un_groupe_pour_inverser_l'appartenance_des_entr\u00e9es_s\u00e9lectionn\u00e9es
 Use_EMACS_23_insertion_string=Utiliser_la_cha\u00eene_d'insertion_d'EMACS_23
-Normalize_to_BibTeX_name_format=Normaliser_au_format_de_noms_BibTeX
 If_possible,_normalize_this_list_of_names_to_conform_to_standard_BibTeX_name_formatting=Si_possible,_normaliser_cette_liste_de_noms_afin_de_correspondre_au_formatage_des_noms_au_standard_BibTeX
 Could_not_open_%0=%0_n'a_pas_pu_\u00eatre_ouvert
 Unknown_import_format=Format_d'importation_inconnu
@@ -1378,7 +1322,6 @@ An_Error_occurred_while_fetching_from_INSPIRE_source_(%0)\:=Une_erreur_est_surve
 Error_while_fetching_from_Inspire\:_=Erreur_lors_d'une_recherche_sur_INSPIRE_:_
 Web_search=Recherche_web
 Autocomplete_names=Compl\u00e9tion_automatique_des_noms
-You_must_select_either_a_valid_style_file,_or_use_the_default_style.=Vous_devez_s\u00e9lectionner_soit_un_style_de_fichier_valide,_soit_utiliser_le_style_par_d\u00e9faut.
 Default_style=Style_par_d\u00e9faut
 Choose_style_file_directly=Choisir_directement_le_style_de_fichier_
 Choose_from_a_directory=Choisir_\u00e0_partir_d'un_r\u00e9pertoire_
@@ -1421,8 +1364,7 @@ Autocompletion_options=Options_de_la_compl\u00e9tion_automatique
 Autocomplete_after_following_number_of_characters=Compl\u00e9tion_automatique_apr\u00e8s_un_nombre_de_caract\u00e8res_\u00e9gal_\u00e0
 Name_format_used_for_autocompletion=Format_de_nom_utilis\u00e9_pour_la_compl\u00e9tion_automatique
 Treatment_of_first_names=Traitement_des_pr\u00e9noms
-No_icon_found_for_%0=Aucun_ic\u00f4ne_trouv\u00e9_pour_%0
-Cleanup_entries=Entr\u00e9es_nettoy\u00e9es
+Cleanup_entries=Nettoyage_des_entr\u00e9es
 Automatically_assign_new_entry_to_selected_groups=Assigner_automatiquement_les_nouvelles_entr\u00e9es_aux_groupes_s\u00e9lectionn\u00e9s
 Move_DOIs_from_note_and_URL_field_to_DOI_field_and_remove_http_prefix=D\u00e9placer_les_DOIs_des_champs_note_et_URL_vers_le_champ_DOI,_et_supprimer_le_prefix_http
 Format_content_of_month_field_to_#mon#=Formater_le_contenu_du_champ_mois_en_#mon#
@@ -1435,14 +1377,10 @@ Doing_a_cleanup_for_%0_entries...=Nettoyage_en_cours_pour_%0_entr\u00e9es...
 No_entry_needed_a_clean_up=Aucune_entr\u00e9e_ne_n\u00e9cessitait_un_nettoyage
 One_entry_needed_a_clean_up=Une_entr\u00e9e_n\u00e9cessitait_un_nettoyage
 %0_entries_needed_a_clean_up=%0_entr\u00e9es_n\u00e9cessitaient_un_nettoyage
-Imported_=Import\u00e9_
 Error_importing_from_database=Erreur_d'importation_\u00e0_partir_de_la_base_de_donn\u00e9es
 
 Minimize_to_system_tray=Minimiser_vers_la_barre_des_t\u00e2ches
 
-Incomplete_search_results=R\u00e9sultats_de_recherche_incomplets
-%0_entries_were_found,_but_only_%1_of_these_could_be_resolved.=%0_entr\u00e9es_ont_\u00e9t\u00e9_trouv\u00e9es,_mais_seulement_%1_ont_pu_\u00eatre_trait\u00e9es.
-
 Error_downloading_file_'%0'=Erreur_lors_du_t\u00e9l\u00e9chargement_du_fichier_'%0'
 Download_failed=Echec_du_t\u00e9l\u00e9chargement
 
@@ -1468,10 +1406,9 @@ Unable_to_clear_preferences.=Impossible_d'initialiser_la_configuration.
 
 Reset_preferences_(key1,key2,..._or_'all')=R\u00e9initialiser_la_configuration_(clef1,_clef2,..._ou_'toutes')
 Find_unlinked_files=Trouver_les_fichiers_non_li\u00e9s
-Select_All=Tout_s\u00e9lectionner
-Unselect_All=Tout_d\u00e9s\u00e9lectionner
-Expand_All=Tout_\u00e9tendre
-Collapse_All=Tout_masquer
+Unselect_all=Tout_d\u00e9s\u00e9lectionner
+Expand_all=Tout_\u00e9tendre
+Collapse_all=Tout_masquer
 Select_Directory=S\u00e9lectionner_un_r\u00e9pertoire
 Choose_Directory=Choisir_un_r\u00e9pertoire
 Use_the_selected_directory_to_start_with_the_search.=Utiliser_le_r\u00e9pertoire_s\u00e9lectionn\u00e9_pour_lancer_la_recherche.
@@ -1531,7 +1468,6 @@ Priority_medium=Priorit\u00e9_interm\u00e9diaire
 Quality=Qualt\u00e9
 Rank=Rang
 Relevance=Pertinence
-Set_priority=D\u00e9finir_la_priorit\u00e9
 Set_priority_to_high=D\u00e9finir_la_priorit\u00e9_comme_forte
 Set_priority_to_low=D\u00e9finir_la_priorit\u00e9_comme_faible
 Set_priority_to_medium=D\u00e9finir_la_priorit\u00e9_comme_interm\u00e9diaire
@@ -1553,7 +1489,7 @@ Toogle_quality_assured=Afficher/Masquer_la_qualit\u00e9_\u00e9valu\u00e9e
 Two_stars=Deux_\u00e9toiles
 Update_keywords=Mettre_\u00e0_jour_les_mots-clefs
 Write_values_of_special_fields_as_separate_fields_to_BibTeX=Ecrire_les_valeurs_des_champs_sp\u00e9ciaux_dans_des_champs_BibTeX_s\u00e9par\u00e9s
-You_have_changed_settings_for_special_fields.=Vous_avez_modifier_les_param\u00e8tres_pour_les_champs_sp\u00e9ciaux.
+You_have_changed_settings_for_special_fields.=Vous_avez_modifi\u00e9_les_param\u00e8tres_pour_les_champs_sp\u00e9ciaux.
 no_preview_available=Pr\u00e9visualisation_non_disponible
 
 %0_entries_found._To_reduce_server_load,_only_%1_will_be_downloaded.=%0_entr\u00e9es_trouv\u00e9es._Pour_r\u00e9duire_la_charge_du_serveur,_seulement_%1_seront_t\u00e9l\u00e9charg\u00e9es.
@@ -1563,7 +1499,6 @@ Correct_the_entry,_and_reopen_editor_to_display/edit_source.=Corrigez_l'entr\u00
 Could_not_connect_to_a_running_gnuserv_process._Make_sure_that_Emacs_or_XEmacs_is_running,<BR>and_that_the_server_has_been_started_(by_running_the_command_'server-start'/'gnuserv-start').=La_connexion_\u00e0_un_processus_gnuserv_actif_a_\u00e9chou\u00e9._Assurez-vous_que_Emacs_ou_XEmacs_soit_lanc\u00e9,<BR>et_que_le_serveur_a_\u00e9t\u00e9_d\u00e9marr\u00e9_(en_lan\u00e7ant_la_commande_'server-start'/'gnuserv-start').
 Could_not_connect_to_running_OpenOffice.\nMake_sure_you_have_installed_OpenOffice_with_Java_support.\nIf_connecting_manually,_please_verify_program_and_library_paths.\n\nError_message\:_=La_connexion_\u00e0_OpenOffice_n'a_pas_pu_\u00eatre_lanc\u00e9e.\nAssurez-vous_qu'OpenOffice_est_install\u00e9_avec_le_support_Java.\\nEn_cas_de_connexion_manuelle,_v\u00e9rifiez_les_chemins_du_programme_et_de_la_biblioth\u00e8que.\n\nMessage_d'erreur_\:_
 Created_group_"%0".=Groupe_"%0"_cr\u00e9\u00e9.
-File_has_been_updated_externally._Are_you_sure_you_want_to_save?=Le_fichier_a_\u00e9t\u00e9_mis_\u00e0_jour_par_ailleurs._Etes-vous_s\u00fbr_que_vous_voulez_sauver_?
 If_a_pasted_or_imported_entry_already_has_the_field_set,_overwrite.=Si_une_entr\u00e9e_coll\u00e9e_ou_import\u00e9e_a_le_champ_d\u00e9j\u00e0_param\u00e9tr\u00e9,_\u00e9craser.
 Import_Metadata_From_PDF=Importer_les_m\u00e9ta-donn\u00e9es_\u00e0_partir_du_PDF
 Not_connected_to_any_Writer_document._Please_make_sure_a_document_is_open,_and_use_the_'Select_Writer_document'_button_to_connect_to_it.=Pas_de_connexion_\u00e0_un_document_Writer._S'il_vous_plait,_assurez-vous_qu'un_document_est_ouvert_et_utiliser_le_bouton_'S\u00e9lectionner_un_document_Writer'_pour_vous_y_connecter.
@@ -1598,4 +1533,62 @@ An_Error_occurred_while_parsing_abstract=Une_erreur_est_survenue_pendant_le_trai
 Unknown_DiVA_entry\:_'%0'.=Entr\u00e9e_DiVA_inconnue\:_'%0'.
 Get_BibTeX_entry_from_DiVA=Obtenir_l'entr\u00e9e_BibTeX_\u00e0_partir_de_DiVA
 Log=Message
-Remove_unneccessary_$,_{,_and_}=Suppression_des_$,_{,_et_}_inutiles
+
+ISO_690=ISO_690
+
+Add_brackets_and_replace_separators_with_their_non-breaking_version_for_units=Ajouter_des_crochets_et_remplacer_les_s\u00e9parateurs_par_leur_version_non_interruptible_pour_les_unit\u00e9s
+Add_new_entry_and_keep_both_old_entries=Ajouter_une_nouvelle_entr\u00e9e_et_conserver_les_deux_anciennes_entr\u00e9es
+Cancelled_merging_entries=Fusion_des_entr\u00e9es_interrompues
+Error_in_entry=Erreur_dans_l'entr\u00e9e
+First_entry=Premi\u00e8re_entr\u00e9e
+Format_units_by_adding_non-breaking_separators_and_keeping_the_correct_case_on_search=Formatter_les_unit\u00e9s_en_ajouter_des_s\u00e9parateurs_non_interruptibles_et_conserver_la_casse_correcte_pour_la_recherche
+Merge_entries=Fusionner_les_entr\u00e9es
+Merged_entries_into_a_new_and_kept_the_old=Entr\u00e9es_fusionn\u00e9es_dans_une_nouvelle_et_anciennes_conserv\u00e9es
+Merged_entries_into_a_new_and_removed_the_old=Entr\u00e9es_fusionn\u00e9es_dans_une_nouvelle_et_anciennes_supprim\u00e9es
+Merged_entry=Entr\u00e9e_fusionn\u00e9e
+None=Aucune
+Parse=Analyser
+Remove_unneccessary_$,_{,_and_}_and_move_adjacent_numbers_into_equations=Supprimer_les_$,_{,_et_}_inutiles_et_d\u00e9placer_les_nombres_adjacents_dans_des_\u00e9quations
+Replace_old_entries_with_new_entry=Remplacer_les_anciennes_entr\u00e9es_par_la_nouvelle
+Result=R\u00e9sultat
+Second_entry=Deuxi\u00e8me_entr\u00e9e
+Show_DOI_first=Montrer_le_DOI_en_premier
+Show_URL_first=Montrer_l'URL_en_premier
+Use_1st=Utiliser_le_premier
+Use_2nd=Utiliser_le_second
+Use_Emacs_key_bindings=Utiliser_les_raccourcis_clavier_d'Emacs
+You_have_to_choose_exactly_two_entries_to_merge.=Vous_devez_choisir_exactement_deux_entr\u00e9es_\u00e0_fusionner.
+
+Update_timestamp_on_modification=Mettre_\u00e0_jour_l'horodatage_en_cas_de_modification
+change_field=modifier_un_champ
+
+All_key_bindings_will_be_reset_to_their_defaults.=Tous_les_raccourcis_clavier_seront_r\u00e9initialis\u00e9s_\u00e0_leurs_valeurs_par_d\u00e9faut.
+Automatically_set_file_links=Configurer_automatiquement_les_liens_de_fichier
+Continue?=Continuer_?
+Resetting_all_key_bindings=R\u00e9initialisation_de_tous_les_raccourcis_clavier
+Save_entries_ordered_by_title=Enregistrement_les_entr\u00e9es_par_ordre_de_titre
+Export_entries_ordered_by_title=Exporter_les_entr\u00e9es_par_ordre_de_titre
+Quotes=Guillemets
+Curly_Brackets=Parenth\u00e8ses
+Include_empty_fields=Inclure_les_champs_vides
+Field_saving_options=Options_d'enregistrement_des_champs
+Field_value_delimiter._E.g.,_"author\={x}"_or_"author\='x'"=D\u00e9limiteur_de_valeur_d'un_champ._Par_ex.,_"author={x}"_ou_"author='x'"
+Run_Unicode_converter_on_title,_author(s),_and_abstract=Lancer_le_convertisseur_Unicode_sur_le_titre,_le(s)_auteur(s),_et_le_r\u00e9sum\u00e9
+
+Database_has_changed._Do_you_want_to_save_before_closing?=La_base_de_donn\u00e9es_a_\u00e9t\u00e9_modifi\u00e9e._Voulez-vous_l'enregistrer_avant_fermeture_?
+Host=Ordinateur_h\u00f4te
+Invalid_setting=Param\u00e9trage_invalide
+Network=R\u00e9seau
+Please_specify_both_hostname_and_port=Entrez_\u00e0_la_fois_le_nom_de_l'ordinateur_h\u00f4te_et_le_port,_s'il_vous_plait
+Port=Port
+Start_field_contents_in_same_column=D\u00e9marrer_les_contenus_du_champ_dans_une_m\u00eame_colonne
+Use_camel_case_for_field_names_(e.g.,_"HowPublished"_instead_of_"howpublished")=Utiliser_des_majuscules_interm\u00e9diaires_pour_les_noms_de_champ_(par_ex.,_"HowPublished"_au_lieu_de_"howpublished")
+Use_custom_proxy_configuration=Utiliser_une_configuration_de_proxy_personnalis\u00e9e
+Clear_connection_settings=R\u00e9initialiser_les_param\u00e8tres_de_connexion
+Cleared_connection_settings.=Param\u00e8tres_de_connexion_r\u00e9initialis\u00e9s.
+Rebind_C-a,_too=
+
+Show_number_of_elements_contained_in_each_group=
+
+Open_folder=
+Opened_%0_folder(s).=
diff --git a/src/resource/JabRef_in.properties b/src/resource/JabRef_in.properties
index aaff48e..b8c94dd 100644
--- a/src/resource/JabRef_in.properties
+++ b/src/resource/JabRef_in.properties
@@ -104,7 +104,6 @@ Background_color_for_optional_fields=Latar_bidang_tambahan
 Background_color_for_required_fields=Latar_bidang_utama
 Backup_old_file_when_saving=Cadangan_berkas_lama_ketika_menyimpan
 Beta_version=Versi_Beta
-Bibkey_to_filename_conversion=Konversi_Bibkey_ke_nama_berkas
 BibTeX_key=Kunci_BibTeX
 BibTeX_key_is_unique.=Kunci_BibTeX_tidak_boleh_sama.
 BibTeX_key_not_set._Enter_a_name_for_the_downloaded_file=Kunci_BibTeX_belum_ditentukan._Tulis_nama_untuk_berkas_muat_turun
@@ -114,7 +113,6 @@ Binding=Gabung
 Broken_link=Tautan_rusak
 Browse=Jelajah
 by=oleh
-Calling_external_viewer...=Memanggil_penampil_eksternal
 Cancel=Batal
 Cannot_add_entries_to_group_without_generating_keys._Generate_keys_now?=Tidak_bisa_menambah_entri_ke_grup_tanpa_membuat_kunci._Membuat_kunci_sekarang?
 Cannot_merge_this_change=Tidak_bisa_menggagung_perubahan_ini
@@ -167,7 +165,6 @@ Command_line_id=id_perintah_baris
 Complete_record=Selesai_merekam
 Connect=Menghubungi
 Connect_to_SQL_database=Menghubungi_basisdata_SQL
-Connect_to_SQL_Database=Menghubungi_Basisdata_SQL
 Connection_to_IEEEXplore_failed=Koneksi_ke_IEEEXplore_gagal
 Contained_in=Terkandung_di
 Content=Isi
@@ -181,8 +178,6 @@ Copy_file_to_file_directory.=Salin_berkas_ke_direktori_berkas.
 Copy_files_to_file_directory.=Salin_berkas_ke_direktori_berkas.
 Copy_to_clipboard=Salin_ke_papan_klip
 Could_not_call_executable=Tidak_bisa_memanggil_yang_bisa_dijalankan
-Could_not_connect_to_a_running_gnuserv_process._Make_sure_that_Emacs_or_XEmacs_is_running,<BR>and_that_the_server_has_been_started_(by_running_the_command_'gnuserv-start').=Tidak_bisa_menghubungi_ke_proses_gnuserv_yang_berjalan._Pastikan_Emacs_atau_XEmacs_sedang_berjalan,<BR>dan_server_sudah_dijalankan_(dengan_perintah_'gnuserv-start').
-Could_not_connect_to_host_=Tidak_bisa_menghubungi_host
 Could_not_connect_to_Vim_server._Make_sure_that_Vim_is_running<BR>with_correct_server_name.=Tidak_bisa_menghubungi_server_Vim._Pastikan_Vim_sedang_berjalan<BR>dengan_nama_server_yang_sah.
 Could_not_export_file=Tidak_bisa_ekspor_berkas
 Could_not_export_preferences=Tidak_bisa_ekspor_preferensi
@@ -200,15 +195,12 @@ Could_not_print_preview=Tidak_bisa_mencetak_pratampilan
 Could_not_run_the_'vim'_program.=Tidak_bisa_menjalankan_program_'vim'.
 Could_not_save_file=Tidak_bisa_membuka_berkas
 Could_not_save_file._Character_encoding_'%0'_is_not_supported.=Tidak_bisa_menyimpan_berkas._Enkoding_karakter_'%0'_tidak_didukung.
-Create_group=Membuat_grup
 Created_groups.=Grup_dibuat.
 crossreferenced_entries_included=entri_referensi_silang_diikutkan
 Current_content=Isi_sekarang
 Current_value=Angka_sekarang
 Custom_entry_types=Tipe_entri_suaian
 Custom_entry_types_found_in_file=Tipe_entri_suaian_ditemukan_dalam_berkas
-Custom_icon_theme=Tema_ikon_suaian
-Custom_icon_theme_file=Berkas_tema_ikon_suaian_
 Custom_importers=Pengimpor_atursendiri
 Customize_entry_types=Tipe_entri_ubahsuai
 Customize_key_bindings=Ubahsuai_kunci_gabungan
@@ -218,7 +210,6 @@ cut_entry=potong_entri
 Cut_pr=Potong_pr
 Database_\:=Basisdata_\:
 Database_encoding=Enkoding_basisdata
-Database_has_changed._Do_you_want_to_save_before_closing?=Basisdata_sudah_berubah._Apakah_ingin_menyimpan_sebelum_menutup?
 Database_properties=Properti_basisdata
 Date_format=Format_tanggal
 Default=Bawaan
@@ -271,8 +262,6 @@ Download_file=Muaturun_berkas
 Downloading...=Sedang_muaturun...
 Drag_and_Drop_Error=Kesalahan_Seret_dan_Letak
 Drop_%0=Letakkan_%0
-duplicate_BibTeX_key=kunci_BibTeX_sama
-Duplicate_BibTeX_key.=Kunci_BibTeX_sama.
 Duplicate_BibTeX_key._Grouping_may_not_work_for_this_entry.=Kunci_BibTeX_sama._Entri_ini_tidak_bisa_untuk_grup.
 Duplicate_Key_Warning=Peringatan_Kunci_Sama
 Duplicate_pairs_found=Ditemukan_pasangan_sama
@@ -295,10 +284,8 @@ Edit_preamble=Sunting_preamble
 Edit_strings=Sunting_string
 Editor_options=Pilihan_Penyunting
 empty_BibTeX_key=kunci_BibTeX_kosong
-Empty_BibTeX_key.=Kinci_BibTeX_kosong.
 Empty_BibTeX_key._Grouping_may_not_work_for_this_entry.=Kunci_BibTeX_kosong._Grup_tidak_bisa_menggunakan_entri_ini.
 empty_database=basisdata_kosong
-Enable_source_editing=Aktifkan_penyuntingan_sumber
 Enable_word/name_autocompletion=Otomatis_melengkapi_kata/nama
 Endnote=Endnote
 Enter_URL=Tulis_URL
@@ -320,7 +307,7 @@ Entry_type_names_are_not_allowed_to_contain_white_space_or_the_following_charact
 Entry_types=Tipe_entri
 Error=Kesalahan
 Error\:_=Kesalahan\:_
-Error_converting_Bibtex_to_XMP\:_%0=Kesalahan_merubah_Bibtex_ke_XMP:_%0
+Error_converting_BibTeX_to_XMP\:_%0=Kesalahan_merubah_Bibtex_ke_XMP:_%0
 Error_converting_XMP_to_'%0'...=Kesalahan_merubah_XMP_ke_'%0'...
 Error_exporting_to_clipboard=Kesalahan_mengekspor_ke_papan_klip
 Error_in_field=Kesalahan_dalam_bidang
@@ -330,7 +317,6 @@ Error_opening_file=Kesalahan_ketika_membuka_berkas
 Error_setting_field=Kesalahan_pengaturan_bidang
 Error_while_converting_BibtexEntry_to_XMP_%0=Kesalahan_ketika_merubah_BibtexEntry_ke_XMP_%0
 Error_while_downloading_file\:=Kesalahan_ketika_muaturun_berkas\:
-Error_while_fetching_from_OIA2=Kesalahan_ketika_mengambil_dari_OIA2
 Error_while_writing=Kesalahan_ketika_menulis
 Error_writing_to_%0_file(s).=Kesalahan_menulis_ke_berkas_%0.
 Error_writing_XMP_to_file\:_%0=Kesalahan_ketika_menulis_XMP_ke_berkas\:_%0
@@ -364,7 +350,6 @@ Field_names_are_not_allowed_to_contain_white_space_or_the_following_characters=N
 Field_sizes=Ukuran_bidang
 Field_to_filter=Bidang_ditapis
 Field_to_group_by=Bidang_ke_grup_berdasar
-Fields=Bidang
 File=Berkas
 file=berkas
 File_'%0'_is_already_open.=Berkas_'%0'_sudah_dibuka
@@ -480,17 +465,13 @@ Insert_selected_citations_into_LyX/Kile=Sisipkan_acuan_pilihan_ke_LyX/Kile
 Insert_selected_citations_into_WinEdt=Sisipkan_acuan_pilihan_ke_WinEdt
 insert_string_=sisipkan_string_
 Insert_URL=Sisipkan_URL
-integrity=integritas
 Integrity_check=periksa_integritas
 Intersection=Interseksi
 Invalid_BibTeX_key=Kunci_BibTeX_salah
 Invalid_date_format=Format_hari_salah
 Invalid_URL=URL_salah
 Inverted=Dibalik
-is_a_standard_type.=adalah_tipe_standar.
 ISO_abbreviation=Singkatan_ISO
-Item_list_for_field=daftar_item_untuk_bidang
-jabref=jabref
 JabRef_help=Petunjuk_menggunakan_JabRef
 JabRef_preferences=Preferensi_JabRef
 Journal_abbreviations=Singkatan_nama_Jurnal
@@ -523,7 +504,6 @@ Listen_for_remote_operation_on_port=Menggunakan_operasi_jarak_jauh_pada_port
 Load_and_Save_preferences_from/to_jabref.xml_on_start-up_(memory_stick_mode)=Muat_dan_Simpan_preferensi_dari/ke_jabref.xml_ketika_memulai_(mode_pena_simpan)
 Load_session=Sesi_muat
 Loading_session...=Sesi_pemuatan...
-localhost=host_lokal
 Look_and_feel=Penampilan_artistik
 Looking_for_pdf...=Sedang_mencari_pdf...
 lower=bawah
@@ -592,7 +572,6 @@ No_entries_found._Please_make_sure_you_are_using_the_correct_import_filter.=Entr
 No_entries_found_for_the_search_string_'%0'=Tidak_adan_entri_ditemukan_untuk_pencarian_string_'%0'
 No_entries_imported.=Tidak_ada_entri_yang_diimpor.
 No_entries_or_multiple_entries_selected.=Tidak_ada_satu_entri_pun_yang_dipilih.
-No_entries_selected=Tidak_ada_entri_yang_dipilih
 No_entries_selected.=Tidak_ada_entri_yang_dipilih.
 No_exceptions_have_ocurred.=Tidak_ada_perkecualian_yang_terjadi.
 No_files_found.=Berkas_tidak_ditemukan.
@@ -615,7 +594,6 @@ Nothing_to_redo=Tidak_ada_yang_dibatalkan
 Nothing_to_undo=Tidak_ada_yang_dikembalikan
 Number_of_references_to_fetch?=Nomor_referensi_yang_diambil?
 occurences=kali
-OK=OK
 Ok=Ok
 One_or_more_file_links_are_of_the_type_'%0',_which_is_undefined._What_do_you_want_to_do?=Satu_atau_lebih_tautan_berkas_dari_tipe_'%0',_yang_tidak_didefinisikan._Apa_yang_anda_inginkan?
 One_or_more_keys_will_be_overwritten._Continue?=Satu_atau_lebih_kunci_akan_ditindih._Teruskan?
@@ -666,12 +644,10 @@ PDF_directory=Lokasi_PDF
 PDF_does_not_exist=PDF_tidak_ada
 Personal_journal_list=Daftar_jurnal_pribadi
 Plain_text_import=Impor_teks_normal
-Please_check_your_network_connection_to_this_machine.=Mohon_periksa_koneksi_jaringan_ke_mesin_ini.
 Please_enter_a_name_for_the_group.=Tuliskan_nama_untuk_grup.
 Please_enter_a_search_term._For_example,_to_search_all_fields_for_<b>Smith</b>,_enter%c<p><tt>smith</tt><p>To_search_the_field_<b>Author</b>_for_<b>Smith</b>_and_the_field_<b>Title</b>_for_<b>electrical</b>,_enter%c<p><tt>author%esmith_and_title%eelectrical</tt>=Tuliskan_kata_pencarian._Contoh,_untuk_mencari_di_semua_bidang_<b>Smith</b>,_tulis%c<p><tt>smith</tt><p>Untuk_mencari_pada_bidang_<b>Author</b>_untuk_<b>Smith</b>_dan_pada_bidang_<b>Title</b>_untuk_<b>electrical</b>,_tulis%c<p><t [...]
 Please_enter_the_field_to_search_(e.g._<b>keywords</b>)_and_the_keyword_to_search_it_for_(e.g._<b>electrical</b>).=Tulis_bidang_pencarian_(misal_<b>keywords</b>)_dan_katakunci_untuk_mencari_(misal_<b>electrical</b>).
 Please_enter_the_string's_label=Tuliskan_label_string
-Please_select_an_importer=Silahkan_pilih_pengimpor
 Please_select_an_importer.=Silahkan_pilih_pengimpor.
 Please_select_exactly_one_group_to_move.=Silahkan_pilih_satu_grup_yang_akan_dipindah.
 Please_specify_the_=Silahkan_nyatakan_
@@ -741,7 +717,6 @@ Removed_group_"%0".=Hapus_grup_"%0".
 Removed_group_"%0"_and_its_subgroups.=Hapus_grup_"%0"_dan_sub-grup_nya.
 Removed_string=Hapus_string
 Renamed_string=Ganti_nama_string
-Replace=Ganti
 Replace_(regular_expression)=Ganti_(ekspresi_reguler)
 Replace_string=Ganti_string
 Replace_with=Ganti_dengan
@@ -757,7 +732,6 @@ Revert_to_original_source=Kembalikan_ke_sumber_asli
 Review=Periksa_ulang
 Review_changes=Periksa_ulang_perubahan
 Right=Kanan
-root=root
 Save=Simpan
 Save_all_finished.=Simpan_semua_selesai.
 Save_all_open_databases=Simpan_semua_basisdata_yang_dibuka
@@ -778,17 +752,15 @@ Saving_all_databases...=Menyimpan_semua_basisdata...
 Saving_database=Menyimpan_basisdata
 Scan=Pindai
 Search=Cari
-Search_All_Fields=Pencarian_Semua_Bidang
 Search_all_fields=Pencarian_semua_bidang
 Search_error=Kesalahan_pencarian
 Search_expression=Ekspresi_pencarian
 Search_for=Mencari
 Search_general_fields=Mencari_bidang_umum
 Search_IEEEXplore=Pencarian_IEEEXplore
-Search_IEEExplore=Pencarian_IEEEXplore
 Search_optional_fields=Pencarian_bidang_tambahan
 Search_required_fields=Pencarian_bidang_utama
-Search_Specified_Field(s)=Pencarian_Bidang_Tertentu
+Search_specified_field(s)=Pencarian_Bidang_Tertentu
 Searched_database._Global_number_of_hits=Basisdata_dicari._Jumlah_hit_global
 Searched_database._Number_of_hits=Basisdata_dicari._Jumlah_hit
 Searching_for_%0_file=Mencari_berkas_%0
@@ -811,7 +783,6 @@ Select_matches=Pilih_matches
 Select_new_ImportFormat_Subclass=Pilih_ImportFormat_Subclass_baru
 Select_the_tree_nodes_to_view_and_accept_or_reject_changes=Pilih_tiga_nodal_untuk_melihat,_menerima_atau_menolak_perubahan
 Selected_entries=Entri_pilihan
-Selector_enabled_fields=Pemilih_entri_aktif
 Server_Hostname_\:=Nama_Host_Server_\:
 Server_Type_\:=Tipe_Server_\:
 Set_field=Pilih_bidang
@@ -887,10 +858,8 @@ Target_file_cannot_be_a_directory.=Berkas_target_tidak_boleh_nama_folder
 Tertiary_sort_criterion=Kriteria_ketiga
 Test=Coba_lihat
 Text_Input_Area=Area_Masukan_Teks
-The_#_character_is_not_allowed_in_BibTeX_fields=Karakter_#_tidak_diijinkan_dalam_bidang_BibTeX
 The_chosen_date_format_for_new_entries_is_not_valid=Format_hari_yang_dipilih_untuk_entri_baru_tidak_sah
 The_chosen_encoding_'%0'_could_not_encode_the_following_characters\:_=Enkoding_yang_dipilih_'%0'_tidak_bisa_digunakan_untuk_karakter_berikut\:_
-The_CiteSeer_fetch_operation_returned_zero_results.=Operasi_pengambilan_CiteSeerX_tidak_membuahkan_hasil.
 The_current_version_features_a_new_way_of_handling_links_to_external_files.<br>To_take_advantage_of_this,_your_links_must_be_changed_into_the_new_format,_and<br>JabRef_must_be_configured_to_show_the_new_links.=Versi_sekarang_mempunyaia_fitur_pengaturan_tautan_untuk_berkas_luar.<br>Untuk_memanfaatkan,_tautan_anda_harus_diubah_ke_format_baru,_dan<br>JabRef_di_konfigurasi_ulang_untuk_menampilkan_tautan.
 the_field_<b>%0</b>=bidang_<b>%0</b>
 The_file<BR>'%0'<BR>has_been_modified<BR>externally!=Berkas<BR>'%0'<BR>telah_diubah<BR>oleh_program_eksternal!
@@ -905,7 +874,6 @@ The_search_is_case_insensitive.=Pencarian_tidak_meperhitungkan_huruf_besar_kecil
 The_search_is_case_sensitive.=Pencarian_meperhitungkan_huruf_besar_kecil.
 The_string_has_been_removed_locally=String_sudah_dihapus_secara_lokal
 There_are_possible_duplicates_(marked_with_a_'D'_icon)_that_haven't_been_resolved._Continue?=Ada_kemungkinan_sama_(ditandai_dengan_ikon_'D')_yang_belum_diselesaikan._Teruskan?
-this_button_will_update=Tombol_ini_akan_memperbarui
 This_database_was_written_using_an_older_version_of_JabRef.=Basisdata_ini_ditulis_dengan_JabRef_versi_lama.
 This_entry_has_no_BibTeX_key._Generate_key_now?=Entri_ini_belum_mempunyai_kunci_BibTeX._Membuat_kunci_sekarang?
 This_entry_is_incomplete=Entri_belum_lengkap
@@ -917,12 +885,10 @@ This_group_contains_entries_in_which_any_field_contains_the_regular_expression_<
 This_group_contains_entries_in_which_any_field_contains_the_term_<b>%0</b>=Grup_ini_memiliki_entri_dimana_semua_bidang_mempunyai_istilah_<b>%0</>
 This_group_contains_entries_whose_<b>%0</b>_field_contains_the_keyword_<b>%1</b>=Grup_ini_memiliki_entri_dimana_bidang_<b>%0</b>_memiliki_katakunci_<b>%1</b>
 This_group_contains_entries_whose_<b>%0</b>_field_contains_the_regular_expression_<b>%1</b>=Grup_ini_memiliki_entri_dimana_bidang_<b>%0</b>_mempunyai_ekspresi_reguler_<b>%1</b>
-This_is_a_simple_copy_and_paste_dialog_for_import_some_fields_from_normal_text.=Ini_hanyalah_dialog_sederhana_salin_dan_tempelkan_untuk_impor_beberapa_beidang_dari_teks_normal.
 This_makes_JabRef_look_up_each_%0_link_and_check_if_the_file_exists._If_not,_you_will_be_given_options<BR>to_resolve_the_problem.=Ini_membuat_JabRef_mencari_disemua_tautan_%0_dan_memeriksa_apakah_ada_berkas._Jika_tidak,_anda_diberi_pilihan_<BR>untuk_mengatasi_masalah.
 This_operation_requires_all_selected_entries_to_have_BibTex_keys_defined.=Operasi_ini_memerlukan_semua_entri_mempunyai_kunci_BibTeX.
 This_operation_requires_at_least_one_entry.=Operasi_ini_memerlukan_paling_tidak_satu_entri.
 This_operation_requires_one_or_more_entries_to_be_selected.=Operasi_ini_memerlukan_satu_atau_lebih_entri_yang_dipilih.
-This_will_move_all_external_links_from_the_'pdf'_and_'ps'_fields_into_the_'%0'_field._Proceed?=Ini_akan_memindah_semua_tautan_eksternal_dari_bidang_'pdf'_dan_'ps'_ke_bidang_'%0'._Diteruskan?
 To_set_up,_go_to_<B>Tools_->_Manage_journal_abbreviations</B>=Untuk_mengatur,_dari_<B>AlatBantuan_->_Pengaturan_singkatan_jurnal</B>
 Toggle_abbreviation=Gunakan_singkatan
 Toggle_entry_preview=Gunakan_pratampilan_entri
@@ -932,7 +898,6 @@ Try_different_encoding=Coba_enkoding_lain
 Type_set_to_'other'=Ubah_tipe_ke_'lainnya'
 Unabbreviate_journal_names_of_the_selected_entries=Nama_jurnal_tidak_disingkat_dari_entri_pilihan
 Unabbreviated_%0_journal_names.=%0_nama_jurnal_tidak_disingkat.
-unable_to_access_LyX-pipe=tidak_bisa_berhubungan_dengan_pipa_LyX
 Unable_to_create_graphical_interface=Tidak_bisa_membuat_antarmuka_grafik
 Unable_to_open_file.=Tidak_bisa_membuka_berkas.
 Unable_to_open_link._The_application_'%0'_associated_with_the_file_type_'%1'_could_not_be_called.=Tidak_bisa_membuka_tautan._Aplikasi_'%0'_yang_berkaitan_dengan_berkas_tipe_'%0'_tidak_bisa_dimuat.
@@ -957,7 +922,6 @@ untitled=tanpa_judul
 Up=Naik
 Update_to_current_column_widths=Perbarui_sesuai_lebar_kolom_sekarang
 Updated_group_selection=Pilihan_grup_diperbarui
-Upgrade_external_links=Naiktaraf_tautan_eksternal
 Upgrade_external_PDF/PS_links_to_use_the_'%0'_field.=Perbarui_tautan_eksternal_PDF/PS_untuk_digunakan_bidang_'%0'.
 Upgrade_file=Naiktaraf_berkas
 Upgrade_old_external_file_links_to_use_the_new_feature=Naiktaraf_tautan_berkas_eksternal_lama_untuk_digunakan_di_fitur_baru
@@ -966,16 +930,13 @@ UPPER=ATAS
 Upper_Each_First=Utamakan_setiap_atas
 Upper_first=Dahulukan_atas
 usage=penggunaan
-Use_antialiasing_font=Gunakan_huruf_antialiasing
 Use_autocompletion_for_the_following_fields=Gunakan_otomatis_melengkapi_pada_bidang_berikut
-Use_custom_icon_theme=Gunakan_tema_ikon_atursendiri
 Use_default_viewer=Gunakan_penampil_bawaan
 Use_inspection_window_also_when_a_single_entry_is_imported.=Gunakan_jendela_inspeksi_juga_untuk_entri_tunggal_impor
 Use_native_file_dialog=Gunakan_dialog_berkas_asli
 Use_other_look_and_feel=Gunakan_gaya_penampilan_lain
 Use_Regular_Expression_Search=Gunakan_ekspresi_pencarian_biasa
 Use_regular_expressions=Gunakan_ekspresi_reguler
-Use_the_following_delimiter_character(s)=Gunakan_karakter_pembatas_berikut
 Username_\:=Nama_pengguna_\:
 Value_cleared_externally=Isi_dihapus_dari_luar
 Value_set_externally=Isi_diatur_dari_luar
@@ -1022,7 +983,6 @@ Your_new_key_bindings_have_been_stored.=Gabungan_kunci_anda_sudah_disimpan.
 The_following_fetchers_are_available\:=Pengambil_berikut_tersedia\:
 Could_not_find_fetcher_'%0'=Tidak_bisa_menemukan_pengambil_'%0'
 Running_Query_'%0'_with_fetcher_'%1'.=Jalankan_Kueri_'%0'_dengan_pengambil_'%1'.
-Please_wait!=Mohon_tunggu!
 Query_'%0'_with_fetcher_'%1'_did_not_return_any_results.=Kueri_'%0'_dengan_pengambil_'%1'_tidak_ada_hasilnya.
 Open_SPIRES_entry=Buka_entri_SPIRES
 Move/Rename_file=Memindah/Menamai_berkas
@@ -1030,7 +990,6 @@ File_moved=Berkas_dipindah
 Move_file_failed=Gagal_memindah_berkas
 Could_not_move_file=Tidak_bisa_meindah_berkas
 Could_not_find_file_'%0'.=Tidak_bisa_menemukan_berkas_'%0'.
-Move/rename_file=Memindah/menamai_berkas
 Number_of_entries_successfully_imported=Jumlah_entri_yang_berhasil_diimpor
 Import_canceled_by_user=Impor_dibatalkan_oleh_pengguna
 Progress\:_%0_of_%1=Berlangsung:_%0_of_%1
@@ -1126,10 +1085,8 @@ Version=Versi
 Unknown=Tidak_dikenal
 Not_loaded=Tidak_dimuat
 Loaded=Dimuat
-Could_not_determine_version_of_=Tidak_bisa_menentukan_versi_dari_
 Install_anyway?=Tetap_pasang?
 Looking_for_full_text_document...=Sedang_mencari_dokumen_teks_lengkap...
-Follow_DOI_or_URL_link_and_try_to_locate_PDF_full_text_document=Ikuti_tautan_DOI_atau_URL_dan_temukan_dokumen_PDF_lengkap
 Unable_to_find_full_text_article._No_search_algorithm_defined_for_the_'%0'_web_site.=Tidak_bisa_menemukan_artikel_teks_lengkap._Tidak_ada_algoritma_pencarian_didefinisakn_untuk_situs_'%0'.
 Found_pdf_link,_but_received_the_wrong_MIME_type._This_could_indicate_that_you_don't_have_access_to_the_fulltext_article.=Menemukan_tautan_pdf,_tetapi_menerima_tipe_MIME_yang_salah._Menunjukkan_bahwa_anda_tidak_mempunyai_akses_artikel_teks_lengkap.
 Autosave=Simpan_otomatis
@@ -1169,7 +1126,6 @@ The_#_character_is_not_allowed_in_BibTeX_strings_unless_escaped_as_in_'\\#'.=Kar
 Before_saving,_please_edit_any_strings_containing_the_#_character.=Sebelum_menyimpan,_mohon_ubah_string_yang_mengandung_karakter_#.
 Save_without_backup?=Simpan_tanpa_cadangan?
 Unable_to_create_backup=Tidak_bisa_membuat_cadangan
-File_directory_is_not_set_or_does_not_exist.=Lokasi_berkas_belum_ditentukan_atau_tidak_ada.
 Move_file_to_file_directory.=Pindah_berkas_ke_direktori_berkas.
 Rename_file_to=Ganti_nama_berkas_menjadi
 <b>All_Entries</b>_(this_group_cannot_be_edited_or_removed)=<b>Semua_Entri</b>_(grup_ini_tidak_bisa_diubah_atau_dihapus)
@@ -1187,7 +1143,6 @@ Error_while_fetching_from_ScienceDirect=Kesalahan_ketika_mengambil_dari_ScienceD
 Error_initializing_custom_export_format_from_string_'%0'=Ada_kesalahan_menentukan_format_ekspor_atursendiri_dari_string_'%0'
 BibLaTeX_mode=Mode_BibLaTeX
 Optional_fields_2=Bidang_tambahan_2
-Please_wait=Mohon_tunggu
 Waiting_for_save_operation_to_finish=Menunggu_proses_menyimpan_selesai
 Resolving_duplicate_BibTeX_keys...=Mengatasi_masalah_kunci_BibTeX_sama...
 Finished_resolving_duplicate_BibTeX_keys._%0_entries_modified.=Selesai_mengatasi_masalah_kunci_BibTeX_sama._%0_entri_diubah.
@@ -1199,7 +1154,6 @@ Duplicate_BibTeX_key=kunci_BibTeX_sama
 Duplicate_key=Kunci_sama
 Generate_key=Membuat_kunci
 Import_marking_color=Tanda_impor
-%0_entries_found._To_reduce_server_load,_only_%1_will_be_downloaded._It_will_be_very_slow,_in_order_to_make_ACM_happy.=%0_entri_ditemukan._Untuk_mengurangi_beban,_hanya_%1_akan_dimuaturun._Akan_lambat,_agar_ACM_gembira.
 BibTeX_importer=Penimpor_BibTeX
 Always_add_letter_(a,_b,_...)_to_generated_keys=Selalu_tambah_huruf_(a,_b,_...)_untuk_kunci
 Ensure_unique_keys_using_letters_(a,_b,_...)=Pastikan_kunci_unik_dengan_huruf_(a,_b,_...)
@@ -1213,7 +1167,6 @@ An_autosave_file_was_found_for_this_database._This_could_indicate_=Berkas_hasil_
 that_JabRef_didn't_shut_down_cleanly_last_time_the_file_was_used.=bahwa_JabRef_tidak_ditutup_dengan_benar_waktu_menggunakan_berkas.
 General_file_directory=Direktori_berkas_umum
 User-specific_file_directory=Direktori_berkas_khusus_pengguna
-Error_setting_look_and_feel=Kesalahan_pengaturan_penampilan
 Search_failed\:_illegal_search_expression=Pencarian_gagal\:_ekspresi_pencarian_tidak_benar
 Show_ArXiv_column=Tampilkan_kolom_ArXiv
 <HTML>Unpack_the_zip_file_containing_import/export_filters_for_Endnote,<BR>for_optimal_interoperability_with_JabRef</HTML>=<HTML>Menguraikan_berkas_zip_yang_mengandung_tapisan_impor/ekspor_untukEndnote,<BR>agar_dapat_optimal_digunakan_dengan_JabRef</HTML>
@@ -1228,7 +1181,6 @@ Create_entry_based_on_XMP_data=Membuat_entri_berasal_data_XMP
 Create_entry_based_on_data_fetched_from=Membuat_entri_berasal_dari_data_terurai
 Create_blank_entry_linking_the_PDF=Membuat_entri_kosong_tautan_PDF
 Only_attach_PDF=Hanya_lampirkan_PDF
-Mr._dLib_Metadata_Entries_Associated_With\:=Mr._dLib_Entri_Metadata_Berhubungan_dengan\:
 Mr._dLib_Metadata_Entries_Associated_With_PDF_File=Mr._dLib_Entri_Metadata_Berhubungan_Dengan_Berkas_PDF
 Title=Judul
 Author(s)=Penulis
@@ -1247,21 +1199,18 @@ Update_Existing_Entry=Perbarui_Entri_Yang_Sudah_Ada
 Mr._dLib=Mr._dLib
 More_information=Informasi_lain
 Fetching_Metadata...=Proses_Menguraikan_Metadata..
-Metadata=Metadata
 Autocomplete_names_in_'Firstname_Lastname'_format_only=Nama_isian_otomatis_hanya_untuk_format_'Namadepan_Namaakhir'
 Autocomplete_names_in_'Lastname,_Firstname'_format_only=Nama_isian_otomatis_hanya_untuk_format_'Namaakhir,_Namadepan'
 Autocomplete_names_in_both_formats=Nama_isian_otomatis_untuk_kedua_format
 Marking_color_%0=Tanda_warna_%0
 The_name_'comment'_can_not_be_used_as_an_entry_type_name.=Nama_'kometar'_tidak_dapat_digunakan_sebagai_tipe_nama_entri.
 You_must_enter_an_integer_value_in_the_text_field_for=Anda_harus_menggunakan_bilangan_bulat_di_bidang_teks_untuk
-File_directory=Direktori_berkas
 Send_as_email=Kirim_sebagai_email
 References=Referensi
 Sending_of_emails=Sedang_Mengirim_email
 Subject_for_sending_an_email_with_references=Subyek_untuk_mengirim_email_dengan_referensi
 Automatically_open_folders_of_attached_files=Otomatis_membuka_direktori_lampiran_berkas
 Create_entry_based_on_content=Membuat_entri_dari_isi_kandungan
-Store_choice_as_default=Simpan_pilihan_sebagai_bawaan
 Do_not_show_this_box_again_for_this_import=Tidak_menampilkan_kotak_ini_lagi_saat_impor
 Always_use_this_PDF_import_style_(and_do_not_ask_for_each_import)=Selalu_menggunakan_Impor_PDF_(tidak_menanyakan_lagi_ketika_impor)
 Error_creating_email=Gagal_menulis_email
@@ -1287,7 +1236,6 @@ Extra_information_(e.g._page_number)=Informasi_ekstra_(misal,_nomor_halaman)
 Manage_citations=Pengelolaan_acuan
 Problem_modifying_citation=Perubahan_acuan_bermasalah
 Citation=Acuan
-Context=Konteks
 Extra_information=Informasi_ekstra
 Could_not_resolve_BibTeX_entry_for_citation_marker_'%0'.=Tidak_bisa_memperbaiki_entri_BibTeX_untuk_penanda_acuan_'%0'.
 Styles=Gaya
@@ -1313,12 +1261,10 @@ Combine_pairs_of_citations_that_are_separated_by_spaces_only=Menggabungkan_pasan
 Autodetection_failed=Deteksi_otomatis_gagal
 Connecting=Sedang_menyambungkan
 Please_wait...=Mohon_tunggu...
-Unable_to_connect=Tidak_bisa_tersambung
 Set_connection_parameters=Atur_parameter_sambungan
 Path_to_OpenOffice_directory=Lokasi_direktori_OpenOffice
 Path_to_OpenOffice_executable=Lokasi_program_OpenOffice
 Path_to_OpenOffice_library_dir=Lokasi_pustaka_OpenOffice
-Autodetect=DeteksiOtomatis
 Connection_lost=Sambungan_terlepas
 The_paragraph_format_is_controlled_by_the_property_'ReferenceParagraphFormat'_or_'ReferenceHeaderParagraphFormat'_in_the_style_file.=Format_paragraf_diatur_melalui_'FormatAcuanParagraf'_atau_'KepalaAcuan'
 The_character_format_is_controlled_by_the_citation_property_'CitationCharacterFormat'_in_the_style_file.=Format_karakter_iatur_melalui_pengaturan_acauan_'FormatKarakterAcuan'_dalam_berkas_gaya.
@@ -1341,7 +1287,6 @@ JSTOR_import_cancelled=Impor_JSTOR_dibatalkan
 HTML_list=Daftar_HTML
 Click_group_to_toggle_membership_of_selected_entries=Klik_grup_untuk_masuk_ke_anggota_dari_entri_pilihan
 Use_EMACS_23_insertion_string=Gunakan_EMACS_23_sisipan_karakter
-Normalize_to_BibTeX_name_format=Menyesuaikan_ke_nama_format_BibTeX
 If_possible,_normalize_this_list_of_names_to_conform_to_standard_BibTeX_name_formatting=Jika_memungkinkan,_sesuaikan_daftar_nama_untuk_mengikuti_format_penamaan_BibTeX
 Could_not_open_%0=Tidak_bisa_membuka_%0
 Unknown_import_format=Format_impor_tidak_dikenal
@@ -1350,7 +1295,6 @@ An_Error_occurred_while_fetching_from_INSPIRE_source_(%0)\:=Terjadi_kesalahan_ke
 Error_while_fetching_from_Inspire\:_=Terjadi_kesalahan_ketika_mengambil_dari_Inspire\:_
 Web_search=Pencarian_Web
 Autocomplete_names=Pengisian_otomatis_nama
-You_must_select_either_a_valid_style_file,_or_use_the_default_style.=Anda_harus_memilih_gaya_berkas_yang_sah,_atau_gunakan_gaya_bawaan.
 
 Default_style=Gaya_bawaan
 Choose_style_file_directly=Pilih_gaya_berkas_secara_langsung
@@ -1393,7 +1337,6 @@ Autocompletion_options=
 Autocomplete_after_following_number_of_characters=
 Name_format_used_for_autocompletion=
 Treatment_of_first_names=
-No_icon_found_for_%0=
 Cleanup_entries=
 Automatically_assign_new_entry_to_selected_groups=
 Move_DOIs_from_note_and_URL_field_to_DOI_field_and_remove_http_prefix=
@@ -1407,13 +1350,9 @@ Doing_a_cleanup_for_%0_entries...=
 No_entry_needed_a_clean_up=
 One_entry_needed_a_clean_up=
 %0_entries_needed_a_clean_up=
-Imported_=
 Error_importing_from_database=
 Minimize_to_system_tray=
 
-Incomplete_search_results=
-%0_entries_were_found,_but_only_%1_of_these_could_be_resolved.=
-
 Error_downloading_file_'%0'=
 Download_failed=
 
@@ -1439,10 +1378,9 @@ Unable_to_clear_preferences.=
 
 Reset_preferences_(key1,key2,..._or_'all')=
 Find_unlinked_files=
-Select_All=
-Unselect_All=
-Expand_All=
-Collapse_All=
+Unselect_all=
+Expand_all=
+Collapse_all=
 Select_Directory=
 Choose_Directory=
 Use_the_selected_directory_to_start_with_the_search.=
@@ -1502,7 +1440,6 @@ Priority_medium=
 Quality=
 Rank=
 Relevance=
-Set_priority=
 Set_priority_to_high=
 Set_priority_to_low=
 Set_priority_to_medium=
@@ -1534,7 +1471,6 @@ Correct_the_entry,_and_reopen_editor_to_display/edit_source.=
 Could_not_connect_to_a_running_gnuserv_process._Make_sure_that_Emacs_or_XEmacs_is_running,<BR>and_that_the_server_has_been_started_(by_running_the_command_'server-start'/'gnuserv-start').=
 Could_not_connect_to_running_OpenOffice.\nMake_sure_you_have_installed_OpenOffice_with_Java_support.\nIf_connecting_manually,_please_verify_program_and_library_paths.\n\nError_message\:_=
 Created_group_"%0".=
-File_has_been_updated_externally._Are_you_sure_you_want_to_save?=
 If_a_pasted_or_imported_entry_already_has_the_field_set,_overwrite.=
 Import_Metadata_From_PDF=
 Not_connected_to_any_Writer_document._Please_make_sure_a_document_is_open,_and_use_the_'Select_Writer_document'_button_to_connect_to_it.=
@@ -1569,4 +1505,62 @@ An_Error_occurred_while_parsing_abstract=
 Unknown_DiVA_entry\:_'%0'.=
 Get_BibTeX_entry_from_DiVA=
 Log=
-Remove_unneccessary_$,_{,_and_}=
+
+ISO_690=
+
+Add_brackets_and_replace_separators_with_their_non-breaking_version_for_units=
+Add_new_entry_and_keep_both_old_entries=
+Cancelled_merging_entries=
+Error_in_entry=
+First_entry=
+Format_units_by_adding_non-breaking_separators_and_keeping_the_correct_case_on_search=
+Merge_entries=
+Merged_entries_into_a_new_and_kept_the_old=
+Merged_entries_into_a_new_and_removed_the_old=
+Merged_entry=
+None=
+Parse=
+Remove_unneccessary_$,_{,_and_}_and_move_adjacent_numbers_into_equations=
+Replace_old_entries_with_new_entry=
+Result=
+Second_entry=
+Show_DOI_first=
+Show_URL_first=
+Use_1st=
+Use_2nd=
+Use_Emacs_key_bindings=
+You_have_to_choose_exactly_two_entries_to_merge.=
+
+Update_timestamp_on_modification=
+change_field=
+
+All_key_bindings_will_be_reset_to_their_defaults.=
+Automatically_set_file_links=
+Continue?=
+Resetting_all_key_bindings=
+Save_entries_ordered_by_title=
+Export_entries_ordered_by_title=
+Quotes=
+Curly_Brackets=
+Include_empty_fields=
+Field_saving_options=
+Field_value_delimiter._E.g.,_"author\={x}"_or_"author\='x'"=
+Run_Unicode_converter_on_title,_author(s),_and_abstract=
+
+Database_has_changed._Do_you_want_to_save_before_closing?=
+Host=
+Invalid_setting=
+Network=
+Please_specify_both_hostname_and_port=
+Port=
+Start_field_contents_in_same_column=
+Use_camel_case_for_field_names_(e.g.,_"HowPublished"_instead_of_"howpublished")=
+Use_custom_proxy_configuration=
+Clear_connection_settings=
+Cleared_connection_settings.=
+Rebind_C-a,_too=
+
+Show_number_of_elements_contained_in_each_group=
+
+Open_folder=
+Opened_%0_folder(s).=
diff --git a/src/resource/JabRef_it.properties b/src/resource/JabRef_it.properties
index f93327d..3de9245 100644
--- a/src/resource/JabRef_it.properties
+++ b/src/resource/JabRef_it.properties
@@ -108,7 +108,6 @@ Background_color_for_optional_fields=Colore_di_sfondo_per_i_campi_facoltativi
 Background_color_for_required_fields=Colore_di_sfondo_per_i_campi_obbligatori
 Backup_old_file_when_saving=Fare_una_copia_di_backup_del_vecchio_file_quando_viene_salvato
 Beta_version=Versione_Beta
-Bibkey_to_filename_conversion=Conversione_della_chiave_BibTeX_in_nome_del_file
 BibTeX_key=Chiave_BibTeX
 BibTeX_key_is_unique.=La_chiave_BibTeX_\u00e8_unica.
 BibTeX_key_not_set._Enter_a_name_for_the_downloaded_file=Chiave_BibTeX_non_definita._Inserire_un_nome_per_il_file_scaricato
@@ -120,7 +119,6 @@ Broken_link=Collegamento_interrotto
 Browse=Sfoglia
 # Unsure how to translate out of context
 by=da
-Calling_external_viewer...=Chiamata_a_visualizzatore_esterno...
 Cancel=Annulla
 Cannot_add_entries_to_group_without_generating_keys._Generate_keys_now?=Le_voci_non_possono_essere_inserite_in_un_gruppo_se_prive_di_chiave._Generare_le_chiavi_ora?
 Cannot_merge_this_change=Questa_modifica_non__pu\u00f2_essere_incorporata
@@ -178,7 +176,6 @@ Command_line_id=Identificativo_della_riga_di_comando
 Complete_record=Completa_la_registrazione
 Connect=Connessione
 Connect_to_SQL_database=Connessione_ad_un_database_SQL
-Connect_to_SQL_Database=Connessione_ad_un_Database_SQL
 Connection_to_IEEEXplore_failed=Connessione_a_IEEEXplore_fallita
 Contained_in=Contenuto_in
 Content=Contenuto
@@ -192,8 +189,6 @@ Copy_file_to_file_directory.=Copia_il_file_nella_cartella_dei_file.
 Copy_files_to_file_directory.=Copia_i_file_nella_cartella_dei_file.
 Copy_to_clipboard=Copia_negli_appunti
 Could_not_call_executable=Non_\u00e8_possibile_effetuare_la_chiamata_dell'eseguibile
-Could_not_connect_to_a_running_gnuserv_process._Make_sure_that_Emacs_or_XEmacs_is_running,<BR>and_that_the_server_has_been_started_(by_running_the_command_'gnuserv-start').=Impossibile_la_connessione_a_un_processo_gnuserv_in_esecuzione._Accertarsi_che_Emacs_o_XEmacs_siano_in_esecuzione,<BR>e_che_il_server_sia_stato_avviato_(con_il_comando_'gnuserv-start').
-Could_not_connect_to_host_=Impossibile_connettersi_all'host_
 Could_not_connect_to_Vim_server._Make_sure_that_Vim_is_running<BR>with_correct_server_name.=Impossibile_stabilire_la_connessione_al_server_Vim.<BR>Assicurarsi_che_Vim_sia_in_esecuzione_con_il_nome_di_server_corretto.
 Could_not_export_file=Impossibile_esportare_il_file
 Could_not_export_preferences=Impossibile_esportare_le_preferenze
@@ -213,15 +208,12 @@ Could_not_print_preview=Impossibile_visualizzare_l'anteprima_di_stampa
 Could_not_run_the_'vim'_program.=Impossibile_eseguire_il_programma_'vim'.
 Could_not_save_file=Impossibile_salvare_il_file
 Could_not_save_file._Character_encoding_'%0'_is_not_supported.=Impossibile_salvare_il_file._La_codifica_dei_caratteri_'%0'_non_\u00e8_supportata.
-Create_group=Crea_gruppo
 Created_groups.=Gruppi_creati
 crossreferenced_entries_included=Incluse_le_voci_con_riferimenti_incrociati
 Current_content=Contenuto_corrente
 Current_value=Valore_corrente
 Custom_entry_types=Tipi_di_voce_personalizzati
 Custom_entry_types_found_in_file=Tipi_di_voce_personalizzati_trovati_nel_file
-Custom_icon_theme=Tema_di_icone_personalizzato
-Custom_icon_theme_file=File_di_tema_di_icone_personalizzato
 Custom_importers=Importazioni_personalizzate
 Customize_entry_types=Personalizza_tipi_di_voce
 Customize_key_bindings=Personalizza_combinazioni_di_tasti
@@ -231,7 +223,6 @@ cut_entry=taglia_voce
 Cut_pr=Taglia
 Database_\:=Database:
 Database_encoding=Codifica_database
-Database_has_changed._Do_you_want_to_save_before_closing?=Il_database_\u00e8_stato_modificato._Vuoi_salvare_prima_di_chiudere?
 Database_properties=Propriet\u00e0_del_database
 Date_format=Formato_data
 Default=Predefinito
@@ -288,8 +279,6 @@ Downloading...=Download_in_corso...
 Drag_and_Drop_Error=Errore_di_'Drag_&_Drop'
 # Check translation below
 Drop_%0=Rilascia_%0
-duplicate_BibTeX_key=chiave_BibTeX_duplicata
-Duplicate_BibTeX_key.=Chiave_BibTeX_duplicata.
 Duplicate_BibTeX_key._Grouping_may_not_work_for_this_entry.=Chiave_BibTeX_duplicata._I_raggruppamenti_potrebbero_non_essere_corretti_per_questa_voce.
 Duplicate_Key_Warning=Attenzione:_chiave_duplicata
 Duplicate_pairs_found=Trovati_doppioni
@@ -313,10 +302,8 @@ Edit_preamble=Modifica_il_preambolo
 Edit_strings=Modifica_le_stringhe
 Editor_options=Opzioni_dell'editor
 empty_BibTeX_key=chiave_BibTeX_vuota
-Empty_BibTeX_key.=Chiave_BibTeX_vuota
 Empty_BibTeX_key._Grouping_may_not_work_for_this_entry.=Chiave_BibTeX_vuota._La_gestione_dei_gruppi_potrebbe_non_funzionare_per_questa_voce.
 empty_database=database_vuoto
-Enable_source_editing=Abilita_la_modifica_del_codice_sorgente
 Enable_word/name_autocompletion=Abilita_autocompletamento_di_parole/nomi
 Endnote=Endnote
 Enter_URL=Immettere_l'URL
@@ -340,7 +327,7 @@ Entry_types=Tipi_di_voce
 Error=Errore
 
 Error\:_=Errore:_
-Error_converting_Bibtex_to_XMP\:_%0=Errore_durante_la_conversione_della_voce_BibTeX_in_XMP:_%0
+Error_converting_BibTeX_to_XMP\:_%0=Errore_durante_la_conversione_della_voce_BibTeX_in_XMP:_%0
 Error_converting_XMP_to_'%0'...=Errore_durante_la_conversione_dei_metadati_XMP_in_'%0'...
 Error_exporting_to_clipboard=Errore_durante_l'esportazione_negli_appunti
 Error_in_field=Errore_nel_campo
@@ -350,7 +337,6 @@ Error_opening_file=Errore_all'apertura_del_file
 Error_setting_field=Errore_nell'impostazione_del_campo
 Error_while_converting_BibtexEntry_to_XMP_%0=Errore_durante_la_conversione_della_voce_BibTeX_in_XMP_%0
 Error_while_downloading_file\:=Errore_nel_corso_del_download_del_file:
-Error_while_fetching_from_OIA2=Errore_durante_una_ricerca_da_OIA2
 Error_while_writing=Errore_durante_la_scrittura
 
 Error_writing_to_%0_file(s).=Errore_di_scrittura_di_%0_file.
@@ -387,7 +373,6 @@ Field_sizes=Dimensioni_dei_campi
 
 Field_to_filter=Campi_da_filtrare
 Field_to_group_by=Campo_di_raggruppamento
-Fields=Campi
 File=File
 file=file
 
@@ -516,17 +501,13 @@ Insert_selected_citations_into_LyX/Kile=Inserisci_le_citazioni_selezionate_in_Ly
 Insert_selected_citations_into_WinEdt=Inserisci_le_citazioni_selezionate_in_WinEdt
 insert_string_=Inserisci_stringa_
 Insert_URL=Inserisci_URL
-integrity=Integrit\u00e0
 Integrity_check=Verifica_di_integrit\u00e0
 Intersection=Intersezione
 Invalid_BibTeX_key=Chiave_BibTeX_non_valida
 Invalid_date_format=Formato_data_non_valido
 Invalid_URL=URL_non_valido
 Inverted=Complemantare
-is_a_standard_type.=\u00e8_un_tipo_standard
 ISO_abbreviation=Abbreviazione_ISO
-Item_list_for_field=Lista_di_campi
-jabref=jabref
 JabRef_help=Aiuto_di_JabRef
 JabRef_preferences=Preferenze_JabRef
 Journal_abbreviations=Abbreviazioni_riviste
@@ -562,7 +543,6 @@ Listen_for_remote_operation_on_port=Porta_in_ascolto_per_operazioni_remote
 Load_and_Save_preferences_from/to_jabref.xml_on_start-up_(memory_stick_mode)=Carica_e_salva_le_preferenze_da/in_jabref.xml_all'avvio_(modalit\u00e0_chiavetta_di_memoria)
 Load_session=Carica_sessione
 Loading_session...=Caricamento_sessione...
-localhost=localhost
 Look_and_feel=Aspetto
 Looking_for_pdf...=Ricerca_del_file_pdf...
 lower=minuscolo
@@ -634,7 +614,6 @@ No_entries_found._Please_make_sure_you_are_using_the_correct_import_filter.=Ness
 No_entries_found_for_the_search_string_'%0'=Nessuna_voce_trovata_in_base_alla_stringa_di_ricerca_'%0'
 No_entries_imported.=Nessuna_voce_importata
 No_entries_or_multiple_entries_selected.=Nessuna_voce_selezionata_o_voci_multiple_selezionate.
-No_entries_selected=Nessuna_voce_selezionata
 No_entries_selected.=Nessuna_voce_selezionata
 No_exceptions_have_ocurred.=Non_si_\u00e8_verificata_nessuna_eccezione
 No_files_found.=Nessun_file_trovato.
@@ -658,7 +637,6 @@ Nothing_to_redo=Niente_da_ripetere
 Nothing_to_undo=Niente_da_annullare
 Number_of_references_to_fetch?=Numero_di_riferimenti_da_recuperare?
 occurences=ricorrenze
-OK=OK
 Ok=Ok
 One_or_more_file_links_are_of_the_type_'%0',_which_is_undefined._What_do_you_want_to_do?=Uno_o_pi\u00f9_collegamenti_a_file_sono_del_tipo_'%0',_non_definito._Come_procedere?
 One_or_more_keys_will_be_overwritten._Continue?=Una_o_pi\u00f9_chiavi_saranno_sovrascritte._Continuare?
@@ -718,12 +696,10 @@ PDF_directory=Cartella_dei_file_PDF
 PDF_does_not_exist=Il_file_PDF_non_esiste
 Personal_journal_list=Lista_di_riviste_personale
 Plain_text_import=Importazione_da_solo_testo
-Please_check_your_network_connection_to_this_machine.=Verificare_la_connessione_di_rete_di_questa_macchina.
 Please_enter_a_name_for_the_group.=Immettere_un_nome_per_il_gruppo
 Please_enter_a_search_term._For_example,_to_search_all_fields_for_<b>Smith</b>,_enter%c<p><tt>smith</tt><p>To_search_the_field_<b>Author</b>_for_<b>Smith</b>_and_the_field_<b>Title</b>_for_<b>electrical</b>,_enter%c<p><tt>author%esmith_and_title%eelectrical</tt>=Immettere_un_termine_di_ricerca._Per_esempio,_per_ricercare_in_tutti_i_campi_<b>Smith</b>,_imettere%c<p><tt>smith</tt><p>_Per_ricercare_nel_campo_<b>Author</b>_il_termine_<b>Smith</b>_e_nel_campo_<b>Title</b>_il_termine_<b>electr [...]
 Please_enter_the_field_to_search_(e.g._<b>keywords</b>)_and_the_keyword_to_search_it_for_(e.g._<b>electrical</b>).=Immettere_il_cmpo_di_ricerca_(es._<b>keywords</b>)_e_la_parola_chiave_da_ricercare_(es._<b>electrical</b>).
 Please_enter_the_string's_label=Immettere_l'etichetta_della_stringa
-Please_select_an_importer=Selezionare_un_filtro_di_importazione
 Please_select_an_importer.=Selezionare_un_filtro_di_importazione.
 Please_select_exactly_one_group_to_move.=Selezionare_un_solo_gruppo_da_spostare.
 Please_specify_the_=Specificare_il_
@@ -796,7 +772,6 @@ Removed_group_"%0".=Rimosso_gruppo_"%0".
 Removed_group_"%0"_and_its_subgroups.=Rimosso_gruppo_"%0"_e_suoi_sottogruppi.
 Removed_string=Stringa_rimossa
 Renamed_string=Stringa_rinominata
-Replace=Sostituisci
 Replace_(regular_expression)=Sostituisci_(espressione_regolare)
 Replace_string=Sostituisci_stringa
 Replace_with=Sostituisci_con
@@ -814,7 +789,6 @@ Revert_to_original_source=Ripristina_il_contenuto_iniziale
 Review=Rivedi
 Review_changes=Rivedi_le_modifiche
 Right=Destra
-root=root
 Save=Salva
 Save_all_finished.=Terminato_il_salvataggio_di_tutti_i_database.
 
@@ -837,17 +811,15 @@ Saving_database=Salvataggio_del_database_in_corso
 ##_check
 Scan=Scansione
 Search=Ricerca
-Search_All_Fields=Ricerca_in_tutti_i_campi
 Search_all_fields=Ricerca_in_tutti_i_campi
 Search_error=Errore_di_ricerca
 Search_expression=Espressione_di_ricerca
 Search_for=Ricerca
 Search_general_fields=Ricerca_nei_campi_generali
 Search_IEEEXplore=Ricerca_IEEEXplore
-Search_IEEExplore=Ricerca_in_IEEExplore
 Search_optional_fields=Ricerca_nei_campi_opzionali
 Search_required_fields=Ricerca_nei_campi_obbligatori
-Search_Specified_Field(s)=Ricerca_nei_campi_specificati
+Search_specified_field(s)=Ricerca_nei_campi_specificati
 Searched_database._Global_number_of_hits=Ricerca_effettuata._Numero_totale_di_risultati
 Searched_database._Number_of_hits=Ricerca_effettuata._Numero_di_risultati_trovati
 Searching_for_%0_file=Ricerca_file_%0
@@ -871,8 +843,6 @@ Select_matches=Seleziona_le_corrispondenze
 Select_new_ImportFormat_Subclass=Seleziona_una_nuova_sottoclasse_ImportFormat
 Select_the_tree_nodes_to_view_and_accept_or_reject_changes=Selezionare_i_nodi_dell'albero_per_vedere_ed_accettare_o_rifiutare_le_modifiche
 Selected_entries=Voci_selezionate
-##_check
-Selector_enabled_fields=Campi_con_selezione_attivata
 Server_Hostname_\:=Hostname_del_server:
 Server_Type_\:=Tipo_di_server:
 
@@ -954,11 +924,9 @@ Target_file_cannot_be_a_directory.=L'oggetto_deve_essere_un_file,_non_una_cartel
 Tertiary_sort_criterion=Criterio_di_ordinamento_terziario
 Test=Test
 Text_Input_Area=Area_di_inserimento_testo
-The_#_character_is_not_allowed_in_BibTeX_fields=Il_carattere_'#'_non_\u00e8_permesso_nei_campi_BibTeX
 The_chosen_date_format_for_new_entries_is_not_valid=Il_formato_di_data_scelto_per_le_nuove_voci_non_\u00e8_valido
 
 The_chosen_encoding_'%0'_could_not_encode_the_following_characters\:_=La_codifica_scelta_'%0'_non_pu\u00f2_codificare_i_caratteri_seguenti:_
-The_CiteSeer_fetch_operation_returned_zero_results.=La_ricerca_CiteSeerX_non_ha_fornito_risultati.
 
 The_current_version_features_a_new_way_of_handling_links_to_external_files.<br>To_take_advantage_of_this,_your_links_must_be_changed_into_the_new_format,_and<br>JabRef_must_be_configured_to_show_the_new_links.=La_versione_attuale_dispone_di_una_nuova_modalit\u00e0_di_gestione_dei_collegamenti_ai_file_esterni.<BR>Per_poterla_sfruttare,_i_collegamenti_devono_essere_convertiti_nel_nuovo_formato<BR>e_JabRef_deve_essere_configurato_per_mostrare_i_nuovi_collegamenti.
 the_field_<b>%0</b>=il_campo_<b>%0</b>
@@ -974,7 +942,6 @@ The_search_is_case_insensitive.=La_ricerca_non_distingue_maiuscole_e_minuscole.
 The_search_is_case_sensitive.=La_ricerca_distingue_maiuscole_e_minuscole.
 The_string_has_been_removed_locally=La_stringa_\u00e8_stata_rimossa_localmente
 There_are_possible_duplicates_(marked_with_a_'D'_icon)_that_haven't_been_resolved._Continue?=Ci_sono_dei_potenziali_duplicati_(contrassegnati_con_una_icona_'D')_che_non_possono_essere_risolti._Continuare?
-this_button_will_update=questo_bottone_aggiorner\u00e0
 This_database_was_written_using_an_older_version_of_JabRef.=Questo_database_\u00e8_stato_generato_da_una_versione_precedente_di_JabRef.
 This_entry_has_no_BibTeX_key._Generate_key_now?=Questa_voce_\u00e8_priva_di_una_chiave_BibTeX._Generarla_ora?
 This_entry_is_incomplete=La_voce_\u00e8_incompleta
@@ -986,12 +953,10 @@ This_group_contains_entries_in_which_any_field_contains_the_regular_expression_<
 This_group_contains_entries_in_which_any_field_contains_the_term_<b>%0</b>=Questo_gruppo_contiene_voci_in_cui_uno_dei_campi_contiene_il_termine_<b>%0</b>
 This_group_contains_entries_whose_<b>%0</b>_field_contains_the_keyword_<b>%1</b>=Questo_gruppo_contiene_voci_in_cui_il_campo_<b>%0</b>__contiene_la_keyword_<b>%1</b>
 This_group_contains_entries_whose_<b>%0</b>_field_contains_the_regular_expression_<b>%1</b>=Questo_gruppo_contiene_voci_in_cui_il_campo_<b>%0</b>__contiene_l'espressione_regolare_<b>%1</b>
-This_is_a_simple_copy_and_paste_dialog_for_import_some_fields_from_normal_text.=Questo_\u00e8_un_semplice_dialogo_taglia_e_copia_per_importare_dei_campi_da_testo_normale
 This_makes_JabRef_look_up_each_%0_link_and_check_if_the_file_exists._If_not,_you_will_be_given_options<BR>to_resolve_the_problem.=Per_ciascuno_dei_%0_collegamenti,_JabRef_verificher\u00e0_l'esistenza_del_file.<BR>In_caso_negativo_proporr\u00e0_delle_opzioni_per_la_risoluzione_del_problema.
 This_operation_requires_all_selected_entries_to_have_BibTex_keys_defined.=Per_questa_operazione_\u00e8_necessario_che_tutte_le_voci_selezionate_abbiano_la_chiave_BibTeX_definita
 This_operation_requires_at_least_one_entry.=Questa_operazione_richiede_almeno_una_voce.
 This_operation_requires_one_or_more_entries_to_be_selected.=Per_questa_operazione_una_o_pi\u00f9_voci_devono_essere_selezionate
-This_will_move_all_external_links_from_the_'pdf'_and_'ps'_fields_into_the_'%0'_field._Proceed?=Questa_azione_sposter\u00e0_tutti_i_collegamenti_dai_campi_'pdf'_e_'ps'_al_campo_'%0'._Procedere?
 To_set_up,_go_to_<B>Tools_->_Manage_journal_abbreviations</B>=Per_configurare_vedi_<B>Strumenti_->_Gestione_delle_abbreviazioni_delle_riviste</B>
 Toggle_abbreviation=Mostra/Nascondi_l'abbreviazione
 Toggle_entry_preview=Mostra/Nascondi_l'anteprima
@@ -1001,7 +966,6 @@ Try_different_encoding=Prova_codifiche_differenti
 Type_set_to_'other'=Tipo_configurato_come_'other'
 Unabbreviate_journal_names_of_the_selected_entries=Mostra_il_nome_completo_delle_riviste_per_le_voci_selezionate
 Unabbreviated_%0_journal_names.=%0_nomi_di_riviste_per_esteso.
-unable_to_access_LyX-pipe=impossibile_accedere_alla_'pipe'_LyX
 Unable_to_create_graphical_interface=Impossibile_creare_l'interfaccia_grafica
 Unable_to_open_file.=Impossibile_aprire_il_file
 Unable_to_open_link._The_application_'%0'_associated_with_the_file_type_'%1'_could_not_be_called.=Impossibile_aprire_il_collegamento._L'applicazione_'%0'_associata_con_il_tipo_di_file_'%1'_non_pu\u00f2_essere_aperta.
@@ -1028,7 +992,6 @@ untitled=senza_titolo
 Up=Su
 Update_to_current_column_widths=Aggiorna_la_larghezza_delle_colonne_ai_valori_correnti
 Updated_group_selection=Selezione_di_gruppo_aggiornata
-Upgrade_external_links=Aggiorna_i_collegamenti_esterni
 Upgrade_external_PDF/PS_links_to_use_the_'%0'_field.=Aggiornare_i_collegamenti_esterni_PDF/PS_per_utilizzare_il_campo_'%0'.
 Upgrade_file=Aggiornamento_del_file
 Upgrade_old_external_file_links_to_use_the_new_feature=Aggiornare_i_vecchi_collegamenti_ai_file_esterni_per_utilizzare_la_nuova_funzione
@@ -1037,16 +1000,13 @@ UPPER=MAIUSCOLO
 Upper_Each_First=Prime_Lettere_In_Maiuscolo
 Upper_first=Prima_lettera_in_maiuscolo
 usage=uso
-Use_antialiasing_font=Usa_font_con_antialising
 Use_autocompletion_for_the_following_fields=Usa_l'autocompletamento_per_i_seguenti_campi
-Use_custom_icon_theme=Utilizza_un_tema_di_icone_personalizzato
 Use_default_viewer=Usa_il_visualizzatore_predefinito
 Use_inspection_window_also_when_a_single_entry_is_imported.=Usa_la_finestra_di_ispezione_anche_per_l'importazione_di_una_singola_voce.
 Use_native_file_dialog=Usa_finestra_di_dialogo_File_nativa
 Use_other_look_and_feel=Usa_un_altro_"Look-and-Feel"
 Use_Regular_Expression_Search=Ricerca_l'espressione_regolare
 Use_regular_expressions=Utilizza_espressioni_regolari
-Use_the_following_delimiter_character(s)=Utilizza_i_caratteri_di_delimitazione_seguenti
 Username_\:=Username:
 Value_cleared_externally=Valore_cancellato_esternamente
 Value_set_externally=Valore_impostato_esternamente
@@ -1100,7 +1060,6 @@ Your_new_key_bindings_have_been_stored.=La_nuova_assegnazione_di_tasti_\u00e8_st
 The_following_fetchers_are_available\:=Le_utilit\u00e0_di_ricerca_seguenti_sono_disponibili:
 Could_not_find_fetcher_'%0'=Impossibile_trovare_l'utilit\u00e0_di_ricerca_'%0'_
 Running_Query_'%0'_with_fetcher_'%1'.=Esecuzione_della_query_'%0'_con_l'utilit\u00e0_di_ricerca_'%1'.
-Please_wait!=Attendere,_prego!
 Query_'%0'_with_fetcher_'%1'_did_not_return_any_results.=La_query_'%0'_con_l'utilit\u00e0_di_ricerca_'%1'_non_ha_prodotto_alcun_risultato.
 Open_SPIRES_entry=Apri_la_voce_SPIRES
 Move/Rename_file=Sposta/Rinomina_il_file
@@ -1108,7 +1067,6 @@ File_moved=File_spostato
 Move_file_failed=Spostamento_del_file_fallito
 Could_not_move_file=Impossibile_spostare_il_file
 Could_not_find_file_'%0'.=Impossibile_trovare_il_file_'%0'.
-Move/rename_file=Sposta/rinomina_il_file
 Number_of_entries_successfully_imported=Numero_di_voci_importate_con_successo
 Import_canceled_by_user=Importazione_interrotta_dall'utente
 Progress\:_%0_of_%1=Stato_d'avanzamento:_%0_di_%1
@@ -1217,11 +1175,9 @@ Version=Versione
 Unknown=Sconosciuto
 Not_loaded=Non_caricato
 Loaded=Caricato
-Could_not_determine_version_of_=Impossibile_determinare_la_versione_di_
 Install_anyway?=Installare_comunque?
 
 Looking_for_full_text_document...=Ricerca_del_documento_citato
-Follow_DOI_or_URL_link_and_try_to_locate_PDF_full_text_document=Segui_i_collegamenti_DOI_e_URL_prova_a_localizzare_il_file_PDF_del_documento_citato
 Unable_to_find_full_text_article._No_search_algorithm_defined_for_the_'%0'_web_site.=Impossibile_torvare_il_file_PDF_del_documento_citato._Nessun_algoritmo_di_ricerca_definito_per_il_sito_internet_'%0'.
 Found_pdf_link,_but_received_the_wrong_MIME_type._This_could_indicate_that_you_don't_have_access_to_the_fulltext_article.=Trovato_il_collegamento_al_file_PDF,_ma_il_tipo_MIME_ricevuto_non_\u00e8_corretto._Ci\u00f2_potrebbe_indicare_che_non_si_ha_permessi_di_accesso_al_file_PDF_del_documento_citato.
 
@@ -1269,8 +1225,6 @@ Before_saving,_please_edit_any_strings_containing_the_#_character.=Prima_di_salv
 
 Save_without_backup?=Salvare_senza_backup?
 Unable_to_create_backup=Impossibile_creare_un_backup
-## line below is a duplicate? 
-File_directory_is_not_set_or_does_not_exist.=La_cartella_dei_file_non_\u00e8_configurata_o_non_esiste.
 ## end note
 
 Move_file_to_file_directory.=Sposta_il_file_nella_cartella_dei_file.
@@ -1294,7 +1248,6 @@ Error_initializing_custom_export_format_from_string_'%0'=Errore_di_inizializzazi
 
 BibLaTeX_mode=modalit\u00e0_BibLaTeX
 Optional_fields_2=Campi_opzionali_2
-Please_wait=Attendere,_prego.
 Waiting_for_save_operation_to_finish=In_attesa_del_termine_del_salvataggio
 Resolving_duplicate_BibTeX_keys...=Risoluzione_delle_chiavi_BibTeX_duplicate...
 Finished_resolving_duplicate_BibTeX_keys._%0_entries_modified.=Terminata_la_risoluzione_delle_chiavi_BibTeX_duplicate._%0_voci_modificate.
@@ -1308,8 +1261,6 @@ Duplicate_key=Chiave_duplicata
 Generate_key=Genera_una_chiave
 Import_marking_color=Colore_per_contrassegnare_le_voci_importate
 
-%0_entries_found._To_reduce_server_load,_only_%1_will_be_downloaded._It_will_be_very_slow,_in_order_to_make_ACM_happy.=%0_voci_trovate._Per_ridurre_il_carico_sul_server_ne_saranno_scaricate_solo_%1._Il_processo_sar\u00e0_piuttosto_lento,_in_modo_da_non_creare_problemi_ad_ACM.
-
 BibTeX_importer=Filtro_di_importazione_BibTeX
 Always_add_letter_(a,_b,_...)_to_generated_keys=Aggiungi_sempre_una_lettera_(a,_b,_...)_alle_chiavi_generate
 
@@ -1326,7 +1277,6 @@ An_autosave_file_was_found_for_this_database._This_could_indicate_=Un_file_di_sa
 that_JabRef_didn't_shut_down_cleanly_last_time_the_file_was_used.=che_JabRef_non_\u00e8_stato_chiuso_correttamente_l'ultima_volta_che_il_file_\u00e8_stato_utilizzato.
 General_file_directory=Cartella_dei_file_generale
 User-specific_file_directory=Cartella_dei_file_specifica_dell'utente
-Error_setting_look_and_feel=Errore_nell'impostazione_del_"Look-and-Feel"
 Search_failed\:_illegal_search_expression=Ricerca_fallita:_espressione_di_ricerca_illegale
 Show_ArXiv_column=Mostra_la_colonna_ArXiv
 <HTML>Unpack_the_zip_file_containing_import/export_filters_for_Endnote,<BR>for_optimal_interoperability_with_JabRef</HTML>=<HTML>Decomprimi_il_file_zip_contenente_i_filtri_di_importazione/esportazione_per_Endnote,<BR>per_una_interoperabilit\u00e0_ottimale_con_JabRef</HTML>
@@ -1340,7 +1290,6 @@ Create_entry_based_on_XMP_data=Crea_una_nuova_voce_in_base_ai_dati_XMP
 Create_entry_based_on_data_fetched_from=Crea_una_nuova_voce_in_base_ai_dati_recuperati_da
 Create_blank_entry_linking_the_PDF=Crea_una_voce_vuota_collegata_al_file_PDF
 Only_attach_PDF=Allega_solo_il_file_PDF
-Mr._dLib_Metadata_Entries_Associated_With\:=Metadati_di_Mr._dLib_associati_con:
 Mr._dLib_Metadata_Entries_Associated_With_PDF_File=Metadati_di_Mr._dLib_associati_con_il_file_PDF
 Title=Titolo
 Author(s)=Autori
@@ -1359,21 +1308,18 @@ Update_Existing_Entry=Aggiorna_la_voce_esistente
 Mr._dLib=Mr._dLib
 More_information=Ulteriori_informazioni
 Fetching_Metadata...=Recupero_dei_metadati...
-Metadata=Metadati
 Autocomplete_names_in_'Firstname_Lastname'_format_only=Autocompletamento_dei_nomi_solo_nel_formato_'Firstname_Lastname'
 Autocomplete_names_in_'Lastname,_Firstname'_format_only=Autocompletamento_dei_nomi_solo_nel_formato_'Lastname,_Firstname'
 Autocomplete_names_in_both_formats=Autocompletamento_dei_nomi_in_entrambi_i_formati
 Marking_color_%0=Colore_di_contrassegno_%0
 The_name_'comment'_can_not_be_used_as_an_entry_type_name.=Il_nome_'comment'_non_pu\u00f2_essere_utilizzato_come_nome_di_tipo_di_voce.
 You_must_enter_an_integer_value_in_the_text_field_for=Inserire_un_numero_intero_nel_campo_di_testo_per
-File_directory=Cartella_dei_file
 Send_as_email=Invia_come_email
 References=Riferimenti
 Sending_of_emails=Invio_di_email
 Subject_for_sending_an_email_with_references=Oggetto_per_l'invio_di_email_con_riferimenti
 Automatically_open_folders_of_attached_files=Apri_automaticamente_le_cartelle_dei_file_allegati
 Create_entry_based_on_content=Crea_una_voce_in_base_al_contenuto
-Store_choice_as_default=Salva_la_scelta_come_predefinita
 Do_not_show_this_box_again_for_this_import=Non_mostrare_nuovamente_questo_dialogo_per_questa_importazione
 Always_use_this_PDF_import_style_(and_do_not_ask_for_each_import)=Usa_sempre_questa_modalit\u00e0_di_importazione_PDF_(non_chiedere_per_ogni_importazione)
 Error_creating_email=Errore_nella_creazione_della_email
@@ -1399,7 +1345,6 @@ Extra_information_(e.g._page_number)=Informazione_aggiuntiva_(es._numero_di_pagi
 Manage_citations=Gestione_delle_citazioni
 Problem_modifying_citation=Problema_nella_modifica_della_citazione
 Citation=Citazione
-Context=Contesto
 Extra_information=Informazione_aggiuntiva
 Could_not_resolve_BibTeX_entry_for_citation_marker_'%0'.=Impossibile_risolvere_la_voce_BibTeX_per_l'identificativo_di_citazione_'%0'.
 Styles=Stili
@@ -1425,12 +1370,10 @@ Combine_pairs_of_citations_that_are_separated_by_spaces_only=Combina_le_coppie_d
 Autodetection_failed=Autorilevamento_non_riuscito
 Connecting=Connessione_in_corso
 Please_wait...=Attendere...
-Unable_to_connect=Impossibile_connettersi
 Set_connection_parameters=Imposta_i_parametri_di_connessione
 Path_to_OpenOffice_directory=Percorso_per_la_cartella_OpenOffice
 Path_to_OpenOffice_executable=Percorso_per_il_file_eseguibile_OpenOffice
 Path_to_OpenOffice_library_dir=Percorso_per_la_cartella_della_libreria_OpenOffice
-Autodetect=Autorilevamento
 Connection_lost=Connessione_perduta
 The_paragraph_format_is_controlled_by_the_property_'ReferenceParagraphFormat'_or_'ReferenceHeaderParagraphFormat'_in_the_style_file.=Il_formato_del_paragrafo_\u00e8_controllato_dalle_propriet\u00e0_'ReferenceParagraphFormat'_o_'ReferenceHeaderParagraphFormat'_nel_file_di_stile.
 The_character_format_is_controlled_by_the_citation_property_'CitationCharacterFormat'_in_the_style_file.=Il_formato_del_carattere_\u00e8_controllato_dalla_propriet\u00e0_della_citazione_'CitationCharacterFormat'_nel_file_di_stile.
@@ -1453,7 +1396,6 @@ JSTOR_import_cancelled=Inportazione_da_JSTOR_annullata
 HTML_list=Lista_HTML
 Click_group_to_toggle_membership_of_selected_entries=Cliccare_sul_gruppo_per_invertire_l'appartenenza_delle_voci_selezionate
 Use_EMACS_23_insertion_string=Usa_la_stringa_di_inserimento_EMACS_23
-Normalize_to_BibTeX_name_format=Normalizzare_con_il_formato_dei_nomi_BibTeX
 If_possible,_normalize_this_list_of_names_to_conform_to_standard_BibTeX_name_formatting=Se_possiblile,_normalizzare_questa_lista_di_nomi_in_accordo_con_lo_standard_di_formattazione_dei_nomi_BibTeX
 Could_not_open_%0=Impossiblie_aprire_%0
 Unknown_import_format=Formato_di_importazione_sconosciuto
@@ -1462,7 +1404,6 @@ An_Error_occurred_while_fetching_from_INSPIRE_source_(%0)\:=Si_\u00e8_verificato
 Error_while_fetching_from_Inspire\:_=Errore_nel_recupero_dei_dati_da_INSPIRE:
 Web_search=Ricerca_sul_Web
 Autocomplete_names=Autocompletamento_dei_nomi
-You_must_select_either_a_valid_style_file,_or_use_the_default_style.=Selezionare_un_file_di_stile_valido_oppure_utilizzare_lo_stile_predefinito
 
 Default_style=Stile_predefinito
 Choose_style_file_directly=Scegliere_la_cartella_dei_file_di_stile
@@ -1502,7 +1443,6 @@ Autocompletion_options=Opzioni_di_autocompletamento
 Autocomplete_after_following_number_of_characters=Attiva_autocompletamento_dopo_il_seguente_numero_di_caratteri
 Name_format_used_for_autocompletion=Formato_dei_nomi_usato_per_l'autocompletamento
 Treatment_of_first_names=Gestione_dei_nomi
-No_icon_found_for_%0=Nessuna_icona_trovata_per_%0
 Cleanup_entries=Ripulisci_voci
 Move_DOIs_from_note_and_URL_field_to_DOI_field_and_remove_http_prefix=Sposta_i_DOI_dai_campi_note_e_URL_al_campo_DOI_e_rimuovi_il_prefisso_'http'
 Format_content_of_month_field_to_#mon#=Formatta_il_contenuto_del_campo_'month'_nella_forma_'#mon#'
@@ -1515,7 +1455,6 @@ Doing_a_cleanup_for_%0_entries...=Ripulitura_per_%0_voci...
 No_entry_needed_a_clean_up=Nessuna_voce_necessita_ripulitura
 One_entry_needed_a_clean_up=Una_voce_necessita_ripulitura
 %0_entries_needed_a_clean_up=%0_voci_necessitano_ripulitura
-Imported_=Importato
 Minimize_to_system_tray=Minimizza_nell'area_di_notifica
 
 This_feature_generates_a_new_database_based_on_which_entries_are_needed_in_an_existing_LaTeX_document.=Questa_funzione_genera_un_nuovo_database_basato_sulle_voci_necessarie_in_un_documento_LaTeX_esistente.
@@ -1523,9 +1462,6 @@ You_need_to_select_one_of_your_open_databases_from_which_to_choose_entries,_as_w
 Automatically_assign_new_entry_to_selected_groups=Assegna_automaticamente_la_nuova_voce_ai_gruppi_selezionati
 Error_importing_from_database=Errore_di_importazione_dal_database
 
-Incomplete_search_results=Risultati_della_ricerca_incompleti
-%0_entries_were_found,_but_only_%1_of_these_could_be_resolved.=Trovate_%0_voci,_ma_\u00e8_stato_possibile_risolvere_solo_%1_di_queste.
-
 Error_downloading_file_'%0'=Errore_nel_corso_del_download_del_file_'%0'
 Download_failed=Download_fallito
 
@@ -1551,10 +1487,9 @@ Unable_to_clear_preferences.=Impossibile_reimpostatare_le_preferenze.
 
 Reset_preferences_(key1,key2,..._or_'all')=Reimposta_le_preferenze_(chiave1,chiave2,..._oppure_'all')
 Find_unlinked_files=Trovati_file_non_collegati
-Select_All=Seleziona_tutto
-Unselect_All=Deseleziona_tutto
-Expand_All=Espandi_tutto
-Collapse_All=Comprimi_tutto
+Unselect_all=Deseleziona_tutto
+Expand_all=Espandi_tutto
+Collapse_all=Comprimi_tutto
 Select_Directory=Seleziona_cartella
 Choose_Directory=Scegli_cartella
 Use_the_selected_directory_to_start_with_the_search.=Usa_la_cartella_selezionata_per_iniziare_la_ricerca.
@@ -1615,7 +1550,6 @@ Priority_medium=Priorit\u00e0_media
 Quality=Qualit\u00e0
 Rank=Valutazione
 Relevance=Attinenza
-Set_priority=Assegna_priorit\u00e0
 Set_priority_to_high=Assegna_priorit\u00e0_alta
 Set_priority_to_low=Assegna_priorit\u00e0_bassa
 Set_priority_to_medium=Assegna_priorit\u00e0_media
@@ -1648,7 +1582,6 @@ Correct_the_entry,_and_reopen_editor_to_display/edit_source.=Correggi_la_voce_e_
 Could_not_connect_to_a_running_gnuserv_process._Make_sure_that_Emacs_or_XEmacs_is_running,<BR>and_that_the_server_has_been_started_(by_running_the_command_'server-start'/'gnuserv-start').=Impossibile_la_connessione_a_un_processo_gnuserv_in_esecuzione._Accertarsi_che_Emacs_o_XEmacs_siano_in_esecuzione,<BR>e_che_il_server_sia_stato_avviato_(con_il_comando_'server-start'/'gnuserv-start').
 Could_not_connect_to_running_OpenOffice.\nMake_sure_you_have_installed_OpenOffice_with_Java_support.\nIf_connecting_manually,_please_verify_program_and_library_paths.\n\nError_message\:_=Impossibile_la_connessione_ad_OpenOffice.\nAssicurarsi_che_OpenOffice_sia_installato_con_supporto_per_Java.\nSe_si_effettua_la_connessione_manualmente_verificare_i_percorsi_al_programma_e_alla_libreria.\n\nMessaggio_di_errore:_
 Created_group_"%0".=Creato_il_gruppo_"%0".
-File_has_been_updated_externally._Are_you_sure_you_want_to_save?=Il_file_\u00e8_stato_aggiornato_esternamente._Sicuro_di_voler_salvare?
 If_a_pasted_or_imported_entry_already_has_the_field_set,_overwrite.=Se_la_voce_incollata_o_importata_ha_il_campo_gi\u00e0_impostato,_sovrascrivere.
 Import_Metadata_From_PDF=Importa_metadati_dal_file_PDF
 Not_connected_to_any_Writer_document._Please_make_sure_a_document_is_open,_and_use_the_'Select_Writer_document'_button_to_connect_to_it.=Non_connesso_ad_alcun_documento_Writer._Assicurarsi_che_un_documento_sia_aperto_e_connetterlo_con_il_bottone_"Selezionare_il_documento_Writer".
@@ -1683,4 +1616,62 @@ An_Error_occurred_while_parsing_abstract=Si_\u00e8_verificato_un_errore_durante_
 Unknown_DiVA_entry\:_'%0'.=Voce_DiVA_sconosciuta:_'%0'
 Get_BibTeX_entry_from_DiVA=Recupera_la_voce_BibTeX_da_DiVA
 Log=Registro
-Remove_unneccessary_$,_{,_and_}=
+
+ISO_690=
+
+Add_brackets_and_replace_separators_with_their_non-breaking_version_for_units=
+Add_new_entry_and_keep_both_old_entries=
+Cancelled_merging_entries=
+Error_in_entry=
+First_entry=
+Format_units_by_adding_non-breaking_separators_and_keeping_the_correct_case_on_search=
+Merge_entries=
+Merged_entries_into_a_new_and_kept_the_old=
+Merged_entries_into_a_new_and_removed_the_old=
+Merged_entry=
+None=
+Parse=
+Remove_unneccessary_$,_{,_and_}_and_move_adjacent_numbers_into_equations=
+Replace_old_entries_with_new_entry=
+Result=
+Second_entry=
+Show_DOI_first=
+Show_URL_first=
+Use_1st=
+Use_2nd=
+Use_Emacs_key_bindings=
+You_have_to_choose_exactly_two_entries_to_merge.=
+
+Update_timestamp_on_modification=
+change_field=
+
+All_key_bindings_will_be_reset_to_their_defaults.=
+Automatically_set_file_links=
+Continue?=
+Resetting_all_key_bindings=
+Save_entries_ordered_by_title=
+Export_entries_ordered_by_title=
+Quotes=
+Curly_Brackets=
+Include_empty_fields=
+Field_saving_options=
+Field_value_delimiter._E.g.,_"author\={x}"_or_"author\='x'"=
+Run_Unicode_converter_on_title,_author(s),_and_abstract=
+
+Database_has_changed._Do_you_want_to_save_before_closing?=
+Host=
+Invalid_setting=
+Network=
+Please_specify_both_hostname_and_port=
+Port=
+Start_field_contents_in_same_column=
+Use_camel_case_for_field_names_(e.g.,_"HowPublished"_instead_of_"howpublished")=
+Use_custom_proxy_configuration=
+Clear_connection_settings=
+Cleared_connection_settings.=
+Rebind_C-a,_too=
+
+Show_number_of_elements_contained_in_each_group=
+
+Open_folder=
+Opened_%0_folder(s).=
diff --git a/src/resource/JabRef_ja.properties b/src/resource/JabRef_ja.properties
index 98a5326..bed189d 100644
--- a/src/resource/JabRef_ja.properties
+++ b/src/resource/JabRef_ja.properties
@@ -1,5 +1,5 @@
 #!
-#! created/edited by Popeye version 0.54 (popeye.sourceforge.net)
+#! created/edited by Popeye version 0.55 (https://github.com/koppor/popeye)
 #! encoding:ISO-8859-1
 
 %0_contains_the_Regular_Expression_<b>%1</b>=%0\u306b\u306f\u3001\u6b63\u898f\u8868\u73fe<b>%1</b>\u304c\u542b\u307e\u308c\u3066\u3044\u307e\u3059
@@ -51,9 +51,9 @@ Action=\u30a2\u30af\u30b7\u30e7\u30f3
 
 Add=\u8ffd\u52a0
 
-Add_a_(compiled)_custom_ImportFormat_class_from_a_class_path._\nThe_path_need_not_be_on_the_classpath_of_JabRef.=\uff08\u30b3\u30f3\u30d1\u30a4\u30eb\u3057\u305f\uff09\u30ab\u30b9\u30bf\u30e0ImportFormat\u30af\u30e9\u30b9\u3092\u30af\u30e9\u30b9\u30d1\u30b9\u304b\u3089\u8ffd\u52a0\u3057\u307e\u3059\u3002\n\u3053\u306e\u30d1\u30b9\u306f\u3001JabRef\u306e\u30af\u30e9\u30b9\u30d1\u30b9\u306b\u3042\u308b\u3068\u306f\u9650\u308a\u307e\u305b\u3093\u3002
+Add_a_(compiled)_custom_ImportFormat_class_from_a_class_path._\nThe_path_need_not_be_on_the_classpath_of_JabRef.=(\u30b3\u30f3\u30d1\u30a4\u30eb\u3057\u305f)\u81ea\u4f5cImportFormat\u30af\u30e9\u30b9\u3092\u30af\u30e9\u30b9\u30d1\u30b9\u304b\u3089\u8ffd\u52a0\u3057\u307e\u3059\u3002\n\u3053\u306e\u30d1\u30b9\u306f\u3001JabRef\u306e\u30af\u30e9\u30b9\u30d1\u30b9\u306b\u3042\u308b\u3068\u306f\u9650\u308a\u307e\u305b\u3093\u3002
 
-Add_a_(compiled)_custom_ImportFormat_class_from_a_Zip-archive.\nThe_Zip-archive_need_not_be_on_the_classpath_of_JabRef.=\uff08\u30b3\u30f3\u30d1\u30a4\u30eb\u3057\u305f\uff09\u30ab\u30b9\u30bf\u30e0ImportFormat\u30af\u30e9\u30b9\u3092Zip\u66f8\u5eab\u304b\u3089\u8ffd\u52a0\u3057\u307e\u3059\u3002\n\u3053\u306eZip\u66f8\u5eab\u306f\u3001JabRef\u306e\u30af\u30e9\u30b9\u30d1\u30b9\u306b\u3042\u308b\u3068\u306f\u9650\u308a\u307e\u305b\u3093\u3002
+Add_a_(compiled)_custom_ImportFormat_class_from_a_Zip-archive.\nThe_Zip-archive_need_not_be_on_the_classpath_of_JabRef.=(\u30b3\u30f3\u30d1\u30a4\u30eb\u3057\u305f)\u81ea\u4f5cImportFormat\u30af\u30e9\u30b9\u3092Zip\u66f8\u5eab\u304b\u3089\u8ffd\u52a0\u3057\u307e\u3059\u3002\n\u3053\u306eZip\u66f8\u5eab\u306f\u3001JabRef\u306e\u30af\u30e9\u30b9\u30d1\u30b9\u306b\u3042\u308b\u3068\u306f\u9650\u308a\u307e\u305b\u3093\u3002
 
 add_entries_to_group=\u9805\u76ee\u3092\u30b0\u30eb\u30fc\u30d7\u306b\u8ffd\u52a0
 
@@ -82,7 +82,7 @@ Added_string=\u6587\u5b57\u5217\u3092\u8ffd\u52a0\u3057\u307e\u3057\u305f:
 Additionally,_entries_whose_<b>%0</b>_field_does_not_contain_<b>%1</b>_can_be_assigned_manually_to_this_group_by_selecting_them_then_using_either_drag_and_drop_or_the_context_menu._This_process_adds_the_term_<b>%1</b>_to_each_entry's_<b>%0</b>_field._Entries_can_be_removed_manually_from_this_group_by_selecting_them_then_using_the_context_menu._This_process_removes_the_term_<b>%1</b>_from_each_entry's_<b>%0</b>_field.=\u3055\u3089\u306b\u3001<b>%0</b>\u30d5\u30a3\u30fc\u30eb\u30c9\u306b<b [...]
 
 Advanced=\u8a73\u7d30\u8a2d\u5b9a
-All_custom_file_types_will_be_lost._Proceed?=\u500b\u4eba\u8a2d\u5b9a\u306e\u30d5\u30a1\u30a4\u30eb\u578b\u306f\u3059\u3079\u3066\u5931\u308f\u308c\u307e\u3059\u3002\u7d9a\u3051\u307e\u3059\u304b\uff1f
+All_custom_file_types_will_be_lost._Proceed?=\u81ea\u4f5c\u30d5\u30a1\u30a4\u30eb\u578b\u306f\u3059\u3079\u3066\u5931\u308f\u308c\u307e\u3059\u3002\u7d9a\u3051\u307e\u3059\u304b\uff1f
 
 All_Entries=\u5168\u9805\u76ee
 
@@ -112,7 +112,7 @@ Append_contents_from_a_BibTeX_database_into_the_currently_viewed_database=BibTeX
 
 Append_database=\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u3092\u8ffd\u52a0
 
-append_the_selected_text_to_bibtex_key=\u9078\u629e\u3057\u305f\u30c6\u30ad\u30b9\u30c8\u3092bibtex\u30ad\u30fc\u306b\u8ffd\u52a0
+append_the_selected_text_to_bibtex_key=\u9078\u629e\u3057\u305f\u30c6\u30ad\u30b9\u30c8\u3092BibTeX\u9375\u306b\u8ffd\u52a0
 Application=\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3
 
 Apply=\u9069\u7528
@@ -134,22 +134,22 @@ Attach_%0_file=%0\u30d5\u30a1\u30a4\u30eb\u3092\u6dfb\u4ed8
 
 Attach_URL=URL\u3092\u6dfb\u4ed8
 
-Attempt_to_autoset_%0_links_for_your_entries._Autoset_works_if_a_%0_file_in_your_%0_directory_or_a_subdirectory<BR>is_named_identically_to_an_entry's_BibTeX_key,_plus_extension.=\u3053\u308c\u306f\u3001\u4f7f\u7528\u4e2d\u306e\u9805\u76ee\u306e%0\u30ea\u30f3\u30af\u3092\u81ea\u52d5\u8a2d\u5b9a\u3057\u307e\u3059\u3002\u81ea\u52d5\u8a2d\u5b9a\u306f\u3001%0\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u306a\u3044\u3057\u4e0b\u5c64\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u306e<BR>%0\u30d5\u30a1\u30a4\u30 [...]
+Attempt_to_autoset_%0_links_for_your_entries._Autoset_works_if_a_%0_file_in_your_%0_directory_or_a_subdirectory<BR>is_named_identically_to_an_entry's_BibTeX_key,_plus_extension.=\u3053\u308c\u306f\u3001\u4f7f\u7528\u4e2d\u306e\u9805\u76ee\u306e%0\u30ea\u30f3\u30af\u3092\u81ea\u52d5\u8a2d\u5b9a\u3057\u307e\u3059\u3002\u81ea\u52d5\u8a2d\u5b9a\u306f\u3001%0\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u306a\u3044\u3057\u4e0b\u5c64\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u306e<BR>%0\u30d5\u30a1\u30a4\u30 [...]
 Attempting_SQL_export...=SQL\u3078\u306e\u66f8\u304d\u51fa\u3057\u3092\u8a66\u307f\u3066\u3044\u307e\u3059...
 
 Auto=\u81ea\u52d5
 
 Autodetect_format=\u66f8\u5f0f\u3092\u81ea\u52d5\u691c\u51fa
 
-Autogenerate_BibTeX_key=BibTeX\u30ad\u30fc\u3092\u81ea\u52d5\u751f\u6210
-Autogenerate_BibTeX_keys=BibTeX\u30ad\u30fc\u3092\u81ea\u52d5\u751f\u6210
+Autogenerate_BibTeX_key=BibTeX\u9375\u3092\u81ea\u52d5\u751f\u6210
+Autogenerate_BibTeX_keys=BibTeX\u9375\u3092\u81ea\u52d5\u751f\u6210
 
 Autogenerate_groups=\u30b0\u30eb\u30fc\u30d7\u3092\u81ea\u52d5\u751f\u6210
 
-autogenerate_keys=\u30ad\u30fc\u3092\u81ea\u52d5\u751f\u6210
-Autolink_files_with_names_starting_with_the_BibTeX_key=BibTeX\u30ad\u30fc\u3067\u59cb\u307e\u308b\u30d5\u30a1\u30a4\u30eb\u540d\u3092\u6301\u3064\u30d5\u30a1\u30a4\u30eb\u3092\u81ea\u52d5\u30ea\u30f3\u30af
+autogenerate_keys=\u9375\u3092\u81ea\u52d5\u751f\u6210
+Autolink_files_with_names_starting_with_the_BibTeX_key=BibTeX\u9375\u3067\u59cb\u307e\u308b\u30d5\u30a1\u30a4\u30eb\u540d\u3092\u6301\u3064\u30d5\u30a1\u30a4\u30eb\u3092\u81ea\u52d5\u30ea\u30f3\u30af
 
-Autolink_only_files_that_match_the_BibTeX_key=BibTeX\u30ad\u30fc\u306b\u4e00\u81f4\u3059\u308b\u30d5\u30a1\u30a4\u30eb\u306e\u307f\u3092\u81ea\u52d5\u30ea\u30f3\u30af
+Autolink_only_files_that_match_the_BibTeX_key=BibTeX\u9375\u306b\u4e00\u81f4\u3059\u308b\u30d5\u30a1\u30a4\u30eb\u306e\u307f\u3092\u81ea\u52d5\u30ea\u30f3\u30af
 
 Automatically_create_groups=\u30b0\u30eb\u30fc\u30d7\u3092\u81ea\u52d5\u751f\u6210
 
@@ -188,13 +188,11 @@ Background_color_for_required_fields=\u5fc5\u9808\u9805\u76ee\u306e\u80cc\u666f\
 Backup_old_file_when_saving=\u4fdd\u5b58\u6642\u306b\u65e7\u30d5\u30a1\u30a4\u30eb\u3092\u30d0\u30c3\u30af\u30a2\u30c3\u30d7
 Beta_version=\u30d9\u30fc\u30bf\u7248
 
-Bibkey_to_filename_conversion=Bibkey\u304b\u3089\u30d5\u30a1\u30a4\u30eb\u540d\u3078\u306e\u5909\u63db
+BibTeX_key=BibTeX\u9375
 
-BibTeX_key=BibTeX\u30ad\u30fc
+BibTeX_key_is_unique.=BibTeX\u9375\u306f\u4e00\u610f\u3067\u3059\u3002
 
-BibTeX_key_is_unique.=BibTeX\u30ad\u30fc\u306f\u4e00\u610f\u3067\u3059\u3002
-
-BibTeX_key_not_set._Enter_a_name_for_the_downloaded_file=BibTeX\u30ad\u30fc\u304c\u8a2d\u5b9a\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002\u30c0\u30a6\u30f3\u30ed\u30fc\u30c9\u3057\u305f\u30d5\u30a1\u30a4\u30eb\u306b\u4ed8\u3051\u308b\u540d\u79f0\u3092\u5165\u529b\u3057\u3066\u304f\u3060\u3055\u3044\u3002
+BibTeX_key_not_set._Enter_a_name_for_the_downloaded_file=BibTeX\u9375\u304c\u8a2d\u5b9a\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002\u30c0\u30a6\u30f3\u30ed\u30fc\u30c9\u3057\u305f\u30d5\u30a1\u30a4\u30eb\u306b\u4ed8\u3051\u308b\u540d\u79f0\u3092\u5165\u529b\u3057\u3066\u304f\u3060\u3055\u3044\u3002
 
 BibTeX_source=BibTeX\u30bd\u30fc\u30b9
 
@@ -207,11 +205,9 @@ Browse=\u4e00\u89a7
 
 by=\u7f6e\u63db\u6587\u5b57\u5217
 
-Calling_external_viewer...=\u5916\u90e8\u30d3\u30e5\u30fc\u30a2\u30fc\u3092\u547c\u3073\u51fa\u3057\u3066\u3044\u307e\u3059...
-
 Cancel=\u53d6\u6d88
 
-Cannot_add_entries_to_group_without_generating_keys._Generate_keys_now?=\u30ad\u30fc\u3092\u751f\u6210\u3057\u306a\u3051\u308c\u3070\u9805\u76ee\u3092\u30b0\u30eb\u30fc\u30d7\u306b\u8ffd\u52a0\u3059\u308b\u3053\u3068\u306f\u3067\u304d\u307e\u305b\u3093\u3002\u3053\u3053\u3067\u30ad\u30fc\u3092\u751f\u6210\u3057\u307e\u3059\u304b\uff1f
+Cannot_add_entries_to_group_without_generating_keys._Generate_keys_now?=\u9375\u3092\u751f\u6210\u3057\u306a\u3051\u308c\u3070\u9805\u76ee\u3092\u30b0\u30eb\u30fc\u30d7\u306b\u8ffd\u52a0\u3059\u308b\u3053\u3068\u306f\u3067\u304d\u307e\u305b\u3093\u3002\u3053\u3053\u3067\u9375\u3092\u751f\u6210\u3057\u307e\u3059\u304b\uff1f
 
 Cannot_merge_this_change=\u3053\u306e\u5909\u66f4\u3092\u7d71\u5408\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u305b\u3093
 
@@ -236,7 +232,7 @@ Change_case=\u5927\u5c0f\u6587\u5b57\u3092\u5207\u308a\u66ff\u3048
 Change_entry_type=\u9805\u76ee\u578b\u3092\u5909\u66f4
 Change_file_type=\u30d5\u30a1\u30a4\u30eb\u578b\u3092\u5909\u66f4
 
-change_key=\u30ad\u30fc\u3092\u5909\u66f4
+change_key=\u9375\u3092\u5909\u66f4
 
 Change_of_Grouping_Method=\u30b0\u30eb\u30fc\u30d7\u6cd5\u3092\u5909\u66f4
 
@@ -306,7 +302,6 @@ Command_line_id=\u30b3\u30de\u30f3\u30c9\u30e9\u30a4\u30f3ID
 Complete_record=\u30ec\u30b3\u30fc\u30c9\u3092\u5b8c\u6210\u3059\u308b
 Connect=\u63a5\u7d9a
 Connect_to_SQL_database=SQL\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u306b\u63a5\u7d9a
-Connect_to_SQL_Database=SQL\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u306b\u63a5\u7d9a
 Connection_to_IEEEXplore_failed=IEEEXPlore\u3078\u306e\u63a5\u7d9a\u306b\u5931\u6557\u3057\u307e\u3057\u305f
 
 Contained_in=\u6240\u5728
@@ -317,23 +312,19 @@ Copied=\u30b3\u30d4\u30fc\u3057\u307e\u3057\u305f:
 
 Copied_cell_contents=\u30bb\u30eb\u306e\u5185\u5bb9\u3092\u30b3\u30d4\u30fc\u3057\u307e\u3057\u305f
 
-Copied_key=\u30ad\u30fc\u3092\u30b3\u30d4\u30fc\u3057\u307e\u3057\u305f
+Copied_key=\u9375\u3092\u30b3\u30d4\u30fc\u3057\u307e\u3057\u305f
 
-Copied_keys=\u30ad\u30fc\u3092\u30b3\u30d4\u30fc\u3057\u307e\u3057\u305f
+Copied_keys=\u9375\u3092\u30b3\u30d4\u30fc\u3057\u307e\u3057\u305f
 
 Copy=\u30b3\u30d4\u30fc
 
-Copy_BibTeX_key=BibTeX\u30ad\u30fc\u3092\u30b3\u30d4\u30fc
+Copy_BibTeX_key=BibTeX\u9375\u3092\u30b3\u30d4\u30fc
 Copy_file_to_file_directory.=\u30d5\u30a1\u30a4\u30eb\u3092\u30d5\u30a1\u30a4\u30eb\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u306b\u30b3\u30d4\u30fc\u3057\u307e\u3059\u3002
 Copy_files_to_file_directory.=\u30d5\u30a1\u30a4\u30eb\u3092\u30d5\u30a1\u30a4\u30eb\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u306b\u30b3\u30d4\u30fc\u3057\u307e\u3059\u3002
 
 Copy_to_clipboard=\u30af\u30ea\u30c3\u30d7\u30dc\u30fc\u30c9\u306b\u30b3\u30d4\u30fc\u3057\u307e\u3059\u3002
 
 Could_not_call_executable=\u5b9f\u884c\u30d5\u30a1\u30a4\u30eb\u3092\u547c\u3073\u51fa\u305b\u307e\u305b\u3093\u3067\u3057\u305f
-
-Could_not_connect_to_a_running_gnuserv_process._Make_sure_that_Emacs_or_XEmacs_is_running,<BR>and_that_the_server_has_been_started_(by_running_the_command_'gnuserv-start').=\u5b9f\u884c\u4e2d\u306egnuserv\u30d7\u30ed\u30bb\u30b9\u306b\u63a5\u7d9a\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002Emacs\u3042\u308b\u3044\u306fXEmacs\u304c\u5b9f\u884c\u4e2d\u3067\u3042\u308b\u3053\u3068\u3092\u78ba\u8a8d\u3057\u3001<BR>\uff08\u300cgnuserv-start\u300d\u30b3\u30de\u30f3\u30c9\u3092\u5b9f\u [...]
-
-Could_not_connect_to_host_=\u4ee5\u4e0b\u306e\u30db\u30b9\u30c8\u306b\u63a5\u7d9a\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f:_
 Could_not_connect_to_Vim_server._Make_sure_that_Vim_is_running<BR>with_correct_server_name.=Vim\u30b5\u30fc\u30d0\u30fc\u306b\u63a5\u7d9a\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002Vim\u304c\u6b63\u3057\u3044\u30b5\u30fc\u30d0\u30fc\u540d\u3067\u5b9f\u884c\u3055\u308c\u3066\u3044\u308b\u3053\u3068\u3092\u78ba\u8a8d\u3057\u3066\u304f\u3060\u3055\u3044\u3002
 
 Could_not_export_file=\u30d5\u30a1\u30a4\u30eb\u3092\u66f8\u304d\u51fa\u305b\u307e\u305b\u3093\u3067\u3057\u305f
@@ -361,8 +352,6 @@ Could_not_run_the_'vim'_program.=\u300cvim\u300d\u30d7\u30ed\u30b0\u30e9\u30e0\u
 Could_not_save_file=\u30d5\u30a1\u30a4\u30eb\u3092\u4fdd\u5b58\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f
 Could_not_save_file._Character_encoding_'%0'_is_not_supported.=\u30d5\u30a1\u30a4\u30eb\u3092\u4fdd\u5b58\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002\u6587\u5b57\u30a8\u30f3\u30b3\u30fc\u30c7\u30a3\u30f3\u30b0\u300c%0\u300d\u306f\u30b5\u30dd\u30fc\u30c8\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002
 
-Create_group=\u30b0\u30eb\u30fc\u30d7\u3092\u751f\u6210
-
 Created_groups.=\u30b0\u30eb\u30fc\u30d7\u3092\u751f\u6210\u3057\u307e\u3057\u305f\u3002
 
 crossreferenced_entries_included=\u76f8\u4e92\u53c2\u7167\u3057\u3066\u3044\u308b\u9805\u76ee\u3092\u53d6\u308a\u8fbc\u307f\u307e\u3057\u305f
@@ -371,17 +360,15 @@ Current_content=\u73fe\u5728\u306e\u5185\u5bb9
 
 Current_value=\u73fe\u5728\u5024
 
-Custom_entry_types=\u500b\u4eba\u8a2d\u5b9a\u306e\u9805\u76ee\u578b
+Custom_entry_types=\u81ea\u4f5c\u9805\u76ee\u578b
 
-Custom_entry_types_found_in_file=\u500b\u4eba\u8a2d\u5b9a\u306e\u9805\u76ee\u578b\u304c\u30d5\u30a1\u30a4\u30eb\u4e2d\u306b\u898b\u3064\u304b\u308a\u307e\u3057\u305f
-Custom_icon_theme=\u500b\u4eba\u8a2d\u5b9a\u306e\u30a2\u30a4\u30b3\u30f3\u30c6\u30fc\u30de
-Custom_icon_theme_file=\u500b\u4eba\u8a2d\u5b9a\u306e\u30a2\u30a4\u30b3\u30f3\u30c6\u30fc\u30de\u30d5\u30a1\u30a4\u30eb
+Custom_entry_types_found_in_file=\u81ea\u4f5c\u9805\u76ee\u578b\u304c\u30d5\u30a1\u30a4\u30eb\u4e2d\u306b\u898b\u3064\u304b\u308a\u307e\u3057\u305f
 
-Custom_importers=\u500b\u4eba\u8a2d\u5b9a\u306e\u8aad\u307f\u8fbc\u307f
+Custom_importers=\u81ea\u4f5c\u8aad\u8fbc
 
-Customize_entry_types=\u9805\u76ee\u578b\u3092\u500b\u4eba\u8a2d\u5b9a\u3059\u308b
+Customize_entry_types=\u9805\u76ee\u578b\u3092\u81ea\u4f5c
 
-Customize_key_bindings=\u30ad\u30fc\u5272\u308a\u5f53\u3066\u3092\u500b\u4eba\u8a2d\u5b9a\u3059\u308b
+Customize_key_bindings=\u30ad\u30fc\u5272\u5f53\u3092\u81ea\u4f5c
 
 Cut=\u5207\u308a\u53d6\u308a
 
@@ -394,8 +381,6 @@ Database_\:=\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9:
 
 Database_encoding=\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u306e\u30a8\u30f3\u30b3\u30fc\u30c7\u30a3\u30f3\u30b0
 
-Database_has_changed._Do_you_want_to_save_before_closing?=\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u306b\u5909\u66f4\u304c\u52a0\u3048\u3089\u308c\u307e\u3057\u305f\u3002\u9589\u3058\u308b\u524d\u306b\u4fdd\u5b58\u3057\u307e\u3059\u304b\uff1f
-
 Database_properties=\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u7279\u6027
 
 Date_format=\u65e5\u4ed8\u66f8\u5f0f
@@ -415,7 +400,7 @@ Define_'%0'=\u300c'%0\u300d\u3092\u5b9a\u7fa9
 
 Delete=\u524a\u9664
 
-Delete_custom_format=\u500b\u4eba\u8a2d\u5b9a\u306e\u66f8\u5f0f\u3092\u524a\u9664
+Delete_custom_format=\u81ea\u4f5c\u5f62\u5f0f\u3092\u524a\u9664
 
 delete_entries=\u9805\u76ee\u3092\u524a\u9664
 
@@ -469,7 +454,7 @@ Do_not_import_entry=\u9805\u76ee\u3092\u8aad\u307f\u8fbc\u307e\u306a\u3044
 
 Do_not_open_any_files_at_startup=\u8d77\u52d5\u6642\u306b\u30d5\u30a1\u30a4\u30eb\u3092\u958b\u304b\u306a\u3044
 
-Do_not_overwrite_existing_keys=\u65e2\u5b58\u306e\u30ad\u30fc\u306f\u4e0a\u66f8\u304d\u3057\u306a\u3044
+Do_not_overwrite_existing_keys=\u65e2\u5b58\u306e\u9375\u306f\u4e0a\u66f8\u304d\u3057\u306a\u3044
 Do_not_show_splash_window_at_startup=\u8d77\u52d5\u6642\u306b\u30b9\u30d7\u30e9\u30c3\u30b7\u30e5\u30a6\u30a3\u30f3\u30c9\u30a6\u3092\u8868\u793a\u3057\u306a\u3044
 Do_not_show_these_options_in_the_future=\u3053\u308c\u3089\u306e\u30aa\u30d7\u30b7\u30e7\u30f3\u306f\u3082\u3046\u8868\u793a\u3057\u306a\u3044
 
@@ -492,13 +477,9 @@ Downloading...=\u30c0\u30a6\u30f3\u30ed\u30fc\u30c9\u4e2d\u3067\u3059\u2026
 Drag_and_Drop_Error=\u30c9\u30e9\u30c3\u30b0\u30a2\u30f3\u30c9\u30c9\u30ed\u30c3\u30d7\u30a8\u30e9\u30fc
 Drop_%0=%0\u3092\u30c9\u30ed\u30c3\u30d7
 
-duplicate_BibTeX_key=\u91cd\u8907BibTeX\u30ad\u30fc
-
-Duplicate_BibTeX_key.=\u91cd\u8907\u3057\u305fBibTeX\u30ad\u30fc\u3067\u3059\u3002
+Duplicate_BibTeX_key._Grouping_may_not_work_for_this_entry.=\u91cd\u8907\u3057\u305fBibTeX\u9375\u3067\u3059\u3002\u3053\u306e\u9805\u76ee\u306e\u30b0\u30eb\u30fc\u30d7\u5316\u306f\u52d5\u4f5c\u3057\u306a\u3044\u53ef\u80fd\u6027\u304c\u3042\u308a\u307e\u3059\u3002
 
-Duplicate_BibTeX_key._Grouping_may_not_work_for_this_entry.=\u91cd\u8907\u3057\u305fBibTeX\u30ad\u30fc\u3067\u3059\u3002\u3053\u306e\u9805\u76ee\u306e\u30b0\u30eb\u30fc\u30d7\u5316\u306f\u52d5\u4f5c\u3057\u306a\u3044\u53ef\u80fd\u6027\u304c\u3042\u308a\u307e\u3059\u3002
-
-Duplicate_Key_Warning=\u91cd\u8907\u30ad\u30fc\u306e\u8b66\u544a
+Duplicate_Key_Warning=\u91cd\u8907\u9375\u306e\u8b66\u544a
 
 Duplicate_pairs_found=\u91cd\u8907\u5bfe\u304c\u898b\u3064\u304b\u308a\u307e\u3057\u305f
 
@@ -520,7 +501,7 @@ Each_line_must_be_on_the_following_form=\u5404\u884c\u306f\u4ee5\u4e0b\u306e\u5f
 
 Edit=\u7de8\u96c6
 
-Edit_custom_export=\u500b\u4eba\u8a2d\u5b9a\u306e\u66f8\u304d\u51fa\u3057\u3092\u7de8\u96c6
+Edit_custom_export=\u81ea\u4f5c\u66f8\u51fa\u3092\u7de8\u96c6
 Edit_entry=\u9805\u76ee\u3092\u7de8\u96c6
 Edit_file_link=\u30d5\u30a1\u30a4\u30eb\u30ea\u30f3\u30af\u3092\u7de8\u96c6
 Edit_file_type=\u30d5\u30a1\u30a4\u30eb\u578b\u3092\u7de8\u96c6
@@ -533,15 +514,11 @@ Edit_preamble=\u30d7\u30ea\u30a2\u30f3\u30d6\u30eb\u3092\u7de8\u96c6
 Edit_strings=\u6587\u5b57\u5217\u3092\u7de8\u96c6
 Editor_options=\u30a8\u30c7\u30a3\u30bf\u30aa\u30d7\u30b7\u30e7\u30f3
 
-empty_BibTeX_key=BibTeX\u30ad\u30fc\u3092\u7a7a\u306b\u3059\u308b
-
-Empty_BibTeX_key.=BibTeX\u30ad\u30fc\u3092\u7a7a\u306b\u3059\u308b\u3002
+empty_BibTeX_key=BibTeX\u9375\u3092\u7a7a\u306b\u3059\u308b
 
-Empty_BibTeX_key._Grouping_may_not_work_for_this_entry.=BibTeX\u30ad\u30fc\u3092\u7a7a\u306b\u3057\u307e\u3059\u3002\u3053\u306e\u9805\u76ee\u306b\u5bfe\u3057\u3066\u306f\u30b0\u30eb\u30fc\u30d7\u5316\u306f\u6a5f\u80fd\u3057\u306a\u3044\u304b\u3082\u3057\u308c\u307e\u305b\u3093\u3002
+Empty_BibTeX_key._Grouping_may_not_work_for_this_entry.=BibTeX\u9375\u3092\u7a7a\u306b\u3057\u307e\u3059\u3002\u3053\u306e\u9805\u76ee\u306b\u5bfe\u3057\u3066\u306f\u30b0\u30eb\u30fc\u30d7\u5316\u306f\u6a5f\u80fd\u3057\u306a\u3044\u304b\u3082\u3057\u308c\u307e\u305b\u3093\u3002
 
 empty_database=\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u306f\u7a7a\u3067\u3059
-
-Enable_source_editing=\u30bd\u30fc\u30b9\u7de8\u96c6\u3092\u6709\u52b9\u306b\u3059\u308b
 Enable_word/name_autocompletion=\u5358\u8a9e\u3068\u540d\u79f0\u306e\u81ea\u52d5\u88dc\u5b8c\u3092\u6709\u52b9\u306b\u3059\u308b
 
 Endnote=Endnote
@@ -556,7 +533,7 @@ Entries_cannot_be_manually_assigned_to_or_removed_from_this_group.=\u9805\u76ee\
 
 Entries_exported_to_clipboard=\u9805\u76ee\u3092\u30af\u30ea\u30c3\u30d7\u30dc\u30fc\u30c9\u306b\u66f8\u304d\u51fa\u3057\u307e\u3057\u305f:
 
-entries_have_undefined_BibTeX_key=\u9805\u76ee\u306b\u5b9a\u7fa9\u3055\u308c\u3066\u3044\u306a\u3044BibTeX\u30ad\u30fc\u304c\u3042\u308a\u307e\u3059
+entries_have_undefined_BibTeX_key=\u9805\u76ee\u306b\u5b9a\u7fa9\u3055\u308c\u3066\u3044\u306a\u3044BibTeX\u9375\u304c\u3042\u308a\u307e\u3059
 
 entries_into_new_database=\u9805\u76ee\u3092\u65b0\u898f\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u3078
 
@@ -582,7 +559,7 @@ Entry_types=\u9805\u76ee\u578b
 
 Error=\u30a8\u30e9\u30fc
 Error\:_=\u30a8\u30e9\u30fc:_
-Error_converting_Bibtex_to_XMP\:_%0=Bibtex\u304b\u3089XMP\u3078\u306e\u5909\u63db\u4e2d\u306b\u30a8\u30e9\u30fc\u767a\u751f:_%0
+Error_converting_BibTeX_to_XMP\:_%0=Bibtex\u304b\u3089XMP\u3078\u306e\u5909\u63db\u4e2d\u306b\u30a8\u30e9\u30fc\u767a\u751f:_%0
 Error_converting_XMP_to_'%0'...=XMP\u3092\u300c'%0\u300d\u306b\u5909\u63db\u4e2d\u306b\u30a8\u30e9\u30fc\u767a\u751f...
 Error_exporting_to_clipboard=\u30af\u30ea\u30c3\u30d7\u30dc\u30fc\u30c9\u66f8\u304d\u51fa\u3057\u4e2d\u306b\u30a8\u30e9\u30fc\u767a\u751f
 
@@ -596,7 +573,6 @@ Error_opening_file=\u30d5\u30a1\u30a4\u30eb\u3092\u958b\u304f\u969b\u306b\u30a8\
 Error_setting_field=\u30d5\u30a3\u30fc\u30eb\u30c9\u8a2d\u5b9a\u6642\u306b\u30a8\u30e9\u30fc\u767a\u751f
 Error_while_converting_BibtexEntry_to_XMP_%0=BibtexEntry\u3092XMP\u300c%0\u300d\u306b\u5909\u63db\u6642\u306b\u30a8\u30e9\u30fc\u767a\u751f
 Error_while_downloading_file\:=\u4ee5\u4e0b\u306e\u30d5\u30a1\u30a4\u30eb\u306e\u30c0\u30a6\u30f3\u30ed\u30fc\u30c9\u6642\u306b\u30a8\u30e9\u30fc\u767a\u751f:
-Error_while_fetching_from_OIA2=OIA2\u304b\u3089\u306e\u53d6\u5f97\u4e2d\u306b\u30a8\u30e9\u30fc\u767a\u751f
 Error_while_writing=\u66f8\u304d\u8fbc\u307f\u4e2d\u306b\u30a8\u30e9\u30fc\u767a\u751f
 Error_writing_to_%0_file(s).=%0\u30d5\u30a1\u30a4\u30eb\u3092\u66f8\u304d\u8fbc\u307f\u4e2d\u306b\u30a8\u30e9\u30fc\u767a\u751f
 Error_writing_XMP_to_file\:_%0=XMP\u3092\u30d5\u30a1\u30a4\u30eb\u306b\u66f8\u304d\u8fbc\u307f\u4e2d\u306b\u30a8\u30e9\u30fc\u767a\u751f:_%0
@@ -615,7 +591,7 @@ Expand_subtree=\u4e0b\u5c64\u30c4\u30ea\u30fc\u3092\u958b\u304f
 #previousentrynottranslated.Toviewit,openGroupinterfaceandclickonthe"newgroup"button
 Export=\u66f8\u304d\u51fa\u3059
 
-Export_name=\u66f8\u304d\u51fa\u3057\u306e\u540d\u79f0
+Export_name=\u66f8\u51fa\u540d
 
 Export_preferences=\u8a2d\u5b9a\u3092\u66f8\u304d\u51fa\u3059
 
@@ -658,8 +634,6 @@ Field_to_filter=\u30d5\u30a3\u30eb\u30bf\u3092\u639b\u3051\u308b\u30d5\u30a3\u30
 
 Field_to_group_by=\u30b0\u30eb\u30fc\u30d7\u5316\u3059\u308b\u30d5\u30a3\u30fc\u30eb\u30c9
 
-Fields=\u30d5\u30a3\u30fc\u30eb\u30c9
-
 File=\u30d5\u30a1\u30a4\u30eb
 
 file=\u30d5\u30a1\u30a4\u30eb
@@ -695,7 +669,7 @@ Finished_synchronizing_%0_links._Entries_changed%c_%1.=%0\u30ea\u30f3\u30af\u306
 Finished_writing_XMP-metadata._Wrote_to_%0_file(s).=XMP\u30e1\u30bf\u30c7\u30fc\u30bf\u3092\u66f8\u304d\u8fbc\u307f\u7d42\u308f\u308a\u307e\u3057\u305f\u3002%0\u30d5\u30a1\u30a4\u30eb\u306b\u66f8\u304d\u8fbc\u307f\u307e\u3057\u305f\u3002
 Finished_writing_XMP_for_%0_file_(%1_skipped,_%2_errors).=XMP\u3092%0\u30d5\u30a1\u30a4\u30eb\u306b\u66f8\u304d\u8fbc\u307f\u7d42\u308f\u308a\u307e\u3057\u305f\uff08%1\u30b9\u30ad\u30c3\u30d7\u30fb%2\u30a8\u30e9\u30fc\uff09\u3002
 
-First_select_the_entries_you_want_keys_to_be_generated_for.=\u30ad\u30fc\u3092\u751f\u6210\u3055\u305b\u305f\u3044\u9805\u76ee\u3092\u307e\u305a\u9078\u629e\u3057\u3066\u304f\u3060\u3055\u3044\u3002
+First_select_the_entries_you_want_keys_to_be_generated_for.=\u9375\u3092\u751f\u6210\u3055\u305b\u305f\u3044\u9805\u76ee\u3092\u307e\u305a\u9078\u629e\u3057\u3066\u304f\u3060\u3055\u3044\u3002
 
 Fit_table_horizontally_on_screen=\u8868\u3092\u753b\u9762\u4e0a\u306e\u6c34\u5e73\u65b9\u5411\u306b\u5408\u308f\u305b\u3066\u8868\u793a
 
@@ -727,7 +701,7 @@ Found_%0_plugin(s)=%0\u30d7\u30e9\u30b0\u30a4\u30f3\u3092\u691c\u51fa
 
 found_in_aux_file=aux\u30d5\u30a1\u30a4\u30eb\u3092\u691c\u51fa
 
-Full_name=\u59d3\u540d
+Full_name=\u5b8c\u5168\u306a\u540d\u79f0
 
 General=\u4e00\u822c
 
@@ -735,18 +709,18 @@ General_fields=\u6c4e\u7528\u30d5\u30a3\u30fc\u30eb\u30c9
 
 Generate=\u751f\u6210
 
-Generate_BibTeX_key=BibTeX\u30ad\u30fc\u3092\u751f\u6210
+Generate_BibTeX_key=BibTeX\u9375\u3092\u751f\u6210
 
-Generate_keys=\u30ad\u30fc\u3092\u751f\u6210
+Generate_keys=\u9375\u3092\u751f\u6210
 
-Generate_keys_before_saving_(for_entries_without_a_key)=\u4fdd\u5b58\u524d\u306b\u30ad\u30fc\u3092\u751f\u6210\uff08\u30ad\u30fc\u306e\u306a\u3044\u9805\u76ee\u306b\u5bfe\u3057\u3066\uff09
-Generate_keys_for_imported_entries=\u8aad\u307f\u8fbc\u3093\u3060\u9805\u76ee\u306b\u30ad\u30fc\u3092\u751f\u6210
+Generate_keys_before_saving_(for_entries_without_a_key)=\u4fdd\u5b58\u524d\u306b\u9375\u3092\u751f\u6210_(\u9375\u306e\u306a\u3044\u9805\u76ee\u306b\u5bfe\u3057\u3066)
+Generate_keys_for_imported_entries=\u8aad\u307f\u8fbc\u3093\u3060\u9805\u76ee\u306b\u9375\u3092\u751f\u6210
 
 Generate_now=\u3044\u307e\u751f\u6210\u3059\u308b
 
-Generated_BibTeX_key_for=\u4ee5\u4e0b\u306e\u9805\u76ee\u306eBibTeX\u30ad\u30fc\u3092\u751f\u6210\u3057\u307e\u3057\u305f:
+Generated_BibTeX_key_for=\u4ee5\u4e0b\u306e\u9805\u76ee\u306eBibTeX\u9375\u3092\u751f\u6210\u3057\u307e\u3057\u305f:
 
-Generating_BibTeX_key_for=\u4ee5\u4e0b\u306e\u9805\u76ee\u306eBibTeX\u30ad\u30fc\u3092\u751f\u6210\u3057\u3066\u3044\u307e\u3059:
+Generating_BibTeX_key_for=\u4ee5\u4e0b\u306e\u9805\u76ee\u306eBibTeX\u9375\u3092\u751f\u6210\u3057\u3066\u3044\u307e\u3059:
 
 Grab=\u5165\u624b
 
@@ -813,7 +787,7 @@ Import_file=\u30d5\u30a1\u30a4\u30eb\u3092\u8aad\u307f\u8fbc\u307f
 
 Import_group_definitions=\u30b0\u30eb\u30fc\u30d7\u5b9a\u7fa9\u3092\u8aad\u307f\u8fbc\u307f
 
-Import_name=\u8aad\u307f\u8fbc\u307f\u306e\u540d\u79f0
+Import_name=\u8aad\u8fbc\u540d
 
 Import_preferences=\u8a2d\u5b9a\u3092\u8aad\u307f\u8fbc\u3080
 
@@ -870,14 +844,12 @@ insert_string_=\u4ee5\u4e0b\u306e\u6587\u5b57\u5217\u3092\u633f\u5165
 
 Insert_URL=URL\u3092\u633f\u5165
 
-integrity=\u6574\u5408\u6027
-
 #Integritycheckisaprocessthatchecksforindicationsofwronglyfilledoutbibtexfields."Scan"isthebuttonthatstartsthecheck.
 Integrity_check=\u6574\u5408\u6027\u691c\u67fb
 
 Intersection=\u8ad6\u7406\u7a4d
 
-Invalid_BibTeX_key=\u7121\u52b9\u306aBibTeX\u30ad\u30fc\u3067\u3059
+Invalid_BibTeX_key=\u7121\u52b9\u306aBibTeX\u9375\u3067\u3059
 
 Invalid_date_format=\u7121\u52b9\u306a\u65e5\u4ed8\u66f8\u5f0f\u3067\u3059
 
@@ -885,13 +857,8 @@ Invalid_URL=\u7121\u52b9\u306aURL\u3067\u3059
 
 Inverted=\u5426\u5b9a
 
-is_a_standard_type.=\u306f\u6a19\u6e96\u578b\u3067\u3059\u3002
-
 ISO_abbreviation=ISO\u77ed\u7e2e\u5f62
 
-Item_list_for_field=\u30d5\u30a3\u30fc\u30eb\u30c9\u306e\u9805\u76ee\u4e00\u89a7
-jabref=jabref
-
 JabRef_help=JabRef\u30d8\u30eb\u30d7
 
 JabRef_preferences=JabRef\u306e\u8a2d\u5b9a
@@ -910,15 +877,15 @@ Keep_lower=\u4e0b\u3092\u7dad\u6301
 
 Keep_upper=\u4e0a\u3092\u7dad\u6301
 
-Key_bindings=\u30ad\u30fc\u5272\u308a\u5f53\u3066
+Key_bindings=\u30ad\u30fc\u5272\u5f53
 
-Key_bindings_changed=\u30ad\u30fc\u5272\u308a\u5f53\u3066\u304c\u5909\u66f4\u3055\u308c\u307e\u3057\u305f
+Key_bindings_changed=\u30ad\u30fc\u5272\u5f53\u304c\u5909\u66f4\u3055\u308c\u307e\u3057\u305f
 
-Key_generator_settings=\u30ad\u30fc\u751f\u6210\u30c4\u30fc\u30eb\u306e\u8a2d\u5b9a
+Key_generator_settings=\u9375\u751f\u6210\u30c4\u30fc\u30eb\u306e\u8a2d\u5b9a
 
 Key_pattern=\u30ad\u30fc\u30d1\u30bf\u30fc\u30f3
 
-keys_in_database=\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u4e2d\u306e\u30ad\u30fc
+keys_in_database=\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u4e2d\u306e\u9375
 
 #nottranslated.Toviewit,usemenu"Tools|NewBibTeXfilefromAUxfile",andlaunchtheactiononanon-existantauxfile.
 Keyword=\u30ad\u30fc\u30ef\u30fc\u30c9
@@ -951,7 +918,6 @@ Load_and_Save_preferences_from/to_jabref.xml_on_start-up_(memory_stick_mode)=\u8
 Load_session=\u30bb\u30c3\u30b7\u30e7\u30f3\u3092\u8aad\u307f\u8fbc\u307f
 
 Loading_session...=\u30bb\u30c3\u30b7\u30e7\u30f3\u3092\u8aad\u307f\u8fbc\u3093\u3067\u3044\u307e\u3059...
-localhost=\u30ed\u30fc\u30ab\u30eb\u30db\u30b9\u30c8
 
 Look_and_feel=\u64cd\u4f5c\u6027
 Looking_for_pdf...=PDF\u3092\u63a2\u3057\u3066\u3044\u307e\u3059...
@@ -966,9 +932,9 @@ Main_PS_directory=\u57fa\u672cPS\u30c7\u30a3\u30ec\u30af\u30c8\u30ea
 
 Manage=\u7ba1\u7406
 
-Manage_custom_exports=\u500b\u4eba\u8a2d\u5b9a\u66f8\u304d\u51fa\u3057\u306e\u7ba1\u7406
+Manage_custom_exports=\u81ea\u4f5c\u66f8\u51fa\u306e\u7ba1\u7406
 
-Manage_custom_imports=\u500b\u4eba\u8a2d\u5b9a\u8aad\u307f\u8fbc\u307f\u306e\u7ba1\u7406
+Manage_custom_imports=\u81ea\u4f5c\u8aad\u8fbc\u306e\u7ba1\u7406
 Manage_external_file_types=\u5916\u90e8\u30d5\u30a1\u30a4\u30eb\u578b\u306e\u7ba1\u7406
 
 Manage_journal_abbreviations=\u5b66\u8853\u8a8c\u540d\u77ed\u7e2e\u5f62\u306e\u7ba1\u7406
@@ -1076,8 +1042,6 @@ No_entries_found_for_the_search_string_'%0'=\u691c\u7d22\u6587\u5b57\u5217\u300c
 No_entries_imported.=\u9805\u76ee\u306f\u8aad\u307f\u8fbc\u307e\u308c\u307e\u305b\u3093\u3067\u3057\u305f\u3002
 
 No_entries_or_multiple_entries_selected.=\u9805\u76ee\u304c\u9078\u629e\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002
-
-No_entries_selected=\u9805\u76ee\u304c\u9078\u629e\u3055\u308c\u3066\u3044\u307e\u305b\u3093
 No_entries_selected.=\u9805\u76ee\u304c\u9078\u629e\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002
 
 No_exceptions_have_ocurred.=\u4f8b\u5916\u30a8\u30e9\u30fc\u306f\u767a\u751f\u3057\u307e\u305b\u3093\u3067\u3057\u305f\u3002
@@ -1090,7 +1054,7 @@ No_journal_names_could_be_abbreviated.=\u5b66\u8853\u8a8c\u540d\u3092\u77ed\u7e2
 No_journal_names_could_be_unabbreviated.=\u5b66\u8853\u8a8c\u540d\u3092\u975e\u77ed\u7e2e\u5f62\u306b\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002
 No_PDF_linked=PDF\u306f\u30ea\u30f3\u30af\u3055\u308c\u3066\u3044\u307e\u305b\u3093
 
-No_pdf_or_ps_defined,_and_no_file_matching_Bibtex_key_found=PDF\u3084PS\u306e\u5b9a\u7fa9\u306f\u306a\u304f\u3001BibTeX\u30ad\u30fc\u306b\u4e00\u81f4\u3059\u308b\u30d5\u30a1\u30a4\u30eb\u3082\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3067\u3057\u305f
+No_pdf_or_ps_defined,_and_no_file_matching_Bibtex_key_found=PDF\u3084PS\u306e\u5b9a\u7fa9\u306f\u306a\u304f\u3001BibTeX\u9375\u306b\u4e00\u81f4\u3059\u308b\u30d5\u30a1\u30a4\u30eb\u3082\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3067\u3057\u305f
 No_plugins_were_found_in_the_following_folders\:=\u4ee5\u4e0b\u306e\u30d5\u30a9\u30eb\u30c0\u306b\u306f\u30d7\u30e9\u30b0\u30a4\u30f3\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3067\u3057\u305f:
 
 No_references_found=\u53c2\u7167\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3067\u3057\u305f
@@ -1119,12 +1083,10 @@ Number_of_references_to_fetch?=\u53d6\u5f97\u3059\u308b\u53c2\u7167\u6570\uff1f
 
 occurences=\u500b
 
-OK=OK
-
 Ok=OK
 One_or_more_file_links_are_of_the_type_'%0',_which_is_undefined._What_do_you_want_to_do?=\u4e00\u3064\u306a\u3044\u3057\u305d\u308c\u4ee5\u4e0a\u306e\u30d5\u30a1\u30a4\u30eb\u30ea\u30f3\u30af\u304c\u3001\u672a\u5b9a\u7fa9\u306e\u300c%0\u300d\u3068\u306a\u3063\u3066\u3044\u307e\u3059\u3002\u3069\u3046\u3057\u307e\u3059\u304b\uff1f
 
-One_or_more_keys_will_be_overwritten._Continue?=\u4e00\u3064\u306a\u3044\u3057\u305d\u308c\u4ee5\u4e0a\u306e\u30ad\u30fc\u304c\u4e0a\u66f8\u304d\u3055\u308c\u307e\u3059\u3002\u7d9a\u3051\u307e\u3059\u304b\uff1f
+One_or_more_keys_will_be_overwritten._Continue?=\u4e00\u3064\u306a\u3044\u3057\u305d\u308c\u4ee5\u4e0a\u306e\u9375\u304c\u4e0a\u66f8\u304d\u3055\u308c\u307e\u3059\u3002\u7d9a\u3051\u307e\u3059\u304b\uff1f
 Only_one_item_is_supported=\u4e00\u9805\u76ee\u306e\u307f\u304c\u30b5\u30dd\u30fc\u30c8\u3055\u308c\u3066\u3044\u307e\u3059
 
 Open=\u958b\u304f
@@ -1174,13 +1136,13 @@ Override_default_file_directories=\u30d5\u30a1\u30a4\u30eb\u30c7\u30a3\u30ec\u30
 
 Override_default_font_settings=\u65e2\u5b9a\u30d5\u30a9\u30f3\u30c8\u8a2d\u5b9a\u3092\u4e0a\u66f8\u304d
 
-override_the_bibtex_key_by_the_selected_text=BibTeX\u30ad\u30fc\u3092\u9078\u629e\u3057\u305f\u6587\u5b57\u5217\u3067\u4e0a\u66f8\u304d
+override_the_bibtex_key_by_the_selected_text=BibTeX\u9375\u3092\u9078\u629e\u3057\u305f\u6587\u5b57\u5217\u3067\u4e0a\u66f8\u304d
 
 
 Overwrite=\u4e0a\u66f8\u304d
 Overwrite_existing_field_values=\u65e2\u5b58\u306e\u30d5\u30a3\u30fc\u30eb\u30c9\u5024\u3092\u4e0a\u66f8\u304d
 
-Overwrite_keys=\u30ad\u30fc\u306e\u4e0a\u66f8\u304d
+Overwrite_keys=\u9375\u306e\u4e0a\u66f8\u304d
 
 pairs_processed=\u5bfe\u304c\u51e6\u7406\u3055\u308c\u307e\u3057\u305f
 Password_\:=\u30d1\u30b9\u30ef\u30fc\u30c9:
@@ -1211,8 +1173,6 @@ Personal_journal_list=\u500b\u4eba\u7528\u5b66\u8853\u8a8c\u540d\u8868
 
 Plain_text_import=\u5e73\u6587\u8aad\u307f\u8fbc\u307f
 
-Please_check_your_network_connection_to_this_machine.=\u3053\u306e\u30de\u30b7\u30f3\u3078\u306e\u30cd\u30c3\u30c8\u30ef\u30fc\u30af\u63a5\u7d9a\u3092\u691c\u67fb\u3057\u3066\u304f\u3060\u3055\u3044\u3002
-
 Please_enter_a_name_for_the_group.=\u3053\u306e\u30b0\u30eb\u30fc\u30d7\u7528\u306e\u540d\u79f0\u3092\u5165\u529b\u3057\u3066\u304f\u3060\u3055\u3044\u3002
 
 Please_enter_a_search_term._For_example,_to_search_all_fields_for_<b>Smith</b>,_enter%c<p><tt>smith</tt><p>To_search_the_field_<b>Author</b>_for_<b>Smith</b>_and_the_field_<b>Title</b>_for_<b>electrical</b>,_enter%c<p><tt>author%esmith_and_title%eelectrical</tt>=\u691c\u7d22\u9805\u76ee\u3092\u5165\u529b\u3057\u3066\u304f\u3060\u3055\u3044\u3002\u305f\u3068\u3048\u3070\u3001<b>Smith</b>\u306e\u3059\u3079\u3066\u306e\u9805\u76ee\u3092\u691c\u7d22\u3059\u308b\u306b\u306f\u3001<p><tt>smith< [...]
@@ -1221,9 +1181,7 @@ Please_enter_the_field_to_search_(e.g._<b>keywords</b>)_and_the_keyword_to_searc
 
 Please_enter_the_string's_label=\u6587\u5b57\u5217\u306e\u30e9\u30d9\u30eb\u3092\u5165\u529b\u3057\u3066\u304f\u3060\u3055\u3044\u3002
 
-Please_select_an_importer=\u8aad\u307f\u8fbc\u307f\u6cd5\u3092\u9078\u629e\u3057\u3066\u304f\u3060\u3055\u3044
-
-Please_select_an_importer.=\u8aad\u307f\u8fbc\u307f\u6cd5\u3092\u9078\u629e\u3057\u3066\u304f\u3060\u3055\u3044\u3002
+Please_select_an_importer.=\u8aad\u8fbc\u3092\u9078\u629e\u3057\u3066\u304f\u3060\u3055\u3044\u3002
 
 Please_select_exactly_one_group_to_move.=\u79fb\u52d5\u3059\u308b\u30b0\u30eb\u30fc\u30d7\u3092\u4e00\u3064\u3060\u3051\u9078\u629e\u3057\u3066\u304f\u3060\u3055\u3044\u3002
 Please_specify_the_=\u4ee5\u4e0b\u3092\u6307\u5b9a\u3057\u3066\u304f\u3060\u3055\u3044:_
@@ -1352,8 +1310,6 @@ Removed_string=\u6587\u5b57\u5217\u3092\u524a\u9664\u3057\u307e\u3057\u305f
 
 Renamed_string=\u6587\u5b57\u5217\u3092\u6539\u540d\u3057\u307e\u3057\u305f
 
-Replace=\u7f6e\u63db
-
 Replace_(regular_expression)=\u7f6e\u63db\u5bfe\u8c61\uff08\u6b63\u898f\u8868\u73fe\uff09
 
 Replace_string=\u6587\u5b57\u5217\u3092\u7f6e\u63db
@@ -1381,7 +1337,6 @@ Review=\u8ad6\u8a55
 Review_changes=\u5909\u66f4\u3092\u691c\u67fb\u3059\u308b
 
 Right=\u53f3
-root=root
 
 Save=\u4fdd\u5b58
 Save_all_finished.=\u4fdd\u5b58\u304c\u3059\u3079\u3066\u7d42\u308f\u308a\u307e\u3057\u305f\u3002
@@ -1419,8 +1374,6 @@ Scan=\u30b9\u30ad\u30e3\u30f3
 
 Search=\u691c\u7d22
 
-Search_All_Fields=\u5168\u30d5\u30a3\u30fc\u30eb\u30c9\u3092\u691c\u7d22
-
 Search_all_fields=\u5168\u30d5\u30a3\u30fc\u30eb\u30c9\u3092\u691c\u7d22
 
 Search_error=\u691c\u7d22\u30a8\u30e9\u30fc
@@ -1432,13 +1385,12 @@ Search_for=\u691c\u7d22\u5bfe\u8c61
 Search_general_fields=\u6c4e\u7528\u30d5\u30a3\u30fc\u30eb\u30c9\u3092\u691c\u7d22
 
 Search_IEEEXplore=IEEEXplore\u3092\u691c\u7d22
-Search_IEEExplore=IEEEXplore\u3092\u691c\u7d22
 
 Search_optional_fields=\u975e\u5fc5\u9808\u30d5\u30a3\u30fc\u30eb\u30c9\u3092\u691c\u7d22
 
 Search_required_fields=\u5fc5\u9808\u30d5\u30a3\u30fc\u30eb\u30c9\u3092\u691c\u7d22
 
-Search_Specified_Field(s)=\u6307\u5b9a\u3057\u305f\u30d5\u30a3\u30fc\u30eb\u30c9\u3092\u691c\u7d22
+Search_specified_field(s)=\u6307\u5b9a\u3057\u305f\u30d5\u30a3\u30fc\u30eb\u30c9\u3092\u691c\u7d22
 
 Searched_database._Global_number_of_hits=\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u3092\u691c\u7d22\u3057\u307e\u3057\u305f\u3002\u5168\u4f53\u306e\u8a72\u5f53\u6570
 
@@ -1480,8 +1432,6 @@ Select_new_ImportFormat_Subclass=\u65b0\u3057\u3044ImportFormat\u30b5\u30d6\u30a
 
 Select_the_tree_nodes_to_view_and_accept_or_reject_changes=\u30c4\u30ea\u30fc\u30ce\u30fc\u30c9\u3092\u9078\u629e\u3057\u3066\u8868\u793a\u3055\u305b\u3001\u5909\u66f4\u3092\u53d7\u8afe\u306a\u3044\u3057\u62d2\u5426\u3057\u3066\u304f\u3060\u3055\u3044
 Selected_entries=\u9078\u629e\u3057\u305f\u9805\u76ee
-
-Selector_enabled_fields=\u30bb\u30ec\u30af\u30bf\u304c\u6709\u52b9\u306b\u3057\u305f\u30d5\u30a3\u30fc\u30eb\u30c9
 Server_Hostname_\:=\u30b5\u30fc\u30d0\u30fc\u30db\u30b9\u30c8\u540d:
 Server_Type_\:=\u30b5\u30fc\u30d0\u30fc\u578b:
 Set_field=\u30d5\u30a3\u30fc\u30eb\u30c9\u3092\u8a2d\u5b9a
@@ -1537,9 +1487,9 @@ Show_required_fields=\u5fc5\u9808\u30d5\u30a3\u30fc\u30eb\u30c9\u3092\u8868\u793
 
 Show_URL/DOI_column=URL/DOI\u5217\u3092\u8868\u793a
 
-Show_warning_dialog_when_a_duplicate_BibTeX_key_is_entered=\u91cd\u8907\u3057\u305fBibTeX\u30ad\u30fc\u304c\u5165\u529b\u3055\u308c\u305f\u969b\u306b\u8b66\u544a\u30c0\u30a4\u30a2\u30ed\u30b0\u3092\u8868\u793a
+Show_warning_dialog_when_a_duplicate_BibTeX_key_is_entered=\u91cd\u8907\u3057\u305fBibTeX\u9375\u304c\u5165\u529b\u3055\u308c\u305f\u969b\u306b\u8b66\u544a\u30c0\u30a4\u30a2\u30ed\u30b0\u3092\u8868\u793a
 
-Show_warning_dialog_when_an_empty_BibTeX_key_is_entered=\u7a7a\u306eBibTeX\u30ad\u30fc\u304c\u5165\u529b\u3055\u308c\u305f\u969b\u306b\u8b66\u544a\u30c0\u30a4\u30a2\u30ed\u30b0\u3092\u8868\u793a
+Show_warning_dialog_when_an_empty_BibTeX_key_is_entered=\u7a7a\u306eBibTeX\u9375\u304c\u5165\u529b\u3055\u308c\u305f\u969b\u306b\u8b66\u544a\u30c0\u30a4\u30a2\u30ed\u30b0\u3092\u8868\u793a
 
 Simple_HTML=\u5358\u7d14\u306aHTML
 
@@ -1620,14 +1570,10 @@ Test=\u78ba\u8a8d
 
 Text_Input_Area=\u30c6\u30ad\u30b9\u30c8\u3092\u3053\u3053\u306b\u8cbc\u308a\u4ed8\u3051\u3066\u304f\u3060\u3055\u3044
 
-The_#_character_is_not_allowed_in_BibTeX_fields=#\u6587\u5b57\u306fBibTeX\u30d5\u30a3\u30fc\u30eb\u30c9\u4e2d\u3067\u306f\u4f7f\u3046\u3053\u3068\u304c\u3067\u304d\u307e\u305b\u3093
-
 The_chosen_date_format_for_new_entries_is_not_valid=\u65b0\u898f\u9805\u76ee\u306b\u9078\u629e\u3057\u305f\u65e5\u4ed8\u66f8\u5f0f\u306f\u6709\u52b9\u3067\u306f\u3042\u308a\u307e\u305b\u3093
 
 The_chosen_encoding_'%0'_could_not_encode_the_following_characters\:_=\u9078\u629e\u3057\u305f\u30a8\u30f3\u30b3\u30fc\u30c7\u30a3\u30f3\u30b0\u300c%0\u300d\u306f\u3001\u4ee5\u4e0b\u306e\u6587\u5b57\u3092\u30a8\u30f3\u30b3\u30fc\u30c9\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f:_
 
-The_CiteSeer_fetch_operation_returned_zero_results.=CiteSeerX\u304b\u3089\u306e\u53d6\u5f97\u64cd\u4f5c\u306f\u3001\u8a72\u5f530\u4ef6\u3068\u56de\u7b54\u3057\u307e\u3057\u305f\u3002
-
 
 The_current_version_features_a_new_way_of_handling_links_to_external_files.<br>To_take_advantage_of_this,_your_links_must_be_changed_into_the_new_format,_and<br>JabRef_must_be_configured_to_show_the_new_links.=\u73fe\u5728\u306e\u30d0\u30fc\u30b8\u30e7\u30f3\u306f\u3001\u5916\u90e8\u30d5\u30a1\u30a4\u30eb\u3078\u306e\u30ea\u30f3\u30af\u3092\u53d6\u308a\u6271\u3046\u306e\u306b\u65b0\u3057\u3044\u65b9\u6cd5\u3092\u63a1\u7528\u3057\u3066\u3044\u307e\u3059\u3002<br>\u3053\u308c\u3092\u5229\u [...]
 
@@ -1655,11 +1601,9 @@ The_search_is_case_sensitive.=\u691c\u7d22\u306f\u5927\u5c0f\u6587\u5b57\u3092\u
 The_string_has_been_removed_locally=\u6587\u5b57\u5217\u306f\u30ed\u30fc\u30ab\u30eb\u3067\u524a\u9664\u3055\u308c\u307e\u3057\u305f
 
 There_are_possible_duplicates_(marked_with_a_'D'_icon)_that_haven't_been_resolved._Continue?=\u89e3\u6d88\u3055\u308c\u3066\u3044\u306a\u3044\u91cd\u8907\u3068\u601d\u308f\u308c\u308b\u3082\u306e\u304c\u5b58\u5728\u3057\u307e\u3059\uff08\u300cD\u300d\u30a2\u30a4\u30b3\u30f3\u3067\u6a19\u8b58\u3055\u308c\u3066\u3044\u307e\u3059\uff09\u3002\u5148\u306b\u9032\u307f\u307e\u3059\u304b\uff1f
-
-this_button_will_update=\u3053\u306e\u30dc\u30bf\u30f3\u306f\u53f3\u306e\u3082\u306e\u3092\u66f4\u65b0\u3057\u307e\u3059
 This_database_was_written_using_an_older_version_of_JabRef.=\u3053\u306e\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u306f\u3001JabRef\u65e7\u7248\u3092\u4f7f\u7528\u3057\u3066\u66f8\u304d\u8fbc\u307e\u308c\u3066\u3044\u307e\u3059\u3002
 
-This_entry_has_no_BibTeX_key._Generate_key_now?=\u3053\u306e\u9805\u76ee\u306b\u306fBibTeX\u30ad\u30fc\u304c\u3042\u308a\u307e\u305b\u3093\u3002\u3044\u307e\u751f\u6210\u3057\u307e\u3059\u304b\uff1f
+This_entry_has_no_BibTeX_key._Generate_key_now?=\u3053\u306e\u9805\u76ee\u306b\u306fBibTeX\u9375\u304c\u3042\u308a\u307e\u305b\u3093\u3002\u3044\u307e\u751f\u6210\u3057\u307e\u3059\u304b\uff1f
 
 This_entry_is_incomplete=\u3053\u306e\u9805\u76ee\u306f\u4e0d\u5b8c\u5168\u3067\u3059
 
@@ -1667,7 +1611,7 @@ This_entry_type_cannot_be_removed.=\u3053\u306e\u9805\u76ee\u578b\u306f\u89e3\u6
 
 This_external_link_is_of_the_type_'%0',_which_is_undefined._What_do_you_want_to_do?=\u3053\u306e\u5916\u90e8\u30ea\u30f3\u30af\u306f\u300c%0\u300d\u578b\u3067\u3059\u304c\u3001\u3053\u308c\u306f\u5b9a\u7fa9\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002\u3069\u3046\u3057\u307e\u3059\u304b\uff1f
 
-This_group_contains_entries_based_on_manual_assignment._Entries_can_be_assigned_to_this_group_by_selecting_them_then_using_either_drag_and_drop_or_the_context_menu._Entries_can_be_removed_from_this_group_by_selecting_them_then_using_the_context_menu._Every_entry_assigned_to_this_group_must_have_a_unique_key._The_key_may_be_changed_at_any_time_as_long_as_it_remains_unique.=\u3053\u306e\u30b0\u30eb\u30fc\u30d7\u306f\u3001\u624b\u52d5\u5272\u308a\u5f53\u3066\u306b\u3088\u308b\u9805\u76ee\u3 [...]
+This_group_contains_entries_based_on_manual_assignment._Entries_can_be_assigned_to_this_group_by_selecting_them_then_using_either_drag_and_drop_or_the_context_menu._Entries_can_be_removed_from_this_group_by_selecting_them_then_using_the_context_menu._Every_entry_assigned_to_this_group_must_have_a_unique_key._The_key_may_be_changed_at_any_time_as_long_as_it_remains_unique.=\u3053\u306e\u30b0\u30eb\u30fc\u30d7\u306f\u3001\u624b\u52d5\u5272\u308a\u5f53\u3066\u306b\u3088\u308b\u9805\u76ee\u3 [...]
 
 This_group_contains_entries_in_which=\u3053\u306e\u30b0\u30eb\u30fc\u30d7\u306b\u306f\u3001\u4ee5\u4e0b\u306e\u3088\u3046\u306a\u9805\u76ee\u304c\u542b\u307e\u308c\u3066\u3044\u307e\u3059
 
@@ -1678,17 +1622,13 @@ This_group_contains_entries_in_which_any_field_contains_the_term_<b>%0</b>=\u305
 This_group_contains_entries_whose_<b>%0</b>_field_contains_the_keyword_<b>%1</b>=\u3053\u306e\u30b0\u30eb\u30fc\u30d7\u306b\u306f\u3001<b>%0</b>\u30d5\u30a3\u30fc\u30eb\u30c9\u306b\u30ad\u30fc\u30ef\u30fc\u30c9<b>%1</b>\u3092\u542b\u3093\u3067\u3044\u308b\u9805\u76ee\u304c\u3042\u308a\u307e\u3059\u3002
 
 This_group_contains_entries_whose_<b>%0</b>_field_contains_the_regular_expression_<b>%1</b>=\u3053\u306e\u30b0\u30eb\u30fc\u30d7\u306b\u306f\u3001<b>%0</b>\u30d5\u30a3\u30fc\u30eb\u30c9\u306b\u6b63\u898f\u8868\u73fe<b>%1</b>\u3092\u542b\u3093\u3067\u3044\u308b\u9805\u76ee\u304c\u3042\u308a\u307e\u3059\u3002
-
-This_is_a_simple_copy_and_paste_dialog_for_import_some_fields_from_normal_text.=\u3053\u308c\u306f\u3001\u901a\u5e38\u306e\u30c6\u30ad\u30b9\u30c8\u304b\u3089\u30d5\u30a3\u30fc\u30eb\u30c9\u3092\u8aad\u307f\u8fbc\u3080\u305f\u3081\u306e\u3001\u30b3\u30d4\u30fc\u30a2\u30f3\u30c9\u30da\u30fc\u30b9\u30c8\u7528\u30c0\u30a4\u30a2\u30ed\u30b0\u3067\u3059\u3002
 This_makes_JabRef_look_up_each_%0_link_and_check_if_the_file_exists._If_not,_you_will_be_given_options<BR>to_resolve_the_problem.=\u3053\u308c\u3092\u6709\u52b9\u306b\u3059\u308b\u3068\u3001JabRef\u306f\u5404%0\u30ea\u30f3\u30af\u3092\u8abf\u3079\u3001\u30d5\u30a1\u30a4\u30eb\u304c\u5b58\u5728\u3059\u308b\u304b\u3069\u3046\u304b\u78ba\u8a8d\u3057\u307e\u3059\u3002<BR>\u3082\u3057\u5b58\u5728\u3057\u306a\u3051\u308c\u3070\u3001\u554f\u984c\u3092\u89e3\u6c7a\u3059\u308b\u9078\u629e\u80a2\u [...]
 
-This_operation_requires_all_selected_entries_to_have_BibTex_keys_defined.=\u3053\u306e\u64cd\u4f5c\u3092\u884c\u3046\u306b\u306f\u3001\u9078\u629e\u3055\u308c\u305f\u5168\u9805\u76ee\u306bBibTeX\u30ad\u30fc\u304c\u5b9a\u7fa9\u3055\u308c\u3066\u3044\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002
+This_operation_requires_all_selected_entries_to_have_BibTex_keys_defined.=\u3053\u306e\u64cd\u4f5c\u3092\u884c\u3046\u306b\u306f\u3001\u9078\u629e\u3055\u308c\u305f\u5168\u9805\u76ee\u306bBibTeX\u9375\u304c\u5b9a\u7fa9\u3055\u308c\u3066\u3044\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002
 This_operation_requires_at_least_one_entry.=\u3053\u306e\u64cd\u4f5c\u3092\u884c\u3046\u306b\u306f\u30011\u3064\u4ee5\u4e0a\u306e\u9805\u76ee\u304c\u5fc5\u8981\u3067\u3059\u3002
 
 This_operation_requires_one_or_more_entries_to_be_selected.=\u3053\u306e\u64cd\u4f5c\u3092\u884c\u3046\u306b\u306f\u30011\u3064\u4ee5\u4e0a\u306e\u9805\u76ee\u304c\u9078\u629e\u3055\u308c\u3066\u3044\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002
 
-This_will_move_all_external_links_from_the_'pdf'_and_'ps'_fields_into_the_'%0'_field._Proceed?=\u3053\u306e\u64cd\u4f5c\u306f\u3001\u5916\u90e8\u30ea\u30f3\u30af\u3092\u3059\u3079\u3066\u3001\u300cpdf\u300d\u304a\u3088\u3073\u300cps\u300d\u30d5\u30a3\u30fc\u30eb\u30c9\u304b\u3089\u300c%0\u300d\u30d5\u30a3\u30fc\u30eb\u30c9\u306b\u79fb\u52d5\u3057\u307e\u3059\u3002\u7d9a\u3051\u307e\u3059\u304b\uff1f
-
 To_set_up,_go_to_<B>Tools_->_Manage_journal_abbreviations</B>=\u8a2d\u5b9a\u3059\u308b\u306b\u306f\u3001<B>\u30aa\u30d7\u30b7\u30e7\u30f3\u2192\u5b66\u8853\u8a8c\u7565\u8a9e\u306e\u7ba1\u7406</B>\u3092\u4f7f\u7528\u3057\u3066\u304f\u3060\u3055\u3044\u3002
 
 Toggle_abbreviation=\u77ed\u7e2e\u5f62/\u975e\u77ed\u7e2e\u5f62\u306e\u5207\u66ff
@@ -1702,8 +1642,6 @@ Type_set_to_'other'=\u578b\u3092\u300cother\u300d\u306b\u8a2d\u5b9a\u3057\u307e\
 Unabbreviate_journal_names_of_the_selected_entries=\u9078\u629e\u3057\u305f\u9805\u76ee\u306e\u8a8c\u540d\u3092\u975e\u77ed\u7e2e\u5f62\u306b\u3059\u308b
 Unabbreviated_%0_journal_names.=%0\u500b\u306e\u8a8c\u540d\u3092\u975e\u77ed\u7e2e\u5f62\u306b\u3057\u307e\u3057\u305f
 
-unable_to_access_LyX-pipe=LyX\u30d1\u30a4\u30d7\u306b\u30a2\u30af\u30bb\u30b9\u3067\u304d\u307e\u305b\u3093
-
 Unable_to_create_graphical_interface=\u30b0\u30e9\u30d5\u30a3\u30ab\u30eb\u30a4\u30f3\u30bf\u30d5\u30a7\u30fc\u30b9\u3092\u751f\u6210\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u305b\u3093
 
 Unable_to_open_file.=\u30d5\u30a1\u30a4\u30eb\u3092\u958b\u304f\u3053\u3068\u304c\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002
@@ -1747,7 +1685,6 @@ Up=\u4e0a
 Update_to_current_column_widths=\u73fe\u5728\u306e\u5217\u5e45\u306b\u66f4\u65b0
 
 Updated_group_selection=\u30b0\u30eb\u30fc\u30d7\u9078\u629e\u3092\u66f4\u65b0\u3057\u307e\u3057\u305f
-Upgrade_external_links=\u5916\u90e8\u30ea\u30f3\u30af\u3092\u66f4\u65b0
 Upgrade_external_PDF/PS_links_to_use_the_'%0'_field.=\u5916\u90e8PDF/PS\u30ea\u30f3\u30af\u3092\u300c%0\u300d\u30d5\u30a3\u30fc\u30eb\u30c9\u3092\u4f7f\u7528\u3059\u308b\u3088\u3046\u306b\u66f4\u65b0
 Upgrade_file=\u30d5\u30a1\u30a4\u30eb\u3092\u66f4\u65b0
 Upgrade_old_external_file_links_to_use_the_new_feature=\u53e4\u3044\u5916\u90e8\u30d5\u30a1\u30a4\u30eb\u30ea\u30f3\u30af\u3092\u65b0\u6a5f\u80fd\u3092\u5229\u7528\u3059\u308b\u3088\u3046\u306b\u66f4\u65b0
@@ -1757,10 +1694,7 @@ Upper_Each_First=Upper_Each_First
 Upper_first=Upper_first
 
 usage=\u4f7f\u7528\u6cd5
-
-Use_antialiasing_font=\u30a2\u30f3\u30c1\u30a8\u30a4\u30ea\u30a2\u30b9\u30d5\u30a9\u30f3\u30c8\u3092\u4f7f\u7528\u3059\u308b
 Use_autocompletion_for_the_following_fields=\u53f3\u8a18\u306e\u30d5\u30a3\u30fc\u30eb\u30c9\u3067\u81ea\u52d5\u88dc\u5b8c\u3092\u4f7f\u7528
-Use_custom_icon_theme=\u500b\u4eba\u8a2d\u5b9a\u306e\u30a2\u30a4\u30b3\u30f3\u30c6\u30fc\u30de\u3092\u4f7f\u7528
 Use_default_viewer=\u65e2\u5b9a\u30d3\u30e5\u30fc\u30a2\u3092\u4f7f\u7528
 
 Use_inspection_window_also_when_a_single_entry_is_imported.=\u9805\u76ee\u304c\u3072\u3068\u3064\u3060\u3051\u8aad\u307f\u8fbc\u307e\u308c\u305f\u3068\u304d\u306b\u3082\u7cbe\u67fb\u30a6\u30a3\u30f3\u30c9\u30a6\u3092\u4f7f\u7528\u3059\u308b
@@ -1770,8 +1704,6 @@ Use_other_look_and_feel=\u5225\u306e\u64cd\u4f5c\u6027\u3092\u4f7f\u7528\u3059\u
 Use_Regular_Expression_Search=\u6b63\u898f\u8868\u73fe\u691c\u7d22\u3092\u4f7f\u7528
 
 Use_regular_expressions=\u6b63\u898f\u8868\u73fe\u3092\u4f7f\u7528
-
-Use_the_following_delimiter_character(s)=\u53f3\u306e\u533a\u5207\u308a\u6587\u5b57\u3092\u4f7f\u7528
 Username_\:=\u30e6\u30fc\u30b6\u30fc\u540d:
 
 Value_cleared_externally=\u5916\u90e8\u304b\u3089\u5024\u304c\u6d88\u53bb\u3055\u308c\u307e\u3057\u305f
@@ -1787,12 +1719,12 @@ Waiting_for_ArXiv...=ArXiv\u306e\u5fdc\u7b54\u3092\u5f85\u3063\u3066\u3044\u307e
 
 Warn_about_unresolved_duplicates_when_closing_inspection_window=\u7cbe\u67fb\u30a6\u30a3\u30f3\u30c9\u30a6\u3092\u9589\u3058\u308b\u969b\u306b\u89e3\u6d88\u3055\u308c\u3066\u3044\u306a\u3044\u91cd\u8907\u9805\u76ee\u306b\u5bfe\u3057\u3066\u8b66\u544a\u3059\u308b
 
-Warn_before_overwriting_existing_keys=\u65e2\u5b58\u306e\u30ad\u30fc\u3092\u4e0a\u66f8\u304d\u3059\u308b\u524d\u306b\u8b66\u544a
+Warn_before_overwriting_existing_keys=\u65e2\u5b58\u306e\u9375\u3092\u4e0a\u66f8\u304d\u3059\u308b\u524d\u306b\u8b66\u544a
 
 Warning=\u8b66\u544a
 Warning\:_could_not_complete_file_repair;_your_file_may_have_been_corrupted._Error_message=\u8b66\u544a:_\u30d5\u30a1\u30a4\u30eb\u4fee\u5fa9\u3092\u5b8c\u9042\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002\u30d5\u30a1\u30a4\u30eb\u306f\u7834\u640d\u3057\u3066\u3044\u308b\u53ef\u80fd\u6027\u304c\u3042\u308a\u307e\u3059\u3002\u30a8\u30e9\u30fc\u30e1\u30c3\u30bb\u30fc\u30b8
 
-Warning_there_is_a_duplicate_key=\u8b66\u544a:_\u91cd\u8907\u30ad\u30fc\u304c\u3042\u308a\u307e\u3059
+Warning_there_is_a_duplicate_key=\u8b66\u544a:_\u91cd\u8907\u9375\u304c\u3042\u308a\u307e\u3059
 
 Warnings=\u8b66\u544a
 
@@ -1806,7 +1738,7 @@ Will_write_XMP-metadata_to_the_PDFs_linked_from_selected_entries.=\u9078\u629e\u
 with=with
 
 Word=Word
-Write_BibtexEntry_as_XMP-metadata_to_PDF.=PDF\u306bBibtexEntry\u3092XMP\u30e1\u30bf\u30c7\u30fc\u30bf\u3068\u3057\u3066\u66f8\u304d\u8fbc\u3080\u3002
+Write_BibtexEntry_as_XMP-metadata_to_PDF.=PDF\u306bBibTeX\u9805\u76ee\u3092XMP\u30e1\u30bf\u30c7\u30fc\u30bf\u3068\u3057\u3066\u66f8\u304d\u8fbc\u3080\u3002
 
 Write_XMP=XMP\u3092\u66f8\u304d\u8fbc\u3080
 Write_XMP-metadata=XMP\u30e1\u30bf\u30c7\u30fc\u30bf\u3092\u66f8\u304d\u8fbc\u3080
@@ -1835,17 +1767,16 @@ You_have_entered_an_invalid_search_'%0'.=\u7121\u52b9\u306a\u691c\u7d22\u300c%0\
 
 You_must_choose_a_file_name_to_store_journal_abbreviations=\u8a8c\u540d\u77ed\u7e2e\u5f62\u3092\u4fdd\u7ba1\u3059\u308b\u30d5\u30a1\u30a4\u30eb\u540d\u3092\u9078\u3070\u306a\u304f\u3066\u306f\u306a\u308a\u307e\u305b\u3093
 
-You_must_restart_JabRef_for_the_new_key_bindings_to_work_properly.=\u65b0\u3057\u3044\u30ad\u30fc\u5272\u308a\u5f53\u3066\u304c\u6b63\u3057\u304f\u6a5f\u80fd\u3059\u308b\u3088\u3046\u306b\u3059\u308b\u305f\u3081\u306b\u306f\u3001JabRef\u3092\u518d\u8d77\u52d5\u3057\u306a\u304f\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002
+You_must_restart_JabRef_for_the_new_key_bindings_to_work_properly.=\u65b0\u3057\u3044\u30ad\u30fc\u5272\u5f53\u304c\u6b63\u3057\u304f\u6a5f\u80fd\u3059\u308b\u3088\u3046\u306b\u3059\u308b\u305f\u3081\u306b\u306f\u3001JabRef\u3092\u518d\u8d77\u52d5\u3057\u306a\u304f\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002
 
-You_must_set_both_BibTeX_key_and_%0_directory=BibTeX\u30ad\u30fc\u3068%0\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u306e\u4e21\u65b9\u3092\u8a2d\u5b9a\u3057\u306a\u304f\u3066\u306f\u306a\u308a\u307e\u305b\u3093
+You_must_set_both_BibTeX_key_and_%0_directory=BibTeX\u9375\u3068%0\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u306e\u4e21\u65b9\u3092\u8a2d\u5b9a\u3057\u306a\u304f\u3066\u306f\u306a\u308a\u307e\u305b\u3093
 
-Your_new_key_bindings_have_been_stored.=\u65b0\u3057\u3044\u30ad\u30fc\u5272\u308a\u5f53\u3066\u304c\u4fdd\u7ba1\u3055\u308c\u307e\u3057\u305f\u3002
+Your_new_key_bindings_have_been_stored.=\u65b0\u3057\u3044\u30ad\u30fc\u5272\u5f53\u304c\u4fdd\u7ba1\u3055\u308c\u307e\u3057\u305f\u3002
 
 
 The_following_fetchers_are_available\:=\u4ee5\u4e0b\u306e\u53d6\u5f97\u5b50\u304c\u4f7f\u7528\u3067\u304d\u307e\u3059:
 Could_not_find_fetcher_'%0'=\u53d6\u5f97\u5b50\u300c%0\u300d\u3092\u898b\u3064\u3051\u3089\u308c\u307e\u305b\u3093\u3067\u3057\u305f
 Running_Query_'%0'_with_fetcher_'%1'.=\u53d6\u5f97\u5b50\u300c%1\u300d\u3092\u4f7f\u7528\u3057\u3066\u3001\u30af\u30a8\u30ea\u300c%0\u300d\u3092\u5b9f\u884c\u3057\u3066\u3044\u307e\u3059\u3002
-Please_wait!=\u304a\u5f85\u3061\u304f\u3060\u3055\u3044\uff01
 Query_'%0'_with_fetcher_'%1'_did_not_return_any_results.=\u53d6\u5f97\u5b50\u300c%1\u300d\u3092\u4f7f\u7528\u3057\u305f\u30af\u30a8\u30ea\u300c%0\u300d\u306f\u3001\u7d50\u679c\u3092\u4f55\u3082\u8fd4\u3057\u307e\u305b\u3093\u3067\u3057\u305f\u3002
 Open_SPIRES_entry=SPIRES\u9805\u76ee\u3092\u958b\u304f
 Move/Rename_file=\u30d5\u30a1\u30a4\u30eb\u306e\u79fb\u52d5\u30fb\u6539\u540d
@@ -1853,7 +1784,6 @@ File_moved=\u30d5\u30a1\u30a4\u30eb\u3092\u79fb\u52d5\u3057\u307e\u3057\u305f
 Move_file_failed=\u30d5\u30a1\u30a4\u30eb\u306e\u79fb\u52d5\u306b\u5931\u6557
 Could_not_move_file=\u30d5\u30a1\u30a4\u30eb\u3092\u79fb\u52d5\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f
 Could_not_find_file_'%0'.=\u30d5\u30a1\u30a4\u30eb\u300c%0\u300d\u3092\u898b\u3064\u3051\u3089\u308c\u307e\u305b\u3093\u3067\u3057\u305f\u3002
-Move/rename_file=\u30d5\u30a1\u30a4\u30eb\u306e\u79fb\u52d5\u30fb\u6539\u540d
 Number_of_entries_successfully_imported=\u8aad\u307f\u8fbc\u307f\u306b\u6210\u529f\u3057\u305f\u9805\u76ee\u6570
 Import_canceled_by_user=\u8aad\u307f\u8fbc\u307f\u306f\u30e6\u30fc\u30b6\u30fc\u306b\u3088\u3063\u3066\u53d6\u308a\u6d88\u3055\u308c\u307e\u3057\u305f
 Progress\:_%0_of_%1=\u9032\u6357\u72b6\u6cc1:_%1\u306e\u3046\u3061%0
@@ -1881,11 +1811,11 @@ You_have_changed_the_menu_and_label_font_size.=\u30e1\u30cb\u30e5\u30fc\u30c8\u3
 
 Database_is_protected._Cannot_save_until_external_changes_have_been_reviewed.=\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u306f\u4fdd\u8b77\u3055\u308c\u3066\u3044\u307e\u3059\u3002\u5916\u90e8\u304b\u3089\u306e\u5909\u66f4\u3092\u691c\u67fb\u3057\u306a\u3044\u9650\u308a\u3001\u4fdd\u5b58\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u305b\u3093\u3002
 Protected_database=\u4fdd\u8b77\u3055\u308c\u305f\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9
-Refuse_to_save_the_database_before_external_changes_have_been_reviewed.=\u5916\u90e8\u304b\u3089\u306e\u5909\u66f4\u3092\u5be9\u67fb\u3059\u308b\u307e\u3067\u306f\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u3092\u4fdd\u5b58\u3059\u308b\u3053\u3068\u3092\u62d2\u7d76\u3059\u308b
+Refuse_to_save_the_database_before_external_changes_have_been_reviewed.=\u5916\u90e8\u304b\u3089\u306e\u5909\u66f4\u3092\u691c\u67fb\u3059\u308b\u307e\u3067\u306f\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u3092\u4fdd\u5b58\u3059\u308b\u3053\u3068\u3092\u62d2\u7d76\u3059\u308b
 Database_protection=\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u4fdd\u8b77
 Unable_to_save_database=\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u3092\u4fdd\u5b58\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f
 
-BibTeX_key_generator=BibTeX\u30ad\u30fc\u306e\u751f\u6210
+BibTeX_key_generator=BibTeX\u9375\u306e\u751f\u6210
 Unable_to_open_link.=\u30ea\u30f3\u30af\u3092\u958b\u304f\u3053\u3068\u304c\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002
 Search_JSTOR=JSTOR\u3092\u691c\u7d22
 Attempting_SQL_import...=SQL\u304b\u3089\u306e\u8aad\u307f\u8fbc\u307f\u3092\u8a66\u307f\u3066\u3044\u307e\u3059...
@@ -1900,7 +1830,6 @@ Note_that_these_settings_are_used_for_the_legacy_<b>pdf</b>_and_<b>ps</b>_fields
 Legacy_file_fields=\u5ec3\u6b62\u3055\u308c\u305f\u30d5\u30a1\u30a4\u30eb\u30d5\u30a3\u30fc\u30eb\u30c9
 
 This_makes_JabRef_look_up_each_%0_extension_and_check_if_the_file_exists._If_not,_you_will_be_given_options<BR>to_resolve_the_problem.=\u3053\u308c\u3092\u6709\u52b9\u306b\u3059\u308b\u3068\u3001JabRef\u306f\u5404%0\u62e1\u5f35\u5b50\u3092\u8abf\u3079\u3001\u30d5\u30a1\u30a4\u30eb\u304c\u5b58\u5728\u3059\u308b\u304b\u3069\u3046\u304b\u78ba\u8a8d\u3057\u307e\u3059\u3002<BR>\u3082\u3057\u5b58\u5728\u3057\u306a\u3051\u308c\u3070\u3001\u554f\u984c\u3092\u89e3\u6c7a\u3059\u308b\u9078\u629e\u8 [...]
-Run_Fetcher,_e.g._"--fetch=Medline\:cancer"=
 
 The_ACM_Digital_Library=ACM\u30c7\u30b8\u30bf\u30eb\u30e9\u30a4\u30d6\u30e9\u30ea
 Reset=\u30ea\u30bb\u30c3\u30c8
@@ -1925,9 +1854,9 @@ Unmark_all_entries_before_importing_new_entries_into_an_existing_database=\u65e2
 Forward=\u9032\u3080
 Back=\u623b\u308b
 Sort_the_following_fields_as_numeric_fields=\u4ee5\u4e0b\u306e\u30d5\u30a3\u30fc\u30eb\u30c9\u306f\u6570\u5024\u30d5\u30a3\u30fc\u30eb\u30c9\u3068\u3057\u3066\u6574\u5e8f
-Line_%0\:_Found_corrupted_BibTeX-key.=%0\u884c\u3081\:_\u7834\u640d\u3057\u305fBibTeX\u30ad\u30fc\u3092\u767a\u898b\u3057\u307e\u3057\u305f\u3002
-Line_%0\:_Found_corrupted_BibTeX-key_(contains_whitespaces).=%0\u884c\u3081\:_\u7834\u640d\u3057\u305fBibTeX\u30ad\u30fc\u3092\u767a\u898b\u3057\u307e\u3057\u305f\uff08\u7a7a\u767d\u304c\u5165\u3063\u3066\u3044\u308b\uff09\u3002
-Line_%0\:_Found_corrupted_BibTeX-key_(comma_missing).=%0\u884c\u3081\:_\u7834\u640d\u3057\u305fBibTeX\u30ad\u30fc\u3092\u767a\u898b\u3057\u307e\u3057\u305f\uff08\u30b3\u30f3\u30de\u304c\u6b20\u843d\uff09\u3002
+Line_%0\:_Found_corrupted_BibTeX-key.=%0\u884c\u3081\:_\u7834\u640d\u3057\u305fBibTeX\u9375\u3092\u691c\u51fa\u3057\u307e\u3057\u305f\u3002
+Line_%0\:_Found_corrupted_BibTeX-key_(contains_whitespaces).=%0\u884c\u3081\:_\u7834\u640d\u3057\u305fBibTeX\u9375\u3092\u767a\u898b\u3057\u307e\u3057\u305f\uff08\u7a7a\u767d\u304c\u5165\u3063\u3066\u3044\u308b\uff09\u3002
+Line_%0\:_Found_corrupted_BibTeX-key_(comma_missing).=%0\u884c\u3081\:_\u7834\u640d\u3057\u305fBibTeX\u9375\u3092\u767a\u898b\u3057\u307e\u3057\u305f\uff08\u30b3\u30f3\u30de\u304c\u6b20\u843d\uff09\u3002
 Finished_downloading_full_text_document=\u6587\u66f8\u672c\u4f53\u306e\u30c0\u30a6\u30f3\u30ed\u30fc\u30c9\u304c\u7d42\u4e86\u3057\u307e\u3057\u305f
 Unable_to_find_full_text_document_in_the_linked_web_page.=\u30ea\u30f3\u30af\u5148\u306e\u30a6\u30a7\u30d6\u30da\u30fc\u30b8\u306b\u8ad6\u6587\u672c\u4f53\u3092\u898b\u3064\u3051\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002
 Connection_error_when_trying_to_find_full_text_document.=\u5b8c\u5168\u306a\u30c6\u30ad\u30b9\u30c8\u6587\u66f8\u3092\u691c\u7d22\u4e2d\u306b\u63a5\u7d9a\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002
@@ -1970,11 +1899,9 @@ Version=\u30d0\u30fc\u30b8\u30e7\u30f3
 Unknown=\u77e5\u308a\u307e\u305b\u3093
 Not_loaded=\u8aad\u307f\u8fbc\u307e\u308c\u307e\u305b\u3093\u3067\u3057\u305f
 Loaded=\u8aad\u307f\u8fbc\u307f\u307e\u3057\u305f
-Could_not_determine_version_of_=\u4ee5\u4e0b\u306e\u7248\u3092\u7279\u5b9a\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f:_
 Install_anyway?=\u69cb\u308f\u305a\u5c0e\u5165\u3057\u307e\u3059\u304b\uff1f
 
 Looking_for_full_text_document...=\u6587\u66f8\u672c\u4f53\u3092\u63a2\u3057\u3066\u3044\u307e\u3059...
-Follow_DOI_or_URL_link_and_try_to_locate_PDF_full_text_document=DOI\u307e\u305f\u306fURL\u30ea\u30f3\u30af\u3092\u305f\u3069\u3063\u3066PDF\u6587\u66f8\u672c\u4f53\u306e\u5834\u6240\u306e\u7279\u5b9a\u3092\u8a66\u307f\u307e\u3059
 Unable_to_find_full_text_article._No_search_algorithm_defined_for_the_'%0'_web_site.=\u8ad6\u6587\u672c\u4f53\u3092\u898b\u3064\u3051\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002\u300c%0\u300d\u30a6\u30a7\u30d6\u30b5\u30a4\u30c8\u7528\u306e\u691c\u7d22\u30a2\u30eb\u30b4\u30ea\u30ba\u30e0\u304c\u5b9a\u7fa9\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002
 Found_pdf_link,_but_received_the_wrong_MIME_type._This_could_indicate_that_you_don't_have_access_to_the_fulltext_article.=PDF\u30ea\u30f3\u30af\u3092\u691c\u51fa\u3057\u307e\u3057\u305f\u304c\u3001\u4e0d\u6b63\u306aMIME\u578b\u3092\u53d7\u4fe1\u3057\u307e\u3057\u305f\u3002\u8ad6\u6587\u672c\u4f53\u3078\u306e\u30a2\u30af\u30bb\u30b9\u6a29\u304c\u306a\u3044\u305f\u3081\u3067\u3042\u308b\u3053\u3068\u304c\u3042\u308a\u307e\u3059\u3002
 
@@ -2016,14 +1943,12 @@ Changes_have_been_made_to_the_following_metadata_elements=\u4ee5\u4e0b\u306e\u30
 Generate_groups_for_author_last_names=\u8457\u8005\u306e\u59d3\u3067\u30b0\u30eb\u30fc\u30d7\u3092\u751f\u6210\u3059\u308b
 Generate_groups_for_editor_last_names=\u7de8\u96c6\u8005\u306e\u59d3\u3067\u30b0\u30eb\u30fc\u30d7\u3092\u751f\u6210\u3059\u308b
 Generate_groups_from_keywords_in_a_BibTeX_field=BibTeX\u30d5\u30a3\u30fc\u30eb\u30c9\u306e\u30ad\u30fc\u30ef\u30fc\u30c9\u304b\u3089\u30b0\u30eb\u30fc\u30d7\u3092\u751f\u6210\u3059\u308b
-Enforce_legal_characters_in_BibTeX_keys=BibTeX\u30ad\u30fc\u3067\u898f\u5247\u306b\u5247\u3063\u305f\u6587\u5b57\u306e\u4f7f\u7528\u3092\u5f37\u5236\u3059\u308b
+Enforce_legal_characters_in_BibTeX_keys=BibTeX\u9375\u3067\u898f\u5247\u306b\u5247\u3063\u305f\u6587\u5b57\u306e\u4f7f\u7528\u3092\u5f37\u5236\u3059\u308b
 The_#_character_is_not_allowed_in_BibTeX_strings_unless_escaped_as_in_'\\#'.=#\u6587\u5b57\u306f\u3001\u300c\\#\u300d\u306e\u3088\u3046\u306b\u30a8\u30b9\u30b1\u30fc\u30d7\u3057\u306a\u3044\u9650\u308a\u306f\u3001BibTeX\u30d5\u30a3\u30fc\u30eb\u30c9\u4e2d\u3067\u306f\u4f7f\u3046\u3053\u3068\u304c\u3067\u304d\u307e\u305b\u3093\u3002
 Before_saving,_please_edit_any_strings_containing_the_#_character.=\u4fdd\u5b58\u524d\u306b\u3001#\u6587\u5b57\u3092\u542b\u3080\u6587\u5b57\u5217\u3092\u5168\u3066\u7de8\u96c6\u3057\u3066\u304f\u3060\u3055\u3044\u3002
 
 Save_without_backup?=\u30d0\u30c3\u30af\u30a2\u30c3\u30d7\u3092\u53d6\u3089\u305a\u306b\u4fdd\u5b58\u3057\u307e\u3059\u304b\uff1f
 Unable_to_create_backup=\u30d0\u30c3\u30af\u30a2\u30c3\u30d7\u3092\u4f5c\u6210\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u305b\u3093
-
-File_directory_is_not_set_or_does_not_exist.=\u30d5\u30a1\u30a4\u30eb\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u304c\u8a2d\u5b9a\u3055\u308c\u3066\u3044\u306a\u3044\u304b\u5b58\u5728\u3057\u307e\u305b\u3093\u3002
 Move_file_to_file_directory.=\u30d5\u30a1\u30a4\u30eb\u3092\u30d5\u30a1\u30a4\u30eb\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u306b\u79fb\u52d5\u3057\u307e\u3059\u3002
 Rename_file_to=\u30d5\u30a1\u30a4\u30eb\u540d\u3092\u4ee5\u4e0b\u306b\u6539\u540d:
 <b>All_Entries</b>_(this_group_cannot_be_edited_or_removed)=<b>\u5168\u9805\u76ee</b>\uff08\u3053\u306e\u30b0\u30eb\u30fc\u30d7\u306f\u7de8\u96c6\u3057\u305f\u308a\u524a\u9664\u3057\u305f\u308a\u3059\u308b\u3053\u3068\u306f\u3067\u304d\u307e\u305b\u3093\uff09
@@ -2041,29 +1966,25 @@ No_entries_found._It_looks_like_you_do_not_have_access_to_search_JStor.=\u9805\u
 Search_ScienceDirect=ScienceDirect\u3092\u691c\u7d22
 Error_while_fetching_from_ScienceDirect=ScienceDirect\u304b\u3089\u306e\u53d6\u5f97\u4e2d\u306b\u30a8\u30e9\u30fc\u767a\u751f
 
-Error_initializing_custom_export_format_from_string_'%0'=\u6587\u5b57\u5217\u300c%0\u300d\u304b\u3089\u500b\u4eba\u8a2d\u5b9a\u306e\u66f8\u304d\u51fa\u3057\u66f8\u5f0f\u3092\u521d\u671f\u5316\u4e2d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f
+Error_initializing_custom_export_format_from_string_'%0'=\u6587\u5b57\u5217\u300c%0\u300d\u304b\u3089\u81ea\u4f5c\u66f8\u51fa\u5f62\u5f0f\u3092\u521d\u671f\u5316\u4e2d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f
 
 
 BibLaTeX_mode=BibLaTeX\u30e2\u30fc\u30c9
 Optional_fields_2=\u975e\u5fc5\u9808\u30d5\u30a3\u30fc\u30eb\u30c92
-Please_wait=\u304a\u5f85\u3061\u304f\u3060\u3055\u3044
 Waiting_for_save_operation_to_finish=\u4fdd\u5b58\u64cd\u4f5c\u304c\u7d42\u4e86\u3059\u308b\u306e\u3092\u5f85\u3063\u3066\u3044\u307e\u3059
-Resolving_duplicate_BibTeX_keys...=\u91cd\u8907\u3057\u305fBibTeX\u30ad\u30fc\u3092\u89e3\u6c7a...
-Finished_resolving_duplicate_BibTeX_keys._%0_entries_modified.=\u91cd\u8907\u3057\u305fBibTeX\u30ad\u30fc\u3092\u89e3\u6d88\u3057\u7d42\u308f\u308a\u307e\u3057\u305f\u3002%0\u9805\u76ee\u3092\u4fee\u6b63\u3057\u307e\u3057\u305f\u3002
-This_database_contains_one_or_more_duplicated_BibTeX_keys.=\u3053\u306e\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u306b\u306f\u30011\u3064\u306a\u3044\u3057\u8907\u6570\u306e\u91cd\u8907\u3057\u305fBibTeX\u30ad\u30fc\u304c\u3042\u308a\u307e\u3059\u3002
-Do_you_want_to_resolve_duplicate_keys_now?=\u91cd\u8907\u3057\u305f\u30ad\u30fc\u3092\u76f4\u3061\u306b\u89e3\u6d88\u3057\u307e\u3059\u304b\uff1f
-Find_and_remove_duplicate_BibTeX_keys=\u91cd\u8907BibTeX\u30ad\u30fc\u3092\u691c\u51fa\u3057\u3066\u524a\u9664
-Expected_syntax_for_--fetch='<name_of_fetcher>\:<query>'=
-Duplicate_BibTeX_key=\u91cd\u8907\u3057\u305fBibTeX\u30ad\u30fc
-Duplicate_key=\u91cd\u8907\u30ad\u30fc
-Generate_key=\u30ad\u30fc\u3092\u751f\u6210
+Resolving_duplicate_BibTeX_keys...=\u91cd\u8907\u3057\u305fBibTeX\u9375\u3092\u89e3\u6c7a...
+Finished_resolving_duplicate_BibTeX_keys._%0_entries_modified.=\u91cd\u8907\u3057\u305fBibTeX\u9375\u3092\u89e3\u6d88\u3057\u7d42\u308f\u308a\u307e\u3057\u305f\u3002%0\u9805\u76ee\u3092\u4fee\u6b63\u3057\u307e\u3057\u305f\u3002
+This_database_contains_one_or_more_duplicated_BibTeX_keys.=\u3053\u306e\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u306b\u306f\u30011\u3064\u306a\u3044\u3057\u8907\u6570\u306e\u91cd\u8907\u3057\u305fBibTeX\u9375\u304c\u3042\u308a\u307e\u3059\u3002
+Do_you_want_to_resolve_duplicate_keys_now?=\u91cd\u8907\u3057\u305f\u9375\u3092\u76f4\u3061\u306b\u89e3\u6d88\u3057\u307e\u3059\u304b\uff1f
+Find_and_remove_duplicate_BibTeX_keys=\u91cd\u8907BibTeX\u9375\u3092\u691c\u51fa\u3057\u3066\u524a\u9664
+Duplicate_BibTeX_key=\u91cd\u8907\u3057\u305fBibTeX\u9375
+Duplicate_key=\u91cd\u8907\u9375
+Generate_key=\u9375\u3092\u751f\u6210
 Import_marking_color=\u8aad\u307f\u8fbc\u307f\u6a19\u8b58\u306e\u8272
-
-%0_entries_found._To_reduce_server_load,_only_%1_will_be_downloaded._It_will_be_very_slow,_in_order_to_make_ACM_happy.=%0\u9805\u76ee\u3092\u691c\u51fa\u3057\u307e\u3057\u305f\u3002\u30b5\u30fc\u30d0\u30fc\u8ca0\u8377\u3092\u639b\u3051\u306a\u3044\u3088\u3046\u306b\u3059\u308b\u305f\u3081\u306b\u3001%1\u306e\u307f\u30c0\u30a6\u30f3\u30ed\u30fc\u30c9\u3057\u307e\u3059\u3002ACM\u306b\u8ff7\u60d1\u3092\u304b\u3051\u306a\u3044\u3088\u3046\u306b\u3059\u308b\u306e\u3067\u3001\u304b\u306a\u308a [...]
 BibTeX_importer=BibTeX\u304b\u3089\u8aad\u307f\u8fbc\u307f
-Always_add_letter_(a,_b,_...)_to_generated_keys=\u30ad\u30fc\u751f\u6210\u6642\u306b\u5e38\u306b(a,_,b,_\u2026)\u306a\u3069\u306e\u6587\u5b57\u3092\u4ed8\u52a0
-Ensure_unique_keys_using_letters_(a,_b,_...)=(a,_,b,_\u2026)\u306a\u3069\u306e\u6587\u5b57\u3092\u4f7f\u7528\u3057\u3066\u30ad\u30fc\u304c\u552f\u4e00\u3067\u3042\u308b\u3053\u3068\u3092\u4fdd\u8a3c
-Ensure_unique_keys_using_letters_(b,_c,_...)=(b,_,c,_\u2026)\u306a\u3069\u306e\u6587\u5b57\u3092\u4f7f\u7528\u3057\u3066\u30ad\u30fc\u304c\u552f\u4e00\u3067\u3042\u308b\u3053\u3068\u3092\u4fdd\u8a3c
+Always_add_letter_(a,_b,_...)_to_generated_keys=\u9375\u751f\u6210\u6642\u306b\u5e38\u306b(a,_,b,_\u2026)\u306a\u3069\u306e\u6587\u5b57\u3092\u4ed8\u52a0
+Ensure_unique_keys_using_letters_(a,_b,_...)=(a,_,b,_\u2026)\u306a\u3069\u306e\u6587\u5b57\u3092\u4f7f\u7528\u3057\u3066\u9375\u304c\u552f\u4e00\u3067\u3042\u308b\u3053\u3068\u3092\u4fdd\u8a3c
+Ensure_unique_keys_using_letters_(b,_c,_...)=(b,_,c,_\u2026)\u306a\u3069\u306e\u6587\u5b57\u3092\u4f7f\u7528\u3057\u3066\u9375\u304c\u552f\u4e00\u3067\u3042\u308b\u3053\u3068\u3092\u4fdd\u8a3c
 Entry_editor_active_background_color=\u9805\u76ee\u30a8\u30c7\u30a3\u30bf\u306e\u30a2\u30af\u30c6\u30a3\u30d6\u80cc\u666f\u8272
 Entry_editor_background_color=\u9805\u76ee\u30a8\u30c7\u30a3\u30bf\u306e\u80cc\u666f\u8272
 Entry_editor_font_color=\u9805\u76ee\u30a8\u30c7\u30a3\u30bf\u306e\u30d5\u30a9\u30f3\u30c8\u8272
@@ -2073,7 +1994,6 @@ An_autosave_file_was_found_for_this_database._This_could_indicate_=\u3053\u306e\
 that_JabRef_didn't_shut_down_cleanly_last_time_the_file_was_used.=\u30d5\u30a1\u30a4\u30eb\u304c\u4f7f\u7528\u3055\u308c\u305f\u969b\u306bJabRef\u304c\u6b63\u5e38\u306b\u7d42\u4e86\u3057\u306a\u304b\u3063\u305f\u3053\u3068\u3092\u793a\u3057\u307e\u3059\u3002
 General_file_directory=\u4e00\u822c\u30d5\u30a1\u30a4\u30eb\u30c7\u30a3\u30ec\u30af\u30c8\u30ea
 User-specific_file_directory=\u30e6\u30fc\u30b6\u30fc\u30d5\u30a1\u30a4\u30eb\u30c7\u30a3\u30ec\u30af\u30c8\u30ea
-Error_setting_look_and_feel=\u64cd\u4f5c\u6027\u8a2d\u5b9a\u6642\u306b\u30a8\u30e9\u30fc\u767a\u751f
 Search_failed\:_illegal_search_expression=\u691c\u7d22\u306b\u5931\u6557:_\u8aa4\u3063\u305f\u691c\u7d22\u8868\u73fe\u3067\u3059
 Show_ArXiv_column=ArXiv\u5217\u3092\u8868\u793a
 
@@ -2091,7 +2011,6 @@ Create_entry_based_on_XMP_data=XMP\u30c7\u30fc\u30bf\u306b\u57fa\u3065\u3044\u30
 Create_entry_based_on_data_fetched_from=\u53f3\u8a18\u304b\u3089\u53d6\u308a\u8fbc\u3093\u3060\u30c7\u30fc\u30bf\u306b\u57fa\u3065\u3044\u3066\u9805\u76ee\u3092\u751f\u6210
 Create_blank_entry_linking_the_PDF=PDF\u306b\u30ea\u30f3\u30af\u3057\u305f\u7a7a\u306e\u9805\u76ee\u3092\u751f\u6210
 Only_attach_PDF=PDF\u3092\u6dfb\u4ed8\u3057\u3066\u304f\u3060\u3055\u3044
-Mr._dLib_Metadata_Entries_Associated_With\:=\u53f3\u8a18\u306b\u95a2\u9023\u3065\u3051\u3089\u308c\u305fMr._dLib\u30e1\u30bf\u30c7\u30fc\u30bf\u9805\u76ee
 Mr._dLib_Metadata_Entries_Associated_With_PDF_File=PDF\u30d5\u30a1\u30a4\u30eb\u306b\u95a2\u9023\u3065\u3051\u3089\u308c\u305fMr._dLib\u30e1\u30bf\u30c7\u30fc\u30bf\u9805\u76ee
 Title=\u30bf\u30a4\u30c8\u30eb
 Author(s)=\u8457\u8005
@@ -2110,7 +2029,6 @@ Update_Existing_Entry=\u65e2\u5b58\u9805\u76ee\u3092\u66f4\u65b0
 Mr._dLib=Mr._dLib
 More_information=\u8a73\u3057\u3044\u60c5\u5831
 Fetching_Metadata...=\u30e1\u30bf\u30c7\u30fc\u30bf\u3092\u53d6\u5f97\u3057\u3066\u3044\u307e\u3059...
-Metadata=\u30e1\u30bf\u30c7\u30fc\u30bf
 
 Autocomplete_names_in_'Firstname_Lastname'_format_only=\u300c\u540d_\u59d3\u300d\u5f62\u5f0f\u306e\u540d\u524d\u306e\u307f\u81ea\u52d5\u88dc\u5b8c
 Autocomplete_names_in_'Lastname,_Firstname'_format_only=\u300c\u59d3,_\u540d\u300d\u5f62\u5f0f\u306e\u540d\u524d\u306e\u307f\u81ea\u52d5\u88dc\u5b8c
@@ -2118,15 +2036,12 @@ Autocomplete_names_in_both_formats=\u4e21\u65b9\u306e\u5f62\u5f0f\u3068\u3082\u8
 Marking_color_%0=\u6a19\u8b58\u8272_%0
 The_name_'comment'_can_not_be_used_as_an_entry_type_name.=\u300ccomment\u300d\u3068\u3044\u3046\u540d\u524d\u306f\u3001\u9805\u76ee\u578b\u540d\u3068\u3057\u3066\u306f\u4f7f\u7528\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u305b\u3093\u3002
 You_must_enter_an_integer_value_in_the_text_field_for=\u53f3\u8a18\u306e\u30c6\u30ad\u30b9\u30c8\u30d5\u30a3\u30fc\u30eb\u30c9\u4e2d\u306b\u306f\u6574\u6570\u5024\u3092\u5165\u529b\u3057\u306a\u304f\u3066\u306f\u306a\u308a\u307e\u305b\u3093:
-
-File_directory=\u30d5\u30a1\u30a4\u30eb\u30c7\u30a3\u30ec\u30af\u30c8\u30ea
 Send_as_email=\u96fb\u5b50\u30e1\u30fc\u30eb\u3068\u3057\u3066\u9001\u308b
 References=\u66f8\u8a8c\u60c5\u5831
 Sending_of_emails=\u96fb\u5b50\u30e1\u30fc\u30eb\u306e\u9001\u4ed8
 Subject_for_sending_an_email_with_references=\u66f8\u8a8c\u60c5\u5831\u3092\u6dfb\u4ed8\u3057\u305f\u96fb\u5b50\u30e1\u30fc\u30eb\u306e\u4ef6\u540d
 Automatically_open_folders_of_attached_files=\u6dfb\u4ed8\u30d5\u30a1\u30a4\u30eb\u306e\u30d5\u30a9\u30eb\u30c0\u3092\u81ea\u52d5\u7684\u306b\u958b\u304f
 Create_entry_based_on_content=\u5185\u5bb9\u306b\u57fa\u3065\u3044\u3066\u9805\u76ee\u3092\u751f\u6210\u3059\u308b
-Store_choice_as_default=\u9078\u629e\u3092\u65e2\u5b9a\u5024\u3068\u3057\u3066\u4fdd\u7ba1\u3059\u308b
 Do_not_show_this_box_again_for_this_import=\u3053\u306e\u8aad\u307f\u8fbc\u307f\u306b\u306f\u3053\u306e\u30dc\u30c3\u30af\u30b9\u3092\u3082\u3046\u8868\u793a\u3057\u306a\u3044
 Always_use_this_PDF_import_style_(and_do_not_ask_for_each_import)=\u3053\u306ePDF\u53d6\u8fbc\u307f\u65b9\u6cd5\u3092\u5e38\u306b\u7528\u3044\u308b(\u305d\u3057\u3066\u8aad\u307f\u8fbc\u307f\u6bce\u306b\u5c0b\u306d\u306a\u3044)
 Error_creating_email=\u96fb\u5b50\u30e1\u30fc\u30eb\u3092\u751f\u6210\u3059\u308b\u969b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f
@@ -2152,12 +2067,11 @@ Extra_information_(e.g._page_number)=\u8ffd\u52a0\u60c5\u5831_(\u4f8b:\u30da\u30
 Manage_citations=\u5f15\u7528\u3092\u7ba1\u7406
 Problem_modifying_citation=\u5f15\u7528\u3092\u4fee\u6b63\u3059\u308b\u306e\u306b\u554f\u984c\u767a\u751f
 Citation=\u5f15\u7528
-Context=\u6587\u8108
 Extra_information=\u8ffd\u52a0\u60c5\u5831
 Could_not_resolve_BibTeX_entry_for_citation_marker_'%0'.=\u5f15\u7528\u6a19\u8b58\u300c%0\u300d\u306b\u5bfe\u3057\u3066BibTeX\u9805\u76ee\u3092\u5f53\u3066\u306f\u3081\u3089\u308c\u307e\u305b\u3093\u3067\u3057\u305f\u3002
-Styles=\u66f8\u5f0f
-Select_style=\u66f8\u5f0f\u306e\u9078\u629e
-This_is_the_list_of_available_styles._Select_the_one_you_want_to_use.=\u4f7f\u7528\u3067\u304d\u308b\u66f8\u5f0f\u306e\u4e00\u89a7\u3067\u3059\u3002\u4f7f\u3044\u305f\u3044\u3082\u306e\u3092\u9078\u629e\u3057\u3066\u304f\u3060\u3055\u3044\u3002
+Styles=\u69d8\u5f0f
+Select_style=\u69d8\u5f0f\u306e\u9078\u629e
+This_is_the_list_of_available_styles._Select_the_one_you_want_to_use.=\u4f7f\u7528\u3067\u304d\u308b\u69d8\u5f0f\u306e\u4e00\u89a7\u3067\u3059\u3002\u4f7f\u3044\u305f\u3044\u3082\u306e\u3092\u9078\u629e\u3057\u3066\u304f\u3060\u3055\u3044\u3002
 Journals=\u5b66\u8853\u8a8c
 Cite=\u5f15\u7528
 Cite_in-text=\u6587\u4e2d\u3078\u306e\u5f15\u7528
@@ -2178,14 +2092,12 @@ Combine_pairs_of_citations_that_are_separated_by_spaces_only=\u7a7a\u767d\u3067\
 Autodetection_failed=\u81ea\u52d5\u691c\u51fa\u306b\u5931\u6557\u3057\u307e\u3057\u305f
 Connecting=\u63a5\u7d9a\u3057\u3066\u3044\u307e\u3059
 Please_wait...=\u304a\u5f85\u3061\u304f\u3060\u3055\u3044...
-Unable_to_connect=\u63a5\u7d9a\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f
 Set_connection_parameters=\u63a5\u7d9a\u30d1\u30e9\u30e1\u30fc\u30bf\u30fc\u3092\u6307\u5b9a\u3057\u3066\u304f\u3060\u3055\u3044
 Path_to_OpenOffice_directory=OpenOffice\u8f9e\u66f8\u3078\u306e\u30d1\u30b9
 Path_to_OpenOffice_executable=OpenOffice\u5b9f\u884c\u30d5\u30a1\u30a4\u30eb\u3078\u306e\u30d1\u30b9
 Path_to_OpenOffice_library_dir=OpenOffice\u30e9\u30a4\u30d6\u30e9\u30ea \u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u3078\u306e\u30d1\u30b9
-Autodetect=\u81ea\u52d5\u691c\u51fa
 Connection_lost=\u63a5\u7d9a\u304c\u5931\u308f\u308c\u307e\u3057\u305f
-The_paragraph_format_is_controlled_by_the_property_'ReferenceParagraphFormat'_or_'ReferenceHeaderParagraphFormat'_in_the_style_file.=\u6bb5\u843d\u306e\u66f8\u5f0f\u306f\u3001\u66f8\u5f0f\u30d5\u30a1\u30a4\u30eb\u5185\u306e\u300cReferenceParagraphFormat\u300d\u7279\u6027\u3082\u3057\u304f\u306f\u300cReferenceHeaderParagraphFormat\u300d\u7279\u6027\u3067\u5236\u5fa1\u3055\u308c\u3066\u3044\u307e\u3059\u3002
+The_paragraph_format_is_controlled_by_the_property_'ReferenceParagraphFormat'_or_'ReferenceHeaderParagraphFormat'_in_the_style_file.=\u6bb5\u843d\u69d8\u5f0f\u306f\u3001\u69d8\u5f0f\u30d5\u30a1\u30a4\u30eb\u5185\u306e\u300cReferenceParagraphFormat\u300d\u7279\u6027\u3082\u3057\u304f\u306f\u300cReferenceHeaderParagraphFormat\u300d\u7279\u6027\u3067\u5236\u5fa1\u3055\u308c\u3066\u3044\u307e\u3059\u3002
 The_character_format_is_controlled_by_the_citation_property_'CitationCharacterFormat'_in_the_style_file.=\u6587\u5b57\u66f8\u5f0f\u306f\u3001\u66f8\u5f0f\u30d5\u30a1\u30a4\u30eb\u5185\u306e\u5f15\u7528\u7279\u6027\u300cCitationCharacterFormat\u300d\u3067\u5236\u5fa1\u3055\u308c\u3066\u3044\u307e\u3059\u3002
 Automatically_sync_bibliography_when_inserting_citations=\u5f15\u7528\u3092\u633f\u5165\u3059\u308b\u969b\u3001\u66f8\u8a8c\u60c5\u5831\u3092\u81ea\u52d5\u7684\u306b\u540c\u671f
 Look_up_BibTeX_entries_in_the_active_tab_only=\u30a2\u30af\u30c6\u30a3\u30d6\u306a\u30bf\u30d6\u306eBibTeX\u9805\u76ee\u306e\u307f\u3092\u691c\u7d22
@@ -2206,7 +2118,6 @@ JSTOR_import_cancelled=JSTOR\u306e\u8aad\u307f\u8fbc\u307f\u304c\u53d6\u308a\u6d
 HTML_list=HTML\u4e00\u89a7
 Click_group_to_toggle_membership_of_selected_entries=\u30b0\u30eb\u30fc\u30d7\u3092\u30af\u30ea\u30c3\u30af\u3057\u3066\u3001\u9078\u629e\u3057\u305f\u9805\u76ee\u306e\u6240\u5c5e\u3092\u5165\u5207\u3057\u3066\u304f\u3060\u3055\u3044
 Use_EMACS_23_insertion_string=EMACS_23\u578b\u6587\u5b57\u5217\u633f\u5165\u3092\u884c\u3046
-Normalize_to_BibTeX_name_format=BibTeX\u540d\u66f8\u5f0f\u306b\u898f\u6e96\u5316
 If_possible,_normalize_this_list_of_names_to_conform_to_standard_BibTeX_name_formatting=\u53ef\u80fd\u306a\u3089\u3070\u3001\u540d\u79f0\u4e00\u89a7\u3092\u6a19\u6e96\u7684\u306aBibTeX\u540d\u66f8\u5f0f\u306b\u5408\u81f4\u3059\u308b\u3088\u3046\u306b\u898f\u6e96\u5316\u3059\u308b
 Could_not_open_%0=%0\u3092\u958b\u304f\u3053\u3068\u304c\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f
 Unknown_import_format=\u672a\u77e5\u306e\u8aad\u307f\u8fbc\u307f\u578b\u3067\u3059
@@ -2215,19 +2126,18 @@ An_Error_occurred_while_fetching_from_INSPIRE_source_(%0)\:=INSPIRE\u30bd\u30fc\
 Error_while_fetching_from_Inspire\:_=Inspire\u304b\u3089\u306e\u53d6\u5f97\u6642\u306b\u30a8\u30e9\u30fc\u767a\u751f:
 Web_search=\u30a6\u30a7\u30d6\u691c\u7d22
 Autocomplete_names=\u540d\u524d\u3092\u81ea\u52d5\u88dc\u5b8c
-You_must_select_either_a_valid_style_file,_or_use_the_default_style.=\u6709\u52b9\u306a\u66f8\u5f0f\u30d5\u30a1\u30a4\u30eb\u3092\u9078\u629e\u3057\u306a\u304f\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002\u305d\u3046\u3067\u306a\u3051\u308c\u3070\u65e2\u5b9a\u306e\u66f8\u5f0f\u304c\u7528\u3044\u3089\u308c\u307e\u3059\u3002
-Default_style=\u65e2\u5b9a\u66f8\u5f0f
-Choose_style_file_directly=\u66f8\u5f0f\u30d5\u30a1\u30a4\u30eb\u3092\u76f4\u63a5\u9078\u629e
+Default_style=\u65e2\u5b9a\u69d8\u5f0f
+Choose_style_file_directly=\u69d8\u5f0f\u30d5\u30a1\u30a4\u30eb\u3092\u76f4\u63a5\u9078\u629e
 Choose_from_a_directory=\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u304b\u3089\u9078\u629e
 No_directory_defined_for_%0-files=%0\u500b\u306e\u30d5\u30a1\u30a4\u30eb\u306b\u8f9e\u66f8\u304c\u5b9a\u7fa9\u3055\u308c\u3066\u3044\u307e\u305b\u3093
 Allow_file_links_relative_to_each_bib_file's_location=\u5404bib\u30d5\u30a1\u30a4\u30eb\u306e\u5834\u6240\u304b\u3089\u76f8\u5bfe\u30d1\u30b9\u3067\u30d5\u30a1\u30a4\u30eb\u3092\u30ea\u30f3\u30af\u3059\u308b\u3053\u3068\u3092\u8a31\u53ef
-Style_selection=\u66f8\u5f0f\u306e\u9078\u629e
-The_panel_below_shows_the_definition_of_the_default_style.=\u4e0b\u8a18\u306e\u30d1\u30cd\u30eb\u306f\u3001\u65e2\u5b9a\u66f8\u5f0f\u306e\u5b9a\u7fa9\u3092\u8868\u793a\u3057\u3066\u3044\u307e\u3059\u3002
-If_you_want_to_use_it_as_a_template_for_a_new_style,_you_can_copy_the_contents_into_a_new_.jstyle_file=\u3053\u308c\u3092\u65b0\u898f\u66f8\u5f0f\u306e\u96db\u5f62\u306b\u4f7f\u7528\u3057\u305f\u3044\u5834\u5408\u306f\u3001\u5185\u5bb9\u3092\u65b0\u3057\u3044.jstyle\u30d5\u30a1\u30a4\u30eb\u306b\u30b3\u30d4\u30fc\u3057\u3066\u304f\u3060\u3055\u3044
+Style_selection=\u69d8\u5f0f\u306e\u9078\u629e
+The_panel_below_shows_the_definition_of_the_default_style.=\u4e0b\u8a18\u306e\u30d1\u30cd\u30eb\u306f\u3001\u65e2\u5b9a\u69d8\u5f0f\u306e\u5b9a\u7fa9\u3092\u8868\u793a\u3057\u3066\u3044\u307e\u3059\u3002
+If_you_want_to_use_it_as_a_template_for_a_new_style,_you_can_copy_the_contents_into_a_new_.jstyle_file=\u3053\u308c\u3092\u65b0\u898f\u69d8\u5f0f\u306e\u96db\u5f62\u306b\u4f7f\u7528\u3057\u305f\u3044\u5834\u5408\u306f\u3001\u5185\u5bb9\u3092\u65b0\u3057\u3044.jstyle\u30d5\u30a1\u30a4\u30eb\u306b\u30b3\u30d4\u30fc\u3057\u3066\u304f\u3060\u3055\u3044
 
-Default_style_(author-year_citations)=\u65e2\u5b9a\u66f8\u5f0f\uff08\u8457\u8005\u540d-\u767a\u884c\u5e74\uff09
-Default_style_(numerical_citations)=\u65e2\u5b9a\u66f8\u5f0f\uff08\u9023\u756a\u5f15\u7528\uff09
-No_valid_style_file_defined=\u6709\u52b9\u306a\u66f8\u5f0f\u30d5\u30a1\u30a4\u30eb\u304c\u5b9a\u7fa9\u3055\u308c\u3066\u3044\u307e\u305b\u3093
+Default_style_(author-year_citations)=\u65e2\u5b9a\u69d8\u5f0f\uff08\u8457\u8005\u540d-\u767a\u884c\u5e74\uff09
+Default_style_(numerical_citations)=\u65e2\u5b9a\u69d8\u5f0f\uff08\u9023\u756a\u5f15\u7528\uff09
+No_valid_style_file_defined=\u6709\u52b9\u306a\u69d8\u5f0f\u30d5\u30a1\u30a4\u30eb\u304c\u5b9a\u7fa9\u3055\u308c\u3066\u3044\u307e\u305b\u3093
 Choose_pattern=\u30d1\u30bf\u30fc\u30f3\u3092\u9078\u629e\u3057\u3066\u304f\u3060\u3055\u3044
 Use_the_bib_file_location_as_primary_file_directory=bib\u30d5\u30a1\u30a4\u30eb\u306e\u5834\u6240\u3092\u4e3b\u8981\u30d5\u30a1\u30a4\u30eb\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u3068\u3057\u3066\u4f7f\u7528
 Could_not_run_the_gnuclient/emacsclient_program._Make_sure_you_have_the_emacsclient/gnuclient_program_installed_and_available_in_the_PATH.=gnuclient/emacsclient\u30d7\u30ed\u30b0\u30e9\u30e0\u3092\u5b9f\u884c\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002emacsclient/gnuclient\u30d7\u30ed\u30b0\u30e9\u30e0\u304c\u5c0e\u5165\u6e08\u307f\u3067PATH\u4e2d\u306b\u3042\u308b\u3053\u3068\u3092\u78ba\u8a8d\u3057\u3066\u304f\u3060\u3055\u3044\u3002
@@ -2235,8 +2145,8 @@ Built-in_journal_list=\u7d44\u307f\u8fbc\u307f\u5b66\u8853\u8a8c\u4e00\u89a7
 OpenOffice/LibreOffice_connection=OpenOffice/LibreOffice\u63a5\u7d9a
 You_can_add_additional_journal_names_by_setting_up_a_personal_journal_list,<br>as_well_as_linking_to_external_journal_lists.=\u500b\u4eba\u7528\u5b66\u8853\u8a8c\u4e00\u89a7\u3092\u4f5c\u6210\u3001\u307e\u305f\u306f\u5916\u90e8\u306e\u5b66\u8853\u8a8c\u4e00\u89a7\u306b\u30ea\u30f3\u30af\u3059\u308b\u3053\u3068\u3067<br>\u5b66\u8853\u8a8c\u540d\u3092\u8ffd\u52a0\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u3059\u3002
 JabRef_includes_a_built-in_list_of_journal_abbreviations.=JabRef\u306b\u306f\u5b66\u8853\u8a8c\u77ed\u7e2e\u540d\u306e\u7d44\u307f\u8fbc\u307f\u4e00\u89a7\u304c\u3042\u308a\u307e\u3059\u3002
-You_must_select_either_a_valid_style_file,_or_use_one_of_the_default_styles.=\u6709\u52b9\u306a\u66f8\u5f0f\u30d5\u30a1\u30a4\u30eb\u3092\u9078\u629e\u3059\u308b\u304b\u3001\u65e2\u5b9a\u66f8\u5f0f\u306e\u3046\u3061\u4e00\u3064\u3092\u7528\u3044\u306a\u304f\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002
-You_must_select_either_a_valid_style_file,_or_use_a_default_style.=\u6709\u52b9\u306a\u66f8\u5f0f\u30d5\u30a1\u30a4\u30eb\u3092\u9078\u629e\u3059\u308b\u304b\u3001\u65e2\u5b9a\u66f8\u5f0f\u3092\u7528\u3044\u306a\u304f\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002
+You_must_select_either_a_valid_style_file,_or_use_one_of_the_default_styles.=\u6709\u52b9\u306a\u69d8\u5f0f\u30d5\u30a1\u30a4\u30eb\u3092\u9078\u629e\u3059\u308b\u304b\u3001\u65e2\u5b9a\u69d8\u5f0f\u306e\u3046\u3061\u4e00\u3064\u3092\u7528\u3044\u306a\u304f\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002
+You_must_select_either_a_valid_style_file,_or_use_a_default_style.=\u6709\u52b9\u306a\u69d8\u5f0f\u30d5\u30a1\u30a4\u30eb\u3092\u9078\u629e\u3059\u308b\u304b\u3001\u65e2\u5b9a\u69d8\u5f0f\u3092\u7528\u3044\u306a\u304f\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002
 Show=\u8868\u793a
 This_is_a_simple_copy_and_paste_dialog._First_load_or_paste_some_text_into_the_text_input_area.<br>After_that,_you_can_mark_text_and_assign_it_to_a_BibTeX_field.=\u3053\u308c\u306f\u5358\u7d14\u306a\u30b3\u30d4\u30fc\uff06\u30da\u30fc\u30b9\u30c8\u30c0\u30a4\u30a2\u30ed\u30b0\u3067\u3059\u3002\u307e\u305a\u5165\u529b\u9818\u57df\u306b\u6587\u7ae0\u3092\u8aad\u307f\u8fbc\u3080\u304b\u8cbc\u308a\u4ed8\u3051\u3066\u304f\u3060\u3055\u3044\u3002<br>\u305d\u306e\u5f8c\u3001\u6587\u7ae0\u3092\u [...]
 Java_Bouncy_Castle_library_not_found._Please_download_and_install_it._For_more_information_see_http\://www.bouncycastle.org/.=Java_Bouncy_Castle\u30e9\u30a4\u30d6\u30e9\u30ea\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3002\u30c0\u30a6\u30f3\u30ed\u30fc\u30c9\u3057\u3066\u5c0e\u5165\u3057\u3066\u304f\u3060\u3055\u3044\u3002\u8a73\u3057\u304f\u306f\u3001http\://www.bouncycastle.org/\u53c2\u7167\u3002
@@ -2256,7 +2166,6 @@ Autocompletion_options=\u81ea\u52d5\u88dc\u5b8c\u30aa\u30d7\u30b7\u30e7\u30f3
 Autocomplete_after_following_number_of_characters=\u53f3\u8a18\u306e\u6587\u5b57\u6570\u4ee5\u4e0a\u3067\u81ea\u52d5\u88dc\u5b8c
 Name_format_used_for_autocompletion=\u81ea\u52d5\u88dc\u5b8c\u306b\u4f7f\u7528\u3055\u308c\u308b\u6c0f\u540d\u306e\u66f8\u5f0f
 Treatment_of_first_names=\u540d(first_name)\u306e\u53d6\u308a\u6271\u3044
-No_icon_found_for_%0=%0\u306e\u30a2\u30a4\u30b3\u30f3\u304c\u898b\u5f53\u305f\u308a\u307e\u305b\u3093
 Cleanup_entries=\u9805\u76ee\u3092\u6d88\u53bb
 Automatically_assign_new_entry_to_selected_groups=\u9078\u629e\u3057\u305f\u30b0\u30eb\u30fc\u30d7\u306b\u65b0\u898f\u9805\u76ee\u3092\u81ea\u52d5\u5272\u308a\u5f53\u3066
 Move_DOIs_from_note_and_URL_field_to_DOI_field_and_remove_http_prefix=DOI\u3092note\u53ca\u3073URL\u30d5\u30a3\u30fc\u30eb\u30c9\u304b\u3089DOI\u30d5\u30a3\u30fc\u30eb\u30c9\u306b\u79fb\u52d5\u3057\u3066\u3001http\u524d\u7f6e\u53e5\u3092\u524a\u9664\u3059\u308b
@@ -2270,16 +2179,12 @@ Doing_a_cleanup_for_%0_entries...=%0\u500b\u306e\u9805\u76ee\u3092\u6d88\u53bb\u
 No_entry_needed_a_clean_up=\u6d88\u53bb\u306e\u5fc5\u8981\u304c\u3042\u308b\u9805\u76ee\u306f\u3042\u308a\u307e\u305b\u3093\u3067\u3057\u305f
 One_entry_needed_a_clean_up=1\u3064\u306e\u9805\u76ee\u3092\u6d88\u53bb\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3057\u305f
 %0_entries_needed_a_clean_up=%0\u500b\u306e\u9805\u76ee\u3092\u6d88\u53bb\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3057\u305f
-Imported_=\u53f3\u8a18\u3092\u8aad\u307f\u8fbc\u307f\u307e\u3057\u305f\:_
 Error_importing_from_database=\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u306e\u8aad\u307f\u8fbc\u307f\u6642\u306b\u30a8\u30e9\u30fc\u767a\u751f
 
 %0_databases_will_be_imported=%0\u500b\u306e\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u304c\u8aad\u307f\u8fbc\u307e\u308c\u307e\u3059
 Imported_%0_databases_successfully=%0\u500b\u306e\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u304c\u7121\u4e8b\u8aad\u307f\u8fbc\u307e\u308c\u307e\u3057\u305f
 Minimize_to_system_tray=\u30b7\u30b9\u30c6\u30e0\u30c8\u30ec\u30a4\u306b\u6700\u5c0f\u5316
 
-Incomplete_search_results=\u4e0d\u5b8c\u5168\u306a\u691c\u7d22\u7d50\u679c
-%0_entries_were_found,_but_only_%1_of_these_could_be_resolved.=%0\u500b\u306e\u9805\u76ee\u304c\u691c\u51fa\u3055\u308c\u307e\u3057\u305f\u304c\u3001\u305d\u306e\u3046\u3061%1\u500b\u3060\u3051\u3057\u304b\u89e3\u6c7a\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002
-
 Error_downloading_file_'%0'=\u30d5\u30a1\u30a4\u30eb\u300c%0\u300d\u3092\u30c0\u30a6\u30f3\u30ed\u30fc\u30c9\u3059\u308b\u969b\u306b\u30a8\u30e9\u30fc\u767a\u751f
 Download_failed=\u30c0\u30a6\u30f3\u30ed\u30fc\u30c9\u306b\u5931\u6557\u3057\u307e\u3057\u305f
 Importing_cancelled=\u8aad\u307f\u8fbc\u307f\u3092\u53d6\u308a\u6d88\u3057\u307e\u3057\u305f
@@ -2302,10 +2207,9 @@ Unable_to_clear_preferences.=\u8a2d\u5b9a\u3092\u6d88\u53bb\u3059\u308b\u3053\u3
 
 Reset_preferences_(key1,key2,..._or_'all')=\u8a2d\u5b9a\u3092\u30ea\u30bb\u30c3\u30c8(\u30ad\u30fc1\u30fb\u30ad\u30fc2\u2026\u3042\u308b\u3044\u306f\u300call\u300d)
 Find_unlinked_files=\u30ea\u30f3\u30af\u3057\u3066\u3044\u306a\u3044\u30d5\u30a1\u30a4\u30eb\u3092\u691c\u7d22
-Select_All=\u3059\u3079\u3066\u3092\u9078\u629e
-Unselect_All=\u3059\u3079\u3066\u306e\u9078\u629e\u3092\u89e3\u9664
-Expand_All=\u3059\u3079\u3066\u5c55\u958b\u8868\u793a
-Collapse_All=\u3059\u3079\u3066\u7573\u3093\u3067\u8868\u793a
+Unselect_all=\u3059\u3079\u3066\u306e\u9078\u629e\u3092\u89e3\u9664
+Expand_all=\u3059\u3079\u3066\u5c55\u958b\u8868\u793a
+Collapse_all=\u3059\u3079\u3066\u7573\u3093\u3067\u8868\u793a
 Select_Directory=\u8f9e\u66f8\u3092\u9078\u629e
 Choose_Directory=\u8f9e\u66f8\u3092\u9078\u3076
 Use_the_selected_directory_to_start_with_the_search.=\u9078\u629e\u3057\u305f\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u304b\u3089\u691c\u7d22\u3092\u958b\u59cb\u3057\u307e\u3059\u3002
@@ -2335,12 +2239,11 @@ Unable_to_connect_to_freecite_online_service.=freecite\u30aa\u30f3\u30e9\u30a4\u
 Parse_with_FreeCite=FreeCite\u3067\u89e3\u6790
 Insert_selected_citations_into_TeXstudio=\u9078\u629e\u3057\u305f\u5f15\u7528\u3092TeXstudio\u306b\u633f\u5165
 The_current_BibTeX_key_will_be_overwritten._Continue?=\u73fe\u5728\u306eBibTeX\u9375\u306f\u4e0a\u66f8\u304d\u3055\u308c\u307e\u3059\u3002\u7d9a\u3051\u307e\u3059\u304b\uff1f
-Overwrite_key=\u30ad\u30fc\u3092\u4e0a\u66f8\u304d
+Overwrite_key=\u9375\u3092\u4e0a\u66f8\u304d
 Not_overwriting_existing_key._To_change_this_setting,_open_Options_->_Prefererences_->_BibTeX_key_generator=\u65e2\u5b58\u306e\u9375\u3092\u4e0a\u66f8\u304d\u3057\u307e\u305b\u3093\u3002\u3053\u306e\u8a2d\u5b9a\u3092\u5909\u66f4\u3059\u308b\u306b\u306f\u3001\u30aa\u30d7\u30b7\u30e7\u30f3\u2192\u8a2d\u5b9a\u2192BibTeX\u30ad\u30fc\u306e\u751f\u6210\u3092\u958b\u3044\u3066\u304f\u3060\u3055\u3044
 How_would_you_like_to_link_to_'%0'?=\u300c%0\u300d\u3078\u306e\u30ea\u30f3\u30af\u3092\u3069\u3046\u3057\u307e\u3059\u304b\uff1f
 Marked_entries_as_relevant=\u9805\u76ee\u3092\u95a2\u9023\u6027\u304c\u3042\u308b\u3082\u306e\u3068\u3057\u3066\u6a19\u8b58\u4ed8\u3051\u3057\u307e\u3057\u305f
 Marked_entries'_quality_as_good=\u9805\u76ee\u306e\u54c1\u8cea\u3092\u826f\u597d\u3068\u3057\u3066\u6a19\u8b58\u4ed8\u3051\u3057\u307e\u3057\u305f
-Set_priority=\u512a\u5148\u5ea6\u3092\u8a2d\u5b9a
 no_preview_available=\u30d7\u30ec\u30d3\u30e5\u30fc\u304c\u3042\u308a\u307e\u305b\u3093
 Enable_PDF_preview=PDF\u30d7\u30ec\u30d3\u30e5\u30fc\u3092\u6709\u52b9\u306b\u3059\u308b
 Show_one_letter_heading_for_icon_columns=\u30a2\u30a4\u30b3\u30f3\u5217\u306e\u898b\u51fa\u3057\u306b1\u6587\u5b57\u4ed8\u3051\u52a0\u3048\u308b
@@ -2395,7 +2298,6 @@ If_a_pasted_or_imported_entry_already_has_the_field_set,_overwrite.=\u65e2\u306b
 To_disable_the_memory_stick_mode_rename_or_remove_the_jabref.xml_file_in_the_same_folder_as_JabRef.=\u30e1\u30e2\u30ea\u30fc\u30b9\u30c6\u30a3\u30c3\u30af\u30e2\u30fc\u30c9\u3092\u7121\u52b9\u306b\u3059\u308b\u306b\u306f\u3001JabRef\u3068\u540c\u3058\u30d5\u30a9\u30eb\u30c0\u306b\u3042\u308bjabref.xml\u30d5\u30a1\u30a4\u30eb\u3092\u6539\u540d\u3059\u308b\u304b\u524a\u9664\u3057\u3066\u304f\u3060\u3055\u3044
 Please_note_that_this_is_an_early_beta_version._Do_not_use_it_without_backing_up_your_files!=\u3053\u308c\u306f\u521d\u671f\u30d9\u30fc\u30bf\u7248\u3067\u3042\u308b\u3053\u3068\u306b\u3054\u6ce8\u610f\u304f\u3060\u3055\u3044\u3002\u304a\u4f7f\u3044\u306e\u30d5\u30a1\u30a4\u30eb\u3092\u30d0\u30c3\u30af\u30a2\u30c3\u30d7\u3059\u308b\u3053\u3068\u306a\u304f\u4f7f\u7528\u3057\u306a\u3044\u3067\u304f\u3060\u3055\u3044\uff01
 A_string_with_that_label_already_exists=\u305d\u306e\u30e9\u30d9\u30eb\u3092\u6301\u3064\u6587\u5b57\u5217\u306f\u65e2\u306b\u5b58\u5728\u3057\u3066\u3044\u307e\u3059
-File_has_been_updated_externally._Are_you_sure_you_want_to_save?=\u30d5\u30a1\u30a4\u30eb\u304c\u5916\u90e8\u304b\u3089\u66f4\u65b0\u3055\u308c\u307e\u3057\u305f\u3002\u672c\u5f53\u306b\u4fdd\u5b58\u3057\u307e\u3059\u304b\uff1f
 Could_not_connect_to_a_running_gnuserv_process._Make_sure_that_Emacs_or_XEmacs_is_running,<BR>and_that_the_server_has_been_started_(by_running_the_command_'server-start'/'gnuserv-start').=\u5b9f\u884c\u4e2d\u306egnuserv\u30d7\u30ed\u30bb\u30b9\u306b\u63a5\u7d9a\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002Emacs\u3042\u308b\u3044\u306fXEmacs\u304c\u5b9f\u884c\u4e2d\u3067\u3042\u308b\u3053\u3068\u3092\u78ba\u8a8d\u3057\u3001<BR>\uff08\u300cserver-start\u300d\u307e\u305f\u306f\u300c [...]
 Use_the_following_delimiter_character(s)\:=\u53f3\u8a18\u306e\u533a\u5207\u308a\u6587\u5b57\u3092\u4f7f\u7528\:
 Created_group_"%0".=\u30b0\u30eb\u30fc\u30d7\u300c%0\u300d\u3092\u4f5c\u6210\u3057\u307e\u3057\u305f\u3002
@@ -2406,8 +2308,8 @@ Unable_to_connect._One_possible_reason_is_that_JabRef_and_OpenOffice/LibreOffice
 Could_not_connect_to_running_OpenOffice.\nMake_sure_you_have_installed_OpenOffice_with_Java_support.\nIf_connecting_manually,_please_verify_program_and_library_paths.\n\nError_message\:_=\u5b9f\u884c\u4e2d\u306eOpenOffice\u306b\u63a5\u7d9a\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002\nOpenOffice\u304cJava\u30b5\u30dd\u30fc\u30c8\u3068\u3068\u3082\u306b\u5c0e\u5165\u3055\u308c\u3066\u3044\u308b\u3053\u3068\u3092\u78ba\u8a8d\u3057\u3066\u304f\u3060\u3055\u3044\u3002\n\u624b\u52d5\ [...]
 Not_connected_to_any_Writer_document._Please_make_sure_a_document_is_open,_and_use_the_'Select_Writer_document'_button_to_connect_to_it.=\u3069\u306eWriter\u6587\u66f8\u306b\u3082\u63a5\u7d9a\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002\u6587\u66f8\u304c\u958b\u304b\u308c\u3066\u3044\u308b\u304b\u78ba\u8a8d\u3057\u3066\u3001\u300cWriter\u6587\u66f8\u3092\u9078\u629e\u300d\u30dc\u30bf\u30f3\u3092\u62bc\u3057\u3066\u63a5\u7d9a\u3057\u3066\u304f\u3060\u3055\u3044\u3002
 Connection_to_OpenOffice_has_been_lost._Please_make_sure_OpenOffice_is_running,_and_try_to_reconnect.=OpenOffice\u3078\u306e\u63a5\u7d9a\u304c\u5931\u308f\u308c\u307e\u3057\u305f\u3002OpenOffice\u304c\u5b9f\u884c\u3055\u308c\u3066\u3044\u308b\u3053\u3068\u3092\u78ba\u8a8d\u3057\u3066\u518d\u63a5\u7d9a\u3092\u8a66\u307f\u3066\u304f\u3060\u3055\u3044\u3002
-Your_style_file_specifies_the_paragraph_format_'%0',_which_is_undefined_in_your_current_OpenOffice_document.=\u304a\u4f7f\u3044\u306e\u66f8\u5f0f\u30d5\u30a1\u30a4\u30eb\u306f\u3001\u6bb5\u843d\u69d8\u5f0f\u300c%0\u300d\u3092\u6307\u5b9a\u3057\u3066\u3044\u307e\u3059\u304c\u3001\u3053\u308c\u306f\u3001\u73fe\u5728\u306eOpenOffice\u6587\u66f8\u306b\u306f\u5b9a\u7fa9\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002
-Your_style_file_specifies_the_character_format_'%0',_which_is_undefined_in_your_current_OpenOffice_document.=\u304a\u4f7f\u3044\u306e\u66f8\u5f0f\u30d5\u30a1\u30a4\u30eb\u306f\u3001\u6587\u5b57\u69d8\u5f0f\u300c%0\u300d\u3092\u6307\u5b9a\u3057\u3066\u3044\u307e\u3059\u304c\u3001\u3053\u308c\u306f\u3001\u73fe\u5728\u306eOpenOffice\u6587\u66f8\u306b\u306f\u5b9a\u7fa9\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002
+Your_style_file_specifies_the_paragraph_format_'%0',_which_is_undefined_in_your_current_OpenOffice_document.=\u304a\u4f7f\u3044\u306e\u69d8\u5f0f\u30d5\u30a1\u30a4\u30eb\u306f\u3001\u6bb5\u843d\u69d8\u5f0f\u300c%0\u300d\u3092\u6307\u5b9a\u3057\u3066\u3044\u307e\u3059\u304c\u3001\u3053\u308c\u306f\u3001\u73fe\u5728\u306eOpenOffice\u6587\u66f8\u306b\u306f\u5b9a\u7fa9\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002
+Your_style_file_specifies_the_character_format_'%0',_which_is_undefined_in_your_current_OpenOffice_document.=\u304a\u4f7f\u3044\u306e\u69d8\u5f0f\u30d5\u30a1\u30a4\u30eb\u306f\u3001\u6587\u5b57\u69d8\u5f0f\u300c%0\u300d\u3092\u6307\u5b9a\u3057\u3066\u3044\u307e\u3059\u304c\u3001\u3053\u308c\u306f\u3001\u73fe\u5728\u306eOpenOffice\u6587\u66f8\u306b\u306f\u5b9a\u7fa9\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002
 Unable_to_determine_plugin_name_and_version._This_may_not_be_a_valid_JabRef_plugin.=\u30d7\u30e9\u30b0\u30a4\u30f3\u540d\u3068\u305d\u306e\u7248\u6570\u3092\u78ba\u5b9a\u3067\u304d\u307e\u305b\u3093\u3002\u6709\u52b9\u306aJabRef\u30d7\u30e9\u30b0\u30a4\u30f3\u3067\u306f\u306a\u3044\u53ef\u80fd\u6027\u304c\u3042\u308a\u307e\u3059\u3002
 Import_Metadata_From_PDF=PDF\u304b\u3089Metadata\u3092\u8aad\u307f\u8fbc\u3080
 Run_HTML_converter_on_title=title\u306bHTML\u5909\u63db\u5b50\u3092\u304b\u3051\u308b
@@ -2432,11 +2334,10 @@ An_Error_occurred_while_parsing_abstract=abstract\u306e\u89e3\u6790\u6642\u306b\
 Unknown_DiVA_entry\:_'%0'.=\u672a\u77e5\u306eDiVA\u9805\u76ee\:\u300c%0\u300d
 Get_BibTeX_entry_from_DiVA=DiVA\u304b\u3089BibTeX\u9805\u76ee\u3092\u53d6\u5f97
 Log=\u30ed\u30b0
-Remove_unneccessary_$,_{,_and_}=\u4e0d\u8981\u306a$/{/}\u3092\u6d88\u53bb\u3057\u3066\u304f\u3060\u3055\u3044
 
 ISO_690=ISO_690
 Format_units_by_adding_non-breaking_separators_and_keeping_the_correct_case_on_search=\u975e\u6539\u884c\u533a\u5207\u308a\u3092\u4ed8\u3057\u3066\u691c\u7d22\u3067\u5927\u6587\u5b57\u5c0f\u6587\u5b57\u304c\u6b63\u3057\u304f\u306a\u308b\u3088\u3046\u5358\u4f4d\u3092\u6574\u5f62
-Use_Emacs_key_bindings=Emacs\u30ad\u30fc\u5272\u308a\u5f53\u3066\u3092\u4f7f\u7528
+Use_Emacs_key_bindings=Emacs\u30ad\u30fc\u5272\u5f53\u3092\u4f7f\u7528
 Merge_entries=\u9805\u76ee\u3092\u7d71\u5408
 Show_URL_first=URL\u3092\u6700\u521d\u306b\u8868\u793a
 Show_DOI_first=DOI\u3092\u6700\u521d\u306b\u8868\u793a
@@ -2458,3 +2359,39 @@ Merged_entries_into_a_new_and_kept_the_old=\u7d71\u5408\u9805\u76ee\u3092\u65b0\
 Merged_entries_into_a_new_and_removed_the_old=\u7d71\u5408\u9805\u76ee\u3092\u65b0\u898f\u306b\u8ffd\u52a0\u3057\u3001\u65e7\u9805\u76ee\u3092\u524a\u9664\u3057\u307e\u3057\u305f
 Parse=\u89e3\u6790
 Result=\u7d50\u679c
+
+Update_timestamp_on_modification=\u4fee\u6b63\u6642\u306b\u30bf\u30a4\u30e0\u30b9\u30bf\u30f3\u30d7\u3092\u66f4\u65b0
+change_field=\u30d5\u30a3\u30fc\u30eb\u30c9\u3092\u5909\u66f4
+All_key_bindings_will_be_reset_to_their_defaults.=\u3059\u3079\u3066\u306e\u30ad\u30fc\u5272\u5f53\u3092\u65e2\u5b9a\u5024\u306b\u5fa9\u5e30\u3057\u307e\u3059\u3002
+Automatically_set_file_links=\u30d5\u30a1\u30a4\u30eb\u30ea\u30f3\u30af\u3092\u81ea\u52d5\u8a2d\u5b9a
+Continue?=\u7d9a\u3051\u307e\u3059\u304b\uff1f
+Resetting_all_key_bindings=\u30ad\u30fc\u5272\u5f53\u3092\u3059\u3079\u3066\u5fa9\u5e30
+Save_entries_ordered_by_title=
+Export_entries_ordered_by_title=
+Quotes=
+Curly_Brackets=
+Include_empty_fields=
+Field_saving_options=
+Field_value_delimiter._E.g.,_"author\={x}"_or_"author\='x'"=
+Run_Unicode_converter_on_title,_author(s),_and_abstract=
+
+Run_Fetcher,_e.g._"--fetch\=Medline\:cancer"=
+Expected_syntax_for_--fetch\='<name_of_fetcher>\:<query>'=
+
+Database_has_changed._Do_you_want_to_save_before_closing?=
+Host=
+Invalid_setting=
+Network=
+Please_specify_both_hostname_and_port=
+Port=
+Start_field_contents_in_same_column=
+Use_camel_case_for_field_names_(e.g.,_"HowPublished"_instead_of_"howpublished")=
+Use_custom_proxy_configuration=
+Clear_connection_settings=
+Cleared_connection_settings.=
+Rebind_C-a,_too=
+
+Show_number_of_elements_contained_in_each_group=
+
+Open_folder=
+Opened_%0_folder(s).=
diff --git a/src/resource/JabRef_nl.properties b/src/resource/JabRef_nl.properties
index 67ebacc..5dddc67 100644
--- a/src/resource/JabRef_nl.properties
+++ b/src/resource/JabRef_nl.properties
@@ -188,8 +188,6 @@ Background_color_for_required_fields=Achtergrondkleur_voor_vereiste_velden
 Backup_old_file_when_saving=Maak_reservekopie_van_oud_bestand_bij_het_opslaan
 Beta_version=
 
-Bibkey_to_filename_conversion=BibTeX-sleutel_naar_bestandsnaam_conversie
-
 BibTeX_key=BibTeX-sleutel
 
 BibTeX_key_is_unique.=BibTeX-sleutel_is_uniek
@@ -207,8 +205,6 @@ Browse=Bladeren
 
 by=door
 
-Calling_external_viewer...=Externe_viewer_opgeroepen...
-
 Cancel=Annuleren
 
 Cannot_add_entries_to_group_without_generating_keys._Generate_keys_now?=Kan_entries_niet_aan_de_groep_toevoegen_zonder_sleutels_te_genereren._Sleutels_nu_genereren?
@@ -311,7 +307,6 @@ Complete_record=Vervolledig_record
 
 Connect=
 Connect_to_SQL_database=
-Connect_to_SQL_Database=
 Connection_to_IEEEXplore_failed=
 
 Contained_in=bevat_in
@@ -335,11 +330,6 @@ Copy_files_to_file_directory.=
 Copy_to_clipboard=
 
 Could_not_call_executable=Kon_executable_niet_oproepen
-
-Could_not_connect_to_a_running_gnuserv_process._Make_sure_that_Emacs_or_XEmacs_is_running,<BR>and_that_the_server_has_been_started_(by_running_the_command_'gnuserv-start').=Kon_geen_verbinding_maken_met_een_draaiend_gnuserv_proces._Zorg_ervoor_dat_Emacs_of_XEmacs_draait,<BR>en_dat_de_server_gestart_is_(door_het_commando_'gnuserv-start'_te_draaien).
-
-# I have reformulated the following lines, because the 1st person form is not suitable:
-Could_not_connect_to_host_=Kon_geen_verbinding_maken_met_de_host
 Could_not_connect_to_Vim_server._Make_sure_that_Vim_is_running<BR>with_correct_server_name.=
 
 Could_not_export_file=Kon_bestand_niet_exporteren
@@ -368,8 +358,6 @@ Could_not_run_the_'vim'_program.=
 Could_not_save_file=Kon_het_bestand_niet_opslaan
 Could_not_save_file._Character_encoding_'%0'_is_not_supported.=
 
-Create_group=Groep_aanmaken
-
 Created_groups.=Groepen_aangemaakt.
 
 crossreferenced_entries_included=inclusief_kruisgerefereerde_entries
@@ -381,8 +369,6 @@ Current_value=Huidige_waarde
 Custom_entry_types=Externe_entry_types
 
 Custom_entry_types_found_in_file=Externe_entry_types_gevonden_in_bestand
-Custom_icon_theme=Extern_icoonthema
-Custom_icon_theme_file=Extern_icoonthema_bestaan
 
 Custom_importers=Externe_importfilter
 
@@ -401,8 +387,6 @@ Database_\:=
 
 Database_encoding=Database_encodering
 
-Database_has_changed._Do_you_want_to_save_before_closing?=De_database_is_gewijzigd._Wilt_u_opslaan_alvorens_af_te_sluiten?
-
 Database_properties=Database_eigenschappen
 
 Date_format=Datum_formaat
@@ -502,10 +486,6 @@ Downloading...=Downloading...
 Drag_and_Drop_Error=
 Drop_%0=
 
-duplicate_BibTeX_key=dubbele_BibTeX-sleutel
-
-Duplicate_BibTeX_key.=Dubbele_BibTeX-sleutel.
-
 Duplicate_BibTeX_key._Grouping_may_not_work_for_this_entry.=Dubbele_BibTeX-sleutel._Groepering_kan_misschien_niet_werken_voor_deze_entry.
 
 Duplicate_Key_Warning=Waarschuwing:_dubbele_BibTeX-sleutel
@@ -545,13 +525,9 @@ Editor_options=
 
 empty_BibTeX_key=lege_BibTeX-sleutel
 
-Empty_BibTeX_key.=Lege_BibTeX-sleutel.
-
 Empty_BibTeX_key._Grouping_may_not_work_for_this_entry.=Lege_BibTeX-sleutel._Groepering_kan_misschien_niet_werken_voor_deze_entry.
 
 empty_database=lege_database
-
-Enable_source_editing=Broncode_aanpassing_mogelijk_maken
 Enable_word/name_autocompletion=
 
 Endnote=Endnote
@@ -593,7 +569,7 @@ Entry_types=Entrytypes
 Error=Foutmelding
 
 Error\:_=
-Error_converting_Bibtex_to_XMP\:_%0=
+Error_converting_BibTeX_to_XMP\:_%0=
 Error_converting_XMP_to_'%0'...=
 Error_exporting_to_clipboard=
 
@@ -607,7 +583,6 @@ Error_opening_file=Foutmelding_bij_het_openen_van_het_bestand
 Error_setting_field=Foutmelding_bij_het_instellen_van_het_veld
 Error_while_converting_BibtexEntry_to_XMP_%0=
 Error_while_downloading_file\:=
-Error_while_fetching_from_OIA2=
 Error_while_writing=Foutmelding_bij_het_schrijven
 
 Error_writing_to_%0_file(s).=
@@ -670,8 +645,6 @@ Field_to_filter=
 
 Field_to_group_by=Veld_te_groeperen_op
 
-Fields=Velden
-
 File=Bestand
 
 file=vestand
@@ -888,8 +861,6 @@ insert_string_=voeg_constante_in_
 
 Insert_URL=voeg_URL_in
 
-integrity=integriteit
-
 # Integrity check is a process that checks for indications of wrongly filled out bibtex fields. "Scan" is the button that starts the check.
 Integrity_check=Integriteitscontrole
 
@@ -903,13 +874,8 @@ Invalid_URL=Ongeldige_URL
 
 Inverted=Ge\u00efnverteerd
 
-is_a_standard_type.=is_een_standaard_type.
-
 ISO_abbreviation=ISO_afkorting
 
-Item_list_for_field=Item_lijst_voor_veld
-jabref=
-
 JabRef_help=JabRef_Help
 
 JabRef_preferences=JabRef_instellingen
@@ -968,7 +934,6 @@ Load_and_Save_preferences_from/to_jabref.xml_on_start-up_(memory_stick_mode)=
 Load_session=Sessie_laden
 
 Loading_session...=Sessie_aan_het_laden...
-localhost=
 
 Look_and_feel="Look_and_feel"
 Looking_for_pdf...=
@@ -1095,8 +1060,6 @@ No_entries_found_for_the_search_string_'%0'=
 No_entries_imported.=Geen_entries_ge\u00efmporteerd.
 
 No_entries_or_multiple_entries_selected.=Geen_entries_of_meerdere_entries_geselecteerd.
-
-No_entries_selected=Geen_entries_geselecteerd
 No_entries_selected.=Geen_entries_geselecteerd.
 
 No_exceptions_have_ocurred.=Geen_uitzonderingen_zijn_voorgekomen.
@@ -1139,8 +1102,6 @@ Number_of_references_to_fetch?=Aantal_referenties_om_op_te_halen?
 
 occurences=voorkomens
 
-OK=OK
-
 Ok=OK
 One_or_more_file_links_are_of_the_type_'%0',_which_is_undefined._What_do_you_want_to_do?=
 
@@ -1229,8 +1190,6 @@ Personal_journal_list=Persoonlijke_tijdschriften_lijst
 
 Plain_text_import=Onopgemaakte_tekst_importeren
 
-Please_check_your_network_connection_to_this_machine.=Controleer_uw_netwerkverbinding_naar_deze_machine.
-
 Please_enter_a_name_for_the_group.=Geef_a.u.b._een_naam_voor_de_groep.
 
 Please_enter_a_search_term._For_example,_to_search_all_fields_for_<b>Smith</b>,_enter%c<p><tt>smith</tt><p>To_search_the_field_<b>Author</b>_for_<b>Smith</b>_and_the_field_<b>Title</b>_for_<b>electrical</b>,_enter%c<p><tt>author%esmith_and_title%eelectrical</tt>=Geef_a.u.b._een_zoekterm._Bijvoorbeeld,_om_alle_velden_te_doorzoeken_naar_<b>Smith</b>,_geef_in:%c<p><tt>smith</tt><p>Om_het_veld_<b>Author</b>_te_doorzoeken_naar_<b>Smith</b>_en_het_veld_<b>Title</b>_naar_<b>electrical</b>,_geef [...]
@@ -1239,8 +1198,6 @@ Please_enter_the_field_to_search_(e.g._<b>keywords</b>)_and_the_keyword_to_searc
 
 Please_enter_the_string's_label=Geef_a.u.b._het_label_van_de_constante_in
 
-Please_select_an_importer=Selecteer_a.u.b._een_importer
-
 Please_select_an_importer.=Selecteer_a.u.b._een_importer.
 
 Please_select_exactly_one_group_to_move.=Selecteer_a.u.b._exact_\u00e9\u00e9n_groep_om_te_verplaatsen.
@@ -1371,8 +1328,6 @@ Removed_string=Constante_verwijderd
 
 Renamed_string=Constante_hernoemd
 
-Replace=Vervangen
-
 Replace_(regular_expression)=Vervang_(regular_expression)
 
 Replace_string=Tekst_vervangen
@@ -1400,7 +1355,6 @@ Review=Recensie
 Review_changes=Bekijk_veranderingen
 
 Right=Rechts
-root=
 
 Save=Opslaan
 Save_all_finished.=
@@ -1438,8 +1392,6 @@ Scan=Doorzoeken
 
 Search=Zoeken
 
-Search_All_Fields=Zoek_in_Alle_Velden
-
 Search_all_fields=Zoek_in_alle_velden
 
 Search_error=Zoek_foutmelding
@@ -1451,13 +1403,12 @@ Search_for=Zoek_naar
 Search_general_fields=Zoek_algemene_velden
 
 Search_IEEEXplore=Zoek_IEEEXplore
-Search_IEEExplore=
 
 Search_optional_fields=Zoek_optionele_velden
 
 Search_required_fields=Zoek_vereiste_velden
 
-Search_Specified_Field(s)=Zoek_Gespecifieerde_Veld(en)
+Search_specified_field(s)=Zoek_Gespecifieerde_Veld(en)
 
 Searched_database._Global_number_of_hits=Database_doorzocht._Globaal_aantal_gevonden_resultaten
 
@@ -1499,8 +1450,6 @@ Select_new_ImportFormat_Subclass=Selecteer_nieuw_ImportFormat_Subklasse
 
 Select_the_tree_nodes_to_view_and_accept_or_reject_changes=Selecteer_de_boom_knopen_om_veranderingen_te_tonen_en_te_accepteren_of_afwijzen
 Selected_entries=Geselecteerde_entries
-
-Selector_enabled_fields=Selecteer_velden_die_in_werking_zijn
 Server_Hostname_\:=
 Server_Type_\:=
 
@@ -1641,14 +1590,10 @@ Test=Test
 
 Text_Input_Area=Tekst_Invoer_Gebied
 
-The_#_character_is_not_allowed_in_BibTeX_fields=Het_#_teken_is_niet_toegestand_in_BibTeX-velden
-
 The_chosen_date_format_for_new_entries_is_not_valid=Het_gekozen_datumformaat_voor_nieuwe_entries_is_niet_geldig
 
 The_chosen_encoding_'%0'_could_not_encode_the_following_characters\:_=
 
-The_CiteSeer_fetch_operation_returned_zero_results.=De_CiteSeerX_ophaaloperatie_gaf_nul_resultaten_terug.
-
 The_current_version_features_a_new_way_of_handling_links_to_external_files.<br>To_take_advantage_of_this,_your_links_must_be_changed_into_the_new_format,_and<br>JabRef_must_be_configured_to_show_the_new_links.=
 
 the_field_<b>%0</b>=het_veld_<b>%0</b>
@@ -1675,8 +1620,6 @@ The_search_is_case_sensitive.=De_zoekopdracht_is_hoofdlettergevoelig.
 The_string_has_been_removed_locally=De_constante_werd_lokaal_verwijderd
 
 There_are_possible_duplicates_(marked_with_a_'D'_icon)_that_haven't_been_resolved._Continue?=Er_zijn_mogelijke_dubbels_(aangeduid_met_een_'D'_icoon)_die_nog_niet_opgelost_werden._Verdergaan?
-
-this_button_will_update=deze_knop_zal_update_uitvoeren
 This_database_was_written_using_an_older_version_of_JabRef.=
 This_entry_has_no_BibTeX_key._Generate_key_now?=
 
@@ -1697,15 +1640,12 @@ This_group_contains_entries_whose_<b>%0</b>_field_contains_the_keyword_<b>%1</b>
 
 This_group_contains_entries_whose_<b>%0</b>_field_contains_the_regular_expression_<b>%1</b>=Deze_groep_bevat_entries_waarin_het_<b>%0</b>_veld_de_regular_expression_<b>%1</b>_bevat
 
-This_is_a_simple_copy_and_paste_dialog_for_import_some_fields_from_normal_text.=Dit_is_een_simpele_kopieer_en_plak_dialoog_om_enkele_velden_vanuit_normale_tekst_te_importeren.
-
 This_makes_JabRef_look_up_each_%0_link_and_check_if_the_file_exists._If_not,_you_will_be_given_options<BR>to_resolve_the_problem.=Dit_zorgt_ervoor_dat_JabRef_elke_%0_snelkoppeling_op_zoekt_en_controleert_of_het_bestand_bestaat._Indien_dit_niet_het_geval_is,_zullen_u_opties_gegeven_worden<BR>om_het_probleem_op_te_lossen.
 
 This_operation_requires_all_selected_entries_to_have_BibTex_keys_defined.=Deze_operatie_vereist_dat_alle_geselecteerde_entries_BibTeX-sleutels_gedefinieerd_hebben.
 This_operation_requires_at_least_one_entry.=
 
 This_operation_requires_one_or_more_entries_to_be_selected.=Deze_operatie_vereist_dat_een_of_meer_entries_geselecteerd_zijn.
-This_will_move_all_external_links_from_the_'pdf'_and_'ps'_fields_into_the_'%0'_field._Proceed?=
 
 To_set_up,_go_to_<B>Tools_->_Manage_journal_abbreviations</B>=Om_in_te_stellen,_ga_naar_<B>Opties_->_Beheer_tijdschrift_afkortingen</B>
 
@@ -1720,8 +1660,6 @@ Type_set_to_'other'=Type_ingesteld_als_'other'
 Unabbreviate_journal_names_of_the_selected_entries=Maak_afkortingen_van_tijdschriftnamen_van_geselecteerde_entries_ongedaan
 Unabbreviated_%0_journal_names.=
 
-unable_to_access_LyX-pipe=kan_geen_toegang_krijgen_tot_LyX-pipe
-
 Unable_to_create_graphical_interface=kan_grafische_interface_niet_aanmaken
 Unable_to_open_file.=
 Unable_to_open_link._The_application_'%0'_associated_with_the_file_type_'%1'_could_not_be_called.=
@@ -1764,7 +1702,6 @@ Up=Omhoog
 Update_to_current_column_widths=Update_naar_huidige_kolombreedtes
 
 Updated_group_selection=Groep_selectie_geupdate
-Upgrade_external_links=
 Upgrade_external_PDF/PS_links_to_use_the_'%0'_field.=
 Upgrade_file=
 Upgrade_old_external_file_links_to_use_the_new_feature=
@@ -1774,10 +1711,7 @@ Upper_Each_First=
 Upper_first=
 
 usage=gebruik
-
-Use_antialiasing_font=Gebruik_antialiasing_lettertype
 Use_autocompletion_for_the_following_fields=
-Use_custom_icon_theme=Gebruik_extern_icoonthema
 Use_default_viewer=
 
 Use_inspection_window_also_when_a_single_entry_is_imported.=Gebruik_inspectievenster_ook_wanneer_een_enkele_entry_ge\u00efmporteerd_wordt
@@ -1788,8 +1722,6 @@ Use_other_look_and_feel=Gebruik_andere_"look_and_feel"
 Use_Regular_Expression_Search=Gebruik_Regular_Expression_Zoekopdracht
 
 Use_regular_expressions=Gebruik_regular_expressions
-
-Use_the_following_delimiter_character(s)=Gebruik_volgende_teken(s)_als_scheidingsteken
 Username_\:=
 
 Value_cleared_externally=Waarde_extern_gewist
@@ -1862,7 +1794,6 @@ Your_new_key_bindings_have_been_stored.=Uw_nieuwe_sneltoetsen_zijn_opgeslagen.
 The_following_fetchers_are_available\:=
 Could_not_find_fetcher_'%0'=
 Running_Query_'%0'_with_fetcher_'%1'.=
-Please_wait!=
 Query_'%0'_with_fetcher_'%1'_did_not_return_any_results.=
 Open_SPIRES_entry=
 Move/Rename_file=
@@ -1870,7 +1801,6 @@ File_moved=
 Move_file_failed=
 Could_not_move_file=
 Could_not_find_file_'%0'.=
-Move/rename_file=
 Number_of_entries_successfully_imported=
 Import_canceled_by_user=
 Progress\:_%0_of_%1=
@@ -1973,11 +1903,9 @@ Version=
 Unknown=
 Not_loaded=
 Loaded=
-Could_not_determine_version_of_=
 Install_anyway?=
 
 Looking_for_full_text_document...=
-Follow_DOI_or_URL_link_and_try_to_locate_PDF_full_text_document=
 Unable_to_find_full_text_article._No_search_algorithm_defined_for_the_'%0'_web_site.=
 Found_pdf_link,_but_received_the_wrong_MIME_type._This_could_indicate_that_you_don't_have_access_to_the_fulltext_article.=
 
@@ -2024,8 +1952,6 @@ Before_saving,_please_edit_any_strings_containing_the_#_character.=
 
 Save_without_backup?=
 Unable_to_create_backup=
-
-File_directory_is_not_set_or_does_not_exist.=
 Move_file_to_file_directory.=
 Rename_file_to=
 <b>All_Entries</b>_(this_group_cannot_be_edited_or_removed)=
@@ -2047,7 +1973,6 @@ Error_initializing_custom_export_format_from_string_'%0'=
 
 BibLaTeX_mode=
 Optional_fields_2=
-Please_wait=
 Waiting_for_save_operation_to_finish=
 Resolving_duplicate_BibTeX_keys...=
 Finished_resolving_duplicate_BibTeX_keys._%0_entries_modified.=
@@ -2060,8 +1985,6 @@ Duplicate_BibTeX_key=
 Duplicate_key=
 Generate_key=
 Import_marking_color=
-
-%0_entries_found._To_reduce_server_load,_only_%1_will_be_downloaded._It_will_be_very_slow,_in_order_to_make_ACM_happy.=
 BibTeX_importer=
 Always_add_letter_(a,_b,_...)_to_generated_keys=
 
@@ -2078,7 +2001,6 @@ An_autosave_file_was_found_for_this_database._This_could_indicate_=
 that_JabRef_didn't_shut_down_cleanly_last_time_the_file_was_used.=
 General_file_directory=
 User-specific_file_directory=
-Error_setting_look_and_feel=
 Search_failed\:_illegal_search_expression=
 Show_ArXiv_column=
 <HTML>Unpack_the_zip_file_containing_import/export_filters_for_Endnote,<BR>for_optimal_interoperability_with_JabRef</HTML>=
@@ -2093,7 +2015,6 @@ Create_entry_based_on_XMP_data=
 Create_entry_based_on_data_fetched_from=
 Create_blank_entry_linking_the_PDF=
 Only_attach_PDF=
-Mr._dLib_Metadata_Entries_Associated_With\:=
 Mr._dLib_Metadata_Entries_Associated_With_PDF_File=
 Title=
 Author(s)=
@@ -2112,21 +2033,18 @@ Update_Existing_Entry=
 Mr._dLib=
 More_information=
 Fetching_Metadata...=
-Metadata=
 Autocomplete_names_in_'Firstname_Lastname'_format_only=
 Autocomplete_names_in_'Lastname,_Firstname'_format_only=
 Autocomplete_names_in_both_formats=
 Marking_color_%0=
 The_name_'comment'_can_not_be_used_as_an_entry_type_name.=
 You_must_enter_an_integer_value_in_the_text_field_for=
-File_directory=
 Send_as_email=
 References=
 Sending_of_emails=
 Subject_for_sending_an_email_with_references=
 Automatically_open_folders_of_attached_files=
 Create_entry_based_on_content=
-Store_choice_as_default=
 Do_not_show_this_box_again_for_this_import=
 Always_use_this_PDF_import_style_(and_do_not_ask_for_each_import)=
 Error_creating_email=
@@ -2152,7 +2070,6 @@ Extra_information_(e.g._page_number)=
 Manage_citations=
 Problem_modifying_citation=
 Citation=
-Context=
 Extra_information=
 Could_not_resolve_BibTeX_entry_for_citation_marker_'%0'.=
 Styles=
@@ -2178,12 +2095,10 @@ Combine_pairs_of_citations_that_are_separated_by_spaces_only=
 Autodetection_failed=
 Connecting=
 Please_wait...=
-Unable_to_connect=
 Set_connection_parameters=
 Path_to_OpenOffice_directory=
 Path_to_OpenOffice_executable=
 Path_to_OpenOffice_library_dir=
-Autodetect=
 Connection_lost=
 The_paragraph_format_is_controlled_by_the_property_'ReferenceParagraphFormat'_or_'ReferenceHeaderParagraphFormat'_in_the_style_file.=
 The_character_format_is_controlled_by_the_citation_property_'CitationCharacterFormat'_in_the_style_file.=
@@ -2206,7 +2121,6 @@ JSTOR_import_cancelled=
 HTML_list=
 Click_group_to_toggle_membership_of_selected_entries=
 Use_EMACS_23_insertion_string=
-Normalize_to_BibTeX_name_format=
 If_possible,_normalize_this_list_of_names_to_conform_to_standard_BibTeX_name_formatting=
 Could_not_open_%0=
 Unknown_import_format=
@@ -2215,7 +2129,6 @@ An_Error_occurred_while_fetching_from_INSPIRE_source_(%0)\:=
 Error_while_fetching_from_Inspire\:_=
 Web_search=
 Autocomplete_names=
-You_must_select_either_a_valid_style_file,_or_use_the_default_style.=
 Default_style=
 Choose_style_file_directly=
 Choose_from_a_directory=
@@ -2256,7 +2169,6 @@ Autocompletion_options=
 Autocomplete_after_following_number_of_characters=
 Name_format_used_for_autocompletion=
 Treatment_of_first_names=
-No_icon_found_for_%0=
 Cleanup_entries=
 Automatically_assign_new_entry_to_selected_groups=
 Move_DOIs_from_note_and_URL_field_to_DOI_field_and_remove_http_prefix=
@@ -2270,13 +2182,9 @@ Doing_a_cleanup_for_%0_entries...=
 No_entry_needed_a_clean_up=
 One_entry_needed_a_clean_up=
 %0_entries_needed_a_clean_up=
-Imported_=
 Error_importing_from_database=
 Minimize_to_system_tray=
 
-Incomplete_search_results=
-%0_entries_were_found,_but_only_%1_of_these_could_be_resolved.=
-
 Error_downloading_file_'%0'=
 Download_failed=
 
@@ -2302,10 +2210,9 @@ Unable_to_clear_preferences.=
 
 Reset_preferences_(key1,key2,..._or_'all')=
 Find_unlinked_files=
-Select_All=
-Unselect_All=
-Expand_All=
-Collapse_All=
+Unselect_all=
+Expand_all=
+Collapse_all=
 Select_Directory=
 Choose_Directory=
 Use_the_selected_directory_to_start_with_the_search.=
@@ -2365,7 +2272,6 @@ Priority_medium=
 Quality=
 Rank=
 Relevance=
-Set_priority=
 Set_priority_to_high=
 Set_priority_to_low=
 Set_priority_to_medium=
@@ -2397,7 +2303,6 @@ Correct_the_entry,_and_reopen_editor_to_display/edit_source.=
 Could_not_connect_to_a_running_gnuserv_process._Make_sure_that_Emacs_or_XEmacs_is_running,<BR>and_that_the_server_has_been_started_(by_running_the_command_'server-start'/'gnuserv-start').=
 Could_not_connect_to_running_OpenOffice.\nMake_sure_you_have_installed_OpenOffice_with_Java_support.\nIf_connecting_manually,_please_verify_program_and_library_paths.\n\nError_message\:_=
 Created_group_"%0".=
-File_has_been_updated_externally._Are_you_sure_you_want_to_save?=
 If_a_pasted_or_imported_entry_already_has_the_field_set,_overwrite.=
 Import_Metadata_From_PDF=
 Not_connected_to_any_Writer_document._Please_make_sure_a_document_is_open,_and_use_the_'Select_Writer_document'_button_to_connect_to_it.=
@@ -2433,4 +2338,62 @@ An_Error_occurred_while_parsing_abstract=
 Unknown_DiVA_entry\:_'%0'.=
 Get_BibTeX_entry_from_DiVA=
 Log=
-Remove_unneccessary_$,_{,_and_}=
+
+ISO_690=
+
+Add_brackets_and_replace_separators_with_their_non-breaking_version_for_units=
+Add_new_entry_and_keep_both_old_entries=
+Cancelled_merging_entries=
+Error_in_entry=
+First_entry=
+Format_units_by_adding_non-breaking_separators_and_keeping_the_correct_case_on_search=
+Merge_entries=
+Merged_entries_into_a_new_and_kept_the_old=
+Merged_entries_into_a_new_and_removed_the_old=
+Merged_entry=
+None=
+Parse=
+Remove_unneccessary_$,_{,_and_}_and_move_adjacent_numbers_into_equations=
+Replace_old_entries_with_new_entry=
+Result=
+Second_entry=
+Show_DOI_first=
+Show_URL_first=
+Use_1st=
+Use_2nd=
+Use_Emacs_key_bindings=
+You_have_to_choose_exactly_two_entries_to_merge.=
+
+Update_timestamp_on_modification=
+change_field=
+
+All_key_bindings_will_be_reset_to_their_defaults.=
+Automatically_set_file_links=
+Continue?=
+Resetting_all_key_bindings=
+Save_entries_ordered_by_title=
+Export_entries_ordered_by_title=
+Quotes=
+Curly_Brackets=
+Include_empty_fields=
+Field_saving_options=
+Field_value_delimiter._E.g.,_"author\={x}"_or_"author\='x'"=
+Run_Unicode_converter_on_title,_author(s),_and_abstract=
+
+Database_has_changed._Do_you_want_to_save_before_closing?=
+Host=
+Invalid_setting=
+Network=
+Please_specify_both_hostname_and_port=
+Port=
+Start_field_contents_in_same_column=
+Use_camel_case_for_field_names_(e.g.,_"HowPublished"_instead_of_"howpublished")=
+Use_custom_proxy_configuration=
+Clear_connection_settings=
+Cleared_connection_settings.=
+Rebind_C-a,_too=
+
+Show_number_of_elements_contained_in_each_group=
+
+Open_folder=
+Opened_%0_folder(s).=
diff --git a/src/resource/JabRef_no.properties b/src/resource/JabRef_no.properties
index 9c5a0f5..33071ba 100644
--- a/src/resource/JabRef_no.properties
+++ b/src/resource/JabRef_no.properties
@@ -204,8 +204,6 @@ Backup_old_file_when_saving=Lag_sikkerhetskopi_ved_lagring
 
 Beta_version=Betaversjon
 
-Bibkey_to_filename_conversion=Konvertering_av_BibTeX-n\u00f8kkel_til_filnavn
-
 BibTeX_key=BibTeX-n\u00f8kkel
 
 BibTeX_key_is_unique.=BibTeX-n\u00f8kkelen_er_unik
@@ -224,8 +222,6 @@ Browse=Bla_gjennom
 
 by=med
 
-Calling_external_viewer...=Kaller_opp_eksternt_program...
-
 Cancel=Avbryt
 
 Cannot_add_entries_to_group_without_generating_keys._Generate_keys_now?=Kan_ikke_legge_til_enheter_til_en_gruppe_uten_\u00e5_generere_n\u00f8kler._Vil_du_generer_n\u00f8kler_n\u00e5?
@@ -330,8 +326,6 @@ Connect=Koble_til
 
 Connect_to_SQL_database=Koble_til_SQL-database
 
-Connect_to_SQL_Database=Koble_til_SQL-database
-
 Connection_to_IEEEXplore_failed=Oppkobling_til_IEEExplore_mislyktes
 
 Contained_in=Inneholdt_i
@@ -358,10 +352,6 @@ Copy_to_clipboard=Kopier_til_utklippstavle
 
 Could_not_call_executable=Kunne_ikke_kalle_programfilen
 
-Could_not_connect_to_a_running_gnuserv_process._Make_sure_that_Emacs_or_XEmacs_is_running,<BR>and_that_the_server_has_been_started_(by_running_the_command_'gnuserv-start').=Kunne_ikke_opprette_kontakt_med_en_gnuserv-prosess._Kontroller_at_Emacs_eller_XEmacs_er_i_gang<BR>og_at_serveren_har_blitt_startet_(med_kommandoen_'gnuserv-start').
-
-Could_not_connect_to_host_=Kunne_ikke_koble_opp_mot_vert
-
 Could_not_connect_to_Vim_server._Make_sure_that_Vim_is_running<BR>with_correct_server_name.=Kunne_ikke_koble_til_Vim-server._Sjekk_at_Vim_kj\u00f8rer<BR>med_riktig_servernavn.
 
 Could_not_export_file=Kunne_ikke_eksportere
@@ -396,8 +386,6 @@ Could_not_save_file=Kunne_ikke_lagre
 
 Could_not_save_file._Character_encoding_'%0'_is_not_supported.=Kunne_ikke_lagre_fil._Tegnkodingen_'%0'_er_ikke_st\u00f8ttet.
 
-Create_group=Opprett_gruppe
-
 Created_groups.=Opprettet_grupper.
 
 crossreferenced_entries_included=refererte_enheter_inkludert
@@ -410,10 +398,6 @@ Custom_entry_types=Egendefinerte_enhetstyper
 
 Custom_entry_types_found_in_file=Fant_egendefinerte_enhetstyper_i_filen
 
-Custom_icon_theme=Egendefinert_ikonsett
-
-Custom_icon_theme_file=Ikonsettfil
-
 Custom_importers=Egendefinerte_importformat
 
 Customize_entry_types=Tilpass_enhetstyper
@@ -432,8 +416,6 @@ Database_\:=Database_:
 
 Database_encoding=Tegnkoding_for_database
 
-Database_has_changed._Do_you_want_to_save_before_closing?=Databasen_er_endret._Vil_du_lagre_f\u00f8r_du_lukker_den?
-
 Database_properties=Databaseegenskaper
 
 Date_format=Datoformat
@@ -537,10 +519,6 @@ Drag_and_Drop_Error=Feil_ved_trekk-og-slipp
 
 Drop_%0=Slipp_%0
 
-duplicate_BibTeX_key=ikke_unik_BibTeX-n\u00f8kkel
-
-Duplicate_BibTeX_key.=Duplicate_BibTeX_key.
-
 Duplicate_BibTeX_key._Grouping_may_not_work_for_this_entry.=BibTeX-n\u00f8kkelen_er_ikke_unik._Gruppering_kan_feile_for_denne_enheten.
 
 Duplicate_Key_Warning=Advarsel:_ikke_unik_n\u00f8kkel
@@ -585,14 +563,10 @@ Editor_options=Alternativer_for_redigering
 
 empty_BibTeX_key=tom_BibTeX-n\u00f8kkel
 
-Empty_BibTeX_key.=Tom_BibTeX-n\u00f8kkel
-
 Empty_BibTeX_key._Grouping_may_not_work_for_this_entry.=Tom_BibTeX-n\u00f8kkel._Gruppering_kan_feile_for_denne_enheten.
 
 empty_database=tom_database
 
-Enable_source_editing=Tillat_redigering_av_kildekode
-
 Enable_word/name_autocompletion=Aktiver_autokomplettering_av_navn/ord
 
 Endnote=Endnote
@@ -634,7 +608,7 @@ Entry_types=Enhetstyper
 Error=Feil
 Error\:_=Feil:_
 
-Error_converting_Bibtex_to_XMP\:_%0=Feil_ved_konvertering_av_BibTeX_til_XMP:_%0
+Error_converting_BibTeX_to_XMP\:_%0=Feil_ved_konvertering_av_BibTeX_til_XMP:_%0
 
 Error_converting_XMP_to_'%0'...=Feil_ved_tilpassing_av_XMP_for_'%0'...
 
@@ -654,8 +628,6 @@ Error_setting_field=Problem_med_\u00e5_sette_felt
 Error_while_converting_BibtexEntry_to_XMP_%0=Feil_ved_konvertering_av_BibTeX-enheten_til_XMP_%0
 Error_while_downloading_file\:=Feil_ved_nedlasting_av_fil:
 
-Error_while_fetching_from_OIA2=Feil_ved_nedlasting_fra_OIA2
-
 Error_while_writing=En_feil_oppsto_ved_skriving
 
 Error_writing_to_%0_file(s).=Feil_ved_skriving_til_%0_fil(er).
@@ -722,8 +694,6 @@ Field_to_filter=Felt_som_skal_filtreres
 
 Field_to_group_by=Grupperingsfelt
 
-Fields=Felter
-
 File=Fil
 
 file=fil
@@ -951,8 +921,6 @@ insert_string_=sett_inn_streng_
 
 Insert_URL=Sett_inn_URL
 
-integrity=integritet
-
 Integrity_check=Integritetssjekk
 
 Intersection=Snitt
@@ -965,14 +933,8 @@ Invalid_URL=Ugyldig_URL
 
 Inverted=Invertert
 
-is_a_standard_type.=er_en_standardtype.
-
 ISO_abbreviation=ISO-forkortelse
 
-Item_list_for_field=Ordliste_for_felt
-
-jabref=jabref
-
 JabRef_help=JabRef-hjelp
 
 JabRef_preferences=JabRef-oppsett
@@ -1037,8 +999,6 @@ Load_session=Gjenopprett_tilstand
 
 Loading_session...=Gjenoppretter_tilstand...
 
-localhost=localhost
-
 Look_and_feel=Utseende
 
 Looking_for_pdf...=Ser_etter_pdf...
@@ -1175,8 +1135,6 @@ No_entries_imported.=Ingen_enheter_importert.
 
 No_entries_or_multiple_entries_selected.=Ingen_eller_flere_enheter_valgt.
 
-No_entries_selected=Ingen_enheter_valgt
-
 No_entries_selected.=Ingen_enheter_valgt.
 
 No_exceptions_have_ocurred.=Ingen_feiltilstander_har_inntruffet.
@@ -1221,8 +1179,6 @@ Number_of_references_to_fetch?=Antall_referanser_som_skal_hentes?
 
 occurences=treff
 
-OK=OK
-
 Ok=OK
 
 One_or_more_file_links_are_of_the_type_'%0',_which_is_undefined._What_do_you_want_to_do?=En_eller_flere_linker_er_av_typen_'%0'_som_er_udefinert._Hva_vil_du_gj\u00f8re?
@@ -1321,8 +1277,6 @@ Personal_journal_list=Personlig_journalliste
 
 Plain_text_import=Import_fra_ren_tekst
 
-Please_check_your_network_connection_to_this_machine.=Vennligst_sjekk_maskinens_nettverksforbindelse.
-
 Please_enter_a_name_for_the_group.=Skriv_inn_et_navn_for_gruppen.
 
 Please_enter_a_search_term._For_example,_to_search_all_fields_for_<b>Smith</b>,_enter%c<p><tt>smith</tt><p>To_search_the_field_<b>Author</b>_for_<b>Smith</b>_and_the_field_<b>Title</b>_for_<b>electrical</b>,_enter%c<p><tt>author%esmith_and_title%eelectrical</tt>=Skriv_inn_et_s\u00f8kebegrep._For_eksempel,_for_\u00e5_s\u00f8ke_i_alle_felter_etter_<b>Olsen</b>,_skriv%c<p><tt>olsen</tt><p>For_\u00e5_s\u00f8ke_i_<b>Author</b>-feltet_etter_<b>Olsen</b>_og_i_<b>Title</b>-feltet_etter_<b>electr [...]
@@ -1331,8 +1285,6 @@ Please_enter_the_field_to_search_(e.g._<b>keywords</b>)_and_the_keyword_to_searc
 
 Please_enter_the_string's_label=Skriv_inn_et_navn_for_strengen
 
-Please_select_an_importer=Vennligst_velg_et_importformat
-
 Please_select_an_importer.=Velg_et_importfilter.
 
 Please_select_exactly_one_group_to_move.=Velg_eksakt_en_gruppe_for_flytting.
@@ -1471,8 +1423,6 @@ Removed_string=Fjernet_streng
 
 Renamed_string=Endret_navn_p\u00e5_streng
 
-Replace=Erstatt
-
 Replace_(regular_expression)=Erstatt_(regul\u00e6ruttrykk)
 
 Replace_string=Erstatt_streng
@@ -1503,8 +1453,6 @@ Review_changes=Se_over_endringer
 
 Right=H\u00f8yre
 
-root=root
-
 Save=Lagre
 
 Save_all_finished.=Fullf\u00f8rte_lagring_av_alle_databaser
@@ -1546,8 +1494,6 @@ Scan=S\u00f8k
 
 Search=S\u00f8k
 
-Search_All_Fields=S\u00f8k_i_alle_felter
-
 Search_all_fields=S\u00f8k_i_alle_felter
 
 Search_error=Feil_ved_s\u00f8k
@@ -1560,13 +1506,11 @@ Search_general_fields=S\u00f8k_i_generelle_felter
 
 Search_IEEEXplore=S\u00f8l_IEEExplore
 
-Search_IEEExplore=S\u00f8k_IEEExplore
-
 Search_optional_fields=S\u00f8k_i_valgfrie_felter
 
 Search_required_fields=S\u00f8k_i_n\u00f8dvendige_felter
 
-Search_Specified_Field(s)=S\u00f8k_spesifiserte_felt(er)
+Search_specified_field(s)=S\u00f8k_spesifiserte_felt(er)
 
 Searched_database._Global_number_of_hits=S\u00f8kte_gjennom_basen._Globalt_antall_treff
 
@@ -1612,8 +1556,6 @@ Select_the_tree_nodes_to_view_and_accept_or_reject_changes=Velg_trenodene_for_\u
 
 Selected_entries=Valgte_enheter
 
-Selector_enabled_fields=Felter_med_ordliste
-
 Server_Hostname_\:=Tjenernavn:
 
 Server_Type_\:=Tjenertype:
@@ -1764,13 +1706,9 @@ Test=Test
 
 Text_Input_Area=Inndatafelt
 
-The_#_character_is_not_allowed_in_BibTeX_fields=#-tegnet_er_ikke_tillatt_i_BibTeX-felter
-
 The_chosen_date_format_for_new_entries_is_not_valid=Det_valgte_datoformatet_er_ugyldig
 The_chosen_encoding_'%0'_could_not_encode_the_following_characters\:_=Den_valgte_tegnkodingen_'%0'_kunne_ikke_kode_f\u00f8lgende_tegn:_
 
-The_CiteSeer_fetch_operation_returned_zero_results.=Nedlastingen_fra_CiteSeerX_ga_ingen_resultater.
-
 The_current_version_features_a_new_way_of_handling_links_to_external_files.<br>To_take_advantage_of_this,_your_links_must_be_changed_into_the_new_format,_and<br>JabRef_must_be_configured_to_show_the_new_links.=Denne_versjonen_tilbyr_en_ny_m\u00e5te_\u00e5_h\u00e5ndtere_linker_til_eksterne_filer.<br>For_\u00e5_dra_nytte_av_dette_m\u00e5_linkene_dine_endres_til_det_nye_formatet,_og<br>JabRef_m\u00e5_konfigureres_for_\u00e5_vise_de_nye_linkene.
 
 the_field_<b>%0</b>=feltet_<b>%0</b>
@@ -1799,8 +1737,6 @@ The_string_has_been_removed_locally=Strengen_har_blitt_slettet_lokalt
 
 There_are_possible_duplicates_(marked_with_a_'D'_icon)_that_haven't_been_resolved._Continue?=Det_finnes_mulige_duplikater_(merket_med_et_'D'-ikon)_som_ikke_har_blitt_h\u00e5ndtert._Fortsette?
 
-this_button_will_update=denne_knappen_vil_oppdatere
-
 This_database_was_written_using_an_older_version_of_JabRef.=Denne_databasen_ble_lagret_fra_en_eldre_versjon_av_JabRef.
 
 This_entry_has_no_BibTeX_key._Generate_key_now?=Denne_enheten_har_ingen_BibTeX-n\u00f8kkel._Generer_n\u00f8kkel_n\u00e5?
@@ -1823,8 +1759,6 @@ This_group_contains_entries_whose_<b>%0</b>_field_contains_the_keyword_<b>%1</b>
 
 This_group_contains_entries_whose_<b>%0</b>_field_contains_the_regular_expression_<b>%1</b>=Denne_gruppen_inneholder_enheter_hvis_<b>%0</b>-felt_stemmer_med_regul\u00e6ruttrykket_<b>%1</b>
 
-This_is_a_simple_copy_and_paste_dialog_for_import_some_fields_from_normal_text.=Dette_er_et_enkelt_klipp-og-lim-vindu._F\u00f8rst_last_inn_eller_kopier_tekst_til_inndatafeltet._Deretter_kan_du_merke_tekst_og_tildele_den_til_et_BibTeX-felt.
-
 This_makes_JabRef_look_up_each_%0_link_and_check_if_the_file_exists._If_not,_you_will_be_given_options<BR>to_resolve_the_problem.=Dette_f\u00e5r_JabRef_til_\u00e5_unders\u00f8ke_hver_av_%0-linkene,_og_sjekke_om_filen_eksisterer._Hvis_ikke_vil_du_bli_gitt_valg<BR>for_\u00e5_l\u00f8se_problemet.
 
 This_operation_requires_all_selected_entries_to_have_BibTex_keys_defined.=Denne_operasjonen_krever_at_alle_valgte_enheter_har_definerte_BibTeX-n\u00f8kler.
@@ -1833,8 +1767,6 @@ This_operation_requires_at_least_one_entry.=Denne_operasjonen_krever_minst_en_en
 
 This_operation_requires_one_or_more_entries_to_be_selected.=Denne_operasjonen_krever_at_en_eller_flere_enheter_er_valgt.
 
-This_will_move_all_external_links_from_the_'pdf'_and_'ps'_fields_into_the_'%0'_field._Proceed?=Denne_operasjonen_vil_flytte_alle_eskterne_linker_fra_'pdf'-_og_'ps'-feltene_til_'%0'-feltet._Fortsette?
-
 To_set_up,_go_to_<B>Tools_->_Manage_journal_abbreviations</B>=For_\u00e5_sette_opp,_g\u00e5_til_<B>Verkt\u00f8y_->_Sett_opp_journalforkortelser</b>
 
 Toggle_abbreviation=Forkort/ekspander
@@ -1853,8 +1785,6 @@ Unabbreviate_journal_names_of_the_selected_entries=Ekspander_journalnavn_for_de_
 
 Unabbreviated_%0_journal_names.=Ekspanderte_%0_journalnavn.
 
-unable_to_access_LyX-pipe=ingen_tilgang_til_LyX-pipe
-
 Unable_to_create_graphical_interface=Kunne_ikke_opprette_grafisk_grensesnitt
 
 Unable_to_open_file.=Kan_ikke_\u00e5pne_fil.
@@ -1903,8 +1833,6 @@ Update_to_current_column_widths=Bruk_n\u00e5v\u00e6rende_kolonnebredder
 
 Updated_group_selection=Updated_group_selection
 
-Upgrade_external_links=Oppgrader_eksterne_linker
-
 Upgrade_external_PDF/PS_links_to_use_the_'%0'_field.=Oppgrader_eksterne_PDF-_og_PS-linker_til_\u00e5_bruke_'%0'-feltet.
 
 Upgrade_file=Oppgrader_fil
@@ -1921,12 +1849,8 @@ Upper_first=Stor_forbokstav_f\u00f8rst
 
 usage=bruk
 
-Use_antialiasing_font=Bruk_glattet_font
-
 Use_autocompletion_for_the_following_fields=Bruk_autokomplettering_for_f\u00f8lgende_felter
 
-Use_custom_icon_theme=Bruk_egendefinert_ikonsett
-
 Use_default_viewer=Bruk_standardprogram_for_filtypen
 
 Use_inspection_window_also_when_a_single_entry_is_imported.=Bruk_inspeksjonsvindu_ogs\u00e5_n\u00e5r_bare_\u00e9n_enhet_importeres.
@@ -1939,8 +1863,6 @@ Use_Regular_Expression_Search=S\u00f8k_med_regul\u00e6ruttrykk
 
 Use_regular_expressions=Bruk_"regular_expressions"
 
-Use_the_following_delimiter_character(s)=Use_the_following_delimiter_character(s)
-
 Username_\:=Brukernavn:
 
 Value_cleared_externally=Verdien_slettet_eksternt
@@ -2034,8 +1956,6 @@ Could_not_find_fetcher_'%0'=Kunne_ikke_finne_nedlasteren_'%0'
 
 Running_Query_'%0'_with_fetcher_'%1'.=Utf\u00f8rer_s\u00f8k_'%0'_med_nedlaster_'%1'.
 
-Please_wait!=Vennligst_vent!
-
 Query_'%0'_with_fetcher_'%1'_did_not_return_any_results.=S\u00f8ket_'%0'_med_nedlaster_'%1'_ga_ingen_resultater.
 
 Open_SPIRES_entry=\u00c5pne_SPIRES-enhet
@@ -2050,8 +1970,6 @@ Could_not_move_file=Kunne_ikke_flytte_filen
 
 Could_not_find_file_'%0'.=Kunne_ikke_finne_filen_'%0'.
 
-Move/rename_file=Flytt/endre_navn_p\u00e5_fil
-
 Number_of_entries_successfully_imported=Antall_enheter_importert
 
 Import_canceled_by_user=Import_avbrutt_av_bruker
@@ -2242,14 +2160,10 @@ Not_loaded=Ikke_lastet
 
 Loaded=Lastet
 
-Could_not_determine_version_of_=Kunne_ikke_bestemme_versjonsnummer_for_
-
 Install_anyway?=Installer_likevel?
 
 Looking_for_full_text_document...=Ser_etter_fulltekstdokument...
 
-Follow_DOI_or_URL_link_and_try_to_locate_PDF_full_text_document=F\u00f8lg_DOI-_eller_URL-link_og_pr\u00f8v_\u00e5_finne_fulltekst-dokument
-
 Unable_to_find_full_text_article._No_search_algorithm_defined_for_the_'%0'_web_site.=Kunne_ikke_finne_fulltekstdokument._Ingen_s\u00f8kealgoritme_definert_for_websiden_'%0'.
 
 Found_pdf_link,_but_received_the_wrong_MIME_type._This_could_indicate_that_you_don't_have_access_to_the_fulltext_article.=Fant_PDF-link,_men_mottok_feil_MIME-type._Dette_kan_indikere_at_du_ikke_har_tilgang_til_fulltekstdokumentet.
@@ -2328,8 +2242,6 @@ Save_without_backup?=Lagre_uten_backup?
 
 Unable_to_create_backup=Kan_ikke_lagre_backup?
 
-File_directory_is_not_set_or_does_not_exist.=Filkatalogen_er_ikke_valgt_eller_eksisterer_ikke.
-
 Move_file_to_file_directory.=Flytt_fil_til_filkatalog.
 
 Rename_file_to=Endre_navn_p\u00e5_fil_til
@@ -2359,8 +2271,6 @@ BibLaTeX_mode=BibLaTeX-modus
 
 Optional_fields_2=Valgfrie_felter_2
 
-Please_wait=Vennligst_vent
-
 Waiting_for_save_operation_to_finish=Venter_p\u00e5_lagringsoperasjon
 
 Resolving_duplicate_BibTeX_keys...=S\u00f8k_etter_dupliserte_BibTeX-n\u00f8kler
@@ -2383,8 +2293,6 @@ Generate_key=Generer_n\u00f8kkel
 
 Import_marking_color=Farge_som_markerer_importerte_enheter
 
-%0_entries_found._To_reduce_server_load,_only_%1_will_be_downloaded._It_will_be_very_slow,_in_order_to_make_ACM_happy.=Fant_%0_enheter._For_\u00e5_redusere_lasten_p\u00e5_serveren_vil_bare_%1_enheter_bli_lastet_ned._Nedlastingen_vil_g\u00e5_langsomt_for_\u00e5_blidgj\u00b8re_ACM.
-
 BibTeX_importer=BibTeX-importerer
 
 Always_add_letter_(a,_b,_...)_to_generated_keys=Legg_alltid_til_en_bokstav_(a,_b,_...)_til_genererte_n\u00f8kler
@@ -2411,8 +2319,6 @@ General_file_directory=Standard_filkatalog
 
 User-specific_file_directory=Brukerdefinert_filkatalog
 
-Error_setting_look_and_feel=Feil_ved_endring_av_look_and_feel
-
 Search_failed\:_illegal_search_expression=Kunne_ikke_s\u00f8ke:_feil_i_s\u00f8keuttrykk
 
 Show_ArXiv_column=Vis_ArXiv-kolonne
@@ -2437,8 +2343,6 @@ Create_blank_entry_linking_the_PDF=Lag_blank_enhet_med_lenke_til_PDF
 
 Only_attach_PDF=Bare_lenk_til_PDF
 
-Mr._dLib_Metadata_Entries_Associated_With\:=Mr._dLib_metadata-enheter_assosiert_med:
-
 Mr._dLib_Metadata_Entries_Associated_With_PDF_File=Mr._dLib_metadata-enheter_assosiert_med_PDF-fil
 
 Title=Tittel
@@ -2474,8 +2378,6 @@ More_information=Mer_informasjon
 
 Fetching_Metadata...=Henter_metadata...
 
-Metadata=Metadata
-
 Autocomplete_names_in_'Firstname_Lastname'_format_only=Autokompletter_navn_i_'Fornavn_Etternavn'-format
 
 Autocomplete_names_in_'Lastname,_Firstname'_format_only=Autokompletter_navn_i_'Etternavn,_Fornavn'-format
@@ -2488,8 +2390,6 @@ The_name_'comment'_can_not_be_used_as_an_entry_type_name.=Navnet_'comment'_kan_i
 
 You_must_enter_an_integer_value_in_the_text_field_for=Du_m\u00e5_skrive_inn_en_heltallverdi_i_tekstfeltet_for
 
-File_directory=Filkatalog
-
 Send_as_email=Send_som_e-post
 
 References=Referanser
@@ -2502,8 +2402,6 @@ Automatically_open_folders_of_attached_files=\u00c5pne_automatisk_mapper_for_ved
 
 Create_entry_based_on_content=Opprett_enhet_basert_p\u00e5_innhold
 
-Store_choice_as_default=Lagre_valg_som_standard
-
 Do_not_show_this_box_again_for_this_import=Ikke_vis_denne_dialogboksen_igjen_for_denne_importen
 
 Always_use_this_PDF_import_style_(and_do_not_ask_for_each_import)=Alltid_bruk_denne_PDF-importmetoden_(ikke_sp\u00f8r_for_hver_enkelt_import)
@@ -2553,8 +2451,6 @@ Problem_modifying_citation=Det_oppsto_et_problem_ved_endring_av_referansen
 
 Citation=Referanse
 
-Context=Kontekst
-
 Extra_information=Ekstra_informasjon
 
 Could_not_resolve_BibTeX_entry_for_citation_marker_'%0'.=Kunne_ikke_finne_BibTeX-enhet_for_referansen_'%0'.
@@ -2605,8 +2501,6 @@ Connecting=Kobler_til
 
 Please_wait...=Vennligst_vent...
 
-Unable_to_connect=Kunne_ikke_koble_til
-
 Set_connection_parameters=Sett_opp_tilkoblingsparametre
 
 Path_to_OpenOffice_directory=Sti_til_OpenOffice-katalog
@@ -2615,8 +2509,6 @@ Path_to_OpenOffice_executable=Sti_til_OpenOffice-startfil
 
 Path_to_OpenOffice_library_dir=Sti_til_OpenOffice-bibliotekkatalog
 
-Autodetect=Autodetekter
-
 Connection_lost=Mistet_forbindelsen
 
 The_paragraph_format_is_controlled_by_the_property_'ReferenceParagraphFormat'_or_'ReferenceHeaderParagraphFormat'_in_the_style_file.=Dette_avsnittsformatet_styres_av_innstillingen_'ReferenceParagraphFormat'_eller_'ReferenceHeaderParagraphFormat'_i_stilfilen.
@@ -2661,8 +2553,6 @@ Click_group_to_toggle_membership_of_selected_entries=Klikk_p\u00e5_gruppe_for_\u
 
 Use_EMACS_23_insertion_string=Bruk_EMACS-23-innsettingsstreng
 
-Normalize_to_BibTeX_name_format=Normaliser_til_BibTeX-navneformat
-
 If_possible,_normalize_this_list_of_names_to_conform_to_standard_BibTeX_name_formatting=Om_mulig,_normaliser_denne_navnelisten_til_standard_BibTeX-navneformatering
 
 Could_not_open_%0=Kunne_ikke_\u00e5pne_%0
@@ -2680,8 +2570,6 @@ Web_search=Webs\u00f8k
 
 Autocomplete_names=Autokompletter_navn
 
-You_must_select_either_a_valid_style_file,_or_use_the_default_style.=Du_m\u00e5_enten_velge_en_gyldig_stilfil_eller_bruke_en_standardstil.
-
 Default_style=Standardstil
 
 Choose_style_file_directly=Velg_en_stilfil_direkte
@@ -2737,7 +2625,6 @@ Autocompletion_options=
 Autocomplete_after_following_number_of_characters=
 Name_format_used_for_autocompletion=
 Treatment_of_first_names=
-No_icon_found_for_%0=
 Cleanup_entries=
 
 Move_DOIs_from_note_and_URL_field_to_DOI_field_and_remove_http_prefix=
@@ -2763,9 +2650,6 @@ Automatically_assign_new_entry_to_selected_groups=Tilordne_automatisk_nye_enhete
 
 Error_importing_from_database=Feil_ved_import_fra_database
 
-Incomplete_search_results=Ufullstendig_s\u00f8keresultat
-%0_entries_were_found,_but_only_%1_of_these_could_be_resolved.=%0_enheter_ble_funnet,_men_bare_%1_av_disse_kunne_lastes_ned.
-
 Error_downloading_file_'%0'=Feil_ved_nedlasting_av_filen_'%0'
 Download_failed=Nedlsting_mislyktes
 
@@ -2783,7 +2667,6 @@ Please_select_which_JabRef_databases_do_you_want_to_import\:=Vennligst_velg_hvil
 
 Group_tree_could_not_be_parsed._If_you_save_the_BibTeX_database,_all_groups_will_be_lost.=
 Attach_file=
-Imported_=
 Minimize_to_system_tray=
 An_Error_occurred_while_fetching_from_OAI2_source_(%0)\:=En_feil_oppsto_under_nedlasting_fra_OIA2_source_(%0):
 
@@ -2794,10 +2677,9 @@ Unable_to_clear_preferences.=
 
 Reset_preferences_(key1,key2,..._or_'all')=
 Find_unlinked_files=
-Select_All=
-Unselect_All=
-Expand_All=
-Collapse_All=
+Unselect_all=
+Expand_all=
+Collapse_all=
 Select_Directory=
 Choose_Directory=
 Use_the_selected_directory_to_start_with_the_search.=
@@ -2857,7 +2739,6 @@ Priority_medium=
 Quality=
 Rank=
 Relevance=
-Set_priority=
 Set_priority_to_high=
 Set_priority_to_low=
 Set_priority_to_medium=
@@ -2889,7 +2770,6 @@ Correct_the_entry,_and_reopen_editor_to_display/edit_source.=
 Could_not_connect_to_a_running_gnuserv_process._Make_sure_that_Emacs_or_XEmacs_is_running,<BR>and_that_the_server_has_been_started_(by_running_the_command_'server-start'/'gnuserv-start').=
 Could_not_connect_to_running_OpenOffice.\nMake_sure_you_have_installed_OpenOffice_with_Java_support.\nIf_connecting_manually,_please_verify_program_and_library_paths.\n\nError_message\:_=
 Created_group_"%0".=
-File_has_been_updated_externally._Are_you_sure_you_want_to_save?=
 If_a_pasted_or_imported_entry_already_has_the_field_set,_overwrite.=
 Import_Metadata_From_PDF=
 Not_connected_to_any_Writer_document._Please_make_sure_a_document_is_open,_and_use_the_'Select_Writer_document'_button_to_connect_to_it.=
@@ -2924,4 +2804,62 @@ An_Error_occurred_while_parsing_abstract=
 Unknown_DiVA_entry\:_'%0'.=
 Get_BibTeX_entry_from_DiVA=
 Log=
-Remove_unneccessary_$,_{,_and_}=
+
+ISO_690=
+
+Add_brackets_and_replace_separators_with_their_non-breaking_version_for_units=
+Add_new_entry_and_keep_both_old_entries=
+Cancelled_merging_entries=
+Error_in_entry=
+First_entry=
+Format_units_by_adding_non-breaking_separators_and_keeping_the_correct_case_on_search=
+Merge_entries=
+Merged_entries_into_a_new_and_kept_the_old=
+Merged_entries_into_a_new_and_removed_the_old=
+Merged_entry=
+None=
+Parse=
+Remove_unneccessary_$,_{,_and_}_and_move_adjacent_numbers_into_equations=
+Replace_old_entries_with_new_entry=
+Result=
+Second_entry=
+Show_DOI_first=
+Show_URL_first=
+Use_1st=
+Use_2nd=
+Use_Emacs_key_bindings=
+You_have_to_choose_exactly_two_entries_to_merge.=
+
+Update_timestamp_on_modification=
+change_field=
+
+All_key_bindings_will_be_reset_to_their_defaults.=
+Automatically_set_file_links=
+Continue?=
+Resetting_all_key_bindings=
+Save_entries_ordered_by_title=
+Export_entries_ordered_by_title=
+Quotes=
+Curly_Brackets=
+Include_empty_fields=
+Field_saving_options=
+Field_value_delimiter._E.g.,_"author\={x}"_or_"author\='x'"=
+Run_Unicode_converter_on_title,_author(s),_and_abstract=
+
+Database_has_changed._Do_you_want_to_save_before_closing?=
+Host=
+Invalid_setting=
+Network=
+Please_specify_both_hostname_and_port=
+Port=
+Start_field_contents_in_same_column=
+Use_camel_case_for_field_names_(e.g.,_"HowPublished"_instead_of_"howpublished")=
+Use_custom_proxy_configuration=
+Clear_connection_settings=
+Cleared_connection_settings.=
+Rebind_C-a,_too=
+
+Show_number_of_elements_contained_in_each_group=
+
+Open_folder=
+Opened_%0_folder(s).=
diff --git a/src/resource/JabRef_pt_BR.properties b/src/resource/JabRef_pt_BR.properties
index a7b57c4..97fd4b6 100644
--- a/src/resource/JabRef_pt_BR.properties
+++ b/src/resource/JabRef_pt_BR.properties
@@ -103,7 +103,6 @@ Background_color_for_optional_fields=Cor_de_fundo_para_campos_opcionais
 Background_color_for_required_fields=Cor_de_fundo_para_campos_obrigat\u00f3rios
 Backup_old_file_when_saving=Criar_uma_c\u00f3pia_de_seguran\u00e7a_do_arquivo_antigo_quando_salvar
 Beta_version=Vers\u00e3o_Beta
-Bibkey_to_filename_conversion=Convers\u00e3o_de_chave_BibTeX_para_o_nome_do_arquivo
 BibTeX_key=Chave_BibTeX
 BibTeX_key_is_unique.=A_chave_BibTeX_\u00e9_\u00fanica.
 BibTeX_key_not_set._Enter_a_name_for_the_downloaded_file=Chave_BibTeX_n\u00e3o_definida._Insira_um_nome_para_o_arquivo_baixado.
@@ -113,7 +112,6 @@ Binding=Binding
 Broken_link=Link_quebrado
 Browse=Explorar
 by=por
-Calling_external_viewer...=Executando_visualizador_externo
 Cancel=Cancelar
 Cannot_add_entries_to_group_without_generating_keys._Generate_keys_now?=N\u00e3o_\u00e9_poss\u00edvel_adicionar_refer\u00eancias_ao_grupo_sem_gerar_as_chaves._Gerar_as_chaves_agora?_
 Cannot_merge_this_change=N\u00e3o_\u00e9_poss\u00edvel_mesclar_esta_mudan\u00e7a.
@@ -166,7 +164,6 @@ Command_line_id=ID_da_linha_de_comando
 Complete_record=Registro_completo
 Connect=Conectar
 Connect_to_SQL_database=Conectar_ao_banco_de_dados_SQL
-Connect_to_SQL_Database=Conectar_a_um_Banco_de_dados_SQL
 Connection_to_IEEEXplore_failed=Conex\u00e3o_ao_IEEEXplore_falhou
 Contained_in=Contido_em
 Content=Conte\u00fado
@@ -180,8 +177,6 @@ Copy_file_to_file_directory.=Copiar_arquivo_para_o_diret\u00f3rio_de_arquivos
 Copy_files_to_file_directory.=Copiar_arquivos_para_o_diret\u00f3rio_de_arquivos.
 Copy_to_clipboard=Copiar_para_a_\u00e1rea_de_transfer\u00eancia
 Could_not_call_executable=N\u00e3o_\u00e9_poss\u00edvel_chamar_o_execut\u00e1vel
-Could_not_connect_to_a_running_gnuserv_process._Make_sure_that_Emacs_or_XEmacs_is_running,<BR>and_that_the_server_has_been_started_(by_running_the_command_'gnuserv-start').=N\u00e3o_foi_poss\u00edvel_conectar_a_um_processo_'gnuserv'_em_execu\u00e7\u00e3o._Certifique-se_que_Emacs_ou_XEmacs_est\u00e1_sendo_executado,<BR>e_que_o_servidor_foi_iniciado_(executando_o_comando_'gnuserv-start').
-Could_not_connect_to_host_=N\u00e3o_foi_poss\u00edvel_conectar_ao_host_
 Could_not_connect_to_Vim_server._Make_sure_that_Vim_is_running<BR>with_correct_server_name.=N\u00e3o_foi_poss\u00edvel_conectar_ao_servidor_Vim._Certifique-se_que_o_Vim_est\u00e1_sendo_executado<br>_com_o_nome_de_servidor_correto.
 Could_not_export_file=N\u00e3o_foi_poss\u00edvel_exportar_os_arquivos
 Could_not_export_preferences=N\u00e3o_foi_poss\u00edvel_exportar_as_prefer\u00eancias
@@ -199,15 +194,12 @@ Could_not_print_preview=N\u00e3o_foi_poss\u00edvel_imprimir_a_previsualiza\u00e7
 Could_not_run_the_'vim'_program.=N\u00e3o_foi_poss\u00edvel_executar_o_programa_'vim'.
 Could_not_save_file=N\u00e3o_foi_poss\u00edvel_salvar_o_arquivo
 Could_not_save_file._Character_encoding_'%0'_is_not_supported.=N\u00e3o_foi_poss\u00edvel_salvar_o_arquivo._A_codifica\u00e7\u00e3o_de_caracteres_'%0'_n\u00e3o_\u00e9_suportada.
-Create_group=Criar_grupo
 Created_groups.=Grupos_criados.
 crossreferenced_entries_included=Registros_com_refer\u00eancias_cruzadas_inclu\u00eddos
 Current_content=Conte\u00fado_atual
 Current_value=Valor_atual
 Custom_entry_types=Tipos_de_refer\u00eancias_personalizados
 Custom_entry_types_found_in_file=Tipos_de_refer\u00eancias_personalizadas_encontradas_no_arquivo
-Custom_icon_theme=Tema_de_\u00edcones_personalizado
-Custom_icon_theme_file=Arquivo_de_tema_de_\u00edcones_personalizado
 Custom_importers=Importadores_personalizados
 Customize_entry_types=Personalizar_tipos_de_refer\u00eancias
 Customize_key_bindings=Personalizar_combina\u00e7\u00f5es_de_teclas
@@ -217,7 +209,6 @@ cut_entry=Recortar_refer\u00eancia
 Cut_pr=Recortar
 Database_\:=Base_de_dados\:
 Database_encoding=Codifica\u00e7\u00e3o_da_base_de_dados
-Database_has_changed._Do_you_want_to_save_before_closing?=A_base_de_dados_foi_modificada._Deseja_salvar_antes_de_fechar?
 Database_properties=Propriedades_da_base_de_dados
 Date_format=Formato_de_data
 Default=Padr\u00e3o
@@ -270,8 +261,6 @@ Download_file=Download_do_arquivo
 Downloading...=Download_em_curso...
 Drag_and_Drop_Error=Erro_ao_arrastar_e_soltar
 Drop_%0=Soltar_%0
-duplicate_BibTeX_key=chave_BibTeX_duplicada
-Duplicate_BibTeX_key.=Chave_BibTeX_duplicada.
 Duplicate_BibTeX_key._Grouping_may_not_work_for_this_entry.=Chave_BibTeX_duplicada._Agrupamento_pode_n\u00e3o_funcionar_para_esta_refer\u00eancia.
 Duplicate_Key_Warning=Aviso_de_chave_duplicada
 Duplicate_pairs_found=Pares_duplicados_encontrados
@@ -294,10 +283,8 @@ Edit_preamble=Editar_pre\u00e2mbulo
 Edit_strings=Editar_strings
 Editor_options=Op\u00e7\u00f5es_do_editor
 empty_BibTeX_key=chave_BibTeX_vazia
-Empty_BibTeX_key.=Chave_BibTeX_vazia.
 Empty_BibTeX_key._Grouping_may_not_work_for_this_entry.=Chave_BibTeX_vazia._O_agrupamento_pode_n\u00e3o_funcionar_para_esta_refer\u00eancia.
 empty_database=base_de_dados_vazio
-Enable_source_editing=Ativar_edi\u00e7\u00e3o_de_c\u00f3digo_fonte
 Enable_word/name_autocompletion=Ativar_auto_completar_para_palavras/nomes
 Endnote=Nota
 Enter_URL=Digite_a_URL
@@ -319,7 +306,7 @@ Entry_type_names_are_not_allowed_to_contain_white_space_or_the_following_charact
 Entry_types=Tipos_de_refer\u00eancia
 Error=Erro
 Error\:_=Erro\:_
-Error_converting_Bibtex_to_XMP\:_%0=Erro_ao_converter_Bibtex_para_XMP:_%0
+Error_converting_BibTeX_to_XMP\:_%0=Erro_ao_converter_Bibtex_para_XMP:_%0
 Error_converting_XMP_to_'%0'...=Erro_ao_converter_XMP_para_'%0'...
 Error_exporting_to_clipboard=Erro_ao_exportar_para_a_\u00e1rea_de_transfer\u00eancia
 Error_in_field=Erro_no_campo
@@ -329,7 +316,6 @@ Error_opening_file=Erro_ao_abrir_o_arquivo
 Error_setting_field=Erro_ao_confgurar_campo
 Error_while_converting_BibtexEntry_to_XMP_%0=Erro_ao_converter_BibtexEntry_para_XMP_%0
 Error_while_downloading_file\:=Erro_ao_realizar_o_download_do_arquivo_\:
-Error_while_fetching_from_OIA2=Erro_ao_recuperar_a_partir_do_OIA2
 Error_while_writing=Erro_durante_a_escrita
 Error_writing_to_%0_file(s).=Erro_ao_escrever_para_%0_arquivos.
 Error_writing_XMP_to_file\:_%0=Erro_ao_escrever_metadados_XMP_para_o_arquivo\:_%0
@@ -363,7 +349,6 @@ Field_names_are_not_allowed_to_contain_white_space_or_the_following_characters=O
 Field_sizes=Tamanho_dos_campos
 Field_to_filter=Campos_a_serem_filtrados
 Field_to_group_by=Campos_como_crit\u00e9rio_de_agrupamento
-Fields=Campos
 File=Arquivo
 file=arquivo
 File_'%0'_is_already_open.=O_arquivo_'%0'_j\u00e1_est\u00e1_aberto.
@@ -479,17 +464,13 @@ Insert_selected_citations_into_LyX/Kile=Inserir_cita\u00e7\u00f5es_selecionadas_
 Insert_selected_citations_into_WinEdt=Inserir_cita\u00e7\u00f5es_selecionadas_no_WInEdt
 insert_string_=Inserir_string_
 Insert_URL=Inserir_URL
-integrity=Integridade
 Integrity_check=Verfica\u00e7\u00e3o_de_integridade
 Intersection=Interse\u00e7\u00e3o
 Invalid_BibTeX_key=Chave_BibTex_inv\u00e1lida
 Invalid_date_format=Formato_de_data_inv\u00e1lido
 Invalid_URL=URL_inv\u00e1lida
 Inverted=invertido
-is_a_standard_type.=\u00e9_um_tipo_padr\u00e3o.
 ISO_abbreviation=Abrevia\u00e7\u00e3o_ISO
-Item_list_for_field=lista_de_itens_para_o_campo
-jabref=jabref
 JabRef_help=Ajuda_do_JabRef
 JabRef_preferences=Prefer\u00eancias_do_JabRef
 Journal_abbreviations=Abrevia\u00e7\u00f5es_de_peri\u00f3dico
@@ -522,7 +503,6 @@ Listen_for_remote_operation_on_port=Escutar_opera\u00e7\u00f5es_remotas_na_porta
 Load_and_Save_preferences_from/to_jabref.xml_on_start-up_(memory_stick_mode)=Carregar_e_salvar_prefer\u00eancias_a_partir_de/para_jabref.xml_ao_iniciar_(modo_cart\u00e3o_de_mem\u00f3ria)
 Load_session=Carregar_sess\u00e3o
 Loading_session...=Carregando_sess\u00e3o...
-localhost=localhost
 Look_and_feel=Apar\u00eancia
 Looking_for_pdf...=Procurando_por_pdf...
 lower=min\u00fasculo
@@ -591,7 +571,6 @@ No_entries_found._Please_make_sure_you_are_using_the_correct_import_filter.=Nenh
 No_entries_found_for_the_search_string_'%0'=Nenhuma_refer\u00eancia_encontrada_para_a_string_pesquisada_'%0'
 No_entries_imported.=Nenhuma_refer\u00eancia_importada.
 No_entries_or_multiple_entries_selected.=Nenhuma_refer\u00eancia_ou_m\u00faltiplas_refer\u00eancias_selecionadas.
-No_entries_selected=Nenhuma_refer\u00eancia_selecionada
 No_entries_selected.=Nenhuma_refer\u00eancia_selecionada.
 No_exceptions_have_ocurred.=Nenhuma_exce\u00e7\u00e3o_ocorreu.
 No_files_found.=Nenhum_arquivo_encontrado.
@@ -614,7 +593,6 @@ Nothing_to_redo=Nada_para_refazer
 Nothing_to_undo=Nada_para_desfazer
 Number_of_references_to_fetch?=N\u00fameros_de_refer\u00eancias_para_recuperar?
 occurences=ocorr\u00eancias
-OK=OK
 Ok=Ok
 One_or_more_file_links_are_of_the_type_'%0',_which_is_undefined._What_do_you_want_to_do?=Um_ou_mais_links_de_arquivos_s\u00e3o_do_tipo_'%0',_que_n\u00e3o_est\u00e1_definido._O_que_voc\u00ea_deseja_fazer?
 One_or_more_keys_will_be_overwritten._Continue?=Uma_ou_mais_chaves_ser\u00e3o_sobrescritas._Continuar?
@@ -623,6 +601,7 @@ Open=Abrir
 Open_BibTeX_database=Abrir_base_de_dados_BibTeX
 Open_database=Abrir_base_de_dados
 Open_editor_when_a_new_entry_is_created=Abrir_o_editor_quando_uma_nova_refer\u00eancia_\u00e9_criada
+Open_folder=Abrir_pasta
 Open_file=Abrir_arquivo
 Open_last_edited_databases_at_startup=Abrir_as_\u00faltimas_base_de_dados_editadas_ao_iniciar
 Open_PDF_or_PS=_Abrir_PDF_ou_PS
@@ -665,12 +644,10 @@ PDF_directory=Diret\u00f3rio_PDF
 PDF_does_not_exist=O_PDF_n\u00e3o_existe
 Personal_journal_list=Lista_pessoal_de_peri\u00f3dicos
 Plain_text_import=Importa\u00e7\u00e3o_de_texto_puro
-Please_check_your_network_connection_to_this_machine.=Por_favor,_verifique_sua_conex\u00e3o_de_rede_para_esta_m\u00e1quina.
 Please_enter_a_name_for_the_group.=Por_favor,_digite_um_nome_para_o_grupo.
 Please_enter_a_search_term._For_example,_to_search_all_fields_for_<b>Smith</b>,_enter%c<p><tt>smith</tt><p>To_search_the_field_<b>Author</b>_for_<b>Smith</b>_and_the_field_<b>Title</b>_for_<b>electrical</b>,_enter%c<p><tt>author%esmith_and_title%eelectrical</tt>=Por_favor_digite_um_termo_de_pesquisa._Por_exemplo,_para_pesquisar_todos_os_campos_por_<b>Smith</b>,_digite_%c<p><tt>smith</tt><p>Para_pesquisar_no_campo_<b>Author</b>_por_<b>Smith</b>_e_no_campo_<b>Title</b>_por_<b>electrical</b [...]
 Please_enter_the_field_to_search_(e.g._<b>keywords</b>)_and_the_keyword_to_search_it_for_(e.g._<b>electrical</b>).=Por_favor,_digite_o_campo_a_ser_pesquisado_(e.g._<b>palavras-chave</b>)_e_a_palavra-chave_de_pesquisa_(e.g._<b>el\u00e9trico</b>).
 Please_enter_the_string's_label=Por_favor,_digite_o_r\u00f3tulo_da_string
-Please_select_an_importer=Por_favor,_selecione_um_importador.
 Please_select_an_importer.=Por_favor,_selecione_um_importador.
 Please_select_exactly_one_group_to_move.=Por_favor,_selecione_exatamente_um_grupo_a_ser_movido.
 Please_specify_the_=Por_favor,_especifique_o_
@@ -740,7 +717,6 @@ Removed_group_"%0".=Grupo_"%0"_removido.
 Removed_group_"%0"_and_its_subgroups.=Grupo_"%0"_e_seus_subgrupos_removidos.
 Removed_string=String_removida
 Renamed_string=String_renomeada
-Replace=Substituir
 Replace_(regular_expression)=Substituir_(express\u00e3o_regular)
 Replace_string=Substituir_string
 Replace_with=Substituir_por
@@ -756,7 +732,6 @@ Revert_to_original_source=Reverter_para_o_original
 Review=Revisar
 Review_changes=Revisar_mudan\u00e7as
 Right=Direito
-root=root
 Save=Salvar
 Save_all_finished.=Salvar_todos_os_conclu\u00eddos.
 Save_all_open_databases=Salvar_todas_as_prefer\u00eancias
@@ -777,17 +752,15 @@ Saving_all_databases...=Salvando_todas_as_bases_de_dados...
 Saving_database=Salvando_base_de_dados...
 Scan=Escanear
 Search=Pesquisar
-Search_All_Fields=Pesquisar_Todos_os_Campos
 Search_all_fields=Pesquisar_todos_os_campos
 Search_error=Erro_de_pesquisa
 Search_expression=Pesquisar_express\u00e3o
 Search_for=Pesquisar_por
 Search_general_fields=Pesquisar_campos_gerais
 Search_IEEEXplore=Pesquisar_na_IEEEXplore
-Search_IEEExplore=Pesquiar_na_IEEExplore
 Search_optional_fields=Pesquisar_campos_opcionais
 Search_required_fields=Pesquisar_campos_obrigat\u00f3rios
-Search_Specified_Field(s)=Pesquisar_campo(s)_especificado(s)
+Search_specified_field(s)=Pesquisar_campo(s)_especificado(s)
 Searched_database._Global_number_of_hits=Busca_na_base_de_dados_efetuada._N\u00famero_de_ocorr\u00eancias_globais
 Searched_database._Number_of_hits=Busca_na_base_de_dados_efetuada._N\u00famero_de_ocorr\u00eancias
 Searching_for_%0_file=Procurando_por_arquivo_%0
@@ -810,7 +783,6 @@ Select_matches=Selecionar_correspond\u00eancias
 Select_new_ImportFormat_Subclass=Selecionar_nova_subclasse_ImportFormat
 Select_the_tree_nodes_to_view_and_accept_or_reject_changes=Selecione_os_n\u00f3s_da_\u00e1rvore_para_visualizar_e_aceitar_ou_rejeitar_mudan\u00e7as
 Selected_entries=Refer\u00eancias_selecionadas
-Selector_enabled_fields=Campos_seletor_habilitados
 Server_Hostname_\:=Hostname_do_servidor_\:
 Server_Type_\:=Tipo_de_servidor_\:
 Set_field=Configurar_campo
@@ -886,10 +858,8 @@ Target_file_cannot_be_a_directory.=O_arquivo_destino_n\u00e3o_pode_ser_um_diret\
 Tertiary_sort_criterion=Crit\u00e9rio_de_ordena\u00e7\u00e3o_terci\u00e1rio
 Test=Teste
 Text_Input_Area=Area_de_inser\u00e7\u00e3o_de_texto
-The_#_character_is_not_allowed_in_BibTeX_fields=O_caracter_#_n\u00e3o_\u00e9_permitido_em_campos_BibTeX
 The_chosen_date_format_for_new_entries_is_not_valid=O_formato_de_data_escolhido_n\u00e3o_\u00e9_v\u00e1lido
 The_chosen_encoding_'%0'_could_not_encode_the_following_characters\:_=A_codifica\u00e7\u00e3o_'%0'_n\u00e3o_pode_codificar_os_seguintes_caracteres\:_
-The_CiteSeer_fetch_operation_returned_zero_results.=A_opera\u00e7\u00e3o_de_recupera\u00e7\u00e3o_do_CiteSeer_n\u00e3o_retornou_resultados.
 The_current_version_features_a_new_way_of_handling_links_to_external_files.<br>To_take_advantage_of_this,_your_links_must_be_changed_into_the_new_format,_and<br>JabRef_must_be_configured_to_show_the_new_links.=A_vers\u00e3o_atual_traz_uma_nova_forma_de_trabalhar_com_links_para_arquivos_externos.<br>_Para_tirar_vantagem_disto,_seus_links_devem_ser_alterados_para_o_novo_formato,_e_<br>_o_JabRef_deve_estar_configurado_para_exibir_os_novos_links.
 the_field_<b>%0</b>=o_campo_<b>%0</b>
 The_file<BR>'%0'<BR>has_been_modified<BR>externally!=O_arquivo<BR>'%0'<BR>foi_modificado<BR>externamente!
@@ -904,7 +874,6 @@ The_search_is_case_insensitive.=A_busca_n\u00e3o_\u00e9_sens\u00edvel_ao_caso.
 The_search_is_case_sensitive.=A_busca_\u00e9_sens\u00edvel_ao_caso.
 The_string_has_been_removed_locally=Esta_string_foi_removida_localmente
 There_are_possible_duplicates_(marked_with_a_'D'_icon)_that_haven't_been_resolved._Continue?=Existem_poss\u00edveis_duplicatadas_(marcadas_com_um_\u00edcone_'D')_que_n\u00e3o_foram_resolvidas._Continuar?
-this_button_will_update=este_bot\u00e3o_atualizar\u00e1
 This_database_was_written_using_an_older_version_of_JabRef.=Esta_base_de_dados_foi_escrita_utlizando_uma_vers\u00e3o_antiga_do_JabRef.
 This_entry_has_no_BibTeX_key._Generate_key_now?=Esta_refer\u00eancia_n\u00e3o_possui_chave_BibTeX._Deseja_gerar_uma_chave?
 This_entry_is_incomplete=Esta_refer\u00eancia_est\u00e1_incompleta
@@ -916,12 +885,10 @@ This_group_contains_entries_in_which_any_field_contains_the_regular_expression_<
 This_group_contains_entries_in_which_any_field_contains_the_term_<b>%0</b>=Este_grupo_cont\u00e9m_refer\u00eancias_nas_quais_qualquer_campo_cont\u00e9m_o_termo_<b>%0</b>
 This_group_contains_entries_whose_<b>%0</b>_field_contains_the_keyword_<b>%1</b>=Este_grupo_cont\u00e9m_refer\u00eancias_cujo_campo_<b>%0</b>_cont\u00e9m_a_palavra-chave_<b>%1</b>
 This_group_contains_entries_whose_<b>%0</b>_field_contains_the_regular_expression_<b>%1</b>=Este_grupo_cont\u00e9m_refer\u00eancias_cujo_campo_<b>%0</b>_cont\u00e9m_a_express\u00e3o_regular_<b>%1</b>
-This_is_a_simple_copy_and_paste_dialog_for_import_some_fields_from_normal_text.=Esta_\u00e9_uma_janela_de_di\u00e1logo_do_copiar_e_colar_para_importar_alguns_campos_a_partir_de_texto_normal.
 This_makes_JabRef_look_up_each_%0_link_and_check_if_the_file_exists._If_not,_you_will_be_given_options<BR>to_resolve_the_problem.=Isto_faz_com_que_o_JabRed_busque_cada_link_%0_e_verifique_se_o_arquivo_existe._Caso_n\u00e3o_exista,_ser\u00e3o_exibidas_op\u00e7\u00f5es<BR>_para_resolver_o_problema.
 This_operation_requires_all_selected_entries_to_have_BibTex_keys_defined.=Esta_opera\u00e7\u00e3o_requer_que_todas_as_refer\u00eancias_selecionadas_tenham_chaves_BibTeX_definidas.
 This_operation_requires_at_least_one_entry.=Esta_opera\u00e7\u00e3o_requer_ao_menos_uma_refer\u00eancia.
 This_operation_requires_one_or_more_entries_to_be_selected.=Esta_opera\u00e7\u00e3o_exige_que_uma_ou_mais_refer\u00eancias_sejam_selecionadas
-This_will_move_all_external_links_from_the_'pdf'_and_'ps'_fields_into_the_'%0'_field._Proceed?=Esta_opera\u00e7\u00e3o_ir\u00e1_mover_todos_os_links_externos_dos_campos_'pdf'_e_'ps'_para_o_campo_'%0'._Deseja_continuar?
 To_set_up,_go_to_<B>Tools_->_Manage_journal_abbreviations</B>=Para_configurar,_acesse_o_menu_<B>_Ferramentas_->_Gerenciar_abrevia\u00e7\u00f5es_de_peri\u00f3dicos</B>
 Toggle_abbreviation=Habilitar/Desabilitar_abrevia\u00e7\u00e3o
 Toggle_entry_preview=Habilitar/Desabilitar_previsualiza\u00e7\u00e3o_da_refer\u00eancia
@@ -931,7 +898,6 @@ Try_different_encoding=Tente_uma_codifica\u00e7\u00e3o_diferente
 Type_set_to_'other'=Tipo_configurado_para_'other'
 Unabbreviate_journal_names_of_the_selected_entries=Reverter_abrevia\u00e7\u00f5es_dos_nomes_de_peri\u00f3dicos_das_refer\u00eancias_selecionadas
 Unabbreviated_%0_journal_names.=Revertidas_abrevia\u00e7\u00f5es_de_%0_nomes_de_peri\u00f3dicos.
-unable_to_access_LyX-pipe=n\u00e3o_foi_poss\u00edvel_acessar_o_pipe_LyX
 Unable_to_create_graphical_interface=N\u00e3o_foi_poss\u00edvel_criar_a_interface_gr\u00e1fica.
 Unable_to_open_file.=N\u00e3o_foi_poss\u00edvel_abrir_o_arquivo.
 Unable_to_open_link._The_application_'%0'_associated_with_the_file_type_'%1'_could_not_be_called.=N\u00e3o_foi_poss\u00edvel_abrir_o_link._A_aplica\u00e7a\u00f5_'%0'_associada_com_o_tipo_de_arquivo_'%1'_n\u00e3o_p\u00f4de_ser_chamada.
@@ -956,7 +922,6 @@ untitled=Sem_t\u00edtulo
 Up=Acima
 Update_to_current_column_widths=Atualizar_para_a_largura_de_coluna_atual
 Updated_group_selection=Sele\u00e7\u00e3o_de_grupo_atualizada
-Upgrade_external_links=Atualizar_links_externos
 Upgrade_external_PDF/PS_links_to_use_the_'%0'_field.=Atualizar_links_PDF/PS_externos_para_utilizar_o_campo_'%0'
 Upgrade_file=Atualizar_arquivo
 Upgrade_old_external_file_links_to_use_the_new_feature=Atualize_os_links_de_arquivos_externos_para_utilizar_o_novo_recurso
@@ -965,16 +930,13 @@ UPPER=MAI\u00daSCULO
 Upper_Each_First=Primeira_letra_de_cada_palavra_em_mai\u00fasculo
 Upper_first=Primeira_letra_em_mai\u00fasculo
 usage=utiliza\u00e7\u00e3o
-Use_antialiasing_font=Utilizar_fonte_com_antialiasing
 Use_autocompletion_for_the_following_fields=Utilizar_o_autocompletar_para_os_seguintes_campos
-Use_custom_icon_theme=Utiliza_tema_de_\u00edcone_personalizado
 Use_default_viewer=Utilizar_visualizador_padr\u00e3o
 Use_inspection_window_also_when_a_single_entry_is_imported.=Utilizar_janela_de_inspe\u00e7\u00e3o_tamb\u00e9m_quando_uma_\u00fanica_refer\u00eancia_\u00e9_importada.
 Use_native_file_dialog=Utilizar_caixa_de_di\u00e1logo_de_arquivo_nativa
 Use_other_look_and_feel=Utilizar_uma_outra_apar\u00eancia
 Use_Regular_Expression_Search=Utilizar_pesquisa_por_express\u00e3o_regular
 Use_regular_expressions=Utilizar_express\u00f5es_regulares
-Use_the_following_delimiter_character(s)=Utilize_o(s)_seguinte(s)_caractere(s)_de_delimita\u00e7\u00e3o
 Username_\:=Nome_de_usu\u00e1rio\:
 Value_cleared_externally=Valor_apagado_externamente
 Value_set_externally=Valor_definido_externamente
@@ -1021,7 +983,6 @@ Your_new_key_bindings_have_been_stored.=Suas_novas_atribui\u00e7\u00f5es_de_chav
 The_following_fetchers_are_available\:=As_seguintes_ferramentas_de_pesquisa_est\u00e3o_dispon\u00edveis\:
 Could_not_find_fetcher_'%0'=N\u00e3o_foi_poss\u00edvel_encontrar_a_ferramenta_de_pesquisa_'%0'
 Running_Query_'%0'_with_fetcher_'%1'.=Executando_consulta_'%0'_com_ferramenta_de_pesquisa_'%1'.
-Please_wait!=Por_favor,_aguarde!
 Query_'%0'_with_fetcher_'%1'_did_not_return_any_results.=Consulta_'%0'_com_ferramenta_de_pesquisa_'%1'_n\u00e3o_retornou_resultados.
 Open_SPIRES_entry=Abrir_refer\u00eancia_SPIRES
 Move/Rename_file=Mover/Renomear_arquivo
@@ -1029,7 +990,6 @@ File_moved=Arquivo_movido
 Move_file_failed=Movimenta\u00e7\u00e3o_do_arquivo_falhou
 Could_not_move_file=N\u00e3o_foi_poss\u00edvel_mover_o_arquivo
 Could_not_find_file_'%0'.=N\u00e3o_foi_poss\u00edvel_encontrar_o_arquivo_'%0'.
-Move/rename_file=Mover/renomear_arquivo
 Number_of_entries_successfully_imported=N\u00famero_de_refer\u00eancias_importadas_com_sucesso
 Import_canceled_by_user=Importa\u00e7\u00e3o_cancelada_pelo_usu\u00e1rio
 Progress\:_%0_of_%1=Progresso:_%0_de_%1
@@ -1124,10 +1084,8 @@ Version=Vers\u00e3o
 Unknown=Desconhecido
 Not_loaded=N\u00e3o_carregado
 Loaded=Carregado
-Could_not_determine_version_of_=N\u00e3o_foi_poss\u00edvel_determinar_a_vers\u00e3o_de_
 Install_anyway?=Instalar_mesmo_assim?_
 Looking_for_full_text_document...=Pesquisando_por_documento_completo...
-Follow_DOI_or_URL_link_and_try_to_locate_PDF_full_text_document=Seguir_o_DOI_ou_link_URL_e_tentar_localizar_o_documento_PDF_completo
 Unable_to_find_full_text_article._No_search_algorithm_defined_for_the_'%0'_web_site.=N\u00e3o_foi_poss\u00edvel_encontrar_o_artigo_completo._Nenhum_algoritmo_de_pesquisa_definido_para_o_website_'%0'.
 Found_pdf_link,_but_received_the_wrong_MIME_type._This_could_indicate_that_you_don't_have_access_to_the_fulltext_article.=Link_PDF_encontrado,_mas_MIME_type_recebido_\u00e9_incorreto._Isto_pode_indicar_que_voc\u00ea_n\u00e3o_possui_acesso_ao_artigo_completo.
 Autosave=Salvar_automaticamente
@@ -1167,7 +1125,6 @@ The_#_character_is_not_allowed_in_BibTeX_strings_unless_escaped_as_in_'\\#'.=O_c
 Before_saving,_please_edit_any_strings_containing_the_#_character.=Antes_de_salvar_por_favor_edite_quaisquer_strings_contendo_o_caracter_#.
 Save_without_backup?=Salvar_sem_backup?
 Unable_to_create_backup=N\u00e3o_foi_poss\u00edvel_criar_o_backup
-File_directory_is_not_set_or_does_not_exist.=O_diret\u00f3rio_de_arquvios_n\u00e3o_foi_definido_ou_n\u00e3o_existe.
 Move_file_to_file_directory.=Mover_arquivo_para_diret\u00f3rio_de_arquivo.
 Rename_file_to=Renomear_arquivo_para
 <b>All_Entries</b>_(this_group_cannot_be_edited_or_removed)=<b>Todas_as_refer\u00eancias</b>_(este_grupo_n\u00e3o_pode_ser_editado_ou_removido)
@@ -1185,7 +1142,6 @@ Error_while_fetching_from_ScienceDirect=Erro_ao_recuperar_dados_do_ScienceDirect
 Error_initializing_custom_export_format_from_string_'%0'=Erro_ao_iniciar_formata\u00e7\u00e3o_da_exporta\u00e7\u00e3o_personalizada_a_partir_da_string_%0
 BibLaTeX_mode=Modo_BibLaTeX
 Optional_fields_2=Campos_opcionais_2
-Please_wait=Por_favor,_aguarde
 Waiting_for_save_operation_to_finish=Aguardando_a_opera\u00e7\u00e3o_de_salvamento_ser_finalizada
 Resolving_duplicate_BibTeX_keys...=Resolvendo_chaves_BibTeX_duplicadas...
 Finished_resolving_duplicate_BibTeX_keys._%0_entries_modified.=Resolu\u00e7\u00e3o_de_chaves_BibTeX_duplicadas_finalizada._%0_refer\u00eancias_foram_modificadas.
@@ -1197,7 +1153,6 @@ Duplicate_BibTeX_key=Duplicar_chave_BibTeX
 Duplicate_key=Duplicar_chave
 Generate_key=Gerar_chave
 Import_marking_color=Importar_cores_de_marca\u00e7\u00e3o
-%0_entries_found._To_reduce_server_load,_only_%1_will_be_downloaded._It_will_be_very_slow,_in_order_to_make_ACM_happy.=%0_refer\u00eancias_encontradas._Para_reduzir_a_carga_no_servidor,_apenas_%1_ser\u00e1_baixada._Ser\u00e1_bem_devagar,_para_fazer_a_ACM_feliz.
 BibTeX_importer=Importador_BibTeX
 Always_add_letter_(a,_b,_...)_to_generated_keys=Sempre_adicionar_uma_letra_(a,_b,_...)\u00e0s_chaves_geradas
 Ensure_unique_keys_using_letters_(a,_b,_...)=Garantir_chaves_\u00fanicas_utilizando_letras_(a,_b,_...)
@@ -1211,7 +1166,6 @@ An_autosave_file_was_found_for_this_database._This_could_indicate_=Um_arquivo_de
 that_JabRef_didn't_shut_down_cleanly_last_time_the_file_was_used.=que_o_JabRef_n\u00e3o_foi_encerrado_corretamenre_na_\u00faltima_vez_que_o_arquivo_foi_utilizado.
 General_file_directory=Diret\u00f3rio_geral_de_arquivos
 User-specific_file_directory=Diret\u00f3rio_de_arquivo_espec\u00edfico_do_usu\u00e1rio
-Error_setting_look_and_feel=Erro_ao_definir_apar\u00eancia
 Search_failed\:_illegal_search_expression=A_pesquisa_falhou\:_express\u00e3o_de_pesquisa_ilegal
 Show_ArXiv_column=Exibir_coluna_ArXiv
 <HTML>Unpack_the_zip_file_containing_import/export_filters_for_Endnote,<BR>for_optimal_interoperability_with_JabRef</HTML>=<HTML>Descompacte_o_arquivo_zip_contendo_filtros_de_importa\u00e7\u00e3o/exporta\u00e7\u00e3o_para_Endnote,<BR>para_melhor_interoperabilidade_com_o_JabRef</HTML>
@@ -1224,7 +1178,6 @@ Create_entry_based_on_XMP_data=Criar_refer\u00eancia_baseada_em_dados_XMP
 Create_entry_based_on_data_fetched_from=Criar_refer\u00eancia_baseado_em_dados_recuperados_de_
 Create_blank_entry_linking_the_PDF=Criar_refer\u00eancia_em_branco_linkando_o_PDF
 Only_attach_PDF=Anexar_apenas_PDF
-Mr._dLib_Metadata_Entries_Associated_With\:=Refer\u00eancias_de_metadados_Mr._dLib_associadas_com\:
 Mr._dLib_Metadata_Entries_Associated_With_PDF_File=Refer\u00eancias_de_metadados_Mr._dLib_associadas_com_o_arquivo_PDF
 Title=T\u00edtulo
 Author(s)=Autor(es)
@@ -1243,21 +1196,18 @@ Update_Existing_Entry=Atualizar_refer\u00eancia_existente
 Mr._dLib=Mr._dLib
 More_information=Mais_informa\u00e7\u00f5es
 Fetching_Metadata...=Recuperando_metadados
-Metadata=Metadados
 Autocomplete_names_in_'Firstname_Lastname'_format_only=Autocompletar_nome_em_um_formato_'Nome,_Sobrenome'_apenas
 Autocomplete_names_in_'Lastname,_Firstname'_format_only=Autocompletar_nomes_em_um_formato_'Sobrenome,_Nome'_apenas
 Autocomplete_names_in_both_formats=Autocompletar_nomes_em_ambos_os_formatos
 Marking_color_%0=Cor_de_marca\u00e7\u00e3o_%0
 The_name_'comment'_can_not_be_used_as_an_entry_type_name.=O_nome_'comment'_n\u00e3o_pode_ser_utilizado_como_um_nome_de_tipo_de_refer\u00eancia.
 You_must_enter_an_integer_value_in_the_text_field_for=Voc\u00ea_deve_digitar_um_valor_inteiro_no_campo_de_texto_para
-File_directory=Diret\u00f3rio_de_arquivo
 Send_as_email=Enviar_como_email
 References=Refer\u00eancias
 Sending_of_emails=Envio_de_emails
 Subject_for_sending_an_email_with_references=Assunto_para_enviar_um_email_com_refer\u00eancias
 Automatically_open_folders_of_attached_files=Abrir_pastas_de_arquivos_anexados_automaticamente
 Create_entry_based_on_content=Criar_refer\u00eancia_baseada_no_conte\u00fado
-Store_choice_as_default=Armazenar_escolha_como_padr\u00e3o
 Do_not_show_this_box_again_for_this_import=N\u00e3o_exibir_esta_caixa_de_di\u00e1logo_novamente_para_esta_importa\u00e7\u00e3o
 Always_use_this_PDF_import_style_(and_do_not_ask_for_each_import)=Sempre_utilizar_este_estilo_de_importa\u00e7\u00e3o_de_PDF_(e_n\u00e3o_pergunte_a_cada_importa\u00e7\u00e3o)
 Error_creating_email=Erro_ao_criar_email
@@ -1283,7 +1233,6 @@ Extra_information_(e.g._page_number)=Informa\u00e7\u00e3o_adicional_(e.g.)_n\u00
 Manage_citations=Gerenciar_cita\u00e7\u00f5es
 Problem_modifying_citation=Problema_ao_modificar_cita\u00e7\u00e3o
 Citation=Cita\u00e7\u00e3o
-Context=Contexto
 Extra_information=Informa\u00e7\u00e3o_adicional
 Could_not_resolve_BibTeX_entry_for_citation_marker_'%0'.=N\u00e3o_foi_poss\u00edvel_resolver_a_refer\u00eancia_BibTeX_para_o_marcador_de_cita\u00e7\u00e3o_'%0'.
 Styles=Estilos
@@ -1309,12 +1258,10 @@ Combine_pairs_of_citations_that_are_separated_by_spaces_only=Combinar_pares_de_c
 Autodetection_failed=Falha_na_detec\u00e7\u00e3o_autom\u00e1tica
 Connecting=Conectando
 Please_wait...=Por_favor,_aguarde...
-Unable_to_connect=N\u00e3o_foi_poss\u00edvel_conectar
 Set_connection_parameters=Definir_par\u00e2metros_de_conex\u00e3o
 Path_to_OpenOffice_directory=Caminho_para_o_diret\u00f3rio_OpenOffice/LibreOffice
 Path_to_OpenOffice_executable=Caminho_para_o_execut\u00e1vel_do_OpenOffice/LibreOffice
 Path_to_OpenOffice_library_dir=Camino_para_diret\u00f3rio_de_bibliotecas_do_OpenOffice/LibreOffice
-Autodetect=Detectar_automaticamente
 Connection_lost=Conex\u00e3o_perdida
 The_paragraph_format_is_controlled_by_the_property_'ReferenceParagraphFormat'_or_'ReferenceHeaderParagraphFormat'_in_the_style_file.=O_formato_de_par\u00e1grafo_\u00e9_controlado_pela_propriedade_'ReferenceParagraphFormat'_ou_Reference_HeaderParagraphFormat'_no_arquivo_de_estilos.
 The_character_format_is_controlled_by_the_citation_property_'CitationCharacterFormat'_in_the_style_file.=O_formato_do_caracter_\u00e9_controlado_pela_propriedade_de_cita\u00e7\u00e3o_'CitationCharacterFormat'_no_arquivo_de_estilos.
@@ -1337,7 +1284,6 @@ JSTOR_import_cancelled=Importa\u00e7\u00e3o_JSTOR_cancelada
 HTML_list=Lista_HTML
 Click_group_to_toggle_membership_of_selected_entries=Clique_em_um_grupo_para_habilitar/desabilitar_participa\u00e7\u00e3o_das_refer\u00eancias_selecionadas
 Use_EMACS_23_insertion_string=Utilizar_string_de_inser\u00e7\u00e3o_EMACS_23
-Normalize_to_BibTeX_name_format=Normalizar_para_formato_de_nomes_BibTex
 If_possible,_normalize_this_list_of_names_to_conform_to_standard_BibTeX_name_formatting=Se_poss\u00edvel,_normalize_esta_lista_de_nomes_conforme_\u00e0_forma\u00e7\u00e3o_de_nomes_BibTeX_padr\u00e3o
 Could_not_open_%0=N\u00e3o_foi_poss\u00edvel_abrir_%0
 Unknown_import_format=Formato_de_importa\u00e7\u00e3o_desconhecido
@@ -1346,7 +1292,6 @@ An_Error_occurred_while_fetching_from_INSPIRE_source_(%0)\:=Um_erro_ocorreu_ao_p
 Error_while_fetching_from_Inspire\:_=Erro_ao_buscar_no_Inspire\:
 Web_search=Pesquisa_na_Web
 Autocomplete_names=Autocompletar_nomes
-You_must_select_either_a_valid_style_file,_or_use_the_default_style.=Voc\u00ea_deve_selecionar_um_estilo_v\u00e1lido,_ou_utilizar_o_estilo_padr\u00e3o.
 Default_style=Estilo_padr\u00e3o
 Choose_style_file_directly=Escolha_o_arquivo_de_estilo_diretamente
 Choose_from_a_directory=Escolha_a_partir_de_um_diret\u00f3rio
@@ -1392,7 +1337,6 @@ Autocompletion_options=
 Autocomplete_after_following_number_of_characters=
 Name_format_used_for_autocompletion=
 Treatment_of_first_names=
-No_icon_found_for_%0=
 Cleanup_entries=
 Move_DOIs_from_note_and_URL_field_to_DOI_field_and_remove_http_prefix=
 Format_content_of_month_field_to_#mon#=
@@ -1405,11 +1349,8 @@ Doing_a_cleanup_for_%0_entries...=
 No_entry_needed_a_clean_up=
 One_entry_needed_a_clean_up=
 %0_entries_needed_a_clean_up=
-Imported_=
 Automatically_assign_new_entry_to_selected_groups=Designar_automaticamente_novas_entradas_para_os_grupos_selecionados
 Error_importing_from_database=Erro_ao_importar_do_banco_de_dados
-Incomplete_search_results=Resultados_de_busca_incompletos
-%0_entries_were_found,_but_only_%1_of_these_could_be_resolved.=%_0_entradas_foram_encontradas,_mas_somente_%1_destas_puderam_ser_recuperadas.
 Error_downloading_file_'%0'=Erro_ao_baixar_arquivo_'%0'
 Download_failed=O_download_falhou
 
@@ -1434,10 +1375,9 @@ Unable_to_clear_preferences.=
 
 Reset_preferences_(key1,key2,..._or_'all')=
 Find_unlinked_files=
-Select_All=
-Unselect_All=
-Expand_All=
-Collapse_All=
+Unselect_all=
+Expand_all=
+Collapse_all=
 Select_Directory=
 Choose_Directory=
 Use_the_selected_directory_to_start_with_the_search.=
@@ -1497,7 +1437,6 @@ Priority_medium=
 Quality=
 Rank=
 Relevance=
-Set_priority=
 Set_priority_to_high=
 Set_priority_to_low=
 Set_priority_to_medium=
@@ -1529,7 +1468,6 @@ Correct_the_entry,_and_reopen_editor_to_display/edit_source.=
 Could_not_connect_to_a_running_gnuserv_process._Make_sure_that_Emacs_or_XEmacs_is_running,<BR>and_that_the_server_has_been_started_(by_running_the_command_'server-start'/'gnuserv-start').=
 Could_not_connect_to_running_OpenOffice.\nMake_sure_you_have_installed_OpenOffice_with_Java_support.\nIf_connecting_manually,_please_verify_program_and_library_paths.\n\nError_message\:_=
 Created_group_"%0".=
-File_has_been_updated_externally._Are_you_sure_you_want_to_save?=
 If_a_pasted_or_imported_entry_already_has_the_field_set,_overwrite.=
 Import_Metadata_From_PDF=
 Not_connected_to_any_Writer_document._Please_make_sure_a_document_is_open,_and_use_the_'Select_Writer_document'_button_to_connect_to_it.=
@@ -1564,4 +1502,61 @@ An_Error_occurred_while_parsing_abstract=
 Unknown_DiVA_entry\:_'%0'.=
 Get_BibTeX_entry_from_DiVA=
 Log=
-Remove_unneccessary_$,_{,_and_}=
+
+ISO_690=
+
+Add_brackets_and_replace_separators_with_their_non-breaking_version_for_units=
+Add_new_entry_and_keep_both_old_entries=
+Cancelled_merging_entries=
+Error_in_entry=
+First_entry=
+Format_units_by_adding_non-breaking_separators_and_keeping_the_correct_case_on_search=
+Merge_entries=
+Merged_entries_into_a_new_and_kept_the_old=
+Merged_entries_into_a_new_and_removed_the_old=
+Merged_entry=
+None=
+Parse=
+Remove_unneccessary_$,_{,_and_}_and_move_adjacent_numbers_into_equations=
+Replace_old_entries_with_new_entry=
+Result=
+Second_entry=
+Show_DOI_first=
+Show_URL_first=
+Use_1st=
+Use_2nd=
+Use_Emacs_key_bindings=
+You_have_to_choose_exactly_two_entries_to_merge.=
+
+Update_timestamp_on_modification=
+change_field=
+
+All_key_bindings_will_be_reset_to_their_defaults.=
+Automatically_set_file_links=
+Continue?=
+Resetting_all_key_bindings=
+Save_entries_ordered_by_title=
+Export_entries_ordered_by_title=
+Quotes=
+Curly_Brackets=
+Include_empty_fields=
+Field_saving_options=
+Field_value_delimiter._E.g.,_"author\={x}"_or_"author\='x'"=
+Run_Unicode_converter_on_title,_author(s),_and_abstract=
+
+Database_has_changed._Do_you_want_to_save_before_closing?=
+Host=
+Invalid_setting=
+Network=
+Please_specify_both_hostname_and_port=
+Port=
+Start_field_contents_in_same_column=
+Use_camel_case_for_field_names_(e.g.,_"HowPublished"_instead_of_"howpublished")=
+Use_custom_proxy_configuration=
+Clear_connection_settings=
+Cleared_connection_settings.=
+Rebind_C-a,_too=
+
+Show_number_of_elements_contained_in_each_group=
+
+Opened_%0_folder(s).=
diff --git a/src/resource/JabRef_en.properties b/src/resource/JabRef_ru.properties
similarity index 86%
copy from src/resource/JabRef_en.properties
copy to src/resource/JabRef_ru.properties
index 75cb7f9..410a6e8 100644
--- a/src/resource/JabRef_en.properties
+++ b/src/resource/JabRef_ru.properties
@@ -2,9 +2,9 @@
 #! created/edited by Popeye version 0.54 (popeye.sourceforge.net)
 #! encoding:ISO-8859-1
 
-%0_contains_the_Regular_Expression_<b>%1</b>=%0%0 contains_the_Regular_Expression_<b>%1</b>
+%0_contains_the_Regular_Expression_<b>%1</b>=%0_contains_the_Regular_Expression_<b>%1</b>
 
-%0_contains_the_term_<b>%1</b>=%0 contains_the_term_<b>%1</b>
+%0_contains_the_term_<b>%1</b>=%0_contains_the_term_<b>%1</b>
 
 %0_doesn't_contain_the_Regular_Expression_<b>%1</b>=%0_doesn't_contain_the_Regular_Expression_<b>%1</b>
 
@@ -30,7 +30,7 @@
 <select>=<select>
 
 <select_word>=<select_word>
-A_string_with_this_label_already_exists=A_string_with_that_label_already_exists
+A_string_with_this_label_already_exists=A_string_with_this_label_already_exists
 Abbreviate_journal_names_of_the_selected_entries_(ISO_abbreviation)=Abbreviate_journal_names_of_the_selected_entries_(ISO_abbreviation)
 Abbreviate_journal_names_of_the_selected_entries_(MEDLINE_abbreviation)=Abbreviate_journal_names_of_the_selected_entries_(MEDLINE_abbreviation)
 
@@ -39,7 +39,7 @@ Abbreviated_%0_journal_names.=Abbreviated_%0_journal_names.
 
 Abbreviation=Abbreviation
 
-About_JabRef=About_JabRef
+About_JabRef=\u00ce_\u00ef\u00f0\u00ee\u00e3\u00f0\u00e0\u00ec\u00ec\u00e5_JabRef
 
 Abstract=Abstract
 
@@ -65,11 +65,11 @@ Add_from_jar=Add_from_jar
 
 add_group=add_group
 
-Add_Group=Add_group
+Add_Group=Add_Group
 
 Add_new=Add_new
 
-Add_Subgroup=Add_subgroup
+Add_Subgroup=Add_Subgroup
 
 Add_to_group=Add_to_group
 
@@ -79,7 +79,7 @@ Added_new=Added_new
 
 Added_string=Added_string
 
-Additionally,_entries_whose_<b>%0</b>_field_does_not_contain_<b>%1</b>_can_be_assigned_manually_to_this_group_by_selecting_them_then_using_either_drag_and_drop_or_the_context_menu._This_process_adds_the_term_<b>%1</b>_to_each_entry's_<b>%0</b>_field._Entries_can_be_removed_manually_from_this_group_by_selecting_them_then_using_the_context_menu._This_process_removes_the_term_<b>%1</b>_from_each_entry's_<b>%0</b>_field.=Additionally,_entries_whose_<b>%0</b>_field_does_not_contain_<b>%1</b>& [...]
+Additionally,_entries_whose_<b>%0</b>_field_does_not_contain_<b>%1</b>_can_be_assigned_manually_to_this_group_by_selecting_them_then_using_either_drag_and_drop_or_the_context_menu._This_process_adds_the_term_<b>%1</b>_to_each_entry's_<b>%0</b>_field._Entries_can_be_removed_manually_from_this_group_by_selecting_them_then_using_the_context_menu._This_process_removes_the_term_<b>%1</b>_from_each_entry's_<b>%0</b>_field.=Additionally,_entries_whose_<b>%0</b>_field_does_not_contain_<b>%1</b>_ [...]
 
 Advanced=Advanced
 All_custom_file_types_will_be_lost._Proceed?=All_custom_file_types_will_be_lost._Proceed?
@@ -94,23 +94,23 @@ All_fields=All_fields
 All_subgroups_(recursively)=All_subgroups_(recursively)
 
 Allow_editing_in_table_cells=Allow_editing_in_table_cells
-An_Error_occurred_while_fetching_from_OAI2_source_(%0)\:=An_Error_occurred_while_fetching_from_OAI2_source_(%0):
-An_Exception_ocurred_while_accessing_'%0'=An_Exception_occurred_while_accessing_'%0'
-An_SAXException_ocurred_while_parsing_'%0'\:=An_SAXException_occurred_while_parsing_'%0':
+An_Error_occurred_while_fetching_from_OAI2_source_(%0)\:=An_Error_occurred_while_fetching_from_OAI2_source_(%0)\:
+An_Exception_ocurred_while_accessing_'%0'=An_Exception_ocurred_while_accessing_'%0'
+An_SAXException_ocurred_while_parsing_'%0'\:=An_SAXException_ocurred_while_parsing_'%0'\:
 
-and= and
-and_inside_the_JabRef-jar\:=and_inside_the_JabRef-jar:
+and=and
+and_inside_the_JabRef-jar\:=and_inside_the_JabRef-jar\:
 
 and_the_class_must_be_available_in_your_classpath_next_time_you_start_JabRef.=and_the_class_must_be_available_in_your_classpath_next_time_you_start_JabRef.
 
-any_field_that_matches_the_regular_expression_<b>%0</b>=any_field_that_matches_the_Regular_Expression_<b>%0</b>
+any_field_that_matches_the_regular_expression_<b>%0</b>=any_field_that_matches_the_regular_expression_<b>%0</b>
 
 Appearance=Appearance
 
 Append=Append
 Append_contents_from_a_BibTeX_database_into_the_currently_viewed_database=Append_contents_from_a_BibTeX_database_into_the_currently_viewed_database
 
-Append_database=Append_database
+Append_database=\u00c4\u00ee\u00e1\u00e0\u00e2\u00e8\u00f2\u00fc_\u00c1\u00c4
 
 append_the_selected_text_to_bibtex_key=append_the_selected_text_to_bibtex_key
 Application=Application
@@ -142,7 +142,7 @@ Auto=Auto
 Autodetect_format=Autodetect_format
 
 Autogenerate_BibTeX_key=Autogenerate_BibTeX_key
-Autogenerate_BibTeX_keys=Autogenerate_BibTeX_keys
+Autogenerate_BibTeX_keys=\u00c0\u00e2\u00f2\u00ee\u00f1\u00ee\u00e7\u00e4\u00e0\u00ed\u00e8\u00e5_\u00ea\u00eb\u00fe\u00f7\u00e5\u00e9_BibTeX
 
 Autogenerate_groups=Autogenerate_groups
 
@@ -177,7 +177,7 @@ AUX_file_import=AUX_file_import
 
 Available_export_formats=Available_export_formats
 
-Available_fields=Allowed_BibTeX_fields
+Available_fields=Available_fields
 
 Available_import_formats=Available_import_formats
 
@@ -188,8 +188,6 @@ Background_color_for_required_fields=Background_color_for_required_fields
 Backup_old_file_when_saving=Backup_old_file_when_saving
 Beta_version=Beta_version
 
-Bibkey_to_filename_conversion=Bibkey_to_filename_conversion
-
 BibTeX_key=BibTeX_key
 
 BibTeX_key_is_unique.=BibTeX_key_is_unique.
@@ -207,8 +205,6 @@ Browse=Browse
 
 by=by
 
-Calling_external_viewer...=Calling_external_viewer...
-
 Cancel=Cancel
 
 Cannot_add_entries_to_group_without_generating_keys._Generate_keys_now?=Cannot_add_entries_to_group_without_generating_keys._Generate_keys_now?
@@ -306,7 +302,6 @@ Command_line_id=Command_line_id
 Complete_record=Complete_record
 Connect=Connect
 Connect_to_SQL_database=Connect_to_SQL_database
-Connect_to_SQL_Database=Connect_to_SQL_Database
 Connection_to_IEEEXplore_failed=Connection_to_IEEEXplore_failed
 
 Contained_in=Contained_in
@@ -321,19 +316,15 @@ Copied_key=Copied_key
 
 Copied_keys=Copied_keys
 
-Copy=Copy
+Copy=\u00ca\u00ee\u00ef\u00e8\u00f0\u00ee\u00e2\u00e0\u00f2\u00fc
 
-Copy_BibTeX_key=Copy_BibTeX_key
+Copy_BibTeX_key=\u00ca\u00ee\u00ef\u00e8\u00f0\u00ee\u00e2\u00e0\u00f2\u00fc_\u00ea\u00eb\u00fe\u00f7_BibTeX
 Copy_file_to_file_directory.=Copy_file_to_file_directory.
 Copy_files_to_file_directory.=Copy_files_to_file_directory.
 
 Copy_to_clipboard=Copy_to_clipboard
 
 Could_not_call_executable=Could_not_call_executable
-
-Could_not_connect_to_a_running_gnuserv_process._Make_sure_that_Emacs_or_XEmacs_is_running,<BR>and_that_the_server_has_been_started_(by_running_the_command_'gnuserv-start').=Could_not_connect_to_a_running_gnuserv_process._Make_sure_that_Emacs_or_XEmacs_is_running,<BR>and_that_the_server_has_been_started_(by_running_the_command_'gnuserv-start').
-
-Could_not_connect_to_host_=Could_not_connect_to_host_
 Could_not_connect_to_Vim_server._Make_sure_that_Vim_is_running<BR>with_correct_server_name.=Could_not_connect_to_Vim_server._Make_sure_that_Vim_is_running<BR>with_correct_server_name.
 
 Could_not_export_file=Could_not_export_file
@@ -341,7 +332,7 @@ Could_not_export_file=Could_not_export_file
 Could_not_export_preferences=Could_not_export_preferences
 
 Could_not_find_a_suitable_import_format.=Could_not_find_a_suitable_import_format.
-Could_not_find_directory_for_%0-files\:_%1=Could_not_find_directory_for_%0-files:_%1
+Could_not_find_directory_for_%0-files\:_%1=Could_not_find_directory_for_%0-files\:_%1
 Could_not_find_image_file=Could_not_find_image_file
 
 Could_not_find_layout_file=Could_not_find_layout_file
@@ -361,8 +352,6 @@ Could_not_run_the_'vim'_program.=Could_not_run_the_'vim'_program.
 Could_not_save_file=Could_not_save_file
 Could_not_save_file._Character_encoding_'%0'_is_not_supported.=Could_not_save_file._Character_encoding_'%0'_is_not_supported.
 
-Create_group=Create_group
-
 Created_groups.=Created_groups.
 
 crossreferenced_entries_included=crossreferenced_entries_included
@@ -374,29 +363,25 @@ Current_value=Current_value
 Custom_entry_types=Custom_entry_types
 
 Custom_entry_types_found_in_file=Custom_entry_types_found_in_file
-Custom_icon_theme=Custom_icon_theme
-Custom_icon_theme_file=Custom_icon_theme_file
 
 Custom_importers=Custom_importers
 
-Customize_entry_types=Customize_entry_types
+Customize_entry_types=\u00cd\u00e0\u00f1\u00f2\u00f0\u00ee\u00e8\u00f2\u00fc_\u00f2\u00e8\u00ef\u00fb_\u00e7\u00e0\u00ef\u00e8\u00f1\u00e8
 
 Customize_key_bindings=Customize_key_bindings
 
-Cut=Cut
+Cut=\u00c2\u00fb\u00f0\u00e5\u00e7\u00e0\u00f2\u00fc
 
 cut_entries=cut_entries
 
 cut_entry=cut_entry
 
-Cut_pr=Cut
-Database_\:=Database:
+Cut_pr=Cut_pr
+Database_\:=Database_\:
 
 Database_encoding=Database_encoding
 
-Database_has_changed._Do_you_want_to_save_before_closing?=Database_has_changed._Do_you_want_to_save_before_closing?
-
-Database_properties=Database_properties
+Database_properties=\u00d1\u00e2\u00ee\u00e9\u00f1\u00f2\u00e2\u00e0_\u00c1\u00c4
 
 Date_format=Date_format
 
@@ -413,7 +398,7 @@ Default_pattern=Default_pattern
 Default_sort_criteria=Default_sort_criteria
 Define_'%0'=Define_'%0'
 
-Delete=Delete
+Delete=\u00d3\u00e4\u00e0\u00eb\u00e8\u00f2\u00fc
 
 Delete_custom_format=Delete_custom_format
 
@@ -474,7 +459,7 @@ Do_not_show_splash_window_at_startup=Do_not_show_splash_window_at_startup
 Do_not_show_these_options_in_the_future=Do_not_show_these_options_in_the_future
 
 Do_not_wrap_the_following_fields_when_saving=Do_not_wrap_the_following_fields_when_saving
-Do_not_write_the_following_fields_to_XMP_Metadata\:=Do_not_write_the_following_fields_to_XMP_Metadata:
+Do_not_write_the_following_fields_to_XMP_Metadata\:=Do_not_write_the_following_fields_to_XMP_Metadata\:
 
 Do_you_want_JabRef_to_do_the_following_operations?=Do_you_want_JabRef_to_do_the_following_operations?
 
@@ -492,10 +477,6 @@ Downloading...=Downloading...
 Drag_and_Drop_Error=Drag_and_Drop_Error
 Drop_%0=Drop_%0
 
-duplicate_BibTeX_key=duplicate_BibTeX_key
-
-Duplicate_BibTeX_key.=Duplicate_BibTeX_key.
-
 Duplicate_BibTeX_key._Grouping_may_not_work_for_this_entry.=Duplicate_BibTeX_key._Grouping_may_not_work_for_this_entry.
 
 Duplicate_Key_Warning=Duplicate_Key_Warning
@@ -518,30 +499,26 @@ Dynamically_group_entries_by_searching_a_field_for_a_keyword=Dynamically_group_e
 
 Each_line_must_be_on_the_following_form=Each_line_must_be_on_the_following_form
 
-Edit=Edit
+Edit=\u00c8\u00e7\u00ec\u00e5\u00ed\u00e8\u00f2\u00fc
 
 Edit_custom_export=Edit_custom_export
-Edit_entry=Edit_entry
+Edit_entry=\u00c8\u00e7\u00ec\u00e5\u00ed\u00e8\u00f2\u00fc_\u00e7\u00e0\u00ef\u00e8\u00f1\u00fc
 Edit_file_link=Edit_file_link
 Edit_file_type=Edit_file_type
 
-Edit_group=Edit_Group
+Edit_group=Edit_group
 
 Edit_journal=Edit_journal
 
-Edit_preamble=Edit_preamble
-Edit_strings=Edit_strings
+Edit_preamble=\u00c8\u00e7\u00ec\u00e5\u00ed\u00e8\u00f2\u00fc_\u00ef\u00f0\u00e5\u00e0\u00ec\u00e1\u00f3\u00eb\u00f3
+Edit_strings=\u00c8\u00e7\u00ec\u00e5\u00ed\u00e8\u00f2\u00fc_\u00f1\u00f2\u00f0\u00ee\u00ea\u00f3
 Editor_options=Editor_options
 
 empty_BibTeX_key=empty_BibTeX_key
 
-Empty_BibTeX_key.=Empty_BibTeX_key.
-
 Empty_BibTeX_key._Grouping_may_not_work_for_this_entry.=Empty_BibTeX_key._Grouping_may_not_work_for_this_entry.
 
 empty_database=empty_database
-
-Enable_source_editing=Enable_source_editing
 Enable_word/name_autocompletion=Enable_word/name_autocompletion
 
 Endnote=Endnote
@@ -581,25 +558,24 @@ Entry_type_names_are_not_allowed_to_contain_white_space_or_the_following_charact
 Entry_types=Entry_types
 
 Error=Error
-Error\:_=Error:_
-Error_converting_Bibtex_to_XMP\:_%0=Error_converting_Bibtex_to_XMP:_%0
+Error\:_=Error\:_
+Error_converting_BibTeX_to_XMP\:_%0=Error_converting_Bibtex_to_XMP\:_%0
 Error_converting_XMP_to_'%0'...=Error_converting_XMP_to_'%0'...
 Error_exporting_to_clipboard=Error_exporting_to_clipboard
 
 ##Error:_check_your_External_viewer_settings_in_Preferences=Error:_check_your_External_viewer_settings_in_Preferences
 Error_in_field=Error_in_field
 Error_in_starting_plug-in_system._Starting_without,_but_some_functionality_may_be_missing.=Error_in_starting_plug-in_system._Starting_without,_but_some_functionality_may_be_missing.
-Error_occured_when_parsing_entry=Error_occurred_when_parsing_entry
+Error_occured_when_parsing_entry=Error_occured_when_parsing_entry
 
 Error_opening_file=Error_opening_file
 
 Error_setting_field=Error_setting_field
 Error_while_converting_BibtexEntry_to_XMP_%0=Error_while_converting_BibtexEntry_to_XMP_%0
-Error_while_downloading_file\:=Error_while_downloading_file:
-Error_while_fetching_from_OIA2=Error_while_fetching_from_OIA2
+Error_while_downloading_file\:=Error_while_downloading_file\:
 Error_while_writing=Error_while_writing
 Error_writing_to_%0_file(s).=Error_writing_to_%0_file(s).
-Error_writing_XMP_to_file\:_%0=Error_writing_XMP_to_file:_%0
+Error_writing_XMP_to_file\:_%0=Error_writing_XMP_to_file\:_%0
 
 
 Establishing_SQL_connection...=Establishing_SQL_connection...
@@ -613,7 +589,7 @@ exists._Overwrite?=exists._Overwrite?
 Expand_subtree=Expand_subtree
 
 #previousentrynottranslated.Toviewit,openGroupinterfaceandclickonthe"newgroup"button
-Export=Export
+Export=\u00dd\u00ea\u00f1\u00ef\u00ee\u00f0\u00f2
 
 Export_name=Export_name
 
@@ -639,7 +615,7 @@ External_programs=External_programs
 
 External_viewer_called=External_viewer_called
 
-Failed_to_read_groups_data_(unsupported_version\:_%0)=Failed_to_read_groups_data_(unsupported_version:_%0)
+Failed_to_read_groups_data_(unsupported_version\:_%0)=Failed_to_read_groups_data_(unsupported_version\:_%0)
 
 Fetch=Fetch
 
@@ -658,9 +634,7 @@ Field_to_filter=Field_to_filter
 
 Field_to_group_by=Field_to_group_by
 
-Fields=Fields
-
-File=File
+File=\u00d4\u00e0\u00e9\u00eb
 
 file=file
 
@@ -669,7 +643,7 @@ File_'%0'_is_already_open.=File_'%0'_is_already_open.
 File_'%0'_not_found=File_'%0'_not_found
 
 File_changed=File_changed
-File_directory_is_'%0'\:=File_directory_is_'%0':
+File_directory_is_'%0'\:=File_directory_is_'%0'\:
 
 File_directory_is_not_set_or_does_not_exist!=File_directory_is_not_set_or_does_not_exist!
 File_download=File_download
@@ -766,9 +740,9 @@ Harvard_RTF=Harvard_RTF
 
 Have_you_chosen_the_correct_package_path?=Have_you_chosen_the_correct_package_path?
 
-Help=Help
+Help=\u00d1\u00ef\u00f0\u00e0\u00e2\u00ea\u00e0
 
-Help_contents=Help_contents
+Help_contents=\u00d1\u00ee\u00e4\u00e5\u00f0\u00e6\u00e0\u00ed\u00e8\u00e5_\u00f1\u00ef\u00f0\u00e0\u00e2\u00ea\u00e8
 
 Help_on_groups=Help_on_groups
 
@@ -783,8 +757,8 @@ Hide_non-matching_entries=Hide_non-matching_entries
 Hierarchical_context=Hierarchical_context
 
 Highlight=Highlight
-Highlight_groups_matching_all_selected_entries=Highlight_groups_matching_all_selected_entries
-Highlight_groups_matching_any_selected_entry=Highlight_groups_matching_any_selected_entry
+Highlight_groups_matching_all_selected_entries=\u00c2\u00fb\u00e4\u00e5\u00eb\u00e8\u00f2\u00fc_\u00e3\u00f0\u00f3\u00ef\u00ef\u00fb_\u00f1\u00ee\u00ee\u00f2\u00e2\u00e5\u00f2\u00f1\u00f2\u00e2\u00f3\u00fe\u00f9\u00e8\u00e5_\u00e2\u00f1\u00e5\u00ec_\u00e2\u00fb\u00e1\u00f0\u00e0\u00ed\u00ed\u00fb\u00ec_\u00e7\u00e0\u00ef\u00e8\u00f1\u00ff\u00ec
+Highlight_groups_matching_any_selected_entry=\u00c2\u00fb\u00e4\u00e5\u00eb\u00e8\u00f2\u00fc_\u00e3\u00f0\u00f3\u00ef\u00ef\u00fb,_\u00f1\u00ee\u00ee\u00f2\u00e2\u00e5\u00f2\u00f1\u00f2\u00e2\u00f3\u00fe\u00f9\u00e8\u00e5_\u00e2\u00f1\u00e5\u00ec_\u00e2\u00fb\u00e1\u00f0\u00e0\u00ed\u00ed\u00fb\u00ec_\u00e7\u00e0\u00ef\u00e8\u00f1\u00ff\u00ec
 
 Highlight_overlapping_groups=Highlight_overlapping_groups
 
@@ -842,19 +816,19 @@ In_JabRef,_use_pairs_of_#_characters_to_indicate_a_string.=In_JabRef,_use_pairs_
 Include_abstracts=Include_abstracts
 Include_entries=Include_entries
 
-Include_subgroups\:_When_selected,_view_entries_contained_in_this_group_or_its_subgroups=Include_subgroups:_When_selected,_view_entries_contained_in_this_group_or_its_subgroups
+Include_subgroups\:_When_selected,_view_entries_contained_in_this_group_or_its_subgroups=Include_subgroups\:_When_selected,_view_entries_contained_in_this_group_or_its_subgroups
 
 Incremental=Incremental
 
-Incremental_search=Incremental_search
+Incremental_search=\u00c8\u00ed\u00ea\u00f0\u00e5\u00ec\u00e5\u00ed\u00f2\u00e0\u00eb\u00fc\u00ed\u00fb\u00e9_\u00ef\u00ee\u00e8\u00f1\u00ea
 
 Incremental_search_failed._Repeat_to_search_from_top.=Incremental_search_failed._Repeat_to_search_from_top.
 
-Independent_group\:_When_selected,_view_only_this_group's_entries=Independent_group:_When_selected,_view_only_this_group's_entries
+Independent_group\:_When_selected,_view_only_this_group's_entries=Independent_group\:_When_selected,_view_only_this_group's_entries
 
 Initially_show_groups_tree_expanded=Initially_show_groups_tree_expanded
 
-Input=Work_options
+Input=Input
 
 Input_error=Input_error
 
@@ -862,18 +836,16 @@ Insert=Insert
 
 Insert_rows=Insert_rows
 
-Insert_selected_citations_into_LyX/Kile=Insert_selected_citations_into_LyX/Kile
+Insert_selected_citations_into_LyX/Kile=\u00c2\u00f1\u00f2\u00e0\u00e2\u00e8\u00f2\u00fc_\u00e2\u00fb\u00e1\u00f0\u00e0\u00ed\u00ed\u00fb\u00e5_\u00f6\u00e8\u00f2\u00e0\u00f2\u00fb_\u00e2_LyX/Kile
 
-Insert_selected_citations_into_WinEdt=Insert_selected_citations_into_WinEdt
+Insert_selected_citations_into_WinEdt=\u00c2\u00f1\u00f2\u00e0\u00e2\u00e8\u00f2\u00fc_\u00e2\u00fb\u00e1\u00f0\u00e0\u00ed\u00ed\u00fb\u00e5_\u00f6\u00e8\u00f2\u00e0\u00f2\u00fb_\u00e2_WinEdt
 
 insert_string_=insert_string_
 
 Insert_URL=Insert_URL
 
-integrity=integrity
-
 #Integritycheckisaprocessthatchecksforindicationsofwronglyfilledoutbibtexfields."Scan"isthebuttonthatstartsthecheck.
-Integrity_check=Integrity_check
+Integrity_check=\u00cf\u00f0\u00ee\u00f1\u00e5\u00f0\u00ea\u00e0_\u00f6\u00e5\u00eb\u00ee\u00f1\u00f2\u00ed\u00ee\u00f1\u00f2\u00e8
 
 Intersection=Intersection
 
@@ -885,14 +857,9 @@ Invalid_URL=Invalid_URL
 
 Inverted=Inverted
 
-is_a_standard_type.=is_a_standard_type.
-
 ISO_abbreviation=ISO_abbreviation
 
-Item_list_for_field=Item_list_for_field
-jabref=jabref
-
-JabRef_help=JabRef_help
+JabRef_help=\u00d1\u00ef\u00f0\u00e0\u00e2\u00ea\u00e0_JabRef
 
 JabRef_preferences=JabRef_preferences
 
@@ -948,10 +915,9 @@ Link_to_file_%0=Link_to_file_%0
 Listen_for_remote_operation_on_port=Listen_for_remote_operation_on_port
 Load_and_Save_preferences_from/to_jabref.xml_on_start-up_(memory_stick_mode)=Load_and_Save_preferences_from/to_jabref.xml_on_start-up_(memory_stick_mode)
 
-Load_session=Load_session
+Load_session=\u00c7\u00e0\u00e3\u00f0\u00f3\u00e7\u00e8\u00f2\u00fc_\u00f1\u00e5\u00e0\u00ed\u00f1
 
 Loading_session...=Loading_session...
-localhost=localhost
 
 Look_and_feel=Look_and_feel
 Looking_for_pdf...=Looking_for_pdf...
@@ -966,14 +932,14 @@ Main_PS_directory=Main_PS_directory
 
 Manage=Manage
 
-Manage_custom_exports=Manage_custom_exports
+Manage_custom_exports=\u00d3\u00ef\u00f0\u00e0\u00e2\u00eb\u00e5\u00ed\u00e8\u00e5_\u00ed\u00e0\u00f1\u00f2\u00f0\u00ee\u00e9\u00ea\u00e0\u00ec\u00e8_\u00fd\u00ea\u00f1\u00ef\u00ee\u00f0\u00f2\u00e0
 
-Manage_custom_imports=Manage_custom_imports
-Manage_external_file_types=Manage_external_file_types
+Manage_custom_imports=\u00d3\u00ef\u00f0\u00e0\u00e2\u00eb\u00e5\u00ed\u00e8\u00e5_\u00ed\u00e0\u00f1\u00f2\u00f0\u00ee\u00e9\u00ea\u00e0\u00ec\u00e8_\u00e8\u00ec\u00ef\u00ee\u00f0\u00f2\u00e0
+Manage_external_file_types=\u00d3\u00ef\u00f0\u00e0\u00e2\u00eb\u00e5\u00ed\u00e8\u00e5_\u00e2\u00ed\u00e5\u00f8\u00ed\u00e8\u00ec\u00e8_\u00f2\u00e8\u00ef\u00e0\u00ec\u00e8_\u00f4\u00e0\u00e9\u00eb\u00ee\u00e2
 
-Manage_journal_abbreviations=Manage_journal_abbreviations
+Manage_journal_abbreviations=\u00d3\u00ef\u00f0\u00e0\u00e2\u00eb\u00e5\u00ed\u00e8\u00e5_\u00f1\u00ee\u00ea\u00f0\u00e0\u00f9\u00e5\u00ed\u00e8\u00ff\u00ec\u00e8_\u00e4\u00eb\u00ff_\u00e6\u00f3\u00f0\u00ed\u00e0\u00eb\u00ee\u00e2
 
-Mark_entries=Mark_entries
+Mark_entries=\u00cc\u00e5\u00f2\u00ea\u00e8_\u00e7\u00e0\u00ef\u00e8\u00f1\u00e5\u00e9
 
 Mark_entry=Mark_entry
 
@@ -990,7 +956,7 @@ Merged_external_changes=Merged_external_changes
 
 Messages=Messages
 
-Messages_and_Hints=Hints_and_Warnings
+Messages_and_Hints=Messages_and_Hints
 
 Modification_of_field=Modification_of_field
 
@@ -1012,7 +978,7 @@ Move_down=Move_down
 
 Move_entries_in_group_selection_to_the_top=Move_entries_in_group_selection_to_the_top
 Move_external_links_to_'file'_field=Move_external_links_to_'file'_field
-Move_files_to_file_directory.=Move_files_to_file_directory
+Move_files_to_file_directory.=Move_files_to_file_directory.
 
 move_group=move_group
 
@@ -1062,7 +1028,7 @@ No_%0_found=No_%0_found
 
 No_actual_changes_found.=No_actual_changes_found.
 
-no_base-bibtex-file_specified=no_base-bibtex-file_specified!
+no_base-bibtex-file_specified=no_base-bibtex-file_specified
 
 no_database_generated=no_database_generated
 
@@ -1076,11 +1042,9 @@ No_entries_found_for_the_search_string_'%0'=No_entries_found_for_the_search_stri
 No_entries_imported.=No_entries_imported.
 
 No_entries_or_multiple_entries_selected.=No_entries_or_multiple_entries_selected.
-
-No_entries_selected=No_entries_selected
 No_entries_selected.=No_entries_selected.
 
-No_exceptions_have_ocurred.=No_exceptions_have_occurred.
+No_exceptions_have_ocurred.=No_exceptions_have_ocurred.
 No_files_found.=No_files_found.
 
 No_GUI._Only_process_command_line_options.=No_GUI._Only_process_command_line_options.
@@ -1091,7 +1055,7 @@ No_journal_names_could_be_unabbreviated.=No_journal_names_could_be_unabbreviated
 No_PDF_linked=No_PDF_linked
 
 No_pdf_or_ps_defined,_and_no_file_matching_Bibtex_key_found=No_pdf_or_ps_defined,_and_no_file_matching_Bibtex_key_found
-No_plugins_were_found_in_the_following_folders\:=No_plugins_were_found_in_the_following_folders:
+No_plugins_were_found_in_the_following_folders\:=No_plugins_were_found_in_the_following_folders\:
 
 No_references_found=No_references_found
 
@@ -1119,9 +1083,7 @@ Number_of_references_to_fetch?=Number_of_references_to_fetch?
 
 occurences=occurences
 
-OK=OK
-
-Ok=OK
+Ok=Ok
 One_or_more_file_links_are_of_the_type_'%0',_which_is_undefined._What_do_you_want_to_do?=One_or_more_file_links_are_of_the_type_'%0',_which_is_undefined._What_do_you_want_to_do?
 
 One_or_more_keys_will_be_overwritten._Continue?=One_or_more_keys_will_be_overwritten._Continue?
@@ -1131,19 +1093,19 @@ Open=Open
 
 Open_BibTeX_database=Open_BibTeX_database
 
-Open_database=Open_database
+Open_database=\u00ce\u00f2\u00ea\u00f0\u00fb\u00f2\u00fc_\u00c1\u00c4
 
 Open_editor_when_a_new_entry_is_created=Open_editor_when_a_new_entry_is_created
 
-Open_file=Open_file
+Open_file=\u00ce\u00f2\u00ea\u00f0\u00fb\u00f2\u00fc_\u00f4\u00e0\u00e9\u00eb
 
 Open_last_edited_databases_at_startup=Open_last_edited_databases_at_startup
 
-Open_PDF_or_PS=Open_PDF_or_PS
+Open_PDF_or_PS=\u00ce\u00f2\u00ea\u00f0\u00fb\u00f2\u00fc_PDF_\u00e8\u00eb\u00e8_PS
 
 Open_right-click_menu_with_Ctrl+left_button=Open_right-click_menu_with_Ctrl+left_button
 
-Open_URL_or_DOI=Open_URL_or_DOI
+Open_URL_or_DOI=\u00ce\u00f2\u00ea\u00f0\u00fb\u00f2\u00fc_URL-\u00e0\u00e4\u00f0\u00e5\u00f1_\u00e8\u00eb\u00e8_DOI
 OpenDocument_Spreadsheet=OpenDocument_Spreadsheet
 
 Opened_database=Opened_database
@@ -1159,7 +1121,7 @@ Operation_not_supported=Operation_not_supported
 
 Optional_fields=Optional_fields
 
-Options=Options
+Options=\u00cf\u00e0\u00f0\u00e0\u00ec\u00e5\u00f2\u00f0\u00fb
 
 or=or
 
@@ -1183,9 +1145,9 @@ Overwrite_existing_field_values=Overwrite_existing_field_values
 Overwrite_keys=Overwrite_keys
 
 pairs_processed=pairs_processed
-Password_\:=Password:
+Password_\:=Password_\:
 
-Paste=Paste
+Paste=\u00c2\u00f1\u00f2\u00e0\u00e2\u00e8\u00f2\u00fc
 
 paste_entries=paste_entries
 
@@ -1211,8 +1173,6 @@ Personal_journal_list=Personal_journal_list
 
 Plain_text_import=Plain_text_import
 
-Please_check_your_network_connection_to_this_machine.=Please_check_your_network_connection_to_this_machine.
-
 Please_enter_a_name_for_the_group.=Please_enter_a_name_for_the_group.
 
 Please_enter_a_search_term._For_example,_to_search_all_fields_for_<b>Smith</b>,_enter%c<p><tt>smith</tt><p>To_search_the_field_<b>Author</b>_for_<b>Smith</b>_and_the_field_<b>Title</b>_for_<b>electrical</b>,_enter%c<p><tt>author%esmith_and_title%eelectrical</tt>=Please_enter_a_search_term._For_example,_to_search_all_fields_for_<b>Smith</b>,_enter%c<p><tt>smith</tt><p>To_search_the_field_<b>Author</b>_for_<b>Smith</b>_and_the_field_<b>Title</b>_for_<b>electrical</b>,_enter%c<p><tt>author% [...]
@@ -1221,8 +1181,6 @@ Please_enter_the_field_to_search_(e.g._<b>keywords</b>)_and_the_keyword_to_searc
 
 Please_enter_the_string's_label=Please_enter_the_string's_label
 
-Please_select_an_importer=Please_select_an_importer
-
 Please_select_an_importer.=Please_select_an_importer.
 
 Please_select_exactly_one_group_to_move.=Please_select_exactly_one_group_to_move.
@@ -1234,7 +1192,7 @@ Possible_duplicate_of_existing_entry._Click_to_resolve.=Possible_duplicate_of_ex
 
 Preamble=Preamble
 
-Preferences=Preferences
+Preferences=\u00cd\u00e0\u00f1\u00f2\u00f0\u00ee\u00e9\u00ea\u00e8
 
 Preferences_recorded.=Preferences_recorded.
 
@@ -1251,7 +1209,7 @@ Processing_=Processing_
 Program_output=Program_output
 
 PS_directory=PS_directory
-Push_entries_to_external_application_(%0)=Push_entries_to_external_application_(%0)
+Push_entries_to_external_application_(%0)=\u00cf\u00e5\u00f0\u00e5\u00e4\u00e0\u00f2\u00fc_\u00e7\u00e0\u00ef\u00e8\u00f1\u00e8_\u00e2\u00ee_\u00e2\u00ed\u00e5\u00f8\u00ed\u00e5\u00e5_\u00ef\u00f0\u00e8\u00eb\u00ee\u00e6\u00e5\u00ed\u00e8\u00e5_(%0)
 
 Push_selection_to_Emacs=Push_selection_to_Emacs
 
@@ -1280,14 +1238,14 @@ Really_delete_the_selected=Really_delete_the_selected
 
 Rearrange_tabs_alphabetically_by_title=Rearrange_tabs_alphabetically_by_title
 
-Redo=Redo
+Redo=\u00ce\u00f2\u00ec\u00e5\u00ed\u00e0
 
 Reference_database=Reference_database
 
 #Thenexttwolinesareusedlikein"Referencesfound:1Numberofreferencestofetch?"
 References_found=References_found
 
-Refine_supergroup\:_When_selected,_view_entries_contained_in_both_this_group_and_its_supergroup=Refine_supergroup:_When_selected,_view_entries_contained_in_both_this_group_and_its_supergroup
+Refine_supergroup\:_When_selected,_view_entries_contained_in_both_this_group_and_its_supergroup=Refine_supergroup\:_When_selected,_view_entries_contained_in_both_this_group_and_its_supergroup
 
 Refresh_view=Refresh_view
 
@@ -1303,7 +1261,7 @@ Remove=Remove
 
 Remove_all?=Remove_all?
 
-Remove_all_subgroups=Remove_subgroups
+Remove_all_subgroups=Remove_all_subgroups
 
 Remove_all_subgroups_of_"%0"?=Remove_all_subgroups_of_"%0"?
 
@@ -1352,11 +1310,9 @@ Removed_string=Removed_string
 
 Renamed_string=Renamed_string
 
-Replace=Replace
-
 Replace_(regular_expression)=Replace_(regular_expression)
 
-Replace_string=Replace_string
+Replace_string=\u00c7\u00e0\u00ec\u00e5\u00ed\u00e8\u00f2\u00fc_\u00f1\u00f2\u00f0\u00ee\u00ea\u00f3
 
 Replace_with=Replace_with
 
@@ -1365,7 +1321,7 @@ Replaced=Replaced
 Required_fields=Required_fields
 
 Reset_all=Reset_all
-Reset_file_type_definitons=Reset_file_type_definitions
+Reset_file_type_definitons=Reset_file_type_definitons
 
 Resolve_strings_for_all_fields_except=Resolve_strings_for_all_fields_except
 Resolve_strings_for_standard_BibTeX_fields_only=Resolve_strings_for_standard_BibTeX_fields_only
@@ -1381,7 +1337,6 @@ Review=Review
 Review_changes=Review_changes
 
 Right=Right
-root=root
 
 Save=Save
 Save_all_finished.=Save_all_finished.
@@ -1390,8 +1345,8 @@ Save_all_open_databases=Save_all_open_databases
 
 Save_before_closing=Save_before_closing
 
-Save_database=Save_database
-Save_database_as_...=Save_database_as_...
+Save_database=\u00d1\u00ee\u00f5\u00f0\u00e0\u00ed\u00e8\u00f2\u00fc_\u00c1\u00c4
+Save_database_as_...=\u00d1\u00ee\u00f5\u00f0\u00e0\u00ed\u00e8\u00f2\u00fc_\u00c1\u00c4_\u00ea\u00e0\u00ea...
 
 Save_entries_in_their_original_order=Save_entries_in_their_original_order
 
@@ -1402,7 +1357,7 @@ Save_failed_during_backup_creation=Save_failed_during_backup_creation
 Save_failed_while_committing_changes=Save_failed_while_committing_changes
 
 Save_ordered_by_author/editor/year=Save_ordered_by_author/editor/year
-Save_selected_as_...=Save_selected_as_...
+Save_selected_as_...=\u00d1\u00ee\u00f5\u00f0\u00e0\u00ed\u00e8\u00f2\u00fc_\u00e2\u00fb\u00e1\u00f0\u00e0\u00ed\u00ed\u00ee\u00e5_\u00ea\u00e0\u00ea_...
 
 Saved_database=Saved_database
 
@@ -1419,8 +1374,6 @@ Scan=Scan
 
 Search=Search
 
-Search_All_Fields=Search_All_Fields
-
 Search_all_fields=Search_all_fields
 
 Search_error=Search_error
@@ -1431,14 +1384,13 @@ Search_for=Search_for
 
 Search_general_fields=Search_general_fields
 
-Search_IEEEXplore=Search_IEEEXplore
-Search_IEEExplore=Search_IEEExplore
+Search_IEEEXplore=\u00cf\u00ee\u00e8\u00f1\u00ea_IEEEXplore
 
 Search_optional_fields=Search_optional_fields
 
 Search_required_fields=Search_required_fields
 
-Search_Specified_Field(s)=Search_Specified_Field(s)
+Search_specified_field(s)=Search_specified_field(s)
 
 Searched_database._Global_number_of_hits=Searched_database._Global_number_of_hits
 
@@ -1458,7 +1410,7 @@ Select_a_Zip-archive=Select_a_Zip-archive
 
 Select_action=Select_action
 
-Select_all=Select_all
+Select_all=\u00c2\u00fb\u00e1\u00f0\u00e0\u00f2\u00fc_\u00e2\u00f1\u00e5
 
 Select_Classpath_of_New_Importer=Select_Classpath_of_New_Importer
 
@@ -1480,10 +1432,8 @@ Select_new_ImportFormat_Subclass=Select_new_ImportFormat_Subclass
 
 Select_the_tree_nodes_to_view_and_accept_or_reject_changes=Select_the_tree_nodes_to_view_and_accept_or_reject_changes
 Selected_entries=Selected_entries
-
-Selector_enabled_fields=Selector_enabled_fields
-Server_Hostname_\:=Server_Hostname:
-Server_Type_\:=Server_Type:
+Server_Hostname_\:=Server_Hostname_\:
+Server_Type_\:=Server_Type_\:
 Set_field=Set_field
 Set_fields=Set_fields
 
@@ -1529,7 +1479,7 @@ Show_one_less_rows=Show_one_less_rows
 
 Show_one_more_row=Show_one_more_row
 
-Show_optional_fields=Show_optional_field
+Show_optional_fields=Show_optional_fields
 
 Show_PDF/PS_column=Show_PDF/PS_column
 
@@ -1553,7 +1503,7 @@ Skipped_entry.=Skipped_entry.
 
 Sort_alphabetically=Sort_alphabetically
 
-Sort_Automatically=Sort_automatically
+Sort_Automatically=Sort_Automatically
 
 Sort_order=Sort_order
 
@@ -1618,15 +1568,11 @@ Tertiary_sort_criterion=Tertiary_sort_criterion
 
 Test=Test
 
-Text_Input_Area=paste_text_here
-
-The_#_character_is_not_allowed_in_BibTeX_fields=The_#_character_is_not_allowed_in_BibTeX_fields
+Text_Input_Area=Text_Input_Area
 
 The_chosen_date_format_for_new_entries_is_not_valid=The_chosen_date_format_for_new_entries_is_not_valid
 
-The_chosen_encoding_'%0'_could_not_encode_the_following_characters\:_=The_chosen_encoding_'%0'_could_not_encode_the_following_characters:_
-
-The_CiteSeer_fetch_operation_returned_zero_results.=The_CiteSeerX_fetch_operation_returned_zero_results.
+The_chosen_encoding_'%0'_could_not_encode_the_following_characters\:_=The_chosen_encoding_'%0'_could_not_encode_the_following_characters\:_
 
 
 The_current_version_features_a_new_way_of_handling_links_to_external_files.<br>To_take_advantage_of_this,_your_links_must_be_changed_into_the_new_format,_and<br>JabRef_must_be_configured_to_show_the_new_links.=The_current_version_features_a_new_way_of_handling_links_to_external_files.<br>To_take_advantage_of_this,_your_links_must_be_changed_into_the_new_format,_and<br>JabRef_must_be_configured_to_show_the_new_links.
@@ -1646,7 +1592,7 @@ The_label_of_the_string_can_not_contain_the_'#'_character.=The_label_of_the_stri
 The_output_option_depends_on_a_valid_import_option.=The_output_option_depends_on_a_valid_import_option.
 The_PDF_contains_one_or_several_bibtex-records.\nDo_you_want_to_import_these_as_new_entries_into_the_current_database?=The_PDF_contains_one_or_several_bibtex-records.\nDo_you_want_to_import_these_as_new_entries_into_the_current_database?
 
-The_regular_expression_<b>%0</b>_is_invalid%c=The_Regular_Expression_<b>%0</b>_is_invalid%c
+The_regular_expression_<b>%0</b>_is_invalid%c=The_regular_expression_<b>%0</b>_is_invalid%c
 
 The_search_is_case_insensitive.=The_search_is_case_insensitive.
 
@@ -1655,8 +1601,6 @@ The_search_is_case_sensitive.=The_search_is_case_sensitive.
 The_string_has_been_removed_locally=The_string_has_been_removed_locally
 
 There_are_possible_duplicates_(marked_with_a_'D'_icon)_that_haven't_been_resolved._Continue?=There_are_possible_duplicates_(marked_with_a_'D'_icon)_that_haven't_been_resolved._Continue?
-
-this_button_will_update=this_button_will_update
 This_database_was_written_using_an_older_version_of_JabRef.=This_database_was_written_using_an_older_version_of_JabRef.
 
 This_entry_has_no_BibTeX_key._Generate_key_now?=This_entry_has_no_BibTeX_key._Generate_key_now?
@@ -1671,15 +1615,13 @@ This_group_contains_entries_based_on_manual_assignment._Entries_can_be_assigned_
 
 This_group_contains_entries_in_which=This_group_contains_entries_in_which
 
-This_group_contains_entries_in_which_any_field_contains_the_regular_expression_<b>%0</b>=This_group_contains_entries_in_which_any_field_contains_the_Regular_Expression_<b>%0</b> 
+This_group_contains_entries_in_which_any_field_contains_the_regular_expression_<b>%0</b>=This_group_contains_entries_in_which_any_field_contains_the_regular_expression_<b>%0</b>
 
-This_group_contains_entries_in_which_any_field_contains_the_term_<b>%0</b>=This_group_contains_entries_in_which_any_field_contains_the_term_<b>%0</b> 
+This_group_contains_entries_in_which_any_field_contains_the_term_<b>%0</b>=This_group_contains_entries_in_which_any_field_contains_the_term_<b>%0</b>
 
-This_group_contains_entries_whose_<b>%0</b>_field_contains_the_keyword_<b>%1</b>=This_group_contains_entries_whose_<b>%0</b>_field_contains_the_keyword_<b>%1</b> 
+This_group_contains_entries_whose_<b>%0</b>_field_contains_the_keyword_<b>%1</b>=This_group_contains_entries_whose_<b>%0</b>_field_contains_the_keyword_<b>%1</b>
 
-This_group_contains_entries_whose_<b>%0</b>_field_contains_the_regular_expression_<b>%1</b>=This_group_contains_entries_whose_<b>%0</b>_field_contains_the_Regular_Expression_<b>%1</b> 
-
-This_is_a_simple_copy_and_paste_dialog_for_import_some_fields_from_normal_text.=This_is_a_simple_copy_and_paste_dialog_for_import_some_fields_from_normal_text.
+This_group_contains_entries_whose_<b>%0</b>_field_contains_the_regular_expression_<b>%1</b>=This_group_contains_entries_whose_<b>%0</b>_field_contains_the_regular_expression_<b>%1</b>
 This_makes_JabRef_look_up_each_%0_link_and_check_if_the_file_exists._If_not,_you_will_be_given_options<BR>to_resolve_the_problem.=This_makes_JabRef_look_up_each_%0_link_and_check_if_the_file_exists._If_not,_you_will_be_given_options<BR>to_resolve_the_problem.
 
 This_operation_requires_all_selected_entries_to_have_BibTex_keys_defined.=This_operation_requires_all_selected_entries_to_have_BibTex_keys_defined.
@@ -1687,13 +1629,11 @@ This_operation_requires_at_least_one_entry.=This_operation_requires_at_least_one
 
 This_operation_requires_one_or_more_entries_to_be_selected.=This_operation_requires_one_or_more_entries_to_be_selected.
 
-This_will_move_all_external_links_from_the_'pdf'_and_'ps'_fields_into_the_'%0'_field._Proceed?=This_will_move_all_external_links_from_the_'pdf'_and_'ps'_fields_into_the_'%0'_field._Proceed?
-
-To_set_up,_go_to_<B>Tools_->_Manage_journal_abbreviations</B>=To_set_up,_go_to_<B>Options_->_Manage_journal_abbreviations</B>
+To_set_up,_go_to_<B>Tools_->_Manage_journal_abbreviations</B>=To_set_up,_go_to_<B>Tools_->_Manage_journal_abbreviations</B>
 
 Toggle_abbreviation=Toggle_abbreviation
-Toggle_entry_preview=Toggle_entry_preview
-Toggle_groups_interface=Toggle_groups_interface
+Toggle_entry_preview=\u00cf\u00e5\u00f0\u00e5\u00ea\u00eb\u00fe\u00f7\u00e8\u00f2\u00fc_\u00ef\u00f0\u00ee\u00f1\u00ec\u00ee\u00f2\u00f0_\u00e7\u00e0\u00ef\u00e8\u00f1\u00e8
+Toggle_groups_interface=\u00cf\u00e5\u00f0\u00e5\u00ea\u00eb\u00fe\u00f7\u00e8\u00f2\u00fc_\u00e8\u00ed\u00f2\u00e5\u00f0\u00f4\u00e5\u00e9\u00f1_\u00e3\u00f0\u00f3\u00ef\u00ef
 Toggle_search_panel=Toggle_search_panel
 
 Try_different_encoding=Try_different_encoding
@@ -1702,8 +1642,6 @@ Type_set_to_'other'=Type_set_to_'other'
 Unabbreviate_journal_names_of_the_selected_entries=Unabbreviate_journal_names_of_the_selected_entries
 Unabbreviated_%0_journal_names.=Unabbreviated_%0_journal_names.
 
-unable_to_access_LyX-pipe=unable_to_access_LyX-pipe
-
 Unable_to_create_graphical_interface=Unable_to_create_graphical_interface
 
 Unable_to_open_file.=Unable_to_open_file.
@@ -1726,9 +1664,9 @@ unknown_entry_type=unknown_entry_type
 
 Unknown_export_format=Unknown_export_format
 
-Unmark_all=Unmark_all
+Unmark_all=\u00d1\u00ed\u00ff\u00f2\u00fc_\u00e2\u00f1\u00e5_\u00ec\u00e5\u00f2\u00ea\u00e8
 
-Unmark_entries=Unmark_entries
+Unmark_entries=\u00d1\u00ed\u00ff\u00f2\u00fc_\u00ec\u00e5\u00f2\u00ea\u00e8_\u00e7\u00e0\u00ef\u00e8\u00f1\u00e5\u00e9
 
 Unmark_entry=Unmark_entry
 
@@ -1738,7 +1676,7 @@ Unpack_EndNote_filter_set=Unpack_EndNote_filter_set
 
 Unpacked_file.=Unpacked_file.
 
-Unsupported_version_of_class_%0\:_%1=Unsupported_version_of_class_%0:_%1
+Unsupported_version_of_class_%0\:_%1=Unsupported_version_of_class_%0\:_%1
 
 untitled=untitled
 
@@ -1747,7 +1685,6 @@ Up=Up
 Update_to_current_column_widths=Update_to_current_column_widths
 
 Updated_group_selection=Updated_group_selection
-Upgrade_external_links=Upgrade_external_links
 Upgrade_external_PDF/PS_links_to_use_the_'%0'_field.=Upgrade_external_PDF/PS_links_to_use_the_'%0'_field.
 Upgrade_file=Upgrade_file
 Upgrade_old_external_file_links_to_use_the_new_feature=Upgrade_old_external_file_links_to_use_the_new_feature
@@ -1757,10 +1694,7 @@ Upper_Each_First=Upper_Each_First
 Upper_first=Upper_first
 
 usage=usage
-
-Use_antialiasing_font=Use_antialiasing_font
 Use_autocompletion_for_the_following_fields=Use_autocompletion_for_the_following_fields
-Use_custom_icon_theme=Use_custom_icon_theme
 Use_default_viewer=Use_default_viewer
 
 Use_inspection_window_also_when_a_single_entry_is_imported.=Use_inspection_window_also_when_a_single_entry_is_imported.
@@ -1769,10 +1703,8 @@ Use_native_file_dialog=Use_native_file_dialog
 Use_other_look_and_feel=Use_other_look_and_feel
 Use_Regular_Expression_Search=Use_Regular_Expression_Search
 
-Use_regular_expressions=Use_Regular_Expressions
-
-Use_the_following_delimiter_character(s)=Use_the_following_delimiter_character(s)
-Username_\:=Username:
+Use_regular_expressions=Use_regular_expressions
+Username_\:=Username_\:
 
 Value_cleared_externally=Value_cleared_externally
 
@@ -1780,7 +1712,7 @@ Value_set_externally=Value_set_externally
 
 verify_that_LyX_is_running_and_that_the_lyxpipe_is_valid=verify_that_LyX_is_running_and_that_the_lyxpipe_is_valid
 
-View=View
+View=\u00c2\u00e8\u00e4
 Vim_Server_Name=Vim_Server_Name
 
 Waiting_for_ArXiv...=Waiting_for_ArXiv...
@@ -1790,7 +1722,7 @@ Warn_about_unresolved_duplicates_when_closing_inspection_window=Warn_about_unres
 Warn_before_overwriting_existing_keys=Warn_before_overwriting_existing_keys
 
 Warning=Warning
-Warning\:_could_not_complete_file_repair;_your_file_may_have_been_corrupted._Error_message=Warning:_could_not_complete_file_repair;_your_file_may_have_been_corrupted._Error_message
+Warning\:_could_not_complete_file_repair;_your_file_may_have_been_corrupted._Error_message=Warning\:_could_not_complete_file_repair;_your_file_may_have_been_corrupted._Error_message
 
 Warning_there_is_a_duplicate_key=Warning_there_is_a_duplicate_key
 
@@ -1824,7 +1756,7 @@ Wrote_XMP_to_'%0'.=Wrote_XMP_to_'%0'.
 XMP-annotated_PDF=XMP-annotated_PDF
 XMP_Export_Privacy_Settings=XMP_Export_Privacy_Settings
 XMP_metadata=XMP_metadata
-XMP_metadata_found_in_PDF\:_%0=XMP_metadata_found_in_PDF:_%0
+XMP_metadata_found_in_PDF\:_%0=XMP_metadata_found_in_PDF\:_%0
 You_must_restart_JabRef_for_this_to_come_into_effect.=You_must_restart_JabRef_for_this_to_come_into_effect.
 You_have_changed_the_language_setting.=You_have_changed_the_language_setting.
 
@@ -1843,10 +1775,9 @@ You_must_set_both_BibTeX_key_and_%0_directory=You_must_set_both_BibTeX_key_and_%
 Your_new_key_bindings_have_been_stored.=Your_new_key_bindings_have_been_stored.
 
 
-The_following_fetchers_are_available\:=The_following_fetchers_are_available:
+The_following_fetchers_are_available\:=The_following_fetchers_are_available\:
 Could_not_find_fetcher_'%0'=Could_not_find_fetcher_'%0'
 Running_Query_'%0'_with_fetcher_'%1'.=Running_Query_'%0'_with_fetcher_'%1'.
-Please_wait!=Please_wait!
 Query_'%0'_with_fetcher_'%1'_did_not_return_any_results.=Query_'%0'_with_fetcher_'%1'_did_not_return_any_results.
 Open_SPIRES_entry=Open_SPIRES_entry
 Move/Rename_file=Move/Rename_file
@@ -1854,10 +1785,9 @@ File_moved=File_moved
 Move_file_failed=Move_file_failed
 Could_not_move_file=Could_not_move_file
 Could_not_find_file_'%0'.=Could_not_find_file_'%0'.
-Move/rename_file=Move/rename_file
 Number_of_entries_successfully_imported=Number_of_entries_successfully_imported
 Import_canceled_by_user=Import_canceled_by_user
-Progress\:_%0_of_%1=Progress:_%0_of_%1
+Progress\:_%0_of_%1=Progress\:_%0_of_%1
 Error_while_fetching_from_JSTOR=Error_while_fetching_from_JSTOR
 
 Fetching_Medline_by_id...=Fetching_Medline_by_id...
@@ -1868,8 +1798,8 @@ Please_enter_a_valid_number=Please_enter_a_valid_number
 Please_enter_a_comma_separated_list_of_Medline_IDs_(numbers)_or_search_terms.=Please_enter_a_comma_separated_list_of_Medline_IDs_(numbers)_or_search_terms.
 An_Error_occurred_while_fetching_from_SPIRES_source_(%0)\:=An_Error_occurred_while_fetching_from_SPIRES_source_(%0)\:
 Error_while_fetching_from_Spires\:_=Error_while_fetching_from_Spires\:_
-Connect_to_external_SQL_database=Connect_to_external_SQL_database
-Export_to_external_SQL_database=Export_to_external_SQL_database
+Connect_to_external_SQL_database=\u00cf\u00ee\u00e4\u00ea\u00eb\u00fe\u00f7\u00e5\u00ed\u00e8\u00e5_\u00ea_\u00e2\u00ed\u00e5\u00f8\u00ed\u00e5\u00e9_\u00c1\u00c4_SQL
+Export_to_external_SQL_database=\u00dd\u00ea\u00f1\u00ef\u00ee\u00f0\u00f2_\u00e2\u00ee_\u00e2\u00ed\u00e5\u00f8\u00ed\u00fe\u00fe_\u00c1\u00c4_SQL
 
 Show_results_in_dialog=Show_results_in_dialog
 Global_search=Global_search
@@ -1888,7 +1818,7 @@ Unable_to_save_database=Unable_to_save_database
 
 BibTeX_key_generator=BibTeX_key_generator
 Unable_to_open_link.=Unable_to_open_link.
-Search_JSTOR=Search_JSTOR
+Search_JSTOR=\u00cf\u00ee\u00e8\u00f1\u00ea_\u00e2_JSTOR
 Attempting_SQL_import...=Attempting_SQL_import...
 BibO_RDF=BibO_RDF
 HTML_parser=HTML_parser
@@ -1901,14 +1831,12 @@ Note_that_these_settings_are_used_for_the_legacy_<b>pdf</b>_and_<b>ps</b>_fields
 Legacy_file_fields=Legacy_file_fields
 
 This_makes_JabRef_look_up_each_%0_extension_and_check_if_the_file_exists._If_not,_you_will_be_given_options<BR>to_resolve_the_problem.=This_makes_JabRef_look_up_each_%0_extension_and_check_if_the_file_exists._If_not,_you_will_be_given_options<BR>to_resolve_the_problem.
-Run_Fetcher,_e.g._"--fetch\=Medline\:cancer"=Run_Fetcher,_e.g._"--fetch=Medline:cancer"
-
 The_ACM_Digital_Library=The_ACM_Digital_Library
 Reset=Reset
 
 Use_IEEE_LaTeX_abbreviations=Use_IEEE_LaTeX_abbreviations
 The_Guide_to_Computing_Literature=The_Guide_to_Computing_Literature
-Search_ACM_Portal=Search_ACM_Portal
+Search_ACM_Portal=\u00cf\u00ee\u00e8\u00f1\u00ea_\u00ed\u00e0_\u00ef\u00ee\u00f0\u00f2\u00e0\u00eb\u00e5_ACM
 Connection_to_ACM_Portal_failed=Connection_to_ACM_Portal_failed
 
 When_opening_file_link,_search_for_matching_file_if_no_link_is_defined=When_opening_file_link,_search_for_matching_file_if_no_link_is_defined
@@ -1923,7 +1851,7 @@ Bad_Request_'%0'.=Bad_Request_'%0'.
 Mark_entries_imported_into_an_existing_database=Mark_entries_imported_into_an_existing_database
 Unmark_all_entries_before_importing_new_entries_into_an_existing_database=Unmark_all_entries_before_importing_new_entries_into_an_existing_database
 
-Forward=Forward
+Forward=\u00c2\u00ef\u00e5\u00f0\u00e5\u00e4
 Back=Back
 Sort_the_following_fields_as_numeric_fields=Sort_the_following_fields_as_numeric_fields
 Line_%0\:_Found_corrupted_BibTeX-key.=Line_%0\:_Found_corrupted_BibTeX-key.
@@ -1937,8 +1865,8 @@ Full_text_article_download_failed=Full_text_article_download_failed
 Update_to_current_column_order=Update_to_current_column_order
 
 Rename_field=Rename_field
-Set/clear/rename_fields=Set/clear/rename_fields
-Rename_field_to\:=Rename_field_to_\:
+Set/clear/rename_fields=\u00c7\u00e0\u00e4\u00e0\u00f2\u00fc/\u00ee\u00f7\u00e8\u00f1\u00f2\u00e8\u00f2\u00fc/\u00ef\u00e5\u00f0\u00e5\u00e8\u00ec\u00e5\u00ed\u00ee\u00e2\u00e0\u00f2\u00fc_\u00ef\u00ee\u00eb\u00ff
+Rename_field_to\:=Rename_field_to\:
 Move_contents_of_a_field_into_a_field_with_a_different_name=Move_contents_of_a_field_into_a_field_with_a_different_name
 You_can_only_rename_one_field_at_a_time=You_can_only_rename_one_field_at_a_time
 
@@ -1971,11 +1899,9 @@ Version=Version
 Unknown=Unknown
 Not_loaded=Not_loaded
 Loaded=Loaded
-Could_not_determine_version_of_=Could_not_determine_version_of_
 Install_anyway?=Install_anyway?
 
 Looking_for_full_text_document...=Looking_for_full_text_document...
-Follow_DOI_or_URL_link_and_try_to_locate_PDF_full_text_document=Follow_DOI_or_URL_link_and_try_to_locate_PDF_full_text_document
 Unable_to_find_full_text_article._No_search_algorithm_defined_for_the_'%0'_web_site.=Unable_to_find_full_text_article._No_search_algorithm_defined_for_the_'%0'_web_site.
 Found_pdf_link,_but_received_the_wrong_MIME_type._This_could_indicate_that_you_don't_have_access_to_the_fulltext_article.=Found_pdf_link,_but_received_the_wrong_MIME_type._This_could_indicate_that_you_don't_have_access_to_the_fulltext_article.
 
@@ -1995,8 +1921,8 @@ Autosave_of_file_'%0'=Autosave_of_file_'%0'
 Error_opening_autosave_of_'%0'._Trying_to_load_'%0'_instead.=Error_opening_autosave_of_'%0'._Trying_to_load_'%0'_instead.
 
 
-Plugins_installed_in_your_user_plugin_directory_(%0)\:=Plugins_installed_in_your_user_plugin_directory_(%0):
-Plugins_installed_in_other_locations\:=Plugins_installed_in_other_locations:
+Plugins_installed_in_your_user_plugin_directory_(%0)\:=Plugins_installed_in_your_user_plugin_directory_(%0)\:
+Plugins_installed_in_other_locations\:=Plugins_installed_in_other_locations\:
 Plugins_will_be_deleted_next_time_JabRef_starts_up.=Plugins_will_be_deleted_next_time_JabRef_starts_up.
 Plugin_will_be_deleted_next_time_JabRef_starts_up.=Plugin_will_be_deleted_next_time_JabRef_starts_up.
 Old_plugin_versions_will_be_deleted_next_time_JabRef_starts_up.=Old_plugin_versions_will_be_deleted_next_time_JabRef_starts_up.
@@ -2023,8 +1949,6 @@ Before_saving,_please_edit_any_strings_containing_the_#_character.=Before_saving
 
 Save_without_backup?=Save_without_backup?
 Unable_to_create_backup=Unable_to_create_backup
-
-File_directory_is_not_set_or_does_not_exist.=File_directory_is_not_set_or_does_not_exist.
 Move_file_to_file_directory.=Move_file_to_file_directory.
 Rename_file_to=Rename_file_to
 <b>All_Entries</b>_(this_group_cannot_be_edited_or_removed)=<b>All_Entries</b>_(this_group_cannot_be_edited_or_removed)
@@ -2039,13 +1963,12 @@ Disable_file_renaming_in_non-native_file_dialog=Disable_file_renaming_in_non-nat
 File_dialog=File_dialog
 No_entries_found._It_looks_like_you_do_not_have_access_to_search_JStor.=No_entries_found._It_looks_like_you_do_not_have_access_to_search_JStor.
 
-Search_ScienceDirect=Search_ScienceDirect
+Search_ScienceDirect=\u00cf\u00ee\u00e8\u00f1\u00ea_ScienceDirect
 Error_while_fetching_from_ScienceDirect=Error_while_fetching_from_ScienceDirect
 
 Error_initializing_custom_export_format_from_string_'%0'=Error_initializing_custom_export_format_from_string_'%0'
 BibLaTeX_mode=BibLaTeX_mode
 Optional_fields_2=Optional_fields_2
-Please_wait=Please_wait
 Waiting_for_save_operation_to_finish=Waiting_for_save_operation_to_finish
 Resolving_duplicate_BibTeX_keys...=Resolving_duplicate_BibTeX_keys...
 Finished_resolving_duplicate_BibTeX_keys._%0_entries_modified.=Finished_resolving_duplicate_BibTeX_keys._%0_entries_modified.
@@ -2053,13 +1976,9 @@ This_database_contains_one_or_more_duplicated_BibTeX_keys.=This_database_contain
 Do_you_want_to_resolve_duplicate_keys_now?=Do_you_want_to_resolve_duplicate_keys_now?
 
 Find_and_remove_duplicate_BibTeX_keys=Find_and_remove_duplicate_BibTeX_keys
-Expected_syntax_for_--fetch\='<name_of_fetcher>\:<query>'=Expected_syntax_for_--fetch='<name_of_fetcher>:<query>'
-Duplicate_BibTeX_key=Duplicate_BibTeX_key
 Duplicate_key=Duplicate_key
 Generate_key=Generate_key
 Import_marking_color=Import_marking_color
-
-%0_entries_found._To_reduce_server_load,_only_%1_will_be_downloaded._It_will_be_very_slow,_in_order_to_make_ACM_happy.=%0_entries_found._To_reduce_server_load,_only_%1_will_be_downloaded._It_will_be_very_slow,_in_order_to_make_ACM_happy.
 BibTeX_importer=BibTeX_importer
 Always_add_letter_(a,_b,_...)_to_generated_keys=Always_add_letter_(a,_b,_...)_to_generated_keys
 
@@ -2076,21 +1995,19 @@ An_autosave_file_was_found_for_this_database._This_could_indicate_=An_autosave_f
 that_JabRef_didn't_shut_down_cleanly_last_time_the_file_was_used.=that_JabRef_didn't_shut_down_cleanly_last_time_the_file_was_used.
 General_file_directory=General_file_directory
 User-specific_file_directory=User-specific_file_directory
-Error_setting_look_and_feel=Error_setting_look_and_feel
-Search_failed\:_illegal_search_expression=Search_failed:_illegal_search_expression
+Search_failed\:_illegal_search_expression=Search_failed\:_illegal_search_expression
 Show_ArXiv_column=Show_ArXiv_column
 <HTML>Unpack_the_zip_file_containing_import/export_filters_for_Endnote,<BR>for_optimal_interoperability_with_JabRef</HTML>=<HTML>Unpack_the_zip_file_containing_import/export_filters_for_Endnote,<BR>for_optimal_interoperability_with_JabRef</HTML>
 Highlight_groups_that_contain_entries_contained_in_any_currently_selected_group=Highlight_groups_that_contain_entries_contained_in_any_currently_selected_group
 
 You_must_enter_an_integer_value_in_the_interval_1025-65535_in_the_text_field_for=You_must_enter_an_integer_value_in_the_interval_1025-65535_in_the_text_field_for
 Automatically_open_browse_dialog_when_creating_new_file_link=Automatically_open_browse_dialog_when_creating_new_file_link
-Import_Metadata_from\:=Import_metadata_from:
+Import_Metadata_from\:=Import_Metadata_from\:
 Choose_the_source_for_the_metadata_import=Choose_the_source_for_the_metadata_import
 Create_entry_based_on_XMP_data=Create_entry_based_on_XMP_data
 Create_entry_based_on_data_fetched_from=Create_entry_based_on_data_fetched_from
 Create_blank_entry_linking_the_PDF=Create_blank_entry_linking_the_PDF
 Only_attach_PDF=Only_attach_PDF
-Mr._dLib_Metadata_Entries_Associated_With\:=Mr._dLib_Metadata_Entries_Associated_With:
 Mr._dLib_Metadata_Entries_Associated_With_PDF_File=Mr._dLib_Metadata_Entries_Associated_With_PDF_File
 Title=Title
 Author(s)=Author(s)
@@ -2099,31 +2016,28 @@ No_metadata_found.=No_metadata_found.
 Mr._dLib_web_service_is_temporarily_unavailable.=Mr._dLib_web_service_is_temporarily_unavailable.
 Mr._dLib_web_service_is_temporarily_down._Please_try_again_later.=Mr._dLib_web_service_is_temporarily_down._Please_try_again_later.
 You_are_not_connected_to_the_Internet._To_access_Mr._dLib_web_service_an_internet_connection_is_needed.=You_are_not_connected_to_the_Internet._To_access_Mr._dLib_web_service_an_internet_connection_is_needed.
-No_Internet_Connection.=_No_Internet_Connection.
-This_JabRef_version_is_trying_to_access_an_old_version_of_Mr._dLib's_webservice_that_is_not_working_any_more.\nPlease_visit_http\://jabref.sourceforge.net_or_http\://www.mr-dlib.org_for_more_information_and_updates.=This_JabRef_version_is_trying_to_access_an_old_version_of_Mr._dLib's_webservice_that_is_not_working_any_more.\nPlease_visit_http://jabref.sourceforge.net_or_http://www.mr-dlib.org_for_more_information_and_updates.
+No_Internet_Connection.=No_Internet_Connection.
+This_JabRef_version_is_trying_to_access_an_old_version_of_Mr._dLib's_webservice_that_is_not_working_any_more.\nPlease_visit_http\://jabref.sourceforge.net_or_http\://www.mr-dlib.org_for_more_information_and_updates.=This_JabRef_version_is_trying_to_access_an_old_version_of_Mr._dLib's_webservice_that_is_not_working_any_more.\nPlease_visit_http\://jabref.sourceforge.net_or_http\://www.mr-dlib.org_for_more_information_and_updates.
 Web_Service_Version_Outdated=Web_Service_Version_Outdated
 The_Mr._dLib_web_service_version_you_trying_to_access_is_outdated.=The_Mr._dLib_web_service_version_you_trying_to_access_is_outdated.
 Update_empty_fields_with_data_fetched_from=Update_empty_fields_with_data_fetched_from
 Create_New_Entry=Create_New_Entry
 Update_Existing_Entry=Update_Existing_Entry
 Mr._dLib=Mr._dLib
-More_information=More_Information
+More_information=More_information
 Fetching_Metadata...=Fetching_Metadata...
-Metadata=Metadata
 Autocomplete_names_in_'Firstname_Lastname'_format_only=Autocomplete_names_in_'Firstname_Lastname'_format_only
 Autocomplete_names_in_'Lastname,_Firstname'_format_only=Autocomplete_names_in_'Lastname,_Firstname'_format_only
 Autocomplete_names_in_both_formats=Autocomplete_names_in_both_formats
 Marking_color_%0=Marking_color_%0
 The_name_'comment'_can_not_be_used_as_an_entry_type_name.=The_name_'comment'_can_not_be_used_as_an_entry_type_name.
 You_must_enter_an_integer_value_in_the_text_field_for=You_must_enter_an_integer_value_in_the_text_field_for
-File_directory=File_directory
 Send_as_email=Send_as_email
 References=References
 Sending_of_emails=Sending_of_emails
 Subject_for_sending_an_email_with_references=Subject_for_sending_an_email_with_references
 Automatically_open_folders_of_attached_files=Automatically_open_folders_of_attached_files
 Create_entry_based_on_content=Create_entry_based_on_content
-Store_choice_as_default=Store_choice_as_default
 Do_not_show_this_box_again_for_this_import=Do_not_show_this_box_again_for_this_import
 Always_use_this_PDF_import_style_(and_do_not_ask_for_each_import)=Always_use_this_PDF_import_style_(and_do_not_ask_for_each_import)
 Error_creating_email=Error_creating_email
@@ -2142,14 +2056,13 @@ Wrong_Format=Wrong_Format
 Path_to_gnuclient_or_emacsclient=Path_to_gnuclient_or_emacsclient
 Additional_parameters=Additional_parameters
 Encrypted_documents_are_not_supported=Encrypted_documents_are_not_supported
-Cite_selected_entries=Cite_selected_entries_between_parenthesis
+Cite_selected_entries=Cite_selected_entries
 Cite_selected_entries_with_in-text_citation=Cite_selected_entries_with_in-text_citation
 Cite_special=Cite_special
 Extra_information_(e.g._page_number)=Extra_information_(e.g._page_number)
 Manage_citations=Manage_citations
 Problem_modifying_citation=Problem_modifying_citation
 Citation=Citation
-Context=Context
 Extra_information=Extra_information
 Could_not_resolve_BibTeX_entry_for_citation_marker_'%0'.=Could_not_resolve_BibTeX_entry_for_citation_marker_'%0'.
 Styles=Styles
@@ -2175,12 +2088,10 @@ Combine_pairs_of_citations_that_are_separated_by_spaces_only=Combine_pairs_of_ci
 Autodetection_failed=Autodetection_failed
 Connecting=Connecting
 Please_wait...=Please_wait...
-Unable_to_connect=Unable_to_connect
 Set_connection_parameters=Set_connection_parameters
 Path_to_OpenOffice_directory=Path_to_OpenOffice_directory
 Path_to_OpenOffice_executable=Path_to_OpenOffice_executable
 Path_to_OpenOffice_library_dir=Path_to_OpenOffice_library_dir
-Autodetect=Autodetect
 Connection_lost=Connection_lost
 The_paragraph_format_is_controlled_by_the_property_'ReferenceParagraphFormat'_or_'ReferenceHeaderParagraphFormat'_in_the_style_file.=The_paragraph_format_is_controlled_by_the_property_'ReferenceParagraphFormat'_or_'ReferenceHeaderParagraphFormat'_in_the_style_file.
 The_character_format_is_controlled_by_the_citation_property_'CitationCharacterFormat'_in_the_style_file.=The_character_format_is_controlled_by_the_citation_property_'CitationCharacterFormat'_in_the_style_file.
@@ -2193,7 +2104,7 @@ Autodetecting_paths...=Autodetecting_paths...
 Unable_to_autodetect_OpenOffice_installation._Please_choose_the_installation_directory_manually.=Unable_to_autodetect_OpenOffice_installation._Please_choose_the_installation_directory_manually.
 Could_not_find_OpenOffice_installation=Could_not_find_OpenOffice_installation
 Directories=Directories
-Found_more_than_one_OpenOffice_executable._Please_choose_which_one_to_connect_to\:=Found_more_than_one_OpenOffice_executable._Please_choose_which_one_to_connect_to:
+Found_more_than_one_OpenOffice_executable._Please_choose_which_one_to_connect_to\:=Found_more_than_one_OpenOffice_executable._Please_choose_which_one_to_connect_to\:
 Choose_OpenOffice_executable=Choose_OpenOffice_executable
 Select_document=Select_document
 Edit_Group_Membership=Edit_Group_Membership
@@ -2204,17 +2115,14 @@ JSTOR_import_cancelled=JSTOR_import_cancelled
 HTML_list=HTML_list
 Click_group_to_toggle_membership_of_selected_entries=Click_group_to_toggle_membership_of_selected_entries
 Use_EMACS_23_insertion_string=Use_EMACS_23_insertion_string
-
-Normalize_to_BibTeX_name_format=Normalize_to_BibTeX_name_format
 If_possible,_normalize_this_list_of_names_to_conform_to_standard_BibTeX_name_formatting=If_possible,_normalize_this_list_of_names_to_conform_to_standard_BibTeX_name_formatting
 Could_not_open_%0=Could_not_open_%0
 Unknown_import_format=Unknown_import_format
 Open_INSPIRE_entry=Open_INSPIRE_entry
 An_Error_occurred_while_fetching_from_INSPIRE_source_(%0)\:=An_Error_occurred_while_fetching_from_INSPIRE_source_(%0)\:
 Error_while_fetching_from_Inspire\:_=Error_while_fetching_from_Inspire\:_
-Web_search=Web_search
+Web_search=\u00c2\u00e5\u00e1-\u00ef\u00ee\u00e8\u00f1\u00ea
 Autocomplete_names=Autocomplete_names
-You_must_select_either_a_valid_style_file,_or_use_the_default_style.=You_must_select_either_a_valid_style_file,_or_use_the_default_style.
 Default_style=Default_style
 Choose_style_file_directly=Choose_style_file_directly
 Choose_from_a_directory=Choose_from_a_directory
@@ -2238,7 +2146,7 @@ You_must_select_either_a_valid_style_file,_or_use_a_default_style.=You_must_sele
 Show=Show
 
 This_is_a_simple_copy_and_paste_dialog._First_load_or_paste_some_text_into_the_text_input_area.<br>After_that,_you_can_mark_text_and_assign_it_to_a_BibTeX_field.=This_is_a_simple_copy_and_paste_dialog._First_load_or_paste_some_text_into_the_text_input_area.<br>After_that,_you_can_mark_text_and_assign_it_to_a_BibTeX_field.
-Java_Bouncy_Castle_library_not_found._Please_download_and_install_it._For_more_information_see_http\://www.bouncycastle.org/.=Java_Bouncy_Castle_library_not_found._Please_download_and_install_it._For_more_information_see_http://www.bouncycastle.org/.
+Java_Bouncy_Castle_library_not_found._Please_download_and_install_it._For_more_information_see_http\://www.bouncycastle.org/.=Java_Bouncy_Castle_library_not_found._Please_download_and_install_it._For_more_information_see_http\://www.bouncycastle.org/.
 This_feature_generates_a_new_database_based_on_which_entries_are_needed_in_an_existing_LaTeX_document.=This_feature_generates_a_new_database_based_on_which_entries_are_needed_in_an_existing_LaTeX_document.
 You_need_to_select_one_of_your_open_databases_from_which_to_choose_entries,_as_well_as_the_AUX_file_produced_by_LaTeX_when_compiling_your_document.=You_need_to_select_one_of_your_open_databases_from_which_to_choose_entries,_as_well_as_the_AUX_file_produced_by_LaTeX_when_compiling_your_document.
 
@@ -2256,8 +2164,7 @@ Autocompletion_options=Autocompletion_options
 Autocomplete_after_following_number_of_characters=Autocomplete_after_following_number_of_characters
 Name_format_used_for_autocompletion=Name_format_used_for_autocompletion
 Treatment_of_first_names=Treatment_of_first_names
-No_icon_found_for_%0=No_icon_found_for_%0
-Cleanup_entries=Cleanup_entries
+Cleanup_entries=\u00ce\u00f7\u00e8\u00f1\u00f2\u00e8\u00f2\u00fc_\u00e7\u00e0\u00ef\u00e8\u00f1\u00e8
 Automatically_assign_new_entry_to_selected_groups=Automatically_assign_new_entry_to_selected_groups
 
 Move_DOIs_from_note_and_URL_field_to_DOI_field_and_remove_http_prefix=Move_DOIs_from_note_and_URL_field_to_DOI_field_and_remove_http_prefix
@@ -2271,14 +2178,10 @@ Doing_a_cleanup_for_%0_entries...=Doing_a_cleanup_for_%0_entries...
 No_entry_needed_a_clean_up=No_entry_needed_a_clean_up
 One_entry_needed_a_clean_up=One_entry_needed_a_clean_up
 %0_entries_needed_a_clean_up=%0_entries_needed_a_clean_up
-Imported_=Imported_
 Error_importing_from_database=Error_importing_from_database
 %0_databases_will_be_imported=%0_databases_will_be_imported
 Imported_%0_databases_successfully=Imported_%0_databases_successfully
-Minimize_to_system_tray=Minimize_to_system_tray
-
-Incomplete_search_results=Incomplete_search_results
-%0_entries_were_found,_but_only_%1_of_these_could_be_resolved.=%0_entries_were_found,_but_only_%1_of_these_could_be_resolved.
+Minimize_to_system_tray=\u00d1\u00e2\u00e5\u00f0\u00ed\u00f3\u00f2\u00fc_\u00e2_\u00f1\u00e8\u00f1\u00f2\u00e5\u00ec\u00ed\u00fb\u00e9_\u00f2\u00f0\u00e5\u00e9
 
 Error_downloading_file_'%0'=Error_downloading_file_'%0'
 Download_failed=Download_failed
@@ -2289,9 +2192,9 @@ Import_from_SQL_database=Import_from_SQL_database
 <_CREATE_NEW_DATABASE_>=<_CREATE_NEW_DATABASE_>
 Remove_Selected=Remove_Selected
 SQL_Database_Exporter=SQL_Database_Exporter
-Select_target_SQL_database\:=Select_target_SQL_database:
+Select_target_SQL_database\:=Select_target_SQL_database\:
 SQL_Database_Importer=SQL_Database_Importer
-Please_select_which_JabRef_databases_do_you_want_to_import\:=Please_select_which_JabRef_databases_do_you_want_to_import:
+Please_select_which_JabRef_databases_do_you_want_to_import\:=Please_select_which_JabRef_databases_do_you_want_to_import\:
 
 Group_tree_could_not_be_parsed._If_you_save_the_BibTeX_database,_all_groups_will_be_lost.=Group_tree_could_not_be_parsed._If_you_save_the_BibTeX_database,_all_groups_will_be_lost.
 Attach_file=Attach_file
@@ -2302,10 +2205,9 @@ Unable_to_clear_preferences.=Unable_to_clear_preferences.
 
 Reset_preferences_(key1,key2,..._or_'all')=Reset_preferences_(key1,key2,..._or_'all')
 Find_unlinked_files=Find_unlinked_files
-Select_All=Select_All
-Unselect_All=Unselect_All
-Expand_All=Expand_All
-Collapse_All=Collapse_All
+Unselect_all=Unselect_All
+Expand_all=Expand_All
+Collapse_all=Collapse_All
 Select_Directory=Select_Directory
 Choose_Directory=Choose_Directory
 Use_the_selected_directory_to_start_with_the_search.=Use_the_selected_directory_to_start_with_the_search.
@@ -2313,25 +2215,25 @@ Browse...=Browse...
 Opens_the_file_browser.=Opens_the_file_browser.
 Scan_directory=Scan_directory
 Searches_the_selected_directory_for_unlinked_files.=Searches_the_selected_directory_for_unlinked_files.
-Starts_the_import_of_bibtex_entries.=Starts_the_import_of_BibTeX_entries.
+Starts_the_import_of_bibtex_entries.=Starts_the_import_of_bibtex_entries.
 Leave_this_dialog.=Leave_this_dialog.
 Create_directory_based_keywords=Create_directory_based_keywords
 Creates_keywords_in_created_entrys_with_directory_pathnames=Creates_keywords_in_created_entrys_with_directory_pathnames
 Select_a_directory_where_the_search_shall_start.=Select_a_directory_where_the_search_shall_start.
-Select_file_type\:=Select_file_type:
+Select_file_type\:=Select_file_type\:
 These_files_are_not_linked_in_the_active_database.=These_files_are_not_linked_in_the_active_database.
-Entry_type_to_be_created\:=Entry_type_to_be_created:
+Entry_type_to_be_created\:=Entry_type_to_be_created\:
 Searching_file_system...=Searching_file_system...
 Importing_into_Database...=Importing_into_Database...
 Select_directory=Select_directory
 Select_files=Select_files
-Bibtex_entry_creation=BibTeX_entry_creation
+Bibtex_entry_creation=Bibtex_entry_creation
 <No_selection>=<No_selection>
 Push_selection_to_TeXstudio=Push_selection_to_TeXstudio
 Path_to_TeXstudio=Path_to_TeXstudio
 Program_'%0'_not_found=Program_'%0'_not_found
 Pushed_citations_to_TeXstudio=Pushed_citations_to_TeXstudio
-Unable_to_connect_to_freecite_online_service.=Unable_to_connect_to_FreeCite_online_service.
+Unable_to_connect_to_freecite_online_service.=Unable_to_connect_to_freecite_online_service.
 Parse_with_FreeCite=Parse_with_FreeCite
 Insert_selected_citations_into_TeXstudio=Insert_selected_citations_into_TeXstudio
 The_current_BibTeX_key_will_be_overwritten._Continue?=The_current_BibTeX_key_will_be_overwritten._Continue?
@@ -2340,7 +2242,6 @@ Not_overwriting_existing_key._To_change_this_setting,_open_Options_->_Prefereren
 How_would_you_like_to_link_to_'%0'?=How_would_you_like_to_link_to_'%0'?
 Marked_entries_as_relevant=Marked_entries_as_relevant
 Marked_entries'_quality_as_good=Marked_entries'_quality_as_good
-Set_priority=Set_priority
 no_preview_available=no_preview_available
 Enable_PDF_preview=Enable_PDF_preview
 Show_one_letter_heading_for_icon_columns=Show_one_letter_heading_for_icon_columns
@@ -2396,14 +2297,13 @@ If_a_pasted_or_imported_entry_already_has_the_field_set,_overwrite.=If_a_pasted_
 To_disable_the_memory_stick_mode_rename_or_remove_the_jabref.xml_file_in_the_same_folder_as_JabRef.=To_disable_the_memory_stick_mode_rename_or_remove_the_jabref.xml_file_in_the_same_folder_as_JabRef.
 Please_note_that_this_is_an_early_beta_version._Do_not_use_it_without_backing_up_your_files!=Please_note_that_this_is_an_early_beta_version._Do_not_use_it_without_backing_up_your_files!
 A_string_with_that_label_already_exists=A_string_with_that_label_already_exists
-File_has_been_updated_externally._Are_you_sure_you_want_to_save?=File_has_been_updated_externally._Are_you_sure_you_want_to_save?
 Could_not_connect_to_a_running_gnuserv_process._Make_sure_that_Emacs_or_XEmacs_is_running,<BR>and_that_the_server_has_been_started_(by_running_the_command_'server-start'/'gnuserv-start').=Could_not_connect_to_a_running_gnuserv_process._Make_sure_that_Emacs_or_XEmacs_is_running,<BR>and_that_the_server_has_been_started_(by_running_the_command_'server-start'/'gnuserv-start').
-Use_the_following_delimiter_character(s)\:=Use_the_following_delimiter_character(s):
+Use_the_following_delimiter_character(s)\:=Use_the_following_delimiter_character(s)\:
 Created_group_"%0".=Created_group_"%0".
 Removed_all_subgroups_of_group_"%0".=Removed_all_subgroups_of_group_"%0".
 %0_entries_found._To_reduce_server_load,_only_%1_will_be_downloaded.=%0_entries_found._To_reduce_server_load,_only_%1_will_be_downloaded.
 Unable_to_connect._One_possible_reason_is_that_JabRef_and_OpenOffice/LibreOffice_are_not_both_running_in_either_32_bit_mode_or_64_bit_mode.=Unable_to_connect._One_possible_reason_is_that_JabRef_and_OpenOffice/LibreOffice_are_not_both_running_in_either_32_bit_mode_or_64_bit_mode.
-Could_not_connect_to_running_OpenOffice.\nMake_sure_you_have_installed_OpenOffice_with_Java_support.\nIf_connecting_manually,_please_verify_program_and_library_paths.\n\nError_message\:_=Could_not_connect_to_running_OpenOffice.\nMake_sure_you_have_installed_OpenOffice_with_Java_support.\nIf_connecting_manually,_please_verify_program_and_library_paths.\n\nError_message:_
+Could_not_connect_to_running_OpenOffice.\nMake_sure_you_have_installed_OpenOffice_with_Java_support.\nIf_connecting_manually,_please_verify_program_and_library_paths.\n\nError_message\:_=Could_not_connect_to_running_OpenOffice.\nMake_sure_you_have_installed_OpenOffice_with_Java_support.\nIf_connecting_manually,_please_verify_program_and_library_paths.\n\nError_message\:_
 Not_connected_to_any_Writer_document._Please_make_sure_a_document_is_open,_and_use_the_'Select_Writer_document'_button_to_connect_to_it.=Not_connected_to_any_Writer_document._Please_make_sure_a_document_is_open,_and_use_the_'Select_Writer_document'_button_to_connect_to_it.
 Connection_to_OpenOffice_has_been_lost._Please_make_sure_OpenOffice_is_running,_and_try_to_reconnect.=Connection_to_OpenOffice_has_been_lost._Please_make_sure_OpenOffice_is_running,_and_try_to_reconnect.
 Your_style_file_specifies_the_paragraph_format_'%0',_which_is_undefined_in_your_current_OpenOffice_document.=Your_style_file_specifies_the_paragraph_format_'%0',_which_is_undefined_in_your_current_OpenOffice_document.
@@ -2416,7 +2316,7 @@ Searching...=Searching...
 Error_fetching_from_Google_Scholar=Error_fetching_from_Google_Scholar
 You_have_selected_more_than_%0_entries_for_download._Some_web_sites_might_block_you_if_you_make_too_many_rapid_downloads._Do_you_want_to_continue?=You_have_selected_more_than_%0_entries_for_download._Some_web_sites_might_block_you_if_you_make_too_many_rapid_downloads._Do_you_want_to_continue?
 Confirm_selection=Confirm_selection
-Unknown_DOI\:_'%0'.=Unknown_DOI:_'%0'.
+Unknown_DOI\:_'%0'.=Unknown_DOI\:_'%0'.
 Get_BibTeX_entry_from_DOI=Get_BibTeX_entry_from_DOI
 Prefer_converting_subscripts_and_superscripts_to_equations_rather_than_text=Prefer_converting_subscripts_and_superscripts_to_equations_rather_than_text
 Add_{}_to_specified_title_words_on_search_to_keep_the_correct_case=Add_{}_to_specified_title_words_on_search_to_keep_the_correct_case
@@ -2425,11 +2325,67 @@ Run_filter_on_title_keeping_the_case_of_selected_words=Run_filter_on_title_keepi
 Intermittent_errors_on_the_IEEE_Xplore_server._Please_try_again_in_a_while.=Intermittent_errors_on_the_IEEE_Xplore_server._Please_try_again_in_a_while.
 Please_enter_a_search_string=Please_enter_a_search_string
 Please_open_or_start_a_new_database_before_searching=Please_open_or_start_a_new_database_before_searching
-An_Error_occurred_while_fetching_from_ADS_(%0)\:=An_Error_occurred_while_fetching_from_ADS_(%0):
-Error_while_fetching_from_ADS=Error_while_fetching_from_ADS
-Error_while_fetching_from_OAI2=Error_while_fetching_from_OAI2
-An_Error_occurred_while_parsing_abstract=An_Error_occurred_while_parsing_abstract
-Unknown_DiVA_entry\:_'%0'.=Unknown_DiVA_entry:_'%0'.
-Get_BibTeX_entry_from_DiVA=Get_BibTeX_entry_from_DiVA
-Log=Log
-Remove_unneccessary_$,_{,_and_}=Remove_unneccessary_$,_{,_and_}
+Save_entries_ordered_by_title=
+Export_entries_ordered_by_title=
+Quotes=
+Curly_Brackets=
+Include_empty_fields=
+Field_saving_options=
+Field_value_delimiter._E.g.,_"author\={x}"_or_"author\='x'"=
+Run_Unicode_converter_on_title,_author(s),_and_abstract=
+Clear_connection_settings=
+Cleared_connection_settings.=
+Add_brackets_and_replace_separators_with_their_non-breaking_version_for_units=
+Add_new_entry_and_keep_both_old_entries=
+All_key_bindings_will_be_reset_to_their_defaults.=
+An_Error_occurred_while_fetching_from_ADS_(%0)\:=
+An_Error_occurred_while_parsing_abstract=
+Automatically_set_file_links=
+Cancelled_merging_entries=
+Continue?=
+Database_has_changed._Do_you_want_to_save_before_closing?=
+Duplicate_BibTeX_key=
+Error_in_entry=
+Error_while_fetching_from_ADS=
+Error_while_fetching_from_OAI2=
+Expected_syntax_for_--fetch\='<name_of_fetcher>\:<query>'=
+First_entry=
+Format_units_by_adding_non-breaking_separators_and_keeping_the_correct_case_on_search=
+Get_BibTeX_entry_from_DiVA=
+Host=
+ISO_690=
+Invalid_setting=
+Log=
+Merge_entries=
+Merged_entries_into_a_new_and_kept_the_old=
+Merged_entries_into_a_new_and_removed_the_old=
+Merged_entry=
+Network=
+None=
+Parse=
+Please_specify_both_hostname_and_port=
+Port=
+Rebind_C-a,_too=
+Remove_unneccessary_$,_{,_and_}_and_move_adjacent_numbers_into_equations=
+Replace_old_entries_with_new_entry=
+Resetting_all_key_bindings=
+Result=
+Run_Fetcher,_e.g._"--fetch\=Medline\:cancer"=
+Second_entry=
+Show_DOI_first=
+Show_URL_first=
+Start_field_contents_in_same_column=
+Unknown_DiVA_entry\:_'%0'.=
+Update_timestamp_on_modification=
+Use_1st=
+Use_2nd=
+Use_Emacs_key_bindings=
+Use_camel_case_for_field_names_(e.g.,_"HowPublished"_instead_of_"howpublished")=
+Use_custom_proxy_configuration=
+You_have_to_choose_exactly_two_entries_to_merge.=
+change_field=
+
+Show_number_of_elements_contained_in_each_group=
+
+Open_folder=
+Opened_%0_folder(s).=
diff --git a/src/resource/JabRef_tr.properties b/src/resource/JabRef_tr.properties
index 27ffad4..3b02262 100644
--- a/src/resource/JabRef_tr.properties
+++ b/src/resource/JabRef_tr.properties
@@ -104,7 +104,6 @@ Background_color_for_optional_fields=Se\u00e7meli_alanlar_i\u00e7in_arkaplan_ren
 Background_color_for_required_fields=Zorunlu_alanlar_i\u00e7in_arkaplan_rengi
 Backup_old_file_when_saving=Kaydederken_eski_dosyay\u0131_yedekle
 Beta_version=Beta_s\u00fcr\u00fcm\u00fc
-Bibkey_to_filename_conversion=Bibkey'den_dosya_ad\u0131na_d\u00f6n\u00fc\u015f\u00fcm
 BibTeX_key=BibTeX_anahtar\u0131
 BibTeX_key_is_unique.=BibTeX_anahtar\u0131_benzersizdir.
 BibTeX_key_not_set._Enter_a_name_for_the_downloaded_file=BibTeX_anahtar\u0131_kurulmad\u0131._\u0130ndirilen_dosya_i\u00e7in_bir_isim_giriniz
@@ -114,7 +113,6 @@ Binding=Cilt
 Broken_link=Bozuk_link
 Browse=G\u00f6z_at
 by=ile
-Calling_external_viewer...=Harici_g\u00f6r\u00fcnt\u00fcleyici_\u00e7a\u011fr\u0131l\u0131yor...
 Cancel=\u0130ptal
 Cannot_add_entries_to_group_without_generating_keys._Generate_keys_now?=Anahtarlar_olu\u015fturulmadan_gruba_girdiler_eklenemez._Anahtarlar_olu\u015fturulsun_mu?
 Cannot_merge_this_change=Bu_de\u011fi\u015fiklik_birle\u015ftirilemiyor
@@ -167,7 +165,6 @@ Command_line_id=Komut_sat\u0131r_no
 Complete_record=Tam_kay\u0131t
 Connect=Ba\u011flan
 Connect_to_SQL_database=SQL_veritaban\u0131na_ba\u011flan
-Connect_to_SQL_Database=SQL_Veritaban\u0131na_ba\u011flan
 Connection_to_IEEEXplore_failed=IEEEXplore'a_ba\u011flant\u0131_ba\u015far\u0131s\u0131z
 Contained_in=\u015eunun_i\u00e7inde
 Content=\u0130\u00e7erik
@@ -181,8 +178,6 @@ Copy_file_to_file_directory.=Dosyay\u0131_dosya_dizinine_kopyala
 Copy_files_to_file_directory.=Dosyalar\u0131_dosya_dizinine_kopyala
 Copy_to_clipboard=Panoya_kopyala
 Could_not_call_executable=Program_\u00e7a\u011fr\u0131lam\u0131yor
-Could_not_connect_to_a_running_gnuserv_process._Make_sure_that_Emacs_or_XEmacs_is_running,<BR>and_that_the_server_has_been_started_(by_running_the_command_'gnuserv-start').=\u00c7al\u0131\u015fan_bir_gnuserve_s\u00fcrecine_ba\u011flanam\u0131yor._Emacs_ya_da_XEmacs'\u0131n_\u00e7al\u0131\u015ft\u0131\u011f\u0131na_ve_sunucunun<BR>('gnuserv-start'_komutuyla)_ba\u015flat\u0131ld\u0131\u011f\u0131na_emin_olun.
-Could_not_connect_to_host_=\u015eu_makineye_ba\u011flan\u0131lam\u0131yor_
 Could_not_connect_to_Vim_server._Make_sure_that_Vim_is_running<BR>with_correct_server_name.=Vim_sunucusuna_ba\u011flan\u0131lam\u0131yor._Vim'in_do\u011fru_sunucu_ad\u0131yla<BR>\u00e7al\u0131\u015ft\u0131\u011f\u0131na_emin_olun.
 Could_not_export_file=Dosya_d\u0131\u015fa_aktar\u0131lam\u0131yor
 Could_not_export_preferences=Tercihler_d\u0131\u015fa_aktar\u0131lam\u0131yor
@@ -200,15 +195,12 @@ Could_not_print_preview=Yazd\u0131rma_\u00f6nizlenemiyor
 Could_not_run_the_'vim'_program.='Vim'_program\u0131_\u00e7al\u0131\u015ft\u0131r\u0131lam\u0131yor.
 Could_not_save_file=Dosya_kaydedilemiyor
 Could_not_save_file._Character_encoding_'%0'_is_not_supported.=Dosya_kaydedilemiyor._'%0'_karakter_kodlamas\u0131_desteklenmiyor.
-Create_group=Grup_olu\u015ftur
 Created_groups.=Olu\u015fturulmu\u015f_gruplar.
 crossreferenced_entries_included=\u00e7apraz_ba\u011flant\u0131l\u0131_girdiler_dahil_edildi
 Current_content=G\u00fcncel_i\u00e7erik
 Current_value=G\u00fcncel_de\u011fer
 Custom_entry_types=\u00d6zel_girdi_t\u00fcrleri
 Custom_entry_types_found_in_file=Dosyada_\u00f6zel_girdi_t\u00fcrleri_bulundu
-Custom_icon_theme=\u00d6zel_simge_temas\u0131
-Custom_icon_theme_file=\u00d6zel_simge_tema_dosyas\u0131
 Custom_importers=\u00d6zel_i\u00e7e_aktar\u0131c\u0131\u0131lar
 Customize_entry_types=Girdi_t\u00fcrlerini_\u00f6zelle\u015ftir
 Customize_key_bindings=Tu\u015f_ba\u011flant\u0131lar\u0131n\u0131_\u00f6zelle\u015ftir
@@ -218,7 +210,6 @@ cut_entry=girdiyi_kes
 Cut_pr=Kes
 Database_\:=Veritaban\u0131_\:
 Database_encoding=Veritaban\u0131_kodlamas\u0131
-Database_has_changed._Do_you_want_to_save_before_closing?=Veritaban\u0131_de\u011fi\u015fti._Kapatmadan_\u00f6nce_kaydetmek_ister_misiniz?
 Database_properties=Veritaban\u0131_\u00f6zellikleri
 Date_format=Tarih_bi\u00e7emi
 Default=\u00d6ntan\u0131ml\u0131
@@ -271,8 +262,6 @@ Download_file=Dosya_indir
 Downloading...=\u0130ndiriliyor...
 Drag_and_Drop_Error=S\u00fcr\u00fckle_ve_B\u0131rak_Hatas\u0131
 Drop_%0=%0'i_b\u0131rak
-duplicate_BibTeX_key=\u00e7ift_n\u00fcsha_BibTeX_anahtar\u0131
-Duplicate_BibTeX_key.=\u00c7ift_n\u00fcsha_BibTeX_anahtar\u0131.
 Duplicate_BibTeX_key._Grouping_may_not_work_for_this_entry.=\u00c7ift_n\u00fcsha_BibTeX_anahtar\u0131._Bu_girdi_i\u00e7in_gruplama_\u00e7al\u0131\u015fmayabilir.
 Duplicate_Key_Warning=\u00c7ift_n\u00fcsha_Anahtar_Uyar\u0131s\u0131
 Duplicate_pairs_found=\u00c7ift_n\u00fcsha_\u00e7iftler_bulundu
@@ -295,10 +284,8 @@ Edit_preamble=\u00d6nc\u00fcl\u00fc_d\u00fczenle
 Edit_strings=Dizgeleri_d\u00fczenle
 Editor_options=D\u00fczenleyici_se\u00e7enekleri
 empty_BibTeX_key=bo\u015f_BibTeX_anahtar\u0131
-Empty_BibTeX_key.=Bo\u015f_BibTeX_anahtar\u0131.
 Empty_BibTeX_key._Grouping_may_not_work_for_this_entry.=Bo\u015f_BibTeX_anahtar\u0131._Bu_giri\u015f_i\u00e7in_gruplama_\u00e7al\u0131\u015fmayabilir.
 empty_database=bo\u015f_veritaban\u0131
-Enable_source_editing=Kaynak_d\u00fczenlemesini_etkinle\u015ftir
 Enable_word/name_autocompletion=S\u00f6zc\u00fck/isim_ototamamlamay\u0131_etkinle\u015ftir
 Endnote=Endnote
 Enter_URL=URL_gir
@@ -320,7 +307,7 @@ Entry_type_names_are_not_allowed_to_contain_white_space_or_the_following_charact
 Entry_types=Girdi_t\u00fcrleri
 Error=Hata
 Error\:_=Hata\:_
-Error_converting_Bibtex_to_XMP\:_%0=BibTeX'i_XMP'ye_d\u00f6n\u00fc\u015ft\u00fcrmede_hata:_%0
+Error_converting_BibTeX_to_XMP\:_%0=BibTeX'i_XMP'ye_d\u00f6n\u00fc\u015ft\u00fcrmede_hata:_%0
 Error_converting_XMP_to_'%0'...=XMP'yi_'%0'e_d\u00f6n\u00fc\u015ft\u00fcrmede_hata...
 Error_exporting_to_clipboard=Panoya_aktarmada_hata
 Error_in_field=Alanda_hata
@@ -330,7 +317,6 @@ Error_opening_file=Dosya_a\u00e7mada_hata
 Error_setting_field=Alan_atamada_hata
 Error_while_converting_BibtexEntry_to_XMP_%0=BibTeX'i_XMP'ye_d\u00f6n\u00fc\u015ft\u00fcr\u00fcrken_hata_%0
 Error_while_downloading_file\:=Dosya_indirilirken_hata\:
-Error_while_fetching_from_OIA2=OIA2'den_getirilirken_hata
 Error_while_writing=Yazarken_hata
 Error_writing_to_%0_file(s).=%0_dosya(lar)_yaz\u0131l\u0131rken_hata.
 Error_writing_XMP_to_file\:_%0=XMP_dosyaya_yaz\u0131l\u0131rken_hata\:_%0
@@ -364,7 +350,6 @@ Field_names_are_not_allowed_to_contain_white_space_or_the_following_characters=A
 Field_sizes=Alan_boyutlar\u0131
 Field_to_filter=S\u00fcz\u00fclecek_alan
 Field_to_group_by=Gruplanacak_alan
-Fields=Alanlar
 File=Dosya
 file=dosya
 File_'%0'_is_already_open.='%0'_dosyas\u0131_zaten_a\u00e7\u0131k.
@@ -480,17 +465,13 @@ Insert_selected_citations_into_LyX/Kile=Se\u00e7ili_al\u0131nt\u0131lar\u0131_Ly
 Insert_selected_citations_into_WinEdt=Se\u00e7ili_al\u0131nt\u0131lar\u0131_WinEdt'e_ekle
 insert_string_=dizge_ekle
 Insert_URL=URL_ekle
-integrity=b\u00fct\u00fcnl\u00fck
 Integrity_check=b\u00fct\u00fcnl\u00fck_kontrol\u00fc
 Intersection=Kesi\u015fim
 Invalid_BibTeX_key=Ge\u00e7ersiz_BibTeX_anahtar\u0131
 Invalid_date_format=Ge\u00e7ersiz_tarih_bi\u00e7emi
 Invalid_URL=Ge\u00e7ersiz_URL
 Inverted=Ters_\u00e7evrilmi\u015f
-is_a_standard_type.=bir_standart_t\u00fcrd\u00fcr.
 ISO_abbreviation=ISO_k\u0131saltmas\u0131
-Item_list_for_field=Alan_i\u00e7in_\u00f6\u011fe_listesi
-jabref=jabref
 JabRef_help=JabRef_yard\u0131m
 JabRef_preferences=JabRef_tercihler
 Journal_abbreviations=Dergi_k\u0131saltmalar\u0131
@@ -523,7 +504,6 @@ Listen_for_remote_operation_on_port=Ba\u011flant\u0131_noktas\u0131ndaki_uzak_i\
 Load_and_Save_preferences_from/to_jabref.xml_on_start-up_(memory_stick_mode)=Ba\u015flang\u0131\u00e7ta_tercihleri_jabref.xml'den_y\u00fckle_ya_da_buraya_kaydet_(bellek_\u00e7ubu\u011fu_kipi)
 Load_session=Oturumu_y\u00fckle
 Loading_session...=Oturum_y\u00fckleniyor...
-localhost=yerel_makine
 Look_and_feel=G\u00f6r\u00fcn\u00fcm_ve_tema
 Looking_for_pdf...=pdf_aran\u0131yor...
 lower=k\u00fc\u00e7\u00fck
@@ -592,7 +572,6 @@ No_entries_found._Please_make_sure_you_are_using_the_correct_import_filter.=Gird
 No_entries_found_for_the_search_string_'%0'=Arama_dizgesi_'%0'_i\u00e7in_bir_girdi_bulunmad\u0131
 No_entries_imported.=Hi\u00e7bir_girdi_i\u00e7e_aktar\u0131lmad\u0131.
 No_entries_or_multiple_entries_selected.=Ya_hi\u00e7bir_girdi_se\u00e7ilmedi_ya_da_birden_\u00e7ok_girdi_se\u00e7ildi.
-No_entries_selected=Hi\u00e7bir_girdi_se\u00e7ilmedi
 No_entries_selected.=Hi\u00e7bir_girdi_se\u00e7ilmedi.
 No_exceptions_have_ocurred.=Hi\u00e7bir_istisna_olu\u015fmad\u0131.
 No_files_found.=Hi\u00e7bir_dosya_bulunmad\u0131.
@@ -615,7 +594,6 @@ Nothing_to_redo=Yinelenecek_bir_\u015fey_yok
 Nothing_to_undo=Geriye_al\u0131nacak_bir_\u015fey_yok
 Number_of_references_to_fetch?=Getirilecek_ba\u015fvuru_say\u0131s\u0131?
 occurences=g\u00f6r\u00fclme_s\u0131kl\u0131\u011f\u0131
-OK=Tamam
 Ok=Tamam
 One_or_more_file_links_are_of_the_type_'%0',_which_is_undefined._What_do_you_want_to_do?=Bir_ya_da_daha_\u00e7ok_link,_tan\u0131mlanmam\u0131\u015f_'%0'_t\u00fcr\u00fcnde._Ne_yapmak_istersiniz?
 One_or_more_keys_will_be_overwritten._Continue?=Bir_ya_da_daha_\u00e7ok_anahtar\u0131n_\u00fczerine_yaz\u0131lacak._Devam_edilsin_mi?
@@ -666,12 +644,10 @@ PDF_directory=PDF_dizini
 PDF_does_not_exist=PDF_mevcut_de\u011fil
 Personal_journal_list=Ki\u015fisel_dergi_listesi
 Plain_text_import=D\u00fcz_metin_i\u00e7e_aktarma
-Please_check_your_network_connection_to_this_machine.=L\u00fctfen_bu_makinenin_a\u011f_ba\u011flant\u0131s\u0131n\u0131_kontrol_ediniz.
 Please_enter_a_name_for_the_group.=L\u00fctfen_grup_i\u00e7in_bir_isim_giriniz.
 Please_enter_a_search_term._For_example,_to_search_all_fields_for_<b>Smith</b>,_enter%c<p><tt>smith</tt><p>To_search_the_field_<b>Author</b>_for_<b>Smith</b>_and_the_field_<b>Title</b>_for_<b>electrical</b>,_enter%c<p><tt>author%esmith_and_title%eelectrical</tt>=L\u00fctfen_bir_arama_terimi_giriniz._\u00d6rne\u011fin,_<b>Smith</b>'i_t\u00fcm_alanlarda_aramak_i\u00e7in_%c<p><tt>smith</tt><p>_giriniz._<b>Smith</b>'i_<b>Author</b>_alan\u0131nda,_<b>electrical</b>'\u0131_<b>Title</b>_alan\u0 [...]
 Please_enter_the_field_to_search_(e.g._<b>keywords</b>)_and_the_keyword_to_search_it_for_(e.g._<b>electrical</b>).=L\u00fctfen_aranacak_alan_ad\u0131n\u0131_(\u00f6rne\u011fin_<b>keywords</b>)_ve_aranacak_anahtar_s\u00f6zc\u00fc\u011f\u00fc_(\u00f6rne\u011fin_<b>electrical</b>)_giriniz.
 Please_enter_the_string's_label=L\u00fctfen_dizgenin_etiketini_giriniz
-Please_select_an_importer=L\u00fctfen_bir_i\u00e7e_aktar\u0131c\u0131_se\u00e7iniz
 Please_select_an_importer.=L\u00fctfen_bir_i\u00e7e_aktar\u0131c\u0131_se\u00e7iniz.
 Please_select_exactly_one_group_to_move.=L\u00fctfen_ta\u015f\u0131mak_i\u00e7in_yaln\u0131zca_bir_grup_se\u00e7iniz.
 Please_specify_the_=L\u00fctfen_\u015funu_belirleyiniz_
@@ -741,7 +717,6 @@ Removed_group_"%0".="%0"_grubu_silindi.
 Removed_group_"%0"_and_its_subgroups.="%0"_grubu_ve_altgruplar\u0131_silindi.
 Removed_string=Dizge_silindi
 Renamed_string=Dizge_yeniden_adland\u0131r\u0131ld\u0131
-Replace=Yerine_koy
 Replace_(regular_expression)=Yerine_koy_(d\u00fczenli_ifade)
 Replace_string=Dizgenin_yerine_koy
 Replace_with=\u015eununla_de\u011fi\u015ftir
@@ -757,7 +732,6 @@ Revert_to_original_source=Orijinal_kayna\u011fa_d\u00f6nd\u00fcr
 Review=G\u00f6zden_ge\u00e7ir
 Review_changes=De\u011fi\u015fklikleri_incele
 Right=Sa\u011f
-root=k\u00f6k
 Save=Kaydet
 Save_all_finished.=T\u00fcm_bitenleri_kaydet.
 Save_all_open_databases=T\u00fcm_a\u00e7\u0131k_veritabanlar\u0131n\u0131_kaydet
@@ -778,17 +752,15 @@ Saving_all_databases...=T\u00fcm_veritabanlar\u0131_kaydediliyor...
 Saving_database=Veritaban\u0131_kaydediliyor
 Scan=Tara
 Search=Ara
-Search_All_Fields=T\u00fcm_Alanlarda_Ara
 Search_all_fields=T\u00fcm_alanlarda_ara
 Search_error=Arama_hatas\u0131
 Search_expression=\u0130fade_ara
 Search_for=\u015eunu_ara
 Search_general_fields=Genel_alanlarda_ara
 Search_IEEEXplore=IEEEXplore'da_ara
-Search_IEEExplore=IEEExplore'da_ara
 Search_optional_fields=Se\u00e7meli_alanlarda_ara
 Search_required_fields=Zorunlu_alanlarda_ara
-Search_Specified_Field(s)=Belirtlimi\u015f_Alan(lar)da_Ara
+Search_specified_field(s)=Belirtlimi\u015f_Alan(lar)da_Ara
 Searched_database._Global_number_of_hits=Veritaban\u0131_arand\u0131._K\u00fcresel_ula\u015f\u0131lma_say\u0131s\u0131
 Searched_database._Number_of_hits=Veritaban\u0131_arand\u0131._Ula\u015f\u0131lma_say\u0131s\u0131
 Searching_for_%0_file=%0_dosyas\u0131_aran\u0131yor
@@ -811,7 +783,6 @@ Select_matches=E\u015fle\u015fenleri_se\u00e7iniz
 Select_new_ImportFormat_Subclass=Yeni_\u0130\u00e7e_Aktar\u0131m_Bi\u00e7emi_Alts\u0131n\u0131f\u0131n\u0131_se\u00e7iniz
 Select_the_tree_nodes_to_view_and_accept_or_reject_changes=De\u011fi\u015fiklikleri_g\u00f6rmek_ve_kabul_ya_da_reddetmek_i\u00e7in_a\u011fa\u00e7_d\u00fc\u011f\u00fcmlerini_se\u00e7iniz
 Selected_entries=Se\u00e7ili_girdiler
-Selector_enabled_fields=Se\u00e7icinin_etkili_k\u0131l\u0131nd\u0131\u011f\u0131_alanlar
 Server_Hostname_\:=Sunucu_Makine_ad\u0131_\:
 Server_Type_\:=Sunucu_T\u00fcr\u00fc_\:
 Set_field=Alan\u0131_ata
@@ -887,10 +858,8 @@ Target_file_cannot_be_a_directory.=Hedef_dosya_bir_dizin_olamaz.
 Tertiary_sort_criterion=\u00dc\u00e7\u00fcnc\u00fcl_s\u0131ralama_\u00f6l\u00e7\u00fct\u00fc
 Test=Deneme
 Text_Input_Area=Metin_Girdi_Alan\u0131
-The_#_character_is_not_allowed_in_BibTeX_fields=BibTeX_alanlar\u0131nda_#_karakteri_kullan\u0131lam\u0131yor
 The_chosen_date_format_for_new_entries_is_not_valid=Yeni_girdiler_i\u00e7in_se\u00e7ilen_tarih_bi\u00e7emi_ge\u00e7ersiz
 The_chosen_encoding_'%0'_could_not_encode_the_following_characters\:_=Se\u00e7ilen_'%0'_kodlamas\u0131_\u015fu_karakterleri_kodlayam\u0131yor\:
-The_CiteSeer_fetch_operation_returned_zero_results.=CiteSeerX_getirme_i\u015flemi_s\u0131f\u0131r_sonu\u00e7la_d\u00f6nd\u00fc.
 The_current_version_features_a_new_way_of_handling_links_to_external_files.<br>To_take_advantage_of_this,_your_links_must_be_changed_into_the_new_format,_and<br>JabRef_must_be_configured_to_show_the_new_links.=Mevcut_s\u00fcr\u00fcm_harici_dosya_linklerini_i\u015flemede_yeni_bir_yolu_\u00f6n_plana_\u00e7\u0131kar\u0131yor.<br>Bundan_yararlanmak_i\u00e7in,_linklerinizin_yeni_bi\u00e7eme_de\u011fi\u015ftirilmesi_gerekiyor,_ve<br>JabRef'in_de_yeni_linkleri_g\u00f6sterecek_\u015fekilde_ayarl [...]
 the_field_<b>%0</b>=alan_<b>%0</b>
 The_file<BR>'%0'<BR>has_been_modified<BR>externally!=Dosya<BR>'%0'<BR><BR>harici_olarak_de\u011fi\u015ftirildi!
@@ -905,7 +874,6 @@ The_search_is_case_insensitive.=Arama_b\u00fcy\u00fck/k\u00fc\u00e7\u00fck_harfe
 The_search_is_case_sensitive.=Arama_b\u00fcy\u00fck/k\u00fc\u00e7\u00fck_harfe_duyarl\u0131.
 The_string_has_been_removed_locally=Dizge_yerel_olarak_silindi
 There_are_possible_duplicates_(marked_with_a_'D'_icon)_that_haven't_been_resolved._Continue?=\u00c7\u00f6z\u00fcmlenmemi\u015f,_olas\u0131_\u00e7ift_n\u00fcshalar_mevcut_('D'_simgesiyle_i\u015faretlenmi\u015f)._Devam_edilsin_mi?
-this_button_will_update=bu_d\u00fc\u011fme_g\u00fcncelleyecek
 This_database_was_written_using_an_older_version_of_JabRef.=Bu_veritaban\u0131_eski_bir_JabRef_s\u00fcr\u00fcm\u00fcyle_yaz\u0131lm\u0131\u015f.
 This_entry_has_no_BibTeX_key._Generate_key_now?=Bu_girdinin_BibTeX_anahtar\u0131_yok._\u015eimdi_olu\u015fturulsun_mu?
 This_entry_is_incomplete=Girdi_eksik
@@ -917,12 +885,10 @@ This_group_contains_entries_in_which_any_field_contains_the_regular_expression_<
 This_group_contains_entries_in_which_any_field_contains_the_term_<b>%0</b>=Bu_grup,_herhangi_bir_alan\u0131__<b>%0</b>_terimini_i\u00e7eren_girdileri_i\u00e7erir
 This_group_contains_entries_whose_<b>%0</b>_field_contains_the_keyword_<b>%1</b>=Bu_grup,_<b>%0</b>_alan\u0131_<b>%1</b>_anahtar_s\u00f6zc\u00fc\u011f\u00fcn\u00fc_i\u00e7eren_girdileri_i\u00e7erir
 This_group_contains_entries_whose_<b>%0</b>_field_contains_the_regular_expression_<b>%1</b>=Bu_grup,_<b>%0</b>_alan\u0131_<b>%1</b>_d\u00fczenli_ifadesini_i\u00e7eren_girdileri_i\u00e7erir
-This_is_a_simple_copy_and_paste_dialog_for_import_some_fields_from_normal_text.=Bu,_normal_metinden_baz\u0131_alanlar\u0131_i\u00e7e_aktarmak_i\u00e7in_basit_bir_kopyala_yap\u0131\u015ft\u0131r_ileti\u015fim_penceresidir.
 This_makes_JabRef_look_up_each_%0_link_and_check_if_the_file_exists._If_not,_you_will_be_given_options<BR>to_resolve_the_problem.=Bu,_JabRef'in_her_%0_linki_bulup_dosyan\u0131n_var_olup_olmad\u0131\u011f\u0131n\u0131_kontrol_etmesini_sa\u011flar._E\u011fer_yoksa,_sorunu<BR>\u00e7\u00f6zmek_i\u00e7in_se\u00e7enekler_sunulacakt\u0131r.
 This_operation_requires_all_selected_entries_to_have_BibTex_keys_defined.=Bu_i\u015flem,_t\u00fcm_se\u00e7ili_girdilerin_tan\u0131ml\u0131_BibTex_anahtarlar\u0131n\u0131n_olmas\u0131n\u0131_gerektirir.
 This_operation_requires_at_least_one_entry.=Bu_i\u015flem_en_az_bir_girdi_gerektirir.
 This_operation_requires_one_or_more_entries_to_be_selected.=Bu_i\u015flem,_bir_ya_da_daha_\u00e7ok_girdinin_se\u00e7ili_olmas\u0131n\u0131_gerektirir.
-This_will_move_all_external_links_from_the_'pdf'_and_'ps'_fields_into_the_'%0'_field._Proceed?=Bu,_'pdf'_ve_'ps'_alanlar\u0131ndaki_t\u00fcm_harici_linkleri_'%0'_alan\u0131na_ta\u015f\u0131yacakt\u0131r._Devam_edilsin_mi?
 To_set_up,_go_to_<B>Tools_->_Manage_journal_abbreviations</B>=Kurmak_i\u00e7in_<B>Ara\u00e7lar_->Dergi_k\u0131saltmalar\u0131n\u0131_y\u00f6net'e_gidiniz</B>
 Toggle_abbreviation=K\u0131saltmay\u0131_a\u00e7/kapat
 Toggle_entry_preview=Girdi_\u00f6nizlemeyi_a\u00e7/kapat
@@ -932,7 +898,6 @@ Try_different_encoding=Ba\u015fka_kodlama_deneyin
 Type_set_to_'other'=T\u00fcr,_'di\u011fer'_olarak_atand\u0131
 Unabbreviate_journal_names_of_the_selected_entries=Se\u00e7ili_girdilerin_dergi_adlar\u0131n\u0131_k\u0131saltma
 Unabbreviated_%0_journal_names.=%0_dergi_ad\u0131_k\u0131saltmas\u0131_kald\u0131r\u0131ld\u0131.
-unable_to_access_LyX-pipe=Lyx_veriyoluna_girilemiyor
 Unable_to_create_graphical_interface=Grafik_aray\u00fcz_olu\u015fturulamad\u0131
 Unable_to_open_file.=Dosya_a\u00e7\u0131lamad\u0131.
 Unable_to_open_link._The_application_'%0'_associated_with_the_file_type_'%1'_could_not_be_called.=Link_a\u00e7\u0131lamad\u0131._'%1'_dosya_t\u00fcr\u00fcyle_ili\u015fkili_'%0'_uygulamas\u0131_\u00e7a\u011fr\u0131lamad\u0131.
@@ -957,7 +922,6 @@ untitled=ba\u015fl\u0131ks\u0131z
 Up=Yukar\u0131
 Update_to_current_column_widths=Mevcut_s\u00fctun_geni\u015fliklerine_g\u00fcncelle
 Updated_group_selection=Grup_se\u00e7imi_g\u00fcncellendi
-Upgrade_external_links=Harici_linkleri_yeni_s\u00fcr\u00fcme_y\u00fckselt
 Upgrade_external_PDF/PS_links_to_use_the_'%0'_field.=Harici_PDF/PS_linklerini_'%0'_alan\u0131n\u0131_kullanmak_\u00fczere_yeni_s\u00fcr\u00fcme_y\u00fckselt.
 Upgrade_file=Dosyay\u0131_yeni_s\u00fcr\u00fcme_y\u00fckselt
 Upgrade_old_external_file_links_to_use_the_new_feature=Eski_harici_dosya_linklerini_yeni_\u00f6zelli\u011fi_kullanmak_\u00fczere_yeni_s\u00fcr\u00fcme_y\u00fckselt
@@ -966,16 +930,13 @@ UPPER=DAHA_\u00dcSTTE
 Upper_Each_First=Daha_\u00dcstteki_Her_Birinci
 Upper_first=Daha_\u00fcstteki_\u00f6nce
 usage=kullan\u0131m
-Use_antialiasing_font=\u00d6rt\u00fc\u015fme-\u00f6nler_yaz\u0131tipi_kullan
 Use_autocompletion_for_the_following_fields=A\u015fa\u011f\u0131daki_alanlar_i\u00e7in_otomatik_tamamlamay\u0131_kullan
-Use_custom_icon_theme=\u00d6zel_simge_temas\u0131_kullan
 Use_default_viewer=\u00d6ntan\u0131ml\u0131_g\u00f6r\u00fcnt\u00fcleyiciyi_kullan
 Use_inspection_window_also_when_a_single_entry_is_imported.=Tek_bir_girdi_i\u00e7e_aktar\u0131l\u0131rken_de_inceleme_penceresi_kullan.
 Use_native_file_dialog=Yerli_dosya_ileti\u015fim_penceresini_kullan
 Use_other_look_and_feel=Di\u011fer_g\u00f6r\u00fcn\u00fcm_ve_tema_kullan
 Use_Regular_Expression_Search=D\u00fczenli_\u0130fade_Aramay\u0131_kullan
 Use_regular_expressions=D\u00fczenli_ifadeleri_kullan
-Use_the_following_delimiter_character(s)=A\u015fa\u011f\u0131daki_s\u0131n\u0131rlay\u0131c\u0131_karakter(ler)i_kullan
 Username_\:=Kullan\u0131c\u0131_ad\u0131_\:
 Value_cleared_externally=De\u011fer,_haricen_silindi
 Value_set_externally=De\u011fer,_haricen_atand\u0131
@@ -1022,7 +983,6 @@ Your_new_key_bindings_have_been_stored.=Yeni_anahtar_demetleriniz_kaydedildi.
 The_following_fetchers_are_available\:=A\u015fa\u011f\u0131daki_getiriciler_kullan\u0131ma_haz\u0131rd\u0131r:
 Could_not_find_fetcher_'%0'='%0'_getiricisi_bulunamad\u0131
 Running_Query_'%0'_with_fetcher_'%1'.='%0'_sorgusu_'%1'_getiricisiyle_\u00e7al\u0131\u015ft\u0131r\u0131l\u0131yor.
-Please_wait!=L\u00fctfen_bekleyiniz!
 Query_'%0'_with_fetcher_'%1'_did_not_return_any_results.='%1'_getiricisiyle_'%0'_sorgusu_hi\u00e7bir_sonu\u00e7_d\u00f6nd\u00fcrmedi.
 Open_SPIRES_entry=SPIRES_girdisi_a\u00e7
 Move/Rename_file=Dosya_Ta\u015f\u0131/Yeniden_adland\u0131r
@@ -1030,7 +990,6 @@ File_moved=Dosya_ta\u015f\u0131nd\u0131
 Move_file_failed=Dosya_ta\u015f\u0131ma_ba\u015far\u0131s\u0131z
 Could_not_move_file=Dosya_ta\u015f\u0131nam\u0131yor
 Could_not_find_file_'%0'.='%0'_dosyas\u0131_bulunamad\u0131.
-Move/rename_file=Dosya_Ta\u015f\u0131/yeniden_adland\u0131r
 Number_of_entries_successfully_imported=Girdi_say\u0131s\u0131_ba\u015far\u0131yla_i\u00e7e_aktar\u0131ld\u0131
 Import_canceled_by_user=\u0130\u00e7e_aktr\u0131m_kullan\u0131c\u0131_taraf\u0131ndan_iptal_edildi
 Progress\:_%0_of_%1=\u0130lerleme:_%1'in_%0'i
@@ -1132,11 +1091,9 @@ Version=S\u00fcr\u00fcm
 Unknown=Bilinmeyen
 Not_loaded=Y\u00fcklenmedi
 Loaded=Y\u00fcklendi
-Could_not_determine_version_of_=\u015eunun_s\u00fcr\u00fcm\u00fc_belirlenemedi_
 Install_anyway?=Yine_de_kurulsun_mu?
 
 Looking_for_full_text_document...=Tam_metin_belge_aran\u0131yor...
-Follow_DOI_or_URL_link_and_try_to_locate_PDF_full_text_document=DOI_ya_da_URL_linki_izle_ve_tam_metin_PDF_belgesini_bulmaya_\u00e7al\u0131\u015f
 Unable_to_find_full_text_article._No_search_algorithm_defined_for_the_'%0'_web_site.=Tam_metin_makal_bulunamad\u0131._'%0'_web_sitesi_i\u00e7in_bir_arama_algoritmas\u0131_tan\u0131mlanmam\u0131\u015f.
 Found_pdf_link,_but_received_the_wrong_MIME_type._This_could_indicate_that_you_don't_have_access_to_the_fulltext_article.=Pdf_link_bulundu,_ama_yanl\u0131\u015f_MIME_t\u00fcr\u00fc_al\u0131nd\u0131._Bu,_tam_metin_makaleye_eri\u015fiminiz_olmad\u0131\u011f\u0131_anlam\u0131na_gelebilir.
 
@@ -1183,8 +1140,6 @@ Before_saving,_please_edit_any_strings_containing_the_#_character.=Kaydetmeden_\
 
 Save_without_backup?=Yedeklemeden_kaydedilsin_mi?
 Unable_to_create_backup=Yedek_olu\u015fturulamad\u0131
-
-File_directory_is_not_set_or_does_not_exist.=Dosya_dizini_atanmad\u0131_ya_da_mevcut_de\u011fil.
 Move_file_to_file_directory.=Dosyay\u0131_dosya_dizinine_ta\u015f\u0131.
 Rename_file_to=Dosyay\u0131_\u015funa_yeniden_adland\u0131r
 <b>All_Entries</b>_(this_group_cannot_be_edited_or_removed)=<b>T\u00fcm_Girdiler</b>_(bu_grup_silinemez_ve_d\u00fczenlenemez)
@@ -1206,7 +1161,6 @@ Error_initializing_custom_export_format_from_string_'%0'='%0'_dizgesinden_\u00f6
 
 BibLaTeX_mode=BibLaTeX_kipi
 Optional_fields_2=Opsiyonel_alanlar_2
-Please_wait=L\u00fctfen_bekleyin
 Waiting_for_save_operation_to_finish=Kaydetme_i\u015fleminin_bitmesi_bekleniyor
 Resolving_duplicate_BibTeX_keys...=\u00c7ifte_BibTeX_anahtarlar\u0131_\u00e7\u00f6z\u00fcmleniyor...
 Finished_resolving_duplicate_BibTeX_keys._%0_entries_modified.=\u00c7ifte_BibTeX_anahtarlar\u0131n\u0131n_\u00e7\u00f6z\u00fcmlenmesi_bitti._%0_girdi_de\u011fi\u015ftirildi.
@@ -1219,8 +1173,6 @@ Duplicate_BibTeX_key=\u00c7ifte_BibTeX_anahtar\u0131
 Duplicate_key=\u00c7ifte_anahtar
 Generate_key=Anahtar_olu\u015ftur
 Import_marking_color=\u0130\u015faretleme_rengi_i\u00e7e_al
-
-%0_entries_found._To_reduce_server_load,_only_%1_will_be_downloaded._It_will_be_very_slow,_in_order_to_make_ACM_happy.=%0_girdi_bulundu._Sunucu_y\u00fck\u00fcn\u00fc_azaltmak_i\u00e7in,_yaln\u0131zca_%1_indirilecek._ACM'yi_mutlu_etmek_i\u00e7in_\u00e7ok_yava\u015f_olacak.
 BibTeX_importer=BibTeX_i\u00e7e_aktar\u0131c\u0131s\u0131
 Always_add_letter_(a,_b,_...)_to_generated_keys=Olu\u015fturulmu\u015f_anahtarlara_her_zaman_harf_ekle_(a,_b_...)
 
@@ -1237,7 +1189,6 @@ An_autosave_file_was_found_for_this_database._This_could_indicate_=Bu_veritaban\
 that_JabRef_didn't_shut_down_cleanly_last_time_the_file_was_used.=bu_dosya_son_kullan\u0131ld\u0131\u011f\u0131nda_JabRef_temiz_kapat\u0131lmad\u0131.
 General_file_directory=Genel_dosya_dizini
 User-specific_file_directory=Kullan\u0131c\u0131ya_\u00f6zel_dosya_dizini
-Error_setting_look_and_feel=G\u00f6r\u00fcn\u00fcm_ve_izlenimi_kurmada_hata
 Search_failed\:_illegal_search_expression=Arama_ba\u015far\u0131s\u0131z\:_uygunsuz_arama_dizgesi
 Show_ArXiv_column=ArXiv_s\u00fctununu_g\u00f6ster
 <HTML>Unpack_the_zip_file_containing_import/export_filters_for_Endnote,<BR>for_optimal_interoperability_with_JabRef</HTML>=<HTML>JabRef'le_optimal_kar\u015f\u0131l\u0131kl\u0131_kullan\u0131m_i\u00e7in_<BR>Endnote_i\u00e7in_i\u00e7e_alma/d\u0131\u015fa_aktarma_filtrelerini_i\u00e7eren_zip_dosyas\u0131n\u0131_\u00e7\u00f6z</HTML>
@@ -1252,7 +1203,6 @@ Create_entry_based_on_XMP_data=XMP_verisine_dayanarak_girdi_olu\u015ftur
 Create_entry_based_on_data_fetched_from=\u015euradan_al\u0131nan_veriye_dayanarak_girdi_olu\u015ftur
 Create_blank_entry_linking_the_PDF=PDF'yle_ba\u011flant\u0131l\u0131_olarak_bo\u015f_girdi_olu\u015ftur
 Only_attach_PDF=Yaln\u0131zca_PDF'yi_ekle
-Mr._dLib_Metadata_Entries_Associated_With\:=Mr._dLib_Metaverisi_Girdileri_\u015eununla_\u0130li\u015fkili\:
 Mr._dLib_Metadata_Entries_Associated_With_PDF_File=Mr._dLib_Metaverisi_Girdileri_PDF_Dosyas\u0131yla_\u0130li\u015fkili
 Title=Ba\u015fl\u0131k
 Author(s)=Yazar(lar)
@@ -1271,21 +1221,18 @@ Update_Existing_Entry=Mevcut_Girdiyi_G\u00fcncelle
 Mr._dLib=Mr._dLib
 More_information=Daha_fazla_bilgi
 Fetching_Metadata...=Metaverisi_Al\u0131n\u0131yor...
-Metadata=Metaverisi
 Autocomplete_names_in_'Firstname_Lastname'_format_only=\u0130simleri_yaln\u0131zca_'Ad_Soyad'_bi\u00e7iminde_otomatik_tamamla
 Autocomplete_names_in_'Lastname,_Firstname'_format_only=\u0130simleri_yaln\u0131zca_'Soyad,_Ad'_bi\u00e7iminde_otomatik_tamamla
 Autocomplete_names_in_both_formats=\u0130simleri_her_iki_bi\u00e7imde_otomatik_tamamla
 Marking_color_%0=\u0130\u015faretleme_rengi_%0
 The_name_'comment'_can_not_be_used_as_an_entry_type_name.='comment'_ismi_bir_girdi_t\u00fcr\u00fc_ismi_olarak_kullan\u0131lamaz.
 You_must_enter_an_integer_value_in_the_text_field_for=\u015eunun_i\u00e7in_metin_alan\u0131na_bir_tamsay\u0131_girmelisiniz
-File_directory=Dosya_dizini
 Send_as_email=Eposta_olarak_g\u00f6nder
 References=Kaynaklar
 Sending_of_emails=Epostalar_g\u00f6nderiliyor
 Subject_for_sending_an_email_with_references=Kaynaklarla_g\u00f6nderilecek_bir_eposta_konusu
 Automatically_open_folders_of_attached_files=Ekli_dosyalar\u0131n_klas\u00f6rlerini_otomatikman_a\u00e7
 Create_entry_based_on_content=\u0130\u00e7eri\u011fe_ba\u011fl\u0131_olarak_girdi_olu\u015ftur
-Store_choice_as_default=Se\u00e7imi_\u00f6ntan\u0131ml\u0131_olarak_kaydet
 Do_not_show_this_box_again_for_this_import=Bu_i\u00e7e_aktar\u0131m_i\u00e7in_bu_kutuyu_bir_daha_g\u00f6sterme
 Always_use_this_PDF_import_style_(and_do_not_ask_for_each_import)=Her_zaman_bu_PDF_i\u00e7e_aktar\u0131m_stilini_kullan_(ve_her_i\u00e7e_aktar\u0131m_i\u00e7in_sorma)
 Error_creating_email=Eposta_olu\u015fturmada_hata
@@ -1311,7 +1258,6 @@ Extra_information_(e.g._page_number)=Ek_bilgi_(\u00f6rnek:_sayfa_numaras\u0131)
 Manage_citations=Al\u0131nt\u0131lar\u0131_y\u00f6net
 Problem_modifying_citation=Al\u0131nt\u0131_de\u011fi\u015ftirmede_sorun
 Citation=Al\u0131nt\u0131
-Context=Ba\u011flam
 Extra_information=Ek_bilgi
 Could_not_resolve_BibTeX_entry_for_citation_marker_'%0'.=Al\u0131nt\u0131_belirteci_'%0'_i\u00e7in_BibTeX_girdisi_\u00e7\u00f6z\u00fcmlenemedi.
 Styles=Stiller
@@ -1337,12 +1283,10 @@ Combine_pairs_of_citations_that_are_separated_by_spaces_only=Yaln\u0131zca_bo\u0
 Autodetection_failed=Otomatik_alg\u0131lama_ba\u015far\u0131s\u0131z
 Connecting=Ba\u011flan\u0131yor
 Please_wait...=L\u00fctfen_bekleyin...
-Unable_to_connect=Ba\u011flan\u0131lamad\u0131
 Set_connection_parameters=Ba\u011flant\u0131_parametrelerini_ayarla
 Path_to_OpenOffice_directory=OpenOffice_dizini_yolu
 Path_to_OpenOffice_executable=OpenOffice_\u00e7al\u0131\u015ft\u0131ma_dosyas\u0131_yolu
 Path_to_OpenOffice_library_dir=OpenOffice_k\u00fct\u00fcphane_dizini_yolu
-Autodetect=Otomatik_alg\u0131la
 Connection_lost=Ba\u011flant\u0131_koptu
 The_paragraph_format_is_controlled_by_the_property_'ReferenceParagraphFormat'_or_'ReferenceHeaderParagraphFormat'_in_the_style_file.=Paragraf_bi\u00e7imi_stil_dosyas\u0131nda_'KaynakParagrafBi\u00e7imi'_ya_da_'KaynakBa\u015fl\u0131\u011f\u0131ParagrafBi\u00e7imi'_\u00f6zelli\u011fi_taraf\u0131ndan_kontrol_edilir.
 The_character_format_is_controlled_by_the_citation_property_'CitationCharacterFormat'_in_the_style_file.=Karakter_bi\u00e7imi_stil_dosyas\u0131nda_'Al\u0131nt\u0131KarakterBi\u00e7imi'_al\u0131nt\u0131_\u00f6zelli\u011fi_taraf\u0131ndan_kontrol_edilir.
@@ -1365,7 +1309,6 @@ JSTOR_import_cancelled=JSTOR_i\u00e7e_aktar\u0131m\u0131_iptal_edildi
 HTML_list=HTML_listesi
 Click_group_to_toggle_membership_of_selected_entries=Se\u00e7ili_girdilerin_\u00fcyeli\u011fini_ayarlamak_i\u00e7in_grubu_t\u0131klay\u0131n
 Use_EMACS_23_insertion_string=EMACS_23_ekleme_dizgesini_kullan
-Normalize_to_BibTeX_name_format=BibTeX_isim_bi\u00e7imine_normalle\u015ftir
 If_possible,_normalize_this_list_of_names_to_conform_to_standard_BibTeX_name_formatting=e\u011fer_m\u00fcmk\u00fcnse,_bu_isim_listesini_standart_BibTeX_isim_bi\u00e7imiyle_uyumlu_olacak_\u015fekilde_normalle\u015ftir
 Could_not_open_%0=%0_a\u00e7\u0131lam\u0131yor
 Unknown_import_format=Bilinmeyen_i\u00e7e_aktar\u0131m_bi\u00e7imi
@@ -1374,7 +1317,6 @@ An_Error_occurred_while_fetching_from_INSPIRE_source_(%0)\:=INSPIRE_kayna\u011f\
 Error_while_fetching_from_Inspire\:_=Inspire'dan_al\u0131n\u0131rken_hata\:
 Web_search=A\u011f_aramas\u0131
 Autocomplete_names=\u0130simeri_otomatikman_tamamla
-You_must_select_either_a_valid_style_file,_or_use_the_default_style.=Ya_ge\u00e7erli_bir_stil_dosyas\u0131_se\u00e7meli,_ya_da_\u00f6ntan\u0131ml\u0131_stili_kullanmal\u0131s\u0131n\u0131z.
 Default_style=\u00d6ntan\u0131ml\u0131_stil
 Choose_style_file_directly=Stil_dosyas\u0131n\u0131_direkt_olarak_se\u00e7in
 Choose_from_a_directory=Bir_dizinden_se\u00e7in
@@ -1415,7 +1357,6 @@ Autocompletion_options=Otomatik_tamamlama_se\u00e7enekleri
 Autocomplete_after_following_number_of_characters=\u015eu_say\u0131daki_karakterden_sonra_otomatik_tamamla
 Name_format_used_for_autocompletion=Otomatik_tamamlama_i\u00e7in_kullan\u0131lan_isim_bi\u00e7emi
 Treatment_of_first_names=\u0130lk_isimlerin_i\u015flenme_\u015fekli
-No_icon_found_for_%0=%0_i\u00e7in_simge_bulunamad\u0131
 Cleanup_entries=Girdileri_temizle
 Automatically_assign_new_entry_to_selected_groups=Se\u00e7ili_gruplara_otomatikman_yeni_girdi_ata
 Move_DOIs_from_note_and_URL_field_to_DOI_field_and_remove_http_prefix=DOI'leri_not_ve_URL_alanlar\u0131ndan_DOI_alan\u0131na_ta\u015f\u0131_ve_http_\u00f6n_ekini_kald\u0131r
@@ -1429,14 +1370,9 @@ Doing_a_cleanup_for_%0_entries...=%O_girdileri_i\u00e7in_temizlik_yap\u0131l\u01
 No_entry_needed_a_clean_up=Hi\u00e7bir_girdiye_temizlik_gerekmedi
 One_entry_needed_a_clean_up=Bir_girdi_temizlik_gerektirdi
 %0_entries_needed_a_clean_up=%0_girdi_temizlik_gerektirdi
-Imported_=i\u00e7e_al\u0131nd\u0131_
 Error_importing_from_database=Veritaban\u0131ndan_i\u00e7e_al\u0131nmada_hata
 Minimize_to_system_tray=Sistem_tepsisine_k\u00fc\u00e7\u00fclt
 
-
-Incomplete_search_results=Tamamlanmami\u015f_arama_sonu\u00e7lar\u0131
-%0_entries_were_found,_but_only_%1_of_these_could_be_resolved.=%0_girdi_bulundu,_ama_bunlar\u0131n_yaln\u0131zca_%1'i_\u00e7\u00f6z\u00fcmlenebildi.
-
 Error_downloading_file_'%0'=Dosya_indirmede_hata_%0'
 Download_failed=\u0130ndirme_ba\u015far\u0131s\u0131z
 %0_databases_will_be_imported=%0_veritaban\u0131_i\u00e7e_al\u0131nacak
@@ -1460,10 +1396,9 @@ Unable_to_clear_preferences.=Tercihler_silinemedi.
 
 Reset_preferences_(key1,key2,..._or_'all')=Tercihleri_s\u0131f\u0131rla_(anahtar1,anahtar2,..._ya_da_'t\u00fcm\u00fc')
 Find_unlinked_files=Ba\u011flant\u0131s\u0131z_dosyalar\u0131_bul
-Select_All=T\u00fcm\u00fcn\u00fc_se\u00e7
-Unselect_All=T\u00fcm_se\u00e7imleri_kald\u0131r
-Expand_All=T\u00fcm\u00fcn\u00fc_geni\u015flet
-Collapse_All=T\u00fcm_geni\u015fletmeyi_kald\u0131r
+Unselect_all=T\u00fcm_se\u00e7imleri_kald\u0131r
+Expand_all=T\u00fcm\u00fcn\u00fc_geni\u015flet
+Collapse_all=T\u00fcm_geni\u015fletmeyi_kald\u0131r
 Select_Directory=Dizin_Se\u00e7
 Choose_Directory=Dizin_Se\u00e7
 Use_the_selected_directory_to_start_with_the_search.=Aramay\u0131_ba\u015flatmak_i\u00e7in_se\u00e7ili_dizini_kullan.
@@ -1524,7 +1459,6 @@ Priority_medium=\u00d6ncelik_orta
 Quality=Kalite
 Rank=R\u00fctbe
 Relevance=\u0130lgi_d\u00fczeyi
-Set_priority=\u00d6ncelik_ata
 Set_priority_to_high=\u00d6nceli\u011fi_y\u00fckse\u011fe_ayarla
 Set_priority_to_low=\u00d6nceli\u011fi_d\u00fc\u015f\u00fc\u011fe_ayarla
 Set_priority_to_medium=\u00d6nceli\u011fi_ortaya_ayarla
@@ -1556,7 +1490,6 @@ Correct_the_entry,_and_reopen_editor_to_display/edit_source.=Girdiyi_d\u00fczelt
 Could_not_connect_to_a_running_gnuserv_process._Make_sure_that_Emacs_or_XEmacs_is_running,<BR>and_that_the_server_has_been_started_(by_running_the_command_'server-start'/'gnuserv-start').=\u00d6al\u0131\u015fan_bir_gnuserv_s\u00fcrecine_ba\u011flan\u0131lamad\u0131._Emacs_ya_da_XEmacs'\u0131n_\u00e7al\u0131\u015ft\u0131\u011f\u0131na_ve<BR>sunucunun_ba\u015flat\u0131ld\u0131\u011f\u0131na_('server-start'/'gnuserv-start'_komutu_\u00e7al\u0131\u015ft\u0131r\u0131larak)_emin_olun,
 Could_not_connect_to_running_OpenOffice.\nMake_sure_you_have_installed_OpenOffice_with_Java_support.\nIf_connecting_manually,_please_verify_program_and_library_paths.\n\nError_message\:_=\u00c7al\u0131\u015fan_OpenOffice'e_ba\u011flan\u0131lam\u0131yor.\nOpenOffice'i_Java_deste\u011fiyle_kurdu\u011funuza_emin_olun.\nManuel_ba\u011flan\u0131yorsan\u0131z_program_ve_k\u00fct\u00fcphane_yollar\u0131n\u0131_kontrol_edin.\n\nHata_mesaj\u0131\:_
 Created_group_"%0".=Grup_"%0"_olu\u015fturuldu.
-File_has_been_updated_externally._Are_you_sure_you_want_to_save?=Dosya_d\u0131\u015far\u0131dan_g\u00fcncellendi._Kaydetmek_istedi\u011finize_emin_misiniz?
 If_a_pasted_or_imported_entry_already_has_the_field_set,_overwrite.=E\u011fer_yap\u0131\u015ft\u0131r\u0131lm\u0131\u015f_ya_da_i\u00e7e_aktar\u0131lm\u0131\u015f_bir_girdi_alan\u0131_atad\u0131ysa_\u00fczerine_yaz.
 Import_Metadata_From_PDF=Metadata'y\u0131_PDF'ten_\u0130\u00e7e_Aktar
 Not_connected_to_any_Writer_document._Please_make_sure_a_document_is_open,_and_use_the_'Select_Writer_document'_button_to_connect_to_it.=Herhangi_bir_Writer_belgesine_ba\u011flan\u0131lmad\u0131._L\u00fctfen_bir_belgenin_a\u00e7\u0131k_oldu\u011funa_emin_olun_ve_ona_ba\u011flanmak_i\u00e7in_"Write_belgesini_se\u00e7"_d\u00fc\u011fmesini_kullan\u0131n.
@@ -1573,6 +1506,7 @@ Your_style_file_specifies_the_paragraph_format_'%0',_which_is_undefined_in_your_
 Error_fetching_from_Google_Scholar=Google_Akademik'ten_getirmede_hata
 Run_HTML_converter_on_title=Ba\u015fl\u0131kta_HTML_d\u00f6n\u00fc\u015ft\u00fcr\u00fcc\u00fcy\u00fc_\u00e7al\u0131\u015ft\u0131r
 Searching...=Ar\u0131yor...
+
 You_have_selected_more_than_%0_entries_for_download._Some_web_sites_might_block_you_if_you_make_too_many_rapid_downloads._Do_you_want_to_continue?=\u0130ndirmek_i\u00e7in_%0'dan_fazla_girdi_se\u00e7tiniz._\u00c7ok_say\u0131da_h\u0131zl\u0131_indirme_yaparsan\u0131z_baz\u0131_web_siteleri_sizi_bloke_edebilir._Devam_etmek_istiyor_musunuz?
 Confirm_selection=Se\u00e7imi_onayla
 Unknown_DOI\:_'%0'.=Bilinmeyen_DOI\:_'%0'.
@@ -1588,7 +1522,63 @@ An_Error_occurred_while_fetching_from_ADS_(%0)\:=ADS'den_getirirken_bir_hata_olu
 Error_while_fetching_from_ADS=ADS'den_getirirken_hata
 Error_while_fetching_from_OAI2=OAI2'den_getirirken_hata
 An_Error_occurred_while_parsing_abstract=\u00d6zet_ayr\u0131\u015ft\u0131r\u0131l\u0131rken_bir_hata_olu\u015ftu
+Unknown_DiVA_entry\:_'%0'.=_'%0'.=Bilinmeyen_DiVA_girdisi:_'%0'.
 Get_BibTeX_entry_from_DiVA=BibTeX_girdisini_DIVA'dan_al
 Log=Kay\u0131t
-Remove_unneccessary_$,_{,_and_}=Zorunlu_olmayan_$,_{,_ve_}_lar\u0131 sil
-Unknown_DiVA_entry\:_'%0'.=_'%0'.=Bilinmeyen_DiVA_girdisi:_'%0'.
+
+ISO_690=ISO_690
+Format_units_by_adding_non-breaking_separators_and_keeping_the_correct_case_on_search=Birimleri_b\u00f6l\u00fcnemez_ayra\u00e7lar_ekleyerek_ve_aramadaki_b\u00fcy\u00fck_k\u00fc\u00e7\u00fck_harfleri_koruyarak_bi\u00e7imle
+Use_Emacs_key_bindings=Emacs_tu\u015f_ba\u011flant\u0131lar\u0131n\u0131_kullan
+Merge_entries=Girdileri_birle\u015ftir
+Show_URL_first=\u00d6nce_URL'yi_g\u00f6ster
+Show_DOI_first=\u00d6nce_DOI'y\u0131_g\u00f6ster
+Remove_unneccessary_$,_{,_and_}_and_move_adjacent_numbers_into_equations=Gereksiz_$,_{,_ve_}'lar\u0131_sil_ve_biti\u015fik_numaralar\u0131_denkleme_ta\u015f\u0131
+Add_brackets_and_replace_separators_with_their_non-breaking_version_for_units=K\u00f6\u015feli_parantezler_ekle_ve_ayra\u00e7lar\u0131_birimler_i\u00e7in_b\u00f6l\u00fcnemez_s\u00fcr\u00fcmleriyle_de\u011fi\u015ftir
+First_entry=\u0130lk_girdi
+Use_1st=1._kullan
+None=Hi\u00e7
+Use_2nd=2._kullan
+Second_entry=\u0130kinci_girdi
+You_have_to_choose_exactly_two_entries_to_merge.=Birle\u015ftirmek_i\u00e7in_tam_tam\u0131na_iki_girdi_se\u00e7melisiniz.
+Merged_entry=Birle\u015fmi\u015f_girdi
+Error_in_entry=Girdide_hata
+Add_new_entry_and_keep_both_old_entries=Yeni_girdi_ekle_ve_her_iki_eski_girdiyi_de_koru
+Replace_old_entries_with_new_entry=Eski_girdileri_yenisiyle_de\u011fi\u015ftir
+Cancelled_merging_entries=Girdilerin_birle\u015ftirilmesi_iptal_edildi
+Merged_entries_into_a_new_and_kept_the_old=Girdiler_yeni_birine_birle\u015ftirildi_ve_eskiler_korundu
+Merged_entries_into_a_new_and_removed_the_old=Girdiler_yeni_birine_birle\u015ftirildi_ve_eskiler_silindi
+Parse=Ayr\u0131\u015ft\u0131r
+Result=Sonu\u00e7
+Update_timestamp_on_modification=De\u011fi\u015ftirirken_zaman_damgas\u0131n\u0131_g\u00fcncelle
+change_field=alan\u0131_de\u011fi\u015ftir
+All_key_bindings_will_be_reset_to_their_defaults.=T\u00fcm_tu\u015f_ba\u011flant\u0131lar\u0131_\u00f6ntan\u0131ml\u0131lara_d\u00f6n\u00fc\u015ft\u00fcr\u00fclecek.
+Automatically_set_file_links=Dosya_ba\u011flant\u0131lar\u0131n\u0131_otomatik_olarak_kur
+Continue?=Devam?
+Resetting_all_key_bindings=T\u00fcm_tu\u015f_ba\u011flant\u0131lar\u0131_ba\u015fa_d\u00f6nd\u00fcr\u00fcl\u00fcyor
+
+
+Clear_connection_settings=
+Cleared_connection_settings.=
+Curly_Brackets=
+Database_has_changed._Do_you_want_to_save_before_closing?=
+Export_entries_ordered_by_title=
+Field_saving_options=
+Field_value_delimiter._E.g.,_"author\={x}"_or_"author\='x'"=
+Host=
+Include_empty_fields=
+Invalid_setting=
+Network=
+Please_specify_both_hostname_and_port=
+Port=
+Quotes=
+Rebind_C-a,_too=
+Run_Unicode_converter_on_title,_author(s),_and_abstract=
+Save_entries_ordered_by_title=
+Start_field_contents_in_same_column=
+Use_camel_case_for_field_names_(e.g.,_"HowPublished"_instead_of_"howpublished")=
+Use_custom_proxy_configuration=
+
+Show_number_of_elements_contained_in_each_group=
+
+Open_folder=
+Opened_%0_folder(s).=
diff --git a/src/resource/JabRef_vi.properties b/src/resource/JabRef_vi.properties
index 6f6153c..25aa215 100644
--- a/src/resource/JabRef_vi.properties
+++ b/src/resource/JabRef_vi.properties
@@ -188,8 +188,6 @@ Background_color_for_required_fields=M\u00e0u_n\u1ec1n_cho_c\u00e1c_tr\u01b0\u1e
 Backup_old_file_when_saving=Sao_l\u1ea1i_t\u1eadp_tin_c\u0169_khi_l\u01b0u
 Beta_version=Phi\u00ean_b\u1ea3n_Beta
 
-Bibkey_to_filename_conversion=Ph\u00e9p_chuy\u1ec3n_Bibkey_th\u00e0nh_t\u00ean_t\u1eadp_tin
-
 BibTeX_key=Kh\u00f3a_BibTeX
 
 BibTeX_key_is_unique.=Kh\u00f3a_BibTeX_kh\u00f4ng_\u0111\u01b0\u1ee3c_tr\u00f9ng.
@@ -207,8 +205,6 @@ Browse=Duy\u1ec7t
 
 by=theo
 
-Calling_external_viewer...=\u0110ang_g\u1ecdi_tr\u00ecnh_xem_ngo\u00e0i...
-
 Cancel=H\u1ee7y
 
 Cannot_add_entries_to_group_without_generating_keys._Generate_keys_now?=Kh\u00f4ng_th\u1ec3_th\u00eam_c\u00e1c_m\u1ee5c_v\u00e0o_nh\u00f3m_m\u00e0_kh\u00f4ng_t\u1ea1o_kh\u00f3a._C\u00f3_t\u1ea1o_kh\u00f3a_kh\u00f4ng?
@@ -306,7 +302,6 @@ Command_line_id=Ch\u1ec9_s\u1ed1_(id)_c\u1ee7a_d\u00f2ng_l\u1ec7nh
 Complete_record=Ho\u00e0n_t\u1ea5t_b\u1ea3n_ghi
 Connect=K\u1ebft_n\u1ed1i
 Connect_to_SQL_database=K\u1ebft_n\u1ed1i_\u0111\u1ebfn_CSDL_SQL
-Connect_to_SQL_Database=K\u1ebft_n\u1ed1i_\u0111\u1ebfn_CSDL_SQL
 Connection_to_IEEEXplore_failed=K\u1ebft_n\u1ed1i_\u0111\u1ebfn_IEEEXplore_th\u1ea5t_b\u1ea1i
 
 Contained_in=Ch\u1ee9a_trong
@@ -330,10 +325,6 @@ Copy_files_to_file_directory.=Ch\u00e9p_c\u00e1c_t\u1eadp_tin_v\u00e0o_th\u01b0_
 Copy_to_clipboard=Ch\u00e9p_v\u00e0o_b\u1ed9_nh\u1edb_t\u1ea1m
 
 Could_not_call_executable=Kh\u00f4ng_th\u1ec3_g\u1ecdi_ch\u01b0\u01a1ng_tr\u00ecnh
-
-Could_not_connect_to_a_running_gnuserv_process._Make_sure_that_Emacs_or_XEmacs_is_running,<BR>and_that_the_server_has_been_started_(by_running_the_command_'gnuserv-start').=Kh\u00f4ng_th\u1ec3_k\u1ebft_n\u1ed1i_\u0111\u1ebfn_m\u1ed9t_ti\u1ebfn_tr\u00ecnh_gnuserv_\u0111ang_ch\u1ea1y._H\u00e3y_\u0111\u1ea3m_b\u1ea3o_r\u1eb1ng_Emacs_ho\u1eb7c_XEmacs_\u0111ang_ch\u1ea1y,<BR>v\u00e0_r\u1eb1ng_server_\u0111\u00e3_\u0111\u01b0\u1ee3c_kh\u1edfi_\u0111\u1ed9ng_(b\u1eb1ng_c\u00e1ch_ch\u1ea1y_l\u1e [...]
-
-Could_not_connect_to_host_=Kh\u00f4ng_th\u1ec3_k\u1ebft_n\u1ed1i_\u0111\u1ebfn_host_
 Could_not_connect_to_Vim_server._Make_sure_that_Vim_is_running<BR>with_correct_server_name.=Kh\u00f4ng_th\u1ec3_k\u1ebft_n\u1ed1i_\u0111\u1ebfn_server_Vim._H\u00e3y_\u0111\u1ea3m_b\u1ea3o_r\u1eb1ng_Vim_\u0111ang_ch\u1ea1y<BR>v\u1edbi_t\u00ean_server_\u0111\u00fang.
 
 Could_not_export_file=Kh\u00f4ng_th\u1ec3_xu\u1ea5t_t\u1eadp_tin
@@ -360,8 +351,6 @@ Could_not_run_the_'vim'_program.=Kh\u00f4ng_th\u1ec3_ch\u1ea1y_ch\u01b0\u01a1ng_
 Could_not_save_file=Kh\u00f4ng_th\u1ec3_l\u01b0u_t\u1eadp_tin
 Could_not_save_file._Character_encoding_'%0'_is_not_supported.=Kh\u00f4ng_th\u1ec3_l\u01b0u_t\u1eadp_tin._M\u00e3_h\u00f3a_k\u00fd_t\u1ef1_'%0'_kh\u00f4ng_\u0111\u01b0\u1ee3c_h\u1ed7_tr\u1ee3.
 
-Create_group=T\u1ea1o_nh\u00f3m
-
 Created_groups.=C\u00e1c_nh\u00f3m_\u0111\u01b0\u1ee3c_t\u1ea1o_ra.
 
 crossreferenced_entries_included=c\u00e1c_m\u1ee5c_c\u00f3_tham_chi\u1ebfu_ch\u00e9o_\u0111\u01b0\u1ee3c_\u0111\u01b0a_v\u00e0o
@@ -373,8 +362,6 @@ Current_value=Gi\u00e1_tr\u1ecb_hi\u1ec7n_t\u1ea1i
 Custom_entry_types=Ki\u1ec3u_m\u1ee5c_t\u00f9y_ch\u1ec9nh
 
 Custom_entry_types_found_in_file=Ki\u1ec3u_m\u1ee5c_t\u00f9y_ch\u1ec9nh_\u0111\u01b0\u1ee3c_t\u00ecm_th\u1ea5y_trong_t\u1eadp_tin
-Custom_icon_theme=S\u1eafc_th\u00e1i_bi\u1ec3u_t\u01b0\u1ee3ng_t\u00f9y_ch\u1ec9nh
-Custom_icon_theme_file=T\u1eadp_tin_s\u1eafc_th\u00e1i_bi\u1ec3u_t\u01b0\u1ee3ng_t\u00f9y_ch\u1ec9nh
 
 Custom_importers=C\u00e1c_tr\u00ecnh_nh\u1eadp_t\u00f9y_ch\u1ec9nh
 
@@ -393,8 +380,6 @@ Database_\:=CSDL:
 
 Database_encoding=M\u00e3_h\u00f3a_CSDL
 
-Database_has_changed._Do_you_want_to_save_before_closing?=CSDL_\u0111\u00e3_thay_\u0111\u1ed5i._B\u1ea1n_c\u00f3_mu\u1ed1n_l\u01b0u_tr\u01b0\u1edbc_khi_\u0111\u00f3ng_kh\u00f4ng?
-
 Database_properties=T\u00ednh_ch\u1ea5t_c\u1ee7a_CSDL
 
 Date_format=\u0110\u1ecbnh_d\u1ea1ng_ng\u00e0y
@@ -491,10 +476,6 @@ Downloading...=\u0110ang_t\u1ea3i...
 Drag_and_Drop_Error=L\u1ed7i_k\u00e9o_v\u00e0_th\u1ea3
 Drop_%0=Th\u1ea3_%0
 
-duplicate_BibTeX_key=tr\u00f9ng_kh\u00f3a_BibTeX
-
-Duplicate_BibTeX_key.=Tr\u00f9ng_kh\u00f3a_BibTeX.
-
 Duplicate_BibTeX_key._Grouping_may_not_work_for_this_entry.=Tr\u00f9ng_kh\u00f3a_BibTeX._Vi\u1ec7c_g\u1ed9p_nh\u00f3m_c\u00f3_th\u1ec3_kh\u00f4ng_l\u00e0m_\u0111\u01b0\u1ee3c_v\u1edbi_m\u1ee5c_n\u00e0y.
 
 Duplicate_Key_Warning=C\u1ea3nh_b\u00e1o_tr\u00f9ng_kh\u00f3a
@@ -534,13 +515,9 @@ Editor_options=C\u00e1c_t\u00f9y_ch\u1ecdn_tr\u00ecnh_ch\u1ec9nh_s\u1eeda
 
 empty_BibTeX_key=kh\u00f3a_BibTeX_r\u1ed7ng
 
-Empty_BibTeX_key.=Kh\u00f3a_BibTeX_r\u1ed7ng
-
 Empty_BibTeX_key._Grouping_may_not_work_for_this_entry.=Kh\u00f3a_BibTeX_r\u1ed7ng._Vi\u1ec7c_g\u1ed9p_nh\u00f3m_c\u00f3_th\u1ec3_kh\u00f4ng_l\u00e0m_\u0111\u01b0\u1ee3c_v\u1edbi_m\u1ee5c_n\u00e0y.
 
 empty_database=CSDL_r\u1ed7ng
-
-Enable_source_editing=B\u1eadt_ch\u1ec9nh_s\u1eeda_ngu\u1ed3n
 Enable_word/name_autocompletion=B\u1eadt_ch\u1ee9c_n\u0103ng_t\u1ef1_ho\u00e0n_t\u1ea5t_t\u1eeb/t\u00ean
 
 Endnote=Endnote
@@ -581,7 +558,7 @@ Entry_types=C\u00e1c_ki\u1ec3u_c\u1ee7a_m\u1ee5c
 
 Error=L\u1ed7i
 Error\:_=L\u1ed7i:_
-Error_converting_Bibtex_to_XMP\:_%0=L\u1ed7i_chuy\u1ec3n_\u0111\u1ed5i_Bibtex_th\u00e0nh_XMP:_%0
+Error_converting_BibTeX_to_XMP\:_%0=L\u1ed7i_chuy\u1ec3n_\u0111\u1ed5i_Bibtex_th\u00e0nh_XMP:_%0
 Error_converting_XMP_to_'%0'...=L\u1ed7i_chuy\u1ec3n_\u0111\u1ed5i_XMP_th\u00e0nh_'%0'...
 Error_exporting_to_clipboard=L\u1ed7i_xu\u1ea5t_ra_b\u1ed9_nh\u1edb_t\u1ea1m
 
@@ -595,7 +572,6 @@ Error_opening_file=L\u1ed7i_khi_\u0111ang_m\u1edf_t\u1eadp_tin
 Error_setting_field=L\u1ed7i_thi\u1ebft_l\u1eadp_tr\u01b0\u1eddng
 Error_while_converting_BibtexEntry_to_XMP_%0=L\u1ed7i_khi_chuy\u1ec3n_\u0111\u1ed5i_m\u1ee5c_Bibtex_th\u00e0nh_XMP_%0
 Error_while_downloading_file\:=L\u1ed7i_khi_\u0111ang_t\u1ea3i_t\u1eadp_tin:
-Error_while_fetching_from_OIA2=L\u1ed7i_khi_\u0111ang_l\u1ea5y_v\u1ec1_t\u1eeb_OIA2
 Error_while_writing=L\u1ed7i_khi_\u0111ang_ghi
 Error_writing_to_%0_file(s).=L\u1ed7i_khi_\u0111ang_ghi_v\u00e0o_t\u1eadp_tin_%0.
 Error_writing_XMP_to_file\:_%0=L\u1ed7i_khi_\u0111ang_ghi_XMP_v\u00e0o_t\u1eadp_tin:_%0
@@ -657,8 +633,6 @@ Field_to_filter=Tr\u01b0\u1eddng_c\u1ea7n_l\u1ecdc
 
 Field_to_group_by=Tr\u01b0\u1eddng_g\u1ed9p_nh\u00f3m_theo
 
-Fields=C\u00e1c_tr\u01b0\u1eddng
-
 File=T\u1eadp_tin
 
 file=t\u1eadp_tin
@@ -869,8 +843,6 @@ insert_string_=ch\u00e8n_chu\u1ed7i_
 
 Insert_URL=Ch\u00e8n_URL
 
-integrity=t\u00ednh_to\u00e0n_v\u1eb9n
-
 #Integritycheckisaprocessthatchecksforindicationsofwronglyfilledoutbibtexfields."Scan"isthebuttonthatstartsthecheck.
 Integrity_check=ki\u1ec3m_tra_t\u00ednh_to\u00e0n_v\u1eb9n
 
@@ -884,13 +856,8 @@ Invalid_URL=URL_kh\u00f4ng_h\u1ee3p_l\u1ec7
 
 Inverted=\u0110\u1ea3o_ng\u01b0\u1ee3c
 
-is_a_standard_type.=l\u00e0_m\u1ed9t_ki\u1ec3u_chu\u1ea9n.
-
 ISO_abbreviation=Vi\u1ebft_t\u1eaft_ki\u1ec3u_ISO
 
-Item_list_for_field=Danh_s\u00e1ch_h\u1ea1ng_m\u1ee5c_d\u00f9ng_cho_tr\u01b0\u1eddng
-jabref=jabref
-
 JabRef_help=Tr\u1ee3_gi\u00fap_JabRef
 
 JabRef_preferences=C\u00e1c_t\u00f9y_th\u00edch_JabRef
@@ -950,7 +917,6 @@ Load_and_Save_preferences_from/to_jabref.xml_on_start-up_(memory_stick_mode)=N\u
 Load_session=N\u1ea1p_phi\u00ean_l\u00e0m_vi\u1ec7c
 
 Loading_session...=\u0110ang_n\u1ea1p_phi\u00ean_l\u00e0m_vi\u1ec7c...
-localhost=localhost
 
 Look_and_feel=H\u00ecnh_th\u1ee9c
 Looking_for_pdf...=\u0110ang_t\u00ecm_pdf...
@@ -1075,8 +1041,6 @@ No_entries_found_for_the_search_string_'%0'=Kh\u00f4ng_t\u00ecm_th\u1ea5y_m\u1ee
 No_entries_imported.=Kh\u00f4ng_m\u1ee5c_n\u00e0o_\u0111\u01b0\u1ee3c_nh\u1eadp.
 
 No_entries_or_multiple_entries_selected.=Kh\u00f4ng_c\u00f3_m\u1ee5c_ho\u1eb7c_c\u00e1c_m\u1ee5c_n\u00e0o_\u0111\u01b0\u1ee3c_nh\u1eadp.
-
-No_entries_selected=Kh\u00f4ng_c\u00f3_m\u1ee5c_n\u00e0o_\u0111\u01b0\u1ee3c_ch\u1ecdn
 No_entries_selected.=Kh\u00f4ng_c\u00f3_m\u1ee5c_n\u00e0o_\u0111\u01b0\u1ee3c_ch\u1ecdn.
 
 No_exceptions_have_ocurred.=Kh\u00f4ng_x\u1ea3y_ra_ngo\u1ea1i_l\u1ec7_n\u00e0o.
@@ -1118,8 +1082,6 @@ Number_of_references_to_fetch?=S\u1ed1_l\u01b0\u1ee3ng_t\u00e0i_li\u1ec7u_tham_k
 
 occurences=c\u00e1c_l\u1ea7n_xu\u1ea5t_hi\u1ec7n
 
-OK=\u0110\u1ed3ng_\u00fd
-
 Ok=\u0110\u1ed3ng_\u00fd
 One_or_more_file_links_are_of_the_type_'%0',_which_is_undefined._What_do_you_want_to_do?=M\u1ed9t_ho\u1eb7c_nhi\u1ec1u_li\u00ean_k\u1ebft_thu\u1ed9c_ki\u1ec3u_'%0',_t\u1ee9c_l\u00e0_lo\u1ea1i_kh\u00f4ng_x\u00e1c_\u0111\u1ecbnh._B\u1ea1n_mu\u1ed1n_l\u00e0m_g\u00ec?
 
@@ -1210,8 +1172,6 @@ Personal_journal_list=Danh_s\u00e1ch_t\u1ea1p_ch\u00ed_ri\u00eang
 
 Plain_text_import=Nh\u1eadp_v\u0103n_b\u1ea3n_tr\u01a1n
 
-Please_check_your_network_connection_to_this_machine.=Vui_l\u00f2ng_ki\u1ec3m_tra_k\u1ebft_n\u1ed1i_m\u1ea1ng_\u0111\u1ebfn_m\u00e1y_n\u00e0y.
-
 Please_enter_a_name_for_the_group.=Vui_l\u00f2ng_nh\u1eadp_t\u00ean_cho_nh\u00f3m.
 
 Please_enter_a_search_term._For_example,_to_search_all_fields_for_<b>Smith</b>,_enter%c<p><tt>smith</tt><p>To_search_the_field_<b>Author</b>_for_<b>Smith</b>_and_the_field_<b>Title</b>_for_<b>electrical</b>,_enter%c<p><tt>author%esmith_and_title%eelectrical</tt>=Vui_l\u00f2ng_nh\u1eadp_m\u1ed9t_thu\u1eadt_ng\u1eef_t\u00ecm_ki\u1ebfm._V\u00ed_d\u1ee5,_\u0111\u1ec3_t\u00ecm_t\u1eeb_<b>Smith</b>_trong_t\u1ea5t_c\u1ea3_c\u00e1c_tr\u01b0\u1eddng,_nh\u1eadp%c<p><tt>smith</tt><p>._\u0110\u1ec3_ [...]
@@ -1220,8 +1180,6 @@ Please_enter_the_field_to_search_(e.g._<b>keywords</b>)_and_the_keyword_to_searc
 
 Please_enter_the_string's_label=Vui_l\u00f2ng_nh\u1eadp_nh\u00e3n_c\u1ee7a_chu\u1ed7i
 
-Please_select_an_importer=Vui_l\u00f2ng_ch\u1ecdn_m\u1ed9t_tr\u00ecnh_nh\u1eadp
-
 Please_select_an_importer.=Vui_l\u00f2ng_ch\u1ecdn_m\u1ed9t_tr\u00ecnh_nh\u1eadp.
 
 Please_select_exactly_one_group_to_move.=Vui_l\u00f2ng_ch\u1ecdn_ch\u00ednh_x\u00e1c_m\u1ed9t_nh\u00f3m_c\u1ea7n_di_chuy\u1ec3n
@@ -1351,8 +1309,6 @@ Removed_string=\u0110\u00e3_lo\u1ea1i_b\u1ecf_chu\u1ed7i
 
 Renamed_string=Chu\u1ed7i_\u0111\u01b0\u1ee3c_\u0111\u1eb7t_t\u00ean_l\u1ea1i
 
-Replace=Thay_th\u1ebf
-
 Replace_(regular_expression)=Thay_th\u1ebf_(bi\u1ec3u_th\u1ee9c_ch\u00ednh_t\u1eafc)
 
 Replace_string=Thay_th\u1ebf_chu\u1ed7i
@@ -1380,7 +1336,6 @@ Review=Xem_x\u00e9t_l\u1ea1i
 Review_changes=Xem_x\u00e9t_l\u1ea1i_c\u00e1c_thay_\u0111\u1ed5i
 
 Right=Ph\u1ea3i
-root=root
 
 Save=L\u01b0u
 Save_all_finished.=L\u01b0u_t\u1ea5t_c\u1ea3_\u0111\u00e3_ho\u00e0n_t\u1ea5t.
@@ -1418,8 +1373,6 @@ Scan=Qu\u00e9t
 
 Search=T\u00ecm
 
-Search_All_Fields=T\u00ecm_t\u1ea5t_c\u1ea3_c\u00e1c_tr\u01b0\u1eddng
-
 Search_all_fields=T\u00ecm_t\u1ea5t_c\u1ea3_c\u00e1c_tr\u01b0\u1eddng
 
 Search_error=L\u1ed7i_t\u00ecm_ki\u1ebfm
@@ -1431,13 +1384,12 @@ Search_for=T\u00ecm
 Search_general_fields=T\u00ecm_c\u00e1c_tr\u01b0\u1eddng_t\u1ed5ng_qu\u00e1t
 
 Search_IEEEXplore=T\u00ecm_tr\u00ean_IEEEXplore
-Search_IEEExplore=T\u00ecm_tr\u00ean_IEEExplore
 
 Search_optional_fields=T\u00ecm_c\u00e1c_tr\u01b0\u1eddng_t\u00f9y_ch\u1ecdn
 
 Search_required_fields=T\u00ecm_c\u00e1c_tr\u01b0\u1eddng_b\u1eaft_bu\u1ed9c
 
-Search_Specified_Field(s)=T\u00ecm_c\u00e1c_tr\u01b0\u1eddng_\u0111\u01b0\u1ee3c_ch\u1ec9_\u0111\u1ecbnh
+Search_specified_field(s)=T\u00ecm_c\u00e1c_tr\u01b0\u1eddng_\u0111\u01b0\u1ee3c_ch\u1ec9_\u0111\u1ecbnh
 
 Searched_database._Global_number_of_hits=\u0110\u00e3_t\u00ecm_trong_CSDL._S\u1ed1_l\u1ea7n_g\u1eb7p_to\u00e0n_c\u1ee5c
 
@@ -1479,8 +1431,6 @@ Select_new_ImportFormat_Subclass=Ch\u1ecdn_L\u1edbp.ph\u1ee5_\u0110\u1ecbnh.d\u1
 
 Select_the_tree_nodes_to_view_and_accept_or_reject_changes=Ch\u1ecdn_c\u00e1c_n\u1ed1t_tr\u00ean_s\u01a1_\u0111\u1ed3_h\u00ecnh_c\u00e2y_\u0111\u1ec3_xem_v\u00e0_ch\u1ea5p_nh\u1eadn_ho\u1eb7c_t\u1eeb_ch\u1ed1i_thay_\u0111\u1ed5i
 Selected_entries=C\u00e1c_m\u1ee5c_\u0111\u01b0\u1ee3c_ch\u1ecdn
-
-Selector_enabled_fields=C\u00e1c_tr\u01b0\u1eddng_\u0111\u01b0\u1ee3c_k\u00edch_ho\u1ea1t_b\u1edfi_tr\u00ecnh_ch\u1ecdn
 Server_Hostname_\:=T\u00ean_Server-host:
 Server_Type_\:=Ki\u1ec3u_Server:
 Set_field=Thi\u1ebft_l\u1eadp_tr\u01b0\u1eddng
@@ -1619,14 +1569,10 @@ Test=Ki\u1ec3m_tra
 
 Text_Input_Area=V\u00f9ng_nh\u1eadp_ch\u1eef
 
-The_#_character_is_not_allowed_in_BibTeX_fields=K\u00fd_t\u1ef1_#_kh\u00f4ng_\u0111\u01b0\u1ee3c_ph\u00e9p_d\u00f9ng_trong_c\u00e1c_tr\u01b0\u1eddng_BibTeX
-
 The_chosen_date_format_for_new_entries_is_not_valid=\u0110\u1ecbnh_d\u1ea1ng_ng\u00e0y_\u0111\u01b0\u1ee3c_ch\u1ecdn_cho_c\u00e1c_m\u1ee5c_m\u1edbi_kh\u00f4ng_h\u1ee3p_l\u1ec7
 
 The_chosen_encoding_'%0'_could_not_encode_the_following_characters\:_=M\u00e3_h\u00f3a_\u0111\u00e3_ch\u1ecdn_'%0'_kh\u00f4ng_th\u1ec3_m\u00e3_h\u00f3a_\u0111\u01b0\u1ee3c_c\u00e1c_k\u00fd_t\u1ef1_sau:_
 
-The_CiteSeer_fetch_operation_returned_zero_results.=L\u1ec7nh_l\u1ea5y_v\u1ec1_t\u1eeb_CiteSeerX_tr\u1ea3_v\u1ec1_0_k\u1ebft_qu\u1ea3.
-
 
 The_current_version_features_a_new_way_of_handling_links_to_external_files.<br>To_take_advantage_of_this,_your_links_must_be_changed_into_the_new_format,_and<br>JabRef_must_be_configured_to_show_the_new_links.=Phi\u00ean_b\u1ea3n_hi\u1ec7n_t\u1ea1i_c\u00f3_m\u1ed9t_c\u00e1ch_m\u1edbi_\u0111\u1ec3_qu\u1ea3n_l\u00fd_c\u00e1c_li\u00ean_k\u1ebft_\u0111\u1ebfn_t\u1eadp_tin_ngo\u00e0i.<br>\u0110\u1ec3_s\u1eed_d\u1ee5ng_\u0111\u01b0\u1ee3c_\u0111\u1eb7c_\u0111i\u1ec3m_n\u00e0y,_li\u00ean_k\u1eb [...]
 
@@ -1654,8 +1600,6 @@ The_search_is_case_sensitive.=Ph\u00e9p_t\u00ecm_c\u00f3_ph\u00e2n_bi\u1ec7t_ch\
 The_string_has_been_removed_locally=Chu\u1ed7i_n\u00e0y_\u0111\u00e3_b\u1ecb_lo\u1ea1i_b\u1ecf_c\u1ee5c_b\u1ed9
 
 There_are_possible_duplicates_(marked_with_a_'D'_icon)_that_haven't_been_resolved._Continue?=C\u00f3_th\u1ec3_c\u00f3_c\u00e1c_m\u1ee5c_b\u1ecb_tr\u00f9ng_(\u0111\u01b0\u1ee3c_\u0111\u00e1nh_d\u1ea5u_b\u1eb1ng_bi\u1ec3u_t\u01b0\u1ee3ng_'D')_ch\u01b0a_\u0111\u01b0\u1ee3c_gi\u1ea3i_quy\u1ebft._C\u00f3_ti\u1ebfp_t\u1ee5c_kh\u00f4ng?
-
-this_button_will_update=n\u00fat_l\u1ec7nh_n\u00e0y_s\u1ebd_c\u1eadp_nh\u1eadt
 This_database_was_written_using_an_older_version_of_JabRef.=CSDL_n\u00e0y_\u0111\u01b0\u1ee3c_ghi_b\u1eb1ng_c\u00e1ch_d\u00f9ng_phi\u00ean_b\u1ea3n_JabRef_c\u0169_h\u01a1n.
 
 This_entry_has_no_BibTeX_key._Generate_key_now?=M\u1ee5c_n\u00e0y_kh\u00f4ng_c\u00f3_kh\u00f3a_BibTeX._T\u1ea1o_kh\u00f3a_b\u00e2y_gi\u1edd?
@@ -1677,8 +1621,6 @@ This_group_contains_entries_in_which_any_field_contains_the_term_<b>%0</b>=Nh\u0
 This_group_contains_entries_whose_<b>%0</b>_field_contains_the_keyword_<b>%1</b>=Nh\u00f3m_n\u00e0y_ch\u1ee9a_c\u00e1c_m\u1ee5c_c\u00f3_tr\u01b0\u1eddng_<b>%0</b>_ch\u1ee9a_t\u1eeb_kh\u00f3a_<b>%1</b> 
 
 This_group_contains_entries_whose_<b>%0</b>_field_contains_the_regular_expression_<b>%1</b>=Nh\u00f3m_n\u00e0y_ch\u1ee9a_c\u00e1c_m\u1ee5c_c\u00f3_tr\u01b0\u1eddng_<b>%0</b>_ch\u1ee9a_bi\u1ec3u_th\u1ee9c_ch\u00ednh_t\u1eafc_<b>%1</b> 
-
-This_is_a_simple_copy_and_paste_dialog_for_import_some_fields_from_normal_text.=\u0110\u00e2y_l\u00e0_m\u1ed9t_h\u1ed9p_tho\u1ea1i_sao_ch\u00e9p_v\u00e0_d\u00e1n_\u0111\u01a1n_gi\u1ea3n_\u0111\u1ec3_nh\u1eadp_m\u1ed9t_s\u1ed1_tr\u01b0\u1eddng_t\u1eeb_d\u1ea1ng_ch\u1eef_\u0111\u01a1n_gi\u1ea3n.
 This_makes_JabRef_look_up_each_%0_link_and_check_if_the_file_exists._If_not,_you_will_be_given_options<BR>to_resolve_the_problem.=\u0110i\u1ec1u_n\u00e0y_khi\u1ebfn_cho_JabRef_t\u00ecm_t\u1eebng_li\u00ean_k\u1ebft_trong_t\u1ed5ng_s\u1ed1_%0_v\u00e0_ki\u1ec3m_tra_xem_t\u1eadp_tin_c\u00f3_t\u1ed3n_t\u1ea1i_kh\u00f4ng._N\u1ebfu_kh\u00f4ng_b\u1ea1n_s\u1ebd_\u0111\u01b0\u1ee3c_cung_c\u1ea5p_c\u00e1c_t\u00f9y_ch\u1ecdn<BR>\u0111\u1ec3_gi\u1ea3i_quy\u1ebft_tr\u1ee5c_tr\u1eb7c.
 
 This_operation_requires_all_selected_entries_to_have_BibTex_keys_defined.=L\u1ec7nh_n\u00e0y_y\u00eau_c\u1ea7u_t\u1ea5t_c\u1ea3_c\u00e1c_m\u1ee5c_\u0111\u01b0\u1ee3c_ch\u1ecdn_ph\u1ea3i_c\u00f3_kh\u00f3a_BibTex.
@@ -1686,8 +1628,6 @@ This_operation_requires_at_least_one_entry.=L\u1ec7nh_n\u00e0y_y\u00eau_c\u1ea7u
 
 This_operation_requires_one_or_more_entries_to_be_selected.=L\u1ec7nh_n\u00e0y_y\u00eau_c\u1ea7u_ph\u1ea3i_ch\u1ecdn_tr\u01b0\u1edbc_m\u1ed9t_ho\u1eb7c_nhi\u1ec1u_m\u1ee5c.
 
-This_will_move_all_external_links_from_the_'pdf'_and_'ps'_fields_into_the_'%0'_field._Proceed?=L\u1ec7nh_n\u00e0y_s\u1ebd_di_chuy\u1ec3n_t\u1ea5t_c\u1ea3_c\u00e1c_li\u00ean_k\u1ebft_ngo\u00e0i_t\u1eeb_c\u00e1c_tr\u01b0\u1eddng_'pdf'_v\u00e0_'ps'_v\u00e0o_tr\u01b0\u1eddng_'%0'._C\u00f3_ti\u1ebfn_h\u00e0nh_kh\u00f4ng?
-
 To_set_up,_go_to_<B>Tools_->_Manage_journal_abbreviations</B>=\u0110\u1ec3_c\u00e0i_\u0111\u1eb7t,_ch\u1ecdn_<B>T\u00f9y_ch\u1ecdn_->_Qu\u1ea3n_l\u00fd_t\u00ean_vi\u1ebft_t\u1eaft_c\u00e1c_t\u1ea1p_ch\u00ed</B>
 
 Toggle_abbreviation=B\u1eadt/t\u1eaft_vi\u1ebft_t\u1eaft
@@ -1701,8 +1641,6 @@ Type_set_to_'other'=Ki\u1ec3u_\u0111\u01b0\u1ee3c_thi\u1ebft_l\u1eadp_th\u00e0nh
 Unabbreviate_journal_names_of_the_selected_entries=B\u1ecf_vi\u1ebft_t\u1eaft_t\u00ean_c\u00e1c_t\u1ea1p_ch\u00ed_c\u1ee7a_nh\u1eefng_m\u1ee5c_\u0111\u01b0\u1ee3c_ch\u1ecdn
 Unabbreviated_%0_journal_names.=%0_t\u00ean_t\u1ea1p_ch\u00ed_\u0111\u01b0\u1ee3c_b\u1ecf_vi\u1ebft_t\u1eaft.
 
-unable_to_access_LyX-pipe=kh\u00f4ng_th\u1ec3_truy_c\u1eadp_\u1ed1ng-d\u1eabn-LyX
-
 Unable_to_create_graphical_interface=Kh\u00f4ng_th\u1ec3_t\u1ea1o_giao_di\u1ec7n_\u0111\u1ed3_h\u1ecda
 
 Unable_to_open_file.=Kh\u00f4ng_th\u1ec3_m\u1edf_t\u1eadp_tin.
@@ -1746,7 +1684,6 @@ Up=L\u00ean
 Update_to_current_column_widths=C\u1eadp_nh\u1eadt_chi\u1ec1u_r\u1ed9ng_c\u1ed9t_hi\u1ec7n_t\u1ea1i
 
 Updated_group_selection=Ph\u00e9p_ch\u1ecdn_nh\u00f3m_\u0111\u00e3_\u0111\u01b0\u1ee3c_c\u1eadp_nh\u1eadt
-Upgrade_external_links=N\u00e2ng_c\u1ea5p_c\u00e1c_li\u00ean_k\u1ebft_ngo\u00e0i
 Upgrade_external_PDF/PS_links_to_use_the_'%0'_field.=N\u00e2ng_c\u1ea5p_c\u00e1c_li\u00ean_k\u1ebft_ngo\u00e0i_PDF/PS_\u0111\u1ec3_s\u1eed_d\u1ee5ng_tr\u01b0\u1eddng_'%0'.
 Upgrade_file=N\u00e2ng_c\u1ea5p_t\u1eadp_tin
 Upgrade_old_external_file_links_to_use_the_new_feature=N\u00e2ng_c\u1ea5p_c\u00e1c_li\u00ean_k\u1ebft_t\u1eadp_tin_ngo\u00e0i_\u0111\u1ec3_s\u1eed_d\u1ee5ng_t\u00ednh_ch\u1ea5t_m\u1edbi
@@ -1756,10 +1693,7 @@ Upper_Each_First=Ph\u00eda_tr\u00ean_m\u1ed7i_m\u1ee5c_\u0111\u1ea7u_ti\u00ean
 Upper_first=Ph\u00eda_tr\u00ean_\u0111\u1ea7u_ti\u00ean
 
 usage=c\u00e1ch_d\u00f9ng
-
-Use_antialiasing_font=D\u00f9ng_ph\u00f4ng_ch\u1eef_ch\u1ed1ng_r\u0103ng_c\u01b0a
 Use_autocompletion_for_the_following_fields=D\u00f9ng_t\u00ednh_ch\u1ea5t_t\u1ef1_\u0111i\u1ec1n_\u0111\u1ea7y_\u0111\u1ee7_cho_c\u00e1c_tr\u01b0\u1eddng_sau
-Use_custom_icon_theme=D\u00f9ng_s\u1eafc_th\u00e1i_bi\u1ec3u_t\u01b0\u1ee3ng_t\u00f9y_ch\u1ecdn
 Use_default_viewer=D\u00f9ng_tr\u00ecnh_xem_m\u1eb7c_\u0111\u1ecbnh
 
 Use_inspection_window_also_when_a_single_entry_is_imported.=D\u00f9ng_c\u1eeda_s\u1ed5_ki\u1ec3m_tra_ngay_c\u1ea3_khi_ch\u1ec9_c\u00f3_m\u1ed9t_m\u1ee5c_\u0111\u01b0\u1ee3c_nh\u1eadp_v\u00e0o.
@@ -1769,8 +1703,6 @@ Use_other_look_and_feel=D\u00f9ng_di\u1ec7n_m\u1ea1o_kh\u00e1c
 Use_Regular_Expression_Search=D\u00f9ng_ph\u00e9p_t\u00ecm_b\u1eb1ng_bi\u1ec3u_th\u1ee9c_ch\u00ednh_t\u1eafc
 
 Use_regular_expressions=D\u00f9ng_c\u00e1c_bi\u1ec3u_th\u1ee9c_ch\u00ednh_t\u1eafc
-
-Use_the_following_delimiter_character(s)=D\u00f9ng_(c\u00e1c)_k\u00fd_t\u1ef1_ph\u00e2n_t\u00e1ch_c\u1ed9t_sau
 Username_\:=T\u00ean_ng\u01b0\u1eddi_d\u00f9ng:
 
 Value_cleared_externally=Gi\u00e1_tr\u1ecb_b\u1ecb_x\u00f3a_ngo\u00e0i_ch\u01b0\u01a1ng_tr\u00ecnh
@@ -1844,7 +1776,6 @@ Your_new_key_bindings_have_been_stored.=T\u1ed5_h\u1ee3p_ph\u00edm_t\u1eaft_m\u1
 The_following_fetchers_are_available\:=C\u00e1c_tr\u00ecnh_l\u1ea5y_v\u1ec1_sau_c\u00f3_th\u1ec3_d\u00f9ng_\u0111\u01b0\u1ee3c:
 Could_not_find_fetcher_'%0'=Kh\u00f4ng_th\u1ec3_t\u00ecm_th\u1ea5y_tr\u00ecnh_l\u1ea7y_v\u1ec1_'%0'
 Running_Query_'%0'_with_fetcher_'%1'.=\u0110ang_ch\u1ea1y_truy_v\u1ea5n_'%0'_v\u1edbi_tr\u00ecnh_l\u1ea5y_v\u1ec1_'%1'.
-Please_wait!=Vui_l\u00f2ng_ch\u1edd!
 Query_'%0'_with_fetcher_'%1'_did_not_return_any_results.=Ph\u00e9p_truy_v\u1ea5n_'%0'_b\u1eb1ng_tr\u00ecnh_l\u1ea5y_v\u1ec1_'%1'_kh\u00f4ng_tr\u1ea3_l\u1ea1i_k\u1ebft_qu\u1ea3_n\u00e0o.
 Open_SPIRES_entry=M\u1edf_m\u1ee5c_SPIRES
 Move/Rename_file=Chuy\u1ec3n/\u0110\u1eb7t_l\u1ea1i_t\u00ean_t\u1eadp_tin
@@ -1852,7 +1783,6 @@ File_moved=T\u1eadp_tin_b\u1ecb_di_chuy\u1ec3n
 Move_file_failed=Vi\u1ec7c_chuy\u1ec3n_t\u1eadp_tin_th\u1ea5t_b\u1ea1i
 Could_not_move_file=Kh\u00f4ng_th\u1ec3_chuy\u1ec3n_t\u1eadp_tin
 Could_not_find_file_'%0'.=Kh\u00f4ng_t\u00ecm_th\u1ea5y_t\u1eadp_tin_'%0'.
-Move/rename_file=Chuy\u1ec3n/\u0111\u1eb7t_l\u1ea1i_t\u00ean_t\u1eadp_tin
 Number_of_entries_successfully_imported=S\u1ed1_m\u1ee5c_\u0111\u01b0\u1ee3c_nh\u1eadp_v\u00e0o_th\u00e0nh_c\u00f4ng
 Import_canceled_by_user=Vi\u1ec7c_nh\u1eadp_b\u1ecb_ng\u01b0\u1eddi_d\u00f9ng_h\u1ee7y
 Progress\:_%0_of_%1=Ti\u1ebfn_tr\u00ecnh:_%0_of_%1
@@ -1969,11 +1899,9 @@ Version=Phi\u00ean_b\u1ea3n
 Unknown=Kh\u00f4ng_r\u00f5
 Not_loaded=Kh\u00f4ng_\u0111\u01b0\u1ee3c_n\u1ea1p
 Loaded=\u0110\u00e3_\u0111\u01b0\u1ee3c_n\u1ea1p
-Could_not_determine_version_of_=Kh\u00f4ng_th\u1ec3_x\u00e1c_\u0111\u1ecbnh_phi\u00ean_b\u1ea3n_c\u1ee7a_
 Install_anyway?=C\u1ee9_c\u00e0i_\u0111\u1eb7t?
 
 Looking_for_full_text_document...=\u0110ang_t\u00ecm_t\u00e0i_li\u1ec7u_\u0111\u1ea7y_\u0111\u1ee7...
-Follow_DOI_or_URL_link_and_try_to_locate_PDF_full_text_document=Theo_li\u00ean_k\u1ebft_URL_ho\u1eb7c_DOI_v\u00e0_c\u1ed1_g\u1eafng_\u0111\u1ecbnh_v\u1ecb_t\u00e0i_li\u1ec7u_PDF_\u0111\u1ea7y_\u0111\u1ee7
 Unable_to_find_full_text_article._No_search_algorithm_defined_for_the_'%0'_web_site.=Kh\u00f4ng_th\u1ec3_t\u00ecm_th\u1ea5y_b\u00e0i_vi\u1ebft_\u0111\u1ea7y_\u0111\u1ee7._Kh\u00f4ng_c\u00f3_thu\u1eadt_to\u00e1n_t\u00ecm_ki\u1ebfm_\u0111\u01b0\u1ee3c_\u0111\u1ecbnh_ngh\u0129a_tr\u00ean_trang_web_'%0'.
 Found_pdf_link,_but_received_the_wrong_MIME_type._This_could_indicate_that_you_don't_have_access_to_the_fulltext_article.=T\u00ecm_th\u1ea5y_li\u00ean_k\u1ebft_pdf,_nh\u01b0ng_l\u1ea1i_nh\u1eadn_\u0111\u01b0\u1ee3c_ki\u1ec3u_MIME_sai._\u0110i\u1ec1u_c\u00f3_th\u1ec3_ch\u1ec9_ra_r\u1eb1ng_b\u1ea1n_kh\u00f4ng_c\u00f3_quy\u1ec1n_truy_c\u1eadp_v\u00e0o_b\u00e0i_vi\u1ebft_\u0111\u1ea7y_\u0111\u1ee7.
 
@@ -2021,8 +1949,6 @@ Before_saving,_please_edit_any_strings_containing_the_#_character.=Tr\u01b0\u1ed
 
 Save_without_backup?=L\u01b0u_kh\u00f4ng_c\u00f3_b\u1ea3n_d\u1ef1_ph\u00f2ng?
 Unable_to_create_backup=Kh\u00f4ng_th\u1ec3_t\u1ea1o_b\u1ea3n_d\u1ef1_ph\u00f2ng
-
-File_directory_is_not_set_or_does_not_exist.=Th\u01b0_m\u1ee5c_t\u1eadp_tin_kh\u00f4ng_\u0111\u01b0\u1ee3c_thi\u1ebft_l\u1eadp_ho\u1eb7c_kh\u00f4ng_t\u1ed3n_t\u1ea1i.
 Move_file_to_file_directory.=Di_chuy\u1ec3n_t\u1eadp_tin_v\u00e0o_th\u01b0_m\u1ee5c_t\u1eadp_tin.
 Rename_file_to=\u0110\u1ed5i_t\u00ean_t\u1eadp_tin_th\u00e0nh
 <b>All_Entries</b>_(this_group_cannot_be_edited_or_removed)=<b>T\u1ea5t_c\u1ea3_c\u00e1c_m\u1ee5c</b>_(kh\u00f4ng_th\u1ec3_ch\u1ec9nh_s\u1eeda_ho\u1eb7c_lo\u1ea1i_b\u1ecf_nh\u00f3m_n\u00e0y)
@@ -2044,7 +1970,6 @@ Error_while_fetching_from_ScienceDirect=L\u1ed7i_khi_\u0111ang_l\u1ea5y_v\u1ec1_
 Error_initializing_custom_export_format_from_string_'%0'=L\u1ed7i_khi_kh\u1edfi_t\u1ea1o_\u0111\u1ecbnh_d\u1ea1ng_xu\u1ea5t_t\u00f9y_ch\u1ecdn_t\u1eeb_chu\u1ed7i_'%0'
 BibLaTeX_mode=
 Optional_fields_2=
-Please_wait=
 Waiting_for_save_operation_to_finish=
 Resolving_duplicate_BibTeX_keys...=
 Finished_resolving_duplicate_BibTeX_keys._%0_entries_modified.=
@@ -2056,8 +1981,6 @@ Duplicate_BibTeX_key=
 Duplicate_key=
 Generate_key=
 Import_marking_color=
-
-%0_entries_found._To_reduce_server_load,_only_%1_will_be_downloaded._It_will_be_very_slow,_in_order_to_make_ACM_happy.=T\u00ecm_th\u1ea5y_%0_m\u1ee5c._\u0110\u1ec3_gi\u1ea3m_t\u1ea3i_cho_server,_ch\u1ec9_c\u00f3_%1_s\u1ebd_\u0111\u01b0\u1ee3c_n\u1ea1p._S\u1ebd_r\u1ea5t_ch\u1eadm,_\u0111\u1ec3_\u0111\u1ea3m_b\u1ea3o_ACM_"h\u00e0i_l\u00f2ng".
 BibTeX_importer=Tr\u00ecnh_nh\u1eadp_BibTeX
 Always_add_letter_(a,_b,_...)_to_generated_keys=
 
@@ -2074,7 +1997,6 @@ An_autosave_file_was_found_for_this_database._This_could_indicate_=
 that_JabRef_didn't_shut_down_cleanly_last_time_the_file_was_used.=
 General_file_directory=
 User-specific_file_directory=
-Error_setting_look_and_feel=
 Search_failed\:_illegal_search_expression=
 Show_ArXiv_column=
 <HTML>Unpack_the_zip_file_containing_import/export_filters_for_Endnote,<BR>for_optimal_interoperability_with_JabRef</HTML>=
@@ -2089,7 +2011,6 @@ Create_entry_based_on_XMP_data=
 Create_entry_based_on_data_fetched_from=
 Create_blank_entry_linking_the_PDF=
 Only_attach_PDF=
-Mr._dLib_Metadata_Entries_Associated_With\:=
 Mr._dLib_Metadata_Entries_Associated_With_PDF_File=
 Title=
 Author(s)=
@@ -2108,21 +2029,18 @@ Update_Existing_Entry=
 Mr._dLib=
 More_information=
 Fetching_Metadata...=
-Metadata=
 Autocomplete_names_in_'Firstname_Lastname'_format_only=
 Autocomplete_names_in_'Lastname,_Firstname'_format_only=
 Autocomplete_names_in_both_formats=
 Marking_color_%0=
 The_name_'comment'_can_not_be_used_as_an_entry_type_name.=
 You_must_enter_an_integer_value_in_the_text_field_for=
-File_directory=
 Send_as_email=
 References=
 Sending_of_emails=
 Subject_for_sending_an_email_with_references=
 Automatically_open_folders_of_attached_files=
 Create_entry_based_on_content=
-Store_choice_as_default=
 Do_not_show_this_box_again_for_this_import=
 Always_use_this_PDF_import_style_(and_do_not_ask_for_each_import)=
 Error_creating_email=
@@ -2148,7 +2066,6 @@ Extra_information_(e.g._page_number)=
 Manage_citations=
 Problem_modifying_citation=
 Citation=
-Context=
 Extra_information=
 Could_not_resolve_BibTeX_entry_for_citation_marker_'%0'.=
 Styles=
@@ -2173,13 +2090,11 @@ Unable_to_synchronize_bibliography=
 Combine_pairs_of_citations_that_are_separated_by_spaces_only=
 Autodetection_failed=
 Connecting=
-Please_wait...=
-Unable_to_connect=
+Please_wait...=Vui_l\u00f2ng_ch\u1edd...
 Set_connection_parameters=
 Path_to_OpenOffice_directory=
 Path_to_OpenOffice_executable=
 Path_to_OpenOffice_library_dir=
-Autodetect=
 Connection_lost=
 The_paragraph_format_is_controlled_by_the_property_'ReferenceParagraphFormat'_or_'ReferenceHeaderParagraphFormat'_in_the_style_file.=
 The_character_format_is_controlled_by_the_citation_property_'CitationCharacterFormat'_in_the_style_file.=
@@ -2202,7 +2117,6 @@ JSTOR_import_cancelled=
 HTML_list=
 Click_group_to_toggle_membership_of_selected_entries=
 Use_EMACS_23_insertion_string=
-Normalize_to_BibTeX_name_format=
 If_possible,_normalize_this_list_of_names_to_conform_to_standard_BibTeX_name_formatting=
 Could_not_open_%0=
 Unknown_import_format=
@@ -2211,7 +2125,6 @@ An_Error_occurred_while_fetching_from_INSPIRE_source_(%0)\:=
 Error_while_fetching_from_Inspire\:_=
 Web_search=
 Autocomplete_names=
-You_must_select_either_a_valid_style_file,_or_use_the_default_style.=
 Default_style=
 Choose_style_file_directly=
 Choose_from_a_directory=
@@ -2253,7 +2166,6 @@ Autocompletion_options=
 Autocomplete_after_following_number_of_characters=
 Name_format_used_for_autocompletion=
 Treatment_of_first_names=
-No_icon_found_for_%0=
 Cleanup_entries=
 Automatically_assign_new_entry_to_selected_groups=
 Move_DOIs_from_note_and_URL_field_to_DOI_field_and_remove_http_prefix=
@@ -2267,13 +2179,9 @@ Doing_a_cleanup_for_%0_entries...=
 No_entry_needed_a_clean_up=
 One_entry_needed_a_clean_up=
 %0_entries_needed_a_clean_up=
-Imported_=
 Error_importing_from_database=
 Minimize_to_system_tray=
 
-Incomplete_search_results=
-%0_entries_were_found,_but_only_%1_of_these_could_be_resolved.=
-
 Error_downloading_file_'%0'=
 Download_failed=
 
@@ -2299,10 +2207,9 @@ Unable_to_clear_preferences.=
 
 Reset_preferences_(key1,key2,..._or_'all')=
 Find_unlinked_files=
-Select_All=
-Unselect_All=
-Expand_All=
-Collapse_All=
+Unselect_all=
+Expand_all=
+Collapse_all=
 Select_Directory=
 Choose_Directory=
 Use_the_selected_directory_to_start_with_the_search.=
@@ -2362,7 +2269,6 @@ Priority_medium=
 Quality=
 Rank=
 Relevance=
-Set_priority=
 Set_priority_to_high=
 Set_priority_to_low=
 Set_priority_to_medium=
@@ -2394,7 +2300,6 @@ Correct_the_entry,_and_reopen_editor_to_display/edit_source.=
 Could_not_connect_to_a_running_gnuserv_process._Make_sure_that_Emacs_or_XEmacs_is_running,<BR>and_that_the_server_has_been_started_(by_running_the_command_'server-start'/'gnuserv-start').=
 Could_not_connect_to_running_OpenOffice.\nMake_sure_you_have_installed_OpenOffice_with_Java_support.\nIf_connecting_manually,_please_verify_program_and_library_paths.\n\nError_message\:_=
 Created_group_"%0".=
-File_has_been_updated_externally._Are_you_sure_you_want_to_save?=
 If_a_pasted_or_imported_entry_already_has_the_field_set,_overwrite.=
 Import_Metadata_From_PDF=
 Not_connected_to_any_Writer_document._Please_make_sure_a_document_is_open,_and_use_the_'Select_Writer_document'_button_to_connect_to_it.=
@@ -2429,4 +2334,62 @@ An_Error_occurred_while_parsing_abstract=
 Unknown_DiVA_entry\:_'%0'.=
 Get_BibTeX_entry_from_DiVA=
 Log=
-Remove_unneccessary_$,_{,_and_}=
+
+ISO_690=
+
+Add_brackets_and_replace_separators_with_their_non-breaking_version_for_units=
+Add_new_entry_and_keep_both_old_entries=
+Cancelled_merging_entries=
+Error_in_entry=
+First_entry=
+Format_units_by_adding_non-breaking_separators_and_keeping_the_correct_case_on_search=
+Merge_entries=
+Merged_entries_into_a_new_and_kept_the_old=
+Merged_entries_into_a_new_and_removed_the_old=
+Merged_entry=
+None=
+Parse=
+Remove_unneccessary_$,_{,_and_}_and_move_adjacent_numbers_into_equations=
+Replace_old_entries_with_new_entry=
+Result=
+Second_entry=
+Show_DOI_first=
+Show_URL_first=
+Use_1st=
+Use_2nd=
+Use_Emacs_key_bindings=
+You_have_to_choose_exactly_two_entries_to_merge.=
+
+Update_timestamp_on_modification=
+change_field=
+
+All_key_bindings_will_be_reset_to_their_defaults.=
+Automatically_set_file_links=
+Continue?=
+Resetting_all_key_bindings=
+Save_entries_ordered_by_title=
+Export_entries_ordered_by_title=
+Quotes=
+Curly_Brackets=
+Include_empty_fields=
+Field_saving_options=
+Field_value_delimiter._E.g.,_"author\={x}"_or_"author\='x'"=
+Run_Unicode_converter_on_title,_author(s),_and_abstract=
+
+Database_has_changed._Do_you_want_to_save_before_closing?=
+Host=
+Invalid_setting=
+Network=
+Please_specify_both_hostname_and_port=
+Port=
+Start_field_contents_in_same_column=
+Use_camel_case_for_field_names_(e.g.,_"HowPublished"_instead_of_"howpublished")=
+Use_custom_proxy_configuration=
+Clear_connection_settings=
+Cleared_connection_settings.=
+Rebind_C-a,_too=
+
+Show_number_of_elements_contained_in_each_group=
+
+Open_folder=
+Opened_%0_folder(s).=
diff --git a/src/resource/JabRef_zh.properties b/src/resource/JabRef_zh.properties
index 1ff72d6..9466f58 100644
--- a/src/resource/JabRef_zh.properties
+++ b/src/resource/JabRef_zh.properties
@@ -188,8 +188,6 @@ Background_color_for_required_fields=\u5fc5\u9009\u57df\u7684\u80cc\u666f\u989c\
 Backup_old_file_when_saving=\u4fdd\u5b58\u6570\u636e\u5e93\u65f6\u4fdd\u7559\u5907\u4efd
 Beta_version=Beta_\u7248\u672c
 
-Bibkey_to_filename_conversion=Bibkey_\u5230\u6587\u4ef6\u540d\u8f6c\u6362
-
 BibTeX_key=BibTeX_\u952e
 
 BibTeX_key_is_unique.=BibTeX_\u952e\u503c\u662f\u552f\u4e00\u7684\u3002
@@ -207,8 +205,6 @@ Browse=\u6d4f\u89c8...
 
 by=\u4e3a
 
-Calling_external_viewer...=\u6b63\u5728\u8c03\u7528\u5916\u90e8\u67e5\u770b\u5668...
-
 Cancel=\u53d6\u6d88
 
 Cannot_add_entries_to_group_without_generating_keys._Generate_keys_now?=\u4e0d\u751f\u6210_BibTeX_\u952e\u5c31\u65e0\u6cd5\u6dfb\u52a0\u8bb0\u5f55\u5230\u5206\u7ec4\uff0c\u73b0\u5728\u751f\u6210\u952e\u503c\uff1f
@@ -306,7 +302,6 @@ Command_line_id=\u547d\u4ee4\u884c_id
 Complete_record=\u5b8c\u6210\u8bb0\u5f55
 Connect=\u8fde\u63a5
 Connect_to_SQL_database=\u8fde\u63a5_SQL_\u6570\u636e\u5e93
-Connect_to_SQL_Database=\u8fde\u63a5_SQL_\u6570\u636e\u5e93
 Connection_to_IEEEXplore_failed=\u65e0\u6cd5\u8fde\u63a5\u5230_IEEEXplore\uff0c\u8fde\u63a5\u5931\u8d25\u3002
 
 Contained_in=\u5305\u542b\u5728
@@ -330,10 +325,6 @@ Copy_files_to_file_directory.=\u62f7\u8d1d\u6587\u4ef6\u5230\u6587\u4ef6\u76ee\u
 Copy_to_clipboard=\u590d\u5236\u5230\u526a\u8d34\u677f
 
 Could_not_call_executable=\u65e0\u6cd5\u8c03\u7528\u53ef\u6267\u884c\u6587\u4ef6
-
-Could_not_connect_to_a_running_gnuserv_process._Make_sure_that_Emacs_or_XEmacs_is_running,<BR>and_that_the_server_has_been_started_(by_running_the_command_'gnuserv-start').=\u65e0\u6cd5\u8fde\u63a5\u5230\u6b63\u5728\u8fd0\u884c\u7684_gnuserv_\u8fdb\u7a0b\uff0c\u68c0\u67e5_Emacs_\u6216_XEmacs_\u662f\u5426\u6b63\u5728\u8fd0\u884c\uff0c\u4ee5\u53ca<BR>\u670d\u52a1\u5668\u662f\u5426\u5df2\u7ecf\u542f\u52a8(\u7528_'gnuserv-start'_\u547d\u4ee4)\u3002
-
-Could_not_connect_to_host_=\u65e0\u6cd5\u8fde\u63a5\u5230\u4e3b\u673a_
 Could_not_connect_to_Vim_server._Make_sure_that_Vim_is_running<BR>with_correct_server_name.=\u65e0\u6cd5\u8fde\u63a5\u5230_Vim_\u670d\u52a1\u5668\uff0c\u8bf7\u68c0\u67e5_Vim_\u662f\u5426\u4ee5\u6b63\u786e\u7684_Vim_\u670d\u52a1\u5668\u540d\u9009\u9879\u542f\u52a8\u3002
 
 Could_not_export_file=\u65e0\u6cd5\u5bfc\u51fa\u6587\u4ef6
@@ -360,8 +351,6 @@ Could_not_run_the_'vim'_program.=\u65e0\u6cd5\u8fd0\u884c_'vim'_\u7a0b\u5e8f\u30
 Could_not_save_file=\u65e0\u6cd5\u4fdd\u5b58\u6587\u4ef6
 Could_not_save_file._Character_encoding_'%0'_is_not_supported.=\u65e0\u6cd5\u4fdd\u5b58\u6587\u4ef6\uff0c\u4e0d\u652f\u6301\u7f16\u7801_'%0'\u3002
 
-Create_group=\u65b0\u5efa\u5206\u7ec4
-
 Created_groups.=\u5efa\u7acb\u5206\u7ec4
 
 crossreferenced_entries_included=\u5305\u542b\u4ea4\u53c9\u5f15\u7528\u7684\u8bb0\u5f55
@@ -373,8 +362,6 @@ Current_value=\u5f53\u524d\u503c
 Custom_entry_types=\u81ea\u5b9a\u4e49\u7684\u8bb0\u5f55\u7c7b\u578b
 
 Custom_entry_types_found_in_file=\u6587\u4ef6\u4e2d\u5305\u542b\u81ea\u5b9a\u4e49\u7684\u8bb0\u5f55\u7c7b\u578b
-Custom_icon_theme=\u81ea\u5b9a\u4e49\u56fe\u6807\u4e3b\u9898
-Custom_icon_theme_file=\u81ea\u5b9a\u4e49\u56fe\u6807\u4e3b\u9898\u6587\u4ef6
 
 Custom_importers=\u81ea\u5b9a\u4e49\u5bfc\u5165\u5668
 
@@ -393,8 +380,6 @@ Database_\:=\u6570\u636e\u5e93:
 
 Database_encoding=\u6570\u636e\u5e93\u7f16\u7801
 
-Database_has_changed._Do_you_want_to_save_before_closing?=\u6570\u636e\u5e93\u5df2\u88ab\u4fee\u6539\uff0c\u662f\u5426\u4fdd\u5b58\u4fee\u6539\uff1f
-
 Database_properties=\u6570\u636e\u5e93\u5c5e\u6027
 
 Date_format=\u65e5\u671f\u683c\u5f0f
@@ -491,10 +476,6 @@ Downloading...=\u4e0b\u8f7d\u4e2d...
 Drag_and_Drop_Error=\u62d6\u653e\u9519\u8bef
 Drop_%0=\u91ca\u653e_%0
 
-duplicate_BibTeX_key=\u91cd\u590d\u7684_BibTeX_\u952e\u503c
-
-Duplicate_BibTeX_key.=\u91cd\u590d\u7684_BibTeX_\u952e\u503c\u3002
-
 Duplicate_BibTeX_key._Grouping_may_not_work_for_this_entry.=\u91cd\u590d\u7684_BibTeX_\u952e\uff0c\u8be5\u8bb0\u5f55\u53ef\u80fd\u65e0\u6cd5\u88ab\u5206\u7ec4\u3002
 
 Duplicate_Key_Warning=\u91cd\u590d\u952e\u503c\u8b66\u544a
@@ -534,13 +515,9 @@ Editor_options=\u7f16\u8f91\u5668\u9009\u9879
 
 empty_BibTeX_key=\u7a7a_BibTeX_\u952e
 
-Empty_BibTeX_key.=\u7a7a_BibTeX_\u952e\u3002
-
 Empty_BibTeX_key._Grouping_may_not_work_for_this_entry.=\u7a7a\u767d\u7684_BibTeX_\u952e\uff0c\u8be5\u8bb0\u5f55\u53ef\u80fd\u65e0\u6cd5\u88ab\u5206\u7ec4\u3002
 
 empty_database=\u7a7a\u6570\u636e\u5e93
-
-Enable_source_editing=\u542f\u7528\u6e90\u4ee3\u7801\u7f16\u8f91
 Enable_word/name_autocompletion=\u542f\u7528\u8bcd\u7ec4/\u59d3\u540d\u81ea\u52a8\u5b8c\u6210
 
 Endnote=Endnote
@@ -582,7 +559,7 @@ Entry_types=\u8bb0\u5f55\u7c7b\u578b
 
 Error=\u9519\u8bef
 Error\:_=\u9519\u8bef:_
-Error_converting_Bibtex_to_XMP\:_%0=\u8f6c\u6362_Bibtex_\u5230_XMP_\u9519\u8bef:_%0
+Error_converting_BibTeX_to_XMP\:_%0=\u8f6c\u6362_Bibtex_\u5230_XMP_\u9519\u8bef:_%0
 Error_converting_XMP_to_'%0'...=\u8f6c\u6362_XMP_\u5230_'%0'_\u9519\u8bef...
 Error_exporting_to_clipboard=\u5bfc\u51fa\u5230\u526a\u8d34\u677f\u9519\u8bef
 ##Error:_check_your_External_viewer_settings_in_Preferences=\u9519\u8bef\uff1a\u8bf7\u68c0\u67e5\u201c\u9996\u9009\u9879\u201d\u4e2d\u7684\u5916\u90e8\u67e5\u770b\u5668\u8bbe\u7f6e
@@ -595,7 +572,6 @@ Error_opening_file=\u6253\u5f00\u6587\u4ef6\u9519\u8bef
 Error_setting_field=\u8bbe\u7f6e\u57df\u9519\u8bef
 Error_while_converting_BibtexEntry_to_XMP_%0=\u8f6c\u6362_Bibtex_\u8bb0\u5f55\u5230_XMP_\u9519\u8bef_%0
 Error_while_downloading_file\:=\u4e0b\u8f7d\u6587\u4ef6\u9519\u8bef:
-Error_while_fetching_from_OIA2=\u4ece_OIA2_\u6293\u53d6\u9519\u8bef
 Error_while_writing=\u5199\u5165\u9519\u8bef
 Error_writing_to_%0_file(s).=\u5199\u5165\u5230_%0_\u6587\u4ef6\u9519\u8bef\u3002
 Error_writing_XMP_to_file\:_%0=\u5199\u5165_XMP_\u5230\u6587\u4ef6\u9519\u8bef:_%0
@@ -655,8 +631,6 @@ Field_to_filter=\u8981\u8fc7\u6ee4\u7684\u57df
 
 Field_to_group_by=\u7528\u6765\u5206\u7ec4\u7684\u57df
 
-Fields=\u57df
-
 File=\u6587\u4ef6
 
 file=\u6587\u4ef6
@@ -867,8 +841,6 @@ insert_string_=\u63d2\u5165\u5b57\u4e32_
 
 Insert_URL=\u63d2\u5165_URL
 
-integrity=\u5b8c\u6574\u6027
-
 Integrity_check=\u5b8c\u6574\u6027\u68c0\u67e5
 
 Intersection=\u4ea4\u96c6
@@ -881,13 +853,8 @@ Invalid_URL=\u975e\u6cd5\u7684_URL
 
 Inverted=\u8865\u96c6
 
-is_a_standard_type.=\u662f\u4e00\u4e2a\u6807\u51c6\u7c7b\u578b\u3002
-
 ISO_abbreviation=ISO_\u7f29\u5199
 
-Item_list_for_field=\u57df\u7684\u5143\u7d20\u5217\u8868
-jabref=jabref
-
 JabRef_help=JabRef_\u5e2e\u52a9
 
 JabRef_preferences=JabRef_\u9996\u9009\u9879
@@ -947,7 +914,6 @@ Load_and_Save_preferences_from/to_jabref.xml_on_start-up_(memory_stick_mode)=\u5
 Load_session=\u8f7d\u5165\u4f1a\u8bdd
 
 Loading_session...=\u8f7d\u5165\u4f1a\u8bdd...
-localhost=localhost
 
 Look_and_feel=\u89c6\u89c9\u6548\u679c\u7c7b_(look_and_feel\uff0c\u5373_Java_\u754c\u9762\u7c7b)
 Looking_for_pdf...=\u641c\u7d22_pdf...
@@ -1072,8 +1038,6 @@ No_entries_found_for_the_search_string_'%0'=\u6ca1\u6709\u627e\u5230\u7b26\u5408
 No_entries_imported.=\u6ca1\u6709\u5bfc\u5165\u8bb0\u5f55\u3002
 
 No_entries_or_multiple_entries_selected.=\u6ca1\u6709\u9009\u4e2d\u8bb0\u5f55\u3002
-
-No_entries_selected=\u6ca1\u6709\u9009\u4e2d\u4efb\u4f55\u8bb0\u5f55
 No_entries_selected.=\u6ca1\u6709\u9009\u4e2d\u4efb\u4f55\u8bb0\u5f55\u3002
 
 No_exceptions_have_ocurred.=\u6ca1\u6709\u53d1\u751f\u5f02\u5e38\u3002
@@ -1115,8 +1079,6 @@ Number_of_references_to_fetch?=\u8981\u6293\u53d6\u7684\u5f15\u7528\u6570\uff1f
 
 occurences=\u6b21
 
-OK=\u786e\u5b9a
-
 Ok=\u786e\u5b9a
 One_or_more_file_links_are_of_the_type_'%0',_which_is_undefined._What_do_you_want_to_do?=\u4e00\u4e2a\u6216\u591a\u4e2a\u6587\u4ef6\u94fe\u63a5\u662f\u672a\u5b9a\u4e49\u7684\u6587\u4ef6\u7c7b\u578b_'%0'\uff0c\u60a8\u5e0c\u671b\u600e\u4e48\u505a\uff1f
 
@@ -1207,8 +1169,6 @@ Personal_journal_list=\u79c1\u6709\u7684\u671f\u520a\u5217\u8868
 
 Plain_text_import=\u7eaf\u6587\u672c\u5bfc\u5165
 
-Please_check_your_network_connection_to_this_machine.=\u8bf7\u68c0\u67e5\u8fd9\u53f0\u673a\u5668\u7684\u7f51\u7edc\u8fde\u63a5\u3002
-
 Please_enter_a_name_for_the_group.=\u8bf7\u4e3a\u8be5\u5206\u7ec4\u8f93\u5165\u4e00\u4e2a\u540d\u5b57
 
 Please_enter_a_search_term._For_example,_to_search_all_fields_for_<b>Smith</b>,_enter%c<p><tt>smith</tt><p>To_search_the_field_<b>Author</b>_for_<b>Smith</b>_and_the_field_<b>Title</b>_for_<b>electrical</b>,_enter%c<p><tt>author%esmith_and_title%eelectrical</tt>=\u8bf7\u8f93\u5165\u4e00\u4e2a\u641c\u7d22\u8bcd\u7ec4\u3002\u4f8b\u5982\uff0c\u8981\u5728\u6240\u6709\u57df\u4e2d\u641c\u7d22_<b>Smith</b>\uff0c\u5c31\u8f93\u5165%c<p><tt>smith</tt><p>\u8981\u5728_<b>Author</b>_\u57df\u4e2d\u641 [...]
@@ -1217,8 +1177,6 @@ Please_enter_the_field_to_search_(e.g._<b>keywords</b>)_and_the_keyword_to_searc
 
 Please_enter_the_string's_label=\u8bf7\u8f93\u5165\u5b57\u4e32\u7684\u6807\u7b7e
 
-Please_select_an_importer=\u8bf7\u9009\u62e9\u4e00\u4e2a\u5bfc\u5165\u5668
-
 Please_select_an_importer.=\u8bf7\u9009\u62e9\u4e00\u4e2a\u5bfc\u5165\u5668\u3002
 
 Please_select_exactly_one_group_to_move.=\u8bf7\u9009\u4e2d\u4e00\u4e2a\u5206\u7ec4\u6765\u79fb\u52a8\u3002
@@ -1348,8 +1306,6 @@ Removed_string=\u5df2\u79fb\u9664\u7b80\u5199\u5b57\u4e32
 
 Renamed_string=\u91cd\u547d\u540d\u5b57\u7b26\u4e32
 
-Replace=\u66ff\u6362
-
 Replace_(regular_expression)=\u66ff\u6362_(\u6b63\u5219\u8868\u8fbe\u5f0f)
 
 Replace_string=\u66ff\u6362\u5b57\u7b26\u4e32
@@ -1377,7 +1333,6 @@ Review=\u8bc4\u8bba
 Review_changes=\u590d\u67e5\u4fee\u6539
 
 Right=\u53f3
-root=root
 
 Save=\u4fdd\u5b58
 Save_all_finished.=\u5b8c\u6210\u4fdd\u5b58\u5168\u90e8\u3002
@@ -1415,8 +1370,6 @@ Scan=\u626b\u63cf
 
 Search=\u67e5\u627e
 
-Search_All_Fields=\u5728\u6240\u6709\u57df\u4e2d\u67e5\u627e
-
 Search_all_fields=\u5728\u6240\u6709\u57df\u4e2d\u67e5\u627e
 
 Search_error=\u67e5\u627e\u51fa\u9519
@@ -1428,13 +1381,12 @@ Search_for=\u67e5\u627e
 Search_general_fields=\u5728_general_\u57df\u4e2d\u67e5\u627e
 
 Search_IEEEXplore=\u641c\u7d22_IEEEXplore
-Search_IEEExplore=\u641c\u7d22_IEEExplore
 
 Search_optional_fields=\u5728\u53ef\u9009\u57df\u4e2d\u67e5\u627e
 
 Search_required_fields=\u5728\u5fc5\u9009\u57df\u4e2d\u67e5\u627e
 
-Search_Specified_Field(s)=\u5728\u7279\u5b9a\u57df\u4e2d\u67e5\u627e
+Search_specified_field(s)=\u5728\u7279\u5b9a\u57df\u4e2d\u67e5\u627e
 
 Searched_database._Global_number_of_hits=\u5b8c\u6210\u641c\u7d22\u6570\u636e\u5e93\uff0c\u5168\u5c40\u547d\u4e2d\u6570
 
@@ -1476,8 +1428,6 @@ Select_new_ImportFormat_Subclass=\u9009\u62e9\u65b0\u7684_ImportFormat_\u5b50\u7
 
 Select_the_tree_nodes_to_view_and_accept_or_reject_changes=\u9009\u62e9\u6811\u8282\u70b9\u67e5\u770b\u548c\u63a5\u53d7/\u62d2\u7edd\u4fee\u6539
 Selected_entries=\u9009\u4e2d\u7684\u8bb0\u5f55
-
-Selector_enabled_fields=\u542f\u7528\u4e0b\u62c9\u83dc\u5355\u7684\u57df
 Server_Hostname_\:=\u670d\u52a1\u5668\u4e3b\u673a:
 Server_Type_\:=\u670d\u52a1\u5668\u7c7b\u578b:
 Set_field=\u8bbe\u7f6e\u57df\u5185\u5bb9
@@ -1615,14 +1565,10 @@ Test=\u6d4b\u8bd5
 
 Text_Input_Area=\u6b64\u5904\u7f16\u8f91\u6587\u672c
 
-The_#_character_is_not_allowed_in_BibTeX_fields=#_\u5b57\u7b26\u65e0\u6cd5\u5728_BibTeX_\u57df\u4e2d\u4f7f\u7528
-
 The_chosen_date_format_for_new_entries_is_not_valid=\u4e3a\u65b0\u8bb0\u5f55\u9009\u62e9\u7684\u65e5\u671f\u683c\u5f0f\u975e\u6cd5
 
 The_chosen_encoding_'%0'_could_not_encode_the_following_characters\:_=\u9009\u62e9\u7684\u7f16\u7801_'%0'_\u65e0\u6cd5\u652f\u6301\u4e0b\u5217\u5b57\u7b26:_
 
-The_CiteSeer_fetch_operation_returned_zero_results.=CiteSeerX_\u6293\u53d6\u64cd\u4f5c\u8fd4\u56de_0_\u4e2a\u7ed3\u679c\u3002
-
 
 The_current_version_features_a_new_way_of_handling_links_to_external_files.<br>To_take_advantage_of_this,_your_links_must_be_changed_into_the_new_format,_and<br>JabRef_must_be_configured_to_show_the_new_links.=\u5f53\u524d\u7248\u672c\u4f7f\u7528\u4e86\u65b0\u7684\u65b9\u6cd5\u6765\u5904\u7406\u5916\u90e8\u6587\u4ef6\u94fe\u63a5\u3002\u4e3a\u4f7f\u7528\u65b0\u7279\u6027\uff0c\u60a8\u7684\u94fe\u63a5\u5fc5\u987b\u88ab\u8f6c\u6362\u6210\u65b0\u7684\u683c\u5f0f\uff0c<br>JabRef_\u4e5f\u4f1a\ [...]
 
@@ -1650,8 +1596,6 @@ The_search_is_case_sensitive.=\u8be5\u67e5\u8be2\u662f\u533a\u5206\u5927\u5c0f\u
 The_string_has_been_removed_locally=\u7b80\u5199\u5b57\u4e32\u88ab\u672c\u5730\u79fb\u9664
 
 There_are_possible_duplicates_(marked_with_a_'D'_icon)_that_haven't_been_resolved._Continue?=\u5b58\u5728\u53ef\u80fd\u4ecd\u672a\u89e3\u51b3\u7684\u91cd\u590d\u9879(\u4ee5'D'\u56fe\u6807\u6807\u8bb0)\uff0c\u662f\u5426\u7ee7\u7eed\uff1f
-
-this_button_will_update=\u8fd9\u4e2a\u6309\u94ae\u5c06\u66f4\u65b0
 This_database_was_written_using_an_older_version_of_JabRef.=\u6b64\u6570\u636e\u5e93\u662f\u7531\u65e7\u7248\u672c\u7684_JabRef_\u751f\u6210\u7684\u3002
 
 This_entry_has_no_BibTeX_key._Generate_key_now?=\u6b64\u8bb0\u5f55\u6ca1\u6709_BibTeX_\u952e\uff0c\u73b0\u5728\u751f\u6210\u5b83\uff1f
@@ -1673,8 +1617,6 @@ This_group_contains_entries_in_which_any_field_contains_the_term_<b>%0</b>=\u6b6
 This_group_contains_entries_whose_<b>%0</b>_field_contains_the_keyword_<b>%1</b>=\u6b64\u5206\u7ec4\u4e2d\u8bb0\u5f55\u7684_<b>%0</b>_\u57df\u5305\u542b\u5173\u952e\u8bcd_<b>%1</b> 
 
 This_group_contains_entries_whose_<b>%0</b>_field_contains_the_regular_expression_<b>%1</b>=\u6b64\u5206\u7ec4\u4e2d\u8bb0\u5f55\u7684_<b>%0</b>_\u57df\u5305\u542b\u6b63\u5219\u8868\u8fbe\u5f0f_<b>%1</b> 
-
-This_is_a_simple_copy_and_paste_dialog_for_import_some_fields_from_normal_text.=\u8fd9\u662f\u4e00\u4e2a\u4e3a\u4ece\u666e\u901a\u6587\u672c\u4e2d\u5bfc\u5165\u4e00\u4e9b\u57df\u5185\u5bb9\u7684\u7b80\u5355\u590d\u5236\u548c\u7c98\u8d34\u5bf9\u8bdd\u6846\u3002
 This_makes_JabRef_look_up_each_%0_link_and_check_if_the_file_exists._If_not,_you_will_be_given_options<BR>to_resolve_the_problem.=\u8be5\u9009\u9879\u4f7f_JabRef_\u904d\u5386\u6240\u6709_%0_\u94fe\u63a5\uff0c\u68c0\u67e5\u94fe\u63a5\u6587\u4ef6\u662f\u5426\u5b58\u5728\u3002\u5982\u679c\u4e0d\u5b58\u5728\uff0c\u60a8\u5c06\u4f1a\u5f97\u5230\u4e00\u4e2a\u9009\u9879\u6765\u5904\u7406\u8fd9\u4e2a\u95ee\u9898\u3002
 
 This_operation_requires_all_selected_entries_to_have_BibTex_keys_defined.=\u6b64\u64cd\u4f5c\u8981\u6c42\u6240\u6709\u9009\u4e2d\u8bb0\u5f55\u7684_BibTeX_\u952e\u503c\u4e0d\u4e3a\u7a7a\u3002
@@ -1682,8 +1624,6 @@ This_operation_requires_at_least_one_entry.=\u6b64\u64cd\u4f5c\u8981\u6c42\u81f3
 
 This_operation_requires_one_or_more_entries_to_be_selected.=\u8fd9\u4e2a\u64cd\u4f5c\u8981\u6c42\u9009\u4e2d\u4e00\u6761\u6216\u591a\u6761\u8bb0\u5f55\u3002
 
-This_will_move_all_external_links_from_the_'pdf'_and_'ps'_fields_into_the_'%0'_field._Proceed?=\u8fd9\u4f1a\u5c06\u6240\u6709_'pdf'_\u548c_'ps'_\u57df\u7684\u94fe\u63a5\u79fb\u52a8\u5230_'%0'_\u57df\uff0c\u662f\u5426\u7ee7\u7eed\uff1f
-
 To_set_up,_go_to_<B>Tools_->_Manage_journal_abbreviations</B>=\u8981\u8bbe\u7f6e\u7684\u8bdd\uff0c\u8bf7\u5230_<B>\u9009\u9879->\u7ba1\u7406\u671f\u520a\u540d\u7f29\u5199\u89c4\u5219</B>\u83dc\u5355\u9879
 
 Toggle_abbreviation=\u6253\u5f00/\u5173\u95ed\u540d\u79f0\u7f29\u5199
@@ -1697,8 +1637,6 @@ Type_set_to_'other'=\u8bbe\u7f6e\u7c7b\u578b\u4e3a_'other'
 Unabbreviate_journal_names_of_the_selected_entries=\u5c55\u5f00\u9009\u4e2d\u8bb0\u5f55\u7684\u7f29\u5199\u671f\u520a\u540d\u79f0
 Unabbreviated_%0_journal_names.=\u5c55\u5f00_%0_\u671f\u520a\u540d\u79f0\u3002
 
-unable_to_access_LyX-pipe=\u65e0\u6cd5\u8bbf\u95ee_LyX_\u7ba1\u9053
-
 Unable_to_create_graphical_interface=\u65e0\u6cd5\u751f\u6210\u56fe\u5f62\u754c\u9762
 
 Unable_to_open_file.=\u65e0\u6cd5\u6253\u5f00\u6587\u4ef6.
@@ -1742,7 +1680,6 @@ Up=\u4e0a
 Update_to_current_column_widths=\u4f7f\u7528\u5f53\u524d\u89c6\u56fe\u4e2d\u7684\u5217\u5bbd
 
 Updated_group_selection=\u66f4\u65b0\u5206\u7ec4\u9009\u62e9
-Upgrade_external_links=\u5347\u7ea7\u5916\u90e8\u94fe\u63a5
 Upgrade_external_PDF/PS_links_to_use_the_'%0'_field.=\u5347\u7ea7\u5916\u90e8_PDF/PS_\u94fe\u63a5\u4ee5\u4f7f\u7528_'%0'_\u57df\u3002
 Upgrade_file=\u5347\u7ea7\u6587\u4ef6
 Upgrade_old_external_file_links_to_use_the_new_feature=\u5347\u7ea7\u65e7\u5916\u90e8\u6587\u4ef6\u94fe\u63a5\u4ee5\u4f7f\u7528\u65b0\u7279\u6027
@@ -1752,10 +1689,7 @@ Upper_Each_First=\u5927\u5199\u8bcd\u9996
 Upper_first=\u5927\u5199\u53e5\u9996
 
 usage=\u7528\u6cd5
-
-Use_antialiasing_font=\u4f7f\u7528_antialiasing_\u5b57\u4f53
 Use_autocompletion_for_the_following_fields=\u4e3a\u4ee5\u4e0b\u57df\u5f00\u542f\u81ea\u52a8\u5b8c\u6210\u529f\u80fd
-Use_custom_icon_theme=\u4f7f\u7528\u81ea\u5b9a\u4e49\u56fe\u6807\u4e3b\u9898
 Use_default_viewer=\u4f7f\u7528\u9ed8\u8ba4\u67e5\u770b\u5668
 
 Use_inspection_window_also_when_a_single_entry_is_imported.=\u4ec5\u5bfc\u5165\u4e00\u6761\u8bb0\u5f55\u65f6\u4e5f\u6253\u5f00\u68c0\u89c6\u7a97\u53e3\u663e\u793a\u8be5\u8bb0\u5f55
@@ -1765,8 +1699,6 @@ Use_other_look_and_feel=\u4f7f\u7528\u5176\u5b83\u89c6\u89c9\u6548\u679c\u7c7b_(
 Use_Regular_Expression_Search=\u4f7f\u7528\u6b63\u5219\u8868\u8fbe\u5f0f\u641c\u7d22
 
 Use_regular_expressions=\u4f7f\u7528\u6b63\u5219\u8868\u8fbe\u5f0f
-
-Use_the_following_delimiter_character(s)=\u4f7f\u7528\u4e0b\u9762\u7684\u5206\u9694\u7b26
 Username_\:=\u7528\u6237\u540d:
 
 Value_cleared_externally=\u5185\u5bb9\u4ece\u5916\u90e8\u88ab\u6e05\u9664
@@ -1840,7 +1772,6 @@ Your_new_key_bindings_have_been_stored.=\u60a8\u7684\u70ed\u952e\u7ed1\u5b9a\u5d
 The_following_fetchers_are_available\:=\u4e0b\u9762\u5217\u51fa\u7684\u662f\u53ef\u7528\u7684\u6293\u53d6\u5668:
 Could_not_find_fetcher_'%0'=\u65e0\u6cd5\u627e\u5230\u6293\u53d6\u5668_'%0'
 Running_Query_'%0'_with_fetcher_'%1'.=\u4f7f\u7528\u6293\u53d6\u5668'%1'\u6267\u884c\u8bf7\u6c42'%0'
-Please_wait!=\u8bf7\u7a0d\u5019\uff01
 Query_'%0'_with_fetcher_'%1'_did_not_return_any_results.=\u4f7f\u7528\u6293\u53d6\u5668'%1'\u8bf7\u6c42'%0'\u672a\u8fd4\u56de\u4efb\u4f55\u7ed3\u679c\u3002
 Open_SPIRES_entry=\u6253\u5f00_SPIRES_\u8bb0\u5f55
 Move/Rename_file=\u79fb\u52a8/\u91cd\u547d\u540d_\u6587\u4ef6
@@ -1848,7 +1779,6 @@ File_moved=\u6587\u4ef6\u79fb\u52a8\u5b8c\u6210
 Move_file_failed=\u79fb\u52a8\u6587\u4ef6\u5931\u8d25
 Could_not_move_file=\u65e0\u6cd5\u79fb\u52a8\u6587\u4ef6
 Could_not_find_file_'%0'.=\u65e0\u6cd5\u627e\u5230\u6587\u4ef6_'%0'\u3002
-Move/rename_file=\u79fb\u52a8/\u91cd\u547d\u540d_\u6587\u4ef6
 Number_of_entries_successfully_imported=\u6210\u529f\u5bfc\u5165\u7684\u8bb0\u5f55\u6570
 Import_canceled_by_user=\u5bfc\u5165\u64cd\u4f5c\u88ab\u7528\u6237\u53d6\u6d88
 Progress\:_%0_of_%1=\u8fdb\u5ea6:_%0_of_%1
@@ -1962,11 +1892,9 @@ Version=\u7248\u672c
 Unknown=\u672a\u77e5
 Not_loaded=\u6ca1\u6709\u88ab\u52a0\u8f7d
 Loaded=\u5df2\u52a0\u8f7d
-Could_not_determine_version_of_=\u65e0\u6cd5\u53d6\u5f97\u7248\u672c\u4fe1\u606f\u2014\u2014
 Install_anyway?=\u4ecd\u7136\u7ee7\u7eed\u5b89\u88c5\uff1f
 
 Looking_for_full_text_document...=\u67e5\u627e\u6587\u7ae0\u5168\u6587\u6587\u6863
-Follow_DOI_or_URL_link_and_try_to_locate_PDF_full_text_document=\u6839\u636e_DOI_\u6216\u8005_URL_\u94fe\u63a5\uff0c\u5c1d\u8bd5\u67e5\u627e_PDF_\u5168\u6587\u6587\u6863\u3002
 Unable_to_find_full_text_article._No_search_algorithm_defined_for_the_'%0'_web_site.=\u65e0\u6cd5\u627e\u5230\u6587\u7ae0\u5168\u6587\uff0c\u6ca1\u6709\u5b9a\u4e49\u7f51\u7ad9_\u201c%0\u201d_\u4e0a\u7684\u67e5\u627e\u7b97\u6cd5\u3002
 Found_pdf_link,_but_received_the_wrong_MIME_type._This_could_indicate_that_you_don't_have_access_to_the_fulltext_article.=\u627e\u5230_pdf_\u8fde\u63a5\uff0c\u4f46\u6536\u5230\u7684_MIME_\u7c7b\u578b\u9519\u8bef\uff0c\u8fd9\u53ef\u80fd\u8bf4\u660e\u60a8\u6ca1\u6709\u8bbf\u95ee\u8be5\u6587\u7ae0\u5168\u6587\u7684\u6743\u9650\u3002
 
@@ -2013,8 +1941,6 @@ Before_saving,_please_edit_any_strings_containing_the_#_character.=\u5728\u4fdd\
 
 Save_without_backup?=\u4fdd\u5b58\u4f46\u4e0d\u5907\u4efd\uff1f
 Unable_to_create_backup=\u65e0\u6cd5\u521b\u5efa\u5907\u4efd
-
-File_directory_is_not_set_or_does_not_exist.=\u6587\u4ef6\u76ee\u5f55\u6ca1\u6709\u8bbe\u7f6e\u6216\u8005\u4e0d\u5b58\u5728\u3002
 Move_file_to_file_directory.=\u79fb\u52a8\u6587\u4ef6\u5230\u6587\u4ef6\u76ee\u5f55\u3002
 Rename_file_to=\u5c06\u6587\u4ef6\u66f4\u540d\u4e3a
 <b>All_Entries</b>_(this_group_cannot_be_edited_or_removed)=<b>\u6240\u6709\u8bb0\u5f55</b>\uff08\u6b64\u5206\u7ec4\u65e0\u6cd5\u88ab\u7f16\u8f91\u6216\u8005\u5220\u9664\uff09
@@ -2036,7 +1962,6 @@ Error_initializing_custom_export_format_from_string_'%0'=\u4ece\u5b57\u4e32_"%0"
 
 BibLaTeX_mode=BibLaTeX_\u6a21\u5f0f
 Optional_fields_2=\u53ef\u9009\u57df_2
-Please_wait=\u8bf7\u7a0d\u5019
 Waiting_for_save_operation_to_finish=\u6b63\u5728\u7b49\u5f85\u4fdd\u5b58\u64cd\u4f5c\u5b8c\u6210
 Resolving_duplicate_BibTeX_keys...=\u5904\u7406\u91cd\u590d\u7684_BibTeX
 Finished_resolving_duplicate_BibTeX_keys._%0_entries_modified.=\u5b8c\u6210\u5904\u7406\u91cd\u590d_BibTeX_\u952e\u503c\uff0c\u4fee\u6539\u4e86_%0_\u6761\u8bb0\u5f55\u3002
@@ -2049,8 +1974,6 @@ Duplicate_BibTeX_key=\u91cd\u590d\u7684_BibTeX_\u952e\u503c
 Duplicate_key=\u91cd\u590d\u7684\u952e\u503c
 Generate_key=\u751f\u6210\u952e\u503c
 Import_marking_color=\u6807\u8bb0\u5bfc\u5165\u8bb0\u5f55\u7684\u989c\u8272
-
-%0_entries_found._To_reduce_server_load,_only_%1_will_be_downloaded._It_will_be_very_slow,_in_order_to_make_ACM_happy.=\u627e\u5230_%0_\u6761\u8bb0\u5f55\uff0c\u4e3a\u51cf\u8f7b\u670d\u52a1\u5668\u8d1f\u8f7d\uff0c\u53ea\u4f1a\u4e0b\u8f7d\u5176\u4e2d\u7684_%1_\u6761\u3002\u4e3a\u4e86\u4e0d\u60f9_ACM_\u751f\u6c14\uff0c\u4e0b\u8f7d\u901f\u5ea6\u4f1a\u975e\u5e38\u6162_^\_^
 BibTeX_importer=BibTeX_\u5bfc\u5165\u5668
 Always_add_letter_(a,_b,_...)_to_generated_keys=\u5728\u751f\u6210\u952e\u503c\u65f6\u603b\u662f\u6dfb\u52a0\u5b57\u6bcd_(a,_b,_...)
 
@@ -2067,7 +1990,6 @@ An_autosave_file_was_found_for_this_database._This_could_indicate_=\u5f53\u524d\
 that_JabRef_didn't_shut_down_cleanly_last_time_the_file_was_used.=JabRef_\u4e0a\u6b21\u4f7f\u7528\u6b64\u6587\u4ef6\u65f6\u6ca1\u6709\u6b63\u5e38\u5173\u95ed\u3002
 General_file_directory=\u751f\u6210\u6587\u4ef6\u76ee\u5f55
 User-specific_file_directory=\u7528\u6237\u6307\u5b9a\u7684\u6587\u4ef6\u76ee\u5f55
-Error_setting_look_and_feel=\u9519\u8bef\u8bbe\u7f6e\u89c6\u89c9\u6548\u679c\u7c7b_(look_and_feel)
 Search_failed\:_illegal_search_expression=\u641c\u7d22\u5931\u8d25:_\u4e0d\u5408\u6cd5\u7684\u641c\u7d22\u8868\u8fbe\u5f0f
 Show_ArXiv_column=\u663e\u793a_ArXiv_\u5217
 <HTML>Unpack_the_zip_file_containing_import/export_filters_for_Endnote,<BR>for_optimal_interoperability_with_JabRef</HTML>=
@@ -2081,7 +2003,6 @@ Create_entry_based_on_XMP_data=
 Create_entry_based_on_data_fetched_from=
 Create_blank_entry_linking_the_PDF=
 Only_attach_PDF=
-Mr._dLib_Metadata_Entries_Associated_With\:=
 Mr._dLib_Metadata_Entries_Associated_With_PDF_File=
 Title=
 Author(s)=
@@ -2100,21 +2021,18 @@ Update_Existing_Entry=
 Mr._dLib=
 More_information=
 Fetching_Metadata...=
-Metadata=
 Autocomplete_names_in_'Firstname_Lastname'_format_only=
 Autocomplete_names_in_'Lastname,_Firstname'_format_only=
 Autocomplete_names_in_both_formats=
 Marking_color_%0=\u6807\u8bb0\u989c\u8272_%0
 The_name_'comment'_can_not_be_used_as_an_entry_type_name.=
 You_must_enter_an_integer_value_in_the_text_field_for=
-File_directory=
 Send_as_email=
 References=
 Sending_of_emails=
 Subject_for_sending_an_email_with_references=
 Automatically_open_folders_of_attached_files=
 Create_entry_based_on_content=
-Store_choice_as_default=
 Do_not_show_this_box_again_for_this_import=
 Always_use_this_PDF_import_style_(and_do_not_ask_for_each_import)=
 Error_creating_email=
@@ -2140,7 +2058,6 @@ Extra_information_(e.g._page_number)=
 Manage_citations=
 Problem_modifying_citation=
 Citation=
-Context=
 Extra_information=
 Could_not_resolve_BibTeX_entry_for_citation_marker_'%0'.=
 Styles=
@@ -2165,13 +2082,11 @@ Unable_to_synchronize_bibliography=
 Combine_pairs_of_citations_that_are_separated_by_spaces_only=
 Autodetection_failed=
 Connecting=
-Please_wait...=
-Unable_to_connect=
+Please_wait...=\u8bf7\u7a0d\u5019...
 Set_connection_parameters=
 Path_to_OpenOffice_directory=
 Path_to_OpenOffice_executable=
 Path_to_OpenOffice_library_dir=
-Autodetect=
 Connection_lost=
 The_paragraph_format_is_controlled_by_the_property_'ReferenceParagraphFormat'_or_'ReferenceHeaderParagraphFormat'_in_the_style_file.=
 The_character_format_is_controlled_by_the_citation_property_'CitationCharacterFormat'_in_the_style_file.=
@@ -2194,7 +2109,6 @@ JSTOR_import_cancelled=
 HTML_list=
 Click_group_to_toggle_membership_of_selected_entries=
 Use_EMACS_23_insertion_string=
-Normalize_to_BibTeX_name_format=
 If_possible,_normalize_this_list_of_names_to_conform_to_standard_BibTeX_name_formatting=
 Could_not_open_%0=
 Unknown_import_format=
@@ -2203,7 +2117,6 @@ An_Error_occurred_while_fetching_from_INSPIRE_source_(%0)\:=
 Error_while_fetching_from_Inspire\:_=
 Web_search=
 Autocomplete_names=
-You_must_select_either_a_valid_style_file,_or_use_the_default_style.=
 Default_style=
 Choose_style_file_directly=
 Choose_from_a_directory=
@@ -2245,7 +2158,6 @@ Autocompletion_options=
 Autocomplete_after_following_number_of_characters=
 Name_format_used_for_autocompletion=
 Treatment_of_first_names=
-No_icon_found_for_%0=
 Cleanup_entries=
 Automatically_assign_new_entry_to_selected_groups=
 Move_DOIs_from_note_and_URL_field_to_DOI_field_and_remove_http_prefix=
@@ -2259,13 +2171,9 @@ Doing_a_cleanup_for_%0_entries...=
 No_entry_needed_a_clean_up=
 One_entry_needed_a_clean_up=
 %0_entries_needed_a_clean_up=
-Imported_=
 Error_importing_from_database=
 Minimize_to_system_tray=
 
-Incomplete_search_results=
-%0_entries_were_found,_but_only_%1_of_these_could_be_resolved.=
-
 Error_downloading_file_'%0'=
 Download_failed=
 
@@ -2290,10 +2198,9 @@ Unable_to_clear_preferences.=
 
 Reset_preferences_(key1,key2,..._or_'all')=
 Find_unlinked_files=
-Select_All=
-Unselect_All=
-Expand_All=
-Collapse_All=
+Unselect_all=
+Expand_all=
+Collapse_all=
 Select_Directory=
 Choose_Directory=
 Use_the_selected_directory_to_start_with_the_search.=
@@ -2353,7 +2260,6 @@ Priority_medium=
 Quality=
 Rank=
 Relevance=
-Set_priority=
 Set_priority_to_high=
 Set_priority_to_low=
 Set_priority_to_medium=
@@ -2385,7 +2291,6 @@ Correct_the_entry,_and_reopen_editor_to_display/edit_source.=
 Could_not_connect_to_a_running_gnuserv_process._Make_sure_that_Emacs_or_XEmacs_is_running,<BR>and_that_the_server_has_been_started_(by_running_the_command_'server-start'/'gnuserv-start').=
 Could_not_connect_to_running_OpenOffice.\nMake_sure_you_have_installed_OpenOffice_with_Java_support.\nIf_connecting_manually,_please_verify_program_and_library_paths.\n\nError_message\:_=
 Created_group_"%0".=
-File_has_been_updated_externally._Are_you_sure_you_want_to_save?=
 If_a_pasted_or_imported_entry_already_has_the_field_set,_overwrite.=
 Import_Metadata_From_PDF=
 Not_connected_to_any_Writer_document._Please_make_sure_a_document_is_open,_and_use_the_'Select_Writer_document'_button_to_connect_to_it.=
@@ -2420,4 +2325,63 @@ An_Error_occurred_while_parsing_abstract=
 Unknown_DiVA_entry\:_'%0'.=
 Get_BibTeX_entry_from_DiVA=
 Log=
-Remove_unneccessary_$,_{,_and_}=
+
+ISO_690=
+
+Add_brackets_and_replace_separators_with_their_non-breaking_version_for_units=
+Add_new_entry_and_keep_both_old_entries=
+Cancelled_merging_entries=
+Error_in_entry=
+First_entry=
+Format_units_by_adding_non-breaking_separators_and_keeping_the_correct_case_on_search=
+Merge_entries=
+Merged_entries_into_a_new_and_kept_the_old=
+Merged_entries_into_a_new_and_removed_the_old=
+Merged_entry=
+None=
+Parse=
+Remove_unneccessary_$,_{,_and_}_and_move_adjacent_numbers_into_equations=
+Replace_old_entries_with_new_entry=
+Result=
+Second_entry=
+Show_DOI_first=
+Show_URL_first=
+Use_1st=
+Use_2nd=
+Use_Emacs_key_bindings=
+You_have_to_choose_exactly_two_entries_to_merge.=
+
+Update_timestamp_on_modification=
+change_field=
+
+All_key_bindings_will_be_reset_to_their_defaults.=
+Automatically_set_file_links=
+Continue?=
+Resetting_all_key_bindings=
+Save_entries_ordered_by_title=
+Export_entries_ordered_by_title=
+Quotes=
+Curly_Brackets=
+Include_empty_fields=
+Field_saving_options=
+Field_value_delimiter._E.g.,_"author\={x}"_or_"author\='x'"=
+Run_Unicode_converter_on_title,_author(s),_and_abstract=
+
+Database_has_changed._Do_you_want_to_save_before_closing?=
+Host=
+Invalid_setting=
+Network=
+Please_specify_both_hostname_and_port=
+Port=
+Start_field_contents_in_same_column=
+Use_camel_case_for_field_names_(e.g.,_"HowPublished"_instead_of_"howpublished")=
+Use_custom_proxy_configuration=
+Clear_connection_settings=
+Cleared_connection_settings.=
+
+Rebind_C-a,_too=
+
+Show_number_of_elements_contained_in_each_group=
+
+Open_folder=
+Opened_%0_folder(s).=
diff --git a/src/resource/Menu_de.properties b/src/resource/Menu_de.properties
index a7ed483..05ba70c 100644
--- a/src/resource/Menu_de.properties
+++ b/src/resource/Menu_de.properties
@@ -226,5 +226,5 @@ Legacy_tools...=Extras_(alt)...
 Copy_BibTeX_key_and_title=BibTeX-Key_und_Titel_kopieren
 
 Cleanup_entries=Eintr\u00e4ge_bereinigen
-Manage_keywords=
-Merge_entries=
+Manage_keywords=Stichworte_verwalten
+Merge_entries=Eintr\u00e4ge_zusammenf\u00fchren
diff --git a/src/resource/Menu_es.properties b/src/resource/Menu_es.properties
index 29ba95c..99e3ca5 100644
--- a/src/resource/Menu_es.properties
+++ b/src/resource/Menu_es.properties
@@ -1,15 +1,15 @@
 #!
-#! created/edited by Popeye version 0.54 (popeye.sourceforge.net)
-#! encoding:ISO-8859-1
-Abbreviate_journal_names_(ISO)=Abreviar_nombres_de_journals_(ISO)
-Abbreviate_journal_names_(MEDLINE)=Abreviar_nombres_de_journal_(MEDLINE)
+#!_created/edited_by_Popeye_version_0.55_(https://github.com/koppor/popeye)
+#!_encoding:ISO-8859-1
+Abbreviate_journal_names_(ISO)=Abreviar_nombres_de_revistas_(ISO)
+Abbreviate_journal_names_(MEDLINE)=Abreviar_nombres_de_revista_(MEDLINE)
 About_JabRef=&Acerca_de_JabRef
-Append_database=&Añadir_base_de_datos
+Append_database=&A\u00f1adir_base_de_datos
 Autogenerate_BibTeX_keys=&Autogenerar_claves_de_BibTeX
 BibTeX=&BibTeX
 Close_database=&Cerrar_base_de_datos
 Copy=C&opiar
-Copy_\\cite{BibTeX_key}=Copiar_\\c&ita_{clave_BibTeX}
+Copy_\\cite{BibTeX_key}=Copiar_\\c&ite{clave_BibTeX}
 Copy_BibTeX_key=Copiar_clave_&BibTeX
 Custom_export=E&xportación_Personalizada
 Custom_importers=Importadores_Personalizados
@@ -18,7 +18,7 @@ Cut=&Cortar
 Database_properties=&Propiedades_de_la_base_de_datos
 Delete=E&liminar
 Edit=&Editar
-# Bibtex
+#_Bibtex
 Edit_entry=&Editar_registro
 Edit_preamble=Editar_&preámbulo
 Edit_strings=Editar_&cadenas
@@ -26,7 +26,7 @@ Export=&Exportar
 Export_selected_entries_to_clipboard=&Exportar_registros_seleccionados_al_portapapeles
 Fetch_Medline=Importar_&Medline
 
-# Menu names
+#_Menu_names
 File=&Archivo
 Find_And_Fix=Buscar_y_reemplazar
 Find_and_remove_exact_duplicates=Buscar_y_eliminar_&duplicados_exactos
@@ -42,31 +42,31 @@ Insert_selected_citations_into_LatexEditor=Insertar_citas_seleccionadas_en_Edito
 Insert_selected_citations_into_LyX/Kile=Insertar_citas_seleccionadas_en_&LyX/Kile
 Insert_selected_citations_into_WinEdt=Insertar_citas_seleccionadas_en_&WinEdt
 Integrity_check=Verificar_Integridad
-# Help
+#_Help
 JabRef_help=&Ayuda_de_JabRef
 Load_session=Ca&rgar_sesión
 Manage_content_selectors=Administrar_selectores_de_&contenido
 Manage_custom_exports=Administrar_&exportaciones_personalizadas
 Manage_custom_imports=Administrar_&importaciones_personalizadas
 
-Manage_journal_abbreviations=
+Manage_journal_abbreviations=Administrar_abreviaturas_de_publicaciones
 
 Mark_entries=&Marcar_registros
-# File menu
+#_File_menu
 New_database=&Nueva_base_de_datos
-# Menu BibTeX (BibTeX)
+#_Menu_BibTeX_(BibTeX)
 New_entry=Nu&evo_registro
 New_entry...=&Nuevo_registro_...
 New_entry_from_plain_text=Nue&vo_registro_desde_texto_sin_formato
 New_subdatabase_based_on_AUX_file=Nueva_sub-base_de_datos_a_partir_de_archivo_AU&X
-# View
+#_View
 Next_tab=Pestaña_&siguiente
 Open_database=&Abrir_base_de_datos
 Open_PDF_or_PS=Abrir_&PDF_o_PS
 Open_URL_or_DOI=Abrir_&URL_o_DOI
 Options=&Opciones
 Paste=&Pegar
-# Options
+#_Options
 Preferences=&Preferencias
 Previous_tab=&Pestaña_anterior
 Quit=&Salir
@@ -77,9 +77,11 @@ Save_database=&Guardar_base_de_datos
 Save_database_as_...=Gu&ardar_base_de_datos_como_...
 Save_selected_as_...=Guardar_se&leccionados_como_...
 Save_session=Guardar_sesión
-# Tools
+#_Tools
 Search=&Buscar
 Search_IEEEXplore=Buscar_IEEEXplore
+
+Search_ACM_Portal=Buscar_en_Portal_ACM
 Select_all=Seleccionar_&todos
 Set_up_general_fields=Establecer_&campos_generales
 Show_error_console=Mostrar_consola_de_error
@@ -88,14 +90,15 @@ Sort_tabs=&Ordenar_pestañas
 Switch_preview_layout=&Intercambiar_vista_anterior
 Synchronize_PDF_links=Sincronizar_vínculos_a_PDF
 Synchronize_PS_links=Sincronizar_vínculos_a_PS
-# Export menu
+#_Export_menu
 Tab-separated_file=&Archivo_separado_por_tabulador
 Toggle_entry_preview=A&ctivar/Desactivar_previsualización_de_registro
 Toggle_groups_interface=Activar/Desactivar_ventana_de_&grupos
 Tools=&Herramientas
 Unabbreviate_journal_names=Quitar_abreviatción_de_nombres_de_journal
-# Edit
+#_Edit
 Undo=&Deshacer
+Mark_specific_color=Color_espec\u00edfico_de_la_marca
 Unmark_all=Anular_selección_de_todos_los_registros
 Unmark_entries=Anular_selecció&n__de_registros
 View=&Ver
@@ -120,35 +123,32 @@ Upgrade_external_links=Actualizar_vínculos_externos
 Manage_external_file_types=Administrar_tipos_de_archivo_externos
 
 Open_file=Abrir_archivo
-Plugins=
-Connect_to_external_SQL_database=
-Export_to_external_SQL_database=
-Search_JSTOR=
-Fetch_SPIRES=
-Fetch_INSPIRE=
-Search_Medline=
-
-Import_from_external_SQL_database=
-Focus_entry_table=
-
-Search_ACM_Portal=
-
-Increase_table_font_size=
-Decrease_table_font_size=
-Forward=
-Back=
-
-Manage_plugins=
-Look_up_full_text_document=
-Set/clear/rename_fields=
-
-Search_ScienceDirect=
-Mark_specific_color=
-Resolve_duplicate_BibTeX_keys=
-Minimize_to_system_tray=
-Legacy_tools...=
-Copy_BibTeX_key_and_title=
-
-Cleanup_entries=
-Manage_keywords=
-Merge_entries=
+Plugins=Complementos
+Connect_to_external_SQL_database=Conectar_a_Base_de_Datos_SQL_externa
+Export_to_external_SQL_database=Exportar_a_Base_de_Datos_SQL_externa
+Search_JSTOR=Buscar_en_JSTOR
+Fetch_SPIRES=Recuperar_desde_SPIRES
+Fetch_INSPIRE=Recuperar_desde_INSPIRE
+Search_Medline=Buscar_en_MEDLINE
+
+Import_from_external_SQL_database=Importar_desde_Base_de_Datos_SQL_externa
+Focus_entry_table=Foco_sobre_tabla_de_entradas
+
+Increase_table_font_size=&Incrementar_tama\u00f1o_de_fuente_en_tabla
+Decrease_table_font_size=&Disminuir_tama\u00f1o_de_fuente_en_tabla
+Forward=Avanzar
+Back=Retroceder
+
+Manage_plugins=Administrar_complementos
+Look_up_full_text_document=Buscar_en_todo_el_texto_del_documento
+Set/clear/rename_fields=Establecer/limpiar/renombrar_campos
+
+Search_ScienceDirect=Buscar_en_Science_Direct
+Resolve_duplicate_BibTeX_keys=Resolver_claves_BibTex_duplicadas
+Minimize_to_system_tray=Minimizar_a_bandeja_del_sistema
+Legacy_tools...=Herramientas_antiguas
+Copy_BibTeX_key_and_title=Copiar_clave_y_t\u00edtulo_BibTex
+
+Cleanup_entries=Limpiar_entradas
+Manage_keywords=Administrar_palabras_clave
+Merge_entries=Fusionar_entradas
diff --git a/src/resource/Menu_fr.properties b/src/resource/Menu_fr.properties
index eb668b9..04a67ef 100644
--- a/src/resource/Menu_fr.properties
+++ b/src/resource/Menu_fr.properties
@@ -129,11 +129,11 @@ Set/clear/rename_fields=Configurer/vider/renommer_des_champs
 
 Search_ScienceDirect=ScienceDirect
 Mark_specific_color=Marquer_d'une_couleur_sp\u00e9cifique
-Resolve_duplicate_BibTeX_keys= Traitement_des_clefs_BibTeX_dupliqu\u00e9es
+Resolve_duplicate_BibTeX_keys=Traitement_des_clefs_BibTeX_dupliqu\u00e9es
 Minimize_to_system_tray=R\u00e9duire_dans_la_zone_de_notification
 Legacy_tools...=Anciens_outils...
 Copy_BibTeX_key_and_title=Copier_la_clef_BibTeX_et_le_titre
 
 Cleanup_entries=Nettoyage_des_entr\u00e9es
-Manage_keywords=
-Merge_entries=
+Manage_keywords=G\u00e9rer_les_mots-clefs
+Merge_entries=Fusionner_les_entr\u00e9es
diff --git a/src/resource/Menu_ja.properties b/src/resource/Menu_ja.properties
index bb63455..4401f81 100644
--- a/src/resource/Menu_ja.properties
+++ b/src/resource/Menu_ja.properties
@@ -1,19 +1,19 @@
 #!
-#! created/edited by Popeye version 0.54 (popeye.sourceforge.net)
+#! created/edited by Popeye version 0.55 (https://github.com/koppor/popeye)
 #! encoding:ISO-8859-1
 Abbreviate_journal_names_(ISO)=\u5b66\u8853\u8a8c\u540d\u3092\u77ed\u7e2e\u5f62\u306b\uff08ISO\uff09
 Abbreviate_journal_names_(MEDLINE)=\u5b66\u8853\u8a8c\u540d\u3092\u77ed\u7e2e\u5f62\u306b\uff08MEDLINE\uff09
 About_JabRef=JabRef\u306b\u3064\u3044\u3066(&A)
 Append_database=\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u3092\u8ffd\u52a0(&A)
-Autogenerate_BibTeX_keys=BibTeX\u30ad\u30fc\u3092\u81ea\u52d5\u751f\u6210(&A)
+Autogenerate_BibTeX_keys=BibTeX\u9375\u3092\u81ea\u52d5\u751f\u6210(&A)
 BibTeX=&BibTeX
 Close_database=\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u3092\u9589\u3058\u308b(&C)
 Copy=\u30b3\u30d4\u30fc(&O)
-Copy_\\cite{BibTeX_key}=\\c&ite{BibTeX\u30ad\u30fc}\u3092\u30b3\u30d4\u30fc
-Copy_BibTeX_key=&BibTeX\u30ad\u30fc\u3092\u30b3\u30d4\u30fc
-Custom_export=\u500b\u4eba\u8a2d\u5b9a\u66f8\u304d\u51fa\u3057(&X)
-Custom_importers=\u500b\u4eba\u8a2d\u5b9a\u8aad\u307f\u8fbc\u307f
-Customize_entry_types=\u9805\u76ee\u578b\u3092\u500b\u4eba\u8a2d\u5b9a(&C)
+Copy_\\cite{BibTeX_key}=\\c&ite{BibTeX\u9375}\u3092\u30b3\u30d4\u30fc
+Copy_BibTeX_key=&BibTeX\u9375\u3092\u30b3\u30d4\u30fc
+Custom_export=\u81ea\u4f5c\u66f8\u51fa(&X)
+Custom_importers=\u81ea\u4f5c\u8aad\u8fbc
+Customize_entry_types=\u9805\u76ee\u578b\u3092\u81ea\u4f5c(&C)
 Cut=\u5207\u308a\u53d6\u308a(&C)
 Database_properties=\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u7279\u6027(&P)
 Delete=\u524a\u9664(&D)
@@ -46,10 +46,10 @@ Integrity_check=\u6574\u5408\u6027\u691c\u67fb
 JabRef_help=JabRef\u30d8\u30eb\u30d7(&H)
 Load_session=\u30bb\u30c3\u30b7\u30e7\u30f3\u3092\u8aad\u307f\u8fbc\u3080(&D)
 Manage_content_selectors=\u5185\u5bb9\u9078\u629e\u30e1\u30cb\u30e5\u30fc\u306e\u7ba1\u7406(&C)
-Manage_custom_exports=\u500b\u4eba\u8a2d\u5b9a\u66f8\u304d\u51fa\u3057\u306e\u7ba1\u7406(&M)
-Manage_custom_imports=\u500b\u4eba\u8a2d\u5b9a\u8aad\u307f\u8fbc\u307f\u306e\u7ba1\u7406(&I)
+Manage_custom_exports=\u81ea\u4f5c\u66f8\u51fa\u306e\u7ba1\u7406(&M)
+Manage_custom_imports=\u81ea\u4f5c\u8aad\u8fbc\u306e\u7ba1\u7406(&I)
 Manage_journal_abbreviations=\u8a8c\u540d\u77ed\u7e2e\u5f62\u306e\u7ba1\u7406(&J)
-Mark_entries=\u9805\u76ee\u3092\u30de\u30fc\u30af(&M)
+Mark_entries=\u9805\u76ee\u306b\u6a19\u8b58\u3092\u4ed8\u3051\u308b(&M)
 # File menu
 New_database=\u65b0\u898f\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9(&N)
 # Menu BibTeX (BibTeX)
@@ -78,6 +78,7 @@ Save_session=\u30bb\u30c3\u30b7\u30e7\u30f3\u3092\u4fdd\u5b58
 # Tools
 Search=\u691c\u7d22(&S)
 Search_IEEEXplore=IEEEXplore\u3092\u691c\u7d22
+Search_ACM_Portal=ACM_Portal\u3092\u691c\u7d22
 Select_all=\u5168\u3066\u9078\u629e(&A)
 Set_up_general_fields=\u6c4e\u7528\u30d5\u30a3\u30fc\u30eb\u30c9\u3092\u8a2d\u5b9a(&G)
 Show_error_console=\u30a8\u30e9\u30fc\u30b3\u30f3\u30bd\u30fc\u30eb\u3092\u8868\u793a
@@ -89,13 +90,15 @@ Synchronize_PS_links=PS\u30ea\u30f3\u30af\u3092\u540c\u671f
 # Export menu
 Tab-separated_file=\u30bf\u30d6\u533a\u5207\u308a\u30d5\u30a1\u30a4\u30eb(&T)
 Toggle_entry_preview=\u9805\u76ee\u30d7\u30ec\u30d3\u30e5\u30fc\u3092\u5165\u5207(&T)
-Toggle_groups_interface=\u30b0\u30eb\u30fc\u30d7\u30a4\u30f3\u30bf\u30d5\u30a7\u30fc\u30b9\u3092\u5165\u5207(&G)
+Toggle_groups_interface=\u30b0\u30eb\u30fc\u30d7\u64cd\u4f5c\u76e4\u3092\u5165\u5207(&G)
 Tools=\u30c4\u30fc\u30eb(&T)
 Unabbreviate_journal_names=\u5b66\u8853\u8a8c\u540d\u3092\u975e\u77ed\u7e2e\u5f62\u306b
 # Edit
 Undo=\u53d6\u308a\u6d88\u3057(&U)
-Unmark_all=\u3059\u3079\u3066\u306e\u30de\u30fc\u30af\u3092\u5916\u3059(&L)
-Unmark_entries=\u9805\u76ee\u306e\u30de\u30fc\u30af\u3092\u5916\u3059(&N)
+
+Mark_specific_color=\u7279\u5b9a\u8272\u3067\u6a19\u8b58\u3092\u4ed8\u3051\u308b(&A)
+Unmark_all=\u6a19\u8b58\u3092\u3059\u3079\u3066\u5916\u3059(&L)
+Unmark_entries=\u9805\u76ee\u306e\u6a19\u8b58\u3092\u5916\u3059(&N)
 View=\u8868\u793a(&V)
 Web_search=\u30a6\u30a7\u30d6\u691c\u7d22
 Import_into_new_database=\u65b0\u898f\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u3068\u3057\u3066\u8aad\u307f\u8fbc\u3080
@@ -127,7 +130,6 @@ Fetch_INSPIRE=INSPIRE\u304b\u3089\u53d6\u5f97
 Search_Medline=Medline\u3092\u691c\u7d22
 Import_from_external_SQL_database=\u5916\u90e8SQL\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u304b\u3089\u8aad\u307f\u8fbc\u3080
 Focus_entry_table=\u9805\u76ee\u8868\u306b\u30d5\u30a9\u30fc\u30ab\u30b9
-Search_ACM_Portal=ACM_Portal\u3092\u691c\u7d22
 
 Increase_table_font_size=\u8868\u30d5\u30a9\u30f3\u30c8\u3092\u62e1\u5927(&I)
 Decrease_table_font_size=\u8868\u30d5\u30a9\u30f3\u30c8\u3092\u7e2e\u5c0f(&D)
@@ -140,14 +142,12 @@ Look_up_full_text_document=\u5e73\u6587\u6587\u66f8\u5168\u4f53\u3092\u691c\u7d2
 Set/clear/rename_fields=\u30d5\u30a3\u30fc\u30eb\u30c9\u3092\u8a2d\u5b9a/\u30af\u30ea\u30a2/\u540d\u79f0\u5909\u66f4
 
 Search_ScienceDirect=ScienceDirect\u3092\u691c\u7d22
-
-Mark_specific_color=\u7279\u5b9a\u8272\u3067\u30de\u30fc\u30af(&A)
-Resolve_duplicate_BibTeX_keys=\u91cd\u8907\u3057\u305fBibTeX\u30ad\u30fc\u3092\u89e3\u6d88\u3059\u308b
+Resolve_duplicate_BibTeX_keys=\u91cd\u8907\u3057\u305fBibTeX\u9375\u3092\u89e3\u6d88\u3059\u308b
 
 Minimize_to_system_tray=\u30b7\u30b9\u30c6\u30e0\u30c8\u30ec\u30a4\u306b\u6700\u5c0f\u5316
 Legacy_tools...=\u65e7\u6765\u306e\u30c4\u30fc\u30eb...
 Copy_BibTeX_key_and_title=BibTeX\u9375\u3068\u30bf\u30a4\u30c8\u30eb\u3092\u30b3\u30d4\u30fc
 
 Cleanup_entries=\u9805\u76ee\u3092\u6d88\u53bb
-Manage_keywords=
-Merge_entries=
+Manage_keywords=\u30ad\u30fc\u30ef\u30fc\u30c9\u3092\u7ba1\u7406
+Merge_entries=\u9805\u76ee\u3092\u7d71\u5408
diff --git a/src/resource/Menu_ru.properties b/src/resource/Menu_ru.properties
new file mode 100644
index 0000000..54f79ad
--- /dev/null
+++ b/src/resource/Menu_ru.properties
@@ -0,0 +1,151 @@
+#!
+#! created/edited by Popeye version 0.54 (popeye.sourceforge.net)
+#! encoding:ISO-8859-1
+Abbreviate_journal_names_(ISO)=����������_��������_��������_(ISO)
+Abbreviate_journal_names_(MEDLINE)=����������_��������_��������_(MEDLINE)
+About_JabRef=�_���������_JabRef
+Append_database=��������_��
+Autogenerate_BibTeX_keys=������������_������_BibTeX
+BibTeX=BibTeX
+Close_database=�������_��
+Copy=����������
+Copy_\\cite{BibTeX_key}=����������_\\����������{����_BibTeX}
+Copy_BibTeX_key=����������_����_BibTeX
+Custom_export=����������������_�������
+Custom_importers=Custom_importers
+Customize_entry_types=���������_����_������
+Cut=��������
+Database_properties=��������_��
+Delete=�������
+Edit=��������
+# Bibtex
+Edit_entry=��������_������
+Edit_preamble=��������_���������
+Edit_strings=��������_������
+Export=�������
+Export_selected_entries_to_clipboard=�������_���������_�������_�_�����_������
+Fetch_Medline=�������_Medline
+
+# Menu names
+File=����
+Find_And_Fix=�����_�_���������
+Find_and_remove_exact_duplicates=�����_�_�������_������_���������
+Find_duplicates=�����_���������
+Help=�������
+Help_contents=����������_�������
+Highlight_groups_matching_all_selected_entries=��������_������_�_�������������_���_����_���������_�������
+Highlight_groups_matching_any_selected_entry=��������_������_�_�������������__���_�����_���������_������
+Incremental_search=���������������_�����
+
+Insert_selected_citations_into_Emacs=��������_���������_������_�_Emacs
+Insert_selected_citations_into_LatexEditor=��������_���������_������_�_LatexEditor
+Insert_selected_citations_into_LyX/Kile=��������_���������_������_�_LyX/Kile
+Insert_selected_citations_into_WinEdt=��������_���������_������_�_WinEdt
+Integrity_check=��������_�����������
+# Help
+JabRef_help=�������_JabRef
+Load_session=���������_�����
+Manage_content_selectors=Manage_content_selectors
+Manage_custom_exports=����������_����������������_���������
+Manage_custom_imports=����������_����������������_�������
+Manage_journal_abbreviations=����������_������������_���_��������
+Mark_entries=�����_�������
+# File menu
+New_database=�������_��
+# Menu BibTeX (BibTeX)
+New_entry=�������_������
+New_entry...=�������_������...
+New_entry_from_plain_text=�������_������_��_������������������_������
+New_subdatabase_based_on_AUX_file=�������_�����������_��_��_������_AUX-�����
+# View
+Next_tab=���������_�������
+Open_database=�������_��
+Open_PDF_or_PS=�������_PDF_���_PS
+Open_URL_or_DOI=�������_URL-�����_���_DOI
+Options=���������
+Paste=��������
+# Options
+Preferences=���������
+Previous_tab=�������_��������
+Quit=�����
+Recent_files=�������_��������_�����
+Redo=������
+Replace_string=��������_������
+Save_database=���������_��
+Save_database_as_...=���������_��_���...
+Save_selected_as_...=���������_���������_���_...
+Save_session=���������_�����
+# Tools
+Search=�����
+Search_IEEEXplore=�����_IEEEXplore
+Search_ACM_Portal=�����_��_�������_ACM
+Select_all=�������_���
+Set_up_general_fields=���������_�����_�����
+Show_error_console=��������_�������_������
+
+Sort_tabs=�����������_�������
+Switch_preview_layout=�����������_�����_�������������
+Synchronize_PDF_links=����������������_������_PDF
+Synchronize_PS_links=����������������_������_PS
+# Export menu
+Tab-separated_file=�����_�_������������_����������
+Toggle_entry_preview=�����������_��������_������
+Toggle_groups_interface=�����������_���������_�����
+Tools=�����������
+Unabbreviate_journal_names=������_��������_��������
+# Edit
+Undo=������
+Mark_specific_color=�����_������������_������
+Unmark_all=�����_���_�����
+Unmark_entries=�����_�����_�������
+View=���
+Web_search=���-�����
+Import_into_new_database=������_�_�����_��
+Import_into_current_database=������_�_�������_��
+
+Scan_database...=�����������_��...
+
+Push_entries_to_external_application_(%0)=��������_������_��_�������_����������_(%0)
+Write_XMP-metadata_to_PDFs=������_����������_XMP_�_PDF-����
+
+Set/clear_fields=������/��������_����
+
+Export_selected_entries=�������_���������_�������
+Fetch_ArXiv.org=�������_ArXiv.org
+Sessions=������
+
+Save_all=���������_���
+
+Upgrade_external_links=��������_�������_������
+Manage_external_file_types=����������_��������_������_������
+
+Open_file=�������_����
+
+Plugins=������
+Connect_to_external_SQL_database=�����������_�_�������_��_SQL
+Export_to_external_SQL_database=�������_��_�������_��_SQL
+Search_JSTOR=�����_�_JSTOR
+Fetch_SPIRES=�������_SPIRES
+Fetch_INSPIRE=�������_INSPIRE
+Search_Medline=�����_�_Medline
+Import_from_external_SQL_database=������_��_�������_��_SQL
+Focus_entry_table=Focus_entry_table
+
+Increase_table_font_size=���������_�����_�_�������
+Decrease_table_font_size=���������_�����_�_�������
+Forward=������
+Back=�����
+
+Manage_plugins=����������_��������
+Look_up_full_text_document=Look_up_full_text_document
+Set/clear/rename_fields=������/��������/�������������_����
+
+Search_ScienceDirect=�����_ScienceDirect
+Resolve_duplicate_BibTeX_keys=Resolve_duplicate_BibTeX_keys
+Minimize_to_system_tray=��������_�_�������_�����������
+Legacy_tools...=Legacy_tools...
+Copy_BibTeX_key_and_title=����������_����_�_���������_BibTeX
+
+Cleanup_entries=��������_������
+Manage_keywords=
+Merge_entries=
diff --git a/src/resource/Menu_tr.properties b/src/resource/Menu_tr.properties
index 0202db6..f6e8d83 100644
--- a/src/resource/Menu_tr.properties
+++ b/src/resource/Menu_tr.properties
@@ -1,5 +1,5 @@
 #!
-#! created/edited by Popeye version 0.54 (popeye.sourceforge.net)
+#! created/edited by Popeye version 0.55 (https://github.com/koppor/popeye)
 #! encoding:ISO-8859-1
 Abbreviate_journal_names_(ISO)=Dergi_adlar\u0131n\u0131_k\u0131salt_(ISO)
 Abbreviate_journal_names_(MEDLINE)=Dergi_adlar\u0131n\u0131_k\u0131salt_(MEDLINE)
@@ -125,5 +125,5 @@ Legacy_tools...=Miras_ara\u00e7lar...
 Copy_BibTeX_key_and_title=BibTeX_anahtar\u0131_ve_ba\u015fl\u0131\u011f\u0131n\u0131_kopyala
 
 Cleanup_entries=Girdileri_temizle
-Manage_keywords=
-Merge_entries=
+Manage_keywords=Anahtar_s\u00f6zc\u00fckleri_y\u00f6net
+Merge_entries=Girdileri_birle\u015ftir
diff --git a/src/resource/layout/iso690rtf/iso690RTF.article.layout b/src/resource/layout/iso690rtf/iso690RTF.article.layout
new file mode 100644
index 0000000..5f34a5a
--- /dev/null
+++ b/src/resource/layout/iso690rtf/iso690RTF.article.layout
@@ -0,0 +1,11 @@
+\begin{author}\format[Iso690NamesAuthors,RTFChars]{\author}. \end{author}
+\begin{title}"\format[RTFChars]{\title}". \end{title}
+\begin{editor}\format[RTFChars]{\editor}. \end{editor}
+\begin{journal}{\\i \format[RTFChars]{\journal}}. \end{journal}
+\begin{edition}\format[RTFChars]{\edition} ed. \end{edition}
+\begin{year}\format[RTFChars]{\year}, \end{year}
+\begin{volume}vol \format[RTFChars]{\volume}, \end{volume}
+\begin{number}n�m. \format[RTFChars]{\number}, \end{number}
+\begin{pages}p. \format[RTFChars]{\pages}.\end{pages}
+\\par
+\\par
diff --git a/src/resource/layout/iso690rtf/iso690RTF.begin.layout b/src/resource/layout/iso690rtf/iso690RTF.begin.layout
new file mode 100644
index 0000000..92c728c
--- /dev/null
+++ b/src/resource/layout/iso690rtf/iso690RTF.begin.layout
@@ -0,0 +1,3 @@
+{\\rtf1\\ansi\\ansicpg1251\\uc1\\deff0\\stshfdbch0\\stshfloch0\\stshfhich0\\stshfbi0\\deflang1049\\deflangfe1049{\\fonttbl{\\f0\\froman\\fcharset204\\fprq2{\\*\\panose 02020603050405020304}Times New Roman;}{\\f39\\froman\\fcharset0\\fprq2 Times New Roman;}
+{\\f37\\froman\\fcharset238\\fprq2 Times New Roman CE;}{\\f40\\froman\\fcharset161\\fprq2 Times New Roman Greek;}{\\f41\\froman\\fcharset162\\fprq2 Times New Roman Tur;}{\\f42\\froman\\fcharset177\\fprq2 Times New Roman (Hebrew);}
+{\\f43\\froman\\fcharset178\\fprq2 Times New Roman (Arabic);}{\\f44\\froman\\fcharset186\\fprq2 Times New Roman Baltic;}{\\f45\\froman\\fcharset163\\fprq2 Times New Roman (Vietnamese);}}{
diff --git a/src/resource/layout/iso690rtf/iso690RTF.book.layout b/src/resource/layout/iso690rtf/iso690RTF.book.layout
new file mode 100644
index 0000000..2e9137a
--- /dev/null
+++ b/src/resource/layout/iso690rtf/iso690RTF.book.layout
@@ -0,0 +1,13 @@
+\begin{author}\format[Iso690NamesAuthors,RTFChars]{\author}. \end{author}
+\begin{title}{\\i \format[RTFChars]{\title}}. \end{title}
+\begin{editor}\format[RTFChars]{\editor}. \end{editor}
+\begin{edition}\format[RTFChars]{\edition} ed. \end{edition}
+\begin{address}\format[RTFChars]{\address}: \end{address}
+\begin{publisher}\format[RTFChars]{\publisher}, \end{publisher}
+\begin{year}\format[RTFChars]{\year}. \end{year}
+\begin{pages} p. \format[RTFChars]{\pages}. \end{pages}
+\begin{series}\format[RTFChars]{\series}. \end{series}
+\begin{note}\format[RTFChars]{\note}. \end{note}
+\begin{number}ISBN: \format[RTFChars]{\number}. \end{number}
+\\par
+\\par
diff --git a/src/resource/layout/iso690rtf/iso690RTF.edocs.layout b/src/resource/layout/iso690rtf/iso690RTF.edocs.layout
new file mode 100644
index 0000000..9c9fd7f
--- /dev/null
+++ b/src/resource/layout/iso690rtf/iso690RTF.edocs.layout
@@ -0,0 +1,19 @@
+\begin{author}\format[Iso690NamesAuthors,RTFChars]{\author}. \end{author}
+\begin{title}{\\i \format[RTFChars]{\title}}. \end{title}
+\begin{type}[\format[RTFChars]{\type}]. \end{type}
+\begin{editor}\format[RTFChars]{\editor}. \end{editor}
+\begin{edition}\format[RTFChars]{\edition} ed. \end{edition}
+\begin{address}\format[RTFChars]{\address}: \end{address}
+\begin{publisher}\format[RTFChars]{\publisher}, \end{publisher}
+\begin{year}\format[RTFChars]{\year}, \end{year}
+\begin{yearfield}\format[RTFChars]{\yearfield}, \end{yearfield}
+\begin{yearconsults}[\format[RTFChars]{\yearconsults}]. \end{yearconsults}
+\begin{pages}\format[RTFChars]{\pages}. \end{pages}
+\begin{series}(\format[RTFChars]{\series}). \end{series}
+\begin{volume}(\format[RTFChars]{\volume}). \end{volume}
+\begin{note}\format[RTFChars]{\note}. \end{note}
+\begin{availability} Disponible en: \format[RTFChars]{\availability}. \end{availability}
+\begin{url}\format[RTFChars]{\url}. \end{url}
+\begin{issn}ISSN: \format[RTFChars]{\issn}.\end{issn}
+\\par
+\\par
diff --git a/src/resource/layout/iso690rtf/iso690RTF.edocsarticle.layout b/src/resource/layout/iso690rtf/iso690RTF.edocsarticle.layout
new file mode 100644
index 0000000..341e171
--- /dev/null
+++ b/src/resource/layout/iso690rtf/iso690RTF.edocsarticle.layout
@@ -0,0 +1,16 @@
+\begin{author}\format[Iso690NamesAuthors,RTFChars]{\author}. \end{author}
+\begin{chapter}"\format[RTFChars]{\chapter}". \end{chapter}
+\begin{title}{\\i \format[RTFChars]{\title}}. \end{title}
+\begin{type}[\format[RTFChars]{\type}]. \end{type}
+\begin{edition}\format[RTFChars]{\edition}. \end{edition}
+\begin{number}\format[RTFChars]{\number}. \end{number}
+\begin{year}\format[RTFChars]{\year}, \end{year}
+\begin{yearconsults}[\format[RTFChars]{\yearconsults}]. \end{yearconsults}
+\begin{pages}\format[RTFChars]{\pages} p. \end{pages}
+\begin{series}(\format[RTFChars]{\series}). \end{series}
+\begin{note}\format[RTFChars]{\note}. \end{note}
+\begin{availability} Disponible en: \format[RTFChars]{\availability}. \end{availability}
+\begin{url}\format[RTFChars]{\url}. \end{url}
+\begin{issn}ISSN: \format[RTFChars]{\issn}. \end{issn}
+\\par
+\\par
diff --git a/src/resource/layout/iso690rtf/iso690RTF.edocscontribution.layout b/src/resource/layout/iso690rtf/iso690RTF.edocscontribution.layout
new file mode 100644
index 0000000..5cb0d45
--- /dev/null
+++ b/src/resource/layout/iso690rtf/iso690RTF.edocscontribution.layout
@@ -0,0 +1,20 @@
+\begin{author}\format[Iso690NamesAuthors,RTFChars]{\author}. \end{author}
+\begin{chapter}"\format[RTFChars]{\chapter}". \end{chapter}
+\begin{type}[\format[RTFChars]{\type}]. \end{type}
+\begin{editor}En: \format[RTFChars]{\editor}. \end{editor}
+\begin{title}{\\i \format[RTFChars]{\title}}. \end{title}
+\begin{edition}\format[RTFChars]{\edition} ed.\end{edition}
+\begin{address}\format[RTFChars]{\address}: \end{address}
+\begin{publisher}\format[RTFChars]{\publisher}, \end{publisher}
+\begin{year}\format[RTFChars]{\year}, \end{year}
+\begin{yearfield}\format[RTFChars]{\yearfield}, \end{yearfield}
+\begin{yearconsults}[\format[RTFChars]{\yearconsults}]. \end{yearconsults}
+\begin{number}\format[RTFChars]{\number}. \end{number}
+\begin{pages}\format[RTFChars]{\pages} p. \end{pages}
+\begin{series}(\format[RTFChars]{\series}). \end{series}
+\begin{note}\format[RTFChars]{\note}. \end{note}
+\begin{availability} Disponible en: \format[RTFChars]{\availability}. \end{availability}
+\begin{url}\format[RTFChars]{\url}. \end{url}
+\begin{issn}ISSN: \format[RTFChars]{\issn}. \end{issn}
+\\par
+\\par
diff --git a/src/resource/layout/iso690rtf/iso690RTF.edocsnews.layout b/src/resource/layout/iso690rtf/iso690RTF.edocsnews.layout
new file mode 100644
index 0000000..41afa59
--- /dev/null
+++ b/src/resource/layout/iso690rtf/iso690RTF.edocsnews.layout
@@ -0,0 +1,12 @@
+\begin{title}{\\i \format[RTFChars]{\title}}. \end{title}
+\begin{type}[\format[RTFChars]{\type}]. \end{type}
+\begin{editor}\format[RTFChars]{\editor}. \end{editor}
+\begin{address}\format[RTFChars]{\address}: \end{address}
+\begin{publisher}\format[RTFChars]{\publisher}, \end{publisher}
+\begin{year}\format[RTFChars]{\year}, \end{year}
+\begin{yearconsults}[\format[RTFChars]{\yearconsults}]. \end{yearconsults}
+\begin{note}\format[RTFChars]{\note}. \end{note}
+\begin{availability} Disponible en: \format[RTFChars]{\availability}. \end{availability}
+\begin{url}\format[RTFChars]{\url}. \end{url}
+\\par
+\\par
diff --git a/src/resource/layout/iso690rtf/iso690RTF.edocsperiodical.layout b/src/resource/layout/iso690rtf/iso690RTF.edocsperiodical.layout
new file mode 100644
index 0000000..021f34f
--- /dev/null
+++ b/src/resource/layout/iso690rtf/iso690RTF.edocsperiodical.layout
@@ -0,0 +1,16 @@
+\begin{author}\format[Iso690NamesAuthors,RTFChars]{\author}. \end{author}
+\begin{title}{\\i \format[RTFChars]{\title}}. \end{title}
+\begin{type}[\format[RTFChars]{\type}]. \end{type}
+\begin{editor}\format[RTFChars]{\editor}. \end{editor}
+\begin{number}\format[RTFChars]{\number}. \end{number}
+\begin{year}\format[RTFChars]{\year}. \end{year}
+\begin{address}\format[RTFChars]{\address}: \end{address}
+\\begin{yearfield}\format[RTFChars]{\yearfield}, \end{yearfield}
+\begin{yearconsults}[\format[RTFChars]{\yearconsults}]. \end{yearconsults}
+\begin{series}(\format[RTFChars]{series}). \end{volume}
+\begin{note}\format[RTFChars]{\note}. \end{note}
+\begin{availability} Disponible en: \format[RTFChars]{\availability}. \end{availability}
+\begin{url}\format[RTFChars]{\url}. \end{url}
+\begin{issn}ISSN: \format[RTFChars]{\issn}. \end{issn}
+\\par
+\\par
diff --git a/src/resource/layout/iso690rtf/iso690RTF.email.layout b/src/resource/layout/iso690rtf/iso690RTF.email.layout
new file mode 100644
index 0000000..7c2c8c1
--- /dev/null
+++ b/src/resource/layout/iso690rtf/iso690RTF.email.layout
@@ -0,0 +1,7 @@
+\begin{author}\format[Iso690NamesAuthors,RTFChars]{\author}. \end{author}
+\begin{title}"\format[RTFChars]{\title}". \end{title}
+\begin{type}[\format[RTFChars]{\type}]. \end{type}
+\begin{year}\format[RTFChars]{\year}, \end{year}
+\begin{note}\format[RTFChars]{\note}. \end{note}
+\\par
+\\par
diff --git a/src/resource/layout/iso690rtf/iso690RTF.emaillist.layout b/src/resource/layout/iso690rtf/iso690RTF.emaillist.layout
new file mode 100644
index 0000000..d0848f5
--- /dev/null
+++ b/src/resource/layout/iso690rtf/iso690RTF.emaillist.layout
@@ -0,0 +1,12 @@
+\begin{author}\format[Iso690NamesAuthors,RTFChars]{\author}. \end{author}
+\begin{chapter}"\format[RTFChars]{\chapter}". \end{chapter}
+\begin{type}[\format[RTFChars]{\type}]. \end{type}
+\begin{title}En: {\\i \format[RTFChars]{\title}}. \end{title}
+\begin{number}(\format[RTFChars]{\number}). \end{number}
+\begin{address}\format[RTFChars]{\address}. \end{address}
+\begin{yearconsults}[\format[RTFChars]{\yearconsults}]. \end{yearconsults}
+\begin{note}\format[RTFChars]{\note}. \end{note}
+\begin{availability} Disponible en: \format[RTFChars]{\availability}. \end{availability}
+\begin{url}\format[RTFChars]{\url}. \end{url}
+\\par
+\\par
diff --git a/src/resource/layout/iso690rtf/iso690RTF.end.layout b/src/resource/layout/iso690rtf/iso690RTF.end.layout
new file mode 100644
index 0000000..a2950a1
--- /dev/null
+++ b/src/resource/layout/iso690rtf/iso690RTF.end.layout
@@ -0,0 +1 @@
+}}
\ No newline at end of file
diff --git a/src/resource/layout/iso690rtf/iso690RTF.graphics.layout b/src/resource/layout/iso690rtf/iso690RTF.graphics.layout
new file mode 100644
index 0000000..c4a7e53
--- /dev/null
+++ b/src/resource/layout/iso690rtf/iso690RTF.graphics.layout
@@ -0,0 +1,8 @@
+\begin{author}\format[Iso690NamesAuthors,RTFChars]{\author}. \end{author}
+\begin{title}{\\i \format[RTFChars]{\title}}. \end{title}
+\begin{type}[\format[RTFChars]{\type}]. \end{type}
+\begin{address}\format[RTFChars]{\address}:\end{address}
+\begin{publisher}\format[RTFChars]{\publisher}, \end{publisher}
+\begin{year}\format[RTFChars]{\year}. \end{year}
+\\par
+\\par
diff --git a/src/resource/layout/iso690rtf/iso690RTF.inbook.layout b/src/resource/layout/iso690rtf/iso690RTF.inbook.layout
new file mode 100644
index 0000000..8f88513
--- /dev/null
+++ b/src/resource/layout/iso690rtf/iso690RTF.inbook.layout
@@ -0,0 +1,11 @@
+\begin{author}\format[Iso690NamesAuthors,RTFChars]{\author}. \end{author}
+\begin{chapter}"\format[RTFChars]{\chapter}". \end{chapter}
+\begin{editor}{\\ul En:} \format[RTFChars]{\editor}. \end{editor}
+\begin{title}{\\i \format[RTFChars]{\title}}. \end{title}
+\begin{edition}\format[RTFChars]{\edition} ed. \end{edition}
+\begin{address}\format[RTFChars]{\address}: \end{address}
+\begin{publisher}\format[RTFChars]{\publisher}. \end{publisher}
+\begin{year}\format[RTFChars]{\year}.\end{year}
+\begin{pages}p. \format[RTFChars]{\pages}. \end{pages}
+\\par
+\\par
diff --git a/src/resource/layout/iso690rtf/iso690RTF.inedocs.layout b/src/resource/layout/iso690rtf/iso690RTF.inedocs.layout
new file mode 100644
index 0000000..0522340
--- /dev/null
+++ b/src/resource/layout/iso690rtf/iso690RTF.inedocs.layout
@@ -0,0 +1,20 @@
+\begin{author}\format[Iso690NamesAuthors,RTFChars]{\author}. \end{author}
+\begin{title}{\\i \format[RTFChars]{\title}}. \end{title}
+\begin{type}[\format[RTFChars]{\type}]. \end{type}
+\begin{editor}\format[RTFChars]{\editor}. \end{editor}
+\begin{edition}\format[RTFChars]{\edition} ed. \end{edition}
+\begin{address}\format[RTFChars]{\address}: \end{address}
+\begin{publisher}\format[RTFChars]{\publisher}, \end{publisher}
+\begin{year}\format[RTFChars]{\year}, \end{year}
+\begin{yearfield}\format[RTFChars]{\yearfield}, \end{yearfield}
+\begin{yearconsults}[\format[RTFChars]{\yearconsults}]. \end{yearconsults}
+\begin{chapter}"\format[RTFChars]{\chapter}". \end{chapter}
+\begin{number}\format[RTFChars]{\number}. \end{number}
+\begin{pages}\format[RTFChars]{\pages} p. \end{pages}
+\begin{series}(\format[RTFChars]{\series}). \end{series}
+\begin{note}\format[RTFChars]{\note}. \end{note}
+\begin{availability} Disponible en: \format[RTFChars]{\availability}. \end{availability}
+\begin{url}\format[RTFChars]{\url}. \end{url}
+\begin{issn}ISSN: \format[RTFChars]{\issn}. \end{issn}
+\\par
+\\par
diff --git a/src/resource/layout/iso690rtf/iso690RTF.inproceedings.layout b/src/resource/layout/iso690rtf/iso690RTF.inproceedings.layout
new file mode 100644
index 0000000..8d0a405
--- /dev/null
+++ b/src/resource/layout/iso690rtf/iso690RTF.inproceedings.layout
@@ -0,0 +1,12 @@
+\begin{author}\format[Iso690NamesAuthors,RTFChars]{\author}. \end{author}
+\begin{chapter}"\format[RTFChars]{\chapter}". \end{chapter}
+\begin{editor}{\\ul En:} \format[RTFChars]{\editor}. \end{editor}
+\begin{title}{\\i \format[RTFChars]{\title}}. \end{title}
+\begin{edition}\format[RTFChars]{\edition} ed. \end{edition}
+\begin{address}\format[RTFChars]{\address}: \end{address}
+\begin{publisher}\format[RTFChars]{\publisher}. \end{publisher}
+\begin{year}\format[RTFChars]{\year}.\end{year}
+\begin{pages}p. \format[RTFChars]{\pages}. \end{pages}
+\begin{number}ISBN: \format[RTFChars]{\number}.\end{number}
+\\par
+\\par
diff --git a/src/resource/layout/iso690rtf/iso690RTF.layout b/src/resource/layout/iso690rtf/iso690RTF.layout
new file mode 100644
index 0000000..cd2d4cf
--- /dev/null
+++ b/src/resource/layout/iso690rtf/iso690RTF.layout
@@ -0,0 +1,20 @@
+\begin{author}\format[Iso690NamesAuthors,RTFChars]{\author}. \end{author}
+\begin{title}{\\i \format[RTFChars]{\title}}. \end{title}
+\begin{type}[\format[RTFChars]{\type}]. \end{type}
+\begin{editor}\format[RTFChars]{\editor}. \end{editor}
+\begin{edition}\format[RTFChars]{\edition}a ed. \end{edition}
+\begin{address}\format[RTFChars]{\address}: \end{address}
+\begin{publisher}\format[RTFChars]{\publisher}, \end{publisher}
+\begin{year}\format[RTFChars]{\year}, \end{year}
+\begin{yearfield}\format[RTFChars]{\yearfield}, \end{yearfield}
+\begin{yearconsults}[\format[RTFChars]{\yearconsults}]. \end{yearconsults}
+\begin{pages}\format[RTFChars]{\pages}. \end{pages}
+\begin{series}(\format[RTFChars]{\series}). \end{series}
+\begin{volume}(\format[RTFChars]{\volume}). \end{volume}
+\begin{note}\format[RTFChars]{\note}. \end{note}
+\begin{availability} Disponible en: \format[RTFChars]{\availability}. \end{availability}
+\begin{url}\format[RTFChars]{\url}. \end{url}
+\begin{issn}ISSN: \format[RTFChars]{\issn}.\end{issn}
+\begin{isbn}ISBN: \format[RTFChars]{\isbn}. \end{isbn}
+\\par
+\\par
diff --git a/src/resource/layout/iso690rtf/iso690RTF.legislation.layout b/src/resource/layout/iso690rtf/iso690RTF.legislation.layout
new file mode 100644
index 0000000..f4a0a86
--- /dev/null
+++ b/src/resource/layout/iso690rtf/iso690RTF.legislation.layout
@@ -0,0 +1,8 @@
+\begin{address}\format[RTFChars]{\address}. \end{address}
+\begin{title}\format[RTFChars]{\title}. \end{title}
+\begin{journal}{\\i \format[RTFChars]{\journal}}, \end{journal}
+\begin{year}\format[RTFChars]{\year}.\end{year}
+\begin{number} \format[RTFChars]{n�m.} \format[RTFChars]{\number}, \end{number}
+\begin{pages}p. \format[RTFChars]{\pages}.\end{pages}
+\\par
+\\par
diff --git a/src/resource/layout/iso690rtf/iso690RTF.mastersthesis.layout b/src/resource/layout/iso690rtf/iso690RTF.mastersthesis.layout
new file mode 100644
index 0000000..20ed1e8
--- /dev/null
+++ b/src/resource/layout/iso690rtf/iso690RTF.mastersthesis.layout
@@ -0,0 +1,10 @@
+\begin{author}\format[Iso690NamesAuthors,RTFChars]{\author}. \end{author}
+\begin{chapter}"\format[RTFChars]{\chapter}". \end{chapter}
+\begin{editor}\format[RTFChars]{\editor}. \end{editor}
+\begin{title}{\\i \format[RTFChars]{\title}}. \end{title}
+\begin{type}[\format[RTFChars]{\type}]. \end{type}
+\begin{school}\format[RTFChars]{\school}, \end{school}
+\begin{address}\format[RTFChars]{\address}, \end{address}
+\begin{year}\format[RTFChars]{\year}.\end{year}
+\\par
+\\par
diff --git a/src/resource/layout/iso690rtf/iso690RTF.patent.layout b/src/resource/layout/iso690rtf/iso690RTF.patent.layout
new file mode 100644
index 0000000..ec0675d
--- /dev/null
+++ b/src/resource/layout/iso690rtf/iso690RTF.patent.layout
@@ -0,0 +1,11 @@
+\begin{author}\format[Iso690NamesAuthors,RTFChars]{\author}. \end{author}
+\begin{title}{\\i \format[RTFChars]{\title}}. \end{title}
+\begin{editor}\format[RTFChars]{\editor}. \end{editor}
+\begin{note}\format[RTFChars]{\note}. \end{note}
+\begin{address}\format[RTFChars]{\address}. \end{address}
+\begin{nationality}\format[RTFChars]{\nationality}. \end{nationality}
+\begin{type}\format[RTFChars]{\type}. \end{type}
+\begin{number}\format[RTFChars]{\number}. \end{number}
+\begin{year}\format[RTFChars,Iso690FormatDate]{\year}.\end{year}
+\\par
+\\par
diff --git a/src/resource/layout/iso690rtf/iso690RTF.periodical.layout b/src/resource/layout/iso690rtf/iso690RTF.periodical.layout
new file mode 100644
index 0000000..ff79bad
--- /dev/null
+++ b/src/resource/layout/iso690rtf/iso690RTF.periodical.layout
@@ -0,0 +1,13 @@
+\begin{title}{\\i \format[RTFChars]{\title}}. \end{title}
+\begin{author}\format[Iso690NamesAuthors,RTFChars]{\author}. \end{author}
+\begin{edition}\format[RTFChars]{\edition} ed. \end{edition}
+\begin{number}\format[RTFChars]{\number}. \end{number}
+\begin{address}\format[RTFChars]{\address}:\end{address}
+\begin{publisher}\format[RTFChars]{\publisher},\end{publisher}
+\begin{year}\format[RTFChars]{\year}-\end{year}
+\begin{yearfield}\format[RTFChars]{\yearfield}\end{yearfield}.
+\begin{series}\format[RTFChars]{\series}. \end{series}
+\begin{note}\format[RTFChars]{\note}. \end{note}
+\begin{issn}ISSN: \format[RTFChars]{\issn}.\end{issn}
+\\par
+\\par
diff --git a/src/resource/layout/iso690rtf/iso690RTF.proceeding.layout b/src/resource/layout/iso690rtf/iso690RTF.proceeding.layout
new file mode 100644
index 0000000..923a72c
--- /dev/null
+++ b/src/resource/layout/iso690rtf/iso690RTF.proceeding.layout
@@ -0,0 +1,13 @@
+\begin{author}\format[Iso690NamesAuthors,RTFChars]{\author}.\end{author}
+\begin{title}{\\i \format[RTFChars]{\title}}.\end{title}
+\begin{editor}\format[RTFChars]{\editor}.\end{editor}
+\begin{edition}\format[RTFChars]{\edition} ed.\end{edition}
+\begin{address}\format[RTFChars]{\address}:\end{address}
+\begin{publisher}\format[RTFChars]{\publisher},\end{publisher}
+\begin{year}\format[RTFChars]{\year}.\end{year}
+\begin{pages} p. \format[RTFChars]{\pages}\end{pages}
+\begin{series}\format[RTFChars]{\series}.\end{series}
+\begin{note}\format[RTFChars]{\note}.\end{note}
+\begin{number}ISBN: \format[RTFChars]{\number}.\end{number}
+\\par
+\\par
diff --git a/src/resource/layout/iso690rtf/iso690RTF.radiotv.layout b/src/resource/layout/iso690rtf/iso690RTF.radiotv.layout
new file mode 100644
index 0000000..b5ccef6
--- /dev/null
+++ b/src/resource/layout/iso690rtf/iso690RTF.radiotv.layout
@@ -0,0 +1,6 @@
+\begin{title}{\\i \format[RTFChars]{\title}}. \end{title}
+\begin{author}\format[RTFChars]{\author}. \end{author}
+\begin{editor}\format[RTFChars]{\editor}, \end{editor}
+\begin{year}\format[RTFChars]{\year}.\end{year}
+\\par
+\\par
diff --git a/src/resource/layout/iso690rtf/iso690RTF.recording.layout b/src/resource/layout/iso690rtf/iso690RTF.recording.layout
new file mode 100644
index 0000000..7e3f2e6
--- /dev/null
+++ b/src/resource/layout/iso690rtf/iso690RTF.recording.layout
@@ -0,0 +1,8 @@
+\begin{author}\format[Iso690NamesAuthors,RTFChars]{\author}. \end{author}
+\begin{title}{\\i \format[RTFChars]{\title}}. \end{title}
+\begin{type}[\format[RTFChars]{\type}]. \end{type}
+\begin{address}\format[RTFChars]{\address}: \end{address}
+\begin{publisher}\format[RTFChars]{\publisher}, \end{publisher}
+\begin{year}\format[RTFChars]{\year}.\end{year}
+\\par
+\\par
diff --git a/src/resource/layout/iso690rtf/iso690RTF.standard.layout b/src/resource/layout/iso690rtf/iso690RTF.standard.layout
new file mode 100644
index 0000000..a59d65a
--- /dev/null
+++ b/src/resource/layout/iso690rtf/iso690RTF.standard.layout
@@ -0,0 +1,9 @@
+\begin{author}\format[Iso690NamesAuthors,RTFChars]{\author}. \end{author}
+\begin{title}{\\i \format[RTFChars]{\title}}. \end{title}
+\begin{number}\format[RTFChars]{\number}. \end{number}
+\begin{editor}\format[RTFChars]{\editor}. \end{editor}
+\begin{address}\format[RTFChars]{\address}: \end{address}
+\begin{publisher}\format[RTFChars]{\publisher}, \end{publisher}
+\begin{year}\format[RTFChars]{\year}.\end{year}
+\\par
+\\par
diff --git a/src/resource/layout/iso690rtf/iso690RTF.techreport.layout b/src/resource/layout/iso690rtf/iso690RTF.techreport.layout
new file mode 100644
index 0000000..fc1c994
--- /dev/null
+++ b/src/resource/layout/iso690rtf/iso690RTF.techreport.layout
@@ -0,0 +1,10 @@
+\begin{author}\format[Iso690NamesAuthors,RTFChars]{\author}. \end{author}
+\begin{title}{\\i \format[RTFChars]{\title}}. \end{title}
+\begin{address}\format[RTFChars]{\address}: \end{address}
+\begin{publisher}\format[RTFChars]{\publisher}, \end{publisher}
+\begin{year}\format[RTFChars]{\year}. \end{year}
+\begin{series}\format[RTFChars]{\series}, \end{series}
+\begin{pages}p.\format[RTFChars]{\pages}. \end{pages}
+\begin{availability}(\format[RTFChars]{\availability}).\end{availability}
+\\par
+\\par
diff --git a/src/resource/layout/iso690rtf/iso690RTF.unpublished.layout b/src/resource/layout/iso690rtf/iso690RTF.unpublished.layout
new file mode 100644
index 0000000..ab49d32
--- /dev/null
+++ b/src/resource/layout/iso690rtf/iso690RTF.unpublished.layout
@@ -0,0 +1,9 @@
+\begin{author}\format[Iso690NamesAuthors,RTFChars]{\author}. \end{author}
+\begin{chapter}"\format[RTFChars]{\chapter}". \end{chapter}
+Informe \format[RTFChars]{in�dito}. 
+\begin{institution}\format[RTFChars]{\institution}, \end{institution}
+\begin{address}\format[RTFChars]{\address}: \end{address}
+\begin{year}\format[RTFChars]{\year}. \end{year}
+\begin{pages}p.\format[RTFChars]{\pages}.\end{pages}
+\\par
+\\par
diff --git a/src/resource/layout/iso690txt/iso690.article.layout b/src/resource/layout/iso690txt/iso690.article.layout
new file mode 100644
index 0000000..1e68804
--- /dev/null
+++ b/src/resource/layout/iso690txt/iso690.article.layout
@@ -0,0 +1 @@
+\begin{author}\format[FormatChars,Iso690NamesAuthors]{\author}. \end{author}\begin{title}"\format[FormatChars]{\title}". \end{title}\begin{editor}\format[FormatChars]{\editor}. \end{editor}\begin{journal}\format[FormatChars]{\journal}. \end{journal}\begin{edition}\format[FormatChars]{\edition} ed. \end{edition}\begin{year}\format[FormatChars]{\year}, \end{year}\begin{volume}vol \format[FormatChars]{\volume}, \end{volume}\begin{number}n�m. \format[FormatChars]{\number}, \end{number}\begin [...]
diff --git a/src/resource/layout/iso690txt/iso690.book.layout b/src/resource/layout/iso690txt/iso690.book.layout
new file mode 100644
index 0000000..8866f78
--- /dev/null
+++ b/src/resource/layout/iso690txt/iso690.book.layout
@@ -0,0 +1 @@
+\begin{author}\format[FormatChars,Iso690NamesAuthors]{\author}. \end{author}\begin{title}\format[FormatChars]{\title}. \end{title}\begin{editor}\format[FormatChars]{\editor}. \end{editor}\begin{edition}\format[FormatChars]{\edition} ed. \end{edition}\begin{address}\format[FormatChars]{\address}: \end{address}\begin{publisher}\format[FormatChars]{\publisher}, \end{publisher}\begin{year}\format[FormatChars]{\year}. \end{year}\begin{pages} p. \format[FormatChars]{\pages} \end{pages}\begin{s [...]
diff --git a/src/resource/layout/iso690txt/iso690.edocs.layout b/src/resource/layout/iso690txt/iso690.edocs.layout
new file mode 100644
index 0000000..4813798
--- /dev/null
+++ b/src/resource/layout/iso690txt/iso690.edocs.layout
@@ -0,0 +1 @@
+\begin{author}\format[FormatChars,Iso690NamesAuthors]{\author}. \end{author}\begin{title}\format[FormatChars]{\title}. \end{title}\begin{type}[\format[FormatChars]{\type}]. \end{type}\begin{editor}\format[FormatChars]{\editor}. \end{editor}\begin{edition}\format[FormatChars]{\edition} ed. \end{edition}\begin{address}\format[FormatChars]{\address}: \end{address}\begin{publisher}\format[FormatChars]{\publisher}, \end{publisher}\begin{year}\format[FormatChars]{\year}, \end{year}\begin{yearf [...]
diff --git a/src/resource/layout/iso690txt/iso690.edocsarticle.layout b/src/resource/layout/iso690txt/iso690.edocsarticle.layout
new file mode 100644
index 0000000..d967444
--- /dev/null
+++ b/src/resource/layout/iso690txt/iso690.edocsarticle.layout
@@ -0,0 +1 @@
+\begin{author}\format[FormatChars,Iso690NamesAuthors]{\author}. \end{author}\begin{chapter}"\format[FormatChars]{\chapter}". \end{chapter}\begin{title}\format[FormatChars]{\title}. \end{title}\begin{type}[\format[FormatChars]{\type}]. \end{type}\begin{edition}\format[FormatChars]{\edition}. \end{edition}\begin{number}\format[FormatChars]{\number}. \end{number}\begin{year}\format[FormatChars]{\year}, \end{year}\begin{yearconsults}[\format[FormatChars]{\yearconsults}]. \end{yearconsults}\b [...]
diff --git a/src/resource/layout/iso690txt/iso690.edocscontribution.layout b/src/resource/layout/iso690txt/iso690.edocscontribution.layout
new file mode 100644
index 0000000..3d3ab77
--- /dev/null
+++ b/src/resource/layout/iso690txt/iso690.edocscontribution.layout
@@ -0,0 +1 @@
+\begin{author}\format[FormatChars,Iso690NamesAuthors]{\author}. \end{author}\begin{chapter}"\format[FormatChars]{\chapter}". \end{chapter}\begin{type}[\format[FormatChars]{\type}]. \end{type}\begin{editor}En: \format[FormatChars]{\editor}. \end{editor}\begin{title}\format[FormatChars]{\title}. \end{title}\begin{edition}\format[FormatChars]{\edition} ed.\end{edition}\begin{address}\format[FormatChars]{\address}: \end{address}\begin{publisher}\format[FormatChars]{\publisher}, \end{publishe [...]
diff --git a/src/resource/layout/iso690txt/iso690.edocsnews.layout b/src/resource/layout/iso690txt/iso690.edocsnews.layout
new file mode 100644
index 0000000..fa4d330
--- /dev/null
+++ b/src/resource/layout/iso690txt/iso690.edocsnews.layout
@@ -0,0 +1 @@
+\begin{title}\format[FormatChars]{\title}. \end{title}\begin{type}[\format[FormatChars]{\type}]. \end{type}\begin{editor}\format[FormatChars]{\editor}. \end{editor}\begin{address}\format[FormatChars]{\address}: \end{address}\begin{publisher}\format[FormatChars]{\publisher}, \end{publisher}\begin{year}\format[FormatChars]{\year}, \end{year}\begin{yearconsults}[\format[FormatChars]{\yearconsults}]. \end{yearconsults}\begin{note}\format[FormatChars]{\note}. \end{note}\begin{availability} Di [...]
diff --git a/src/resource/layout/iso690txt/iso690.edocsperiodical.layout b/src/resource/layout/iso690txt/iso690.edocsperiodical.layout
new file mode 100644
index 0000000..7ba3fad
--- /dev/null
+++ b/src/resource/layout/iso690txt/iso690.edocsperiodical.layout
@@ -0,0 +1 @@
+\begin{author}\format[FormatChars,Iso690NamesAuthors]{\author}. \end{author}\begin{title}\format[FormatChars]{\title}. \end{title}\begin{type}[\format[FormatChars]{\type}]. \end{type}\begin{editor}\format[FormatChars]{\editor}. \end{editor}\begin{number}\format[FormatChars]{\number}. \end{number}\begin{year}\format[FormatChars]{\year}. \end{year}\begin{address}\format[FormatChars]{\address}: \end{address}\\begin{yearfield}\format[FormatChars]{\yearfield}, \end{yearfield}\begin{yearconsul [...]
diff --git a/src/resource/layout/iso690txt/iso690.email.layout b/src/resource/layout/iso690txt/iso690.email.layout
new file mode 100644
index 0000000..05368d3
--- /dev/null
+++ b/src/resource/layout/iso690txt/iso690.email.layout
@@ -0,0 +1 @@
+\begin{author}\format[FormatChars,Iso690NamesAuthors]{\author}. \end{author}\begin{title}"\format[FormatChars]{\title}". \end{title}\begin{type}[\format[FormatChars]{\type}]. \end{type}\begin{year}\format[FormatChars]{\year}, \end{year}\begin{note}\format[FormatChars]{\note}. \end{note}
diff --git a/src/resource/layout/iso690txt/iso690.emaillist.layout b/src/resource/layout/iso690txt/iso690.emaillist.layout
new file mode 100644
index 0000000..f538851
--- /dev/null
+++ b/src/resource/layout/iso690txt/iso690.emaillist.layout
@@ -0,0 +1 @@
+\begin{author}\format[FormatChars,Iso690NamesAuthors]{\author}. \end{author}\begin{chapter}"\format[FormatChars]{\chapter}". \end{chapter}\begin{type}[\format[FormatChars]{\type}]. \end{type}\begin{title}En: \format[FormatChars]{\title}. \end{title}\begin{number}(\format[FormatChars]{\number}). \end{number}\begin{address}\format[FormatChars]{\address}. \end{address}\begin{yearconsults}[\format[FormatChars]{\yearconsults}]. \end{yearconsults}\begin{note}\format[FormatChars]{\note}. \end{n [...]
diff --git a/src/resource/layout/iso690txt/iso690.graphics.layout b/src/resource/layout/iso690txt/iso690.graphics.layout
new file mode 100644
index 0000000..c191a65
--- /dev/null
+++ b/src/resource/layout/iso690txt/iso690.graphics.layout
@@ -0,0 +1 @@
+\begin{author}\format[FormatChars,Iso690NamesAuthors]{\author}. \end{author}\begin{title}\format[FormatChars]{\title}. \end{title}\begin{type}[\format[FormatChars]{\type}]. \end{type}\begin{address}\format[FormatChars]{\address}:\end{address}\begin{publisher}\format[FormatChars]{\publisher}, \end{publisher}\begin{year}\format[FormatChars]{\year}. \end{year}
diff --git a/src/resource/layout/iso690txt/iso690.inbook.layout b/src/resource/layout/iso690txt/iso690.inbook.layout
new file mode 100644
index 0000000..111b9e6
--- /dev/null
+++ b/src/resource/layout/iso690txt/iso690.inbook.layout
@@ -0,0 +1 @@
+\begin{author}\format[FormatChars,Iso690NamesAuthors]{\author}. \end{author}\begin{chapter}"\format[FormatChars]{\chapter}". \end{chapter}\begin{editor}En: \format[FormatChars]{\editor}. \end{editor}\begin{title}\format[FormatChars]{\title}. \end{title}\begin{edition}\format[FormatChars]{\edition} ed. \end{edition}\begin{address}\format[FormatChars]{\address}: \end{address}\begin{publisher}\format[FormatChars]{\publisher}. \end{publisher}\begin{year}\format[FormatChars]{\year}.\end{year} [...]
diff --git a/src/resource/layout/iso690txt/iso690.inedocs.layout b/src/resource/layout/iso690txt/iso690.inedocs.layout
new file mode 100644
index 0000000..a862d45
--- /dev/null
+++ b/src/resource/layout/iso690txt/iso690.inedocs.layout
@@ -0,0 +1 @@
+\begin{author}\format[FormatChars,Iso690NamesAuthors]{\author}. \end{author}\begin{title}\format[FormatChars]{\title}. \end{title}\begin{type}[\format[FormatChars]{\type}]. \end{type}\begin{editor}\format[FormatChars]{\editor}. \end{editor}\begin{edition}\format[FormatChars]{\edition} ed. \end{edition}\begin{address}\format[FormatChars]{\address}: \end{address}\begin{publisher}\format[FormatChars]{\publisher}, \end{publisher}\begin{year}\format[FormatChars]{\year}, \end{year}\begin{yearf [...]
diff --git a/src/resource/layout/iso690txt/iso690.inproceedings.layout b/src/resource/layout/iso690txt/iso690.inproceedings.layout
new file mode 100644
index 0000000..7eed160
--- /dev/null
+++ b/src/resource/layout/iso690txt/iso690.inproceedings.layout
@@ -0,0 +1 @@
+\begin{author}\format[FormatChars,Iso690NamesAuthors]{\author}. \end{author}\begin{chapter}"\format[FormatChars]{\chapter}". \end{chapter}\begin{editor}En: \format[FormatChars]{\editor}. \end{editor}\begin{title}\format[FormatChars]{\title}. \end{title}\begin{edition}\format[FormatChars]{\edition} ed. \end{edition}\begin{address}\format[FormatChars]{\address}: \end{address}\begin{publisher}\format[FormatChars]{\publisher}. \end{publisher}\begin{year}\format[FormatChars]{\year}.\end{year} [...]
diff --git a/src/resource/layout/iso690txt/iso690.layout b/src/resource/layout/iso690txt/iso690.layout
new file mode 100644
index 0000000..cdf5a2b
--- /dev/null
+++ b/src/resource/layout/iso690txt/iso690.layout
@@ -0,0 +1 @@
+\begin{author}\format[FormatChars,Iso690NamesAuthors]{\author}. \end{author}\begin{title}\format[FormatChars]{\title}. \end{title}\begin{type}[\format[FormatChars]{\type}]. \end{type}\begin{editor}\format[FormatChars]{\editor}. \end{editor}\begin{edition}\format[FormatChars]{\edition} ed. \end{edition}\begin{address}\format[FormatChars]{\address}: \end{address}\begin{publisher}\format[FormatChars]{\publisher}, \end{publisher}\begin{year}\format[FormatChars]{\year}, \end{year}\begin{yearf [...]
diff --git a/src/resource/layout/iso690txt/iso690.legislation.layout b/src/resource/layout/iso690txt/iso690.legislation.layout
new file mode 100644
index 0000000..2f1610c
--- /dev/null
+++ b/src/resource/layout/iso690txt/iso690.legislation.layout
@@ -0,0 +1 @@
+\begin{address}\format[FormatChars]{\address}. \end{address}\begin{title}\format[FormatChars]{\title}. \end{title}\begin{journal}\format[FormatChars]{\journal}, \end{journal}\begin{year}\format[FormatChars]{\year}.\end{year}\begin{number}n�m. \format[FormatChars]{\number}, \end{number}\begin{pages}p. \format[FormatChars]{\pages}.\end{pages}
diff --git a/src/resource/layout/iso690txt/iso690.mastersthesis.layout b/src/resource/layout/iso690txt/iso690.mastersthesis.layout
new file mode 100644
index 0000000..ae34929
--- /dev/null
+++ b/src/resource/layout/iso690txt/iso690.mastersthesis.layout
@@ -0,0 +1 @@
+\begin{author}\format[FormatChars,Iso690NamesAuthors]{\author}. \end{author}\begin{chapter}"\format[FormatChars]{\chapter}". \end{chapter}\begin{editor}\format[FormatChars]{\editor}. \end{editor}\begin{title} \format[FormatChars]{\title}. \end{title}\begin{type}[\format[FormatChars]{\type}]. \end{type}\begin{school}\format[FormatChars]{\school}, \end{school}\begin{address}\format[FormatChars]{\address}, \end{address}\begin{year}\format[FormatChars]{\year}.\end{year}
diff --git a/src/resource/layout/iso690txt/iso690.patent.layout b/src/resource/layout/iso690txt/iso690.patent.layout
new file mode 100644
index 0000000..d7638af
--- /dev/null
+++ b/src/resource/layout/iso690txt/iso690.patent.layout
@@ -0,0 +1,2 @@
+\begin{author}\format[FormatChars,Iso690NamesAuthors]{\author}. \end{author}\begin{title}\format[FormatChars]{\title}. \end{title}\begin{editor}\format[FormatChars]{\editor}. \end{editor}\begin{note}\format[FormatChars]{\note}. \end{note}\begin{address}\format[FormatChars]{\address}. \end{address}\begin{type}\format[FormatChars]{\type}. \end{type}\begin{number}\format[FormatChars]{\number}. \end{number}\begin{year}\format[FormatChars,Iso690FormatDate]{\year}.\end{year}
+
diff --git a/src/resource/layout/iso690txt/iso690.periodical.layout b/src/resource/layout/iso690txt/iso690.periodical.layout
new file mode 100644
index 0000000..9d37d4c
--- /dev/null
+++ b/src/resource/layout/iso690txt/iso690.periodical.layout
@@ -0,0 +1 @@
+\begin{title}\format[FormatChars]{\title}. \end{title}\begin{author}\format[FormatChars,Iso690NamesAuthors]{\author}. \end{author}\begin{edition}\format[FormatChars]{\edition} ed. \end{edition}\begin{number}\format[FormatChars]{\number}. \end{number}\begin{address}\format[FormatChars]{\address}:\end{address}\begin{publisher}\format[FormatChars]{\publisher},\end{publisher}\begin{year}\format[FormatChars]{\year}-\end{year}\begin{yearfield}\format[FormatChars]{\yearfield}\end{yearfield}.\be [...]
diff --git a/src/resource/layout/iso690txt/iso690.proceeding.layout b/src/resource/layout/iso690txt/iso690.proceeding.layout
new file mode 100644
index 0000000..e0cda6e
--- /dev/null
+++ b/src/resource/layout/iso690txt/iso690.proceeding.layout
@@ -0,0 +1 @@
+\begin{author}\format[FormatChars,Iso690NamesAuthors]{\author}.\end{author}\begin{title}\format[FormatChars]{\title}.\end{title}\begin{editor}\format[FormatChars]{\editor}.\end{editor}\begin{edition}\format[FormatChars]{\edition} ed.\end{edition}\begin{address}\format[FormatChars]{\address}:\end{address}\begin{publisher}\format[FormatChars]{\publisher},\end{publisher}\begin{year}\format[FormatChars]{\year}.\end{year}\begin{pages} p. \format[FormatChars]{\pages}\end{pages}\begin{series}\f [...]
diff --git a/src/resource/layout/iso690txt/iso690.radiotv.layout b/src/resource/layout/iso690txt/iso690.radiotv.layout
new file mode 100644
index 0000000..acc2bd6
--- /dev/null
+++ b/src/resource/layout/iso690txt/iso690.radiotv.layout
@@ -0,0 +1 @@
+\begin{title}\format[FormatChars]{\title}. \end{title}\begin{author}\format[FormatChars]{\author}. \end{author}\begin{editor}\format[FormatChars]{\editor}, \end{editor}\begin{year}\format[FormatChars]{\year}.\end{year}
diff --git a/src/resource/layout/iso690txt/iso690.recording.layout b/src/resource/layout/iso690txt/iso690.recording.layout
new file mode 100644
index 0000000..5b0c496
--- /dev/null
+++ b/src/resource/layout/iso690txt/iso690.recording.layout
@@ -0,0 +1 @@
+\begin{author}\format[FormatChars,Iso690NamesAuthors]{\author}. \end{author}\begin{title}\format[FormatChars]{\title}. \end{title}\begin{type}[\format[FormatChars]{\type}]. \end{type}\begin{address}\format[FormatChars]{\address}: \end{address}\begin{publisher}\format[FormatChars]{\publisher}, \end{publisher}\begin{year}\format[FormatChars]{\year}.\end{year}
diff --git a/src/resource/layout/iso690txt/iso690.standard.layout b/src/resource/layout/iso690txt/iso690.standard.layout
new file mode 100644
index 0000000..41b4e85
--- /dev/null
+++ b/src/resource/layout/iso690txt/iso690.standard.layout
@@ -0,0 +1 @@
+\begin{author}\format[FormatChars,Iso690NamesAuthors]{\author}. \end{author}\begin{title}\format[FormatChars]{\title}. \end{title}\begin{number}\format[FormatChars]{\number}. \end{number}\begin{editor}\format[FormatChars]{\editor}. \end{editor}\begin{address}\format[FormatChars]{\address}: \end{address}\begin{publisher}\format[FormatChars]{\publisher}, \end{publisher}\begin{year}\format[FormatChars]{\year}.\end{year}
diff --git a/src/resource/layout/iso690txt/iso690.techreport.layout b/src/resource/layout/iso690txt/iso690.techreport.layout
new file mode 100644
index 0000000..2797930
--- /dev/null
+++ b/src/resource/layout/iso690txt/iso690.techreport.layout
@@ -0,0 +1 @@
+\begin{author}\format[FormatChars,Iso690NamesAuthors]{\author}. \end{author}\begin{title}\format[FormatChars]{\title}. \end{title}\begin{address}\format[FormatChars]{\address}: \end{address}\begin{publisher}\format[FormatChars]{\publisher}, \end{publisher}\begin{year}\format[FormatChars]{\year}. \end{year}\begin{series}\format[FormatChars]{\series}, \end{series}\begin{pages}p.\format[FormatChars]{\pages}. \end{pages}\begin{availability}(\format[FormatChars]{\availability}).\end{availability}
diff --git a/src/resource/layout/iso690txt/iso690.unpublished.layout b/src/resource/layout/iso690txt/iso690.unpublished.layout
new file mode 100644
index 0000000..6c83cf2
--- /dev/null
+++ b/src/resource/layout/iso690txt/iso690.unpublished.layout
@@ -0,0 +1 @@
+\begin{author}\format[FormatChars,Iso690NamesAuthors]{\author}. \end{author}\begin{chapter}"\format[FormatChars]{\chapter}". \end{chapter}Informe in�dito. \begin{school}\format[FormatChars]{\school}, \end{school}\begin{address}\format[FormatChars]{\address}: \end{address}\begin{year}\format[FormatChars]{\year}. \end{year}\begin{pages}p.\format[FormatChars]{\pages}.\end{pages}
diff --git a/src/txt/CHANGELOG b/src/txt/CHANGELOG
index 356a38a..6d3b871 100644
--- a/src/txt/CHANGELOG
+++ b/src/txt/CHANGELOG
@@ -1,3 +1,50 @@
+2.10 beta
+    - Applied fix for JStor fetcher (patch 202 by Nicolas Brouard)
+    - Added Settings menu item "Clear connection settings" in OpenOffice/LibreOffice panel.
+    - Added support for specifying a BibTeX file at "--importToOpen". This allows a usage in browsers
+      to directly append downloaded entries to the currently opened database.
+    - Added Unicode to LaTeX conversion for Medline imports (feature 721)
+    - Added Unicode to LaTeX conversion cleanup action (feature 721)
+    - Added countries, weekdays and months to the case keeper
+    - Added support for Emacs key bindings at the entry editor.
+      To avoid collisions of common key bindings, Page up and page down (C-v) are not supported as C-v is "paste" in Windows key bindings. 
+    - Added a formatter for units which keeps the case and adds non-breaking separators
+    - Added a Merge entries functionality
+    - Added a setting to choose either a DOI link or a URL to be standard (feature 710)
+    - Added button to change entry type. Removed this functionality from the type label, and
+      reduced the font size.
+    - Added Iso690 export including two new formatters: Iso690FormatDate and Iso690NamesAuthors
+      (patch 123 by Laura Hernández Gómez)
+    - Added menu option "Automatically set file links for selected entries".
+    - Added new BibTeX label pattern authEtAl
+    - Added new BibTeX label pattern authForeIne, authorLastForeIni, edtrForeIni, and editorLastForeIni
+      (patch 199)
+    - The folder of attachments can now be opened (feature 726, patch by Douglas Nassif Roma Junior).
+    - New translation: Spanish. By Jorge Tornero et al.
+    - Adapted the required and optional fields of entry types according to
+      http://en.wikipedia.org/wiki/BibTeX#Entry_types
+    - After a search has been done, the first entry of the entry table is selected (feature 656).
+    - Entries contained in an .aux file can now be selected (feature 644).
+    - Number of entries in a group is now displayed in brackets (patch 124).
+      Feature has to be enabled at the group settings as calculating the numbers takes a long time at huge databases.
+    - New entries are now always be added to a group. Fixes bug 1093.
+    - Configurable: Timestamp is now automatically updated on a change of an entry (feature 799)
+    - Re-enabled customization of shortcut keys
+    - Changed serialization of BibTeX entries:
+      * First, the required, then the optional and then all other fields are written.
+        Thereby, fields are now ordered by name. Except the title, which is written first.
+      * The second word in of the BibTeX type is capitalized. E.g., Inproceedings got InProceedings
+      * Configurable: Start field contents in same column. Enabled by default.
+      * Configurable: Use camel case for field names (e.g., "HowPublished" instead of "howpublished"). Enabled by default.
+      * If no field name is given, then "UNKNOWN" is used. For instance, " = {X}" gets " UNKNOWN = {X}".
+    - Saving a part of the database now also writes entries with a crossref field first.
+    - Author field is now resolved using @String data.
+    - A custom proxy can be specified (patch 198 by Michael).
+    - Default key binding for Write XMP is now "CTRL+F7" instead of "CTRL+F4"
+      as the latter conflicts with "Synchronize files" (by Adrian Daerr)
+    - WriteXMPAction now uses database to resolve strings even for selected entries (by Adrian Daerr)
+    - Extend XMP privacy filtering to Dublin Core Schema (by Adrian Daerr)
+    - IEEE search should include author field again (patch 201 by Christopher S. Lester, fixes bug 1137)
 2.9.2
     - Fixed handling of empty author parts in rare cases. Fixes bug 1124.
     - Fetchers work again: Import inspection dialog is not modal any more.
@@ -22,9 +69,9 @@
       as text or an equation via the preferences
     - Added initial support for adding curly brackets {} for certain
       key words to keep the character case independent of .bst, e.g., for
-      names and abbreviations (use via "Cleanup entries") and can be controlled 
+      names and abbreviations (use via "Cleanup entries") and can be controlled
       via preferences if it should be used at searches
-    - Fixed author and DOI import from IEEE Xplore 
+    - Fixed author and DOI import from IEEE Xplore
     - Improved import of equations in IEEE Xplore titles handling images, (sub) and /spl / representations
     - Rewrote the HTML import in a more general way. A few characters need to be added.
     - IEEE Xplore abstract fetching should now be working again.
@@ -34,7 +81,7 @@
     - Added alternate entry fetcher type where a preview can be displayed so the user can choose
       which entries to download. This can reduce server load significantly and prevent users from
       getting locked out of search services.
-    - Fix for exception and minor bugs in HTML import parsing (patch 3575998 by Daniel Sv�rd)
+    - Fix for exception and minor bugs in HTML import parsing (patch 3575998 by Daniel Svärd)
     - HTML import handles more characters. Cleanup can also do HTML cleanup. (Patch 3582375 by Oscar Gustafsson)
     - During file renaming: More illegal characters are removed (idea by Sarel Botha)
     - Rudimentary support for IEEEtranBSTCTL added (patch 3582376 by Oscar Gustafsson)
@@ -68,7 +115,7 @@
     - Text-based citations can now be imported using FreeCite by Brown University
       (http://freecite.library.brown.edu). By Kai Mindermann and Daniel Maurer.
     - JabRef supports synchronization of unlinked PDFs. Feature request "[2163626] Scan database - find unlinked files".
-      Based on patch 3122104. 
+      Based on patch 3122104.
     - Added command line argument -d/-prdef for resetting preferences to default values. Can
       reset a comma-separated list of preference values, or all values.
     - Added small right-click popup menu at each tab
@@ -76,7 +123,7 @@
     - Drag'n'drop of text from the preview panel to other applications is now working
     - Added highlighting in preview area for search text (based on patch 3121914 by
       Maximilian Lengsfeld).
-    - New context menu option "Switch preview layout" in the preview panel. 
+    - New context menu option "Switch preview layout" in the preview panel.
     - BibTeX key generator patterns can now be stored in per database (implements feature 3495993)
     - Braces around author names are now dropped internally. They remain in the .bib though
       Effects (incomplete list): Authors in the main window are shown without braces,
@@ -86,9 +133,9 @@
       (default is 2)
     - Autocompletion: in case lower case letters are used, the search is case-insenstive,
       otherwise the search is case sensitive.
-    - Autocompletion: new preference to choose how to deal with first names 
+    - Autocompletion: new preference to choose how to deal with first names
       (always full/always abbreviated/both full and abbreviated)
-    - Added functionality "clean up entries" 
+    - Added functionality "clean up entries"
       - Includes clean up DOI functionality by Florian Straßer and Marius Kleiner
         (move of DOIs from ee, note, and url field is supported)
       - Option to rename PDF of entry according to configured PDF-naming-scheme
@@ -170,10 +217,10 @@
     - Bugfix for NullPointerException in Biblatex mode (patch 3222388 by Matthias Erll).
     - ToggleButton added to GroupSelector to ease adding/removing references to/from groups
       (based on patch 3313564 updated by Andreas Schlicker).
-    - Export filter "tablerefsandbib" updated to contain links to files and notes 
+    - Export filter "tablerefsandbib" updated to contain links to files and notes
       (patch 2787096 by Thomas Arildsen).
     - "of" added to the list of skip words (patch 2781830).
-    - Added cli-function for exporting entries filtered by a search term 
+    - Added cli-function for exporting entries filtered by a search term
       (patch 1817093 by Silberer, Zirn)
     - Added highlighting in textarea for search text (patch 3117881 by Ben).
       Slightly modified to cope with words[]={""}, support for "BibTeX source" tab, and that
@@ -226,8 +273,8 @@
     - Restricted remote listener port numbers to interval 1025-65535.
     - Added Japanese translation by Koji Yokota.
     - Added scrollbar to entry editor when it is too high to fit in its panel. Patch
-      by Matthias Erll 
-    - Made it possible to copy entries from the search dialog.    
+      by Matthias Erll
+    - Made it possible to copy entries from the search dialog.
     - Added proper error message when trying to search with invalid regular expression.
     - Added error dialog on startup if custom look and feel cannot be loaded.
     - Applied Alexander Hug's patch for correctly importing doi from ScienceDirect RIS files.
@@ -254,13 +301,13 @@
       externally after merging changes.
     - Fixed bug in Move/rename file link feature that could cause the wrong link to be
       stored for certain directory structures.
-    - Fixed bug: curly braces can now be used in arguments to formatters. 
+    - Fixed bug: curly braces can now be used in arguments to formatters.
     - Fixed lockup bug when generating key for entries with crossref fields.
     - BibTeX strings are now resolved before attempting to (un)abbreviate journal names.
     - Modified [shorttitle] and [veryshorttitle] key generator markers so they consider
       a hyphen a word boundary, and remove punctuation characters (keep only numbers and
       letters).
-    - deprecate various export formatters with new Authors formatter, which provides flexible 
+    - deprecate various export formatters with new Authors formatter, which provides flexible
       formatting options.
 2.6
     - Fixed IEEExplorer and ACM fetchers to adapt to web site changes.
@@ -294,11 +341,11 @@
     - Added "review" field to BibTeXML export.
     - Added Reset button to entry fetchers. Patch by Dennis Hartrampf and Ines Moosdorf.
     - Changed Microsoft Office XML export so "number" rather than "issue" is exported
-      as <b:Issue>, which conforms with import format. 
+      as <b:Issue>, which conforms with import format.
     - Added confirmation dialog that allows saving without backup in cases when
       backup creation fails.
     - Fixed bug 2938562: using the move/rename feature on a file link could give an
-      absolute link even if the file was put below the main file directory. 
+      absolute link even if the file was put below the main file directory.
     - Fixed bug 2931293: error generating key with [authorsAlpha] for short names.
     - When checking for external modifications, file size is now checked in addition
       to the time stamp.
@@ -331,7 +378,7 @@
       group selection is active.
     - Fixed bug in writing of metadata on Windows. For certain metadata lengths newlines would be
       messed up after the metadata comment in a bib file.
-    - Search dialog now automatically previews first hit, and hides preview if there are no hits. 
+    - Search dialog now automatically previews first hit, and hides preview if there are no hits.
 2.6b2
     - Added export formatter "Default" which takes a single argument. Outputs the string to format
       unchanged if it is non-empty, otherwise outputs the argument.
@@ -390,7 +437,7 @@
       author field.
     - Fixed bug in autocompleter. Current suggested completion would be added to the field
       if the user closed the entry editor or mouse clicked on another field.
-    - Fixed problem with exporting to some MySql versions. Patch by François Dorin. 
+    - Fixed problem with exporting to some MySql versions. Patch by François Dorin.
     - Fixed bug in handling of LaTeX character sequences - now sequences with = as command
       character (e.g. "\={A}") are recognized.
     - Fixed bug: gray out / hide setting in groups panel is overridden on startup
@@ -482,7 +529,7 @@
     - Fixed bug in HTMLConverter.
     - Fixed NullPointerException in key generator for incomplete names.
     - Fixed bug in removing custom export filters.
-    - Fixed bug 2225371: restart is no longer required after adding a new custom export filter. 
+    - Fixed bug 2225371: restart is no longer required after adding a new custom export filter.
     - Fixed bug in "Move/rename file" feature in file field editor with regard to undefined
       file directory.
     - Fixed bug in Ris importer.
@@ -493,7 +540,7 @@
     - Fixed crash during initalization of journal abbreviation list.
     - Added option to have JabRef search for external file when "Open file" function is chosen
       for an entry without any linked files. This is similar to what was always done in
-      JabRef 2.3.1 and earlier. 
+      JabRef 2.3.1 and earlier.
     - Improved regular expression file search, so the regular expression can contain field
       markers as used for BibTeX key generation in addition to just regular fields. It is
       no longer possible to call arbitrary layout formatters, but the modifiers "upper",
@@ -563,15 +610,15 @@
     - Fixed bug where the external update notification in the side pane would remain
       even if the referred database was closed.
     - Added two new search modes - display search results in a dialog, and global search.
-    - Support for fetching from the command line using --fetch (contributed by 
+    - Support for fetching from the command line using --fetch (contributed by
       Jan F. Boldt and David Kaltschmidt).
     - Support for fetching from Spires (contributed by Fedor Bezrukov).
-    - Support for fetching from JSTOR (contributed by Tobias Langner, Juliane 
+    - Support for fetching from JSTOR (contributed by Tobias Langner, Juliane
       Doege, Sebastian de Hoog and Christoph Jacob)
     - Added context menu for file list editor with options to move/rename linked file
       as well as to automatically move the file to file directory and optionally rename
       after BibTeX key.
-	- JabRef can now be extended by plugins (using the Java Plugin Framework 
+	- JabRef can now be extended by plugins (using the Java Plugin Framework
 	  JPF as the underlying technology). Currently extension points exist for:
 		- ImportFormat
 		- ExportFormat based on Templates
@@ -583,7 +630,7 @@
 	  generate helper classes for making JPF easier. Current version used: 0.4
 	  http://forge.spline.inf.fu-berlin.de/projects/jpfcodegen/
 	- Print warnings if insufficient Java version is used or if JRE is not from Sun.
-	- Memory Stick Mode: JabRef automatically loads configuration settings from 
+	- Memory Stick Mode: JabRef automatically loads configuration settings from
 	  jabref.xml and also writes them there if enabled.
 	- Improved handling of crossrefs. Fields are now resolved in preview and export.
 	- Updated dependencies, now using: JempBox-0.2
@@ -611,7 +658,7 @@
     - Fixed handling of quotes when using the "abbr" modifier for key generator (Debian bug
       #448917).
     - Download file procedure now strips query string in order to find correct file extension
-      (Debian bug #448027).    
+      (Debian bug #448027).
 2.3b3
     - Export formats that output the character encoding now use common names for encodings
       instead of Java-specific names.
diff --git a/src/txt/README b/src/txt/README
index 9ba95d2..2ee09f2 100644
--- a/src/txt/README
+++ b/src/txt/README
@@ -1,6 +1,5 @@
-
-JabRef 2.9.2
-------------
+JabRef 2.10 beta
+----------------
 
 Introduction:
 
diff --git a/src/windows/nsis/installer_languages/spanish.nsh b/src/windows/nsis/installer_languages/spanish.nsh
new file mode 100644
index 0000000..00efcd6
--- /dev/null
+++ b/src/windows/nsis/installer_languages/spanish.nsh
@@ -0,0 +1,33 @@
+!ifndef _JabRef_LANGUAGES_SPANISH_NSH_
+!define _JabRef_LANGUAGES_SPANISH_NSH_
+
+!ifdef JabRef_LANG
+!undef JabRef_LANG
+!endif
+!define JabRef_LANG ${LANG_SPANISH}
+
+LicenseLangString JabRefLicenseData ${JabRef_LANG} "${PRODUCT_LICENSE_FILE}"
+
+LangString WelcomePageText "${JabRef_LANG}" "Este asistente le guiará a través del proceso de instalación de JabRef.\r\n\
+					     \r\n\
+					     $_CLICK"
+
+LangString SecAssociateBibTitle "${JabRef_LANG}" "Asociar archivos BibTex"
+LangString SecDesktopTitle "${JabRef_LANG}" "Icono de escritorio"
+
+LangString SecAssociateBibDescription "${JabRef_LANG}" "Los ficheros con extensión .bib serán abiertos con JabRef"
+LangString SecDesktopDescription "${JabRef_LANG}" "Inserta el icono de JabRef en el escritorio."
+
+LangString StillInstalled "${JabRef_LANG}" "¡JabRef ${Version} ya está instalado!"
+
+LangString FinishPageMessage "${JabRef_LANG}" "Enhorabuena. JabRef se ha instalado con éxito."
+LangString FinishPageRun "${JabRef_LANG}" "Iniciar JabRef"
+
+LangString UnNotAdminLabel "${JabRef_LANG}" "Debe tener privilegios de administrador para poder instalar JabRef!"
+LangString UnReallyRemoveLabel "${JabRef_LANG}" "¿Está seguro de querer eliminar JabRef por completo?"
+LangString UnRemoveSuccessLabel "${JabRef_LANG}" "La desinstalación de JabRef ha tenido éxito."
+
+
+!undef JabRef_LANG
+
+!endif ; _JabRef_LANGUAGES_SPANISH_NSH_
\ No newline at end of file
diff --git a/src/windows/nsis/setup.nsi b/src/windows/nsis/setup.nsi
index 79decb3..d963e53 100644
--- a/src/windows/nsis/setup.nsi
+++ b/src/windows/nsis/setup.nsi
@@ -121,11 +121,13 @@ Var InstDestination
 !insertmacro MUI_LANGUAGE "French"
 !insertmacro MUI_LANGUAGE "German"
 !insertmacro MUI_LANGUAGE "Italian"
+!insertmacro MUI_LANGUAGE "Spanish"
 
 !include "installer_languages\english.nsh"
 !include "installer_languages\french.nsh"
 !include "installer_languages\german.nsh"
 !include "installer_languages\italian.nsh"
+!include "installer_languages\spanish.nsh"
 
 
 # Installer attributes
diff --git a/syncLang.py b/syncLang.py
index ad83540..790bc36 100644
--- a/syncLang.py
+++ b/syncLang.py
@@ -336,39 +336,18 @@ elif (len(sys.argv) >= 2) and (sys.argv[1] == "-t"):
         changeFiles = 1
     else:
         changeFiles = 0
-        
-    handleFileSet("resource/JabRef_en.properties", ("resource/JabRef_de.properties",\
-        "resource/JabRef_fr.properties", "resource/JabRef_it.properties",\
-        "resource/JabRef_ja.properties", "resource/JabRef_pt_BR.properties",\
-        "resource/JabRef_nl.properties", "resource/JabRef_da.properties",\
-        "resource/JabRef_no.properties", "resource/JabRef_tr.properties",\
-        "resource/JabRef_vi.properties", "resource/JabRef_in.properties", \
-        "resource/JabRef_zh.properties"), changeFiles)
-    handleFileSet("resource/Menu_en.properties", ("resource/Menu_de.properties",\
-        "resource/Menu_fr.properties", "resource/Menu_it.properties",\
-        "resource/Menu_ja.properties", "resource/Menu_pt_BR.properties",\
-        "resource/Menu_nl.properties", "resource/Menu_da.properties",\
-        "resource/Menu_es.properties",\
-        "resource/Menu_no.properties", "resource/Menu_tr.properties",\
-        "resource/Menu_vi.properties", "resource/Menu_in.properties",\
-        "resource/Menu_zh.properties"), changeFiles)
-        
+
+    filesJabRef = filter(lambda s: (s.startswith('JabRef_') and not (s.startswith('JabRef_en'))), os.listdir("resource"));
+    filesJabRef = ["resource/" + i for i in filesJabRef];
+    filesMenu = filter(lambda s: (s.startswith('Menu_') and not (s.startswith('Menu_en'))), os.listdir("resource"));
+    filesMenu = ["resource/" + i for i in filesMenu];
+
+    handleFileSet("resource/JabRef_en.properties", filesJabRef, changeFiles)
+    handleFileSet("resource/Menu_en.properties", filesMenu, changeFiles)
+
 elif (len(sys.argv) >= 2) and ((sys.argv[1] == "-d") or (sys.argv[1] == "-c")):
-    files = ("resource/JabRef_en.properties", "resource/JabRef_de.properties",\
-        "resource/JabRef_fr.properties", "resource/JabRef_it.properties",\
-        "resource/JabRef_ja.properties", "resource/JabRef_pt_BR.properties",\
-        "resource/JabRef_no.properties", "resource/JabRef_nl.properties",\
-        "resource/JabRef_da.properties",\
-        "resource/JabRef_tr.properties",\
-        "resource/JabRef_vi.properties", "resource/JabRef_in.properties",\
-        "resource/JabRef_zh.properties",\
-        "resource/Menu_en.properties", "resource/Menu_de.properties",\
-        "resource/Menu_fr.properties", "resource/Menu_it.properties",\
-        "resource/Menu_ja.properties", "resource/Menu_pt_BR.properties",\
-        "resource/Menu_no.properties", "resource/Menu_nl.properties",\
-        "resource/Menu_da.properties", "resource/Menu_es.properties", \
-        "resource/Menu_tr.properties",\
-        "resource/Menu_vi.properties", "resource/Menu_in.properties",\
-        "resource/Menu_zh.properties")
+    files = filter(lambda s: (s.startswith('JabRef_') and not (s.startswith('JabRef_en'))), os.listdir("resource"));
+    files.extend(filter(lambda s: (s.startswith('Menu_') and not (s.startswith('Menu_en'))), os.listdir("resource")));
+    files = ["resource/" + i for i in files];
     for file in files:
         lookForDuplicates(file, sys.argv[1] == "-d")

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