diff --git a/.classpath b/.classpath
index afba58a..a6a711d 100644
--- a/.classpath
+++ b/.classpath
@@ -1,49 +1,49 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="test-integration/src"/>
-	<classpathentry kind="src" path="gen/src"/>
-	<classpathentry kind="src" path="test/src"/>
-	<classpathentry kind="src" path="lib-mnemonics/src"/>
-	<classpathentry exported="true" kind="lib" path="lib/htmlparser.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/jna.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/jmyspell-core-1.0.0-beta-2.jar"/>
-	<classpathentry exported="true" kind="lib" path="test/lib/junit-4.4.jar"/>
-	<classpathentry exported="true" kind="lib" path="test/lib/xmlunit-1.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/pdfbox-app-1.8.1.jar"/>
-	<classpathentry kind="lib" path="lib/jsch-0.1.49.jar"/>
-	<classpathentry kind="lib" path="lib/sequence-library-1.0.2.jar"/>
-	<classpathentry kind="lib" path="lib/antlr-runtime-3.4.jar"/>
-	<classpathentry kind="lib" path="lib/diff.jar"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-	<classpathentry kind="lib" path="lib/lucene-analyzers-3.6.2.jar"/>
-	<classpathentry kind="lib" path="lib/lucene-core-3.6.2.jar"/>
-	<classpathentry kind="lib" path="lib/lucene-kuromoji-3.6.2.jar"/>
-	<classpathentry kind="lib" path="lib/lucene-smartcn-3.6.2.jar"/>
-	<classpathentry kind="lib" path="lib/tinysegmenter.jar"/>
-	<classpathentry kind="lib" path="lib/commons-lang-2.4.jar"/>
-	<classpathentry kind="lib" path="lib/commons-logging-1.1.1.jar"/>
-	<classpathentry kind="lib" path="lib/LanguageTool/cjftransform-1.0.1.jar"/>
-	<classpathentry kind="lib" path="lib/LanguageTool/ictclas4j-1.0.1.jar"/>
-	<classpathentry kind="lib" path="lib/LanguageTool/jwordsplitter-3.4.jar"/>
-	<classpathentry kind="lib" path="lib/LanguageTool/languagetool-core-2.2.jar"/>
-	<classpathentry kind="lib" path="lib/LanguageTool/LanguageTool-data.jar"/>
-	<classpathentry kind="lib" path="lib/LanguageTool/morfologik-fsa-1.5.4.jar"/>
-	<classpathentry kind="lib" path="lib/LanguageTool/morfologik-speller-1.5.4.jar"/>
-	<classpathentry kind="lib" path="lib/LanguageTool/morfologik-stemming-1.5.4.jar"/>
-	<classpathentry kind="lib" path="lib/LanguageTool/segment-1.4.1.jar"/>
-	<classpathentry kind="lib" path="lib/LanguageTool/lucene-gosen-2.0.2-ipadic.jar"/>
-	<classpathentry kind="lib" path="lib/groovy-all-2.2.2.jar"/>
-	<classpathentry kind="lib" path="lib/KoreanAnalyzer-3x-120223.jar"/>
-	<classpathentry kind="lib" path="lib/SuperTMXMerge-for_OmegaT.jar"/>
-	<classpathentry kind="lib" path="lib/swing-layout-1.0.4.jar"/>
-	<classpathentry kind="lib" path="lib/slf4j-api-1.7.7.jar"/>
-	<classpathentry kind="lib" path="lib/slf4j-jdk14-1.7.7.jar"/>
-	<classpathentry kind="lib" path="lib/sqljet-1.1.10.jar"/>
-	<classpathentry kind="lib" path="lib/svnkit-1.8.5.jar"/>
-	<classpathentry kind="lib" path="lib/trilead-ssh2-1.0.0-build217.jar"/>
-	<classpathentry kind="lib" path="lib/vldocking-3.0.5-SNAPSHOT.jar"/>
-	<classpathentry kind="lib" path="lib/juniversalchardet-1.0.3.jar"/>
-	<classpathentry kind="lib" path="lib/org.eclipse.jgit-3.7.1.201504261725-r.jar"/>
-	<classpathentry kind="output" path="classes"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="test-integration/src"/>
+	<classpathentry kind="src" path="gen/src"/>
+	<classpathentry kind="src" path="test/src"/>
+	<classpathentry kind="src" path="lib-mnemonics/src"/>
+	<classpathentry exported="true" kind="lib" path="lib/htmlparser.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/jna.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/jmyspell-core-1.0.0-beta-2.jar"/>
+	<classpathentry exported="true" kind="lib" path="test/lib/junit-4.4.jar"/>
+	<classpathentry exported="true" kind="lib" path="test/lib/xmlunit-1.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/pdfbox-app-1.8.1.jar"/>
+	<classpathentry kind="lib" path="lib/jsch-0.1.49.jar"/>
+	<classpathentry kind="lib" path="lib/sequence-library-1.0.2.jar"/>
+	<classpathentry kind="lib" path="lib/antlr-runtime-3.4.jar"/>
+	<classpathentry kind="lib" path="lib/diff.jar"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+	<classpathentry kind="lib" path="lib/lucene-analyzers-3.6.2.jar"/>
+	<classpathentry kind="lib" path="lib/lucene-core-3.6.2.jar"/>
+	<classpathentry kind="lib" path="lib/lucene-kuromoji-3.6.2.jar"/>
+	<classpathentry kind="lib" path="lib/lucene-smartcn-3.6.2.jar"/>
+	<classpathentry kind="lib" path="lib/tinysegmenter.jar"/>
+	<classpathentry kind="lib" path="lib/commons-lang-2.4.jar"/>
+	<classpathentry kind="lib" path="lib/commons-logging-1.1.1.jar"/>
+	<classpathentry kind="lib" path="lib/LanguageTool/cjftransform-1.0.1.jar"/>
+	<classpathentry kind="lib" path="lib/LanguageTool/ictclas4j-1.0.1.jar"/>
+	<classpathentry kind="lib" path="lib/LanguageTool/jwordsplitter-3.4.jar"/>
+	<classpathentry kind="lib" path="lib/LanguageTool/languagetool-core-2.2.jar"/>
+	<classpathentry kind="lib" path="lib/LanguageTool/LanguageTool-data.jar"/>
+	<classpathentry kind="lib" path="lib/LanguageTool/morfologik-fsa-1.5.4.jar"/>
+	<classpathentry kind="lib" path="lib/LanguageTool/morfologik-speller-1.5.4.jar"/>
+	<classpathentry kind="lib" path="lib/LanguageTool/morfologik-stemming-1.5.4.jar"/>
+	<classpathentry kind="lib" path="lib/LanguageTool/segment-1.4.1.jar"/>
+	<classpathentry kind="lib" path="lib/LanguageTool/lucene-gosen-2.0.2-ipadic.jar"/>
+	<classpathentry kind="lib" path="lib/groovy-all-2.2.2.jar"/>
+	<classpathentry kind="lib" path="lib/KoreanAnalyzer-3x-120223.jar"/>
+	<classpathentry kind="lib" path="lib/SuperTMXMerge-for_OmegaT.jar"/>
+	<classpathentry kind="lib" path="lib/swing-layout-1.0.4.jar"/>
+	<classpathentry kind="lib" path="lib/slf4j-api-1.7.7.jar"/>
+	<classpathentry kind="lib" path="lib/slf4j-jdk14-1.7.7.jar"/>
+	<classpathentry kind="lib" path="lib/sqljet-1.1.10.jar"/>
+	<classpathentry kind="lib" path="lib/svnkit-1.8.5.jar"/>
+	<classpathentry kind="lib" path="lib/trilead-ssh2-1.0.0-build217.jar"/>
+	<classpathentry kind="lib" path="lib/vldocking-3.0.5-SNAPSHOT.jar"/>
+	<classpathentry kind="lib" path="lib/juniversalchardet-1.0.3.jar"/>
+	<classpathentry kind="lib" path="lib/org.eclipse.jgit-3.7.1.201504261725-r.jar"/>
+	<classpathentry kind="output" path="classes"/>
+</classpath>
diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
index 8000cd6..7341ab1 100644
--- a/.settings/org.eclipse.jdt.core.prefs
+++ b/.settings/org.eclipse.jdt.core.prefs
@@ -1,11 +1,11 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.7
diff --git a/Main.launch b/Main.launch
new file mode 100644
index 0000000..098b54c
--- /dev/null
+++ b/Main.launch
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/OmegaT trunk/src/org/omegat/Main.java"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="1"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
+<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
+</listAttribute>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.omegat.Main"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="OmegaT trunk"/>
+</launchConfiguration>