[SCM] omegat packaging branch, upstream, updated. upstream/2.2.3_beta4-6-g2f251ed

Tiago Saboga tiagosab-guest at alioth.debian.org
Thu Aug 4 19:23:57 UTC 2011


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "omegat packaging".

The branch, upstream has been updated
       via  2f251ed1a7f8356aee64d71eaebdbcb8b06547d8 (commit)
       via  2e9b4cdddab8ea639c5e19dc7ccf8e2ccb83f8ad (commit)
      from  5d88586e0472f772ef2a445ee25e0ebb72fc7ab1 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 build.xml                                          |   28 +-
 docs/en/GoogleTranslate.html                       |  104 --
 docs/en/OmegaT.css                                 |  124 ++-
 docs/en/aboutOmegaT.html                           |   85 --
 docs/en/appendix.acknowledgements.html             |  127 ++
 docs/en/appendix.keyboard.html                     |  215 ++++
 docs/en/appendix.languages.html                    | 1009 ++++++++++++++++
 docs/en/appendix.legal.notices.html                |  122 ++
 docs/en/appendix.website.html                      |  154 +++
 docs/en/chapter.about.OmegaT.html                  |  315 +++++
 docs/en/chapter.dictionaries.html                  |  177 +++
 docs/en/chapter.file.filters.html                  |  560 +++++++++
 docs/en/chapter.files.and.directories.html         |  534 +++++++++
 docs/en/chapter.files.to.translate.html            |  466 ++++++++
 docs/en/chapter.font.html                          |  118 ++
 docs/en/chapter.formatted.text.html                |  282 +++++
 docs/en/chapter.glossaries.html                    |  368 ++++++
 docs/en/chapter.installing.and.running.html        | 1138 ++++++++++++++++++
 docs/en/chapter.instant.start.guide.html           |  603 ++++++++++
 docs/en/chapter.machine.translate.html             |  242 ++++
 docs/en/chapter.menu.html                          | 1004 ++++++++++++++++
 docs/en/chapter.misc.html                          |  390 ++++++
 docs/en/chapter.plain.text.html                    |  190 +++
 docs/en/chapter.project.properties.html            |  167 +++
 docs/en/chapter.regexp.html                        |  537 +++++++++
 docs/en/chapter.searches.html                      |  285 +++++
 docs/en/chapter.segmentation.html                  |  288 +++++
 docs/en/chapter.spellchecker.html                  |  227 ++++
 docs/en/chapter.translation.editing.html           |  171 +++
 docs/en/chapter.translation.memories.html          |  536 +++++++++
 docs/en/chapter.user.interface.html                |  789 ++++++++++++
 docs/en/commandlineArguments.html                  |  320 -----
 docs/en/consoleMode.html                           |   92 --
 docs/en/dictionaries.html                          |   97 --
 docs/en/fileFilters.html                           |  284 -----
 docs/en/filesAndDirectories.html                   |  557 ---------
 docs/en/filesToTranslate.html                      |  380 ------
 docs/en/fontSettings.html                          |   69 --
 docs/en/formattedText.html                         |  390 ------
 docs/en/glossaries.html                            |  232 ----
 docs/en/images/AsciiFilteroptions.png              |  Bin 47301 -> 48179 bytes
 docs/en/images/EditingBehaviourOptions.png         |  Bin 0 -> 11064 bytes
 docs/en/images/Glossary_pane.png                   |  Bin 43588 -> 4558 bytes
 docs/en/images/MatchStatistics.png                 |  Bin 0 -> 24182 bytes
 docs/en/images/MatchesPane.png                     |  Bin 35051 -> 32295 bytes
 docs/en/images/MultiTerm_Glossary.png              |  Bin 0 -> 46736 bytes
 docs/en/images/OmT_Cyrillic.png                    |  Bin 0 -> 2582 bytes
 docs/en/images/OmT_Japanese.png                    |  Bin 0 -> 1858 bytes
 docs/en/images/OmegaT_panes.png                    |  Bin 90834 -> 209496 bytes
 docs/en/images/SpellcheckingText.png               |  Bin 38240 -> 37981 bytes
 docs/en/images/TagValidation.png                   |  Bin 0 -> 9619 bytes
 docs/en/images/TextSearch.png                      |  Bin 28667 -> 57052 bytes
 docs/en/images/saveglossary.png                    |  Bin 117355 -> 117526 bytes
 docs/en/index.html                                 |  533 ++++++---
 docs/en/installingAndRunning.html                  |  683 -----------
 docs/en/instantStartGuide.html                     |  422 -------
 docs/en/instantStartGuideNoTOC.html                |  843 +++++++++-----
 docs/en/ix01.html                                  |  770 ++++++++++++
 docs/en/languages.html                             |  636 ----------
 docs/en/legalNotices.html                          |   77 --
 docs/en/menu.html                                  | 1255 --------------------
 docs/en/plainText.html                             |  164 ---
 docs/en/preventingDataLoss.html                    |   81 --
 docs/en/projectProperties.html                     |  108 --
 docs/en/regexp.html                                |  782 ------------
 docs/en/searches.html                              |  256 ----
 docs/en/segmentation.html                          |  298 -----
 docs/en/spellchecker.html                          |  161 ---
 docs/en/translationEditing.html                    |  124 --
 docs/en/translationMemories.html                   |  319 -----
 docs/en/userInterface.html                         |  755 ------------
 docs/en/version.properties                         |    2 +-
 docs/en/website.html                               |   92 --
 docs/en/xindex.html                                |  908 --------------
 docs/fr/images/MatchesPane.png                     |  Bin 0 -> 32295 bytes
 docs/fr/instantStartGuideNoTOC.html                |  631 +++++++---
 docs/fr/omegat.css                                 |    6 +-
 docs/hu/OmegaT.css                                 |  124 ++-
 docs/hu/instantStartGuideNoTOC.html                |  620 +++++++---
 docs/index.html                                    |    2 +-
 docs/it/OmegaT.css                                 |  124 ++-
 docs/it/instantStartGuideNoTOC.html                |  639 ++++++++---
 docs/pt_BR/aboutOmegaT.html                        |   68 +-
 docs/pt_BR/fileFilters.html                        |  238 +++--
 docs/pt_BR/filesToTranslate.html                   |  301 ++++-
 docs/pt_BR/fontSettings.html                       |   61 +-
 docs/pt_BR/formattedText.html                      |  474 +++++----
 docs/pt_BR/glossaries.html                         |  107 ++-
 docs/pt_BR/index.html                              |  200 +++-
 docs/pt_BR/instantStartGuide.html                  |  363 ++++---
 docs/pt_BR/instantStartGuideNoTOC.html             |   30 +-
 docs/pt_BR/legalNotices.html                       |   62 +-
 docs/pt_BR/license.txt                             |    3 +-
 docs/pt_BR/menu.html                               | 1240 +++++++++++++++++--
 docs/pt_BR/plainText.html                          |  138 +--
 docs/pt_BR/preventingDataLoss.html                 |   57 +-
 docs/pt_BR/projectProperties.html                  |   87 +-
 docs/pt_BR/searches.html                           |  279 +++---
 docs/pt_BR/segmentation.html                       |  319 +++---
 docs/pt_BR/translationEditing.html                 |   97 ++-
 docs/pt_BR/translationMemories.html                |  224 +++--
 docs/pt_BR/userInterface.html                      |  721 ++++++++----
 docs/pt_BR/website.html                            |   76 +-
 manifest-template.mf                               |    6 +
 release/changes.txt                                |   88 ++-
 release/readme.txt                                 |    3 +
 release/readme_fr.txt                              |    5 +-
 release/readme_it.txt                              |    8 +-
 release/readme_pt_BR.txt                           |   55 +-
 release/win32-specific/L4j_OMT.xml                 |   22 -
 release/win32-specific/OmegaT-JRE.iss              |  134 ---
 release/win32-specific/OmegaT.iss                  |  136 ---
 release/win32-specific/OmegaT.l4J.ini              |   17 -
 src/org/omegat/Bundle.properties                   |   19 +-
 src/org/omegat/Bundle_fr.properties                |   21 +-
 src/org/omegat/Bundle_hu.properties                |   32 +-
 src/org/omegat/Bundle_it.properties                |   57 +-
 src/org/omegat/Bundle_ja.properties                |  417 ++++----
 src/org/omegat/Bundle_nl.properties                |   36 +-
 src/org/omegat/Bundle_pt_BR.properties             |  114 +-
 src/org/omegat/Version.properties                  |    4 +-
 src/org/omegat/core/data/RealProject.java          |    2 +-
 src/org/omegat/core/data/TranslateEntry.java       |   20 +-
 src/org/omegat/core/dictionaries/StarDict.java     |    5 +-
 src/org/omegat/core/segmentation/defaultRules.xml  |    5 +-
 src/org/omegat/filters2/AbstractFilter.java        |    3 +-
 src/org/omegat/filters2/ITranslateCallback.java    |    2 +-
 src/org/omegat/filters2/latex/LatexFilter.java     |   19 +-
 .../omegat/filters2/mozdtd/MozillaDTDFilter.java   |    7 +-
 src/org/omegat/filters2/po/PoFilter.java           |   83 ++-
 src/org/omegat/filters2/po/PoOptionsDialog.form    |   96 ++
 src/org/omegat/filters2/po/PoOptionsDialog.java    |  176 +++
 src/org/omegat/filters2/rc/RcFilter.java           |    3 +
 .../text/bundles/ResourceBundleFilter.java         |    3 +-
 src/org/omegat/filters3/xml/DefaultXMLDialect.java |   17 +
 src/org/omegat/filters3/xml/Handler.java           |   12 +-
 src/org/omegat/filters3/xml/XMLDialect.java        |   13 +
 .../omegat/filters3/xml/flash/FlashDialect.java    |   49 +
 src/org/omegat/filters3/xml/flash/FlashFilter.java |  113 ++
 .../omegat/filters3/xml/infix/InfixDialect.java    |   50 +
 src/org/omegat/filters3/xml/infix/InfixFilter.java |   85 ++
 .../xml/openxml/EditOpenXMLOptionsDialog.form      |   20 +
 .../xml/openxml/EditOpenXMLOptionsDialog.java      |   33 +
 .../filters3/xml/openxml/OpenXMLDialect.java       |    8 +
 .../filters3/xml/openxml/OpenXMLOptions.java       |   34 +
 src/org/omegat/filters3/xml/xliff/XLIFFFilter.java |    6 +-
 .../omegat/gui/dialogs/WorkflowOptionsDialog.form  |    2 +-
 .../omegat/gui/dialogs/WorkflowOptionsDialog.java  |   10 +-
 src/org/omegat/gui/editor/mark/EntryMarks.java     |    2 +-
 src/org/omegat/gui/glossary/TransTips.java         |   16 +-
 src/org/omegat/gui/glossary/TransTipsPopup.java    |   53 +-
 src/org/omegat/gui/matches/MatchesTextArea.java    |   16 +-
 src/org/omegat/util/Language.java                  |    2 +
 src/org/omegat/util/Preferences.java               |   54 +-
 .../org/omegat/gui/main/MainWindowMenuTest.java    |    2 -
 155 files changed, 19401 insertions(+), 13130 deletions(-)

diff --git a/build.xml b/build.xml
index 37bebc9..b3ac4ef 100644
--- a/build.xml
+++ b/build.xml
@@ -86,11 +86,11 @@
         </copy>
         <copy todir="${l10n.min.dir}/source">
             <fileset dir="." 
-                    includes="docs/en/instantStartGuideNoTOC.html 
-                    docs/en/images/NewProject.png
-                    docs/en/images/tagged_segment.png
-                    docs/en/images/tagged_segment_target.png
-                    docs/en/images/MatchesPane.png
+                    includes="doc_src/en/InstantStartGuide.xml 
+                    doc_src/en/images/NewProject.png
+                    doc_src/en/images/tagged_segment.png
+                    doc_src/en/images/tagged_segment_target.png
+                    doc_src/en/images/MatchesPane.png
                     src/**/Bundle.properties"/>
         </copy>
         <copy file="release/readme.txt"
@@ -112,10 +112,12 @@
         <copy todir="${l10n.max.dir}">
             <fileset dir="${l10n.project.dir}"/>
         </copy>
-        <copy todir="${l10n.max.dir}/source"> <!-- Copy all files except legalNotices.html -->
+        <copy todir="${l10n.max.dir}/source"> 
             <fileset dir="."
-                    includes="docs/en/** src/**/Bundle.properties"
-                    excludes="docs/en/legalNotices.html"/>
+                    includes="doc_src/en/** src/**/Bundle.properties"
+                    excludes="doc_src/en/index.xml
+                    doc_src/en/html/**
+                    doc_src/en/pdf/**"/>
         </copy>
         <copy file="release/readme.txt"
               tofile="${l10n.max.dir}/source/readme.utf8"
@@ -126,16 +128,6 @@
                         value="This translation is the work of [insert your name], copyright© [insert year]."/>
             </filterset>
         </copy>
-        <copy todir="${l10n.max.dir}/source"
-              encoding="UTF-8"
-              outputencoding="UTF-8">
-            <fileset dir="." 
-                     includes="docs/en/legalNotices.html"/>
-            <filterset begintoken="@@" endtoken="@@">
-                <filter token="TRANSLATION_NOTICE"
-                        value="<p>This translation is the work of [insert your name], copyright© [insert year].</p>"/>
-            </filterset>
-        </copy>
         <zip destfile="dist2/${l10n.max}.zip" 
                 basedir="${l10n.dir}" includes="${l10n.max}/**" />
     </target>
diff --git a/docs/en/GoogleTranslate.html b/docs/en/GoogleTranslate.html
deleted file mode 100644
index e6d932e..0000000
--- a/docs/en/GoogleTranslate.html
+++ /dev/null
@@ -1,104 +0,0 @@
-<html>
-<head>
-  <link rel="stylesheet" href="./OmegaT.css" type="text/css">
-  <meta http-equiv="CONTENT-TYPE" content="text/html; charset=utf-8">
-
-  <title>Google translate - OmegaT 2.0 User Manual</title>
-</head>
-
-<body>
-  <h2>Google Translate</h2>Google Translate is the service offered by Google,
-  to translate sentences, web sites and complete texts between an ever-growing
-  number of languages. At the time of writing the list includes more than 50
-  languages, from Albanian to Yidish, including of course all the major
-  languages (see <a href="http://translate.google.com/#" target=
-  "_blank">Languages available for translation</a>). It's translation produced
-  by state-of-the-art technology, without the intervention of human
-  translators. Google's research group has developed its own statistical
-  translation system for the language pairs now available on Google Translate.
-  As opposed to user-generated translation memories on one side (like in the
-  case of OmegaT) or rule-based systems (usually found under the name of
-  "machine translation" or MT in short) Google can afford a different approach:
-  they feed the computer billions of words of text, both monolingual text in
-  the target language, and aligned text consisting of examples of human
-  translations between the languages. Statistical learning techniques are then
-  applied to build a translation model, achieving very good results in research
-  evaluations.<br>
-  <b><a name="quality" id="quality"></a></b><br>
-  The quality of the translation of course depends on one side on the reservoir
-  of target-language texts and the availability of their bilingual versions, on
-  the other hand on the quality of the models built. It is pretty much certain
-  that while the quality may be insufficient in some cases, it will definitely
-  get better with time and not worse. Even today's most sophisticated software,
-  however, doesn't approach the fluency of a native speaker or possess the
-  skill of a professional translator. Automatic translation is very difficult
-  due to context problems (the sentence "Time flies like an arrow" being just
-  the best known example for it), it may be some time before anyone can offer
-  human quality translations.<br>
-  <br>
-  The OmegaT user is not forced to use Google Translate. If used, neither the
-  user's decision to accept the translation nor the final translation are made
-  available to Google. The following window shows an example of a) the English
-  source b) Spanish and c) Slovenian Google Translate translation.<br>
-  <br>
-  <img alt="Moby Dick with Google Translate" src="images/MobyDick.png"><br>
-  <br>
-  The Spanish translation is better than the Slovenian. Note <span style=
-  "font-style: italic;">interesar</span> and <span style=
-  "font-style: italic;">navegar</span> in Spanish, translating the verbs
-  <span style="font-style: italic;">interest</span> and <span style=
-  "font-style: italic;">sail</span> correctly. In the Slovenian version both
-  words have been translated as nouns. Remember however, that the difference is
-  solely due to the fact that there's far more bilingual material available for
-  the Spanish language than there is for Slovenian.<br>
-  <br>
-
-  <h3>How to use Google Translate in OmegaT</h3>To activate its use, check the
-  Google Translate menu entry in Options to on. When using it the first time,
-  you will need to execute "Restore Main Window" - last menu entry in Options.
-  If the Google Translate pane is not opened, click on "Google Translate" in
-  the line at the bottom of the window to open the pane. Adjust its position
-  to your liking.<br>
-  <br>
-  From now on a suggestion for the translation will appear in the Google
-  Translate pane for every new source segment opened. If you find the
-  suggestion acceptable, press <code>Ctrl+M</code> to replace the target
-  part of the opened segment. In the above segment, for instance,
-  <code>Ctrl+M</code> would overwrite the Spanish version with the Slovenian
-  suggestion.<br>
-  <br>
-  If you do not want OmegaT to send your source segments to Google to get
-  translated, uncheck the Google Translate menu entry in Options.<br>
-  <br>
-
-  <h3>Google Translate trouble shooting</h3>If there's nothing appearing in the
-  Google Translate pane, then check the following:
-
-  <ul>
-    <li>Are you online? You need to be online to be able to use Google
-    Translate.</li>
-
-    <li>What is the source language? Google Translate may not as yet be able to
-    offer its services for it.</li>
-
-    <li>Check Google Translate online for your language pair. Does it
-    work?</li>
-  </ul>
-  <hr style="width: 100%; height: 2px;">
-
-  <table style="width: 100%;" border="0" cellpadding="2" cellspacing="2"
-  summary="just formatting">
-    <tbody>
-      <tr>
-        <td style="text-align: left;"><a href="legalNotices.html">Legal
-        notices</a></td>
-
-        <td style="text-align: center;"><a href="index.html">Home</a></td>
-
-        <td style="text-align: right;"><a href="xindex.html">Index of
-        contents</a></td>
-      </tr>
-    </tbody>
-  </table>
-</body>
-</html>
diff --git a/docs/en/OmegaT.css b/docs/en/OmegaT.css
index dde4bb2..1893c29 100644
--- a/docs/en/OmegaT.css
+++ b/docs/en/OmegaT.css
@@ -1,46 +1,78 @@
-table, h1, h2, h3, h4 
-    {
-    color: #036;
-    font-family: sans-serif;
-    }
-
-h1
-    {
-    font-size: 18;
-    }
-h2
-    {
-    font-size: 16;
-    }
-    
-h3
-    {
-    font-size: 14;
-    }
-h4
-    {
-    font-size: 13;
-    }
-
-p, dd, dt, li, body
-    {
-    margin: 5px 5px 5px 5px;
-    padding: 0px;
-    color: #000;
-    font-family: serif;
-    }
-    
-table
-    {
-    color: #000;
-    font-family: serif;
-    border: 0;
-    }
-    
-code
-    {
-    color: #000;
-    font-family: Courier New;
-    font-size: 12;
-    border: 0;
-    }
\ No newline at end of file
+body {
+	font-family: sans-serif;
+	margin: 1em;
+}
+
+h1, h2, table, dt {
+	color: navy;
+}
+
+h3, h4, ul a {
+	color: green;
+}
+
+code, .code {
+	color: black;
+	background: #ffffcc;
+	border-style: solid;
+	border-width: 1px;
+	border-color: #ffff66;
+	vertical-align: top;
+}
+
+.new {
+	font-size: x-small;
+	color: red;
+	background: yellow;
+}
+
+.updated {
+	font-size: x-small;
+	color: orange;
+}
+
+.note {
+	font-size: small;
+	color: black;
+	background: silver;
+}
+
+.warning {
+	color: red;
+	background: yellow;
+}
+
+.chapter {
+	color: black;
+}
+
+.navbar-top, .navbar-bottom {
+	margin-top: 1em;
+	margin-bottom: 1em;
+}
+
+.rel-p {
+	width: 9%;
+	align: left;
+	valign: center;
+	font-weight: bold;
+}
+
+.rel-n {
+	width: 6%;
+	align: left;
+	valign: center;
+	font-weight: bold;
+} 
+
+.nav-link {
+	width: 39%;
+	align: left;
+	valign: center;
+}
+
+.toc-link {
+	 width: 7%;
+	 align: left;
+	 valign: center;
+}
\ No newline at end of file
diff --git a/docs/en/aboutOmegaT.html b/docs/en/aboutOmegaT.html
deleted file mode 100644
index c30cd1c..0000000
--- a/docs/en/aboutOmegaT.html
+++ /dev/null
@@ -1,85 +0,0 @@
-<html>
-<head>
-  <link type="text/css" href="./OmegaT.css" rel="stylesheet">
-  <meta content="text/html; charset=utf-8" http-equiv="content-type">
-  <title>About OmegaT - OmegaT 2.0
-User Manual</title>
-</head>
-<body>
-<table border="0"  cellpadding="4" cellspacing="0" summary="just formatting"
- frame="below" rules="none" width="100%">
-  <col width="128*"> <col width="128*"> <tbody>
-    <tr valign="top">
-    <td align="left"> 
-      <img src="images/OmegaT_icon.png" name="grafika1" alt="OmegaT logo">
-      </td>
-      <td align="left">
-      <h1>About OmegaT</h1>
-      </td>
-    </tr>
-  </tbody>
-</table>
-<p>
-OmegaT is a free multi platform Computer Aided Translation tool, with
-the following highlights:
-</p>
-<h3><a name="tm"></a>Translation
-memory</h3>
-<p>OmegaT memorizes your
-translations in a translation memory. At the same time it can use
-memories from previous translations for reference. Translation memories
-can be very useful for a translation with a number of repetitions or
-reasonably similar segments of text. OmegaT uses translation memories
-to remember your previous translations and suggest to you the most
-probable translations for the text you are working on.</p>
-<p>The translation memories can be
-very useful when a document, that's been already translated, needs to
-be updated. Unchanged sentences will remain as translated, and updated
-sentences will be shown with an older version of the same sentence as
-the most probable translation. Modifications to the original document
-will thus be handled with greater ease. If you are using previously
-created translation memories, for example given to you by translation
-agency or your client, OmegaT will be able to use them as a reference
-memories.</p>
-<p>OmegaT uses the standard TMX
-file format to store and access translation memories, which guarantees
-that you can exchange your translation material with other CAT
-applications, supporting this file format.</p>
-<h3><a name="glossary"></a>Terminology
-management</h3>
-<p>Terminology management is
-important for translation consistency. OmegaT uses glossaries that
-contain translations of single words or small phrases, a sort of
-simplified bilingual dictionary for a specific domain. OmegaT displays
-the translation of those words that happen to be present in the current
-segment for your reference.</p>
-<h3><a name="process"></a>Translation
-process</h3>
-<p>Imagine having to translate
-anything from a single file to a folder that contains subfolders
-with a number of files in a variety of formats. When you let OmegaT
-know that you need to translate those files it will look for the
-included files it supports according to the file filtering rules,
-recognize the textual parts in them, split the biggest text groups
-according to the segmentation rules and display the segments one by one
-so that you can proceed with the translation. OmegaT will memorize your
-translations and will propose you translation candidates for segments
-similar to those recorded in memory. Once you want to see how the files
-would look once translated, you can create the translated files open
-them in the appropriate application and see what your translation looks
-like.</p>
-<hr>
-<table style="width: 100%;" border="0" cellpadding="2" cellspacing="2" summary="just formatting">
-  <tbody>
-    <tr>
-      <td style="text-align: left;"><a href="legalNotices.html">Legal
-notices</a> </td>
-      <td style="text-align: center;"><a href="index.html">Home</a>
-      </td>
-      <td style="text-align: right;"><a href="xindex.html">Index of
-contents</a> </td>
-    </tr>
-  </tbody>
-</table>
-</body>
-</html>
diff --git a/docs/en/appendix.acknowledgements.html b/docs/en/appendix.acknowledgements.html
new file mode 100644
index 0000000..879897a
--- /dev/null
+++ b/docs/en/appendix.acknowledgements.html
@@ -0,0 +1,127 @@
+<html>
+   <head>
+      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+   
+      <title>Appendix E. Acknowledgements</title>
+      <link rel="stylesheet" href="OmegaT.css" type="text/css">
+      <meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+      <link rel="home" href="index.html" title="OmegaT - User's Guide">
+      <link rel="up" href="index.html" title="OmegaT - User's Guide">
+      <link rel="prev" href="appendix.legal.notices.html" title="Appendix D. Legal notices">
+      <link rel="next" href="ix01.html" title="Index">
+   </head>
+   <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+      <div class="navheader">
+         <table width="100%" summary="Navigation header">
+            <tr>
+               <th colspan="3" align="center">Appendix E. Acknowledgements</th>
+            </tr>
+            <tr>
+               <td width="20%" align="left"><a accesskey="p" href="appendix.legal.notices.html">Prev</a> 
+               </td>
+               <th width="60%" align="center"> </th>
+               <td width="20%" align="right"> <a accesskey="n" href="ix01.html">Next</a></td>
+            </tr>
+         </table>
+         <hr>
+      </div>
+      <div class="appendix" title="Appendix E. Acknowledgements">
+         <div class="titlepage">
+            <div>
+               <div>
+                  <h2 class="title"><a name="appendix.acknowledgements"></a>Appendix E. Acknowledgements
+                  </h2>
+               </div>
+            </div>
+         </div>
+         <div class="toc">
+            <dl>
+               <dt><span class="section"><a href="appendix.acknowledgements.html#d0e10154">1. Thank you all!</a></span></dt>
+            </dl>
+         </div>
+         <div class="section" title="1. Thank you all!">
+            <div class="titlepage">
+               <div>
+                  <div>
+                     <h2 class="title" style="clear: both"><a name="d0e10154"></a>1. Thank you all!
+                     </h2>
+                  </div>
+               </div>
+            </div>
+            <p>Whatever the inconsistencies, omissions and straightforward errors
+               you may find in the present version, I declare them all my own. This
+                   manual, however, would not be possible without the help and support from a
+                   number of people. Explicit thanks to:
+            </p>
+            <div class="itemizedlist">
+               <ul class="itemizedlist" type="disc">
+                  <li class="listitem">
+                     <p>Mark Prior: correcting my first draft was an act of love for
+                                OmegaT and the English language.
+                     </p>
+                  </li>
+               </ul>
+            </div>
+            <div class="itemizedlist">
+               <ul class="itemizedlist" type="disc">
+                  <li class="listitem">
+                     <p>Didier Briel: I could not do without Didier's patient and
+                                persistent help with DocBook intricacies. Not to mention his care and
+                                diligence, keeping repositories intact and in good order.
+                     </p>
+                  </li>
+               </ul>
+            </div>
+            <div class="itemizedlist">
+               <ul class="itemizedlist" type="disc">
+                  <li class="listitem">
+                     <p>Will Helton: his final reading of the draft has spared me a lot
+                                of embarrassment. One could only wonder, how many the and a
+                                prepositions would still be missing without his invaluable
+                                help.
+                     </p>
+                  </li>
+               </ul>
+            </div>
+            <div class="itemizedlist">
+               <ul class="itemizedlist" type="disc">
+                  <li class="listitem">
+                     <p>Jean-Cristophe Hillary: special thanks to JC for his concise
+                                description of OmegaT run and command line parameters.
+                     </p>
+                  </li>
+                  <li class="listitem">
+                     <p>Samual Murray: his "Start Using OmegaT in 5 Minutes!", that
+                                served some time ago as the starting point for the "Instant Start
+                                Guide" chapter, deserves a honorable mention here.
+                     </p>
+                  </li>
+                  <li class="listitem">
+                     <p>Last but not least: my thanks to all the contributors to the
+                                OmegaT documentation tracker (<a class="ulink" href="http://sourceforge.net/tracker/?group_id=68187&atid=912617" target="_top">OmegaT documentation tracker</a>)
+                                for all the inconsistencies found in the previous versions of the
+                                documentation. Keep up your good work!
+                     </p>
+                  </li>
+               </ul>
+            </div>
+         </div>
+      </div>
+      <div class="navfooter">
+         <hr>
+         <table width="100%" summary="Navigation footer">
+            <tr>
+               <td width="40%" align="left"><a accesskey="p" href="appendix.legal.notices.html">Prev</a> 
+               </td>
+               <td width="20%" align="center"> </td>
+               <td width="40%" align="right"> <a accesskey="n" href="ix01.html">Next</a></td>
+            </tr>
+            <tr>
+               <td width="40%" align="left" valign="top">Appendix D. Legal notices </td>
+               <td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td>
+               <td width="40%" align="right" valign="top"> Index</td>
+            </tr>
+         </table>
+      </div>
+   </body>
+</html>
\ No newline at end of file
diff --git a/docs/en/appendix.keyboard.html b/docs/en/appendix.keyboard.html
new file mode 100644
index 0000000..145b887
--- /dev/null
+++ b/docs/en/appendix.keyboard.html
@@ -0,0 +1,215 @@
+<html>
+   <head>
+      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+   
+      <title>Appendix C. Keyboard shortcuts in the editor</title>
+      <link rel="stylesheet" href="OmegaT.css" type="text/css">
+      <meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+      <link rel="home" href="index.html" title="OmegaT - User's Guide">
+      <link rel="up" href="index.html" title="OmegaT - User's Guide">
+      <link rel="prev" href="appendix.languages.html" title="Appendix B. Languages - ISO 639 code list">
+      <link rel="next" href="appendix.legal.notices.html" title="Appendix D. Legal notices">
+   </head>
+   <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+      <div class="navheader">
+         <table width="100%" summary="Navigation header">
+            <tr>
+               <th colspan="3" align="center">Appendix C. Keyboard shortcuts in the editor</th>
+            </tr>
+            <tr>
+               <td width="20%" align="left"><a accesskey="p" href="appendix.languages.html">Prev</a> 
+               </td>
+               <th width="60%" align="center"> </th>
+               <td width="20%" align="right"> <a accesskey="n" href="appendix.legal.notices.html">Next</a></td>
+            </tr>
+         </table>
+         <hr>
+      </div>
+      <div class="appendix" title="Appendix C. Keyboard shortcuts in the editor">
+         <div class="titlepage">
+            <div>
+               <div>
+                  <h2 class="title"><a name="appendix.keyboard"></a>Appendix C. Keyboard shortcuts in the editor
+                  </h2>
+               </div>
+            </div>
+         </div>
+         <p>This short text describes key behavior in the editor pane. The term
+            "Move to inside segment" means, that the cursor moves to the beginning of
+              the segment if it was previously before the segment, and to the end of the
+              segment if it was previously after it.
+         </p>
+         <div class="table"><a name="d0e9888"></a><p class="title"><b>Table C.1. Key behavior in the editor</b></p>
+            <div class="table-contents">
+               <table summary="Key behavior in the editor" border="1">
+                  <colgroup>
+                     <col width="90" align="left">
+                     <col width="300" align="left">
+                  </colgroup>
+                  <thead>
+                     <tr>
+                        <th align="left">Key combination</th>
+                        <th align="left">Action</th>
+                     </tr>
+                  </thead>
+                  <tbody>
+                     <tr>
+                        <td align="left"><span class="bold"><strong>Left: </strong></span></td>
+                        <td align="left">one char left, but not further than the beginning of
+                                     segment
+                        </td>
+                     </tr>
+                     <tr>
+                        <td align="left"><span class="bold"><strong>Right: </strong></span></td>
+                        <td align="left">one char right, but not further than the end of
+                                     segment
+                        </td>
+                     </tr>
+                     <tr>
+                        <td align="left"><span class="bold"><strong>Ctrl+Left: </strong></span></td>
+                        <td align="left">one word left, but not further than the beginning of
+                                     segment
+                        </td>
+                     </tr>
+                     <tr>
+                        <td align="left"><span class="bold"><strong>Ctrl+Right: </strong></span></td>
+                        <td align="left">one word right, but not further than the end of
+                                     segment
+                        </td>
+                     </tr>
+                     <tr>
+                        <td align="left"><span class="bold"><strong>PgUp: </strong></span></td>
+                        <td align="left">page up through the document</td>
+                     </tr>
+                     <tr>
+                        <td align="left"><span class="bold"><strong>PgDn: </strong></span></td>
+                        <td align="left">page down through the document</td>
+                     </tr>
+                     <tr>
+                        <td align="left"><span class="bold"><strong>Home*</strong></span></td>
+                        <td align="left">move to the beginning of the line in the segment</td>
+                     </tr>
+                     <tr>
+                        <td align="left"><span class="bold"><strong>End*</strong></span></td>
+                        <td align="left">move to the end of the line in the segment</td>
+                     </tr>
+                     <tr>
+                        <td align="left"><span class="bold"><strong>Ctrl+Home</strong></span></td>
+                        <td align="left">move to the start of the segment</td>
+                     </tr>
+                     <tr>
+                        <td align="left"><span class="bold"><strong>Ctrl+End</strong></span></td>
+                        <td align="left">move to the end of the segment</td>
+                     </tr>
+                     <tr>
+                        <td align="left"><span class="bold"><strong>Ctrl+PgUp</strong></span></td>
+                        <td align="left">move to the start of the document (Mac: <span class="bold"><strong>Cmd+PgUp</strong></span>)
+                        </td>
+                     </tr>
+                     <tr>
+                        <td align="left"><span class="bold"><strong>Ctrl+PgDn</strong></span></td>
+                        <td align="left">move to the end of the document (Mac: <span class="bold"><strong>Cmd+PgDn</strong></span>)
+                        </td>
+                     </tr>
+                     <tr>
+                        <td align="left"><span class="bold"><strong>Backspace*</strong></span></td>
+                        <td align="left">remove char before cursor</td>
+                     </tr>
+                     <tr>
+                        <td align="left"><span class="bold"><strong>Delete*</strong></span></td>
+                        <td align="left">remove char after cursor</td>
+                     </tr>
+                     <tr>
+                        <td align="left"><span class="bold"><strong>Ctrl+Backspace</strong></span></td>
+                        <td align="left">remove chars up to the start of the current word (Mac:
+                                     <span class="bold"><strong>Alt+Backspace</strong></span>)
+                        </td>
+                     </tr>
+                     <tr>
+                        <td align="left"><span class="bold"><strong>Ctrl+Delete</strong></span></td>
+                        <td align="left">remove chars up to the start of next word (Mac: <span class="bold"><strong>Alt+Delete</strong></span>)
+                        </td>
+                     </tr>
+                     <tr>
+                        <td align="left"><span class="bold"><strong>Ctrl+Enter</strong></span></td>
+                        <td align="left">open previous segment (Mac: <span class="bold"><strong>Cmd+Enter</strong></span>)
+                        </td>
+                     </tr>
+                     <tr>
+                        <td align="left"><span class="bold"><strong>Ctrl+A</strong></span></td>
+                        <td align="left">select complete segment (Mac: <span class="bold"><strong>Cmd+A</strong></span>)
+                        </td>
+                     </tr>
+                     <tr>
+                        <td align="left"><span class="bold"><strong>Ctrl+Shift+O</strong></span></td>
+                        <td align="left">RTL-LTR switch</td>
+                     </tr>
+                  </tbody>
+               </table>
+            </div>
+         </div><br class="table-break"><p>* These keys behave differently when the cursor is outside the
+              editable segment:
+         </p>
+         <div class="itemizedlist">
+            <ul class="itemizedlist" type="disc">
+               <li class="listitem">
+                  <p><span class="bold"><strong>Home: </strong></span> cursor to the beginning of
+                           the active segment
+                  </p>
+               </li>
+               <li class="listitem">
+                  <p><span class="bold"><strong>End: </strong></span> cursor to the end of the
+                           active segment
+                  </p>
+               </li>
+               <li class="listitem">
+                  <p><span class="bold"><strong>Backspace: </strong></span>nothing
+                  </p>
+               </li>
+               <li class="listitem">
+                  <p><span class="bold"><strong>Delete: </strong></span>nothing
+                  </p>
+               </li>
+               <li class="listitem">
+                  <p><span class="bold"><strong>Any char key,</strong></span> if clicked outside
+                           editable segment, will be ignored.
+                  </p>
+               </li>
+            </ul>
+         </div>
+         <p>The "Shift" key doesn't exhibit any special behavior per se: when the
+              "Shift" key is pressed, all keys move the cursor in their usual
+              manner.
+         </p>
+         <p>System-wide commands: Paste (<span class="bold"><strong>Ctrl+V</strong></span>
+              or <span class="bold"><strong>Ctrl+Insert</strong></span>), Cut (<span class="bold"><strong>Ctrl+X</strong></span> or <span class="bold"><strong>Ctrl+C)</strong></span>,
+              Insert match <span class="bold"><strong>(Ctrl+I</strong></span>) and Insert source
+              (<span class="bold"><strong>Ctrl+Shift+I</strong></span>) act in principle on any
+              selection, including those that extend beyond the current segment. In such a
+              case the selection will of course be pared down to segment
+              boundaries.
+         </p>
+      </div>
+      <div class="navfooter">
+         <hr>
+         <table width="100%" summary="Navigation footer">
+            <tr>
+               <td width="40%" align="left"><a accesskey="p" href="appendix.languages.html">Prev</a> 
+               </td>
+               <td width="20%" align="center"> </td>
+               <td width="40%" align="right"> <a accesskey="n" href="appendix.legal.notices.html">Next</a></td>
+            </tr>
+            <tr>
+               <td width="40%" align="left" valign="top">Appendix B. Languages - ISO 639 code list
+                    
+                    
+                    
+                     
+               </td>
+               <td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td>
+               <td width="40%" align="right" valign="top"> Appendix D. Legal notices</td>
+            </tr>
+         </table>
+      </div>
+   </body>
+</html>
\ No newline at end of file
diff --git a/docs/en/appendix.languages.html b/docs/en/appendix.languages.html
new file mode 100644
index 0000000..29a3fab
--- /dev/null
+++ b/docs/en/appendix.languages.html
@@ -0,0 +1,1009 @@
+<html>
+   <head>
+      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+   
+      <title>Appendix B. Languages - ISO 639 code list</title>
+      <link rel="stylesheet" href="OmegaT.css" type="text/css">
+      <meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+      <link rel="home" href="index.html" title="OmegaT - User's Guide">
+      <link rel="up" href="index.html" title="OmegaT - User's Guide">
+      <link rel="prev" href="appendix.website.html" title="Appendix A. OmegaT on the web">
+      <link rel="next" href="appendix.keyboard.html" title="Appendix C. Keyboard shortcuts in the editor">
+   </head>
+   <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+      <div class="navheader">
+         <table width="100%" summary="Navigation header">
+            <tr>
+               <th colspan="3" align="center">Appendix B. Languages - ISO 639 code list
+                    
+                    
+                    
+                    
+               </th>
+            </tr>
+            <tr>
+               <td width="20%" align="left"><a accesskey="p" href="appendix.website.html">Prev</a> 
+               </td>
+               <th width="60%" align="center"> </th>
+               <td width="20%" align="right"> <a accesskey="n" href="appendix.keyboard.html">Next</a></td>
+            </tr>
+         </table>
+         <hr>
+      </div>
+      <div class="appendix" title="Appendix B. Languages - ISO 639 code list">
+         <div class="titlepage">
+            <div>
+               <div>
+                  <h2 class="title"><a name="appendix.languages"></a>Appendix B. Languages - ISO 639 code list
+                       <a class="indexterm" name="d0e8558"></a>
+                       <a class="indexterm" name="d0e8562"></a>
+                       <a class="indexterm" name="d0e8566"></a>
+                       
+                  </h2>
+               </div>
+            </div>
+         </div>
+         <p>Please check the<a class="ulink" href="http://www.sil.org/ISO639-3/codes.asp" target="_top">
+                 ISO 639 Code Tables</a> for further and up-to-date information about
+              language codes.
+         </p>
+         <div class="table"><a name="table.language.code.list"></a><p class="title"><b>Table B.1. ISO 639-1/639-2 Language code list</b></p>
+            <div class="table-contents">
+               <table summary="ISO 639-1/639-2 Language code list" border="1">
+                  <colgroup>
+                     <col width="200" align="left">
+                     <col width="100" align="left">
+                     <col width="100" align="left">
+                  </colgroup>
+                  <thead>
+                     <tr>
+                        <th align="left">Language name</th>
+                        <th align="left">ISO 639-1</th>
+                        <th align="left">ISO 639-2</th>
+                     </tr>
+                  </thead>
+                  <tbody>
+                     <tr>
+                        <td align="left">Abkhaz</td>
+                        <td align="left">ab</td>
+                        <td align="left">abk</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Afar</td>
+                        <td align="left">aa</td>
+                        <td align="left">aar</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Afrikaans</td>
+                        <td align="left">af</td>
+                        <td align="left">afr</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Akan</td>
+                        <td align="left">ak</td>
+                        <td align="left">aka</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Albanian</td>
+                        <td align="left">sq</td>
+                        <td align="left">sqi</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Amharic</td>
+                        <td align="left">am</td>
+                        <td align="left">amh</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Arabic</td>
+                        <td align="left">ar</td>
+                        <td align="left">ara</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Aragonese</td>
+                        <td align="left">an</td>
+                        <td align="left">arg</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Armenian</td>
+                        <td align="left">hy</td>
+                        <td align="left">hye</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Assamese</td>
+                        <td align="left">as</td>
+                        <td align="left">asm</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Avaric</td>
+                        <td align="left">av</td>
+                        <td align="left">ava</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Avestan</td>
+                        <td align="left">ae</td>
+                        <td align="left">ave</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Aymara</td>
+                        <td align="left">ay</td>
+                        <td align="left">aym</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Azerbaijani</td>
+                        <td align="left">az</td>
+                        <td align="left">aze</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Bambara</td>
+                        <td align="left">bm</td>
+                        <td align="left">bam</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Bashkir</td>
+                        <td align="left">ba</td>
+                        <td align="left">bak</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Basque</td>
+                        <td align="left">eu</td>
+                        <td align="left">eus</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Belarusian</td>
+                        <td align="left">be</td>
+                        <td align="left">bel</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Bengali</td>
+                        <td align="left">bn</td>
+                        <td align="left">ben</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Bihari</td>
+                        <td align="left">bh</td>
+                        <td align="left">bih</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Bislama</td>
+                        <td align="left">bi</td>
+                        <td align="left">bis</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Bosnian</td>
+                        <td align="left">bs</td>
+                        <td align="left">bos</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Breton</td>
+                        <td align="left">br</td>
+                        <td align="left">bre</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Bulgarian</td>
+                        <td align="left">bg</td>
+                        <td align="left">bul</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Burmese</td>
+                        <td align="left">my</td>
+                        <td align="left">mya</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Catalan</td>
+                        <td align="left">ca</td>
+                        <td align="left">cat</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Chamorro</td>
+                        <td align="left">ch</td>
+                        <td align="left">cha</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Chechen</td>
+                        <td align="left">ce</td>
+                        <td align="left">che</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Chichewa, Chewa, Nyanja</td>
+                        <td align="left">ny</td>
+                        <td align="left">nya</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Chinese</td>
+                        <td align="left">zh</td>
+                        <td align="left">zho</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Chuvash</td>
+                        <td align="left">cv</td>
+                        <td align="left">chv</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Cornish</td>
+                        <td align="left">kw</td>
+                        <td align="left">cor</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Corsican</td>
+                        <td align="left">co</td>
+                        <td align="left">cos</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Cree</td>
+                        <td align="left">cr</td>
+                        <td align="left">cre</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Croatian</td>
+                        <td align="left">hr</td>
+                        <td align="left">hrv</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Czech</td>
+                        <td align="left">cs</td>
+                        <td align="left">ces</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Danish</td>
+                        <td align="left">da</td>
+                        <td align="left">dan</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Divehi, Dhivehi, Maldivian</td>
+                        <td align="left">dv</td>
+                        <td align="left">div</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Dutch</td>
+                        <td align="left">nl</td>
+                        <td align="left">nld</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Dzongkha</td>
+                        <td align="left">dz</td>
+                        <td align="left">dzo</td>
+                     </tr>
+                     <tr>
+                        <td align="left">English</td>
+                        <td align="left">en</td>
+                        <td align="left">eng</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Esperanto</td>
+                        <td align="left">eo</td>
+                        <td align="left">epo</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Estonian</td>
+                        <td align="left">et</td>
+                        <td align="left">est</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Ewe</td>
+                        <td align="left">ee</td>
+                        <td align="left">ewe</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Faroese</td>
+                        <td align="left">fo</td>
+                        <td align="left">fao</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Fijian</td>
+                        <td align="left">fj</td>
+                        <td align="left">fij</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Finnish</td>
+                        <td align="left">fi</td>
+                        <td align="left">fin</td>
+                     </tr>
+                     <tr>
+                        <td align="left">French</td>
+                        <td align="left">fr</td>
+                        <td align="left">fra</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Fula, Fulah, Pulaar, Pular</td>
+                        <td align="left">ff</td>
+                        <td align="left">ful</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Galician</td>
+                        <td align="left">gl</td>
+                        <td align="left">glg</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Georgian</td>
+                        <td align="left">ka</td>
+                        <td align="left">kat</td>
+                     </tr>
+                     <tr>
+                        <td align="left">German</td>
+                        <td align="left">de</td>
+                        <td align="left">deu</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Greek, Modern</td>
+                        <td align="left">el</td>
+                        <td align="left">ell</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Guaraní</td>
+                        <td align="left">gn</td>
+                        <td align="left">grn</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Gujarati</td>
+                        <td align="left">gu</td>
+                        <td align="left">guj</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Haitian, Haitian Creole</td>
+                        <td align="left">ht</td>
+                        <td align="left">hat</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Hausa</td>
+                        <td align="left">ha</td>
+                        <td align="left">hau</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Hebrew (modern)</td>
+                        <td align="left">he</td>
+                        <td align="left">heb</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Herero</td>
+                        <td align="left">hz</td>
+                        <td align="left">her</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Hindi</td>
+                        <td align="left">hi</td>
+                        <td align="left">hin</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Hiri Motu</td>
+                        <td align="left">ho</td>
+                        <td align="left">hmo</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Hungarian</td>
+                        <td align="left">hu</td>
+                        <td align="left">hun</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Interlingua</td>
+                        <td align="left">ia</td>
+                        <td align="left">ina</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Indonesian</td>
+                        <td align="left">id</td>
+                        <td align="left">ind</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Interlingue</td>
+                        <td align="left">ie</td>
+                        <td align="left">ile</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Irish</td>
+                        <td align="left">ga</td>
+                        <td align="left">gle</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Igbo</td>
+                        <td align="left">ig</td>
+                        <td align="left">ibo</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Inupiaq</td>
+                        <td align="left">ik</td>
+                        <td align="left">ipk</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Ido</td>
+                        <td align="left">io</td>
+                        <td align="left">ido</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Icelandic</td>
+                        <td align="left">is</td>
+                        <td align="left">isl</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Italian</td>
+                        <td align="left">it</td>
+                        <td align="left">ita</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Inuktitut</td>
+                        <td align="left">iu</td>
+                        <td align="left">iku</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Japanese</td>
+                        <td align="left">ja</td>
+                        <td align="left">jpn</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Javanese</td>
+                        <td align="left">jv</td>
+                        <td align="left">jav</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Kalaallisut, Greenlandic</td>
+                        <td align="left">kl</td>
+                        <td align="left">kal</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Kannada</td>
+                        <td align="left">kn</td>
+                        <td align="left">kan</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Kanuri</td>
+                        <td align="left">kr</td>
+                        <td align="left">kau</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Kashmiri</td>
+                        <td align="left">ks</td>
+                        <td align="left">kas</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Kazakh</td>
+                        <td align="left">kk</td>
+                        <td align="left">kaz</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Khmer</td>
+                        <td align="left">km</td>
+                        <td align="left">khm</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Kikuyu, Gikuyu</td>
+                        <td align="left">ki</td>
+                        <td align="left">kik</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Kinyarwanda</td>
+                        <td align="left">rw</td>
+                        <td align="left">kin</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Kirghiz, Kyrgyz</td>
+                        <td align="left">ky</td>
+                        <td align="left">kir</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Komi</td>
+                        <td align="left">kv</td>
+                        <td align="left">kom</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Kongo</td>
+                        <td align="left">kg</td>
+                        <td align="left">kon</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Korean</td>
+                        <td align="left">ko</td>
+                        <td align="left">kor</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Kurdish</td>
+                        <td align="left">ku</td>
+                        <td align="left">kur</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Kwanyama, Kuanyama</td>
+                        <td align="left">kj</td>
+                        <td align="left">kua</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Latin</td>
+                        <td align="left">la</td>
+                        <td align="left">lat</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Luxembourgish, Letzeburgesch</td>
+                        <td align="left">lb</td>
+                        <td align="left">ltz</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Luganda</td>
+                        <td align="left">lg</td>
+                        <td align="left">lug</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Limburgish, Limburgan, Limburger</td>
+                        <td align="left">li</td>
+                        <td align="left">lim</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Lingala</td>
+                        <td align="left">ln</td>
+                        <td align="left">lin</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Lao</td>
+                        <td align="left">lo</td>
+                        <td align="left">lao</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Lithuanian</td>
+                        <td align="left">lt</td>
+                        <td align="left">lit</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Luba-Katanga</td>
+                        <td align="left">lu</td>
+                        <td align="left">lub</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Latvian</td>
+                        <td align="left">lv</td>
+                        <td align="left">lav</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Manx</td>
+                        <td align="left">gv</td>
+                        <td align="left">glv</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Macedonian</td>
+                        <td align="left">mk</td>
+                        <td align="left">mkd</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Malagasy</td>
+                        <td align="left">mg</td>
+                        <td align="left">mlg</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Malay</td>
+                        <td align="left">ms</td>
+                        <td align="left">msa</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Malayalam</td>
+                        <td align="left">ml</td>
+                        <td align="left">mal</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Maltese</td>
+                        <td align="left">mt</td>
+                        <td align="left">mlt</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Māori</td>
+                        <td align="left">mi</td>
+                        <td align="left">mri</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Marathi (Marāṭhī)</td>
+                        <td align="left">mr</td>
+                        <td align="left">mar</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Marshallese</td>
+                        <td align="left">mh</td>
+                        <td align="left">mah</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Mongolian</td>
+                        <td align="left">mn</td>
+                        <td align="left">mon</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Nauru</td>
+                        <td align="left">na</td>
+                        <td align="left">nau</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Navajo, Navaho</td>
+                        <td align="left">nv</td>
+                        <td align="left">nav</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Norwegian Bokmål</td>
+                        <td align="left">nb</td>
+                        <td align="left">nob</td>
+                     </tr>
+                     <tr>
+                        <td align="left">North Ndebele</td>
+                        <td align="left">nd</td>
+                        <td align="left">nde</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Nepali</td>
+                        <td align="left">ne</td>
+                        <td align="left">nep</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Ndonga</td>
+                        <td align="left">ng</td>
+                        <td align="left">ndo</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Norwegian Nynorsk</td>
+                        <td align="left">nn</td>
+                        <td align="left">nno</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Norwegian</td>
+                        <td align="left">no</td>
+                        <td align="left">nor</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Nuosu</td>
+                        <td align="left">ii</td>
+                        <td align="left">iii</td>
+                     </tr>
+                     <tr>
+                        <td align="left">South Ndebele</td>
+                        <td align="left">nr</td>
+                        <td align="left">nbl</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Occitan</td>
+                        <td align="left">oc</td>
+                        <td align="left">oci</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Ojibwe, Ojibwa</td>
+                        <td align="left">oj</td>
+                        <td align="left">oji</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Old Church Slavonic, Church Slavic, Church Slavonic, Old
+                                     Bulgarian, Old Slavonic
+                        </td>
+                        <td align="left">cu</td>
+                        <td align="left">chu</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Oromo</td>
+                        <td align="left">om</td>
+                        <td align="left">orm</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Oriya</td>
+                        <td align="left">or</td>
+                        <td align="left">ori</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Ossetian, Ossetic</td>
+                        <td align="left">os</td>
+                        <td align="left">oss</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Panjabi, Punjabi</td>
+                        <td align="left">pa</td>
+                        <td align="left">pan</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Pāli</td>
+                        <td align="left">pi</td>
+                        <td align="left">pli</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Persian</td>
+                        <td align="left">fa</td>
+                        <td align="left">fas</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Polish</td>
+                        <td align="left">pl</td>
+                        <td align="left">pol</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Pashto, Pushto</td>
+                        <td align="left">ps</td>
+                        <td align="left">pus</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Portuguese</td>
+                        <td align="left">pt</td>
+                        <td align="left">por</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Quechua</td>
+                        <td align="left">qu</td>
+                        <td align="left">que</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Romansh</td>
+                        <td align="left">rm</td>
+                        <td align="left">roh</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Kirundi</td>
+                        <td align="left">rn</td>
+                        <td align="left">run</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Romanian, Moldavian, Moldovan</td>
+                        <td align="left">ro</td>
+                        <td align="left">ron</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Russian</td>
+                        <td align="left">ru</td>
+                        <td align="left">rus</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Sanskrit (Saṁskṛta)</td>
+                        <td align="left">sa</td>
+                        <td align="left">san</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Sardinian</td>
+                        <td align="left">sc</td>
+                        <td align="left">srd</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Sindhi</td>
+                        <td align="left">sd</td>
+                        <td align="left">snd</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Northern Sami</td>
+                        <td align="left">se</td>
+                        <td align="left">sme</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Samoan</td>
+                        <td align="left">sm</td>
+                        <td align="left">smo</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Sango</td>
+                        <td align="left">sg</td>
+                        <td align="left">sag</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Serbian</td>
+                        <td align="left">sr</td>
+                        <td align="left">srp</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Scottish Gaelic, Gaelic</td>
+                        <td align="left">gd</td>
+                        <td align="left">gla</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Shona</td>
+                        <td align="left">sn</td>
+                        <td align="left">sna</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Sinhala, Sinhalese</td>
+                        <td align="left">si</td>
+                        <td align="left">sin</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Slovak</td>
+                        <td align="left">sk</td>
+                        <td align="left">slk</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Slovene</td>
+                        <td align="left">sl</td>
+                        <td align="left">slv</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Somali</td>
+                        <td align="left">so</td>
+                        <td align="left">som</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Southern Sotho</td>
+                        <td align="left">st</td>
+                        <td align="left">sot</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Spanish, Castilian</td>
+                        <td align="left">es</td>
+                        <td align="left">spa</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Sundanese</td>
+                        <td align="left">su</td>
+                        <td align="left">sun</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Swahili</td>
+                        <td align="left">sw</td>
+                        <td align="left">swa</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Swati</td>
+                        <td align="left">ss</td>
+                        <td align="left">ssw</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Swedish</td>
+                        <td align="left">sv</td>
+                        <td align="left">swe</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Tamil</td>
+                        <td align="left">ta</td>
+                        <td align="left">tam</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Telugu</td>
+                        <td align="left">te</td>
+                        <td align="left">tel</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Tajik</td>
+                        <td align="left">tg</td>
+                        <td align="left">tgk</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Thai</td>
+                        <td align="left">th</td>
+                        <td align="left">tha</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Tigrinya</td>
+                        <td align="left">ti</td>
+                        <td align="left">tir</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Tibetan Standard, Tibetan, Central</td>
+                        <td align="left">bo</td>
+                        <td align="left">bod</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Turkmen</td>
+                        <td align="left">tk</td>
+                        <td align="left">tuk</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Tagalog</td>
+                        <td align="left">tl</td>
+                        <td align="left">tgl</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Tswana</td>
+                        <td align="left">tn</td>
+                        <td align="left">tsn</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Tonga (Tonga Islands)</td>
+                        <td align="left">to</td>
+                        <td align="left">ton</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Turkish</td>
+                        <td align="left">tr</td>
+                        <td align="left">tur</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Tsonga</td>
+                        <td align="left">ts</td>
+                        <td align="left">tso</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Tatar</td>
+                        <td align="left">tt</td>
+                        <td align="left">tat</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Twi</td>
+                        <td align="left">tw</td>
+                        <td align="left">twi</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Tahitian</td>
+                        <td align="left">ty</td>
+                        <td align="left">tah</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Uighur, Uyghur</td>
+                        <td align="left">ug</td>
+                        <td align="left">uig</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Ukrainian</td>
+                        <td align="left">uk</td>
+                        <td align="left">ukr</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Urdu</td>
+                        <td align="left">ur</td>
+                        <td align="left">urd</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Uzbek</td>
+                        <td align="left">uz</td>
+                        <td align="left">uzb</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Venda</td>
+                        <td align="left">ve</td>
+                        <td align="left">ven</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Vietnamese</td>
+                        <td align="left">vi</td>
+                        <td align="left">vie</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Volapük</td>
+                        <td align="left">vo</td>
+                        <td align="left">vol</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Walloon</td>
+                        <td align="left">wa</td>
+                        <td align="left">wln</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Welsh</td>
+                        <td align="left">cy</td>
+                        <td align="left">cym</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Wolof</td>
+                        <td align="left">wo</td>
+                        <td align="left">wol</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Western Frisian</td>
+                        <td align="left">fy</td>
+                        <td align="left">fry</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Xhosa</td>
+                        <td align="left">xh</td>
+                        <td align="left">xho</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Yiddish</td>
+                        <td align="left">yi</td>
+                        <td align="left">yid</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Yoruba</td>
+                        <td align="left">yo</td>
+                        <td align="left">yor</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Zhuang, Chuang</td>
+                        <td align="left">za</td>
+                        <td align="left">zha</td>
+                     </tr>
+                     <tr>
+                        <td align="left">Zulu</td>
+                        <td align="left">zu</td>
+                        <td align="left">zul</td>
+                     </tr>
+                  </tbody>
+               </table>
+            </div>
+         </div><br class="table-break"></div>
+      <div class="navfooter">
+         <hr>
+         <table width="100%" summary="Navigation footer">
+            <tr>
+               <td width="40%" align="left"><a accesskey="p" href="appendix.website.html">Prev</a> 
+               </td>
+               <td width="20%" align="center"> </td>
+               <td width="40%" align="right"> <a accesskey="n" href="appendix.keyboard.html">Next</a></td>
+            </tr>
+            <tr>
+               <td width="40%" align="left" valign="top">Appendix A. OmegaT on the web </td>
+               <td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td>
+               <td width="40%" align="right" valign="top"> Appendix C. Keyboard shortcuts in the editor</td>
+            </tr>
+         </table>
+      </div>
+   </body>
+</html>
\ No newline at end of file
diff --git a/docs/en/appendix.legal.notices.html b/docs/en/appendix.legal.notices.html
new file mode 100644
index 0000000..2452470
--- /dev/null
+++ b/docs/en/appendix.legal.notices.html
@@ -0,0 +1,122 @@
+<html>
+   <head>
+      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+   
+      <title>Appendix D. Legal notices</title>
+      <link rel="stylesheet" href="OmegaT.css" type="text/css">
+      <meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+      <link rel="home" href="index.html" title="OmegaT - User's Guide">
+      <link rel="up" href="index.html" title="OmegaT - User's Guide">
+      <link rel="prev" href="appendix.keyboard.html" title="Appendix C. Keyboard shortcuts in the editor">
+      <link rel="next" href="appendix.acknowledgements.html" title="Appendix E. Acknowledgements">
+   </head>
+   <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+      <div class="navheader">
+         <table width="100%" summary="Navigation header">
+            <tr>
+               <th colspan="3" align="center">Appendix D. Legal notices</th>
+            </tr>
+            <tr>
+               <td width="20%" align="left"><a accesskey="p" href="appendix.keyboard.html">Prev</a> 
+               </td>
+               <th width="60%" align="center"> </th>
+               <td width="20%" align="right"> <a accesskey="n" href="appendix.acknowledgements.html">Next</a></td>
+            </tr>
+         </table>
+         <hr>
+      </div>
+      <div class="appendix" title="Appendix D. Legal notices">
+         <div class="titlepage">
+            <div>
+               <div>
+                  <h2 class="title"><a name="appendix.legal.notices"></a>Appendix D. <a class="indexterm" name="d0e10085"></a>Legal notices
+                  </h2>
+               </div>
+            </div>
+         </div>
+         <div class="toc">
+            <dl>
+               <dt><span class="section"><a href="appendix.legal.notices.html#legal.notices.for.documentation">1. For the documentation</a></span></dt>
+               <dt><span class="section"><a href="appendix.legal.notices.html#legal.ntices.for.application">2. For the application</a></span></dt>
+            </dl>
+         </div>
+         <div class="section" title="1. For the documentation">
+            <div class="titlepage">
+               <div>
+                  <div>
+                     <h2 class="title" style="clear: both"><a name="legal.notices.for.documentation"></a>1. For the documentation<a class="indexterm" name="d0e10092"></a></h2>
+                  </div>
+               </div>
+            </div>
+            <p><span class="bold"><strong>Copyright</strong></span></p>
+            <p>The documentation distributed with <span class="application">OmegaT</span>
+               2.3 includes the User Manual and the readme.txt document. The
+                   documentation is Copyright ©2011 Vito Smolej. The Instant Start Guide is a
+                   further development of the Instant Start Guide by Samuel Murray, Copyright
+                   ©2005-2008.
+            </p>
+            <p><span class="bold"><strong>Distribution and
+                         modifications</strong></span></p>
+            <p>The documentation is a free document; 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 (if
+                   you prefer) any later version.
+            </p>
+            <p><span class="bold"><strong>Warranty</strong></span></p>
+            <p>The documentation 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.
+            </p>
+         </div>
+         <div class="section" title="2. For the application">
+            <div class="titlepage">
+               <div>
+                  <div>
+                     <h2 class="title" style="clear: both"><a name="legal.ntices.for.application"></a>2. For the application<a class="indexterm" name="d0e10118"></a></h2>
+                  </div>
+               </div>
+            </div>
+            <p><span class="bold"><strong>Copyright</strong></span></p>
+            <p><span class="bold"><strong><span class="application">OmegaT</span>
+                         2.3</strong></span> is Copyright © 2000-2011 Keith Godfrey, Maxym Mykhalchuk,
+                   Zoltan Bartko, Didier Briel, Kim Bruning, Alex Buloichik, Sandra Jean
+                   Chua, Martin Fleurke, Thomas Huriaux, Fabián Mandelbaum, Arno Peters,
+                   Henry Pijffers, Tiago Saboga, Andrzej Sawuła, Benjamin Siband, Rashid
+                   Umarov, Antonio Vilei and Martin Wunderlich.
+            </p>
+            <p><span class="bold"><strong>Distribution and
+                         modifications</strong></span></p>
+            <p><span class="bold"><strong>O</strong></span><span class="bold"><strong>megaT
+                         2.3</strong></span> 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 (if you prefer)
+                   any later version.
+            </p>
+            <p><span class="bold"><strong>Warranty</strong></span></p>
+            <p><span class="bold"><strong> <span class="application">OmegaT</span> 2.3
+                         </strong></span>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 detail.
+            </p>
+         </div>
+      </div>
+      <div class="navfooter">
+         <hr>
+         <table width="100%" summary="Navigation footer">
+            <tr>
+               <td width="40%" align="left"><a accesskey="p" href="appendix.keyboard.html">Prev</a> 
+               </td>
+               <td width="20%" align="center"> </td>
+               <td width="40%" align="right"> <a accesskey="n" href="appendix.acknowledgements.html">Next</a></td>
+            </tr>
+            <tr>
+               <td width="40%" align="left" valign="top">Appendix C. Keyboard shortcuts in the editor </td>
+               <td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td>
+               <td width="40%" align="right" valign="top"> Appendix E. Acknowledgements</td>
+            </tr>
+         </table>
+      </div>
+   </body>
+</html>
\ No newline at end of file
diff --git a/docs/en/appendix.website.html b/docs/en/appendix.website.html
new file mode 100644
index 0000000..68d73b1
--- /dev/null
+++ b/docs/en/appendix.website.html
@@ -0,0 +1,154 @@
+<html>
+   <head>
+      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+   
+      <title>Appendix A. OmegaT on the web</title>
+      <link rel="stylesheet" href="OmegaT.css" type="text/css">
+      <meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+      <link rel="home" href="index.html" title="OmegaT - User's Guide">
+      <link rel="up" href="index.html" title="OmegaT - User's Guide">
+      <link rel="prev" href="chapter.misc.html" title="Chapter 22. Miscellaneous subjects">
+      <link rel="next" href="appendix.languages.html" title="Appendix B. Languages - ISO 639 code list">
+   </head>
+   <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+      <div class="navheader">
+         <table width="100%" summary="Navigation header">
+            <tr>
+               <th colspan="3" align="center">Appendix A. OmegaT on the web</th>
+            </tr>
+            <tr>
+               <td width="20%" align="left"><a accesskey="p" href="chapter.misc.html">Prev</a> 
+               </td>
+               <th width="60%" align="center"> </th>
+               <td width="20%" align="right"> <a accesskey="n" href="appendix.languages.html">Next</a></td>
+            </tr>
+         </table>
+         <hr>
+      </div>
+      <div class="appendix" title="Appendix A. OmegaT on the web">
+         <div class="titlepage">
+            <div>
+               <div>
+                  <h2 class="title"><a name="appendix.website"></a>Appendix A. <span class="application"><a class="indexterm" name="d0e8407"></a>OmegaT</span> on the web
+                  </h2>
+               </div>
+            </div>
+         </div>
+         <div class="toc">
+            <dl>
+               <dt><span class="section"><a href="appendix.website.html#OmegaT.sites.and.OmegaT.SourceForge.project">1. <span class="application">OmegaT</span> sites and
+                            <span class="application">OmegaT</span> SourceForge project</a></span></dt>
+               <dt><span class="section"><a href="appendix.website.html#bug.reports">2. Bug reports</a></span></dt>
+               <dt><span class="section"><a href="appendix.website.html#contributing.to.omegat.project">3. Contributing to <span class="application">OmegaT</span> project</a></span></dt>
+            </dl>
+         </div>
+         <div class="section" title="1. OmegaT sites and OmegaT SourceForge project">
+            <div class="titlepage">
+               <div>
+                  <div>
+                     <h2 class="title" style="clear: both"><a name="OmegaT.sites.and.OmegaT.SourceForge.project"></a>1. <span class="application">OmegaT</span> sites and
+                            <span class="application">OmegaT</span> SourceForge project<a class="indexterm" name="d0e8420"></a></h2>
+                  </div>
+               </div>
+            </div>
+            <p>The<a class="ulink" href="http://www.omegat.org/" target="_top">
+                      <span class="application">OmegaT</span> web site </a>contains links to
+                   numerous <span class="application">OmegaT</span> resources. User support is
+                   provided on a volunteer basis at the <a class="ulink" href="http://groups.yahoo.com/group/omegat/" target="_top"><span class="application">OmegaT</span>
+                      Yahoo User Group</a>. The <a class="ulink" href="http://tech.groups.yahoo.com/group/omegat/database?method=reportRows&amp;tbl=1" target="_top">FAQ
+                      </a> is a good starting point for finding answers to questions you may
+                   have. For the latest version of OmegaT, refer to the downloads page at
+                   www.omegat.org. You can also file <a class="ulink" href="http://sourceforge.net/tracker/?group_id=68187&amp;atid=520347" target="_top">bug
+                      reports</a> and <a class="ulink" href="http://sourceforge.net/tracker/?group_id=68187&amp;atid=52035" target="_top">requests
+                      for enhancements.</a></p>
+         </div>
+         <div class="section" title="2. Bug reports">
+            <div class="titlepage">
+               <div>
+                  <div>
+                     <h2 class="title" style="clear: both"><a name="bug.reports"></a>2. Bug reports<a class="indexterm" name="d0e8452"></a></h2>
+                  </div>
+               </div>
+            </div>
+            <p>Remember that every good bug report needs just three things:</p>
+            <div class="itemizedlist">
+               <ul class="itemizedlist" type="disc">
+                  <li class="listitem">
+                     <p>Steps to reproduce</p>
+                  </li>
+                  <li class="listitem">
+                     <p>What you expected to see</p>
+                  </li>
+                  <li class="listitem">
+                     <p>What you saw instead</p>
+                  </li>
+               </ul>
+            </div>
+            <p>More can be found in the <a class="ulink" href="http://www.joelonsoftware.com/articles/fog0000000029.html" target="_top">Painless
+                      Bug Tracking</a> article by Joel Spolsky.
+            </p>
+            <p>You should add copies of files, portions of the log (see <a class="link" href="chapter.files.and.directories.html" title="Chapter 8. OmegaT Files and Directories"><span class="application">OmegaT</span> Files
+                      and Directories > User files</a> location), screen shots, and
+                   anything else that you think will help the developers to find and fix your
+                   bug. Note that bug reports and requests for enhancements are publicly
+                   visible, so you should not add any sensitive files. If you wish to keep
+                   track of what is happening to the report, register as a SourceForge user,
+                   login and file a bug report or simply click Monitor at the top of the
+                   report.
+            </p>
+         </div>
+         <div class="section" title="3. Contributing to OmegaT project">
+            <div class="titlepage">
+               <div>
+                  <div>
+                     <h2 class="title" style="clear: both"><a name="contributing.to.omegat.project"></a>3. Contributing to <span class="application">OmegaT</span> project<a class="indexterm" name="d0e8487"></a></h2>
+                  </div>
+               </div>
+            </div>
+            <p><span class="bold"><strong>To contribute to
+                         <span class="application">OmegaT</span>:</strong></span></p>
+            <p>first join the <a class="ulink" href="http://groups.yahoo.com/group/OmegaT/" target="_top">user group</a> (via web or
+                   by sending an email to <a class="ulink" href="mailto:OmegaT-subscribe at yahoogroups.com" target="_top"><span class="application">OmegaT</span>-subscribe at yahoogroups.com</a>).
+                   To get involved in the <span class="application">OmegaT</span> development
+                   effort you can join the developer group, via the web or by sending an
+                   email to <a class="ulink" href="mailto:omegat-development-request at list.sourceforge.net?subject=subscribe" target="_top">omegat-development-request at list.sourceforge.net</a>
+                   with "subscribe" as the subject line.
+            </p>
+            <p><span class="bold"><strong>To translate
+                         <span class="application">OmegaT</span>'s user interface, user manual or other
+                         related documents:</strong></span></p>
+            <p>first read the <a class="ulink" href="http://www.omegat.org/en/howtos/localizing_omegat.html" target="_top">Localizing
+                      and Customizing <span class="application">OmegaT</span></a> guide, and join
+                   the <span class="application">OmegaT</span> translators' group via web or by
+                   sending an email to <a class="ulink" href="mailto:omegat-development-request at lists.sourceforge.net?subject=subscribe" target="_top">omegat-l10n-request at lists.sourceforge.net</a>
+                   with subject "subscribe".
+            </p><a class="indexterm" name="d0e8533"></a><p>To support the OmegaT project financially<a class="indexterm" name="d0e8540"></a></p>
+            <p>If you would like to help support the continued development of
+                   OmegaT, it would be very much appreciated - click on this link to go to
+                   the <a class="ulink" href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UB6Y2BBF99\ LL" target="_top">
+                      OmegaT PayPal account</a>.
+            </p><a class="indexterm" name="d0e8550"></a></div>
+      </div>
+      <div class="navfooter">
+         <hr>
+         <table width="100%" summary="Navigation footer">
+            <tr>
+               <td width="40%" align="left"><a accesskey="p" href="chapter.misc.html">Prev</a> 
+               </td>
+               <td width="20%" align="center"> </td>
+               <td width="40%" align="right"> <a accesskey="n" href="appendix.languages.html">Next</a></td>
+            </tr>
+            <tr>
+               <td width="40%" align="left" valign="top">Chapter 22. Miscellaneous subjects </td>
+               <td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td>
+               <td width="40%" align="right" valign="top"> Appendix B. Languages - ISO 639 code list
+                    
+                    
+                    
+                    
+               </td>
+            </tr>
+         </table>
+      </div>
+   </body>
+</html>
\ No newline at end of file
diff --git a/docs/en/chapter.about.OmegaT.html b/docs/en/chapter.about.OmegaT.html
new file mode 100644
index 0000000..d2eee2c
--- /dev/null
+++ b/docs/en/chapter.about.OmegaT.html
@@ -0,0 +1,315 @@
+<html>
+   <head>
+      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+   
+      <title>Chapter 1. About OmegaT - introduction</title>
+      <link rel="stylesheet" href="OmegaT.css" type="text/css">
+      <meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+      <link rel="home" href="index.html" title="OmegaT - User's Guide">
+      <link rel="up" href="index.html" title="OmegaT - User's Guide">
+      <link rel="prev" href="index.html" title="OmegaT - User's Guide">
+      <link rel="next" href="chapter.instant.start.guide.html" title="Chapter 2. Instant Start Guide">
+   </head>
+   <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+      <div class="navheader">
+         <table width="100%" summary="Navigation header">
+            <tr>
+               <th colspan="3" align="center">Chapter 1. About <span class="application">OmegaT</span> - introduction
+               </th>
+            </tr>
+            <tr>
+               <td width="20%" align="left"><a accesskey="p" href="index.html">Prev</a> 
+               </td>
+               <th width="60%" align="center"> </th>
+               <td width="20%" align="right"> <a accesskey="n" href="chapter.instant.start.guide.html">Next</a></td>
+            </tr>
+         </table>
+         <hr>
+      </div>
+      <div class="chapter" title="Chapter 1. About OmegaT - introduction">
+         <div class="titlepage">
+            <div>
+               <div>
+                  <h2 class="title"><a name="chapter.about.OmegaT"></a>Chapter 1. About <span class="application">OmegaT</span> - introduction
+                  </h2>
+               </div>
+            </div>
+         </div>
+         <div class="toc">
+            <dl>
+               <dt><span class="section"><a href="chapter.about.OmegaT.html#OmegaT-Highlists">1. OmegaT highlights</a></span></dt>
+               <dt><span class="section"><a href="chapter.about.OmegaT.html#OmegaT.chapters.summary">2. Summary of chapters</a></span></dt>
+            </dl>
+         </div>
+         <div class="section" title="1. OmegaT highlights">
+            <div class="titlepage">
+               <div>
+                  <div>
+                     <h2 class="title" style="clear: both"><a name="OmegaT-Highlists"></a>1. OmegaT highlights
+                     </h2>
+                  </div>
+               </div>
+            </div>
+            <p><span class="application">OmegaT</span> is a free multi platform Computer
+                   Aided Translation tool, with the following highlights:
+            </p>
+            <div class="itemizedlist">
+               <ul class="itemizedlist" type="disc">
+                  <li class="listitem">
+                     <p><span class="bold"><strong>Translation
+                                      memory:</strong></span><span class="application"> </span>OmegaT stores your
+                        translations in a translation memory file. At the same time, it can
+                        use memories files from previous translations for reference.
+                        Translation memories can be very useful in a translation where there
+                                are numerous repetitions or reasonably similar segments of text.
+                                OmegaT uses translation memories to store your previous translations
+                                and then suggest likely translations for the text you are currently
+                                working on.
+                     </p>
+                     <p>These translation memories can be very useful when a document
+                                that has already been translated needs to be updated. Unchanged
+                                sentences are automatically translated, while updated sentences are
+                                shown with the translation of the most similar, older sentence.
+                                Modifications to the original document are thus handled with greater
+                                ease. If you are supplied with previously created translation memories
+                                , for example by your translation agency or your client, OmegaT is
+                                able to use these as reference memories.
+                     </p>
+                     <p>OmegaT uses the standard tmx file format to store and access
+                                translation memories, which guarantees that you can exchange your
+                                translation material with other CAT applications supporting this file
+                                format.
+                     </p>
+                  </li>
+               </ul>
+            </div>
+            <div class="itemizedlist">
+               <ul class="itemizedlist" type="disc">
+                  <li class="listitem">
+                     <p><span class="bold"><strong>Terminology management</strong></span>:
+                                Terminology management is important for translation consistency.
+                                OmegaT uses glossaries containing translations of single words or
+                                small phrases: a simplified bilingual dictionary for a specific
+                                domain. For your reference, OmegaT displays the translation of any
+                                words that happen to be present in the segment that currently has
+                                focus.
+                     </p>
+                  </li>
+               </ul>
+            </div>
+            <div class="itemizedlist">
+               <ul class="itemizedlist" type="disc">
+                  <li class="listitem">
+                     <p><span class="bold"><strong>Translation process:</strong></span> Imagine
+                                having to translate something; from a single file to a folder
+                                containing subfolders each with a number of files in a variety of
+                                formats. When you let OmegaT know the files that you need to
+                                translate, it looks for the files it understands based on file
+                                filtering rules, recognizes the textual parts within them, splits up
+                                the text groups according to the segmentation rules, and displays the
+                                segments one by one so that you can proceed with the translation.
+                                OmegaT stores your translations and proposes possible translations
+                                from similar segments in previous memory files. When you are ready to
+                                view the final product, you can export the translated files, open them
+                                in the appropriate application and view the translation in the final
+                                format...
+                     </p>
+                  </li>
+               </ul>
+            </div>
+         </div>
+         <div class="section" title="2. Summary of chapters">
+            <div class="titlepage">
+               <div>
+                  <div>
+                     <h2 class="title" style="clear: both"><a name="OmegaT.chapters.summary"></a>2. Summary of chapters
+                     </h2>
+                  </div>
+               </div>
+            </div>
+            <p>This documentation is intended both as a tutorial and as a reference
+                   guide. Here is a short summary of the chapters and their contents.
+            </p>
+            <div class="itemizedlist">
+               <ul class="itemizedlist" type="disc">
+                  <li class="listitem">
+                     <p><span class="bold"><strong> Instant start guide:</strong></span> this
+                                chapter is intended as an Instant Start Guide for beginners and “tyre
+                                kickers”, showing the complete procedure from opening a new
+                                translation project through to completing the translation.
+                     </p>
+                  </li>
+               </ul>
+            </div>
+            <div class="itemizedlist">
+               <ul class="itemizedlist" type="disc">
+                  <li class="listitem">
+                     <p><span class="bold"><strong>Installing and running OmegaT:
+                                      </strong></span>this chapter is useful when you first begin using OmegaT.
+                                It contains the specific instructions on how to install OmegaT and run
+                                it on Windows, Mac OS X and Linux. For advanced users, the chapter
+                                describes the command line mode and its possibilities.
+                     </p>
+                  </li>
+               </ul>
+            </div>
+            <div class="itemizedlist">
+               <ul class="itemizedlist" type="disc">
+                  <li class="listitem">
+                     <p><span class="bold"><strong>The user interface</strong></span>,<span class="bold"><strong>Main Menu and Keyboard Shortcuts</strong></span>: these two
+                                chapters are likely to be heavily consulted, since they explain the
+                                user interface of OmegaT and the functions available via the main menu
+                                and the keyboard shortcuts.
+                     </p>
+                  </li>
+               </ul>
+            </div>
+            <div class="itemizedlist">
+               <ul class="itemizedlist" type="disc">
+                  <li class="listitem">
+                     <p><span class="bold"><strong>Project properties</strong></span>, <span class="bold"><strong><span class="application">OmegaT</span> Files and
+                                      Directories:</strong></span> a project in the context of OmegaT is the
+                                piece of work that OmegaT as a CAT tool is able to handle. This
+                                chapter describes the project properties, such as the source and
+                                target languages. The second of these chapters describes the various
+                                subfolders and files in a translation project and their role as well
+                                as other user and application files associated with OmegaT.
+                     </p>
+                  </li>
+               </ul>
+            </div>
+            <div class="itemizedlist">
+               <ul class="itemizedlist" type="disc">
+                  <li class="listitem">
+                     <p><span class="bold"><strong>Editing field behavior:</strong></span> a short
+                                chapter describing how to set up the editing behavior of the segment
+                                being translated.
+                     </p>
+                  </li>
+               </ul>
+            </div>
+            <div class="itemizedlist">
+               <ul class="itemizedlist" type="disc">
+                  <li class="listitem">
+                     <p><span class="bold"><strong>Working with plain text</strong></span> and
+                                <span class="bold"><strong>Working with formatted text</strong></span>: these
+                                two chapters explain certain important points concerning texts to be
+                                translated, such as the encoding set (in the case of plain text files)
+                                and tag handling (in the case of formatted text).
+                     </p>
+                  </li>
+               </ul>
+            </div>
+            <div class="itemizedlist">
+               <ul class="itemizedlist" type="disc">
+                  <li class="listitem">
+                     <p><span class="bold"><strong>Translation memories: </strong></span> explains
+                                the role of the various subdirectories containing translation
+                                memories, and provides information on other important aspects relating
+                                to translation memories.
+                     </p>
+                  </li>
+                  <li class="listitem">
+                     <p><span class="bold"><strong>Segmentation</strong></span>:translation memory
+                                tools work with textual units called segments. In OmegaT, segments can
+                                be based on paragraphs or on segmentation rules. Paragraph
+                                segmentation is less frequently used, but can be useful in cases of
+                                so-called "creative" texts, The rule-based segmentation is usually
+                                synonymous with sentence-based segmentation. A number of rule sets are
+                                provided while additional rules can be defined by the user, as
+                                described in this chapter.
+                     </p>
+                  </li>
+                  <li class="listitem">
+                     <p><span class="bold"><strong>Searches</strong></span> and<span class="bold"><strong> </strong></span><span class="bold"><strong>Regular
+                                      expressions</strong></span>: Searches in OmegaT can be as simple as
+                                "<span class="emphasis"><em>list segments containing </em></span><span class="emphasis"><em>the word
+                                      'kangaroo' in the source". </em></span> They can also be complex,
+                                allowing for instance to search for segments in which the target text
+                                contains two or more consecutive spaces. In this case the regular
+                                expression ^s^s+ would be used to find and list the offending
+                                segments. Regular expressions are also used extensively in the
+                                segmentation rules.
+                     </p>
+                  </li>
+                  <li class="listitem">
+                     <p><span class="bold"><strong>Dictionaries, Glossaries</strong></span>,
+                                <span class="bold"><strong>Machine translation</strong></span> and <span class="bold"><strong>Spellchecker:</strong></span> OmegaT enables the extensive of
+                                dictionaries and glossaries. If an Internet connection is available,
+                                various MT services such as Google Translate can be utilized from
+                                within OmegaT. If spell checking is activated, spelling mistakes and
+                                typos are recognized and can be corrected during translation.
+                     </p>
+                  </li>
+                  <li class="listitem">
+                     <p><span class="bold"><strong>Miscellanea</strong></span>: deals with other
+                                issues of interest, such as how to avoid losing data.
+                     </p>
+                  </li>
+                  <li class="listitem">
+                     <p><span class="bold"><strong>Appendices</strong></span> contain the
+                                following information
+                     </p>
+                     <div class="itemizedlist">
+                        <ul class="itemizedlist" type="circle">
+                           <li class="listitem">
+                              <p><span class="bold"><strong>OmegaT on the web:</strong></span>
+                                             information regarding on-line OmegaT resources
+                              </p>
+                           </li>
+                        </ul>
+                     </div>
+                     <div class="itemizedlist">
+                        <ul class="itemizedlist" type="circle">
+                           <li class="listitem">
+                              <p><span class="bold"><strong>Languages:</strong></span> contains the ISO
+                                             list of languages and language codes
+                              </p>
+                           </li>
+                        </ul>
+                     </div>
+                     <div class="itemizedlist">
+                        <ul class="itemizedlist" type="circle">
+                           <li class="listitem">
+                              <p><span class="bold"><strong>Keyboard shortcuts</strong></span>: the
+                                             list of shortcuts used in the editor
+                              </p>
+                           </li>
+                        </ul>
+                     </div>
+                     <div class="itemizedlist">
+                        <ul class="itemizedlist" type="circle">
+                           <li class="listitem">
+                              <p><span class="bold"><strong>Legal notices</strong></span></p>
+                           </li>
+                        </ul>
+                     </div>
+                  </li>
+                  <li class="listitem">
+                     <p><span class="bold"><strong>Keyword index:</strong></span> an extensive
+                                keyword index is provided to help the reader find the relevant
+                                information.
+                     </p>
+                  </li>
+               </ul>
+            </div>
+         </div>
+      </div>
+      <div class="navfooter">
+         <hr>
+         <table width="100%" summary="Navigation footer">
+            <tr>
+               <td width="40%" align="left"><a accesskey="p" href="index.html">Prev</a> 
+               </td>
+               <td width="20%" align="center"> </td>
+               <td width="40%" align="right"> <a accesskey="n" href="chapter.instant.start.guide.html">Next</a></td>
+            </tr>
+            <tr>
+               <td width="40%" align="left" valign="top">OmegaT - User's Guide </td>
+               <td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td>
+               <td width="40%" align="right" valign="top"> Chapter 2. Instant Start Guide</td>
+            </tr>
+         </table>
+      </div>
+   </body>
+</html>
\ No newline at end of file
diff --git a/docs/en/chapter.dictionaries.html b/docs/en/chapter.dictionaries.html
new file mode 100644
index 0000000..f29b8a9
--- /dev/null
+++ b/docs/en/chapter.dictionaries.html
@@ -0,0 +1,177 @@
+<html>
+   <head>
+      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+   
+      <title>Chapter 18. Dictionaries</title>
+      <link rel="stylesheet" href="OmegaT.css" type="text/css">
+      <meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+      <link rel="home" href="index.html" title="OmegaT - User's Guide">
+      <link rel="up" href="index.html" title="OmegaT - User's Guide">
+      <link rel="prev" href="chapter.searches.html" title="Chapter 17. Searches">
+      <link rel="next" href="chapter.glossaries.html" title="Chapter 19. Glossaries">
+   </head>
+   <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+      <div class="navheader">
+         <table width="100%" summary="Navigation header">
+            <tr>
+               <th colspan="3" align="center">Chapter 18. Dictionaries</th>
+            </tr>
+            <tr>
+               <td width="20%" align="left"><a accesskey="p" href="chapter.searches.html">Prev</a> 
+               </td>
+               <th width="60%" align="center"> </th>
+               <td width="20%" align="right"> <a accesskey="n" href="chapter.glossaries.html">Next</a></td>
+            </tr>
+         </table>
+         <hr>
+      </div>
+      <div class="chapter" title="Chapter 18. Dictionaries">
+         <div class="titlepage">
+            <div>
+               <div>
+                  <h2 class="title"><a name="chapter.dictionaries"></a>Chapter 18. <a class="indexterm" name="d0e7381"></a>Dictionaries
+                  </h2>
+               </div>
+            </div>
+         </div>
+         <div class="toc">
+            <dl>
+               <dt><span class="section"><a href="chapter.dictionaries.html#d0e7386">1. How to download and install dictionaries</a></span></dt>
+               <dt><span class="section"><a href="chapter.dictionaries.html#d0e7494">2. Problems with dictionaries</a></span></dt>
+            </dl>
+         </div>
+         <p></p>
+         <div class="section" title="1. How to download and install dictionaries">
+            <div class="titlepage">
+               <div>
+                  <div>
+                     <h2 class="title" style="clear: both"><a name="d0e7386"></a>1. How to download and install dictionaries<a class="indexterm" name="d0e7389"></a></h2>
+                  </div>
+               </div>
+            </div>
+            <p>Dictionaries in <span class="application">OmegaT</span> are based on the
+                   StartDict Platform. To install the necessary files, proceed as
+                   follows:
+            </p>
+            <div class="itemizedlist">
+               <ul class="itemizedlist" type="disc">
+                  <li class="listitem">
+                     <p>Search for the required language combination - for instance on
+                                the <a class="ulink" href="http://stardict.sourceforge.net/index.php" target="_top"><a class="indexterm" name="d0e7404"></a>StartDict Platform</a> above or on <a class="ulink" href="http://www.freedict.org/en/list.html" target="_top">FreeDict<a class="indexterm" name="d0e7413"></a></a></p>
+                  </li>
+               </ul>
+            </div>
+            <div class="itemizedlist">
+               <ul class="itemizedlist" type="disc">
+                  <li class="listitem">
+                     <p>Download the file - it should be a <code class="filename">tarball</code>
+                                archive (extension <span class="emphasis"><em>tar.bz</em></span> or
+                                <span class="emphasis"><em>tar.bz2</em></span>).
+                     </p>
+                  </li>
+               </ul>
+            </div>
+            <div class="itemizedlist">
+               <ul class="itemizedlist" type="disc">
+                  <li class="listitem">
+                     <p>Use untar utility (or its equivalent, for instance<code class="filename">
+                                   winrar</code> in Windows) to extract its contents into the project
+                                folder "Dictionary". There should be three files, with extensions
+                                <span class="emphasis"><em>dz, idx </em></span>and <span class="emphasis"><em>ifo</em></span>.
+                     </p>
+                  </li>
+               </ul>
+            </div>
+            <p>Note that in addition to "source-target" dictionaries you can, using
+                   the Dictionary feature, obtain access to information such as:
+            </p>
+            <div class="itemizedlist">
+               <ul class="itemizedlist" type="disc">
+                  <li class="listitem">
+                     <p><a class="indexterm" name="d0e7449"></a>Webster's Revised Unabridged Dictionary (1913)
+                     </p>
+                  </li>
+               </ul>
+            </div>
+            <div class="itemizedlist">
+               <ul class="itemizedlist" type="disc">
+                  <li class="listitem">
+                     <p><a class="indexterm" name="d0e7458"></a>Longman Dictionary of Contemporary English
+                     </p>
+                  </li>
+               </ul>
+            </div>
+            <div class="itemizedlist">
+               <ul class="itemizedlist" type="disc">
+                  <li class="listitem">
+                     <p><a class="indexterm" name="d0e7467"></a>The Britannica Concise Encyclopedia
+                     </p>
+                  </li>
+               </ul>
+            </div>
+            <div class="itemizedlist">
+               <ul class="itemizedlist" type="disc">
+                  <li class="listitem">
+                     <p>etc...</p>
+                  </li>
+               </ul>
+            </div>
+            <p>Some of the dictionaries have no strings attached - i.e. are "Free
+                   to use", and others, like the selection above, are under the GPL license.
+                   The following example shows Merriam Webster 10th dictionary "in
+                   action":
+            </p>
+            <div class="figure"><a name="Dict.Merriam.Webster"></a><p class="title"><b>Figure 18.1. <a class="indexterm" name="d0e7481"></a>Merriam Webster dictionary - use</b></p>
+               <div class="figure-contents">
+                  <div class="mediaobject"><img src="images/DictMerriamWebster.png" alt="DictionaryMerriam Webster - figureDictionariesMerriam Webster dictionary - use"></div>
+               </div>
+            </div><br class="figure-break"></div>
+         <div class="section" title="2. Problems with dictionaries">
+            <div class="titlepage">
+               <div>
+                  <div>
+                     <h2 class="title" style="clear: both"><a name="d0e7494"></a>2. <a class="indexterm" name="d0e7496"></a>Problems with dictionaries
+                     </h2>
+                  </div>
+               </div>
+            </div>
+            <div class="itemizedlist">
+               <ul class="itemizedlist" type="disc">
+                  <li class="listitem">
+                     <p>Check that your dict files are in the folder (or in a subfolder
+                                below it). Check in <span class="guimenu">Project</span> → <span class="guimenuitem">Properties</span> (<span class="shortcut"><strong><span class="keycap"><strong><a class="indexterm" name="d0e7510"></a>Ctrl</strong></span>+<span class="keycap"><strong>E</strong></span></strong></span>).
+                     </p>
+                  </li>
+               </ul>
+            </div>
+            <div class="itemizedlist">
+               <ul class="itemizedlist" type="disc">
+                  <li class="listitem">
+                     <p>Does the folder contain three files of the same name, with
+                                extensions ? If only one file is present, check its extension. If it
+                                is <span class="emphasis"><em>tar.bz</em></span>, you have forgotten to unpack (untar)
+                                it.
+                     </p>
+                  </li>
+               </ul>
+            </div>
+         </div>
+      </div>
+      <div class="navfooter">
+         <hr>
+         <table width="100%" summary="Navigation footer">
+            <tr>
+               <td width="40%" align="left"><a accesskey="p" href="chapter.searches.html">Prev</a> 
+               </td>
+               <td width="20%" align="center"> </td>
+               <td width="40%" align="right"> <a accesskey="n" href="chapter.glossaries.html">Next</a></td>
+            </tr>
+            <tr>
+               <td width="40%" align="left" valign="top">Chapter 17. Searches </td>
+               <td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td>
+               <td width="40%" align="right" valign="top"> Chapter 19. Glossaries</td>
+            </tr>
+         </table>
+      </div>
+   </body>
+</html>
\ No newline at end of file
diff --git a/docs/en/chapter.file.filters.html b/docs/en/chapter.file.filters.html
new file mode 100644
index 0000000..5d8a8ea
--- /dev/null
+++ b/docs/en/chapter.file.filters.html
@@ -0,0 +1,560 @@
+<html>
+   <head>
+      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+   
+      <title>Chapter 7. File Filters</title>
+      <link rel="stylesheet" href="OmegaT.css" type="text/css">
+      <meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+      <link rel="home" href="index.html" title="OmegaT - User's Guide">
+      <link rel="up" href="index.html" title="OmegaT - User's Guide">
+      <link rel="prev" href="chapter.project.properties.html" title="Chapter 6. Project properties">
+      <link rel="next" href="chapter.files.and.directories.html" title="Chapter 8. OmegaT Files and Directories">
+   </head>
+   <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+      <div class="navheader">
+         <table width="100%" summary="Navigation header">
+            <tr>
+               <th colspan="3" align="center">Chapter 7. File Filters</th>
+            </tr>
+            <tr>
+               <td width="20%" align="left"><a accesskey="p" href="chapter.project.properties.html">Prev</a> 
+               </td>
+               <th width="60%" align="center"> </th>
+               <td width="20%" align="right"> <a accesskey="n" href="chapter.files.and.directories.html">Next</a></td>
+            </tr>
+         </table>
+         <hr>
+      </div>
+      <div class="chapter" title="Chapter 7. File Filters">
+         <div class="titlepage">
+            <div>
+               <div>
+                  <h2 class="title"><a name="chapter.file.filters"></a>Chapter 7. File Filters
+                  </h2>
+               </div>
+            </div>
+         </div>
+         <div class="toc">
+            <dl>
+               <dt><span class="section"><a href="chapter.file.filters.html#file.filters.dialog">1. File filters dialog</a></span></dt>
+               <dt><span class="section"><a href="chapter.file.filters.html#filters.options">2. Filter options</a></span></dt>
+               <dt><span class="section"><a href="chapter.file.filters.html#edit.filter.dialog">3. Edit filter dialog</a></span></dt>
+               <dd>
+                  <dl>
+                     <dt><span class="section"><a href="chapter.file.filters.html#source.filetype.and.filename.pattern">3.1. Source file type, filename pattern</a></span></dt>
+                     <dt><span class="section"><a href="chapter.file.filters.html#source.and.target.files.encoding">3.2. Source and Target file encoding</a></span></dt>
+                     <dt><span class="section"><a href="chapter.file.filters.html#target.name">3.3. Target filename</a></span></dt>
+                  </dl>
+               </dd>
+            </dl>
+         </div>
+         <p>OmegaT features highly customizable filters, enabling you to configure
+              numerous aspects. File filters are pieces of code capable of:
+         </p>
+         <div class="itemizedlist">
+            <ul class="itemizedlist" type="disc">
+               <li class="listitem">
+                  <p>Reading the document in some specific file format. For instance,
+                           plain text files.
+                  </p>
+               </li>
+            </ul>
+         </div>
+         <div class="itemizedlist">
+            <ul class="itemizedlist" type="disc">
+               <li class="listitem">
+                  <p>Extracting the translatable content out of the file.</p>
+               </li>
+            </ul>
+         </div>
+         <div class="itemizedlist">
+            <ul class="itemizedlist" type="disc">
+               <li class="listitem">
+                  <p>Automating modifications of the translated document file names by
+                           replacing translatable contents with its translation.
+                  </p>
+               </li>
+            </ul>
+         </div>
+         <p>Most users will find the default file filter options sufficient. If
+              this is not the case, open the main dialog by selecting<span class="bold"><strong> Options → File Filters...</strong></span> from the main menu.
+         </p>
+         <p><span class="bold"><strong>Warning!</strong></span> Should you change filter
+              options whilst a project is open, you must reload the project in order for
+              the changes to take effect.
+         </p>
+         <div class="section" title="1. File filters dialog">
+            <div class="titlepage">
+               <div>
+                  <div>
+                     <h2 class="title" style="clear: both"><a name="file.filters.dialog"></a>1. File filters dialog<a class="indexterm" name="d0e4278"></a></h2>
+                  </div>
+               </div>
+            </div>
+            <p>This dialog lists available file filters. Should you wish not to use
+                   OmegaT to translate files of a certain type, you can turn off the
+                   corresponding filter by unticking the check box beside its name. OmegaT
+                   will then omit the appropriate files while loading projects, and will copy
+                   them unmodified when creating target documents. When you wish to use the
+                   filter again, just tick the check box. Click <span class="bold"><strong>Defaults</strong></span> to reset the file filters to the default
+                   settings. To edit which files in which encodings the filter is to process,
+                   select the filter from the list and click <span class="bold"><strong>Edit.</strong></span></p>
+         </div>
+         <div class="section" title="2. Filter options">
+            <div class="titlepage">
+               <div>
+                  <div>
+                     <h2 class="title" style="clear: both"><a name="filters.options"></a>2. Filter options<a class="indexterm" name="d0e4293"></a></h2>
+                  </div>
+               </div>
+            </div>
+            <p>Five filters (Text files, XHTML files, HTML and XHTML files,
+                   OpenDocument/OpenOffice.org files and Microsoft Open XML files) have one
+                   or more specific options. To modify the options select the filter from the
+                   list and click on <span class="bold"><strong>Options</strong></span>. The available
+                   options are:
+            </p>
+            <p><span class="bold"><strong>Text files</strong></span></p>
+            <div class="itemizedlist">
+               <ul class="itemizedlist" type="disc">
+                  <li class="listitem">
+                     <p><span class="emphasis"><em>Paragraph segmentation on line breaks, empty lines or
+                                      never:</em></span> if sentence segmentation rules are active, the text
+                                will further be segmented according to the rules available.
+                     </p>
+                  </li>
+               </ul>
+            </div>
+            <p><span class="bold"><strong>PO files</strong></span></p>
+            <div class="itemizedlist">
+               <ul class="itemizedlist" type="disc">
+                  <li class="listitem">
+                     <p><span class="emphasis"><em>Allow blank translations in the target file:</em></span> 
+                                If on, when a PO segment (which may be a whole paragraph) is not 
+                                translated, the translation will be empty in the target file. 
+                                Technically, <code class="code">msgstr</code> will be empty. As it is the standard 
+                                behavior for PO files, it is on by default. If the option is off, 
+                                the source text will be copied to the target segment.
+                     </p>
+                  </li>
+               </ul>
+            </div>
+            <p><span class="bold"><strong>HTML files and HTML and XHTML
+                         Files</strong></span></p>
+            <div class="itemizedlist">
+               <ul class="itemizedlist" type="disc">
+                  <li class="listitem">
+                     <p><span class="emphasis"><em>Encoding declaration:
+                                      </em></span><span class="application">OmegaT</span> may add or rewrite the
+                                file's encoding declaration to the encoding selected for the target
+                                file.
+                     </p>
+                  </li>
+               </ul>
+            </div>
+            <div class="itemizedlist">
+               <ul class="itemizedlist" type="disc">
+                  <li class="listitem">
+                     <p><span class="emphasis"><em>Attributes translation: </em></span>The selected
+                                attributes will appear as segments in the Editor window.
+                     </p>
+                  </li>
+               </ul>
+            </div>
+            <div class="itemizedlist">
+               <ul class="itemizedlist" type="disc">
+                  <li class="listitem">
+                     <p><span class="emphasis"><em>Paragraph on <br>:</em></span> The <br>
+                                HTML tag will constitute a paragraph for segmentation purposes.
+                     </p>
+                  </li>
+               </ul>
+            </div>
+            <div class="itemizedlist">
+               <ul class="itemizedlist" type="disc">
+                  <li class="listitem">
+                     <p><span class="emphasis"><em>Skip text matching regular expression: </em></span>The
+                                text matching the regular expression will be skipped.
+                     </p>
+                  </li>
+               </ul>
+            </div>
+            <p><span class="bold"><strong>OpenDocument/OpenOffice.org
+                         files</strong></span></p>
+            <div class="itemizedlist">
+               <ul class="itemizedlist" type="disc">
+                  <li class="listitem">
+                     <p>Index entries</p>
+                  </li>
+               </ul>
+            </div>
+            <div class="itemizedlist">
+               <ul class="itemizedlist" type="disc">
+                  <li class="listitem">
+                     <p>Bookmarks</p>
+                  </li>
+               </ul>
+            </div>
+            <div class="itemizedlist">
+               <ul class="itemizedlist" type="disc">
+                  <li class="listitem">
+                     <p>Bookmark references</p>
+                  </li>
+               </ul>
+            </div>
+            <div class="itemizedlist">
+               <ul class="itemizedlist" type="disc">
+                  <li class="listitem">
+                     <p>Notes</p>
+                  </li>
+               </ul>
+            </div>
+            <div class="itemizedlist">
+               <ul class="itemizedlist" type="disc">
+                  <li class="listitem">
+                     <p>Comments</p>
+                  </li>
+               </ul>
+            </div>
+            <div class="itemizedlist">
+               <ul class="itemizedlist" type="disc">
+                  <li class="listitem">
+                     <p>Presentation notes</p>
+                  </li>
+               </ul>
+            </div>
+            <div class="itemizedlist">
+               <ul class="itemizedlist" type="disc">
+                  <li class="listitem">
+                     <p>Links (URL)</p>
+                  </li>
+               </ul>
+            </div>
+            <div class="itemizedlist">
+               <ul class="itemizedlist" type="disc">
+                  <li class="listitem">
+                     <p>Sheet names</p>
+                  </li>
+               </ul>
+            </div>
+            <p><span class="bold"><strong>Microsoft Office Open XML
+                         files</strong></span></p>
+            <p>If the following elements are presented for translation, they will
+                   appear as separate segments.
+            </p>
+            <p><span class="bold"><strong>Word</strong></span></p>
+            <div class="itemizedlist">
+               <ul class="itemizedlist" type="disc">
+                  <li class="listitem">
+                     <p>Non-visible Instruction Text</p>
+                  </li>
+               </ul>
+            </div>
+            <div class="itemizedlist">
+               <ul class="itemizedlist" type="disc">
+                  <li class="listitem">
+                     <p>Comments</p>
+                  </li>
+               </ul>
+            </div>
+            <div class="itemizedlist">
+               <ul class="itemizedlist" type="disc">
+                  <li class="listitem">
+                     <p>Footnotes</p>
+                  </li>
+               </ul>
+            </div>
+            <div class="itemizedlist">
+               <ul class="itemizedlist" type="disc">
+                  <li class="listitem">
+                     <p>Endnotes</p>
+                  </li>
+               </ul>
+            </div>
+            <div class="itemizedlist">
+               <ul class="itemizedlist" type="disc">
+                  <li class="listitem">
+                     <p>Headers</p>
+                  </li>
+               </ul>
+            </div>
+            <div class="itemizedlist">
+               <ul class="itemizedlist" type="disc">
+                  <li class="listitem">
+                     <p>Footers</p>
+                  </li>
+               </ul>
+            </div>
+            <p><span class="bold"><strong>Excel</strong></span></p>
+            <div class="itemizedlist">
+               <ul class="itemizedlist" type="disc">
+                  <li class="listitem">
+                     <p>Comments</p>
+                  </li>
+               </ul>
+            </div>
+            <div class="itemizedlist">
+               <ul class="itemizedlist" type="disc">
+                  <li class="listitem">
+                     <p>Sheet Names</p>
+                  </li>
+               </ul>
+            </div>
+            <p><span class="bold"><strong>Power Point</strong></span></p>
+            <div class="itemizedlist">
+               <ul class="itemizedlist" type="disc">
+                  <li class="listitem">
+                     <p>Slide Comments</p>
+                  </li>
+               </ul>
+            </div>
+            <div class="itemizedlist">
+               <ul class="itemizedlist" type="disc">
+                  <li class="listitem">
+                     <p>Slide Masters</p>
+                  </li>
+               </ul>
+            </div>
+            <div class="itemizedlist">
+               <ul class="itemizedlist" type="disc">
+                  <li class="listitem">
+                     <p>Slide Layouts</p>
+                  </li>
+               </ul>
+            </div>
+            <p><span class="bold"><strong>Global</strong></span></p>
+            <div class="itemizedlist">
+               <ul class="itemizedlist" type="disc">
+                  <li class="listitem">
+                     <p>Charts</p>
+                  </li>
+               </ul>
+            </div>
+            <div class="itemizedlist">
+               <ul class="itemizedlist" type="disc">
+                  <li class="listitem">
+                     <p>Diagrams</p>
+                  </li>
+               </ul>
+            </div>
+            <div class="itemizedlist">
+               <ul class="itemizedlist" type="disc">
+                  <li class="listitem">
+                     <p>Drawings</p>
+                  </li>
+               </ul>
+            </div>
+            <div class="itemizedlist">
+               <ul class="itemizedlist" type="disc">
+                  <li class="listitem">
+                     <p>WordArt</p>
+                  </li>
+               </ul>
+            </div>
+            <p><span class="bold"><strong>Other Options</strong></span></p>
+            <div class="itemizedlist">
+               <ul class="itemizedlist" type="disc">
+                  <li class="listitem">
+                     <p><span class="emphasis"><em>Aggregate tags: </em></span>If checked, tags without
+                                translatable text between them will be aggregated into single
+                                tags.
+                     </p>
+                  </li>
+               </ul>
+            </div>
+            <div class="itemizedlist">
+               <ul class="itemizedlist" type="disc">
+                  <li class="listitem">
+                     <p><span class="emphasis"><em>Preserve spaces for all tags: </em></span>If checked,
+                                "white space" (i.e., spaces and newlines) will be preserved, even if
+                                not set technically in the document.
+                     </p>
+                  </li>
+               </ul>
+            </div>
+         </div>
+         <div class="section" title="3. Edit filter dialog">
+            <div class="titlepage">
+               <div>
+                  <div>
+                     <h2 class="title" style="clear: both"><a name="edit.filter.dialog"></a>3. Edit filter dialog<a class="indexterm" name="d0e4483"></a></h2>
+                  </div>
+               </div>
+            </div>
+            <p>This dialog enables you to set up the source filename patterns of
+                   files to be processed by the filter, customize the filenames of translated
+                   files, and select which encodings should be used for loading the file and
+                   saving its translated counterpart. To modify a file filter pattern, either
+                   modify the fields directly or click <span class="bold"><strong>Edit.</strong></span>
+                   To add a new file filter pattern, click <span class="bold"><strong>Add</strong></span>. The same dialog is used to add a pattern or to
+                   edit a particular pattern. The dialog is useful because it includes a
+                   special target filename pattern editor with which you can customize the
+                   names of output files.
+            </p>
+            <div class="section" title="3.1. Source file type, filename pattern">
+               <div class="titlepage">
+                  <div>
+                     <div>
+                        <h3 class="title"><a name="source.filetype.and.filename.pattern"></a>3.1. <a class="indexterm" name="d0e4498"></a>Source file type, filename pattern<a class="indexterm" name="d0e4504"></a></h3>
+                     </div>
+                  </div>
+               </div>
+               <p>When OmegaT encounters a file in its source folder, it attempts to
+                        select the filter based upon the file's extension. More precisely,
+                        OmegaT attempts to match each filter's source filename patterns against
+                        the filename. For example, the pattern <code class="literal">*.xhtml
+                           </code>matches any file with the <code class="literal">.xhtml</code> extension.
+                        If the appropriate filter is found, the file is assigned to it for
+                        processing. For example, by default, XHTML filters are used for
+                        processing files with the .xhtml extension. You can change or add
+                        filename patterns for files to be handled by each file. Source filename
+                        patterns use wild card characters similar to those used in <span class="bold"><strong>Searches. </strong></span>The '*' character matches zero or more
+                        characters. The '?' character matches exactly one character. All other
+                        characters represent themselves. For example, if you wish the text
+                        filter to handle readme files (<code class="literal">readme, read.me</code>, and
+                        <code class="literal">readme.txt</code>) you should use the pattern
+                        <code class="literal">read*</code>.
+               </p>
+            </div>
+            <div class="section" title="3.2. Source and Target file encoding">
+               <div class="titlepage">
+                  <div>
+                     <div>
+                        <h3 class="title"><a name="source.and.target.files.encoding"></a>3.2. Source and Target file encoding
+                        </h3>
+                     </div>
+                  </div>
+               </div><a class="indexterm" name="d0e4532"></a><a class="indexterm" name="d0e4537"></a><a class="indexterm" name="d0e4542"></a><p>Only a limited number of file formats specify a mandatory
+                        encoding. File formats that do not specify their encoding will use the
+                        encoding you set up for the extension that matches their name. For
+                        example, by default<code class="literal"> .txt </code>files will be loaded using
+                        the default encoding of your operating system. You may change the source
+                        encoding for each different source filename pattern. Such files may also
+                        be written out in any encoding. By default, the translated file encoding
+                        is the same as the source file encoding. Source and target encoding
+                        fields use combo boxes with all supported encodings included.
+                        <auto> leaves the encoding choice to
+                        <span class="application">OmegaT</span>. This is how it works:
+               </p>
+               <div class="itemizedlist">
+                  <ul class="itemizedlist" type="disc">
+                     <li class="listitem">
+                        <p>OmegaT identifies the source file encoding by using its
+                                     encoding declaration, if present (HTML files, XML based
+                                     files)
+                        </p>
+                     </li>
+                  </ul>
+               </div>
+               <div class="itemizedlist">
+                  <ul class="itemizedlist" type="disc">
+                     <li class="listitem">
+                        <p>OmegaT is instructed to use a mandatory encoding for certain
+                                     file formats (Java properties etc)
+                        </p>
+                     </li>
+                  </ul>
+               </div>
+               <div class="itemizedlist">
+                  <ul class="itemizedlist" type="disc">
+                     <li class="listitem">
+                        <p><span class="application">OmegaT</span> uses the default encoding of
+                                     the operating system for text files.
+                        </p>
+                     </li>
+                  </ul>
+               </div>
+            </div>
+            <div class="section" title="3.3. Target filename">
+               <div class="titlepage">
+                  <div>
+                     <div>
+                        <h3 class="title"><a name="target.name"></a>3.3. Target filename<a class="indexterm" name="d0e4572"></a></h3>
+                     </div>
+                  </div>
+               </div>
+               <p>Sometimes you may wish to rename the files you translate
+                        automatically, for example adding a language code after the file name.
+                        The target filename pattern uses a special syntax, so if you wish to
+                        edit this field, you must click <span class="bold"><strong>Edit...</strong></span>and use the <a class="indexterm" name="d0e4582"></a>Edit Pattern Dialog. If you wish to revert to default
+                        configuration of the filter, click <span class="bold"><strong>Defaults.</strong></span> You may also modify the name directly
+                        in the target filename pattern field of the file filters dialog. The
+                        Edit Pattern Dialog offers the following options:
+               </p>
+               <div class="itemizedlist">
+                  <ul class="itemizedlist" type="disc">
+                     <li class="listitem">
+                        <p>Default is <code class="literal">${filename}</code>– full filename of
+                                     the source file with extension: in this case the name of the
+                                     translated file is the same as that of the source file.
+                        </p>
+                     </li>
+                  </ul>
+               </div>
+               <div class="itemizedlist">
+                  <ul class="itemizedlist" type="disc">
+                     <li class="listitem">
+                        <p><code class="literal">${nameOnly}</code>– allows you to insert only the
+                                     name of the source file without the extension.
+                        </p>
+                     </li>
+                  </ul>
+               </div>
+               <div class="itemizedlist">
+                  <ul class="itemizedlist" type="disc">
+                     <li class="listitem">
+                        <p><code class="literal">${targetLocale}</code>– target locale code (of a
+                                     form "xx_YY").
+                        </p>
+                     </li>
+                  </ul>
+               </div>
+               <div class="itemizedlist">
+                  <ul class="itemizedlist" type="disc">
+                     <li class="listitem">
+                        <p><code class="literal">${targetLanguage}</code>– the target language and
+                                     country code together (of a form "XX-YY").
+                        </p>
+                     </li>
+                  </ul>
+               </div>
+               <div class="itemizedlist">
+                  <ul class="itemizedlist" type="disc">
+                     <li class="listitem">
+                        <p><code class="literal">${targetLanguageCode}</code> – the target language
+                                     only ("XX").
+                        </p>
+                     </li>
+                  </ul>
+               </div>
+               <div class="itemizedlist">
+                  <ul class="itemizedlist" type="disc">
+                     <li class="listitem">
+                        <p><code class="literal">${targetCountryCode}</code>– the target country
+                                     only ("YY").
+                        </p>
+                     </li>
+                  </ul>
+               </div>
+            </div>
+         </div>
+      </div>
+      <div class="navfooter">
+         <hr>
+         <table width="100%" summary="Navigation footer">
+            <tr>
+               <td width="40%" align="left"><a accesskey="p" href="chapter.project.properties.html">Prev</a> 
+               </td>
+               <td width="20%" align="center"> </td>
+               <td width="40%" align="right"> <a accesskey="n" href="chapter.files.and.directories.html">Next</a></td>
+            </tr>
+            <tr>
+               <td width="40%" align="left" valign="top">Chapter 6. Project properties </td>
+               <td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td>
+               <td width="40%" align="right" valign="top"> Chapter 8. <span class="application">OmegaT</span> Files and Directories
+               </td>
+            </tr>
+         </table>
+      </div>
+   </body>
+</html>
\ No newline at end of file
diff --git a/docs/en/chapter.files.and.directories.html b/docs/en/chapter.files.and.directories.html
new file mode 100644
index 0000000..95dd165
--- /dev/null
+++ b/docs/en/chapter.files.and.directories.html
@@ -0,0 +1,534 @@
+<html>
+   <head>
+      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+   
+      <title>Chapter 8. OmegaT Files and Directories</title>
+      <link rel="stylesheet" href="OmegaT.css" type="text/css">
+      <meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+      <link rel="home" href="index.html" title="OmegaT - User's Guide">
+      <link rel="up" href="index.html" title="OmegaT - User's Guide">
+      <link rel="prev" href="chapter.file.filters.html" title="Chapter 7. File Filters">
+      <link rel="next" href="chapter.files.to.translate.html" title="Chapter 9. Files to translate">
+   </head>
+   <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+      <div class="navheader">
+         <table width="100%" summary="Navigation header">
+            <tr>
+               <th colspan="3" align="center">Chapter 8. <span class="application">OmegaT</span> Files and Directories
+               </th>
+            </tr>
+            <tr>
+               <td width="20%" align="left"><a accesskey="p" href="chapter.file.filters.html">Prev</a> 
+               </td>
+               <th width="60%" align="center"> </th>
+               <td width="20%" align="right"> <a accesskey="n" href="chapter.files.to.translate.html">Next</a></td>
+            </tr>
+         </table>
+         <hr>
+      </div>
+      <div class="chapter" title="Chapter 8. OmegaT Files and Directories">
+         <div class="titlepage">
+            <div>
+               <div>
+                  <h2 class="title"><a name="chapter.files.and.directories"></a>Chapter 8. <span class="application">OmegaT</span> Files and Directories
+                  </h2>
+               </div>
+            </div>
+         </div>
+         <div class="toc">
+            <dl>
+               <dt><span class="section"><a href="chapter.files.and.directories.html#translation.project.files">1. Translation project files</a></span></dt>
+               <dd>
+                  <dl>
+                     <dt><span class="section"><a href="chapter.files.and.directories.html#translation.project.files.location">1.1. Translation project files location</a></span></dt>
+                     <dt><span class="section"><a href="chapter.files.and.directories.html#translation.project.files.list">1.2. Translation project files list</a></span></dt>
+                     <dt><span class="section"><a href="chapter.files.and.directories.html#folder.OmegaT">1.3. Omegat</a></span></dt>
+                     <dt><span class="section"><a href="chapter.files.and.directories.html#folder.source">1.4. Source files</a></span></dt>
+                     <dt><span class="section"><a href="chapter.files.and.directories.html#folder.target">1.5. Target files</a></span></dt>
+                     <dt><span class="section"><a href="chapter.files.and.directories.html#file.omegat.project">1.6. omegat.project</a></span></dt>
+                  </dl>
+               </dd>
+               <dt><span class="section"><a href="chapter.files.and.directories.html#user.files">2. User files</a></span></dt>
+               <dd>
+                  <dl>
+                     <dt><span class="section"><a href="chapter.files.and.directories.html#d0e4836">2.1. User files location </a></span></dt>
+                     <dt><span class="section"><a href="chapter.files.and.directories.html#user.files.list">2.2. User files list</a></span></dt>
+                  </dl>
+               </dd>
+               <dt><span class="section"><a href="chapter.files.and.directories.html#application.files">3. Application files</a></span></dt>
+            </dl>
+         </div>
+         <p><span class="application">OmegaT</span> works with three types of
+              files.
+         </p>
+         <div class="itemizedlist">
+            <ul class="itemizedlist" type="disc">
+               <li class="listitem">
+                  <p>Translation project files: These constitute a translation project.
+                           Losing them may affect the project's integrity and your ability to
+                           complete a job. Project files are the most important files in
+                           <span class="application">OmegaT</span>. They are the files you deal with on a
+                           daily basis while translating.
+                  </p>
+               </li>
+            </ul>
+         </div>
+         <div class="itemizedlist">
+            <ul class="itemizedlist" type="disc">
+               <li class="listitem">
+                  <p>User settings files: These are created when OmegaT's behavior is
+                           modified by user preference settings. Losing them usually results in
+                           OmegaT reverting to its "factory settings". This can sometimes cause a
+                           little trouble when you are in the middle of a translation.
+                  </p>
+               </li>
+            </ul>
+         </div>
+         <div class="itemizedlist">
+            <ul class="itemizedlist" type="disc">
+               <li class="listitem">
+                  <p>Application files: These are included in the package you download.
+                           Most of them are required in order for OmegaT to function properly. If
+                           for some reason these files are lost or corrupted, simply download
+                           and/or reinstall OmegaT to restore them all.
+                  </p>
+               </li>
+            </ul>
+         </div>
+         <div class="section" title="1. Translation project files">
+            <div class="titlepage">
+               <div>
+                  <div>
+                     <h2 class="title" style="clear: both"><a name="translation.project.files"></a>1. Translation project files
+                     </h2>
+                  </div>
+               </div>
+            </div>
+            <p>An <span class="application">OmegaT</span> translation project consists of
+                   a number of files and directories.
+            </p>
+            <div class="section" title="1.1. Translation project files location">
+               <div class="titlepage">
+                  <div>
+                     <div>
+                        <h3 class="title"><a name="translation.project.files.location"></a>1.1. <a class="indexterm" name="d0e4662"></a>Translation project files location
+                        </h3>
+                     </div>
+                  </div>
+               </div>
+               <p>When you create a translation project, OmegaT automatically
+                        creates a list of folders that will later serve as files repositories,
+                        and a number of files that are used to set certain project preferences
+                        and to hold the project translation memory. By default, a translation
+                        project's folders are all grouped under the main project folder.
+                        Alternate locations for some of the folders can be chosen at project
+                        creation or during the translation. It is therefore possible to select
+                        existing folders or create folders in locations that reflect your work
+                        flow and project management habits. To change the location of folders
+                        after a project has been created, open <span class="guimenuitem">Project >
+                           Properties...</span> in the menu or with
+                        <span class="guibutton">Ctrl+E</span> and make the necessary changes.
+               </p>
+            </div>
+            <div class="section" title="1.2. Translation project files list">
+               <div class="titlepage">
+                  <div>
+                     <div>
+                        <h3 class="title"><a name="translation.project.files.list"></a>1.2. <a class="indexterm" name="d0e4678"></a>Translation project files list
+                        </h3>
+                     </div>
+                  </div>
+               </div>
+               <p>When you open a file dialog opened by
+                        <span class="application">OmegaT</span>, a translation project will look like
+                        a file with an <span class="application">OmegaT</span> icon associated with
+                        it. From within a file manager, however, a translation project looks and
+                        acts just like any other folder.
+               </p>
+               <div class="figure"><a name="OmegaT.projects.and.subdirectories"></a><p class="title"><b>Figure 8.1. OmegaT projects and subdirectories</b></p>
+                  <div class="figure-contents">
+                     <div class="mediaobject"><img src="images/OmegaT_projects_and_subdirectories.png" alt="OmegaT projects and subdirectories"></div>
+                  </div>
+               </div><br class="figure-break"><p>Double clicking the item with the OmegaT icon is sufficient to
+                        open the project. A translation project <span class="bold"><strong>Example_Project</strong></span> created with the default settings
+                        will be created as a new subfolder with the following structure:
+               </p>
+               <div class="figure"><a name="OmegaT.project"></a><p class="title"><b>Figure 8.2. OmegaT project</b></p>
+                  <div class="figure-contents">
+                     <div class="mediaobject"><img src="images/Omegatproject.png" alt="OmegaT project"></div>
+                  </div>
+               </div><br class="figure-break"><p>All the subdirectories will be initially empty.</p>
+            </div>
+            <div class="section" title="1.3. Omegat">
+               <div class="titlepage">
+                  <div>
+                     <div>
+                        <h3 class="title"><a name="folder.OmegaT"></a>1.3. Omegat<a class="indexterm" name="d0e4714"></a></h3>
+                     </div>
+                  </div>
+               </div>
+               <p>The <span class="bold"><strong>omegat</strong></span> subfolder contains at
+                        least one and possibly several other files. The most important file is
+                        the translation memory file, <span class="bold"><strong>project_save.tmx
+                              </strong></span>(...). The project_save.tmx file is the working translation
+                        memory for the project. With the autosave function activated, it will be
+                        automatically updated when you quit. It is the translation memory used
+                        to create the translated files. A number of TMX files with names of the
+                        form <span class="bold"><strong>project_save.tmx.<date and
+                              time>.bak</strong></span> (...) are added progressively to this subfolder
+                        as the translation progresses. They serve as a backup for the project
+                        TM. A new one of theses is added each time you reopen a project, thus
+                        reflecting its contents before the current session has changed
+                        them
+               </p>
+               <p>The project <a class="indexterm" name="d0e4732"></a><span class="bold"><strong>stats.txt</strong></span> file (...)
+                        contains the statistics of the current project and can be opened in a
+                        spreadsheet application to display segment and word count information.
+                        The file contains the number of segments for each file to be translated
+                        - Total and Remaining - the number of Unique segments per file, the
+                        number of Unique words and the number of Unique Characters with /
+                        without spaces per file,
+               </p>
+               <p>Note that Unique segments per file provides the number of unique
+                        segments in a given file that do not appear anywhere else in the
+                        project. The unique words or characters per file have a similar
+                        definition. Note that in a multi-file project the sum of unique segments
+                        per file will not necessary be equal to the grand total of unique
+                        segments in the project.
+               </p>
+               <p>The<span class="bold"><strong> <a class="indexterm" name="d0e4746"></a>Ignore_words.txt</strong></span> and <span class="bold"><strong>learned_word.txt</strong></span>files are used by the spell
+                        checker. Note that they are specific for a given project, so if you have
+                        already amassed words you wish the spell checker to ignore / accept, you
+                        just need to copy the corresponding two files into the 
+                        <code class="filename">omegat</code>subfolder of your current project.
+               </p>
+            </div>
+            <div class="section" title="1.4. Source files">
+               <div class="titlepage">
+                  <div>
+                     <div>
+                        <h3 class="title"><a name="folder.source"></a>1.4. Source files<a class="indexterm" name="d0e4762"></a></h3>
+                     </div>
+                  </div>
+               </div>
+               <p>The source subfolder is the location for project files that need
+                        to be translated. You can specify a new subfolder and add the files to
+                        it later. Note that the structure of the source subfolder may take any
+                        form you like. If the files to be translated are parts of a tree
+                        structure (as in a website), you need only specify the top-level
+                        subfolder and OmegaT will maintain the entire contents, while keeping
+                        the tree structure intact.
+               </p>
+            </div>
+            <div class="section" title="1.5. Target files">
+               <div class="titlepage">
+                  <div>
+                     <div>
+                        <h3 class="title"><a name="folder.target"></a>1.5. Target files<a class="indexterm" name="d0e4772"></a></h3>
+                     </div>
+                  </div>
+               </div>
+               <p>When <span class="guimenu">Project</span> → <span class="guimenuitem">Create Translated Documents</span> (<span class="shortcut"><strong><span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>D</strong></span></strong></span>) is selected, all the files within the
+                        <code class="filename">source</code> directory, whether translated or not, are
+                        reproduced in the target directory with the same folder hierarchy to
+                        reflect the current state of the translation. In practical terms, OmegaT
+                        merges the translation information saved in <span class="bold"><strong>/omegat/project_save,tmx</strong></span> with the source
+                        documents to produce the target contents.
+               </p>
+            </div>
+            <div class="section" title="1.6. omegat.project">
+               <div class="titlepage">
+                  <div>
+                     <div>
+                        <h3 class="title"><a name="file.omegat.project"></a>1.6. omegat.project<a class="indexterm" name="d0e4800"></a></h3>
+                     </div>
+                  </div>
+               </div>
+               <p><span class="application">OmegaT</span> automatically creates this file
+                        when the project is created and contains the project parameters. The
+                        parameters included in this file can be modified from the Project
+                        properties window.
+               </p>
+               <p><code class="filename">project_name-omegat.tmx (...)</code></p>
+               <p><code class="filename">project_name-level1.tmx</code></p>
+               <p><code class="filename">project_name-level2.tmx</code></p><a class="indexterm" name="d0e4818"></a><p>These files contain the source and target segments corresponding
+                        to the contents of the <code class="filename">source</code> folder at the time of
+                        their creation (usually when the translated files have been created).
+                        They constitute the exported translation memories that you can use in
+                        future projects.
+               </p>
+            </div>
+         </div>
+         <div class="section" title="2. User files">
+            <div class="titlepage">
+               <div>
+                  <div>
+                     <h2 class="title" style="clear: both"><a name="user.files"></a>2. User files<a class="indexterm" name="d0e4831"></a></h2>
+                  </div>
+               </div>
+            </div>
+            <div class="section" title="2.1. User files location">
+               <div class="titlepage">
+                  <div>
+                     <div>
+                        <h3 class="title"><a name="d0e4836"></a>2.1. User files location <a class="indexterm" name="d0e4839"></a></h3>
+                     </div>
+                  </div>
+               </div>
+               <p>User files are stored in a separate location where they can be
+                        accessed by any version of <span class="application">OmegaT</span>. The
+                        location depends upon the platform you use:
+               </p>
+               <div class="informaltable">
+                  <table border="1">
+                     <colgroup>
+                        <col width="100" align="left">
+                        <col>
+                     </colgroup>
+                     <tbody>
+                        <tr>
+                           <td align="left">Windows 2000 and XP</td>
+                           <td align="left"><code class="literal">Documents and Settings\<User
+                                               Name>\Application
+                                               Data\<span class="application">OmegaT</span></code></td>
+                        </tr>
+                        <tr>
+                           <td align="left">Windows Vista and 7</td>
+                           <td align="left"><code class="literal">Users\<User
+                                               Name>\AppData\Roaming\<span class="application">OmegaT</span></code></td>
+                        </tr>
+                        <tr>
+                           <td align="left">Windows other</td>
+                           <td align="left"><code class="literal"><Something>\<span class="application">OmegaT</span></code>
+                                            (<Something> corresponds to the location of the "home"
+                                            folder as determined by Java)
+                           </td>
+                        </tr>
+                        <tr>
+                           <td align="left">Linux/Solaris/FreeBSD</td>
+                           <td align="left"><code class="literal"><User Home>/.omegat </code>(.omegat is
+                                            a directory, the dot preceding its name makes it invisible
+                                            unless you type ls -a or an equivalent command)
+                           </td>
+                        </tr>
+                        <tr>
+                           <td align="left">MAC OSX</td>
+                           <td align="left"><code class="filename"><User
+                                               Home>/Library/Preferences/<span class="application">OmegaT</span></code></td>
+                        </tr>
+                        <tr>
+                           <td align="left">Other</td>
+                           <td align="left"><code class="filename"><User Home></code></td>
+                        </tr>
+                     </tbody>
+                  </table>
+               </div>
+            </div>
+            <div class="section" title="2.2. User files list">
+               <div class="titlepage">
+                  <div>
+                     <div>
+                        <h3 class="title"><a name="user.files.list"></a>2.2. User files list<a class="indexterm" name="d0e4904"></a></h3>
+                     </div>
+                  </div>
+               </div>
+               <div class="informaltable">
+                  <table border="1">
+                     <colgroup>
+                        <col width="100" align="left">
+                        <col>
+                     </colgroup>
+                     <tbody>
+                        <tr>
+                           <td align="left">logs/OmegaT.log</td>
+                           <td align="left">This file records Java error messages while
+                                            <span class="application">OmegaT</span> is running. Should OmegaT
+                                            appear to be behaving erratically, it is important to include
+                                            this file or the relevant part in any bug report
+                           </td>
+                        </tr>
+                        <tr>
+                           <td align="left">omegat.prefs</td>
+                           <td align="left">An xml file with all the GUI accessible option
+                                            settings
+                           </td>
+                        </tr>
+                        <tr>
+                           <td align="left">uiLayout.xml</td>
+                           <td align="left">An xml file with window position data</td>
+                        </tr>
+                        <tr>
+                           <td align="left">filters.xml</td>
+                           <td align="left">An xml file with all the data set by the file filter
+                                            preferences
+                           </td>
+                        </tr>
+                        <tr>
+                           <td align="left">segmentation.conf</td>
+                           <td align="left">An xml file containing segmentation rules</td>
+                        </tr>
+                     </tbody>
+                  </table>
+               </div>
+            </div>
+         </div>
+         <div class="section" title="3. Application files">
+            <div class="titlepage">
+               <div>
+                  <div>
+                     <h2 class="title" style="clear: both"><a name="application.files"></a>3. <a class="indexterm" name="d0e4943"></a>Application files<a class="indexterm" name="d0e4949"></a></h2>
+                  </div>
+               </div>
+            </div>
+            <p>OmegaT is supplied as a package that can be downloaded from
+                   SourceForge. This chapter will consider the platform-independent package
+                   that contains the application in a standard Java form. Other packages
+                   include a Linux .tar package, a Windows installer – with or without a Java
+                   Runtime Environment –, a MacOSX installer, and a source code package for
+                   developers. The platform-independent package can be used on any platform
+                   with a working Java 1.5 runtime environment, including the platforms for
+                   which a specific package also exists. The platform-independent package is
+                   supplied as a compressed file (zip or tar archive) that you must extract
+                   to the folder of your choice for installation. The file can usually be
+                   extracted by double-clicking on the downloaded package. Once the archive
+                   has been extracted, a folder containing the following contents is
+                   created:
+            </p>
+            <div class="informaltable">
+               <table border="1">
+                  <colgroup>
+                     <col width="100" align="left">
+                     <col>
+                  </colgroup>
+                  <tbody>
+                     <tr>
+                        <td align="left"><span class="bold"><strong>File/ subfolder</strong></span></td>
+                        <td align="left"><span class="bold"><strong>Contents</strong></span></td>
+                     </tr>
+                     <tr>
+                        <td align="left">/docs/</td>
+                        <td align="left">All the user manual files can be found in this folder. You
+                                       can open them in An Internet browser to obtain access to external
+                                       links.
+                        </td>
+                     </tr>
+                     <tr>
+                        <td align="left">/images/</td>
+                        <td align="left">Icons and logo graphics are included here.</td>
+                     </tr>
+                     <tr>
+                        <td align="left">/lib/</td>
+                        <td align="left">Contains Java files, necessary to the operation of
+                                       <span class="application">OmegaT</span>.
+                        </td>
+                     </tr>
+                     <tr>
+                        <td align="left">join.html</td>
+                        <td align="left">This is an ordinary html file that, when opened in your
+                                       Internet browser, directs you to the OmegaT user group hosted on
+                                       Yahoo Groups. Joining is not necessary, but will provide you with
+                                       access to additional services, such as files, questionnaires, and
+                                       the opportunity to take part in OmegaT-related discussions. The
+                                       group archives are public and can be viewed without subscription
+                                       to the group.
+                        </td>
+                     </tr>
+                     <tr>
+                        <td align="left"><code class="filename">changes.txt</code></td>
+                        <td align="left">A relatively detailed list of modifications between this
+                                       version and the preceding versions.
+                        </td>
+                     </tr>
+                     <tr>
+                        <td align="left"><code class="filename">license.txt</code></td>
+                        <td align="left">The GNU GENERAL PUBLIC LICENSE. This license allows you to
+                                       do certain things with <span class="application">OmegaT</span>,
+                                       including modifying and distributing it. If you are interested in
+                                       modifying or distributing <span class="application">OmegaT</span>, read
+                                       this document carefully and ensure you understand its implications
+                                       before doing anything. If in doubt, don't hesitate to ask project
+                                       members directly either by sending them an e-mail from the
+                                       SourceForge page or by sending a public mail to the user
+                                       group.
+                        </td>
+                     </tr>
+                     <tr>
+                        <td align="left"><code class="filename">doc-license.txt</code></td>
+                        <td align="left">The GNU GENERAL PUBLIC LICENSE. This license covers the
+                                       documentation. See above.
+                        </td>
+                     </tr>
+                     <tr>
+                        <td align="left"><code class="filename">readme.txt</code></td>
+                        <td align="left">This file is very important and you should make sure you
+                                       read it before launching OmegaT. It includes general information
+                                       on OmegaT, where to find more information, how to contribute, etc.
+                                       It has been translated into a number of languages.
+                        </td>
+                     </tr>
+                     <tr>
+                        <td align="left"><span class="application">OmegaT</span></td>
+                        <td align="left">A text file containing two lines:</td>
+                     </tr>
+                     <tr>
+                        <td align="left"> </td>
+                        <td align="left"><code class="literal">#!/bin/bash java</code></td>
+                     </tr>
+                     <tr>
+                        <td align="left"> </td>
+                        <td align="left"><code class="literal">java -jar
+                                          <span class="application">OmegaT</span>.jar $*</code></td>
+                     </tr>
+                     <tr>
+                        <td align="left"> </td>
+                        <td align="left">Linux and OSX users may find this file useful. Make it
+                                       executable (chmod +x OmegaT) from the command line after making
+                                       sure you are in the /OmegaT_2.3/ directory. You will then be able
+                                       to launch OmegaT by executing this file from the command
+                                       line
+                        </td>
+                     </tr>
+                     <tr>
+                        <td align="left"><span class="application">OmegaT</span>.bat
+                        </td>
+                        <td align="left">A batch file, used to launch
+                                       <span class="application">OmegaT</span> from the Windows command line.
+                                       It contains just the following line:
+                        </td>
+                     </tr>
+                     <tr>
+                        <td align="left"> </td>
+                        <td align="left"><code class="literal">java -jar <span class="application">OmegaT</span>.jar
+                                          %*</code></td>
+                     </tr>
+                     <tr>
+                        <td align="left"><span class="application">OmegaT</span>.jar
+                        </td>
+                        <td align="left">The main OmegaT application. To launch OmegaT, you must
+                                       launch this file either from the command line or from your file
+                                       manager, usually by double-clicking it.
+                        </td>
+                     </tr>
+                  </tbody>
+               </table>
+            </div>
+         </div>
+      </div>
+      <div class="navfooter">
+         <hr>
+         <table width="100%" summary="Navigation footer">
+            <tr>
+               <td width="40%" align="left"><a accesskey="p" href="chapter.file.filters.html">Prev</a> 
+               </td>
+               <td width="20%" align="center"> </td>
+               <td width="40%" align="right"> <a accesskey="n" href="chapter.files.to.translate.html">Next</a></td>
+            </tr>
+            <tr>
+               <td width="40%" align="left" valign="top">Chapter 7. File Filters </td>
+               <td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td>
+               <td width="40%" align="right" valign="top"> Chapter 9. Files to translate</td>
+            </tr>
+         </table>
+      </div>
+   </body>
+</html>
\ No newline at end of file
diff --git a/docs/en/chapter.files.to.translate.html b/docs/en/chapter.files.to.translate.html
new file mode 100644
index 0000000..703fc1c
--- /dev/null
+++ b/docs/en/chapter.files.to.translate.html
@@ -0,0 +1,466 @@
+<html>
+   <head>
+      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+   
+      <title>Chapter 9. Files to translate</title>
+      <link rel="stylesheet" href="OmegaT.css" type="text/css">
+      <meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+      <link rel="home" href="index.html" title="OmegaT - User's Guide">
+      <link rel="up" href="index.html" title="OmegaT - User's Guide">
+      <link rel="prev" href="chapter.files.and.directories.html" title="Chapter 8. OmegaT Files and Directories">
+      <link rel="next" href="chapter.translation.editing.html" title="Chapter 10. Editing behavior">
+   </head>
+   <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+      <div class="navheader">
+         <table width="100%" summary="Navigation header">
+            <tr>
+               <th colspan="3" align="center">Chapter 9. Files to translate</th>
+            </tr>
+            <tr>
+               <td width="20%" align="left"><a accesskey="p" href="chapter.files.and.directories.html">Prev</a> 
+               </td>
+               <th width="60%" align="center"> </th>
+               <td width="20%" align="right"> <a accesskey="n" href="chapter.translation.editing.html">Next</a></td>
+            </tr>
+         </table>
+         <hr>
+      </div>
+      <div class="chapter" title="Chapter 9. Files to translate">
+         <div class="titlepage">
+            <div>
+               <div>
+                  <h2 class="title"><a name="chapter.files.to.translate"></a>Chapter 9. Files to translate
+                  </h2>
+               </div>
+            </div>
+         </div>
+         <div class="toc">
+            <dl>
+               <dt><span class="section"><a href="chapter.files.to.translate.html#file.formats">1. File formats</a></span></dt>
+               <dd>
+                  <dl>
+                     <dt><span class="section"><a href="chapter.files.to.translate.html#d0e5088">1.1. Plain text files</a></span></dt>
+                     <dt><span class="section"><a href="chapter.files.to.translate.html#d0e5148">1.2. Formatted text files</a></span></dt>
+                  </dl>
+               </dd>
+               <dt><span class="section"><a href="chapter.files.to.translate.html#other.file.formats">2. Other file formats</a></span></dt>
+               <dt><span class="section"><a href="chapter.files.to.translate.html#right.to.left.languages">3. Right to left languages</a></span></dt>
+               <dd>
+                  <dl>
+                     <dt><span class="section"><a href="chapter.files.to.translate.html#d0e5363">3.1. Mixing RTL and LTR strings in segments</a></span></dt>
+                     <dt><span class="section"><a href="chapter.files.to.translate.html#d0e5386">3.2. <span class="application">OmegaT</span> tags in RTL segments</a></span></dt>
+                     <dt><span class="section"><a href="chapter.files.to.translate.html#d0e5400">3.3. Creating translated RTL documents</a></span></dt>
+                  </dl>
+               </dd>
+            </dl>
+         </div>
+         <div class="section" title="1. File formats">
+            <div class="titlepage">
+               <div>
+                  <div>
+                     <h2 class="title" style="clear: both"><a name="file.formats"></a>1. File formats<a class="indexterm" name="d0e5074"></a><a class="indexterm" name="d0e5079"></a></h2>
+                  </div>
+               </div>
+            </div>
+            <p><span class="application">You can use OmegaT</span> to translate files in
+                   a number of file formats. There are basically two types of file formats,
+                   plain text and formatted text.
+            </p>
+            <div class="section" title="1.1. Plain text files">
+               <div class="titlepage">
+                  <div>
+                     <div>
+                        <h3 class="title"><a name="d0e5088"></a>1.1. Plain text files<a class="indexterm" name="d0e5091"></a><a class="indexterm" name="d0e5096"></a></h3>
+                     </div>
+                  </div>
+               </div>
+               <p>Plain text files contain text only, so their translation is as
+                        simple as typing the translation. There are several methods to specify
+                        the file's encoding so that its contents are not garbled when opened in
+                        <span class="application">OmegaT</span>. Such files do not contain any
+                        formatting information beyond the "white space" used to align text,
+                        indicate paragraphs or insert page breaks. They are not able to contain
+                        or retain information regarding the color, font etc of the text.
+                        Currently, <span class="application">OmegaT</span> supports the following
+                        plain text formats:<a class="indexterm" name="d0e5109"></a></p>
+               <div class="itemizedlist">
+                  <ul class="itemizedlist" type="disc">
+                     <li class="listitem">
+                        <p>ASCII text (.txt, etc.)</p>
+                     </li>
+                  </ul>
+               </div>
+               <div class="itemizedlist">
+                  <ul class="itemizedlist" type="disc">
+                     <li class="listitem">
+                        <p>Encoded text (*.UTF8)</p>
+                     </li>
+                  </ul>
+               </div>
+               <div class="itemizedlist">
+                  <ul class="itemizedlist" type="disc">
+                     <li class="listitem">
+                        <p>Java resource bundles (*.properties)</p>
+                     </li>
+                  </ul>
+               </div>
+               <div class="itemizedlist">
+                  <ul class="itemizedlist" type="disc">
+                     <li class="listitem">
+                        <p>PO files (*.po)</p>
+                     </li>
+                  </ul>
+               </div>
+               <div class="itemizedlist">
+                  <ul class="itemizedlist" type="disc">
+                     <li class="listitem">
+                        <p>INI (key=value) files (*.ini)</p>
+                     </li>
+                  </ul>
+               </div>
+               <div class="itemizedlist">
+                  <ul class="itemizedlist" type="disc">
+                     <li class="listitem">
+                        <p>DTD files (*.DTD)</p>
+                     </li>
+                     <li class="listitem">
+                        <p>DocuWiki files (*.txt)</p>
+                     </li>
+                  </ul>
+               </div>
+               <p>Other plain text file types can be handled by
+                        <span class="application">OmegaT</span> by associating their file extension to
+                        a supported file type (for example, .pod files can be associated to the
+                        ASCII text filter) and by pre-processing them with specific segmentation
+                        rules.
+               </p>
+            </div>
+            <div class="section" title="1.2. Formatted text files">
+               <div class="titlepage">
+                  <div>
+                     <div>
+                        <h3 class="title"><a name="d0e5148"></a>1.2. Formatted text files<a class="indexterm" name="d0e5151"></a><a class="indexterm" name="d0e5158"></a></h3>
+                     </div>
+                  </div>
+               </div>
+               <p>Formatted text files contain information such as font type, size,
+                        color etc. as well as text. They are commonly created in word processors
+                        or HTML editors. Such file formats are designed to hold formatting
+                        information. The formatting information can be as simple as “this is
+                        bold”, or as complex as table data with different font sizes, colors,
+                        positions, etc. In most translation jobs, it is considered important for
+                        the formatting of the original text to be retained in the translation.
+                        OmegaT allows you to do this by marking the characters/words that have a
+                        special formatting with easy-to-handle tags. Simplifying the original
+                        text formatting greatly contributes to reducing the number of tags.
+                        Where possible, unifying the fonts, font sizes, colors, etc. used in the
+                        document simplifies the task of translation and reduces the possible
+                        number of tag errors. Each file type is handled differently in OmegaT.
+                        Specific behavior can be set up in the file filters. At the time of
+                        writing, OmegaT supports the following formatted text formats:
+                        formats:<a class="indexterm" name="d0e5165"></a></p>
+               <div class="itemizedlist">
+                  <ul class="itemizedlist" type="disc">
+                     <li class="listitem">
+                        <p>OpenOffice.org / OpenDocument (*.ods, *.ots, *.odt, *.ott,
+                                       *.odp, *.otp)
+                        </p>
+                     </li>
+                  </ul>
+               </div>
+               <div class="itemizedlist">
+                  <ul class="itemizedlist" type="disc">
+                     <li class="listitem">
+                        <p>Microsoft Office Open XML (*.docx, *.dotx, *.xlsx, *.xltx,
+                                       *.pptx)
+                        </p>
+                     </li>
+                  </ul>
+               </div>
+               <div class="itemizedlist">
+                  <ul class="itemizedlist" type="disc">
+                     <li class="listitem">
+                        <p>(X)HTML (*.html, *.xhtml,*.xht)</p>
+                     </li>
+                  </ul>
+               </div>
+               <div class="itemizedlist">
+                  <ul class="itemizedlist" type="disc">
+                     <li class="listitem">
+                        <p>HTML Help Compiler (*.hhc, *.hhk)</p>
+                     </li>
+                  </ul>
+               </div>
+               <div class="itemizedlist">
+                  <ul class="itemizedlist" type="disc">
+                     <li class="listitem">
+                        <p>DocBook (*.xml)</p>
+                     </li>
+                  </ul>
+               </div>
+               <div class="itemizedlist">
+                  <ul class="itemizedlist" type="disc">
+                     <li class="listitem">
+                        <p>XLIFF (*.xlf, *.xliff, *.sdlxliff) - monolingual, i.e. one language
+                                       combination possible for a given project
+                        </p>
+                     </li>
+                  </ul>
+               </div>
+               <div class="itemizedlist">
+                  <ul class="itemizedlist" type="disc">
+                     <li class="listitem">
+                        <p>QuarkXPress CopyFlowGold (*.tag, *.xtg)</p>
+                     </li>
+                  </ul>
+               </div>
+               <div class="itemizedlist">
+                  <ul class="itemizedlist" type="disc">
+                     <li class="listitem">
+                        <p>SubRip title files (*.srt)</p>
+                     </li>
+                  </ul>
+               </div>
+               <div class="itemizedlist">
+                  <ul class="itemizedlist" type="disc">
+                     <li class="listitem">
+                        <p>ResX files (*.resx)</p>
+                     </li>
+                  </ul>
+               </div>
+               <div class="itemizedlist">
+                  <ul class="itemizedlist" type="disc">
+                     <li class="listitem">
+                        <p>Android resource (*.xml)</p>
+                     </li>
+                  </ul>
+               </div>
+               <div class="itemizedlist">
+                  <ul class="itemizedlist" type="disc">
+                     <li class="listitem">
+                        <p>LaTex (*.tex, *.latex)</p>
+                     </li>
+                     <li class="listitem">
+                        <p>Help (*.xml) and Manual (*.hmxp) files</p>
+                     </li>
+                     <li class="listitem">
+                        <p>Typo3 LocManager (*.xml)</p>
+                     </li>
+                  </ul>
+               </div>
+               <div class="itemizedlist">
+                  <ul class="itemizedlist" type="disc">
+                     <li class="listitem">
+                        <p>WiX Localization (*.wxl)</p>
+                     </li>
+                     <li class="listitem">
+                        <p>Iceni Infix (*.xml)</p>
+                     </li>
+                     <li class="listitem">
+                        <p>Flash XML export (*.xml)</p>
+                     </li>
+                  </ul>
+               </div>
+               <p>Other formatted text file types may also be handled by OmegaT by
+                        associating their file extensions to a supported file type, assuming
+                        that the corresponding segmentation rules will segment them
+                        correctly.
+               </p>
+            </div>
+         </div>
+         <div class="section" title="2. Other file formats">
+            <div class="titlepage">
+               <div>
+                  <div>
+                     <h2 class="title" style="clear: both"><a name="other.file.formats"></a>2. Other file formats<a class="indexterm" name="d0e5238"></a><a class="indexterm" name="d0e5243"></a></h2>
+                  </div>
+               </div>
+            </div>
+            <p>Other plain text or formatted text file formats suitable for
+                   processing in OmegaT may also exist.
+            </p>
+            <p><a class="indexterm" name="d0e5251"></a>External tools can be used to convert files to supported
+                   formats. The translated files will then need to be converted back to the
+                   original format. For example, if you have an outdated Microsoft Word
+                   version, that does not handle the ODT format, here's a round trip for Word
+                   files with the DOC extension:
+            </p>
+            <div class="itemizedlist">
+               <ul class="itemizedlist" type="disc">
+                  <li class="listitem">
+                     <p>import the file into OpenOffice writer</p>
+                  </li>
+               </ul>
+            </div>
+            <div class="itemizedlist">
+               <ul class="itemizedlist" type="disc">
+                  <li class="listitem">
+                     <p>save the file in ODT format</p>
+                  </li>
+               </ul>
+            </div>
+            <div class="itemizedlist">
+               <ul class="itemizedlist" type="disc">
+                  <li class="listitem">
+                     <p>translate it into the target ODT file</p>
+                  </li>
+               </ul>
+            </div>
+            <div class="itemizedlist">
+               <ul class="itemizedlist" type="disc">
+                  <li class="listitem">
+                     <p>load the target file in OpenOffice Writer</p>
+                  </li>
+               </ul>
+            </div>
+            <div class="itemizedlist">
+               <ul class="itemizedlist" type="disc">
+                  <li class="listitem">
+                     <p>save the file as a DOC file</p>
+                  </li>
+               </ul>
+            </div>
+            <p>The quality of formatting of the translated file will depend on the
+                   quality of the round-trip conversion. Before proceeding with such
+                   conversions, be sure to test all options. Check the <a class="ulink" href="http://www.omegat.org" target="_top">OmegaT home page</a> for an up-to-date listing of auxiliary
+                   translation tools.
+            </p>
+         </div>
+         <div class="section" title="3. Right to left languages">
+            <div class="titlepage">
+               <div>
+                  <div>
+                     <h2 class="title" style="clear: both"><a name="right.to.left.languages"></a>3. Right to left languages<a class="indexterm" name="d0e5285"></a><a class="indexterm" name="d0e5288"></a><a class="indexterm" name="d0e5293"></a></h2>
+                  </div>
+               </div>
+            </div>
+            <p>Justification of source and target segments depends upon the project
+                   languages. By default, left justification is used for Left-To-Right (LTR)
+                   languages and right justification for Right-To-Left (RTL) languages. You
+                   can toggle between different display modes by pressing <span class="keycap"><strong>Shift</strong></span>+<span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>O</strong></span> (this is the letter O and not the numeral 0). The <span class="keycap"><strong>Shift</strong></span>+<span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>O</strong></span> toggle has three states:
+            </p>
+            <div class="itemizedlist">
+               <ul class="itemizedlist" type="disc">
+                  <li class="listitem">
+                     <p>default justification, that is as defined by the language</p>
+                  </li>
+               </ul>
+            </div>
+            <div class="itemizedlist">
+               <ul class="itemizedlist" type="disc">
+                  <li class="listitem">
+                     <p>left justification</p>
+                  </li>
+               </ul>
+            </div>
+            <div class="itemizedlist">
+               <ul class="itemizedlist" type="disc">
+                  <li class="listitem">
+                     <p>right justification</p>
+                  </li>
+               </ul>
+            </div>
+            <p>Using the RTL mode in <span class="application">OmegaT</span> has no
+                   influence whatsoever on the display mode of the translated documents
+                   created in <span class="application">OmegaT</span>. The display mode of the
+                   translated documents must be modified within the application (such as
+                   Microsoft Word) commonly used to display or modify them (check the
+                   relevant manuals for details). Using <span class="keycap"><strong>Shift</strong></span>+<span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>O</strong></span> causes both text input and display in
+                   <span class="application">OmegaT</span> to change. It can be used separately for
+                   all three panes (Editor, Fuzzy Matches and Glossary) by clicking on the
+                   pane and toggling the display mode. It can also be used in all the input
+                   fields found in <span class="application">OmegaT</span> - in the search window,
+                   for segmentation rules etc. 
+            </p>
+            <p>Mac OS X users, note: use <span class="keycap"><strong>Shift</strong></span>+<span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>O</strong></span> shortcut and <span class="bold"><strong>not
+                         </strong></span>cmd+Ctrl+O.
+            </p>
+            <div class="section" title="3.1. Mixing RTL and LTR strings in segments">
+               <div class="titlepage">
+                  <div>
+                     <div>
+                        <h3 class="title"><a name="d0e5363"></a>3.1. Mixing RTL and LTR strings in segments<a class="indexterm" name="d0e5366"></a><a class="indexterm" name="d0e5371"></a><a class="indexterm" name="d0e5376"></a></h3>
+                     </div>
+                  </div>
+               </div>
+               <p>When writing purely RTL text, the default (LTR) view may be used.
+                        In many cases, however, it is necessary to embed LTR text in RTL text.
+                        For example, in OmegaT tags, product names that must be left in the LTR
+                        source language, place holders in localization files, and numbers in
+                        text. In cases like these it becomes necessary to switch to RTL mode, so
+                        that the RTL (in fact bidirectional) text is displayed correctly. It
+                        should be noted that when <span class="application">OmegaT</span> is in RTL
+                        mode, both source and target are displayed in RTL mode. This means that
+                        if the source language is LTR and the target language is RTL, or vice
+                        versa, it may be necessary to toggle back and forth between RTL and LTR
+                        modes to view the source and enter the target easily in their respective
+                        modes.
+               </p>
+            </div>
+            <div class="section" title="3.2. OmegaT tags in RTL segments">
+               <div class="titlepage">
+                  <div>
+                     <div>
+                        <h3 class="title"><a name="d0e5386"></a>3.2. <span class="application">OmegaT</span> tags in RTL segments<a class="indexterm" name="d0e5391"></a></h3>
+                     </div>
+                  </div>
+               </div>
+               <p>As stated above, OmegaT tags are LTR strings. When translating
+                        between RTL and LTR languages, correctly reading the tags from the
+                        source and entering them properly in the target may require the
+                        translator to toggle between LTR and RTL modes numerous times.
+               </p>
+               <p>If the document allows, the translator is strongly encouraged to
+                        remove style information from the original document so that as few tags
+                        as possible appear in the OmegaT interface. Follow the indications given
+                        in Hints for tags management. Frequently validate tags (see Tag
+                        validation) and produce translated documents (see below and Menu) at
+                        regular intervals to make it easier to catch any problems that arise. A
+                        hint: translating a plain text version of the text and adding the
+                        necessary style in the relevant application at a later stage may turn
+                        out to be less hassle..
+               </p>
+            </div>
+            <div class="section" title="3.3. Creating translated RTL documents">
+               <div class="titlepage">
+                  <div>
+                     <div>
+                        <h3 class="title"><a name="d0e5400"></a>3.3. Creating translated RTL documents<a class="indexterm" name="d0e5403"></a><a class="indexterm" name="d0e5408"></a><a class="indexterm" name="d0e5413"></a></h3>
+                     </div>
+                  </div>
+               </div>
+               <p>When the translated document is created, its display direction
+                        will be the same as that of the original document. If the original
+                        document was LTR, the display direction of the target document must be
+                        changed manually to RTL in its viewing application. Each output format
+                        has specific ways of dealing with RTL display; check the relevant
+                        application manuals for details.
+               </p>
+               <p>To avoid changing the target files display parameters each time
+                        the files are opened, it may be possible to change the source file
+                        display parameters such that such parameters are inherited by the target
+                        files. Such modifications are possible in OpenOffice.org files for
+                        example.
+               </p>
+            </div>
+         </div>
+      </div>
+      <div class="navfooter">
+         <hr>
+         <table width="100%" summary="Navigation footer">
+            <tr>
+               <td width="40%" align="left"><a accesskey="p" href="chapter.files.and.directories.html">Prev</a> 
+               </td>
+               <td width="20%" align="center"> </td>
+               <td width="40%" align="right"> <a accesskey="n" href="chapter.translation.editing.html">Next</a></td>
+            </tr>
+            <tr>
+               <td width="40%" align="left" valign="top">Chapter 8. <span class="application">OmegaT</span> Files and Directories 
+               </td>
+               <td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td>
+               <td width="40%" align="right" valign="top"> Chapter 10. Editing behavior</td>
+            </tr>
+         </table>
+      </div>
+   </body>
+</html>
\ No newline at end of file
diff --git a/docs/en/chapter.font.html b/docs/en/chapter.font.html
new file mode 100644
index 0000000..9dcda1a
--- /dev/null
+++ b/docs/en/chapter.font.html
@@ -0,0 +1,118 @@
+<html>
+   <head>
+      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+   
+      <title>Chapter 11. Font settings</title>
+      <link rel="stylesheet" href="OmegaT.css" type="text/css">
+      <meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+      <link rel="home" href="index.html" title="OmegaT - User's Guide">
+      <link rel="up" href="index.html" title="OmegaT - User's Guide">
+      <link rel="prev" href="chapter.translation.editing.html" title="Chapter 10. Editing behavior">
+      <link rel="next" href="chapter.formatted.text.html" title="Chapter 12. Working with formatted text">
+   </head>
+   <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+      <div class="navheader">
+         <table width="100%" summary="Navigation header">
+            <tr>
+               <th colspan="3" align="center">Chapter 11. Font settings</th>
+            </tr>
+            <tr>
+               <td width="20%" align="left"><a accesskey="p" href="chapter.translation.editing.html">Prev</a> 
+               </td>
+               <th width="60%" align="center"> </th>
+               <td width="20%" align="right"> <a accesskey="n" href="chapter.formatted.text.html">Next</a></td>
+            </tr>
+         </table>
+         <hr>
+      </div>
+      <div class="chapter" title="Chapter 11. Font settings">
+         <div class="titlepage">
+            <div>
+               <div>
+                  <h2 class="title"><a name="chapter.font"></a>Chapter 11. Font settings
+                  </h2>
+               </div>
+            </div>
+         </div>
+         <div class="toc">
+            <dl>
+               <dt><span class="section"><a href="chapter.font.html#section.font.settings">1. Font settings</a></span></dt>
+            </dl>
+         </div>
+         <div class="section" title="1. Font settings">
+            <div class="titlepage">
+               <div>
+                  <div>
+                     <h2 class="title" style="clear: both"><a name="section.font.settings"></a>1. Font settings
+                     </h2>
+                  </div>
+               </div>
+            </div><a class="indexterm" name="d0e5551"></a><p>In this dialog one can define the font used by
+                   OmegaT in the following windows:
+            </p>
+            <div class="itemizedlist">
+               <ul class="itemizedlist" type="disc">
+                  <li class="listitem">
+                     <p>OmegaT main window (except
+                        	the Dictionary viewer)
+                     </p>
+                  </li>
+                  <li class="listitem">
+                     <p>Search window</p>
+                  </li>
+                  <li class="listitem">
+                     <p>Tag validation window</p>
+                  </li>
+               </ul>
+            </div>
+            <p>The dialog can be accessed via the item in the application menu. The dialog contains:
+                   <span class="guimenu">Options</span> → <span class="guimenuitem">Font...</span>
+                   <a class="indexterm" name="d0e5574"></a>
+                   
+            </p>
+            <div class="itemizedlist">
+               <ul class="itemizedlist" type="disc">
+                  <li class="listitem">
+                     <p title="Font"><b>Font. </b>Drop-down to select one
+                                  of the fonts available on your machine.
+                     </p>
+                  </li>
+                  <li class="listitem">
+                     <p title="Size"><b>Size. </b>Edit to change font
+                                  size.
+                     </p>
+                  </li>
+               </ul>
+            </div>
+            <div class="itemizedlist">
+               <ul class="itemizedlist" type="disc">
+                  <li class="listitem">
+                     <p title="Sample text"><b>Sample text. </b>Immediate preview of the selected font.
+                     </p>
+                  </li>
+               </ul>
+            </div>
+            <p title="Note"><b>Note. </b>The display update can
+                     take more time if the number of displayed segments is
+                     important. Also, some fonts may have better coverage of your language pair.
+            </p>
+         </div>
+      </div>
+      <div class="navfooter">
+         <hr>
+         <table width="100%" summary="Navigation footer">
+            <tr>
+               <td width="40%" align="left"><a accesskey="p" href="chapter.translation.editing.html">Prev</a> 
+               </td>
+               <td width="20%" align="center"> </td>
+               <td width="40%" align="right"> <a accesskey="n" href="chapter.formatted.text.html">Next</a></td>
+            </tr>
+            <tr>
+               <td width="40%" align="left" valign="top">Chapter 10. Editing behavior </td>
+               <td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td>
+               <td width="40%" align="right" valign="top"> Chapter 12. Working with formatted text</td>
+            </tr>
+         </table>
+      </div>
+   </body>
+</html>
\ No newline at end of file
diff --git a/docs/en/chapter.formatted.text.html b/docs/en/chapter.formatted.text.html
new file mode 100644
index 0000000..6b09f17
--- /dev/null
+++ b/docs/en/chapter.formatted.text.html
@@ -0,0 +1,282 @@
+<html>
+   <head>
+      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+   
+      <title>Chapter 12. Working with formatted text</title>
+      <link rel="stylesheet" href="OmegaT.css" type="text/css">
+      <meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+      <link rel="home" href="index.html" title="OmegaT - User's Guide">
+      <link rel="up" href="index.html" title="OmegaT - User's Guide">
+      <link rel="prev" href="chapter.font.html" title="Chapter 11. Font settings">
+      <link rel="next" href="chapter.plain.text.html" title="Chapter 13. Working with plain text">
+   </head>
+   <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+      <div class="navheader">
+         <table width="100%" summary="Navigation header">
+            <tr>
+               <th colspan="3" align="center">Chapter 12. Working with formatted text</th>
+            </tr>
+            <tr>
+               <td width="20%" align="left"><a accesskey="p" href="chapter.font.html">Prev</a> 
+               </td>
+               <th width="60%" align="center"> </th>
+               <td width="20%" align="right"> <a accesskey="n" href="chapter.plain.text.html">Next</a></td>
+            </tr>
+         </table>
+         <hr>
+      </div>
+      <div class="chapter" title="Chapter 12. Working with formatted text">
+         <div class="titlepage">
+            <div>
+               <div>
+                  <h2 class="title"><a name="chapter.formatted.text"></a>Chapter 12. Working with formatted text<a class="indexterm" name="d0e5608"></a><a class="indexterm" name="d0e5613"></a></h2>
+               </div>
+            </div>
+         </div>
+         <div class="toc">
+            <dl>
+               <dt><span class="section"><a href="chapter.formatted.text.html#formatting.tags">1. Formatting tags</a></span></dt>
+               <dt><span class="section"><a href="chapter.formatted.text.html#tag.operations">2. Tag operations</a></span></dt>
+               <dt><span class="section"><a href="chapter.formatted.text.html#tag.group.nesting">3. Tag group nesting</a></span></dt>
+               <dt><span class="section"><a href="chapter.formatted.text.html#tag.group.overlapping">4. Tag group overlapping</a></span></dt>
+               <dt><span class="section"><a href="chapter.formatted.text.html#tag.group.validation">5. Tag group validation</a></span></dt>
+               <dt><span class="section"><a href="chapter.formatted.text.html#hints.for.tag.management">6. Hints for tags management</a></span></dt>
+            </dl>
+         </div>
+         <p>Formatting information present in the source file usually needs to be
+            reproduced in the target file. The in-line formatting information made
+            possible by the supported formats (in particular DocBook, HTML, XHTML, Open
+            Document (OpenOffice.org) and Office Open XML (MS Office 2007 and later) at
+              the time of writing) is presented as tags in OmegaT. Normally tags are
+              ignored when considering the similarity between different texts for matching
+              purposes. Tags reproduced in the translated segment will be present in the
+              translated document.
+         </p>
+         <div class="section" title="1. Formatting tags">
+            <div class="titlepage">
+               <div>
+                  <div>
+                     <h2 class="title" style="clear: both"><a name="formatting.tags"></a>1. Formatting tags<a class="indexterm" name="d0e5623"></a></h2>
+                  </div>
+               </div>
+            </div>
+            <p><a class="indexterm" name="d0e5627"></a><span class="bold"><strong>Tag
+                         naming:</strong></span></p>
+            <p>The tags consist of one to three characters and a
+                   number. Unique numbering allows tags, corresponding to each other to be
+                   grouped together and differentiates between tags, that have the same
+                   shortcut character, but are in fact different. The shortcut characters
+                   used try to reflect the underlying meaning of the tag (e.g. b for bold, i
+                   for italics, etc.)
+            </p>
+            <p><a class="indexterm" name="d0e5637"></a><span class="bold"><strong>Tag
+                         numbering:</strong></span></p>
+            <p>Tags are numbered incrementally by tag group. "Tag
+                   groups" in this context are a single tag (such as <i0> and
+                   </i0>). Within a segment, the first group (pair or single) receives
+                   the number 0, the second the number 1 etc. The first example below has 3
+                   tag groups (a pair, a single, and then another pair), the second example
+                   has one group only (a pair).
+            </p>
+            <p><a class="indexterm" name="d0e5647"></a><span class="bold"><strong>Pairs and
+                         singles:</strong></span></p>
+            <p>Tags are always either singles or paired. Single tags
+                   indicate formatting information that does not affect the surrounding text
+                   (an extra space or line break for example).
+            </p>
+            <p><code class="literal"><b0><Ctr+N></b0>,
+                      <br1><b2><Enter></b2><segment 2132>
+                      </code></p>
+            <p><br1> is a single tag and does not affect any
+                   surrounding text. Paired tags usually indicate style information that
+                   applies to the text between the opening tag and the closing tag of a pair.
+                   <b0> and </b0> below are paired and affect the text log.txt.
+                   Note that the opening tag must always come before the corresponding
+                   closing tag:
+            </p>
+            <p><<code class="literal">Log file
+                      (<b0>log.txt</b0>) for tracking operations and 
+                      errors.<segment 3167></code></p>
+            <p><span class="application">OmegaT</span> creates its tags before the
+                   process of sentence segmenting. Depending upon the segmenting rules, the
+                   pair of tags may get separated into two consecutive segments and the tag
+                   validation will err on the side of caution and mark the two
+                   segments.
+            </p>
+         </div>
+         <div class="section" title="2. Tag operations">
+            <div class="titlepage">
+               <div>
+                  <div>
+                     <h2 class="title" style="clear: both"><a name="tag.operations"></a>2. Tag operations<a class="indexterm" name="d0e5672"></a></h2>
+                  </div>
+               </div>
+            </div>
+            <p>Care must be exercised with tags. If they are accidentally changed,
+                   the formatting of the final file may be corrupted. The basic rule is that
+                   the sequence of tags must be preserved in the same order. However, it is
+                   possible, if certain rules are strictly followed, to deviate from this
+                   basic rule.
+            </p>
+            <p><span class="bold"><strong><a class="indexterm" name="d0e5681"></a>Tag duplication: </strong></span></p>
+            <p>To duplicate tag groups, just copy them in the position of your
+                   choice. Keep in mind that in a pair group, the opening tag must come
+                   before the closing tag. The formatting represented by the group you have
+                   duplicated will be applied to both sections.
+            </p>
+            <p>Example:</p>
+            <p><code class="literal"><b0>This formatting</b0>
+                      is going to be duplicated here.<segment 0001> </code></p>
+            <p>After duplication:</p>
+            <p><code class="literal"><b0>This formatting</b0>
+                      has been <b0>duplicated here</b0>.<segment 0001>
+                      </code></p>
+            <p><span class="bold"><strong><a class="indexterm" name="d0e5701"></a>Tag group deletion:</strong></span></p>
+            <p>To delete tag groups, just remove them from the segment. Keep in
+                   mind that a pair group must have both its opening and its closing tag
+                   deleted to ensure that all traces of the formatting are properly erased,
+                   otherwise the translated file may become corrupted. By deleting a tag
+                   group you will remove the related formatting from the translated
+                   file.
+            </p>
+            <p>Example:</p>
+            <p><code class="literal"><b0>This formatting</b0> is
+                      going to be deleted.<segment 0001> </code></p>
+            <p>After deletion:</p>
+            <p><code class="literal">This formatting has been
+                      deleted.<segment 0001> </code></p>
+         </div>
+         <div class="section" title="3. Tag group nesting">
+            <div class="titlepage">
+               <div>
+                  <div>
+                     <h2 class="title" style="clear: both"><a name="tag.group.nesting"></a>3. Tag group nesting<a class="indexterm" name="d0e5722"></a></h2>
+                  </div>
+               </div>
+            </div>
+            <p>Modifying tag group order may result in the nesting of a tag group
+                   within another tag group. This is acceptable, provided the enclosing group
+                   totally encloses the enclosed group. In other words, when moving paired
+                   tags, ensure that both the opening and the closing tag are both either
+                   inside or outside other tag pairs, or the translated file may be corrupted
+                   and fail to open.
+            </p>
+            <p>Example:</p>
+            <p><code class="literal"><b0>Formatting</b0>
+                      <b1>one</b1> is going to be nested inside formatting
+                      zero.<segment 0001> </code></p>
+            <p>After nesting:</p>
+            <p><code class="literal"><b0>Formatting
+                      <b1>one</b1></b0> has been nested inside formatting
+                      zero.<segment 0001></code></p>
+         </div>
+         <div class="section" title="4. Tag group overlapping">
+            <div class="titlepage">
+               <div>
+                  <div>
+                     <h2 class="title" style="clear: both"><a name="tag.group.overlapping"></a>4. Tag group overlapping<a class="indexterm" name="d0e5742"></a></h2>
+                  </div>
+               </div>
+            </div>
+            <p>Overlapping is the result of bad manipulations of tag pairs and is
+                   guaranteed to result in formatting corruption and sometimes in the
+                   translated file not opening at all.
+            </p>
+            <p>Example:</p>
+            <p><code class="literal"><b0>Formatting</b0>
+                      <b1>one</b1> is going to be messed up.<segment 0001>
+                      </code></p>
+            <p>After a bad manipulation:</p>
+            <p><code class="literal"><b0>Formatting
+                      <b1>one</b0> </b1>is very messed up now.<end
+                      segment 0001></code></p>
+         </div>
+         <div class="section" title="5. Tag group validation">
+            <div class="titlepage">
+               <div>
+                  <div>
+                     <h2 class="title" style="clear: both"><a name="tag.group.validation"></a>5. Tag group validation<a class="indexterm" name="d0e5762"></a></h2>
+                  </div>
+               </div>
+            </div>
+            <p>The validate tags function detects changes to tag sequences (whether
+                   deliberate or accidental), and shows the affected segments. Launching this
+                   function – <span class="guimenuitem">Ctrl+T<a class="indexterm" name="d0e5771"></a></span> - opens a window containing all segments in
+                   the file containing suspected broken or bad tags in the translation.
+                   Repairing the tags and recreating the target documents is easy with the
+                   validate tags function. The window that opens when
+                   <span class="guimenuitem">Ctrl+T</span> is pressed features a 3-column table
+                   with a link to the segment, the original segment and the target
+                   segment
+            </p>
+            <div class="figure"><a name="tag.validation"></a><p class="title"><b>Figure 12.1. Tag validation entry</b></p>
+               <div class="figure-contents">
+                  <div class="mediaobject"><img src="images/TagValidation.png" alt="Tag validation entry"></div>
+               </div>
+            </div><br class="figure-break"><p>The tags are highlighted in bold blue for easy comparison between
+                   the original and the translated contents. Click on the link to activate
+                   the segment in the Editor. Correct the error if necessary (in the case
+                   above it is the missing <i2></i2> pair) and press
+                   <span class="guimenuitem">Ctrl+T</span> to return to the tag validation window
+                   to correct other errors. Tag errors are tag sequences in the translation
+                   in which the same tag order and number as in the original segment is not
+                   reproduced. Some tag manipulations are necessary and are benign, others
+                   will cause problems when the translated document is created.
+            </p>
+         </div>
+         <div class="section" title="6. Hints for tags management">
+            <div class="titlepage">
+               <div>
+                  <div>
+                     <h2 class="title" style="clear: both"><a name="hints.for.tag.management"></a>6. Hints for tags management<a class="indexterm" name="d0e5796"></a></h2>
+                  </div>
+               </div>
+            </div>
+            <p><span class="bold"><strong>Simplify the original text</strong></span></p>
+            <p>Tags generally represent formatting in some form of the original
+                   text. Simplifying the original formatting greatly contributes to reducing
+                   the number of tags. Where circumstances permit, unifying used fonts, font
+                   sizes, colors, etc. should be considered, as it could simplify the
+                   translation and reduce the potential for tag errors. Read the tag
+                   operations section to see what can be done with tags. Remember that if you
+                   find tags a problem in OmegaT and formatting is not extremely relevant for
+                   the current translation, removing tags may be the easiest way out of
+                   problems.
+            </p>
+            <p><span class="bold"><strong>Pay extra attention to tag
+                         pairs</strong></span></p>
+            <p>If you need to see tags in OmegaT but do not need to retain most of
+                   the formatting in the translated document you are free not to include tags
+                   in the translation. In this case pay extra attention to tag pairs since
+                   deleting one side of the pair but forgetting to delete the other is
+                   guaranteed to corrupt your document's formatting. Since tags are included
+                   in the text itself, it is possible to use segmentation rules to create
+                   segments with fewer tags. This is an advanced feature and some experience
+                   is required in order for it to be applied properly.
+            </p>
+            <p>OmegaT is not yet able to detect mistakes in formatting fully
+                   automatically, so it will not prompt you if you make an error or change
+                   formatting to fit your target language better. Sometimes, however, your
+                   translated file may look strange, and – in the worst case – may even
+                   refuse to open.
+            </p>
+         </div>
+      </div>
+      <div class="navfooter">
+         <hr>
+         <table width="100%" summary="Navigation footer">
+            <tr>
+               <td width="40%" align="left"><a accesskey="p" href="chapter.font.html">Prev</a> 
+               </td>
+               <td width="20%" align="center"> </td>
+               <td width="40%" align="right"> <a accesskey="n" href="chapter.plain.text.html">Next</a></td>
+            </tr>
+            <tr>
+               <td width="40%" align="left" valign="top">Chapter 11. Font settings </td>
+               <td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td>
+               <td width="40%" align="right" valign="top"> Chapter 13. Working with plain text</td>
+            </tr>
+         </table>
+      </div>
+   </body>
+</html>
\ No newline at end of file
diff --git a/docs/en/chapter.glossaries.html b/docs/en/chapter.glossaries.html
new file mode 100644
index 0000000..e7f6bd8
--- /dev/null
+++ b/docs/en/chapter.glossaries.html
@@ -0,0 +1,368 @@
+<html>
+   <head>
+      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+   
+      <title>Chapter 19. Glossaries</title>
+      <link rel="stylesheet" href="OmegaT.css" type="text/css">
+      <meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+      <link rel="home" href="index.html" title="OmegaT - User's Guide">
+      <link rel="up" href="index.html" title="OmegaT - User's Guide">
+      <link rel="prev" href="chapter.dictionaries.html" title="Chapter 18. Dictionaries">
+      <link rel="next" href="chapter.machine.translate.html" title="Chapter 20. Machine Translation">
+   </head>
+   <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+      <div class="navheader">
+         <table width="100%" summary="Navigation header">
+            <tr>
+               <th colspan="3" align="center">Chapter 19. Glossaries</th>
+            </tr>
+            <tr>
+               <td width="20%" align="left"><a accesskey="p" href="chapter.dictionaries.html">Prev</a> 
+               </td>
+               <th width="60%" align="center"> </th>
+               <td width="20%" align="right"> <a accesskey="n" href="chapter.machine.translate.html">Next</a></td>
+            </tr>
+         </table>
+         <hr>
+      </div>
+      <div class="chapter" title="Chapter 19. Glossaries">
+         <div class="titlepage">
+            <div>
+               <div>
+                  <h2 class="title"><a name="chapter.glossaries"></a>Chapter 19. Glossaries<a class="indexterm" name="d0e7533"></a><a class="indexterm" name="d0e7538"></a></h2>
+               </div>
+            </div>
+         </div>
+         <div class="toc">
+            <dl>
+               <dt><span class="section"><a href="chapter.glossaries.html#d0e7551">1. Usage</a></span></dt>
+               <dt><span class="section"><a href="chapter.glossaries.html#d0e7599">2. File format</a></span></dt>
+               <dt><span class="section"><a href="chapter.glossaries.html#d0e7623">3. How to create glossaries</a></span></dt>
+               <dt><span class="section"><a href="chapter.glossaries.html#d0e7721">4. Using Trados Multiterm</a></span></dt>
+               <dt><span class="section"><a href="chapter.glossaries.html#d0e7739">5. Common glossary problems</a></span></dt>
+            </dl>
+         </div>
+         <p>Glossaries are files created and updated manually for use in
+              <span class="application">OmegaT</span>.
+         </p>
+         <p>If an <span class="application">OmegaT</span> project contains one or more
+              glossaries, any terms in the glossary which are also found in the current
+              segment will be automatically displayed in the Glossary viewer.
+         </p>
+         <div class="section" title="1. Usage">
+            <div class="titlepage">
+               <div>
+                  <div>
+                     <h2 class="title" style="clear: both"><a name="d0e7551"></a>1. Usage
+                     </h2>
+                  </div>
+               </div>
+            </div>
+            <p>To use an existing glossary, simply place it in the<a class="indexterm" name="d0e7556"></a> <code class="filename">/glossary</code> folder after creating the
+                   project. <span class="application">OmegaT</span> automatically detects glossary
+                   files in this folder when a project is opened. Terms in the current
+                   segment which <span class="application">OmegaT</span> finds in the glossary
+                   file(s) are displayed in the Glossary pane:
+            </p><a class="indexterm" name="d0e7571"></a><div class="figure"><a name="d0e7574"></a><p class="title"><b>Figure 19.1. Glossary pane</b></p>
+               <div class="figure-contents">
+                  <div class="mediaobject"><img src="images/Glossary_pane.png" alt="Glossary pane"></div>
+               </div>
+            </div><br class="figure-break"><p>The word before the = sign is the source term, and its translation
+                   is (or are) the words after =. The vocabulary entry can have a comment
+                   added (see "transitive verb" for the second item). The glossary function
+                   only finds exact matches with the glossary entry (e.g. does not find
+                   inflected forms etc.). New terms can be added manually to the glossary
+                   file(s) during translation (for example in a text editor), but newly added
+                   terms will not be recognized until the project is reloaded.
+            </p>
+            <p>The source term does not have to be a single-word item, as the next
+                   example shows:
+            </p>
+            <div class="figure"><a name="d0e7586"></a><p class="title"><b>Figure 19.2. multiple words entries in glossaries - example<a class="indexterm" name="d0e7589"></a></b></p>
+               <div class="figure-contents">
+                  <div class="mediaobject"><img src="images/MultiTerm_Glossary.png" alt="multiple words entries in glossaries - exampleGlossary pane - multiple-words entries"></div>
+               </div>
+            </div><br class="figure-break"><p>The underlined item "new preview screen shot", consists of three
+                   words and can be found in the glossary pane as "nov predogled posnetka
+                   zaslona". Note that parts of the multi-term items ("preview" in the above
+                   example is also recognized on its own as "predogled") are recognized as
+                   well, but ranked lower.
+            </p>
+         </div>
+         <div class="section" title="2. File format">
+            <div class="titlepage">
+               <div>
+                  <div>
+                     <h2 class="title" style="clear: both"><a name="d0e7599"></a>2. <a class="indexterm" name="d0e7601"></a>File format<a class="indexterm" name="d0e7607"></a></h2>
+                  </div>
+               </div>
+            </div>
+            <p>Glossary files are simple plain text files containing three-column,
+                   tab-delimited lists with the source and target terms in the first and
+                   second columns respectively. The third column can be used for additional
+                   information. Glossary files can be either in system default encoding (and
+                   indicated by the extension .tab) or in UTF-8 (the extension .utf8). The
+                   Unicode encoding (UTF8) is preferred for obvious reasons.
+            </p>
+            <p>Also supported is the CSV format. This format is the same as the tab
+                   separated one: source term, target term. Comment fields are separated by a
+                   comma ','. Strings can be enclosed by quotes ", which allows having a
+                   comma inside a string:
+            </p>
+            <p><code class="literal">"This is a source term, which contains a comma",c'est un
+                      terme cible,this is a comment</code></p>
+            <p>In addition to the plain text format, TBX format is also supported.
+                   TBX - Term Base eXchange (TBX) is the open, XML-based standard for
+                   exchanging structured terminological data that has been approved as an
+                   international standard by LISA and ISO. If you have an existing
+                   terminology handling system - MultiTerm for example - It is quite possible
+                   it offers the export of terminology data via TBX format.
+            </p>
+         </div>
+         <div class="section" title="3. How to create glossaries">
+            <div class="titlepage">
+               <div>
+                  <div>
+                     <h2 class="title" style="clear: both"><a name="d0e7623"></a>3. How to create glossaries<a class="indexterm" name="d0e7626"></a></h2>
+                  </div>
+               </div>
+            </div>
+            <p>The method here is foolproof, when followed in a reasonably careful
+                   fashion. You need OpenOffice.org Writer for it, so - if you haven't
+                   already done so - download and install OpenOffice.org. Launch
+                   OpenOffice.org and open a new text document or launch "OpenOffice.org
+                   Writer".
+            </p>
+            <p>In the empty document, enter your glossary terms as follows: a
+                   source-language term, tab space, the target-language term , tab space, a
+                   comment or explanation for the item, and a Return. Tab space is the
+                   tabulator key on the left hand side of the keyboard. If you do not wish to
+                   add any comments, you can drop the second tab space. A "term" can be a
+                   single word or a whole phrase. On the second line, enter the second term
+                   and its translation.
+            </p>
+            <p>When you have finished entering the terms, you will have two
+                   "columns" of terms, source-language terms on the left and their
+                   target-language terms on the right, and possibly a third column,
+                   containing you comments and explanations, The tab space (→ in the example
+                   below) and Enter (¶) characters can be made visible by clicking on the ¶
+                   icon in the Writer's Standard writer bar. Here are a few lines of an
+                   English -German glossary)
+            </p>
+            <p><code class="literal">word →Wort→das (-/e/s, Wörter/-e)¶</code></p>
+            <p><code class="literal">small house→Häuschen→das, (pl Häuschen)¶</code></p>
+            <p><code class="literal">dog →Hund→m, f Hündin ¶</code></p>
+            <p><code class="literal">horse→Pferd→n, m Hengst f Stute n Fohlen¶</code></p>
+            <p>Do NOT use OpenOffice.org's "columns" function to create columns:
+                   just separate each source and target-language term pair with a single tab
+                   space.
+            </p>
+            <p>When you are finished with the entries, save the file as
+                   Unicode-encoded file as follows:
+            </p>
+            <div class="itemizedlist">
+               <ul class="itemizedlist" type="disc">
+                  <li class="listitem">
+                     <p>Select <code class="literal">File > Save As</code></p>
+                  </li>
+                  <li class="listitem">
+                     <p>In the <span class="emphasis"><em>"File location"</em></span> box, enter the name
+                                for your glossary file.
+                     </p>
+                  </li>
+               </ul>
+            </div>
+            <div class="itemizedlist">
+               <ul class="itemizedlist" type="disc">
+                  <li class="listitem">
+                     <p>For "Filter", select "<span class="emphasis"><em>Text Encoded
+                                      (.txt.)</em></span>"
+                     </p>
+                  </li>
+                  <li class="listitem">
+                     <p>make sure "<span class="emphasis"><em>Automatic file name extension</em></span>"
+                                and <span class="emphasis"><em>"Edit filter settings"</em></span> are unchecked.
+                     </p>
+                  </li>
+               </ul>
+            </div>
+            <div class="figure"><a name="d0e7681"></a><p class="title"><b>Figure 19.3. Saving a glossary</b></p>
+               <div class="figure-contents">
+                  <div class="mediaobject"><img src="images/saveglossary.png" alt="Saving a glossary"></div>
+               </div>
+            </div><br class="figure-break"><p>Confirm with OK.</p>
+            <p>After creating an OmegaT project, copy or move this file into the
+                   project's \glossary folder. If the project is already open, reload it
+                   after copying the glossary file into the project. You can make changes to
+                   a glossary file while it is being used in a project. Glossary changes are
+                   detected approximately once every second and modifications load
+                   transparently in the background, so there's no need to reload the project
+                   after saving the new glossary file.
+            </p>
+            <p>When a segment containing a source-text term is opened, the glossary
+                   pane will display glossary entries for those items in the source segment
+                   that can be found in the glossary (or glossaries - you can have more than
+                   one available, and they can be stored in subfolders of <span class="emphasis"><em>glossary
+                         </em></span>as well).
+            </p>
+            <p><span class="bold"><strong>Note: </strong></span>Of course there are other
+                   ways and means to create a simple file with tab delimited entries, and
+                   they are all simpler, a lot of them much simpler, than the above
+                   suggestion. For instance, one can export the contents above as a
+                   <code class="filename">CSV</code>, instead of a <code class="filename">UTF8</code> text
+                   file. Note, however, that the above suggestion works for any target
+                   system, be it Windows, OS X or Linux. Nothing speaks against using
+                   Notepad++ on Windows or GEdit on Linux for instance: any text editor, that
+                   can handle UTF8 and that can show white space (so that you do not miss the
+                   required <span class="keycap"><strong>TAB</strong></span> characters) can be used.
+            </p>
+            <p>The contents of glossary files are kept in memory and are loaded
+                   when the project is opened or reloaded. Updating a glossary file is thus
+                   rather simple:
+            </p>
+            <div class="itemizedlist">
+               <ul class="itemizedlist" type="disc">
+                  <li class="listitem">
+                     <p>keep the file open in your selected editor</p>
+                  </li>
+               </ul>
+            </div>
+            <div class="itemizedlist">
+               <ul class="itemizedlist" type="disc">
+                  <li class="listitem">
+                     <p>When you come across a new term that you would like to add to
+                                your glossary, enter the new term, its translation and any comments
+                                you may have (ensuring you press tab between the fields) and save the
+                                file. The contents of the glossary pane will be updated
+                                accordingly.
+                     </p>
+                  </li>
+               </ul>
+            </div>
+         </div>
+         <div class="section" title="4. Using Trados Multiterm">
+            <div class="titlepage">
+               <div>
+                  <div>
+                     <h2 class="title" style="clear: both"><a name="d0e7721"></a>4. <a class="indexterm" name="d0e7723"></a>Using Trados Multiterm
+                     </h2>
+                  </div>
+               </div>
+            </div>
+            <p>Data exported from Trados MultiTerm can be used as
+                   <span class="application">OmegaT</span> glossaries without further modification,
+                   provided they are given the file extension <code class="filename">.tab</code> and
+                   the source and target term fields are the first two fields
+                   respectively.
+            </p>
+            <p>If you export using the system option "Tab-delimited export", you
+                   will need to delete the first 5 columns (Seq. Nr, Date created etc). The
+                   newer versions of MultiTerm support exporting to TBX format..
+            </p>
+         </div>
+         <div class="section" title="5. Common glossary problems">
+            <div class="titlepage">
+               <div>
+                  <div>
+                     <h2 class="title" style="clear: both"><a name="d0e7739"></a>5. <a class="indexterm" name="d0e7741"></a>Common glossary problems
+                     </h2>
+                  </div>
+               </div>
+            </div>
+            <p><span class="bold"><strong>Problem: No glossary terms are displayed -
+                         possible causes:</strong></span></p>
+            <div class="itemizedlist">
+               <ul class="itemizedlist" type="disc">
+                  <li class="listitem">
+                     <p>No glossary file found in the "glossary" folder.</p>
+                  </li>
+               </ul>
+            </div>
+            <div class="itemizedlist">
+               <ul class="itemizedlist" type="disc">
+                  <li class="listitem">
+                     <p>The glossary file is empty.</p>
+                  </li>
+               </ul>
+            </div>
+            <div class="itemizedlist">
+               <ul class="itemizedlist" type="disc">
+                  <li class="listitem">
+                     <p>The items are not separated with a TAB character.</p>
+                  </li>
+               </ul>
+            </div>
+            <div class="itemizedlist">
+               <ul class="itemizedlist" type="disc">
+                  <li class="listitem">
+                     <p>The glossary file does not have the correct extension (.tab or
+                                .utf8).
+                     </p>
+                  </li>
+               </ul>
+            </div>
+            <div class="itemizedlist">
+               <ul class="itemizedlist" type="disc">
+                  <li class="listitem">
+                     <p>There is no EXACT match between the glossary entry and the
+                                source text in your document - for instance plurals.
+                     </p>
+                  </li>
+               </ul>
+            </div>
+            <div class="itemizedlist">
+               <ul class="itemizedlist" type="disc">
+                  <li class="listitem">
+                     <p>the glossary file does not have the correct encoding.</p>
+                  </li>
+               </ul>
+            </div>
+            <div class="itemizedlist">
+               <ul class="itemizedlist" type="disc">
+                  <li class="listitem">
+                     <p>There are no terms in the current segment which match any terms
+                                in the glossary.
+                     </p>
+                  </li>
+               </ul>
+            </div>
+            <div class="itemizedlist">
+               <ul class="itemizedlist" type="disc">
+                  <li class="listitem">
+                     <p>One or more of the above problems may have been fixed, but the
+                                project has not been reloaded.
+                     </p>
+                  </li>
+               </ul>
+            </div>
+            <p><span class="bold"><strong>Problem: In the glossary pane, some characters
+                         are not displayed properly</strong></span></p>
+            <div class="itemizedlist">
+               <ul class="itemizedlist" type="disc">
+                  <li class="listitem">
+                     <p>...but the same characters are displayed properly in the Editing
+                                pane: the extension and the file encoding do not match.
+                     </p>
+                  </li>
+               </ul>
+            </div>
+         </div>
+      </div>
+      <div class="navfooter">
+         <hr>
+         <table width="100%" summary="Navigation footer">
+            <tr>
+               <td width="40%" align="left"><a accesskey="p" href="chapter.dictionaries.html">Prev</a> 
+               </td>
+               <td width="20%" align="center"> </td>
+               <td width="40%" align="right"> <a accesskey="n" href="chapter.machine.translate.html">Next</a></td>
+            </tr>
+            <tr>
+               <td width="40%" align="left" valign="top">Chapter 18. Dictionaries </td>
+               <td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td>
+               <td width="40%" align="right" valign="top"> Chapter 20. Machine Translation</td>
+            </tr>
+         </table>
+      </div>
+   </body>
+</html>
\ No newline at end of file
diff --git a/docs/en/chapter.installing.and.running.html b/docs/en/chapter.installing.and.running.html
new file mode 100644
index 0000000..830faad
--- /dev/null
+++ b/docs/en/chapter.installing.and.running.html
@@ -0,0 +1,1138 @@
+<html>
+   <head>
+      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+   
+      <title>Chapter 3. Installing and running OmegaT</title>
+      <link rel="stylesheet" href="OmegaT.css" type="text/css">
+      <meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+      <link rel="home" href="index.html" title="OmegaT - User's Guide">
+      <link rel="up" href="index.html" title="OmegaT - User's Guide">
+      <link rel="prev" href="chapter.instant.start.guide.html" title="Chapter 2. Instant Start Guide">
+      <link rel="next" href="chapter.user.interface.html" title="Chapter 4. The user interface">
+   </head>
+   <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+      <div class="navheader">
+         <table width="100%" summary="Navigation header">
+            <tr>
+               <th colspan="3" align="center">Chapter 3. Installing and running <span class="application">OmegaT</span></th>
+            </tr>
+            <tr>
+               <td width="20%" align="left"><a accesskey="p" href="chapter.instant.start.guide.html">Prev</a> 
+               </td>
+               <th width="60%" align="center"> </th>
+               <td width="20%" align="right"> <a accesskey="n" href="chapter.user.interface.html">Next</a></td>
+            </tr>
+         </table>
+         <hr>
+      </div>
+      <div class="chapter" title="Chapter 3. Installing and running OmegaT">
+         <div class="titlepage">
+            <div>
+               <div>
+                  <h2 class="title"><a name="chapter.installing.and.running"></a>Chapter 3. Installing and running <span class="application">OmegaT</span></h2>
+               </div>
+            </div>
+         </div>
+         <div class="toc">
+            <dl>
+               <dt><span class="section"><a href="chapter.installing.and.running.html#d0e779">1. Windows Users</a></span></dt>
+               <dd>
+                  <dl>
+                     <dt><span class="section"><a href="chapter.installing.and.running.html#d0e787">1.1. Downloading the
+                                    package</a></span></dt>
+                     <dt><span class="section"><a href="chapter.installing.and.running.html#OmegaT.installation.Windows">1.2. <span class="application">Installing OmegaT</span></a></span></dt>
+                     <dt><span class="section"><a href="chapter.installing.and.running.html#adding.OmegaT.to.the.start.menu.or.desktop">1.3. Adding <span class="application">OmegaT</span> to the start menu or
+                                    desktop</a></span></dt>
+                     <dt><span class="section"><a href="chapter.installing.and.running.html#running.OmegaT.Windows">1.4. Running OmegaT</a></span></dt>
+                     <dt><span class="section"><a href="chapter.installing.and.running.html#d0e886">1.5. Upgrading OmegaT </a></span></dt>
+                  </dl>
+               </dd>
+               <dt><span class="section"><a href="chapter.installing.and.running.html#Linux.Intel.users">2. Linux (Intel) Users</a></span></dt>
+               <dd>
+                  <dl>
+                     <dt><span class="section"><a href="chapter.installing.and.running.html#which.package.to.download.Linux">2.1. Downloading the right package</a></span></dt>
+                     <dt><span class="section"><a href="chapter.installing.and.running.html#OmegaT.installation.Linux">2.2. <span class="application">Installing OmegaT</span></a></span></dt>
+                     <dt><span class="section"><a href="chapter.installing.and.running.html#adding.OmegaT.to.your.menus.or.panels">2.3. Adding <span class="application">OmegaT</span> to your menus (KDE) or
+                                    panels (Gnome)</a></span></dt>
+                     <dt><span class="section"><a href="chapter.installing.and.running.html#running.OmegaT.Linux">2.4. Running OmegaT</a></span></dt>
+                  </dl>
+               </dd>
+               <dt><span class="section"><a href="chapter.installing.and.running.html#MAC.OSX.users">3. Mac OS X Users</a></span></dt>
+               <dd>
+                  <dl>
+                     <dt><span class="section"><a href="chapter.installing.and.running.html#which.package.to.download.OSX">3.1. Dowloading the package</a></span></dt>
+                     <dt><span class="section"><a href="chapter.installing.and.running.html#OmegaT.installation.OSX">3.2. <span class="application">Installing OmegaT </span></a></span></dt>
+                     <dt><span class="section"><a href="chapter.installing.and.running.html#adding.OmegaT.to.the.dock">3.3. Adding <span class="application">OmegaT</span> to the Dock</a></span></dt>
+                     <dt><span class="section"><a href="chapter.installing.and.running.html#running.OmegaT.OSX">3.4. Running OmegaT</a></span></dt>
+                     <dt><span class="section"><a href="chapter.installing.and.running.html#Mac.OSX.goodies">3.5. Mac OS X goodies</a></span></dt>
+                  </dl>
+               </dd>
+               <dt><span class="section"><a href="chapter.installing.and.running.html#other.systems">4. Other Systems</a></span></dt>
+               <dd>
+                  <dl>
+                     <dt><span class="section"><a href="chapter.installing.and.running.html#d0e1310">4.1. Downloading the right
+                                    package</a></span></dt>
+                     <dt><span class="section"><a href="chapter.installing.and.running.html#OmegaT.installation.other">4.2. <span class="application">Installing OmegaT</span></a></span></dt>
+                     <dt><span class="section"><a href="chapter.installing.and.running.html#installing.convenient.shortcuts">4.3. Installing convenient shortcuts</a></span></dt>
+                     <dt><span class="section"><a href="chapter.installing.and.running.html#running.OmegaT.other">4.4. Running OmegaT</a></span></dt>
+                  </dl>
+               </dd>
+               <dt><span class="section"><a href="chapter.installing.and.running.html#using.Java.Web.Start">5. Using Java Web Start</a></span></dt>
+               <dt><span class="section"><a href="chapter.installing.and.running.html#d0e1460">6. Starting OmegaT from the command line</a></span></dt>
+               <dd>
+                  <dl>
+                     <dt><span class="section"><a href="chapter.installing.and.running.html#method1.opening.commandline.window">6.1. Opening a command line window</a></span></dt>
+                     <dt><span class="section"><a href="chapter.installing.and.running.html#launch.command.arguments">6.2. Launch command arguments</a></span></dt>
+                     <dt><span class="section"><a href="chapter.installing.and.running.html#omegat.command.arguments">6.3. OmegaT in the command line mode</a></span></dt>
+                  </dl>
+               </dd>
+               <dt><span class="section"><a href="chapter.installing.and.running.html#building.OmegaT.from.source">7. Building <span class="application">OmegaT</span> From Source</a></span></dt>
+            </dl>
+         </div>
+         <div class="section" title="1. Windows Users">
+            <div class="titlepage">
+               <div>
+                  <div>
+                     <h2 class="title" style="clear: both"><a name="d0e779"></a>1. Windows Users<a class="indexterm" name="d0e782"></a></h2>
+                  </div>
+               </div>
+            </div>
+            <div class="section" title="1.1. Downloading the package">
+               <div class="titlepage">
+                  <div>
+                     <div>
+                        <h3 class="title"><a name="d0e787"></a>1.1. Downloading the
+                                 package
+                        </h3>
+                     </div>
+                  </div>
+               </div>
+               <p>Do you have a Java implementation compatible with Oracle's Java
+                        1.5 JRE?
+               </p>
+               <div class="itemizedlist">
+                  <ul class="itemizedlist" type="disc">
+                     <li class="listitem">
+                        <p><span class="bold"><strong>Yes: </strong></span>download
+                                     <span class="emphasis"><em>OmegaT_2.3.x_Windows_without_JRE.exe</em></span>.
+                        </p>
+                     </li>
+                     <li class="listitem">
+                        <p><span class="bold"><strong>No / I don't know:</strong></span>
+                                     download<span class="emphasis"><em> OmegaT_2.3.x_Windows.exe.</em></span></p>
+                        <p>This package is bundled with Oracle's Java Runtime
+                                     Environment. This JRE will not interfere with other Java
+                                     implementations that may already be installed on your system.
+                        </p>
+                     </li>
+                  </ul>
+               </div>
+            </div>
+            <div class="section" title="1.2. Installing OmegaT">
+               <div class="titlepage">
+                  <div>
+                     <div>
+                        <h3 class="title"><a name="OmegaT.installation.Windows"></a>1.2. <span class="application">Installing OmegaT</span></h3>
+                     </div>
+                  </div>
+               </div>
+               <p>To install <span class="application">OmegaT</span>, double-click on the
+                        program you have downloaded, and follow the instructions
+               </p>
+            </div>
+            <div class="section" title="1.3. Adding OmegaT to the start menu or desktop">
+               <div class="titlepage">
+                  <div>
+                     <div>
+                        <h3 class="title"><a name="adding.OmegaT.to.the.start.menu.or.desktop"></a>1.3. Adding <span class="application">OmegaT</span> to the start menu or
+                                 desktop<a class="indexterm" name="d0e825"></a></h3>
+                     </div>
+                  </div>
+               </div>
+               <p>During the installation, the setup program asks you whether you
+                        wish to create a folder in the <span class="emphasis"><em>start</em></span> menu, and
+                        whether you wish to create a shortcut on the desktop and in the quick
+                        launch bar.
+               </p>
+               <p>You can still create a shortcut later by dragging
+                        <span class="emphasis"><em><span class="application">OmegaT</span>.exe</em></span> to the
+                        desktop or start menu to link it from there.
+               </p>
+            </div>
+            <div class="section" title="1.4. Running OmegaT">
+               <div class="titlepage">
+                  <div>
+                     <div>
+                        <h3 class="title"><a name="running.OmegaT.Windows"></a>1.4. Running <span class="application">OmegaT<a class="indexterm" name="d0e847"></a></span></h3>
+                     </div>
+                  </div>
+               </div>
+               <p>Once <span class="application">OmegaT</span> is installed, you can click
+                        on <span class="emphasis"><em><span class="application">OmegaT</span>.jar</em></span> to launch
+                        it directly or you can launch it directly from the command line.
+               </p>
+               <p>The simplest way to launch OmegaT, however, is to execute
+                        the<span class="emphasis"><em> <span class="application">OmegaT</span>.exe</em></span> program.
+                        <a class="indexterm" name="d0e870"></a>The options for the program start-up in this case will be
+                        read from the <span class="emphasis"><em><span class="application">OmegaT</span>.l4J.ini
+                              </em></span>file, which resides in the same folder as the exe file and
+                        which you can edit to reflect your setup. The following example for the
+                        INI file reserves 1GB of memory, requests French as the user language
+                        and Canada as the country:
+               </p>
+               <div class="literallayout">
+                  <p><code class="code"># OmegaT.exe runtime configuration<br>
+                        # To use a parameter, remove the '#' before the '-'<br>
+                        # Memory <br>
+                        -Xmx1024M <br>
+                        # Language <br>
+                        -Duser.language=FR<br>
+                        # Country <br>
+                        -Duser.country=CA </code></p>
+               </div>
+            </div>
+            <div class="section" title="1.5. Upgrading OmegaT">
+               <div class="titlepage">
+                  <div>
+                     <div>
+                        <h3 class="title"><a name="d0e886"></a>1.5. Upgrading OmegaT <a class="indexterm" name="d0e889"></a></h3>
+                     </div>
+                  </div>
+               </div>
+               <p><span class="emphasis"><em>This information applies only to the "Traditional"
+                              Windows versions of OmegaT. It does not apply to the Web Start versions,
+                              which are upgraded automatically, nor to cross-platform versions
+                              installed on Windows.</em></span></p>
+               <p>If you already have a version of OmegaT installed on your PC and
+                        wish to upgrade to a more recent version, you have two options:
+               </p>
+               <div class="itemizedlist">
+                  <ul class="itemizedlist" type="disc">
+                     <li class="listitem">
+                        <p><span class="bold"><strong>Install over the existing installation.
+                                           </strong></span>To do this, simply select the same installation folder as
+                                     the existing installation when installing the new version. The "old"
+                                     version of OmegaT will be overwritten, but any settings from it will
+                                     be retained. This includes preferences set from within OmegaT, any
+                                     changes you have made to your<code class="filename"> OmegaT.l4J.ini</code>
+                                     file, and also your launch script (.bat file), if you are using
+                                     one.
+                        </p>
+                     </li>
+                  </ul>
+               </div>
+               <p>With this method, you may also download the "Windows without JRE"
+                        version, since the new installation will use your existing JRE.
+               </p>
+               <div class="itemizedlist">
+                  <ul class="itemizedlist" type="disc">
+                     <li class="listitem">
+                        <p><span class="bold"><strong>Install to a new folder. </strong></span>This
+                                     will enable you to keep both versions side-by-side, which you may
+                                     wish to do until you feel comfortable with the new version. This
+                                     method will also use preferences and settings you have made from
+                                     within OmegaT. In this case, however:
+                        </p>
+                        <div class="itemizedlist">
+                           <ul class="itemizedlist" type="circle">
+                              <li class="listitem">
+                                 <p>If you have made changes to your<code class="filename"> OmegaT.l4J.ini
+                                                     </code>file and/or are using a .bat file, you must copy
+                                                  these over.
+                                 </p>
+                              </li>
+                           </ul>
+                        </div>
+                        <div class="itemizedlist">
+                           <ul class="itemizedlist" type="circle">
+                              <li class="listitem">
+                                 <p>If your existing OmegaT installation is a "Windows with
+                                                  JRE" version, the new version must also be a "Windows with JRE"
+                                                  version.
+                                 </p>
+                              </li>
+                           </ul>
+                        </div>
+                     </li>
+                  </ul>
+               </div>
+            </div>
+         </div>
+         <div class="section" title="2. Linux (Intel) Users">
+            <div class="titlepage">
+               <div>
+                  <div>
+                     <h2 class="title" style="clear: both"><a name="Linux.Intel.users"></a>2. Linux (Intel) Users<a class="indexterm" name="d0e930"></a></h2>
+                  </div>
+               </div>
+            </div>
+            <div class="section" title="2.1. Downloading the right package">
+               <div class="titlepage">
+                  <div>
+                     <div>
+                        <h3 class="title"><a name="which.package.to.download.Linux"></a>2.1. Downloading the right package
+                        </h3>
+                     </div>
+                  </div>
+               </div>
+               <p>Do you have a Java implementation compatible with Oracle's Java
+                        1.5 JRE?
+               </p>
+               <div class="itemizedlist">
+                  <ul class="itemizedlist" type="disc">
+                     <li class="listitem">
+                        <p><span class="bold"><strong>Yes: </strong></span>download
+                                     <span class="emphasis"><em>OmegaT_2.3.x_Without_JRE.zip</em></span>.
+                        </p>
+                     </li>
+                     <li class="listitem">
+                        <p><span class="bold"><strong>No / I don't know:</strong></span> download
+                                     <span class="emphasis"><em>OmegaT_2.3.x_Linux.tar.bz2.</em></span></p>
+                        <p>This package is bundled with Oracle's Java Runtime
+                                     Environment. This JRE will not interfere with other Java
+                                     implementations that may already be installed on your system.
+                        </p>
+                     </li>
+                  </ul>
+               </div>
+            </div>
+            <div class="section" title="2.2. Installing OmegaT">
+               <div class="titlepage">
+                  <div>
+                     <div>
+                        <h3 class="title"><a name="OmegaT.installation.Linux"></a>2.2. <span class="application">Installing OmegaT</span></h3>
+                     </div>
+                  </div>
+               </div>
+               <p>Unpack/untar the downloaded file. This will create an omegat/
+                        folder in the working folder in which you will find all the files needed
+                        to run <span class="application">OmegaT</span>. To untar the
+                        <span class="emphasis"><em>.tar.gz</em></span> file:
+               </p>
+               <p><span class="emphasis"><em>$ tar xf downloaded_file.tar.gz</em></span></p>
+            </div>
+            <div class="section" title="2.3. Adding OmegaT to your menus (KDE) or panels (Gnome)">
+               <div class="titlepage">
+                  <div>
+                     <div>
+                        <h3 class="title"><a name="adding.OmegaT.to.your.menus.or.panels"></a>2.3. Adding <span class="application">OmegaT</span> to your menus (KDE) or
+                                 panels (Gnome)
+                        </h3>
+                     </div>
+                  </div>
+               </div>
+               <div class="section" title="2.3.1. KDE 4 Users">
+                  <div class="titlepage">
+                     <div>
+                        <div>
+                           <h4 class="title"><a name="KDE.users"></a>2.3.1. KDE 4 Users<a class="indexterm" name="d0e982"></a></h4>
+                        </div>
+                     </div>
+                  </div>
+                  <p>You can add <span class="application">OmegaT</span> to your menus as
+                             follows:
+                  </p>
+                  <div class="itemizedlist">
+                     <ul class="itemizedlist" type="disc">
+                        <li class="listitem">
+                           <p>Press <span class="bold"><strong> <span class="keysym">Alt+F2</span>
+                                                </strong></span> to show KRunner. Type
+                                          <span class="emphasis"><em>kmenuedit+enter</em></span> to run the command. The
+                                          KMenuEditor appears. In KMenuEditor select <span class="emphasis"><em>File ->
+                                                New Item.</em></span></p>
+                        </li>
+                        <li class="listitem">
+                           <p>Then, after selecting a suitable menu, add a submenu/item
+                                          with <span class="emphasis"><em>File - New</em></span> Submenu and <span class="emphasis"><em>File -
+                                                New Item</em></span>. Enter <span class="application">OmegaT</span> as
+                                          the name of the new item.
+                           </p>
+                        </li>
+                        <li class="listitem">
+                           <p>In the "Command" field, use the navigation button to find
+                                          your <span class="application">OmegaT</span> launch script (the file
+                                          named <span class="application">OmegaT</span> in the unpacked folder),
+                                          and select it.
+                           </p>
+                        </li>
+                        <li class="listitem">
+                           <p>Click on the icon button (to the right of the
+                                          Name/Description/Comment fields)
+                           </p>
+                        </li>
+                        <li class="listitem">
+                           <p>Other Icons - Browse, and navigate to the /images subfolder
+                                          in the <span class="application">OmegaT</span> application folder.
+                                          Select the <span class="application">OmegaT</span>.png icon.
+                           </p>
+                        </li>
+                        <li class="listitem">
+                           <p>Finally, save the changes with <span class="emphasis"><em>File -
+                                                Save.</em></span></p>
+                        </li>
+                     </ul>
+                  </div>
+               </div>
+               <div class="section" title="2.3.2. GNOME Users">
+                  <div class="titlepage">
+                     <div>
+                        <div>
+                           <h4 class="title"><a name="GNOME.users"></a>2.3.2. GNOME Users<a class="indexterm" name="d0e1048"></a></h4>
+                        </div>
+                     </div>
+                  </div>
+                  <p>You can add <span class="application">OmegaT</span> to your menus as
+                             follows:
+                  </p>
+                  <div class="itemizedlist">
+                     <ul class="itemizedlist" type="disc">
+                        <li class="listitem">
+                           <p>Right-click on the panel - <span class="emphasis"><em>Add New
+                                                Launcher.</em></span></p>
+                        </li>
+                        <li class="listitem">
+                           <p>Enter "<span class="application">OmegaT</span>" in the "Name"
+                                          field; in the "Command" field, use the navigation button to find
+                                          your <span class="application">OmegaT</span> launch script (the file
+                                          named <span class="application">OmegaT</span> in the unpacked folder).
+                                          Select it and confirm with OK.
+                           </p>
+                        </li>
+                        <li class="listitem">
+                           <p>Click on the icon button, then hit
+                                          <span class="emphasis"><em>Browse...</em></span> and navigate to the /images
+                                          subfolder in the <span class="application">OmegaT</span> application
+                                          folder. Select the
+                                          <span class="emphasis"><em><span class="application">OmegaT</span>.png</em></span> icon.
+                                          GNOME may fail to display the icon files in the available formats
+                                          and initially appear to expect an SVG file, but if the folder is
+                                          selected, the files should appear and
+                                          <span class="application">OmegaT</span>.png can be selected.
+                           </p>
+                        </li>
+                     </ul>
+                  </div>
+               </div>
+            </div>
+            <div class="section" title="2.4. Running OmegaT">
+               <div class="titlepage">
+                  <div>
+                     <div>
+                        <h3 class="title"><a name="running.OmegaT.Linux"></a>2.4. Running <span class="application">OmegaT<a class="indexterm" name="d0e1098"></a></span></h3>
+                     </div>
+                  </div>
+               </div>
+               <p>You can launch OmegaT from the command line with a script that
+                        includes start-up options or you can click on
+                        <span class="emphasis"><em><span class="application">OmegaT</span>.jar</em></span> to launch it
+                        directly. Methods differ depending on the distribution. Make sure that
+                        your <span class="emphasis"><em>PATH </em></span>settings are correct and that
+                        .<span class="emphasis"><em>jar</em></span> files are properly associated with a Java
+                        launcher. Check "Command line launching" below for more
+                        information.
+               </p>
+            </div>
+         </div>
+         <div class="section" title="3. Mac OS X Users">
+            <div class="titlepage">
+               <div>
+                  <div>
+                     <h2 class="title" style="clear: both"><a name="MAC.OSX.users"></a>3. Mac OS X Users<a class="indexterm" name="d0e1119"></a><a class="indexterm" name="d0e1124"></a></h2>
+                  </div>
+               </div>
+            </div>
+            <div class="section" title="3.1. Dowloading the package">
+               <div class="titlepage">
+                  <div>
+                     <div>
+                        <h3 class="title"><a name="which.package.to.download.OSX"></a>3.1. Dowloading the package
+                        </h3>
+                     </div>
+                  </div>
+               </div>
+               <p><span class="application">OmegaT</span> 2.3 requires Java 1.5 to run.
+                        Use "Software Update..." from the Apple menu to update your Java
+                        version.
+               </p>
+               <p>Download <span class="emphasis"><em>OmegaT_2.3.x_Mac.zip.</em></span></p>
+            </div>
+            <div class="section" title="3.2. Installing OmegaT">
+               <div class="titlepage">
+                  <div>
+                     <div>
+                        <h3 class="title"><a name="OmegaT.installation.OSX"></a>3.2. <span class="application">Installing OmegaT </span></h3>
+                     </div>
+                  </div>
+               </div>
+               <p>Double click on <span class="emphasis"><em>OmegaT_2.3.x_Mac.zip</em></span> to
+                        unpack it. This creates a folder called <span class="emphasis"><em>
+                              <span class="application">OmegaT</span> </em></span>. The folder contains 2
+                        files: index.html and
+                        <span class="emphasis"><em><span class="application">OmegaT</span>.app.</em></span> Copy the
+                        folder to a suitable folder (e.g. Applications). Once you have done
+                        this, you can delete the <span class="emphasis"><em>OmegaT_2.3.x_Mac.zip</em></span> file,
+                        it is no longer needed.
+               </p>
+            </div>
+            <div class="section" title="3.3. Adding OmegaT to the Dock">
+               <div class="titlepage">
+                  <div>
+                     <div>
+                        <h3 class="title"><a name="adding.OmegaT.to.the.dock"></a>3.3. Adding <span class="application">OmegaT</span> to the Dock<a class="indexterm" name="d0e1169"></a></h3>
+                     </div>
+                  </div>
+               </div>
+               <p>Drag and drop
+                        <span class="emphasis"><em><span class="application">OmegaT</span>.app</em></span> onto the
+                        Dock.
+               </p>
+            </div>
+            <div class="section" title="3.4. Running OmegaT">
+               <div class="titlepage">
+                  <div>
+                     <div>
+                        <h3 class="title"><a name="running.OmegaT.OSX"></a>3.4. Running <span class="application">OmegaT<a class="indexterm" name="d0e1188"></a><a class="indexterm" name="d0e1193"></a></span></h3>
+                     </div>
+                  </div>
+               </div>
+               <p>Double-click on<span class="emphasis"><em>
+                              <span class="application">OmegaT</span>.app</em></span> or click on its
+                        location in the Dock.
+               </p>
+               <p>To access
+                        <span class="application"><span class="emphasis"><em>Info.plist</em></span></span>, right-click
+                        on <span class="emphasis"><em><span class="application">OmegaT</span>.app</em></span> and select
+                        "Show Package Contents", then open the file by right-clicking on it and
+                        selecting your text editor of choice. You can also "cd" there directly
+                        from the command line and open
+                        <span class="application"><span class="emphasis"><em>Info.plist</em></span> in a command line editor
+                           like emacs or vi</span>.<span class="emphasis"><em> <a class="indexterm" name="d0e1224"></a><a class="indexterm" name="d0e1231"></a></em></span></p>
+               <p>You can modify the <span class="emphasis"><em>Properties</em></span> as well as the
+                        <span class="emphasis"><em>VMOptions</em></span> part.
+               </p>
+               <p>If you wish to add values to<span class="emphasis"><em> VMOptions</em></span>, put a
+                        space between them. For example, <code class="filename">-Xmx1024M
+                           -Duser.language=ja</code> will launch
+                        <span class="application">OmegaT</span> with 1024MB of memory and with the
+                        user interface in Japanese.
+               </p>
+               <p>To launch multiple instances of
+                        <span class="emphasis"><em><span class="application">OmegaT</span>.app</em></span>, double-click
+                        the file <span class="emphasis"><em>JavaApplicationStub</em></span> located in
+                        <span class="emphasis"><em><span class="application">OmegaT</span>.app/
+                              Contents/MacOS/</em></span>.
+               </p>
+               <p><span class="emphasis"><em><span class="application"> </span></em></span>Use
+                        <span class="emphasis"><em><span class="application">OmegaT</span>.jar</em></span> file located
+                        in
+                        <span class="emphasis"><em><span class="application">OmegaT</span>.app/Contents/Resources/Java/</em></span>
+                        to launch <span class="application">OmegaT</span> from the command line. Check
+                        "Command line launching" below for more information.
+               </p>
+            </div>
+            <div class="section" title="3.5. Mac OS X goodies">
+               <div class="titlepage">
+                  <div>
+                     <div>
+                        <h3 class="title"><a name="Mac.OSX.goodies"></a>3.5. Mac OS X goodies
+                        </h3>
+                     </div>
+                  </div>
+               </div>
+               <p><span class="emphasis"><em><span class="application">OmegaT</span>.app</em></span> can be
+                        accessed from the Mac OS X Services. You can thus select a word anywhere
+                        in <span class="application">OmegaT</span> and use Services to check this
+                        word, for instance in Spotlight or in Google. You can also use
+                        AppleScript or Automator to create Services or scripts that will
+                        automate frequent actions
+               </p>
+            </div>
+         </div>
+         <div class="section" title="4. Other Systems">
+            <div class="titlepage">
+               <div>
+                  <div>
+                     <h2 class="title" style="clear: both"><a name="other.systems"></a>4. Other Systems<a class="indexterm" name="d0e1303"></a></h2>
+                  </div>
+               </div>
+            </div>
+            <p>This information applies to systems such as Solaris SPARC/x86/x64,
+                   Linux x64/PowerPC, Windows x64
+            </p>
+            <div class="section" title="4.1. Downloading the right package">
+               <div class="titlepage">
+                  <div>
+                     <div>
+                        <h3 class="title"><a name="d0e1310"></a>4.1. Downloading the right
+                                 package
+                        </h3>
+                     </div>
+                  </div>
+               </div>
+               <p><span class="application">OmegaT</span> is available bundled with a
+                        Oracle Java JRE for Linux (Intel x86) and Windows platforms. Users of
+                        other platforms (Linux PowerPC, Linux x64, Solaris SPARC/x86/x64,
+                        Windows x64 etc) must have a running compatible Java JRE on their system
+                        to be able to use <span class="application">OmegaT</span>.
+               </p>
+               <p>Do you have a Java implementation compatible with Oracle's Java
+                        1.5 JRE?
+               </p>
+               <div class="itemizedlist">
+                  <ul class="itemizedlist" type="disc">
+                     <li class="listitem">
+                        <p><span class="bold"><strong>Yes: </strong></span>download
+                                     <span class="emphasis"><em>OmegaT_2.3.x_Windows_without_JRE.</em></span>zip This
+                                     package can be used on any platform where a Java 1.5 JRE compatible
+                                     JRE is installed.
+                        </p>
+                     </li>
+                     <li class="listitem">
+                        <p><span class="bold"><strong>I don't know:</strong></span> open a terminal
+                                     and type "java -version". If a "command not found" or similar
+                                     message is returned, it is likely that Java is not installed on your
+                                     system
+                        </p>
+                     </li>
+                     <li class="listitem">
+                        <p><span class="bold"><strong>No:</strong></span> obtain a Java JRE for
+                                     your system (see below) and download
+                                     <span class="emphasis"><em>OmegaT_2.3.x_Without_JRE.zip</em></span>.
+                        </p>
+                        <p>Oracle provides JREs for Solaris SPARC/x86 (Java 1.5) and for
+                                     Linux x64, Solaris x64, Windows x64 (Java 1.5) at <a class="ulink" href="http://www.oracle.com/technetwork/java/archive-139210.html" target="_top">http://www.oracle.com/technetwork/java/archive-139210.html</a></p>
+                        <p>IBM provides JREs for Linux PowerPC at <a class="ulink" href="http://www.ibm.com/developerworks/java/jdk/linux/download.html" target="_top">http://www.ibm.com/developerworks/java/jdk/linux/download.htm</a></p>
+                        <p>Follow the installation instructions of the package you
+                                     need.
+                        </p>
+                     </li>
+                  </ul>
+               </div>
+            </div>
+            <div class="section" title="4.2. Installing OmegaT">
+               <div class="titlepage">
+                  <div>
+                     <div>
+                        <h3 class="title"><a name="OmegaT.installation.other"></a>4.2. <span class="application">Installing OmegaT</span><a class="indexterm" name="d0e1358"></a></h3>
+                     </div>
+                  </div>
+               </div>
+               <p>To install <span class="application">OmegaT</span>, simply unpack the
+                        <span class="bold"><strong>OmegaT_2.3.x_Without_JRE.zip</strong></span> file. This
+                        creates an <span class="emphasis"><em>./OmegaT_2.3.x_Without_JRE/</em></span> directory in
+                        the working folder with all the files necessary to run
+                        <span class="application">OmegaT</span>.
+               </p>
+            </div>
+            <div class="section" title="4.3. Installing convenient shortcuts">
+               <div class="titlepage">
+                  <div>
+                     <div>
+                        <h3 class="title"><a name="installing.convenient.shortcuts"></a>4.3. Installing convenient shortcuts
+                        </h3>
+                     </div>
+                  </div>
+               </div>
+               <p>Follow your system's instructions to install
+                        <span class="application">OmegaT</span> shortcuts in convenient places of your
+                        choosing.
+               </p>
+            </div>
+            <div class="section" title="4.4. Running OmegaT">
+               <div class="titlepage">
+                  <div>
+                     <div>
+                        <h3 class="title"><a name="running.OmegaT.other"></a>4.4. Running <span class="application">OmegaT<a class="indexterm" name="d0e1390"></a></span></h3>
+                     </div>
+                  </div>
+               </div>
+               <p>Once <span class="application">OmegaT</span> is installed, you can
+                        launch it directly from the command line, you can create a script that
+                        includes launch parameters for the command line or you can click on
+                        <span class="emphasis"><em><span class="application">OmegaT</span>.jar</em></span> to launch it
+                        directly. Methods differ depending on the distribution. Make sure that
+                        your <span class="emphasis"><em>PATH</em></span> settings are correct and that
+                        <span class="emphasis"><em>.jar </em></span> files are properly associated with a Java
+                        launcher. Check "Command line launching" below for more
+                        information.
+               </p>
+            </div>
+         </div>
+         <div class="section" title="5. Using Java Web Start">
+            <div class="titlepage">
+               <div>
+                  <div>
+                     <h2 class="title" style="clear: both"><a name="using.Java.Web.Start"></a>5. Using Java Web Start<a class="indexterm" name="d0e1414"></a></h2>
+                  </div>
+               </div>
+            </div>
+            <p>Java Web Start technology (part of Java 1.5 and above) can be used
+                   to deploy standalone Java software applications with a single click over
+                   the network. Java Web Start ensures that the latest version of the
+                   application will be deployed, as well as the correct version of the Java
+                   Runtime Environment (JRE) used. To start OmegaT for the first time with
+                   Java Web Start, load the following URL in your browser:
+            </p>
+            <p><span class="emphasis"><em>http://omegat.sourceforge.net/webstart/<span class="application">OmegaT</span>.jnlp</em></span></p>
+            <p>Download the file<span class="emphasis"><em>
+                         <span class="application">OmegaT</span>.jnlp</em></span> and then click on it.
+                   During the installation, depending on your operating system, you may
+                   receive several security warnings. The permissions you give to this
+                   version (which may appear as "unrestricted access to the computer") are
+                   identical to the permissions you give to the local version, i.e., they
+                   allow access to the hard drive of the computer. Subsequent clicks on
+                   <span class="emphasis"><em><span class="application">OmegaT</span>.jnlp</em></span> will check for
+                   any upgrades, install them, if there are any, and then start
+                   <span class="application">OmegaT</span>. After the initial installation you can,
+                   of course, also use
+                   <span class="emphasis"><em><span class="application">OmegaT</span>.jnlp</em></span> also when you
+                   are offline.
+            </p>
+            <p><span class="bold"><strong>Privacy</strong></span>:
+                   <span class="application">OmegaT</span> Java Web Start does not save any of your
+                   information beyond the computer on which you are running it. The
+                   application runs on your machine only. Your documents and translation
+                   memories remain on your computer, and the
+                   <span class="application">OmegaT</span> project will have no access to your work
+                   or information.
+            </p>
+            <p>Note that if you need or wish to use any of the launch command
+                   arguments (see above), you must use the normal installation.
+            </p>
+         </div>
+         <div class="section" title="6. Starting OmegaT from the command line">
+            <div class="titlepage">
+               <div>
+                  <div>
+                     <h2 class="title" style="clear: both"><a name="d0e1460"></a>6. Starting OmegaT from the command line<a class="indexterm" name="d0e1463"></a></h2>
+                  </div>
+               </div>
+            </div>
+            <p>Normally, it is not necessary to start
+                   <span class="application">OmegaT</span> from the command line. However, the
+                   command-line alternative allows the user to control and modify the
+                   program's behavior. There are two ways of launching
+                   <span class="application">OmegaT</span> using the command line.
+            </p>
+            <div class="section" title="6.1. Opening a command line window">
+               <div class="titlepage">
+                  <div>
+                     <div>
+                        <h3 class="title"><a name="method1.opening.commandline.window"></a>6.1. Opening a command line window
+                        </h3>
+                     </div>
+                  </div>
+               </div>
+               <p>A command line window is also referred to as a "terminal window".
+                        On Windows it is called an "MS-DOS window" and is available from the
+                        Start Menu, inside Programs, through the "MS-DOS" item. The Mac OS X
+                        equivalent is the application Terminal located in Applications →
+                        Utilities.
+               </p>
+               <p>To launch <span class="application">OmegaT</span>, you must normally
+                        type two commands. The first of these is:
+               </p>
+               <p><span class="emphasis"><em> <code class="literal">cd {folder}</code> </em></span></p>
+               <p>where<span class="emphasis"><em> {folder}</em></span> is the name of the folder,
+                        with complete path, in which your <span class="application">OmegaT</span>
+                        program - specifically, the file
+                        <span class="emphasis"><em><span class="application">OmegaT</span>.jar</em></span> - is located.
+                        In practice, this command will therefore be something like this:
+               </p>
+               <p>On Windows</p>
+               <p><span class="emphasis"><em> <code class="literal">cd C:\Program
+                                 Files\<span class="application">OmegaT</span></code> </em></span></p>
+               <p>On Mac OS X</p>
+               <p><code class="literal"> <code class="literal">cd <<span class="application">OmegaT</span>.app
+                              location>/<span class="application">OmegaT</span>.app/Contents/Resources/Java/</code>
+                           </code></p>
+               <p>On Linux</p>
+               <p><code class="literal">cd /usr/local/omegat</code></p>
+               <p>This command changes the folder to the folder containing the
+                        executable <span class="application">OmegaT</span> file. The second command is
+                        the command which actually launches <span class="application">OmegaT</span>.
+                        In its most basic form, this command is:
+               </p>
+               <p><code class="literal">java -jar
+                           <span class="application">OmegaT</span>.jar</code></p>
+               <p>Pay attention to the capitalization - the program will not start,
+                        if you enter <span class="emphasis"><em>omegat</em></span> instead of <span class="emphasis"><em>OmegaT
+                              </em></span>!
+               </p>
+               <p>This method has a particular benefit of being suitable for finding
+                        causes of problems: if an error occurs during use of the program, an
+                        error message is output in the terminal window which may contain useful
+                        information on the cause of the error.
+               </p>
+               <p>The above method somewhat impractical way of launching a program
+                        routinely. For this reason, the two commands described above are
+                        contained in a file (a "script", also called a ".bat file" on Windows
+                        systems).
+               </p>
+               <p>When this file is executed, the commands within it are
+                        automatically carried out. Consequently, to make changes to the launch
+                        command, it is sufficient to modify the file.
+               </p>
+            </div>
+            <div class="section" title="6.2. Launch command arguments">
+               <div class="titlepage">
+                  <div>
+                     <div>
+                        <h3 class="title"><a name="launch.command.arguments"></a>6.2. Launch command arguments<a class="indexterm" name="d0e1565"></a></h3>
+                     </div>
+                  </div>
+               </div>
+               <p>The basic command has already been mentioned above. Changes to
+                        this command involve the addition of "arguments" to it. Arguments are
+                        added after the initial <span class="emphasis"><em>"java"</em></span>, and before the
+                        <span class="emphasis"><em>"-jar <span class="application">OmegaT</span>.jar"</em></span> . Note
+                        that in Windows you can change the
+                        <span class="emphasis"><em><span class="application">OmegaT</span>.l4J.ini</em></span> file to
+                        reflect your preferences. On Mac OS X, you can change the
+                        <span class="emphasis"><em>Info.plist</em></span> located in
+                        <span class="emphasis"><em><span class="application">OmegaT</span>.app/Contents/</em></span> to
+                        do the same.
+               </p>
+               <p>A list of possible arguments is given below. Advanced users can
+                        obtain more information on the arguments by typing <span class="emphasis"><em>man
+                              java</em></span> in the terminal window.
+               </p>
+               <div class="itemizedlist">
+                  <ul class="itemizedlist" type="disc">
+                     <li class="listitem">
+                        <p><span class="bold"><strong>User interface language
+                                           </strong></span></p>
+                        <p><span class="bold"><strong>-Duser.language=XX</strong></span><a class="indexterm" name="d0e1607"></a> Normally, i.e. when <span class="application">OmegaT</span>
+                                     is launched without any arguments, the program first detects the
+                                     language of the user's operating system. If a user interface in this
+                                     language is available, <span class="application">OmegaT</span> uses it.
+                                     So, if the user's operating system is Russian and
+                                     <span class="application">OmegaT</span> has been localized in Russian,
+                                     <span class="application">OmegaT</span> is displayed with a Russian user
+                                     interface, Russian menus, etc. If the language of the user's system
+                                     is not available, <span class="application">OmegaT</span> defaults to
+                                     English. This is the standard behavior.
+                        </p>
+                        <p>The <span class="emphasis"><em>"-Duser.language=XX"</em></span> argument causes
+                                     <span class="application">OmegaT</span> to use the language specified
+                                     rather than the language of the user's operating system. "XX" in the
+                                     command stands for the two-digit code of the desired language. To
+                                     launch <span class="application">OmegaT</span> with a French interface
+                                     (for example on a Russian operating system), the command would
+                                     therefore be:
+                        </p>
+                        <p><code class="literal">java -Duser.language=fr -jar
+                                        <span class="application">OmegaT</span>.jar</code></p>
+                     </li>
+                  </ul>
+               </div>
+               <div class="itemizedlist">
+                  <ul class="itemizedlist" type="disc">
+                     <li class="listitem">
+                        <p><span class="bold"><strong>User country setup</strong></span></p>
+                        <p><span class="bold"><strong>-Duser.country=XX</strong></span><a class="indexterm" name="d0e1655"></a>Besides the language, you can also specify the
+                                     country, for example CN or TW in case of the Chinese language. To
+                                     display the instant start guide in the desired language, you need to
+                                     specify both the language and the country. This is necessary even if
+                                     there's only one combination available, like pt_BR in case of
+                                     Portuguese / Brazil.
+                        </p>
+                     </li>
+                  </ul>
+               </div>
+               <div class="itemizedlist">
+                  <ul class="itemizedlist" type="disc">
+                     <li class="listitem">
+                        <p><span class="bold"><strong>Font antialiasing</strong></span> - (Java 1.5
+                                     only)
+                        </p>
+                        <p><span class="bold"><strong>-Dswing.aatext=true<a class="indexterm" name="d0e1672"></a></strong></span>This argument effects anti-aliasing of the
+                                     fonts, thereby improving their appearance.
+                        </p>
+                     </li>
+                     <li class="listitem">
+                        <p><span class="bold"><strong>Memory assignment</strong></span></p>
+                        <p><span class="bold"><strong>-XmxZZM </strong></span><a class="indexterm" name="d0e1687"></a>This command assigns more memory to
+                                     <span class="application">OmegaT</span>. By default, 256 MB are assigned,
+                                     so there is no advantage in assigning less than this figure. "ZZ"
+                                     stands for the amount of memory assigned, in megabytes. The command
+                                     to launch <span class="application">OmegaT</span> with assignment of 1024
+                                     MB (1 gigabyte) of memory is therefore:
+                        </p>
+                        <p><code class="literal">java -Xmx1024M -jar
+                                        <span class="application">OmegaT</span>.jar</code></p>
+                     </li>
+                     <li class="listitem">
+                        <p><span class="bold"><strong>Proxy host IP address</strong></span></p>
+                        <p><span class="bold"><strong><span class="bold"><strong>-Dhttp.proxyHost=nnn.nnn.nnn.nnn</strong></span> <a class="indexterm" name="d0e1716"></a></strong></span> the IP address of your proxy server, if
+                                     your system uses as proxy
+                        </p>
+                     </li>
+                     <li class="listitem">
+                        <p><span class="bold"><strong>Proxy Server Port
+                                           Number</strong></span></p>
+                        <p><span class="bold"><strong>Dhttp.proxyPort=NNNN</strong></span>
+                                     <a class="indexterm" name="d0e1732"></a>the port number your system uses to access the proxy
+                                     server.
+                        </p>
+                     </li>
+                  </ul>
+               </div>
+               <p>Arguments can be combined: to launch
+                        <span class="application">OmegaT</span> with all the examples described above,
+                        the command would be:
+               </p>
+               <p><code class="literal">java -Dswing.aatext=true -Duser.language=pt
+                           -Duser.country=BR -Xmx1024M <span class="application">-DDhttp.proxyHost=192.168.1.1
+                              -Dhttp.proxyport<span class="bold"><strong>=</strong></span>3128 -jar
+                              -OmegaT</span>.jar</code></p>
+            </div>
+            <div class="section" title="6.3. OmegaT in the command line mode">
+               <div class="titlepage">
+                  <div>
+                     <div>
+                        <h3 class="title"><a name="omegat.command.arguments"></a>6.3. OmegaT in the command line mode<a class="indexterm" name="d0e1757"></a></h3>
+                     </div>
+                  </div>
+               </div>
+               <p>The purpose of the console mode is to use OmegaT as a translation
+                        tool in a scripting environment. When started in console mode, no GUI is
+                        loaded (so it will work on any console) and the given project is
+                        automatically processed as requested.
+               </p>
+               <div class="section" title="6.3.1. Prerequisites">
+                  <div class="titlepage">
+                     <div>
+                        <div>
+                           <h4 class="title"><a name="console.mode.prerequisites"></a>6.3.1. Prerequisites
+                           </h4>
+                        </div>
+                     </div>
+                  </div>
+                  <p>To run <span class="application">OmegaT</span> in the command line
+                             mode, a valid <span class="application">OmegaT</span> project must be
+                             present. The location does not matter, since you have to add it to the
+                             command line at the start-up anyway.
+                  </p>
+                  <p>If you need altered settings, the configuration files must be
+                             available This can be achieved in two ways:
+                  </p>
+                  <div class="itemizedlist">
+                     <ul class="itemizedlist" type="disc">
+                        <li class="listitem">
+                           <p>Run <span class="application">OmegaT</span> normally (with the
+                                          GUI) and specify the settings. If you start
+                                          <span class="application">OmegaT</span> in console mode, it will use the
+                                          same settings.
+                           </p>
+                        </li>
+                        <li class="listitem">
+                           <p>If you can't run <span class="application">OmegaT</span> normally
+                                          (no graphical environment available): copy the settings files from
+                                          some other <span class="application">OmegaT</span> installation on
+                                          another machine to a specific directory. The location does not
+                                          matter, since you can add it to the command line at startup. The
+                                          relevant files are <code class="literal">filters.conf</code> and
+                                          <code class="literal">segmentation.conf</code> and can be found in the user
+                                          home directory (e.g. <code class="literal">C:\Documents and
+                                             Settings\%User%\<span class="application">OmegaT</span></code> under
+                                          windows, <code class="literal">%user%/.omegat/</code> under Linux)
+                           </p>
+                        </li>
+                     </ul>
+                  </div>
+               </div>
+               <div class="section" title="6.3.2. Starting in console mode">
+                  <div class="titlepage">
+                     <div>
+                        <div>
+                           <h4 class="title"><a name="starting.in.console.mode"></a>6.3.2. Starting in console mode
+                           </h4>
+                        </div>
+                     </div>
+                  </div>
+                  <p>To start <span class="application">OmegaT</span> in console mode, some
+                             extra parameters have to be passed to it on startup. The most
+                             important is <code class="literal"><project-dir></code>, and
+                             optionally<code class="literal"> --config-dir=<config-dir>.
+                                </code>Example:
+                  </p>
+                  <p><code class="literal">java -jar <span class="application">OmegaT</span>.jar
+                                /path/to/project \</code></p>
+                  <p><code class="literal"> --config-dir=/path/to/config-files/ \</code></p>
+                  <p><code class="literal">
+                                --mode=console-translate|console-createpseudotranslatetmx|console-align</code></p>
+                  <p><code class="literal"> --source-pattern={regexp}</code></p>
+                  <p>Note that all parameters start with a double - character.</p>
+                  <p><span class="bold"><strong>Explanation:</strong></span></p>
+                  <div class="itemizedlist">
+                     <ul class="itemizedlist" type="disc">
+                        <li class="listitem">
+                           <p><code class="literal"><project-dir></code> tells
+                                          <span class="application">OmegaT</span> where to find the project to
+                                          translate. If given, <span class="application">OmegaT</span> starts in
+                                          console mode and will translate the given project.
+                           </p>
+                        </li>
+                     </ul>
+                  </div>
+                  <div class="itemizedlist">
+                     <ul class="itemizedlist" type="disc">
+                        <li class="listitem">
+                           <p><code class="literal">--config-dir=<config-dir></code> tells
+                                          <span class="application">OmegaT</span> in which directory the
+                                          configuration files are stored. If not given,
+                                          <span class="application">OmegaT</span> reverts to default values
+                                          (<span class="application">OmegaT</span> dir under user home, or if not
+                                          available, the current working directory). Note double -
+                                          character
+                           </p>
+                        </li>
+                     </ul>
+                  </div>
+                  <div class="itemizedlist">
+                     <ul class="itemizedlist" type="disc">
+                        <li class="listitem">
+                           <p><span class="emphasis"><em><code class="literal">--mode</code>=...-</em></span>
+                                          <span class="application">OmegaT</span> starts in console mode to
+                                          perform one of the following services automatically
+                           </p>
+                           <div class="itemizedlist">
+                              <ul class="itemizedlist" type="circle">
+                                 <li class="listitem">
+                                    <p><span class="emphasis"><em><span class="emphasis"><em><code class="literal">--mode=console-translate</code></em></span></em></span></p>
+                                    <p>In this mode, OmegaT will attempt to translate the files
+                                                       in /source/ with the available translation memories. This is
+                                                       useful to run OmegaT on a server with TMX files automatically
+                                                       fed to a project.
+                                    </p>
+                                 </li>
+                                 <li class="listitem">
+                                    <p><code class="literal">--mode=console-createpseudotranslatetmx</code></p>
+                                    <p>In this mode, OmegaT will create a TMX for the whole
+                                                       project. Additional parameter allows the user to decide about
+                                                       the values for target entries:
+                                    </p>
+                                    <p>--pseudotranslatetype=[equal|empty]</p>
+                                 </li>
+                                 <li class="listitem">
+                                    <p><code class="literal">--mode=console-align</code></p>
+                                    <p>In this mode, OmegaT will align the Java properties
+                                                       found in the<code class="literal"> /source/ </code>folder of the project
+                                                       to the Java properties found at the specified location. The
+                                                       resulting TMX is stored in the <code class="filename">/omegat/</code>
+                                                       folder under the name <code class="filename">align.tmx</code>.
+                                    </p>
+                                    <p>Additional parameter is required in this case,
+                                                       specifying the location of the target data:
+                                    </p>
+                                    <p><code class="literal">--alignDir={location of translated
+                                                          files}</code></p>
+                                    <p><code class="filename">alignDir</code>must contain a translation
+                                                       in the target language of the project. (e.g., if the project
+                                                       is EN->FR, alignDir must contain a bundle ending with _fr).
+                                                       The resulting tmx is stored in the
+                                                       <code class="literal">omegat</code>folder under the name
+                                                       <code class="filename">align.tmx</code>.
+                                    </p>
+                                 </li>
+                              </ul>
+                           </div>
+                        </li>
+                        <li class="listitem">
+                           <p><code class="literal">--source-pattern={regexp} </code></p>
+                           <p>When mode has been used, this option will specify the files
+                                          to be processed automatically.. If the parameter is not specified,
+                                          all files will be processed. Here's few typical examples tro limit
+                                          your choice:
+                           </p>
+                           <div class="itemizedlist">
+                              <ul class="itemizedlist" type="circle">
+                                 <li class="listitem">
+                                    <p><span class="emphasis"><em><code class="literal">.*\.html</code></em></span></p>
+                                    <p>All HTML files will be translated - not that the period
+                                                       in the usual *.html has to be escaped (\.) as specified by the
+                                                       rules for regular expressions
+                                    </p>
+                                 </li>
+                                 <li class="listitem">
+                                    <p><code class="literal">test\.html</code></p>
+                                    <p>Only the file test.html at the root of the source
+                                                       directory will be translated. If there are other files named
+                                                       test.html in other directories, they will be ignored.
+                                    </p>
+                                 </li>
+                                 <li class="listitem">
+                                    <p><code class="literal">dir-10\\test\.html</code></p>
+                                    <p>Only the file test.html in the directory dir-10 will be
+                                                       processed. Again note that the backslash is escaped as
+                                                       well.
+                                    </p>
+                                 </li>
+                              </ul>
+                           </div>
+                        </li>
+                     </ul>
+                  </div>
+               </div>
+               <div class="section" title="6.3.3. Quiet option">
+                  <div class="titlepage">
+                     <div>
+                        <div>
+                           <h4 class="title"><a name="console.mode.extra.options"></a>6.3.3. Quiet option
+                           </h4>
+                        </div>
+                     </div>
+                  </div>
+                  <p>There is one extra command line parameter specific to console
+                             mode: <code class="literal">--quiet. </code>In the quiet mode, less info is
+                             logged to the screen. The messages you would usually find in the
+                             status bar are not displayed.
+                  </p>
+                  <p>Usage: <code class="literal">java -jar <span class="application">OmegaT</span>.jar
+                                /path/to/project --quiet</code></p>
+               </div>
+            </div>
+         </div>
+         <div class="section" title="7. Building OmegaT From Source">
+            <div class="titlepage">
+               <div>
+                  <div>
+                     <h2 class="title" style="clear: both"><a name="building.OmegaT.from.source"></a>7. Building <span class="application">OmegaT</span> From Source<a class="indexterm" name="d0e1976"></a></h2>
+                  </div>
+               </div>
+            </div>
+            <p>Note that you will need the ant program
+                   (<span class="emphasis"><em>http://ant.apache.org/bindownload.cgi</em></span>) to build your
+                   own version of OmegaT. Unpack the
+                   <span class="emphasis"><em>OmegaT_2.3.x_Source.zip</em></span> file and enter the
+                   OmegaT_2.3.x_Source directory or enter the <span class="emphasis"><em>./omegat/</em></span>
+                   directory of the SVN checked out code. Please make sure that a build.xml
+                   file is present in that folder. Then, on the command line, type:
+            </p>
+            <p><code class="literal">$ ant jar release</code></p>
+            <p>This will create a full distribution of
+                   <span class="application">OmegaT</span> in the ./dist/ folder, where you will
+                   find all the files necessary to run
+                   <span class="application">OmegaT</span>.
+            </p>
+         </div>
+      </div>
+      <div class="navfooter">
+         <hr>
+         <table width="100%" summary="Navigation footer">
+            <tr>
+               <td width="40%" align="left"><a accesskey="p" href="chapter.instant.start.guide.html">Prev</a> 
+               </td>
+               <td width="20%" align="center"> </td>
+               <td width="40%" align="right"> <a accesskey="n" href="chapter.user.interface.html">Next</a></td>
+            </tr>
+            <tr>
+               <td width="40%" align="left" valign="top">Chapter 2. Instant Start Guide </td>
+               <td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td>
+               <td width="40%" align="right" valign="top"> Chapter 4. The user interface</td>
+            </tr>
+         </table>
+      </div>
+   </body>
+</html>
\ No newline at end of file
diff --git a/docs/en/chapter.instant.start.guide.html b/docs/en/chapter.instant.start.guide.html
new file mode 100644
index 0000000..37acaf7
--- /dev/null
+++ b/docs/en/chapter.instant.start.guide.html
@@ -0,0 +1,603 @@
+<html>
+   <head>
+      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+   
+      <title>Chapter 2. Instant Start Guide</title>
+      <link rel="stylesheet" href="OmegaT.css" type="text/css">
+      <meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+      <link rel="home" href="index.html" title="OmegaT - User's Guide">
+      <link rel="up" href="index.html" title="OmegaT - User's Guide">
+      <link rel="prev" href="chapter.about.OmegaT.html" title="Chapter 1. About OmegaT - introduction">
+      <link rel="next" href="chapter.installing.and.running.html" title="Chapter 3. Installing and running OmegaT">
+   </head>
+   <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+      <div class="navheader">
+         <table width="100%" summary="Navigation header">
+            <tr>
+               <th colspan="3" align="center">Chapter 2. Instant Start Guide</th>
+            </tr>
+            <tr>
+               <td width="20%" align="left"><a accesskey="p" href="chapter.about.OmegaT.html">Prev</a> 
+               </td>
+               <th width="60%" align="center"> </th>
+               <td width="20%" align="right"> <a accesskey="n" href="chapter.installing.and.running.html">Next</a></td>
+            </tr>
+         </table>
+         <hr>
+      </div>
+      <div class="chapter" title="Chapter 2. Instant Start Guide">
+         <div class="titlepage">
+            <div>
+               <div>
+                  <h2 class="title"><a name="chapter.instant.start.guide"></a>Chapter 2. Instant Start Guide
+                  </h2>
+               </div>
+            </div>
+         </div>
+         <div class="toc">
+            <dl>
+               <dt><span class="section"><a href="chapter.instant.start.guide.html#d0e184">1. Start Using <span class="application">OmegaT</span> in 5 Minutes!</a></span></dt>
+               <dt><span class="section"><a href="chapter.instant.start.guide.html#d0e226">2. Translating with <span class="application">OmegaT</span></a></span></dt>
+               <dd>
+                  <dl>
+                     <dt><span class="section"><a href="chapter.instant.start.guide.html#create.and.open.new.project">2.1. Creating and opening a new project</a></span></dt>
+                     <dt><span class="section"><a href="chapter.instant.start.guide.html#translate.the.segments.one.by.one">2.2. Translating segments one by one</a></span></dt>
+                     <dt><span class="section"><a href="chapter.instant.start.guide.html#use.matches.in.TMs.dictionaries.and.glossaries">2.3. Using matches in the translation memories, dictionaries and
+                                    glossaries</a></span></dt>
+                     <dt><span class="section"><a href="chapter.instant.start.guide.html#create.translated.documents">2.4. Creating translated documents</a></span></dt>
+                  </dl>
+               </dd>
+               <dt><span class="section"><a href="chapter.instant.start.guide.html#how.to.handle.tagged.text">3. Handling tagged text</a></span></dt>
+               <dd>
+                  <dl>
+                     <dt><span class="section"><a href="chapter.instant.start.guide.html#d0e680">3.1. An example...</a></span></dt>
+                     <dt><span class="section"><a href="chapter.instant.start.guide.html#tag.verification">3.2. Tag verification</a></span></dt>
+                  </dl>
+               </dd>
+            </dl>
+         </div>
+         <div class="section" title="1. Start Using OmegaT in 5 Minutes!">
+            <div class="titlepage">
+               <div>
+                  <div>
+                     <h2 class="title" style="clear: both"><a name="d0e184"></a>1. Start Using <span class="application">OmegaT</span> in 5 Minutes!
+                     </h2>
+                  </div>
+               </div>
+            </div>
+            <p>This instant start guide covers only the very basics of OmegaT.
+                   Ideally, users should read the User Manual to familiarize themselves with
+                   everything <span class="application">OmegaT</span> has to offer. Note for Mac
+                   users: shortcuts are described here as "<span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>key</strong></span>" but Mac users should instead use "<span class="keycap"><strong>Cmd</strong></span>+<span class="keycap"><strong>key</strong></span>". The "<span class="keycap"><strong>Cmd</strong></span>" key either has a "command"
+                   label or an apple symbol on Apple keyboards.
+            </p>
+            <p>The <span class="application">OmegaT</span> screen consists of one
+                   workspace with five distinct panes<a class="indexterm" name="d0e215"></a>. Each of these can be resized using the mouse. On the left
+                   is the Editor where you type your translation. On the top right is the
+                   Match Viewer, where translation memory matches are displayed. Below this
+                   is the Glossary Viewer, where glossary matches are displayed. Two
+                   additional tabs at the bottom of the window open the Dictionary and
+                   Machine Translation panes. (Note: you can of course rearrange the panes to
+                   your own liking - the above description applies to your OmegaT after
+                   installation).
+            </p>
+            <p>In the Editor pane OmegaT presents the source text 'segmented' into
+                   either sentences or paragraphs. These are then translated, one by one. As
+                   you progress from segment to segment, your translations are recorded
+                   automatically in a translation memory. Once all the segments have been
+                   translated (or before, if you request) <span class="application">OmegaT</span>
+                   uses the translation memory to generate the translated document(s) in a
+                   “Target” folder.
+            </p>
+            <p>OmegaT organizes your translation work in translation “projects”.
+                   For each project, OmegaT creates a set of folders which, in turn, are used
+                   to store the source documents to be translated as well as any glossaries
+                   and translation memories you may wish to use. OmegaT also creates a
+                   “Target” folder, in which OmegaT places the final translated
+                   documents.
+            </p>
+         </div>
+         <div class="section" title="2. Translating with OmegaT">
+            <div class="titlepage">
+               <div>
+                  <div>
+                     <h2 class="title" style="clear: both"><a name="d0e226"></a>2. Translating with <span class="application">OmegaT</span></h2>
+                  </div>
+               </div>
+            </div>
+            <div class="section" title="2.1. Creating and opening a new project">
+               <div class="titlepage">
+                  <div>
+                     <div>
+                        <h3 class="title"><a name="create.and.open.new.project"></a>2.1. Creating and opening a new project<a class="indexterm" name="d0e234"></a></h3>
+                     </div>
+                  </div>
+               </div>
+               <p>Select <span class="guimenu">Project</span> → <span class="guimenuitem">New...</span><a class="indexterm" name="d0e246"></a> from the menu.
+               </p>
+               <p>Navigate to the folder where you wish to save the project files,
+                        and type in a name for the translation project. This name will be used
+                        for the main project folder; all the project files will be stored in
+                        this folder or its subfolders.
+               </p>
+               <p><span class="application">OmegaT</span> will prompt you to confirm or
+                        change the project folders to be created, using the dialog below:
+               </p>
+               <div class="figure"><a name="New.project.dialog.window"></a><p class="title"><b>Figure 2.1. <a class="indexterm" name="d0e260"></a>New project - dialog window</b></p>
+                  <div class="figure-contents">
+                     <div class="mediaobject"><img src="images/NewProject.png" alt="ProjectProject dialog window - figureNew project - dialog window"></div>
+                  </div>
+               </div><br class="figure-break"><p>You can simply accept the default locations of the subfolders, but
+                        be sure to check that the source language and target language codes are
+                        correct. Select the language code (2 letters) or language-and-region
+                        code (2 + 2 letters) from the drop-down list, or type them in by hand
+                        (the language code can be 2 to 3 letters). Make a mental note of the
+                        location of the Target subfolder (for your translated documents). If you
+                        prefer OmegaT to segment by sentence instead of by "paragraph", please
+                        read the chapter on Segmentation Rules<a class="indexterm" name="d0e271"></a>.
+               </p>
+               <p>When you click OK to accept the project set-up, OmegaT prompts you
+                        to select the source documents for import. You can import individual
+                        files with<em class="firstterm"> Project > Import Source Files</em>, or
+                        you can copy files or even entire folder trees (with all files in all
+                        subfolders) manually into the Source folder of your OmegaT project
+                        (using your system's file manager, for example). If you've accidentally
+                        imported the wrong documents, or too many documents, you can simply
+                        remove them again from the Source folder.
+               </p>
+               <p>To check your list of files to be translated, consult the
+                        <span class="bold"><strong>Project Files</strong></span> <a class="indexterm" name="d0e287"></a>window (Menu: <span class="guimenu">Project</span> → <span class="guimenuitem">Project Files...</span>,<a class="indexterm" name="d0e299"></a> if it does not open automatically). If you had to change
+                        the Contents of the Source folder, remember to reload the project first
+                        (Menu: <span class="guimenu">Project</span> → <span class="guimenuitem">Reload</span> (<span class="shortcut"><strong><span class="keycap"><strong>F5</strong></span></strong></span>)). <span class="application">OmegaT</span> opens the first
+                        file in the project list by default. Bear in mind that
+                        <span class="application">OmegaT</span> can only translate files in the
+                        formats below if they match the patterns defined in the file filters.
+                        Any other files will be ignored.<a class="indexterm" name="d0e320"></a></p>
+               <div class="itemizedlist">
+                  <ul class="itemizedlist" type="disc">
+                     <li class="listitem">
+                        <p><span class="bold"><strong> Plain text file formats<a class="indexterm" name="d0e330"></a></strong></span></p>
+                        <div class="itemizedlist">
+                           <ul class="itemizedlist" type="circle">
+                              <li class="listitem">
+                                 <p>ASCII text (.txt, etc.)</p>
+                              </li>
+                              <li class="listitem">
+                                 <p>Encoded text (*.UTF8)</p>
+                              </li>
+                           </ul>
+                        </div>
+                        <div class="itemizedlist">
+                           <ul class="itemizedlist" type="circle">
+                              <li class="listitem">
+                                 <p>Java resource bundles (*.properties)</p>
+                              </li>
+                           </ul>
+                        </div>
+                        <div class="itemizedlist">
+                           <ul class="itemizedlist" type="circle">
+                              <li class="listitem">
+                                 <p>PO files (*.po)</p>
+                              </li>
+                           </ul>
+                        </div>
+                        <div class="itemizedlist">
+                           <ul class="itemizedlist" type="circle">
+                              <li class="listitem">
+                                 <p>INI (key=value) files (*.ini)</p>
+                              </li>
+                           </ul>
+                        </div>
+                        <div class="itemizedlist">
+                           <ul class="itemizedlist" type="circle">
+                              <li class="listitem">
+                                 <p>DTD files (*.DTD)</p>
+                              </li>
+                              <li class="listitem">
+                                 <p>DocuWiki files (*.txt)</p>
+                              </li>
+                           </ul>
+                        </div>
+                     </li>
+                  </ul>
+               </div>
+               <div class="itemizedlist">
+                  <ul class="itemizedlist" type="disc">
+                     <li class="listitem">
+                        <p><span class="bold"><strong>Tagged text file formats<a class="indexterm" name="d0e366"></a></strong></span></p>
+                        <div class="itemizedlist">
+                           <ul class="itemizedlist" type="circle">
+                              <li class="listitem">
+                                 <p>OpenOffice.org / OpenDocument (*.odt, *.ott, *.ods, *.ots,
+                                                  *.odp, *.otp)
+                                 </p>
+                              </li>
+                           </ul>
+                        </div>
+                        <div class="itemizedlist">
+                           <ul class="itemizedlist" type="circle">
+                              <li class="listitem">
+                                 <p>Microsoft Open XML (*.docx. *.xlsx, *.pptx)</p>
+                              </li>
+                           </ul>
+                        </div>
+                        <div class="itemizedlist">
+                           <ul class="itemizedlist" type="circle">
+                              <li class="listitem">
+                                 <p>(X)HTML (*.html, *.xhtml,*.xht)</p>
+                              </li>
+                           </ul>
+                        </div>
+                        <div class="itemizedlist">
+                           <ul class="itemizedlist" type="circle">
+                              <li class="listitem">
+                                 <p>HTML Help Compiler (*.hhc, *.hhk)</p>
+                              </li>
+                           </ul>
+                        </div>
+                        <div class="itemizedlist">
+                           <ul class="itemizedlist" type="circle">
+                              <li class="listitem">
+                                 <p>DocBook (*.xml)</p>
+                              </li>
+                           </ul>
+                        </div>
+                        <div class="itemizedlist">
+                           <ul class="itemizedlist" type="circle">
+                              <li class="listitem">
+                                 <p>monolingual XLIFF (*.xlf, *.xliff, *.sdlxliff)</p>
+                              </li>
+                           </ul>
+                        </div>
+                        <div class="itemizedlist">
+                           <ul class="itemizedlist" type="circle">
+                              <li class="listitem">
+                                 <p>QuarkXPress CopyFlowGold (*.tag, *.xtg)</p>
+                              </li>
+                           </ul>
+                        </div>
+                        <div class="itemizedlist">
+                           <ul class="itemizedlist" type="circle">
+                              <li class="listitem">
+                                 <p>SubRip title files (*.srt)</p>
+                              </li>
+                           </ul>
+                        </div>
+                        <div class="itemizedlist">
+                           <ul class="itemizedlist" type="circle">
+                              <li class="listitem">
+                                 <p>ResX files (*.resx)</p>
+                              </li>
+                           </ul>
+                        </div>
+                        <div class="itemizedlist">
+                           <ul class="itemizedlist" type="circle">
+                              <li class="listitem">
+                                 <p>Android resource (*.xml)</p>
+                              </li>
+                           </ul>
+                        </div>
+                        <div class="itemizedlist">
+                           <ul class="itemizedlist" type="circle">
+                              <li class="listitem">
+                                 <p>LaTex (*.tex, *.latex)</p>
+                              </li>
+                              <li class="listitem">
+                                 <p>Help (*.xml) and Manual (*.hmxp) files</p>
+                              </li>
+                              <li class="listitem">
+                                 <p>Typo3 LocManager (*.xml)</p>
+                              </li>
+                           </ul>
+                        </div>
+                        <div class="itemizedlist">
+                           <ul class="itemizedlist" type="circle">
+                              <li class="listitem">
+                                 <p>WiX Localization (*.wxl)</p>
+                              </li>
+                              <li class="listitem">
+                                 <p>Iceni Infix (*.xml)</p>
+                              </li>
+                              <li class="listitem">
+                                 <p>Flash XML export (*.xml)</p>
+                              </li>
+                           </ul>
+                        </div>
+                     </li>
+                  </ul>
+               </div>
+               <p>In addition to the text you wish to translate, tagged text files
+                        contain formatting information made visible in OmegaT in the form of
+                        “tags”. The tags must also be present in the translated text, even if
+                        the formatting does not need to be “translated”. If tags happen to be
+                        missing or are misplaced, the text may not be shown as intended and the
+                        translation will have to be corrected - see the chapter "Tag verification"
+                        below.
+               </p>
+            </div>
+            <div class="section" title="2.2. Translating segments one by one">
+               <div class="titlepage">
+                  <div>
+                     <div>
+                        <h3 class="title"><a name="translate.the.segments.one.by.one"></a>2.2. Translating segments one by one
+                        </h3>
+                     </div>
+                  </div>
+               </div>
+               <p>Once you have defined the project and the files to be translated,
+                        <span class="application">OmegaT</span> opens the first source file in the
+                        Editor.
+               </p>
+               <p>The active segment is highlighted in green; a copy of the source
+                        text is displayed just below this in the “target field”. (At this point,
+                        all text outside the target field is protected and cannot be modified.)
+                        You must type your translation before the tag <<code class="literal">segment
+                           0001></code>. OmegaT
+                        can be set up to automatically copy the source text into the target text
+                        (see <span class="emphasis"><em>Options > Editing Behaviour...</em></span>), which can
+                        be useful when parts of the source text are to remain unchanged. In such
+                        cases you will overwrite the source text. Press <span class="bold"><strong>"ENTER"</strong></span> to advance to the next segment.
+                        Note:
+               </p>
+               <div class="itemizedlist">
+                  <ul class="itemizedlist" type="disc">
+                     <li class="listitem">
+                        <p>To move to any other part of the text, whether above or below,
+                                     double-click on the sentence or paragraph you wish to open.
+                        </p>
+                     </li>
+                     <li class="listitem">
+                        <p>If you prefer to translate into an empty target field, set
+                                     this option in <span class="guimenu">Options</span> → <span class="guimenuitem">Editing Behaviour...<a class="indexterm" name="d0e464"></a></span></p>
+                     </li>
+                     <li class="listitem">
+                        <p>You can change the setup of the Editor pane (for instance to
+                                     show the source text or not, highlight the translated text etc) in
+                                     the Main menu under View.
+                        </p>
+                        <p>When you press <span class="bold"><strong>"ENTER"</strong></span>,
+                                     several things happen invisibly: <span class="application">OmegaT</span>
+                                     adds the segment pair (the source segment and its translation) to
+                                     the internal translation memory . It also automatically translates
+                                     any other identical segments that it detects. Additionally it scans
+                                     the translation memory and glossary in search of matches for the
+                                     next untranslated segment, which it then opens.
+                        </p>
+                     </li>
+                  </ul>
+               </div>
+            </div>
+            <div class="section" title="2.3. Using matches in the translation memories, dictionaries and glossaries">
+               <div class="titlepage">
+                  <div>
+                     <div>
+                        <h3 class="title"><a name="use.matches.in.TMs.dictionaries.and.glossaries"></a>2.3. Using matches in the translation memories, dictionaries and
+                                 glossaries
+                        </h3>
+                     </div>
+                  </div>
+               </div>
+               <div class="section" title="2.3.1. Translation memory matches">
+                  <div class="titlepage">
+                     <div>
+                        <div>
+                           <h4 class="title"><a name="translation.memory.matches"></a>2.3.1. Translation memory matches<a class="indexterm" name="d0e486"></a><a class="indexterm" name="d0e491"></a></h4>
+                        </div>
+                     </div>
+                  </div>
+                  <div class="figure"><a name="d0e496"></a><p class="title"><b>Figure 2.2. Matches pane</b></p>
+                     <div class="figure-contents">
+                        <div class="mediaobject"><img src="images/MatchesPane.png" alt="Matches pane"></div>
+                     </div>
+                  </div><br class="figure-break"><p>If <span class="application">OmegaT</span> finds any fuzzy matches
+                             (30% or over) for the next segment in the translation memories in the
+                             project, it displays them in the Match Viewer. The first match is
+                             pre-selected in the Match Viewer by default.
+                  </p>
+                  <div class="itemizedlist">
+                     <ul class="itemizedlist" type="disc">
+                        <li class="listitem">
+                           <p>Press <span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>I</strong></span><a class="indexterm" name="d0e518"></a> to insert the pre-selected match at the cursor
+                                          position, or...
+                           </p>
+                        </li>
+                        <li class="listitem">
+                           <p>Press <span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>R</strong></span> <a class="indexterm" name="d0e533"></a><a class="indexterm" name="d0e538"></a>
+                                            to overwrite the entire segment with the
+                                          pre-selected match.
+                           </p>
+                        </li>
+                     </ul>
+                  </div>
+                  <p>If several matches have been found and you prefer to use a match
+                             other than the pre-selected match:
+                  </p>
+                  <div class="itemizedlist">
+                     <ul class="itemizedlist" type="disc">
+                        <li class="listitem">
+                           <p>Select the match you prefer in the Match Viewer: <span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>2</strong></span> for the second match displayed, <span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>3</strong></span> for the third match, etc.
+                           </p>
+                        </li>
+                        <li class="listitem">
+                           <p>Then use the <span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>I</strong></span> or <span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>R</strong></span> shortcuts as above.
+                           </p>
+                        </li>
+                     </ul>
+                  </div>
+                  <p>You can tell OmegaT to insert any first match above a specified
+                             percentage into the target field automatically. Set this option using
+                             <span class="guimenu">Options</span></p>
+               </div>
+               <div class="section" title="2.3.2. Glossary and Dictionary matches">
+                  <div class="titlepage">
+                     <div>
+                        <div>
+                           <h4 class="title"><a name="glossary.and.dictionary.matches"></a>2.3.2. Glossary and Dictionary matches<a class="indexterm" name="d0e583"></a></h4>
+                        </div>
+                     </div>
+                  </div>
+                  <p>Any matching terms in glossaries and dictionaries, that you may
+                             have included in the project will be displayed for reference in the
+                             glossary and dictionary panes.
+                  </p>
+               </div>
+               <div class="section" title="2.3.3. Use searches">
+                  <div class="titlepage">
+                     <div>
+                        <div>
+                           <h4 class="title"><a name="use.searches"></a>2.3.3. Use searches
+                           </h4>
+                        </div>
+                     </div>
+                  </div>
+                  <p><span class="application">OmegaT</span> provides a powerful range of
+                             search functions. Call up the Search window with <span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>F</strong></span> and type in the word or phrase you wish to search for in
+                             the "Search for" box. Alternatively, select a word or phrase anywhere
+                             in the Editor pane and press <span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>F</strong></span>: the selected word or phrase will be inserted
+                             automatically into the "Search for" box in the window, that then
+                             opens.
+                  </p>
+               </div>
+               <div class="section" title="2.3.4. Use Machine Translation services">
+                  <div class="titlepage">
+                     <div>
+                        <div>
+                           <h4 class="title"><a name="use.Google.Translate"></a>2.3.4. Use Machine Translation services<a class="indexterm" name="d0e612"></a></h4>
+                        </div>
+                     </div>
+                  </div>
+                  <p>In the Machine Translation pane, if any of the services is
+                             activated (see <span class="emphasis"><em>Options > Machine Translate</em></span>),
+                             you will receive an automatic suggestion for the translation of the
+                             current segment. Press <span class="emphasis"><em>Ctrl+M </em></span> to replace the
+                             target segment with this suggestion.
+                  </p>
+               </div>
+            </div>
+            <div class="section" title="2.4. Creating translated documents">
+               <div class="titlepage">
+                  <div>
+                     <div>
+                        <h3 class="title"><a name="create.translated.documents"></a>2.4. Creating translated documents<a class="indexterm" name="d0e628"></a></h3>
+                     </div>
+                  </div>
+               </div>
+               <p>When you have translated all the segments (or earlier if you
+                        wish), <span class="application">OmegaT</span> will create the target
+                        document(s) using the translations stored in the translation memory. To
+                        do this, select <span class="guimenu">Project</span> → <span class="guimenuitem">Create Translated Documents</span> (<span class="shortcut"><strong><span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>D</strong></span></strong></span>)<a class="indexterm" name="d0e649"></a> <a class="indexterm" name="d0e655"></a>from the menu. <span class="application">OmegaT</span> will
+                        build translated versions of all the translatable documents in the
+                        Source folder of the project, whether or not they have been fully
+                        translated. The wholly or partially translated files will be saved to
+                        the project's Target folder. To finalize your translation, open the
+                        target files in their associated applications (browser, word
+                        processor...) to check the content and formatting of your translation.
+                        You can then return to <span class="application">OmegaT</span> to make any
+                        necessary corrections; do not forget to recreating the translated
+                        documents.
+               </p>
+            </div>
+         </div>
+         <div class="section" title="3. Handling tagged text">
+            <div class="titlepage">
+               <div>
+                  <div>
+                     <h2 class="title" style="clear: both"><a name="how.to.handle.tagged.text"></a>3. Handling tagged text<a class="indexterm" name="d0e670"></a></h2>
+                  </div>
+               </div>
+            </div>
+            <p><span class="application">OmegaT</span> ensures that the formatting of the
+                   source documents (bold, italic etc.) is not lost by marking it with
+                   special tags. <span class="application">OmegaT</span> tags are composed of one
+                   or more letters followed by one or more digit, using the "/" character for
+                   closure (for example: <f0>, </f0> <br>, </s2>
+                   etc.). You must handle these tags with care and make sure they are
+                   included in the target segments in a proper fashion (see tag
+                   operations).
+            </p>
+            <div class="section" title="3.1. An example...">
+               <div class="titlepage">
+                  <div>
+                     <div>
+                        <h3 class="title"><a name="d0e680"></a>3.1. An example...<a class="indexterm" name="d0e683"></a></h3>
+                     </div>
+                  </div>
+               </div>
+               <p>In these examples we've highlighted the tags to make them easier
+                        to see, but in <span class="application">OmegaT</span> they will not be
+                        highlighted. The HTML tags, highlighted in blue, will be ignored by
+                        <span class="application">OmegaT</span> as they fully enclose the segment. The
+                        tags highlighted below in green, however, have to be handled by
+                        <span class="application">OmegaT</span> because they are within the segment.
+                        Here is an example of a segment in HTML:
+               </p>
+               <p><code class="literal"><p>A different display font can be selected via
+                           the <b>Display Font</b>dialog. Open it via
+                           the <i>Options</i> →<i>Display Font...</i> menu
+                           item. The font type and size can be changed from the
+                           dialog.</p></code></p>
+               <p>Here is how <span class="application">OmegaT</span> will display this,
+                        with the translation in Afrikaans:
+               </p>
+               <div class="figure"><a name="fig.tagged.segment.source"></a><p class="title"><b>Figure 2.3. Source <a class="indexterm" name="d0e710"></a>HTML segment</b></p>
+                  <div class="figure-contents">
+                     <div class="mediaobject"><img src="images/tagged_segment.png" alt="Source Segment, Source and Target - figureHTML segment"></div>
+                  </div>
+               </div><br class="figure-break"><p>When <span class="application">OmegaT</span> has created the translated
+                        document, the HTML will look like this:
+               </p>
+               <div class="figure"><a name="fig.tagged.segment.target"></a><p class="title"><b>Figure 2.4. Target HTML segment</b></p>
+                  <div class="figure-contents">
+                     <div class="mediaobject"><img src="images/tagged_segment_target.png" alt="Target HTML segment"></div>
+                  </div>
+               </div><br class="figure-break"></div>
+            <div class="section" title="3.2. Tag verification">
+               <div class="titlepage">
+                  <div>
+                     <div>
+                        <h3 class="title"><a name="tag.verification"></a>3.2. Tag verification<a class="indexterm" name="d0e735"></a><a class="indexterm" name="d0e740"></a></h3>
+                     </div>
+                  </div>
+               </div>
+               <p><span class="application">OmegaT</span> doesn't automatically detect
+                        faulty tagging in the translated document. Therefore before you deliver
+                        the document to your client, you should always check your tags for
+                        errors. Select <span class="guimenu">Tools</span> → <span class="guimenuitem">Validate Tags...</span> (<span class="shortcut"><strong><span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>T</strong></span></strong></span>) from the menu. A table will be displayed showing the
+                        segments where the source and target tags do not correspond. Click on
+                        the segment number. You will be taken automatically to the questionable
+                        segment in the Editor, where you can correct the tagging. When you have
+                        carried out the corrections, check these by pressing <span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>T<a class="indexterm" name="d0e764"></a></strong></span> again. Note that the tag verifier may find an error in
+                        cases where the tags are correct - for instance when it was necessary to
+                        change the order of tags involved in making a grammatically correct
+                        translation. Please regard this as a sign that the verifier prefers to
+                        err on the side of caution.
+               </p>
+               <p>In some cases tag errors may even prevent a document from opening.
+                        This is no reason to panic - you still have both the source file and the
+                        translation available, you just need to make sure you have corrected any
+                        tag errors before you create the translated files. Finally, you should
+                        always doublecheck the final formatting by opening the translated
+                        document in its associated viewer or editor.
+               </p>
+            </div>
+         </div>
+      </div>
+      <div class="navfooter">
+         <hr>
+         <table width="100%" summary="Navigation footer">
+            <tr>
+               <td width="40%" align="left"><a accesskey="p" href="chapter.about.OmegaT.html">Prev</a> 
+               </td>
+               <td width="20%" align="center"> </td>
+               <td width="40%" align="right"> <a accesskey="n" href="chapter.installing.and.running.html">Next</a></td>
+            </tr>
+            <tr>
+               <td width="40%" align="left" valign="top">Chapter 1. About <span class="application">OmegaT</span> - introduction 
+               </td>
+               <td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td>
+               <td width="40%" align="right" valign="top"> Chapter 3. Installing and running <span class="application">OmegaT</span></td>
+            </tr>
+         </table>
+      </div>
+   </body>
+</html>
\ No newline at end of file
diff --git a/docs/en/chapter.machine.translate.html b/docs/en/chapter.machine.translate.html
new file mode 100644
index 0000000..70c012e
--- /dev/null
+++ b/docs/en/chapter.machine.translate.html
@@ -0,0 +1,242 @@
+<html>
+   <head>
+      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+   
+      <title>Chapter 20. Machine Translation</title>
+      <link rel="stylesheet" href="OmegaT.css" type="text/css">
+      <meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+      <link rel="home" href="index.html" title="OmegaT - User's Guide">
+      <link rel="up" href="index.html" title="OmegaT - User's Guide">
+      <link rel="prev" href="chapter.glossaries.html" title="Chapter 19. Glossaries">
+      <link rel="next" href="chapter.spellchecker.html" title="Chapter 21. Spell checker">
+   </head>
+   <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+      <div class="navheader">
+         <table width="100%" summary="Navigation header">
+            <tr>
+               <th colspan="3" align="center">Chapter 20. Machine Translation</th>
+            </tr>
+            <tr>
+               <td width="20%" align="left"><a accesskey="p" href="chapter.glossaries.html">Prev</a> 
+               </td>
+               <th width="60%" align="center"> </th>
+               <td width="20%" align="right"> <a accesskey="n" href="chapter.spellchecker.html">Next</a></td>
+            </tr>
+         </table>
+         <hr>
+      </div>
+      <div class="chapter" title="Chapter 20. Machine Translation">
+         <div class="titlepage">
+            <div>
+               <div>
+                  <h2 class="title"><a name="chapter.machine.translate"></a>Chapter 20. Machine Translation<a class="indexterm" name="d0e7792"></a></h2>
+               </div>
+            </div>
+         </div>
+         <div class="toc">
+            <dl>
+               <dt><span class="section"><a href="chapter.machine.translate.html#d0e7795">1. Introduction</a></span></dt>
+               <dt><span class="section"><a href="chapter.machine.translate.html#introduction">2. Google Translate</a></span></dt>
+               <dt><span class="section"><a href="chapter.machine.translate.html#d0e7825">3. <span class="application">OmegaT</span> users and Google
+                            Translate</a></span></dt>
+               <dt><span class="section"><a href="chapter.machine.translate.html#d0e7877">4. Belazar</a></span></dt>
+               <dt><span class="section"><a href="chapter.machine.translate.html#d0e7889">5. Apertium</a></span></dt>
+               <dt><span class="section"><a href="chapter.machine.translate.html#Google.Translate.troubleshooting">6. Machine translation - trouble shooting</a></span></dt>
+            </dl>
+         </div>
+         <div class="section" title="1. Introduction">
+            <div class="titlepage">
+               <div>
+                  <div>
+                     <h2 class="title" style="clear: both"><a name="d0e7795"></a>1. Introduction<a class="indexterm" name="d0e7798"></a></h2>
+                  </div>
+               </div>
+            </div>
+            <p>As opposed to user-generated translation memories (as in the case of
+                   <span class="application">OmegaT</span>) Machine translation (MT) tools use
+               rule-based linguistic tools to create a translation of the source segment
+                   without the need for a translation memory. Statistical learning
+                   techniques, based on source and target texts, are used to build a
+                   translation model. Machine translation services have been achieving good
+                   and steadfastly improving results in research evaluations.
+            </p>
+            <p>To activate any of the Machine Translation services, go to
+                   <span class="guimenuitem">Options > Machine Translate ...</span> and
+                   activate the service desired. Note that they are all web-based: you will
+                   have to be on-line if you want to use them.
+            </p>
+         </div>
+         <div class="section" title="2. Google Translate">
+            <div class="titlepage">
+               <div>
+                  <div>
+                     <h2 class="title" style="clear: both"><a name="introduction"></a>2. Google Translate<a class="indexterm" name="d0e7816"></a></h2>
+                  </div>
+               </div>
+            </div>
+            <p>Google Translate is the service offered by Google, for translating
+                   sentences, web sites and complete texts between an ever-growing number of
+                   languages. At the time of writing the list includes more than 50
+                   languages, from Albanian to Yiddish, including of course all the major
+                   languages.
+            </p>
+            <p>The quality of the translation, of course, depends on one side on
+                   the reservoir of target-language texts and the availability of their
+                   bilingual versions, on the other hand on the quality of the models built.
+                   It is pretty much certain that while the quality may be insufficient in
+                   some cases, it will definitely get better with time and not worse.
+            </p>
+         </div>
+         <div class="section" title="3. OmegaT users and Google Translate">
+            <div class="titlepage">
+               <div>
+                  <div>
+                     <h2 class="title" style="clear: both"><a name="d0e7825"></a>3. <span class="application">OmegaT</span> users and Google
+                            Translate
+                     </h2>
+                  </div>
+               </div>
+            </div>
+            <p>The <span class="application">OmegaT</span> user is not forced to use
+                   Google Translate. If used, neither the user's decision to accept the
+                   translation nor the final translation are made available to Google. The
+                   following window shows an example of a) the English source b) Spanish and
+                   c) Slovenian Google Translate translation.
+            </p>
+            <div class="figure"><a name="moby.dick"></a><p class="title"><b>Figure 20.1. Google Translate - example</b></p>
+               <div class="figure-contents">
+                  <div class="mediaobject"><img src="images/MobyDick.png" alt="Google Translate - example"></div>
+               </div>
+            </div><br class="figure-break"><p>The Spanish translation is better than the Slovenian. Note
+                   <span class="emphasis"><em>interesar</em></span> and<span class="emphasis"><em> navegar</em></span> in
+                   Spanish, are correctly translated as the verbs interest and sail
+                   respectively. In the Slovenian version both words have been translated as
+                   nouns. It is actually quite probable that the Spanish translation is based
+                   at least partially on the actual translation of the book.
+            </p>
+            <p>Once you have activated the service, a suggestion for the
+                   translation will appear in the Google Translate pane every time a new
+                   source segment is opened. If you find the suggestion acceptable, press
+                   <span class="keycap"><strong><a class="indexterm" name="d0e7855"></a>Ctrl</strong></span>+<span class="keycap"><strong>M</strong></span> to replace the target part of the opened segment with the
+                   suggestion. In the above segment, for instance, <span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>M</strong></span> would replace the Spanish version with the Slovenian
+                   suggestion.
+            </p>
+            <p>If you do not wish <span class="application">OmegaT</span> to send your
+                   source segments to Google to get translated, untick the Google Translate
+                   menu entry in Options.
+            </p>
+            <p>Note that nothing but your source segment is sent to the MT service.
+                   The online version of Google Translate allows the user to correct the
+                   suggestion and send the corrected segment in. This feature, however, is
+                   not implemented in OmegaT.
+            </p>
+         </div>
+         <div class="section" title="4. Belazar">
+            <div class="titlepage">
+               <div>
+                  <div>
+                     <h2 class="title" style="clear: both"><a name="d0e7877"></a>4. Belazar<a class="indexterm" name="d0e7880"></a></h2>
+                  </div>
+               </div>
+            </div>
+            <p><a class="ulink" href="http://belsoft.tut.by/belazar/" target="_top">Belazar</a> is a
+                   Machine language translation tool for the Russian-Belarusian language
+                   pair.
+            </p>
+         </div>
+         <div class="section" title="5. Apertium">
+            <div class="titlepage">
+               <div>
+                  <div>
+                     <h2 class="title" style="clear: both"><a name="d0e7889"></a>5. Apertium<a class="indexterm" name="d0e7892"></a></h2>
+                  </div>
+               </div>
+            </div>
+            <p><a class="ulink" href="http://www.apertium.org/" target="_top">Apertium</a> is a free/open-source machine
+                   translation platform, initially aimed at related-language pairs, like CA,
+                   ES, GA, PT, OC and FR but recently expanded to deal with more divergent
+                   language pairs (such as English-Catalan). Check the web site for the
+                   latest list of implemented language pairs.
+            </p>
+            <p>The platform provides</p>
+            <div class="itemizedlist">
+               <ul class="itemizedlist" type="disc">
+                  <li class="listitem">
+                     <p>a language-independent machine translation engine</p>
+                  </li>
+                  <li class="listitem">
+                     <p>tools to manage the linguistic data necessary to build a machine
+                                translation system for a given language pair and
+                     </p>
+                  </li>
+               </ul>
+            </div>
+            <div class="itemizedlist">
+               <ul class="itemizedlist" type="disc">
+                  <li class="listitem">
+                     <p>linguistic data for a growing number of language pairs</p>
+                  </li>
+               </ul>
+            </div>
+            <p>Apertium uses a shallow-transfer machine translation engine which
+                   processes the input text in stages, as in an assembly line: de-formatting,
+                   morphological analysis, part-of-speech disambiguation, shallow structural
+                   transfer, lexical transfer, morphological generation, and
+                   re-formatting.
+            </p>
+            <p>It is possible to use Apertium to build machine translation systems
+                   for a variety of language pairs; to that end, Apertium uses simple
+                   XML-based standard formats to encode the linguistic data needed (either by
+                   hand or by converting existing data), which are compiled using the
+                   provided tools into the high-speed formats used by the engine.
+            </p>
+         </div>
+         <div class="section" title="6. Machine translation - trouble shooting">
+            <div class="titlepage">
+               <div>
+                  <div>
+                     <h2 class="title" style="clear: both"><a name="Google.Translate.troubleshooting"></a>6. Machine translation - trouble shooting<a class="indexterm" name="d0e7921"></a></h2>
+                  </div>
+               </div>
+            </div>
+            <p>If there's nothing appearing in the Google Translate pane, then
+                   check the following:
+            </p>
+            <div class="itemizedlist">
+               <ul class="itemizedlist" type="disc">
+                  <li class="listitem">
+                     <p>Are you online? You need to be online to be able to use an MT
+                                tool.
+                     </p>
+                  </li>
+               </ul>
+            </div>
+            <div class="itemizedlist">
+               <ul class="itemizedlist" type="disc">
+                  <li class="listitem">
+                     <p>What is the language pair you need? Check if the selected
+                                service offers it.
+                     </p>
+                  </li>
+               </ul>
+            </div>
+         </div>
+      </div>
+      <div class="navfooter">
+         <hr>
+         <table width="100%" summary="Navigation footer">
+            <tr>
+               <td width="40%" align="left"><a accesskey="p" href="chapter.glossaries.html">Prev</a> 
+               </td>
+               <td width="20%" align="center"> </td>
+               <td width="40%" align="right"> <a accesskey="n" href="chapter.spellchecker.html">Next</a></td>
+            </tr>
+            <tr>
+               <td width="40%" align="left" valign="top">Chapter 19. Glossaries </td>
+               <td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td>
+               <td width="40%" align="right" valign="top"> Chapter 21. Spell checker</td>
+            </tr>
+         </table>
+      </div>
+   </body>
+</html>
\ No newline at end of file
diff --git a/docs/en/chapter.menu.html b/docs/en/chapter.menu.html
new file mode 100644
index 0000000..03f420e
--- /dev/null
+++ b/docs/en/chapter.menu.html
@@ -0,0 +1,1004 @@
+<html>
+   <head>
+      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+   
+      <title>Chapter 5. Menu and Keyboard shortcuts</title>
+      <link rel="stylesheet" href="OmegaT.css" type="text/css">
+      <meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+      <link rel="home" href="index.html" title="OmegaT - User's Guide">
+      <link rel="up" href="index.html" title="OmegaT - User's Guide">
+      <link rel="prev" href="chapter.user.interface.html" title="Chapter 4. The user interface">
+      <link rel="next" href="chapter.project.properties.html" title="Chapter 6. Project properties">
+   </head>
+   <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+      <div class="navheader">
+         <table width="100%" summary="Navigation header">
+            <tr>
+               <th colspan="3" align="center">Chapter 5. Menu and Keyboard shortcuts</th>
+            </tr>
+            <tr>
+               <td width="20%" align="left"><a accesskey="p" href="chapter.user.interface.html">Prev</a> 
+               </td>
+               <th width="60%" align="center"> </th>
+               <td width="20%" align="right"> <a accesskey="n" href="chapter.project.properties.html">Next</a></td>
+            </tr>
+         </table>
+         <hr>
+      </div>
+      <div class="chapter" title="Chapter 5. Menu and Keyboard shortcuts">
+         <div class="titlepage">
+            <div>
+               <div>
+                  <h2 class="title"><a name="chapter.menu"></a>Chapter 5. Menu and Keyboard shortcuts
+                  </h2>
+               </div>
+            </div>
+         </div>
+         <div class="toc">
+            <dl>
+               <dt><span class="section"><a href="chapter.menu.html#ch04.main.menu">1. Main Menu</a></span></dt>
+               <dt><span class="section"><a href="chapter.menu.html#submenu.Project">2. Project</a></span></dt>
+               <dt><span class="section"><a href="chapter.menu.html#d0e3107">3. Edit</a></span></dt>
+               <dt><span class="section"><a href="chapter.menu.html#submenu.GoTo">4. Go to</a></span></dt>
+               <dt><span class="section"><a href="chapter.menu.html#submenu.View">5. View</a></span></dt>
+               <dt><span class="section"><a href="chapter.menu.html#submenu.Tools">6. Tools</a></span></dt>
+               <dt><span class="section"><a href="chapter.menu.html#submenu.Options">7. Options</a></span></dt>
+               <dt><span class="section"><a href="chapter.menu.html#submenu.Help">8. Help</a></span></dt>
+               <dt><span class="section"><a href="chapter.menu.html#keyboard.shortcuts">9. Keyboard shortcuts</a></span></dt>
+               <dd>
+                  <dl>
+                     <dt><span class="section"><a href="chapter.menu.html#d0e3774">9.1. Project management</a></span></dt>
+                     <dt><span class="section"><a href="chapter.menu.html#keyboard.editing">9.2. Editing</a></span></dt>
+                     <dt><span class="section"><a href="chapter.menu.html#keyboard.moving.around">9.3. Moving around</a></span></dt>
+                     <dt><span class="section"><a href="chapter.menu.html#keyboard.other">9.4. Other</a></span></dt>
+                  </dl>
+               </dd>
+            </dl>
+         </div>
+         <div class="section" title="1. Main Menu">
+            <div class="titlepage">
+               <div>
+                  <div>
+                     <h2 class="title" style="clear: both"><a name="ch04.main.menu"></a>1. <a class="indexterm" name="d0e2904"></a>Main Menu
+                     </h2>
+                  </div>
+               </div>
+            </div><a class="indexterm" name="d0e2908"></a><p>All of OmegaT's functions are available through the menu bar at the
+                   top of the Editor window. Most functions are also available via keyboard
+                   shortcuts. Shortcuts are activated by pressing <span class="keycap"><strong>Ctrl</strong></span> and a
+                   letter. Some shortcuts involve other keys. For readability purposes,
+                   letters are written in uppercase here. <span class="keycap"><strong>Ctrl</strong></span> is used on
+                   Windows, UNIX and UNIX-like operating systems with keyboards featuring a
+                   <span class="keycap"><strong>Ctrl</strong></span> or <span class="keycap"><strong>Control</strong></span> key. Mac users should
+                   instead use <span class="keycap"><strong>cmd</strong></span>+<span class="keycap"><strong>key</strong></span> instead. The "Cmd" key either has a "command" label or an
+                   apple symbol on Apple keyboards.
+            </p>
+            <div class="table"><a name="table.main.menu"></a><p class="title"><b>Table 5.1. Main Menu</b></p>
+               <div class="table-contents">
+                  <table summary="Main Menu" border="1">
+                     <colgroup>
+                        <col>
+                        <col>
+                        <col>
+                        <col>
+                        <col>
+                        <col>
+                        <col>
+                     </colgroup>
+                     <tbody>
+                        <tr>
+                           <td><span class="guimenuitem">Project</span></td>
+                           <td><span class="guimenuitem">Edit</span></td>
+                           <td><span class="guimenuitem">Go to</span></td>
+                           <td><span class="guimenuitem">View</span></td>
+                           <td><span class="guimenuitem">Tools</span></td>
+                           <td><span class="guimenuitem">Options</span></td>
+                           <td><span class="guimenuitem">Help</span></td>
+                        </tr>
+                     </tbody>
+                  </table>
+               </div>
+            </div><br class="table-break"></div>
+         <div class="section" title="2. Project">
+            <div class="titlepage">
+               <div>
+                  <div>
+                     <h2 class="title" style="clear: both"><a name="submenu.Project"></a>2. Project<a class="indexterm" name="d0e2963"></a></h2>
+                  </div>
+               </div>
+            </div>
+            <div class="table"><a name="d0e2968"></a><p class="title"><b>Table 5.2. Project menu</b></p>
+               <div class="table-contents">
+                  <table summary="Project menu" border="1">
+                     <colgroup>
+                        <col width="100" align="left">
+                        <col width="80" align="left">
+                        <col>
+                     </colgroup>
+                     <tbody>
+                        <tr>
+                           <td align="left"><span class="guimenuitem">New</span></td>
+                           <td align="left"> </td>
+                           <td>Creates and opens a new project. The dialog to create a
+                                          project is the same as to edit the project.
+                                          See <a class="xref" href="chapter.project.properties.html" title="Chapter 6. Project properties">Chapter 6, <i>Project properties</i></a></td>
+                        </tr>
+                        <tr>
+                           <td align="left"><span class="guimenuitem">Open</span></td>
+                           <td align="left"><span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>O</strong></span></td>
+                           <td>Opens a previously created project.</td>
+                        </tr>
+                        <tr>
+                           <td align="left"><span class="guimenuitem">Import Source Files...</span></td>
+                           <td align="left"> </td>
+                           <td>Copies the selected files to the
+                                          <code class="filename">source</code> folder and reloads the project to load
+                                          the new files.
+                           </td>
+                        </tr>
+                        <tr>
+                           <td align="left"><span class="guimenuitem">Import From MediaWiki...</span></td>
+                           <td align="left"> </td>
+                           <td>Imports units from MediaWiki pages, based on the URL
+                                          entered.
+                           </td>
+                        </tr>
+                        <tr>
+                           <td align="left"><span class="guimenuitem">Reload</span></td>
+                           <td align="left"><span class="keycap"><strong>F5</strong></span></td>
+                           <td>Reloads the project to take external changes in source
+                                          files, legacy translation memories, glossaries and project
+                                          settings into account.
+                           </td>
+                        </tr>
+                        <tr>
+                           <td align="left"><span class="guimenuitem">Close</span></td>
+                           <td align="left"><span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>Shift</strong></span>+<span class="keycap"><strong>W</strong></span></td>
+                           <td>Saves the translation and closes the project.</td>
+                        </tr>
+                        <tr>
+                           <td align="left"><span class="guimenuitem">Save</span></td>
+                           <td align="left"><span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>S</strong></span></td>
+                           <td>Saves the internal translation memory to the hard disk.
+                                          OmegaT automatically saves translations every 10 minutes as well
+                                          as when you close the project or quit OmegaT.
+                           </td>
+                        </tr>
+                        <tr>
+                           <td align="left"><span class="guimenuitem">Create translated
+                                             documents</span></td>
+                           <td align="left"><span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>D</strong></span></td>
+                           <td>Creates the target documents based on your translation of
+                                          the documents' text. The created target documents are located in
+                                          the <code class="filename">target</code> folder.
+                           </td>
+                        </tr>
+                        <tr>
+                           <td align="left"><span class="guimenuitem">Properties...</span></td>
+                           <td align="left"><span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>E</strong></span></td>
+                           <td>Displays <a class="link" href="chapter.project.properties.html" title="Chapter 6. Project properties">Project
+                                             properties</a> dialog to edit project languages and folder
+                                          locations.
+                           </td>
+                        </tr>
+                        <tr>
+                           <td align="left"><span class="guimenuitem">Project Files...</span></td>
+                           <td align="left"><span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>L</strong></span></td>
+                           <td>Closes or opens the <a class="link" href="chapter.user.interface.html#section.project.files" title="3.1. Project files">Project files
+                                             window</a> (depending on whether it is open or
+                                          closed).
+                           </td>
+                        </tr>
+                        <tr>
+                           <td align="left"><span class="guimenuitem">Quit</span></td>
+                           <td align="left"><span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>Q</strong></span></td>
+                           <td>Saves the project and quits
+                                          <span class="application">OmegaT</span>. If you haven't yet saved the
+                                          project, this manually confirms whether you really wish to
+                                          quit.
+                           </td>
+                        </tr>
+                     </tbody>
+                  </table>
+               </div>
+            </div><br class="table-break"></div>
+         <div class="section" title="3. Edit">
+            <div class="titlepage">
+               <div>
+                  <div>
+                     <h2 class="title" style="clear: both"><a name="d0e3107"></a>3. Edit<a class="indexterm" name="d0e3110"></a></h2>
+                  </div>
+               </div>
+            </div>
+            <p>Note: Items that are found in most applications (copy/cut/paste) are
+                   not displayed in this menu, but are available using your system shortcuts.
+                   For example:
+            </p>
+            <div class="table"><a name="d0e3117"></a><p class="title"><b>Table 5.3. Copy/cut/paste shortcuts</b></p>
+               <div class="table-contents">
+                  <table summary="Copy/cut/paste shortcuts" border="1">
+                     <colgroup>
+                        <col width="100" align="left">
+                        <col width="80" align="left">
+                        <col>
+                     </colgroup>
+                     <tbody>
+                        <tr>
+                           <td align="left"><span class="guimenuitem">Copy</span></td>
+                           <td align="left"><span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>C</strong></span></td>
+                           <td>Copies the selected text to the clipboard.</td>
+                        </tr>
+                        <tr>
+                           <td align="left"><span class="guimenuitem">Cut</span></td>
+                           <td align="left"><span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>X</strong></span></td>
+                           <td>Copies the selected text to the clipboard and deletes the
+                                          selected text.
+                           </td>
+                        </tr>
+                        <tr>
+                           <td align="left"><span class="guimenuitem">Paste</span></td>
+                           <td align="left"><span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>V</strong></span></td>
+                           <td>Pastes the text from the clipboard at the cursor
+                                          position.
+                           </td>
+                        </tr>
+                     </tbody>
+                  </table>
+               </div>
+            </div><br class="table-break"><p>The Edit menu itself contains the following items:</p>
+            <div class="table"><a name="d0e3162"></a><p class="title"><b>Table 5.4. Edit menu</b></p>
+               <div class="table-contents">
+                  <table summary="Edit menu" border="1">
+                     <colgroup>
+                        <col width="100" align="left">
+                        <col width="80" align="left">
+                        <col>
+                     </colgroup>
+                     <tbody>
+                        <tr>
+                           <td align="left"><span class="guimenuitem">Undo Last Action</span></td>
+                           <td align="left"><span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>Z</strong></span></td>
+                           <td>Restores the status before the last editing action was
+                                          taken. This command does not work once the modified segment has
+                                          been validated.
+                           </td>
+                        </tr>
+                        <tr>
+                           <td align="left"><span class="guimenuitem">Redo Last Action</span></td>
+                           <td align="left"><span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>Y</strong></span></td>
+                           <td>Restores the status before the last editing action was
+                                          cancelled. This command does not work once the modified segment
+                                          has been validated.
+                           </td>
+                        </tr>
+                        <tr>
+                           <td align="left"><span class="guimenuitem">Replace With Match</span></td>
+                           <td align="left"><span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>R</strong></span></td>
+                           <td>Replaces the whole target segment with the currently
+                                          selected fuzzy match (by default the first match is
+                                          selected).
+                           </td>
+                        </tr>
+                        <tr>
+                           <td align="left"><span class="guimenuitem">Insert Match</span></td>
+                           <td align="left"><span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>I</strong></span></td>
+                           <td>Inserts the currently selected fuzzy match at the cursor
+                                          position. If part of the target segment has been selected, this
+                                          function overwrites the selected portion.
+                           </td>
+                        </tr>
+                        <tr>
+                           <td align="left"><span class="guimenuitem">Replace with Machine
+                                             Translation</span></td>
+                           <td align="left"><span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>M</strong></span></td>
+                           <td>Replaces the target segment with the translation, provided
+                                          by the selected Machine Translation service. No action is taken,
+                                          if no Machine Translation service has been activated (see Menu
+                                          > Options below).
+                           </td>
+                        </tr>
+                        <tr>
+                           <td align="left"><span class="guimenuitem">Replace With Source</span></td>
+                           <td align="left"><span class="keycap"><strong>Shift</strong></span>+<span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>R</strong></span></td>
+                           <td>Replaces the whole target segment with the source.</td>
+                        </tr>
+                        <tr>
+                           <td align="left"><span class="guimenuitem">Insert Source</span></td>
+                           <td align="left"><span class="keycap"><strong>Shift</strong></span>+<span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>I</strong></span></td>
+                           <td>Inserts the source at the cursor position.</td>
+                        </tr>
+                        <tr>
+                           <td align="left"><span class="guimenuitem">Insert Source Tags</span></td>
+                           <td align="left"><span class="keycap"><strong>Shift</strong></span>+<span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>T</strong></span></td>
+                           <td><a class="indexterm" name="d0e3270"></a>Inserts the source tags at the cursor position. All
+                                          tags in the source will be inserted into the current segment,
+                                          regardless of whether they are already there or not. Texts,
+                                          bracketed by tags, are replaced by spaces:.
+                                          <code class="literal"><f0><f1>This is
+                                             text</f0></f1></code> thus will be copied as
+                                          <code class="literal"><f0><f1>one_space</f0></f1></code></td>
+                        </tr>
+                        <tr>
+                           <td align="left"><span class="guimenuitem">Export Selection</span></td>
+                           <td align="left"><span class="keycap"><strong>Shift</strong></span>+<span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>C</strong></span></td>
+                           <td>Exports the current selection to a text file for
+                                          processing. If no text has been selected, the current source
+                                          segment is written to this file. When the user exits
+                                          <span class="application">OmegaT</span>, this file is not emptied, in
+                                          order to be consistent with usual clipboard behavior. The exported
+                                          contents are copied to the file <code class="filename">selection.txt</code>
+                                          located in the User's preference files folder (see <a class="xref" href="chapter.files.and.directories.html" title="Chapter 8. OmegaT Files and Directories">Chapter 8, <i><span class="application">OmegaT</span> Files and Directories</i></a>).
+                           </td>
+                        </tr>
+                        <tr>
+                           <td align="left"><span class="guimenuitem">Search Project...</span></td>
+                           <td align="left"><span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>F</strong></span></td>
+                           <td>Opens a new <a class="link" href="chapter.user.interface.html#section.search.window" title="3.2. Search window">Search
+                                             window</a>.
+                           </td>
+                        </tr>
+                        <tr>
+                           <td align="left"><span class="guimenuitem">Switch case to...</span></td>
+                           <td align="left"><span class="keycap"><strong>Shift</strong></span>+<span class="keycap"><strong>F3</strong></span> (see text)
+                           </td>
+                           <td>Changes the case of the highlighted text in the target
+                                          segment to the selected option (Lower case, Upper case or Title
+                                          case). Use Shift+F3 <a class="indexterm" name="d0e3331"></a>to cycle through the three alternatives. If no text
+                                          is selected, <span class="application">OmegaT</span> selects the word
+                                          that contains the letter immediately to the right of the
+                                          cursor.
+                           </td>
+                        </tr>
+                        <tr>
+                           <td align="left"><span class="guimenuitem">Select Fuzzy Match #N</span></td>
+                           <td align="left"><span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>#N</strong></span></td>
+                           <td>(#N is a digit from 1 to 5) - Selects the Nth fuzzy match
+                                          displayed in the match viewer to replace or insert it to the
+                                          segment. The <a class="xref" href="chapter.user.interface.html#match.viewer" title="2.2. Match viewer">Section 2.2, “Match viewer”</a> describes the color coding in
+                                          detail.
+                           </td>
+                        </tr>
+                     </tbody>
+                  </table>
+               </div>
+            </div><br class="table-break"></div>
+         <div class="section" title="4. Go to">
+            <div class="titlepage">
+               <div>
+                  <div>
+                     <h2 class="title" style="clear: both"><a name="submenu.GoTo"></a>4. Go to<a class="indexterm" name="d0e3357"></a></h2>
+                  </div>
+               </div>
+            </div>
+            <div class="table"><a name="d0e3362"></a><p class="title"><b>Table 5.5. Go To menu</b></p>
+               <div class="table-contents">
+                  <table summary="Go To menu" border="1">
+                     <colgroup>
+                        <col width="100" align="left">
+                        <col width="80" align="left">
+                        <col>
+                     </colgroup>
+                     <tbody>
+                        <tr>
+                           <td align="left"><span class="guimenuitem">Next Untranslated
+                                             Segment</span></td>
+                           <td align="left"><span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>U</strong></span></td>
+                           <td>Moves to the next segment that has no equivalent in the
+                                          translation memory.
+                           </td>
+                        </tr>
+                        <tr>
+                           <td align="left"><span class="guimenuitem">Next Segment</span></td>
+                           <td align="left"><span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>N</strong></span> or <span class="keycap"><strong>Enter</strong></span> or
+                                          <span class="keycap"><strong>Tab</strong></span></td>
+                           <td>Moves to the next segment. If the current segment is the
+                                          last segment in a file, it moves to the first segment of the next
+                                          file.
+                           </td>
+                        </tr>
+                        <tr>
+                           <td align="left"><span class="guimenuitem">Previous Segment</span></td>
+                           <td align="left"><span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>P</strong></span> or <span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>Enter</strong></span> or <span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>Tab</strong></span></td>
+                           <td>Moves to the previous segment. If the current segment is
+                                          the first one in a file, it moves to the last segment of the
+                                          previous file.
+                           </td>
+                        </tr>
+                        <tr>
+                           <td align="left"><span class="guimenuitem">Segment number...</span></td>
+                           <td align="left"><span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>J</strong></span></td>
+                           <td>The segment is opened when its segment number is
+                                          entered..
+                           </td>
+                        </tr>
+                        <tr>
+                           <td align="left"><span class="guimenuitem">Back in history...</span></td>
+                           <td align="left"><span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>Shift</strong></span>+<span class="keycap"><strong>P</strong></span></td>
+                           <td>With this command you can move backward one segment at a
+                                          time, to return later to the current segment using
+                                          <span class="guimenuitem">Forward in history... </span>command
+                                          below.
+                           </td>
+                        </tr>
+                        <tr>
+                           <td align="left"><span class="guimenuitem">Forward in history...</span></td>
+                           <td align="left"><span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>Shift</strong></span>+<span class="keycap"><strong>N</strong></span></td>
+                           <td><span class="application">OmegaT</span> remembers the segments
+                                          executed. With this command you can step forward to the segment,
+                                          you have previously left by the <span class="guimenuitem">Back in
+                                             history</span>...command.
+                           </td>
+                        </tr>
+                     </tbody>
+                  </table>
+               </div>
+            </div><br class="table-break"></div>
+         <div class="section" title="5. View">
+            <div class="titlepage">
+               <div>
+                  <div>
+                     <h2 class="title" style="clear: both"><a name="submenu.View"></a>5. View<a class="indexterm" name="d0e3474"></a></h2>
+                  </div>
+               </div>
+            </div>
+            <div class="table"><a name="d0e3479"></a><p class="title"><b>Table 5.6. View menu</b></p>
+               <div class="table-contents">
+                  <table summary="View menu" border="1">
+                     <colgroup>
+                        <col width="100" align="left">
+                        <col>
+                     </colgroup>
+                     <tbody>
+                        <tr>
+                           <td align="left"><span class="guimenuitem">Mark Translated Segments</span></td>
+                           <td>If checked, the translated segments will be marked in
+                                          yellow.
+                           </td>
+                        </tr>
+                        <tr>
+                           <td align="left"><span class="guimenuitem">Mark Untranslated
+                                             Segments</span></td>
+                           <td>If checked, the untranslated segments will be marked in
+                                          violet.
+                           </td>
+                        </tr>
+                        <tr>
+                           <td align="left"><span class="guimenuitem">Display Source Segments</span></td>
+                           <td>If checked, source segments will be shown and marked in
+                                          green. If not checked, source segments will not be shown.
+                           </td>
+                        </tr>
+                        <tr>
+                           <td align="left"><span class="guimenuitem">Display Modification</span></td>
+                           <td>Setting the Display Modification option to
+                                          <span class="emphasis"><em>Selected</em></span> will display the time and the author
+                                          of the last change for the current segment. Setting it
+                                          to<span class="emphasis"><em> All </em></span>shows this information for all
+                                          segments and <span class="emphasis"><em>None</em></span> turns this option
+                                          off.
+                           </td>
+                        </tr>
+                     </tbody>
+                  </table>
+               </div>
+            </div><br class="table-break"></div>
+         <div class="section" title="6. Tools">
+            <div class="titlepage">
+               <div>
+                  <div>
+                     <h2 class="title" style="clear: both"><a name="submenu.Tools"></a>6. Tools<a class="indexterm" name="d0e3521"></a></h2>
+                  </div>
+               </div>
+            </div>
+            <div class="table"><a name="d0e3526"></a><p class="title"><b>Table 5.7. Tools menu</b></p>
+               <div class="table-contents"><a class="indexterm" name="d0e3529"></a><a class="indexterm" name="d0e3534"></a><a class="indexterm" name="d0e3539"></a><table summary="Tools menu" border="1">
+                     <colgroup>
+                        <col width="100" align="left">
+                        <col>
+                     </colgroup>
+                     <tbody>
+                        <tr>
+                           <td align="left"><span class="guimenuitem">Validate Tags</span></td>
+                           <td><span class="guimenu">Ctrl+T</span>: Checks for missing or displaced
+                                          tags in formatted files. Will display a list of segments with tag
+                                          errors and possible inconsistencies. See <a class="link" href="chapter.user.interface.html#section.tag.validation" title="3.3. Tag validation">Tag Validation</a> and 
+                                          <a class="xref" href="chapter.formatted.text.html" title="Chapter 12. Working with formatted text">Chapter 12, <i>Working with formatted text</i></a>.
+                           </td>
+                        </tr>
+                        <tr>
+                           <td align="left"><span class="guimenuitem">Statistics</span></td>
+                           <td>Opens a new window and displays the project statistics,
+                                          i.e. the project totals and totals for every file in the
+                                          project.
+                           </td>
+                        </tr>
+                        <tr>
+                           <td align="left"><span class="guimenuitem">Match Statistics</span></td>
+                           <td>Displays the Match Statistics for the project: the number
+                                          of repetitions, exact matches, fuzzy matches and no-matches, for
+                                          segments, words and in characters.
+                           </td>
+                        </tr>
+                     </tbody>
+                  </table>
+               </div>
+            </div><br class="table-break"></div>
+         <div class="section" title="7. Options">
+            <div class="titlepage">
+               <div>
+                  <div>
+                     <h2 class="title" style="clear: both"><a name="submenu.Options"></a>7. <a class="indexterm" name="d0e3574"></a>Options
+                     </h2>
+                  </div>
+               </div>
+            </div>
+            <div class="table"><a name="d0e3580"></a><p class="title"><b>Table 5.8. Options menu</b></p>
+               <div class="table-contents">
+                  <table summary="Options menu" border="1">
+                     <colgroup>
+                        <col width="100" align="left">
+                        <col>
+                     </colgroup>
+                     <tbody>
+                        <tr>
+                           <td align="left"><span class="guimenuitem">Use TAB To Advance</span></td>
+                           <td>Sets segment validation key to
+                                          <span class="guimenuitem">Tab</span> instead of the default
+                                          <span class="guimenuitem">Enter</span>. This option is useful for some
+                                          Chinese, Japanese or Korean character input systems.
+                           </td>
+                        </tr>
+                        <tr>
+                           <td align="left"><span class="guimenuitem">Always Confirm Quit</span></td>
+                           <td>The program will see confirmation before closing
+                                          down.
+                           </td>
+                        </tr>
+                        <tr>
+                           <td align="left"><span class="guimenuitem">Machine Translate</span></td>
+                           <td>Allows you to activate/deactivate the Machine Translation
+                                          tools offered. When active, <span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>M</strong></span> will insert the suggestion into the target part of
+                                          the current segment.
+                           </td>
+                        </tr>
+                        <tr>
+                           <td align="left"><span class="guimenuitem">TransTips</span></td>
+                           <td>Allows you to activate/deactivate <span class="emphasis"><em>TransTips
+                                                </em></span>feature and set its option<span class="emphasis"><em> Exact
+                                                Match.</em></span> With <span class="emphasis"><em>TransTips</em></span> activated a
+                                          right click on a highlighted word in the source will open a popup
+                                          menu with the glossary entries for the word you clicked. You can
+                                          then click on the preferred translation to insert it into the
+                                          target segment at the current position. With
+                                          <span class="emphasis"><em>TransTips/Exact Match </em></span> checked, only complete
+                                          words will be checked, otherwise parts of words will be matched as
+                                          well.
+                           </td>
+                        </tr>
+                        <tr>
+                           <td align="left"><span class="guimenuitem">Font...</span></td>
+                           <td>Shows the dialogue to modify the text display font. Users
+                                          of old computers who feel window resizing is very slow can try
+                                          changing the font. See <a class="xref" href="chapter.font.html" title="Chapter 11. Font settings">Chapter 11, <i>Font settings</i></a>.
+                           </td>
+                        </tr>
+                        <tr>
+                           <td align="left"><span class="guimenuitem">File Filters...</span></td>
+                           <td>Displays the <a class="link" href="chapter.file.filters.html" title="Chapter 7. File Filters">File
+                                             filters</a> dialogue to configure file handling and
+                                          parsing.
+                           </td>
+                        </tr>
+                        <tr>
+                           <td align="left"><span class="guimenuitem">Segmentation...</span></td>
+                           <td>Opens the <a class="link" href="chapter.segmentation.html" title="Chapter 15. Source segmentation">Source
+                                             segmentation</a> dialogue to configure text
+                                          segmentation.
+                           </td>
+                        </tr>
+                        <tr>
+                           <td align="left"><span class="guimenuitem">Spell checking...</span></td>
+                           <td>Displays the <a class="link" href="chapter.spellchecker.html" title="Chapter 21. Spell checker">Spell checker
+                                             setup</a> window to install, configure and activate the spell
+                                          checker.
+                           </td>
+                        </tr>
+                        <tr>
+                           <td align="left"><span class="guimenuitem">Editing Behavior...</span></td>
+                           <td>Displays the <a class="link" href="chapter.translation.editing.html" title="Chapter 10. Editing behavior">Translation editing</a> dialog to
+                                          configure.
+                           </td>
+                        </tr>
+                        <tr>
+                           <td align="left"><span class="guimenuitem">Tag Validation...</span></td>
+                           <td>For programmers: Allows you to configure the Tag Validator
+                                          options to also check programming (%...) variables.
+                           </td>
+                        </tr>
+                        <tr>
+                           <td align="left"><span class="guimenuitem">Team</span></td>
+                           <td>Enter your name here and it will be attached to all
+                                          segments translated by you.
+                           </td>
+                        </tr>
+                        <tr>
+                           <td align="left"><span class="guimenuitem">Restore Main Window</span></td>
+                           <td>Restores the components of the main OmegaT window to their
+                                          default state. Use this feature when you have undocked, moved, or
+                                          hidden one or more components and you are unable to restore the
+                                          desired arrangement. It can also be used when panes do not appear
+                                          as expected following an OmegaT upgrade.
+                           </td>
+                        </tr>
+                     </tbody>
+                  </table>
+               </div>
+            </div><br class="table-break"></div>
+         <div class="section" title="8. Help">
+            <div class="titlepage">
+               <div>
+                  <div>
+                     <h2 class="title" style="clear: both"><a name="submenu.Help"></a>8. Help<a class="indexterm" name="d0e3699"></a></h2>
+                  </div>
+               </div>
+            </div>
+            <div class="table"><a name="d0e3704"></a><p class="title"><b>Table 5.9. Help menu</b></p>
+               <div class="table-contents">
+                  <table summary="Help menu" border="1">
+                     <colgroup>
+                        <col width="100" align="left">
+                        <col>
+                     </colgroup>
+                     <tbody>
+                        <tr>
+                           <td align="left"><span class="guimenuitem">User Manual...</span></td>
+                           <td><span class="keycap"><strong>F1:</strong></span> Opens Help browser displaying this
+                                          manual in a separate window.
+                           </td>
+                        </tr>
+                        <tr>
+                           <td align="left"><span class="guimenuitem">About...</span></td>
+                           <td>Displays copyright, credits and license
+                                          information.
+                           </td>
+                        </tr>
+                     </tbody>
+                  </table>
+               </div>
+            </div><br class="table-break"></div>
+         <div class="section" title="9. Keyboard shortcuts">
+            <div class="titlepage">
+               <div>
+                  <div>
+                     <h2 class="title" style="clear: both"><a name="keyboard.shortcuts"></a>9. Keyboard shortcuts<a class="indexterm" name="d0e3727"></a></h2>
+                  </div>
+               </div>
+            </div>
+            <p>The following shortcuts are available from the main window. When
+                   another window is on the foreground, click on the main window to bring it
+                   to the foreground or press <span class="keycap"><strong>Esc</strong></span> to close the other
+                   window.
+            </p>
+            <p>Shortcuts are activated by pressing <span class="keycap"><strong>Ctrl</strong></span> and a
+                   letter. Some shortcuts involve other keys. For readability purposes,
+                   letters are written in uppercase here.
+            </p>
+            <p>Ctrl is used on Windows, UNIX and UNIX-like operating systems with
+                   keyboards featuring a <span class="keycap"><strong>Ctrl</strong></span> / <span class="keycap"><strong>Control
+                         key</strong></span>. Mac users should instead use the
+                   <span class="guimenuitem">cmd+key.</span> On Apple keyboards the
+                   <span class="guimenuitem">cmd</span> key either has a command label or an Apple
+                   icon on it.
+            </p>
+            <div class="itemizedlist">
+               <ul class="itemizedlist" type="disc">
+                  <li class="listitem">
+                     <p>Project management</p>
+                  </li>
+               </ul>
+            </div>
+            <div class="itemizedlist">
+               <ul class="itemizedlist" type="disc">
+                  <li class="listitem">
+                     <p>Editing</p>
+                  </li>
+               </ul>
+            </div>
+            <div class="itemizedlist">
+               <ul class="itemizedlist" type="disc">
+                  <li class="listitem">
+                     <p>Moving around</p>
+                  </li>
+               </ul>
+            </div>
+            <div class="itemizedlist">
+               <ul class="itemizedlist" type="disc">
+                  <li class="listitem">
+                     <p>Reference windows</p>
+                  </li>
+               </ul>
+            </div>
+            <div class="itemizedlist">
+               <ul class="itemizedlist" type="disc">
+                  <li class="listitem">
+                     <p>Other</p>
+                  </li>
+               </ul>
+            </div>
+            <div class="section" title="9.1. Project management">
+               <div class="titlepage">
+                  <div>
+                     <div>
+                        <h3 class="title"><a name="d0e3774"></a>9.1. <a class="indexterm" name="d0e3776"></a>Project management<a class="indexterm" name="d0e3782"></a></h3>
+                     </div>
+                  </div>
+               </div>
+               <div class="table"><a name="d0e3787"></a><p class="title"><b>Table 5.10. Project management shortcuts</b></p>
+                  <div class="table-contents">
+                     <table summary="Project management shortcuts" border="1">
+                        <colgroup>
+                           <col width="100" align="left">
+                           <col width="80" align="left">
+                           <col>
+                        </colgroup>
+                        <tbody>
+                           <tr>
+                              <td align="left">Open project</td>
+                              <td align="left"><span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>O</strong></span></td>
+                              <td>Displays a dialogue to locate an existing
+                                               project.
+                              </td>
+                           </tr>
+                           <tr>
+                              <td align="left">Save</td>
+                              <td align="left"><span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>S</strong></span></td>
+                              <td>Saves the current work to the internal translation memory
+                                               (file project_save.tmx located in the project's
+                                               <code class="filename">omegat</code> folder).
+                              </td>
+                           </tr>
+                           <tr>
+                              <td align="left">Close Project</td>
+                              <td align="left"><span class="keycap"><strong>Shift</strong></span>+<span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>W</strong></span></td>
+                              <td>Closes the current project.</td>
+                           </tr>
+                           <tr>
+                              <td align="left">Create Translated Documents</td>
+                              <td align="left"><span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>D</strong></span></td>
+                              <td>Creates the translated documents in the project's Target
+                                               folder and creates translation memory files (level1, level2 and
+                                               omegat tmx files) in the project's root folder.
+                              </td>
+                           </tr>
+                           <tr>
+                              <td align="left">Project properties</td>
+                              <td align="left"><span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>E</strong></span></td>
+                              <td>Displays the project's settings for modification, if
+                                               required.
+                              </td>
+                           </tr>
+                        </tbody>
+                     </table>
+                  </div>
+               </div><br class="table-break"></div>
+            <div class="section" title="9.2. Editing">
+               <div class="titlepage">
+                  <div>
+                     <div>
+                        <h3 class="title"><a name="keyboard.editing"></a>9.2. <a class="indexterm" name="d0e3856"></a>Editing<a class="indexterm" name="d0e3862"></a></h3>
+                     </div>
+                  </div>
+               </div>
+               <div class="table"><a name="d0e3867"></a><p class="title"><b>Table 5.11. Editing shortcuts</b></p>
+                  <div class="table-contents">
+                     <table summary="Editing shortcuts" border="1">
+                        <colgroup>
+                           <col width="100" align="left">
+                           <col width="80" align="left">
+                           <col>
+                        </colgroup>
+                        <tbody>
+                           <tr>
+                              <td align="left">Undo last action</td>
+                              <td align="left"><span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>Z</strong></span></td>
+                              <td>Undoes the last editing actions in the current target
+                                               segment
+                              </td>
+                           </tr>
+                           <tr>
+                              <td align="left">Redo last action</td>
+                              <td align="left"><span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>Y</strong></span></td>
+                              <td>Redoes the last editing actions in the current target
+                                               segment
+                              </td>
+                           </tr>
+                           <tr>
+                              <td align="left">Select match #N</td>
+                              <td align="left"><span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>#N</strong></span></td>
+                              <td>#N is a digit from 1 to 5. The shortcut selects the Nth
+                                               match displayed in the match window (the first match is selected
+                                               by default)
+                              </td>
+                           </tr>
+                           <tr>
+                              <td align="left">Replace with match</td>
+                              <td align="left"><span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>R</strong></span></td>
+                              <td>Replaces the current target segment contents with the
+                                               selected match (the first match is selected by default)
+                              </td>
+                           </tr>
+                           <tr>
+                              <td align="left">Insert match</td>
+                              <td align="left"><span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>I</strong></span></td>
+                              <td>Inserts the selected match at the cursor position in the
+                                               current target segment (the first match is inserted by
+                                               default)
+                              </td>
+                           </tr>
+                           <tr>
+                              <td align="left">Replace with source</td>
+                              <td align="left"><span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>Shift+R</strong></span></td>
+                              <td>Replaces the current target segment contents with the
+                                               source text contents
+                              </td>
+                           </tr>
+                           <tr>
+                              <td align="left">Insert source</td>
+                              <td align="left"><span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>Shift+I</strong></span></td>
+                              <td>Inserts the source text contents into the target segment
+                                               at the cursor position
+                              </td>
+                           </tr>
+                           <tr>
+                              <td align="left">Insert Source Tags</td>
+                              <td align="left"><span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>Shift+T</strong></span></td>
+                              <td>Inserts the source tags into the target segment at the
+                                               cursor position
+                              </td>
+                           </tr>
+                           <tr>
+                              <td align="left">Search project</td>
+                              <td align="left"><span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>F</strong></span></td>
+                              <td>Displays a dialogue to conduct searches in the
+                                               project
+                              </td>
+                           </tr>
+                           <tr>
+                              <td align="left">Replace with Machine Translation</td>
+                              <td align="left"><span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>M</strong></span></td>
+                              <td>Replaces the target segment with the machine translation
+                                               of the source. No action, if machine tools are deactivated (see
+                                               Menu > Options > Machine Translate)
+                              </td>
+                           </tr>
+                        </tbody>
+                     </table>
+                  </div>
+               </div><br class="table-break"></div>
+            <div class="section" title="9.3. Moving around">
+               <div class="titlepage">
+                  <div>
+                     <div>
+                        <h3 class="title"><a name="keyboard.moving.around"></a>9.3. <a class="indexterm" name="d0e3986"></a>Moving around
+                        </h3>
+                     </div>
+                  </div>
+               </div>
+               <div class="table"><a name="d0e3992"></a><p class="title"><b>Table 5.12. Moving around shortcuts</b></p>
+                  <div class="table-contents">
+                     <table summary="Moving around shortcuts" border="1">
+                        <colgroup>
+                           <col width="100" align="left">
+                           <col width="80" align="left">
+                           <col>
+                        </colgroup>
+                        <tbody>
+                           <tr>
+                              <td align="left">Next Untranslated Segment</td>
+                              <td align="left"><span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>U</strong></span></td>
+                              <td>Moves the editing field to the next segment that is not
+                                               registered in the project's translation memory
+                              </td>
+                           </tr>
+                           <tr>
+                              <td align="left">Next Segment</td>
+                              <td align="left"><span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>N</strong></span>, <span class="keycap"><strong>Enter</strong></span>
+                                                  or <span class="keycap"><strong>Return</strong></span></td>
+                              <td>Moves the editing field to the next segment.</td>
+                           </tr>
+                           <tr>
+                              <td align="left">Previous Segment</td>
+                              <td align="left"><span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>P</strong></span></td>
+                              <td>Moves the editing field to the previous segment</td>
+                           </tr>
+                           <tr>
+                              <td align="left">Segment number...</td>
+                              <td align="left"><span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>J</strong></span></td>
+                              <td>Moves to the segment number entered</td>
+                           </tr>
+                           <tr>
+                              <td align="left">Back in history...</td>
+                              <td align="left"><span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>Shift+P</strong></span></td>
+                              <td>Moves one segment back in history</td>
+                           </tr>
+                           <tr>
+                              <td align="left">Forward in history...</td>
+                              <td align="left"><span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>Shift+N</strong></span></td>
+                              <td>Moves one segment forward in history</td>
+                           </tr>
+                        </tbody>
+                     </table>
+                  </div>
+               </div><br class="table-break"></div>
+            <div class="section" title="9.4. Other">
+               <div class="titlepage">
+                  <div>
+                     <div>
+                        <h3 class="title"><a name="keyboard.other"></a>9.4. <a class="indexterm" name="d0e4073"></a>Other
+                        </h3>
+                     </div>
+                  </div>
+               </div>
+               <div class="table"><a name="d0e4079"></a><p class="title"><b>Table 5.13. Various shortcuts</b></p>
+                  <div class="table-contents">
+                     <table summary="Various shortcuts" border="1">
+                        <colgroup>
+                           <col width="100" align="left">
+                           <col width="80" align="left">
+                           <col>
+                        </colgroup>
+                        <tbody>
+                           <tr>
+                              <td align="left">Project files listing</td>
+                              <td align="left"><span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>L</strong></span></td>
+                              <td>Displays the Project files listing</td>
+                           </tr>
+                           <tr>
+                              <td align="left">Validate Tags</td>
+                              <td align="left"><span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>T</strong></span></td>
+                              <td>Opens the Tag validation window.</td>
+                           </tr>
+                           <tr>
+                              <td align="left">Export Selection</td>
+                              <td align="left"><span class="keycap"><strong>Shift</strong></span>+<span class="keycap"><strong>Ctrl+C</strong></span></td>
+                              <td>Exports the current selection or the current source, if
+                                               no text has been selected. The text is exported to a plain text
+                                               file.
+                              </td>
+                           </tr>
+                           <tr>
+                              <td align="left">Search Project</td>
+                              <td align="left"><span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>F</strong></span></td>
+                              <td>Opens a new Search window.</td>
+                           </tr>
+                           <tr>
+                              <td align="left">Help files</td>
+                              <td align="left"><span class="keycap"><strong>F1</strong></span></td>
+                              <td>Displays the <span class="application">OmegaT</span> help files
+                                               in a separate window
+                              </td>
+                           </tr>
+                        </tbody>
+                     </table>
+                  </div>
+               </div><br class="table-break"></div>
+         </div>
+      </div>
+      <div class="navfooter">
+         <hr>
+         <table width="100%" summary="Navigation footer">
+            <tr>
+               <td width="40%" align="left"><a accesskey="p" href="chapter.user.interface.html">Prev</a> 
+               </td>
+               <td width="20%" align="center"> </td>
+               <td width="40%" align="right"> <a accesskey="n" href="chapter.project.properties.html">Next</a></td>
+            </tr>
+            <tr>
+               <td width="40%" align="left" valign="top">Chapter 4. The user interface </td>
+               <td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td>
+               <td width="40%" align="right" valign="top"> Chapter 6. Project properties</td>
+            </tr>
+         </table>
+      </div>
+   </body>
+</html>
\ No newline at end of file
diff --git a/docs/en/chapter.misc.html b/docs/en/chapter.misc.html
new file mode 100644
index 0000000..ecd29e6
--- /dev/null
+++ b/docs/en/chapter.misc.html
@@ -0,0 +1,390 @@
+<html>
+   <head>
+      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+   
+      <title>Chapter 22. Miscellaneous subjects</title>
+      <link rel="stylesheet" href="OmegaT.css" type="text/css">
+      <meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+      <link rel="home" href="index.html" title="OmegaT - User's Guide">
+      <link rel="up" href="index.html" title="OmegaT - User's Guide">
+      <link rel="prev" href="chapter.spellchecker.html" title="Chapter 21. Spell checker">
+      <link rel="next" href="appendix.website.html" title="Appendix A. OmegaT on the web">
+   </head>
+   <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+      <div class="navheader">
+         <table width="100%" summary="Navigation header">
+            <tr>
+               <th colspan="3" align="center">Chapter 22. Miscellaneous subjects</th>
+            </tr>
+            <tr>
+               <td width="20%" align="left"><a accesskey="p" href="chapter.spellchecker.html">Prev</a> 
+               </td>
+               <th width="60%" align="center"> </th>
+               <td width="20%" align="right"> <a accesskey="n" href="appendix.website.html">Next</a></td>
+            </tr>
+         </table>
+         <hr>
+      </div>
+      <div class="chapter" title="Chapter 22. Miscellaneous subjects">
+         <div class="titlepage">
+            <div>
+               <div>
+                  <h2 class="title"><a name="chapter.misc"></a>Chapter 22. Miscellaneous subjects<a class="indexterm" name="d0e8087"></a></h2>
+               </div>
+            </div>
+         </div>
+         <div class="toc">
+            <dl>
+               <dt><span class="section"><a href="chapter.misc.html#omegat.misc.console.mode">1. OmegaT Console Mode</a></span></dt>
+               <dd>
+                  <dl>
+                     <dt><span class="section"><a href="chapter.misc.html#misc.console.mode.prerequisites">1.1. Prerequisites</a></span></dt>
+                     <dt><span class="section"><a href="chapter.misc.html#starting.in.misc.console.mode">1.2. Launching OmegaT in console mode</a></span></dt>
+                     <dt><span class="section"><a href="chapter.misc.html#misc.console.mode.extra.options">1.3. Extra options</a></span></dt>
+                  </dl>
+               </dd>
+               <dt><span class="section"><a href="chapter.misc.html#d0e8235">2. Automatic Java Properties Aligner</a></span></dt>
+               <dt><span class="section"><a href="chapter.misc.html#font.settings">3. Font settings</a></span></dt>
+               <dt><span class="section"><a href="chapter.misc.html#preventing.data.loss">4. Preventing data loss</a></span></dt>
+            </dl>
+         </div>
+         <div class="section" title="1. OmegaT Console Mode">
+            <div class="titlepage">
+               <div>
+                  <div>
+                     <h2 class="title" style="clear: both"><a name="omegat.misc.console.mode"></a>1. <span class="application"><a class="indexterm" name="d0e8093"></a>OmegaT</span> Console Mode<a class="indexterm" name="d0e8100"></a></h2>
+                  </div>
+               </div>
+            </div>
+            <div class="note" title="Note" style="margin-left: 0.5in; margin-right: 0.5in;">
+               <h3 class="title">Note</h3>
+               <p>Of interest for advanced users only!</p>
+            </div>
+            <p>The purpose of the console (i.e. command line) mode is to permit the
+                   use <span class="application">of OmegaT</span> as translation tool in a
+                   scripting environment. When launched in console mode, no GUI is loaded (
+                   it will work therefore on any console) and the given project is
+                   automatically translated. An example would be a software project, with GUI
+                   localized in a number of languages. Using the console mode, one can make
+                   generating a localized interface a part of the build process.
+            </p>
+            <div class="section" title="1.1. Prerequisites">
+               <div class="titlepage">
+                  <div>
+                     <div>
+                        <h3 class="title"><a name="misc.console.mode.prerequisites"></a>1.1. Prerequisites
+                        </h3>
+                     </div>
+                  </div>
+               </div>
+               <p>To run OmegaT, a valid OmegaT project must be available. The
+                        location is irrelevant, since it must be specified explicitly on the
+                        command-line at launch..
+               </p>
+               <p>If you need non-standard settings, the corresponding configuration
+                        files (<code class="literal">filters.conf</code> and
+                        <code class="literal">segmentation.conf)</code> must be present. This can be
+                        achieved in two ways:
+               </p>
+               <div class="itemizedlist">
+                  <ul class="itemizedlist" type="disc">
+                     <li class="listitem">
+                        <p>Run <span class="application">OmegaT</span> normally (with the GUI)
+                                     and set the settings. If you start <span class="application">OmegaT</span>
+                                     in console mode, it will use the settings you configured.
+                        </p>
+                     </li>
+                     <li class="listitem">
+                        <p>If you are unable to run <span class="application">OmegaT</span>
+                                     normally (no graphical environment available): copy the settings
+                                     files from some other <span class="application">OmegaT</span> installation
+                                     on another machine to a specific directory. The location does not
+                                     matter, since you can add it to the command line at launch (see
+                                     below). The relevant files <code class="literal">filters.conf</code> and
+                                     <code class="literal">segmentation.conf</code> can be found in the user home
+                                     directory (E.g. <code class="literal">C:\Documents and
+                                        Settings\%User%\<span class="application">OmegaT</span></code> under
+                                     Windows, <code class="literal">%user%/.omegat/</code> under Linux)
+                        </p>
+                     </li>
+                  </ul>
+               </div>
+            </div>
+            <div class="section" title="1.2. Launching OmegaT in console mode">
+               <div class="titlepage">
+                  <div>
+                     <div>
+                        <h3 class="title"><a name="starting.in.misc.console.mode"></a>1.2. Launching OmegaT in console mode
+                        </h3>
+                     </div>
+                  </div>
+               </div>
+               <p>To launch OmegaT in console mode, additional parameters must be
+                        specified at launch. The most important of these is
+                        <code class="literal"><project-dir></code>, and
+                        optionally<code class="literal">--config-dir=<config-dir>.
+                           </code>Example:
+               </p>
+               <p><code class="literal">$> java -jar <span class="application">OmegaT</span>.jar
+                           /path/to/project \</code></p>
+               <p><code class="literal"> --config-dir=/path/to/config-files/ \</code></p>
+               <p><code class="literal"> --mode=console-translate \</code></p>
+               <p><code class="literal"> --source-pattern={regexp}</code></p>
+               <p><span class="bold"><strong>Explanation:</strong></span></p>
+               <div class="itemizedlist">
+                  <ul class="itemizedlist" type="disc">
+                     <li class="listitem">
+                        <p><code class="literal"><project-dir></code> tells
+                                     <span class="application">OmegaT</span> where to find the project to be
+                                     translated. If given, <span class="application">OmegaT</span> launches in
+                                     console mode and translates the given project.
+                        </p>
+                     </li>
+                  </ul>
+               </div>
+               <div class="itemizedlist">
+                  <ul class="itemizedlist" type="disc">
+                     <li class="listitem">
+                        <p><code class="literal">--config-dir=<config-dir></code> enables
+                                     OmegaT to be instructed in which folder the configuration files are
+                                     stored. If not specified, OmegaT reverts to default values (the
+                                     OmegaT folder in the user home folder, or if not available: the
+                                     current working directory).
+                        </p>
+                     </li>
+                  </ul>
+               </div>
+               <div class="itemizedlist">
+                  <ul class="itemizedlist" type="disc">
+                     <li class="listitem">
+                        <p><code class="literal">--mode=console-translate </code>
+                                     <span class="application">OmegaT</span> launches in console mode and
+                                     translates the given project
+                        </p>
+                     </li>
+                     <li class="listitem">
+                        <p>--source-pattern={regexp} The files to be translated can be
+                                     specified this way. Here is an example of the regular expression:
+                                     <code class="filename">test\.html</code></p>
+                     </li>
+                  </ul>
+               </div>
+            </div>
+            <div class="section" title="1.3. Extra options">
+               <div class="titlepage">
+                  <div>
+                     <div>
+                        <h3 class="title"><a name="misc.console.mode.extra.options"></a>1.3. Extra options
+                        </h3>
+                     </div>
+                  </div>
+               </div>
+               <p>One further command line parameter exists specific to the console
+                        mode: <code class="literal">--quiet. </code>In quiet mode, less information is
+                        logged to the screen. The messages that you would usually find in the
+                        status bar are not shown.
+               </p>
+               <p>Usage: <code class="literal">java -jar <span class="application">OmegaT</span>.jar
+                           /path/to/project --quiet</code></p>
+            </div>
+         </div>
+         <div class="section" title="2. Automatic Java Properties Aligner">
+            <div class="titlepage">
+               <div>
+                  <div>
+                     <h2 class="title" style="clear: both"><a name="d0e8235"></a>2. Automatic Java Properties Aligner<a class="indexterm" name="d0e8238"></a></h2>
+                  </div>
+               </div>
+            </div>
+            <p>OmegaT can align Java .properties in console mode. If you have the
+                   source and the target Properties files for one and the same contents in
+                   your language pair, this procedure will create a corresponding tmx file
+                   for these contents. Usage:
+            </p>
+            <p><code class="literal">java -jar OmegaT.jar --mode=console-align /my-project-dir
+                      --alignDir=/translatedFiles/ </code></p>
+            <p><code class="filename">alignDir </code>must contain a translation in the
+                   target language of the project. E.g., if the project is EN->FR,
+                   alignDir must contain a bundle ending with _fr. The resulting tmx is
+                   stored in the <code class="literal">omegat </code>folder under the name
+                   <code class="filename">align.tmx</code>.
+            </p>
+         </div>
+         <div class="section" title="3. Font settings">
+            <div class="titlepage">
+               <div>
+                  <div>
+                     <h2 class="title" style="clear: both"><a name="font.settings"></a>3. Font settings<a class="indexterm" name="d0e8263"></a></h2>
+                  </div>
+               </div>
+            </div>
+            <p>In this dialog one can define the font used by
+                   <span class="application">OmegaT</span> in the following windows:
+            </p>
+            <div class="itemizedlist">
+               <ul class="itemizedlist" type="disc">
+                  <li class="listitem">
+                     <p><span class="application">OmegaT</span> main window (Editor, Match
+                                viewer, Glossary viewer)
+                     </p>
+                  </li>
+               </ul>
+            </div>
+            <div class="itemizedlist">
+               <ul class="itemizedlist" type="disc">
+                  <li class="listitem">
+                     <p>Search window</p>
+                  </li>
+               </ul>
+            </div>
+            <div class="itemizedlist">
+               <ul class="itemizedlist" type="disc">
+                  <li class="listitem">
+                     <p>Tag validation window</p>
+                  </li>
+               </ul>
+            </div>
+            <p>The dialog can be accessed via the <a class="indexterm" name="d0e8289"></a><span class="guimenu">Options</span> → <span class="guimenuitem">Font...</span> item in the Main menu. The dialog contains:
+            </p>
+            <div class="itemizedlist">
+               <ul class="itemizedlist" type="disc">
+                  <li class="listitem">
+                     <p><span class="bold"><strong>Font:</strong></span> drop-down to select one
+                                of the fonts available on your machine
+                     </p>
+                  </li>
+               </ul>
+            </div>
+            <div class="itemizedlist">
+               <ul class="itemizedlist" type="disc">
+                  <li class="listitem">
+                     <p><span class="bold"><strong>Size:</strong></span> edit to change font
+                                size
+                     </p>
+                  </li>
+               </ul>
+            </div>
+            <div class="itemizedlist">
+               <ul class="itemizedlist" type="disc">
+                  <li class="listitem">
+                     <p><span class="bold"><strong>Sample text:</strong></span> field for
+                                immediate preview of the selected font
+                     </p>
+                  </li>
+               </ul>
+            </div>
+            <p><span class="bold"><strong>Note: </strong></span>In some cases it may take
+                   quite some time for OmegaT to update the display after the font setting
+                   has been changed. This is especially the case when a large file containing
+                   many segments is open in the editor, and/or slow hardware is used. Note
+                   also that some fonts behave better for some language pairs than for
+                   others. In particular, if you are translating between two languages with
+                   different alphabets/writing systems (such as Russian and Japanese), select
+                   a font that can be used for both.
+            </p>
+         </div>
+         <div class="section" title="4. Preventing data loss">
+            <div class="titlepage">
+               <div>
+                  <div>
+                     <h2 class="title" style="clear: both"><a name="preventing.data.loss"></a>4. Preventing data loss<a class="indexterm" name="d0e8325"></a></h2>
+                  </div>
+               </div>
+            </div>
+            <p><span class="application">OmegaT</span> is a robust application. However,
+                   you should take precautions against data loss when using
+                   <span class="application">OmegaT</span>, just as with any other application.
+                   When you translate your files, <span class="application">OmegaT</span> stores
+                   all your progress in the translation memory
+                   <code class="literal">project_save.tmx</code> that resides in the project's
+                   <code class="literal">/omegat </code>subfolder.
+            </p>
+            <p>OmegaT also backs up the translation memory to
+                   project_save.tmx.YEARMMDDHHNN.bak in the same subfolder each time a
+                   project is opened or reloaded. YEAR is the 4-digit year, MM is the month,
+                   DD the day of the month, and HH and NN are the hours and minutes when the
+                   previous translation memory was saved.
+            </p>
+            <p>If you believe that you have lost translation data, you can use the
+                   following procedure to restore the project to its most recently saved
+                   state, usually not older than approximately 10 minutes or so:
+            </p>
+            <div class="orderedlist">
+               <ol class="orderedlist" type="1">
+                  <li class="listitem">
+                     <p>close the project</p>
+                  </li>
+                  <li class="listitem">
+                     <p>rename the current <code class="filename">project_save.tmx </code>file
+                                (e.g. to <code class="filename">project_save.tmx.temporary</code>)
+                     </p>
+                  </li>
+                  <li class="listitem">
+                     <p>select the backup translation memory that is the most likely to
+                                contain the data you are looking for
+                     </p>
+                  </li>
+                  <li class="listitem">
+                     <p>rename it <code class="literal">project_save.tmx</code></p>
+                  </li>
+                  <li class="listitem">
+                     <p>open the project</p>
+                  </li>
+               </ol>
+            </div>
+            <p>To avoid losing important data:</p>
+            <div class="itemizedlist">
+               <ul class="itemizedlist" type="disc">
+                  <li class="listitem">
+                     <p>Make regular copies of the file /omegat/project_save.tmx to
+                                backup media, such as CD or DVD.
+                     </p>
+                  </li>
+                  <li class="listitem">
+                     <p>Until you are familiar with <span class="application">OmegaT</span>,
+                                create translated files at regular intervals and check that the
+                                translated file contains the latest version of your
+                                translation.
+                     </p>
+                  </li>
+                  <li class="listitem">
+                     <p>Take particular care when making changes to the files
+                                in <code class="literal">/source </code>while in the middle of a project. If the
+                                source file is modified after you have begun translating,
+                                <span class="application">OmegaT</span> may be unable to find a segment that
+                                you have already translated.
+                     </p>
+                  </li>
+               </ul>
+            </div>
+            <div class="itemizedlist">
+               <ul class="itemizedlist" type="disc">
+                  <li class="listitem">
+                     <p>Use these Help texts to get started. Should you run into
+                                problems, post a message in the <a class="ulink" href="http://tech.groups.yahoo.com/group/Omegat/" target="_top"><span class="application">OmegaT</span>
+                                   user group</a>. Do not hesitate to post in the language you feel
+                                the most familiar with.
+                     </p>
+                  </li>
+               </ul>
+            </div>
+         </div>
+      </div>
+      <div class="navfooter">
+         <hr>
+         <table width="100%" summary="Navigation footer">
+            <tr>
+               <td width="40%" align="left"><a accesskey="p" href="chapter.spellchecker.html">Prev</a> 
+               </td>
+               <td width="20%" align="center"> </td>
+               <td width="40%" align="right"> <a accesskey="n" href="appendix.website.html">Next</a></td>
+            </tr>
+            <tr>
+               <td width="40%" align="left" valign="top">Chapter 21. Spell checker </td>
+               <td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td>
+               <td width="40%" align="right" valign="top"> Appendix A. OmegaT on the web</td>
+            </tr>
+         </table>
+      </div>
+   </body>
+</html>
\ No newline at end of file
diff --git a/docs/en/chapter.plain.text.html b/docs/en/chapter.plain.text.html
new file mode 100644
index 0000000..f7b75b8
--- /dev/null
+++ b/docs/en/chapter.plain.text.html
@@ -0,0 +1,190 @@
+<html>
+   <head>
+      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+   
+      <title>Chapter 13. Working with plain text</title>
+      <link rel="stylesheet" href="OmegaT.css" type="text/css">
+      <meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+      <link rel="home" href="index.html" title="OmegaT - User's Guide">
+      <link rel="up" href="index.html" title="OmegaT - User's Guide">
+      <link rel="prev" href="chapter.formatted.text.html" title="Chapter 12. Working with formatted text">
+      <link rel="next" href="chapter.translation.memories.html" title="Chapter 14. Translation memories">
+   </head>
+   <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+      <div class="navheader">
+         <table width="100%" summary="Navigation header">
+            <tr>
+               <th colspan="3" align="center">Chapter 13. Working with plain text</th>
+            </tr>
+            <tr>
+               <td width="20%" align="left"><a accesskey="p" href="chapter.formatted.text.html">Prev</a> 
+               </td>
+               <th width="60%" align="center"> </th>
+               <td width="20%" align="right"> <a accesskey="n" href="chapter.translation.memories.html">Next</a></td>
+            </tr>
+         </table>
+         <hr>
+      </div>
+      <div class="chapter" title="Chapter 13. Working with plain text">
+         <div class="titlepage">
+            <div>
+               <div>
+                  <h2 class="title"><a name="chapter.plain.text"></a>Chapter 13. Working with plain text<a class="indexterm" name="d0e5816"></a></h2>
+               </div>
+            </div>
+         </div>
+         <div class="toc">
+            <dl>
+               <dt><span class="section"><a href="chapter.plain.text.html#default.encoding">1. Default encoding</a></span></dt>
+               <dt><span class="section"><a href="chapter.plain.text.html#OmegaT.solution">2. The <span class="application">OmegaT</span> solution</a></span></dt>
+            </dl>
+         </div>
+         <div class="section" title="1. Default encoding">
+            <div class="titlepage">
+               <div>
+                  <div>
+                     <h2 class="title" style="clear: both"><a name="default.encoding"></a>1. Default encoding<a class="indexterm" name="d0e5824"></a><a class="indexterm" name="d0e5829"></a></h2>
+                  </div>
+               </div>
+            </div>
+            <p>Plain text files - in most cases files with a txt extension -
+               contain just textual information and offer no clearly defined way to
+               inform the computer which language they contain. The most that OmegaT can
+               do in such a case, is to assume that the text is written in the same
+               language the computer itself uses. This is no problem for files encoded in
+               Unicode using a 16 bit character encoding set. If the text is encoded in 8
+                   bits, however, one can be faced with the following awkward situation:
+                   instead of displaying the text, for Japanese characters...
+            </p>
+            <div class="mediaobject"><img src="images/OmT_Japanese.png"></div>
+            <p>...the system will display it like this for instance:</p>
+            <div class="mediaobject"><img src="images/OmT_Cyrillic.png"></div>
+            <p>The computer, running OmegaT, has Russian as the default language,
+                   and thus shows the characters in the Cyrillic alphabet and not in
+                   Kanji.
+            </p>
+         </div>
+         <div class="section" title="2. The OmegaT solution">
+            <div class="titlepage">
+               <div>
+                  <div>
+                     <h2 class="title" style="clear: both"><a name="OmegaT.solution"></a>2. The <span class="application">OmegaT</span> solution<a class="indexterm" name="d0e5856"></a></h2>
+                  </div>
+               </div>
+            </div>
+            <p>There are basically three ways to address this problem in
+                   <span class="application">OmegaT</span>. They all involve the application of
+                   file filters in the<span class="bold"><strong> Options </strong></span>menu.
+            </p>
+            <div class="variablelist">
+               <dl>
+                  <dt><span class="term">Change the encoding of your files to Unicode</span></dt>
+                  <dd>
+                     <p>open your source file in a text editor that correctly
+                                  interprets its encoding and save the file in <span class="bold"><strong>"UTF-8"</strong></span> encoding. Change the file extension
+                                  from <code class="literal">.txt</code> to
+                                  <code class="literal">.utf8.</code> <span class="application">OmegaT</span> will
+                                  automatically interpret the file as a UTF-8 file. This is the most
+                                  common-sense alternative, sparing you problems in the long
+                                  run.
+                     </p>
+                  </dd>
+               </dl>
+            </div>
+            <div class="variablelist">
+               <dl>
+                  <dt><span class="term">Specify the encoding for your plain text files</span></dt>
+                  <dd>
+                     <p>- i.e. files with a <code class="filename">.txt </code>extension - : in
+                                  the <span class="bold"><strong>Text files </strong></span>section of the file
+                                  filters dialog, change the <span class="bold"><strong>Source File
+                                        Encoding</strong></span> from <auto> to the encoding that
+                                  corresponds to your source <code class="filename">.txt</code> file, for
+                                  instance to .jp for the above example.
+                     </p>
+                  </dd>
+               </dl>
+            </div>
+            <div class="variablelist">
+               <dl>
+                  <dt><span class="term">Change the extensions of your plain text source files</span></dt>
+                  <dd>
+                     <p>for instance from <code class="filename">.txt</code> to 
+                                  <code class="filename">.jp</code> for Japanese plain texts: in the <span class="bold"><strong>Text files</strong></span> section of the file filters
+                                  dialog, add new <span class="bold"><strong>Source Filename
+                                        Pattern</strong></span> (<code class="filename">*.jp</code> for this example) and
+                                  select the appropriate parameters for the source and target
+                                  encoding
+                     </p>
+                  </dd>
+               </dl>
+            </div>
+            <p><span class="application">OmegaT</span> has by default the following short
+                   list available to make it easier for you to deal with some plain text
+                   files:
+            </p>
+            <div class="itemizedlist">
+               <ul class="itemizedlist" type="disc">
+                  <li class="listitem">
+                     <p><code class="literal">.txt</code> files are automatically (<auto>)
+                                interpreted by <span class="application">OmegaT</span> as being encoded in
+                                the computer's default encoding.
+                     </p>
+                  </li>
+               </ul>
+            </div>
+            <div class="itemizedlist">
+               <ul class="itemizedlist" type="disc">
+                  <li class="listitem">
+                     <p><code class="literal">.txt1</code> files are files in ISO-8859-1, covering
+                                most <span class="bold"><strong>Western Europe</strong></span>
+                                languages.<a class="indexterm" name="d0e5951"></a></p>
+                  </li>
+               </ul>
+            </div>
+            <div class="itemizedlist">
+               <ul class="itemizedlist" type="disc">
+                  <li class="listitem">
+                     <p><code class="literal">.txt2</code> files are files in ISO-8859-2, that
+                                covers most <span class="bold"><strong>Central and Eastern
+                                      Europe</strong></span> languages<a class="indexterm" name="d0e5965"></a></p>
+                  </li>
+               </ul>
+            </div>
+            <div class="itemizedlist">
+               <ul class="itemizedlist" type="disc">
+                  <li class="listitem">
+                     <p><code class="literal">.utf8</code> files are interpreted by
+                                <span class="application">OmegaT</span> as being encoded in UTF-8 (an
+                                encoding that covers almost all languages in the world).<a class="indexterm" name="d0e5979"></a></p>
+                  </li>
+               </ul>
+            </div>
+            <p>You can check that yourself by selecting the item <span class="bold"><strong>File Filters</strong></span> in the menu <span class="bold"><strong>Options</strong></span>. For example, when you have a Czech text
+                   file (very probably written in the <span class="bold"><strong>ISO-8859-2</strong></span> code) you just need to change the
+                   extension<code class="literal"> .txt</code> to <code class="literal">.txt2 </code>and
+                   <span class="application">OmegaT</span> will interpret its contents correctly.
+                   And of course, if you wish to be on the safe side, consider converting
+                   this kind of file to Unicode, i.e. to the <code class="literal">.utf8 </code>file
+                   format.
+            </p>
+         </div>
+      </div>
+      <div class="navfooter">
+         <hr>
+         <table width="100%" summary="Navigation footer">
+            <tr>
+               <td width="40%" align="left"><a accesskey="p" href="chapter.formatted.text.html">Prev</a> 
+               </td>
+               <td width="20%" align="center"> </td>
+               <td width="40%" align="right"> <a accesskey="n" href="chapter.translation.memories.html">Next</a></td>
+            </tr>
+            <tr>
+               <td width="40%" align="left" valign="top">Chapter 12. Working with formatted text </td>
+               <td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td>
+               <td width="40%" align="right" valign="top"> Chapter 14. Translation memories</td>
+            </tr>
+         </table>
+      </div>
+   </body>
+</html>
\ No newline at end of file
diff --git a/docs/en/chapter.project.properties.html b/docs/en/chapter.project.properties.html
new file mode 100644
index 0000000..2354280
--- /dev/null
+++ b/docs/en/chapter.project.properties.html
@@ -0,0 +1,167 @@
+<html>
+   <head>
+      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+   
+      <title>Chapter 6. Project properties</title>
+      <link rel="stylesheet" href="OmegaT.css" type="text/css">
+      <meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+      <link rel="home" href="index.html" title="OmegaT - User's Guide">
+      <link rel="up" href="index.html" title="OmegaT - User's Guide">
+      <link rel="prev" href="chapter.menu.html" title="Chapter 5. Menu and Keyboard shortcuts">
+      <link rel="next" href="chapter.file.filters.html" title="Chapter 7. File Filters">
+   </head>
+   <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+      <div class="navheader">
+         <table width="100%" summary="Navigation header">
+            <tr>
+               <th colspan="3" align="center">Chapter 6. Project properties</th>
+            </tr>
+            <tr>
+               <td width="20%" align="left"><a accesskey="p" href="chapter.menu.html">Prev</a> 
+               </td>
+               <th width="60%" align="center"> </th>
+               <td width="20%" align="right"> <a accesskey="n" href="chapter.file.filters.html">Next</a></td>
+            </tr>
+         </table>
+         <hr>
+      </div>
+      <div class="chapter" title="Chapter 6. Project properties">
+         <div class="titlepage">
+            <div>
+               <div>
+                  <h2 class="title"><a name="chapter.project.properties"></a>Chapter 6. Project properties<a class="indexterm" name="d0e4144"></a></h2>
+               </div>
+            </div>
+         </div>
+         <div class="toc">
+            <dl>
+               <dt><span class="section"><a href="chapter.project.properties.html#properties.dialog">1. Properties dialog</a></span></dt>
+               <dt><span class="section"><a href="chapter.project.properties.html#language.modification">2. Modifying project properties</a></span></dt>
+            </dl>
+         </div>
+         <p></p>
+         <div class="section" title="1. Properties dialog">
+            <div class="titlepage">
+               <div>
+                  <div>
+                     <h2 class="title" style="clear: both"><a name="properties.dialog"></a>1. Properties dialog
+                     </h2>
+                  </div>
+               </div>
+            </div>
+            <p>The <span class="guimenu">Project</span> → <span class="guimenuitem">Properties...</span> (<span class="shortcut"><strong><span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>E</strong></span></strong></span>) dialog is used to define and modify the project folders
+                   and languages.
+            </p>
+            <div class="figure"><a name="d0e4167"></a><p class="title"><b>Figure 6.1. Project properties window</b></p>
+               <div class="figure-contents">
+                  <div class="mediaobject"><img src="images/NewProject.png" alt="Project properties window"></div>
+               </div>
+            </div><br class="figure-break"><p>It contains:</p>
+            <div class="itemizedlist">
+               <ul class="itemizedlist" type="disc">
+                  <li class="listitem">
+                     <p>An area for setting project source and target languages with
+                                drop-down menus
+                     </p>
+                  </li>
+               </ul>
+            </div>
+            <div class="itemizedlist">
+               <ul class="itemizedlist" type="disc">
+                  <li class="listitem">
+                     <p>A segmentation settings flag</p>
+                  </li>
+               </ul>
+            </div>
+            <div class="itemizedlist">
+               <ul class="itemizedlist" type="disc">
+                  <li class="listitem">
+                     <p>An area for setting project folders</p>
+                  </li>
+               </ul>
+            </div>
+            <p>All the fields are editable. You can either enter the languages by
+                   hand or use the drop down menu. If you enter names of folders that do not
+                   exist yet, <span class="application">OmegaT</span> creates them for you.
+            </p>
+         </div>
+         <div class="section" title="2. Modifying project properties">
+            <div class="titlepage">
+               <div>
+                  <div>
+                     <h2 class="title" style="clear: both"><a name="language.modification"></a>2. Modifying project properties
+                     </h2>
+                  </div>
+               </div>
+            </div>
+            <p>Note that changes to the project setup may have some consequences,
+                   especially, when the project has already been started.
+            </p>
+            <div class="itemizedlist">
+               <ul class="itemizedlist" type="disc">
+                  <li class="listitem">
+                     <p><span class="bold"><strong>Changing source or target
+                                      languages:<a class="indexterm" name="d0e4202"></a></strong></span></p>
+                     <p>Bear in mind that changing the languages may render the
+                                currently used translation memories useless since their language pair
+                                may not longer match the new languages.
+                     </p>
+                  </li>
+                  <li class="listitem">
+                     <p><span class="bold"><strong>Segmentation modifications:<a class="indexterm" name="d0e4213"></a></strong></span></p>
+                     <p>The segmentation settings only address the way the source files
+                                are handled by <span class="application">OmegaT</span>. They do not modify
+                                the segmentation of already existing translation memories.
+                     </p>
+                     <p>Changes made to the segmentation settings may cause some already
+                                translated segments to be split or merged. This will effectively
+                                return them to the "untranslated" status, as they will no longer match
+                                segments recorded in the project memory, even though their original
+                                translation is still there.
+                     </p>
+                     <p>OmegaT may upgrade old translation memories that did not use
+                                sentence segmentation, but not vice versa. If you decide
+                                mid-translation to switch from sentence to paragraph translation, the
+                                internal translation memory of the project will not be changed.
+                     </p>
+                  </li>
+                  <li class="listitem">
+                     <p><span class="bold"><strong>Changing the folder structure:<a class="indexterm" name="d0e4231"></a></strong></span></p>
+                     <p>In case you decide to modify project folders, keep in mind that
+                                this will not move the contained files from old folders to the new
+                                location.
+                     </p>
+                  </li>
+                  <li class="listitem">
+                     <p><span class="bold"><strong>Modifying project properties during the
+                                      session:<a class="indexterm" name="d0e4242"></a></strong></span></p>
+                     <p>It is possible to modify the project properties during a
+                                translation session. However, until you have some experience with
+                                OmegaT, it is safest to consider all settings final once the
+                                translation has started – unless of course you realize a major mistake
+                                has been made. See the section Preventing data loss for ways and means
+                                of protecting your work.
+                     </p>
+                  </li>
+               </ul>
+            </div>
+         </div>
+      </div>
+      <div class="navfooter">
+         <hr>
+         <table width="100%" summary="Navigation footer">
+            <tr>
+               <td width="40%" align="left"><a accesskey="p" href="chapter.menu.html">Prev</a> 
+               </td>
+               <td width="20%" align="center"> </td>
+               <td width="40%" align="right"> <a accesskey="n" href="chapter.file.filters.html">Next</a></td>
+            </tr>
+            <tr>
+               <td width="40%" align="left" valign="top">Chapter 5. Menu and Keyboard shortcuts </td>
+               <td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td>
+               <td width="40%" align="right" valign="top"> Chapter 7. File Filters</td>
+            </tr>
+         </table>
+      </div>
+   </body>
+</html>
\ No newline at end of file
diff --git a/docs/en/chapter.regexp.html b/docs/en/chapter.regexp.html
new file mode 100644
index 0000000..9d83ad0
--- /dev/null
+++ b/docs/en/chapter.regexp.html
@@ -0,0 +1,537 @@
+<html>
+   <head>
+      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+   
+      <title>Chapter 16. Regular expressions</title>
+      <link rel="stylesheet" href="OmegaT.css" type="text/css">
+      <meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+      <link rel="home" href="index.html" title="OmegaT - User's Guide">
+      <link rel="up" href="index.html" title="OmegaT - User's Guide">
+      <link rel="prev" href="chapter.segmentation.html" title="Chapter 15. Source segmentation">
+      <link rel="next" href="chapter.searches.html" title="Chapter 17. Searches">
+   </head>
+   <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+      <div class="navheader">
+         <table width="100%" summary="Navigation header">
+            <tr>
+               <th colspan="3" align="center">Chapter 16. Regular expressions</th>
+            </tr>
+            <tr>
+               <td width="20%" align="left"><a accesskey="p" href="chapter.segmentation.html">Prev</a> 
+               </td>
+               <th width="60%" align="center"> </th>
+               <td width="20%" align="right"> <a accesskey="n" href="chapter.searches.html">Next</a></td>
+            </tr>
+         </table>
+         <hr>
+      </div>
+      <div class="chapter" title="Chapter 16. Regular expressions">
+         <div class="titlepage">
+            <div>
+               <div>
+                  <h2 class="title"><a name="chapter.regexp"></a>Chapter 16. Regular expressions<a class="indexterm" name="d0e6678"></a></h2>
+               </div>
+            </div>
+         </div>
+         <div class="toc">
+            <dl>
+               <dt><span class="section"><a href="chapter.regexp.html#regex.tools.and.examples.of.use">1. Regex tools and examples of use</a></span></dt>
+            </dl>
+         </div>
+         <p>The regular expressions (or regex for short) used in searches and
+              segmentation rules are those supported by Java. Should you need more
+              specific information, consult the <a class="ulink" href="http://download.oracle.com/javase/1.5.0/docs/api/java/util/regex/Pattern.html" target="_top">Java
+                 Regex documentation</a>. See additional references and examples
+              below.
+         </p>
+         <div class="note" title="Note" style="margin-left: 0.5in; margin-right: 0.5in;">
+            <h3 class="title">Note</h3>
+            <p>This chapter is intended for advanced users, who need to define
+                   their own variants of segmentation rules or devise more complex and
+                   powerful key search items.
+            </p>
+         </div>
+         <div class="table"><a name="d0e6693"></a><p class="title"><b>Table 16.1. Regex - Flags</b></p>
+            <div class="table-contents">
+               <table summary="Regex - Flags" border="1">
+                  <colgroup>
+                     <col width="100" align="left">
+                     <col>
+                  </colgroup>
+                  <thead>
+                     <tr>
+                        <th align="left">The construct</th>
+                        <th align="left">... matches the following</th>
+                     </tr>
+                  </thead>
+                  <tbody>
+                     <tr>
+                        <td align="left">(?i)</td>
+                        <td align="left">Enables case-insensitive matching (by default, the pattern is
+                                     case-sensitive).
+                        </td>
+                     </tr>
+                  </tbody>
+               </table>
+            </div>
+         </div><br class="table-break"><div class="table"><a name="d0e6710"></a><p class="title"><b>Table 16.2. Regex - Character</b></p>
+            <div class="table-contents">
+               <table summary="Regex - Character" border="1">
+                  <colgroup>
+                     <col width="100" align="left">
+                     <col>
+                  </colgroup>
+                  <thead>
+                     <tr>
+                        <th align="left">The construct</th>
+                        <th align="left">... matches the following</th>
+                     </tr>
+                  </thead>
+                  <tbody>
+                     <tr>
+                        <td align="left">x</td>
+                        <td align="left">The character x, except the following...</td>
+                     </tr>
+                     <tr>
+                        <td align="left">\uhhhh</td>
+                        <td align="left">The character with hexadecimal value 0xhhhh</td>
+                     </tr>
+                     <tr>
+                        <td align="left">\t</td>
+                        <td align="left">The tab character ('\u0009')</td>
+                     </tr>
+                     <tr>
+                        <td align="left">\n</td>
+                        <td align="left">The newline (line feed) character ('\u000A')</td>
+                     </tr>
+                     <tr>
+                        <td align="left">\r</td>
+                        <td align="left">The carriage-return character ('\u000D')</td>
+                     </tr>
+                     <tr>
+                        <td align="left">\f</td>
+                        <td align="left">The form-feed character ('\u000C')</td>
+                     </tr>
+                     <tr>
+                        <td align="left">\a</td>
+                        <td align="left">The alert (bell) character ('\u0007')</td>
+                     </tr>
+                     <tr>
+                        <td align="left">\e</td>
+                        <td align="left">The escape character ('\u001B')</td>
+                     </tr>
+                     <tr>
+                        <td align="left">\cx</td>
+                        <td align="left">The control character corresponding to x</td>
+                     </tr>
+                     <tr>
+                        <td align="left">\0n</td>
+                        <td align="left">The character with octal value 0n (0 <= n <= 7)</td>
+                     </tr>
+                     <tr>
+                        <td align="left">\0nn</td>
+                        <td align="left">The character with octal value 0nn (0 <= n <=
+                                     7)
+                        </td>
+                     </tr>
+                     <tr>
+                        <td align="left">\0mnn</td>
+                        <td align="left">The character with octal value 0mnn (0 <= m <= 3, 0
+                                     <= n <= 7)
+                        </td>
+                     </tr>
+                     <tr>
+                        <td align="left">\xhh</td>
+                        <td align="left">The character with hexadecimal value 0xhh</td>
+                     </tr>
+                  </tbody>
+               </table>
+            </div>
+         </div><br class="table-break"><div class="table"><a name="d0e6787"></a><p class="title"><b>Table 16.3. Regex - Quotation</b></p>
+            <div class="table-contents">
+               <table summary="Regex - Quotation" border="1">
+                  <colgroup>
+                     <col width="100" align="left">
+                     <col>
+                  </colgroup>
+                  <thead>
+                     <tr>
+                        <th align="left">The construct</th>
+                        <th align="left">...matches the following</th>
+                     </tr>
+                  </thead>
+                  <tbody>
+                     <tr>
+                        <td align="left">\</td>
+                        <td align="left">Nothing, but quotes the following character. This is required
+                                     if you would like to enter any of the meta characters
+                                     !$()*+.<>?[\]^{|} to match as themselves.
+                        </td>
+                     </tr>
+                     <tr>
+                        <td align="left">\\</td>
+                        <td align="left">For example, this is the backslash character</td>
+                     </tr>
+                     <tr>
+                        <td align="left">\Q</td>
+                        <td align="left">Nothing, but quotes all characters until \E</td>
+                     </tr>
+                     <tr>
+                        <td align="left">\E</td>
+                        <td align="left">Nothing, but ends quoting started by \Q</td>
+                     </tr>
+                  </tbody>
+               </table>
+            </div>
+         </div><br class="table-break"><div class="table"><a name="d0e6819"></a><p class="title"><b>Table 16.4. Regex - Classes for Unicode blocks and categories</b></p>
+            <div class="table-contents">
+               <table summary="Regex - Classes for Unicode blocks and categories" border="1">
+                  <colgroup>
+                     <col width="100" align="left">
+                     <col>
+                  </colgroup>
+                  <thead>
+                     <tr>
+                        <th align="left">The construct</th>
+                        <th align="left">...matches the following</th>
+                     </tr>
+                  </thead>
+                  <tbody>
+                     <tr>
+                        <td align="left">\p{InGreek}</td>
+                        <td align="left">A character in the Greek block (simple <a class="ulink" href="http://download.oracle.com/javase/1.5.0/docs/api/java/util/regex/Pattern.html#ubc" target="_top">
+                                        block</a>)
+                        </td>
+                     </tr>
+                     <tr>
+                        <td align="left">\p{Lu}</td>
+                        <td align="left">An uppercase letter (simple <a class="ulink" href="http://download.oracle.com/javase/1.5.0/docs/api/java/util/regex/Pattern.html#ubc" target="_top">
+                                        category</a>)
+                        </td>
+                     </tr>
+                     <tr>
+                        <td align="left">\p{Sc}</td>
+                        <td align="left">A currency symbol</td>
+                     </tr>
+                     <tr>
+                        <td align="left">\P{InGreek}</td>
+                        <td align="left">Any character except one in the Greek block
+                                     (negation)
+                        </td>
+                     </tr>
+                     <tr>
+                        <td align="left">[\p{L}&&[^\p{Lu}]]</td>
+                        <td align="left">Any letter except an uppercase letter (subtraction)</td>
+                     </tr>
+                  </tbody>
+               </table>
+            </div>
+         </div><br class="table-break"><div class="table"><a name="d0e6862"></a><p class="title"><b>Table 16.5. Regex - Character classes</b></p>
+            <div class="table-contents">
+               <table summary="Regex - Character classes" border="1">
+                  <colgroup>
+                     <col width="100" align="left">
+                     <col>
+                  </colgroup>
+                  <thead>
+                     <tr>
+                        <th align="left">The construct</th>
+                        <th align="left">...matches the following</th>
+                     </tr>
+                  </thead>
+                  <tbody>
+                     <tr>
+                        <td align="left">[abc]</td>
+                        <td align="left">a, b, or c (simple class)</td>
+                     </tr>
+                     <tr>
+                        <td align="left">[^abc]</td>
+                        <td align="left">Any character except a, b, or c (negation)</td>
+                     </tr>
+                     <tr>
+                        <td align="left">[a-zA-Z]</td>
+                        <td align="left">a through z or A through Z, inclusive (range)</td>
+                     </tr>
+                  </tbody>
+               </table>
+            </div>
+         </div><br class="table-break"><div class="table"><a name="d0e6889"></a><p class="title"><b>Table 16.6. Regex - Predefined character classes</b></p>
+            <div class="table-contents">
+               <table summary="Regex - Predefined character classes" border="1">
+                  <colgroup>
+                     <col width="100" align="left">
+                     <col>
+                  </colgroup>
+                  <thead>
+                     <tr>
+                        <th align="left">The construct</th>
+                        <th align="left">...matches the following</th>
+                     </tr>
+                  </thead>
+                  <tbody>
+                     <tr>
+                        <td align="left">.</td>
+                        <td align="left">Any character (except for line terminators)</td>
+                     </tr>
+                     <tr>
+                        <td align="left">\d</td>
+                        <td align="left">A digit: [0-9]</td>
+                     </tr>
+                     <tr>
+                        <td align="left">\D</td>
+                        <td align="left">A non-digit: [^0-9]</td>
+                     </tr>
+                     <tr>
+                        <td align="left">\s</td>
+                        <td align="left">A whitespace character: [ \t\n\x0B\f\r]</td>
+                     </tr>
+                     <tr>
+                        <td align="left">\S</td>
+                        <td align="left">A non-whitespace character: [^\s]</td>
+                     </tr>
+                     <tr>
+                        <td align="left">\w</td>
+                        <td align="left">A word character: [a-zA-Z_0-9]</td>
+                     </tr>
+                     <tr>
+                        <td align="left">\W</td>
+                        <td align="left">A non-word character: [^\w]</td>
+                     </tr>
+                  </tbody>
+               </table>
+            </div>
+         </div><br class="table-break"><div class="table"><a name="d0e6936"></a><p class="title"><b>Table 16.7. Regex - Boundary matchers</b></p>
+            <div class="table-contents">
+               <table summary="Regex - Boundary matchers" border="1">
+                  <colgroup>
+                     <col width="100" align="left">
+                     <col>
+                  </colgroup>
+                  <thead>
+                     <tr>
+                        <th align="left">The construct</th>
+                        <th align="left">...matches the following</th>
+                     </tr>
+                  </thead>
+                  <tbody>
+                     <tr>
+                        <td align="left">^</td>
+                        <td align="left">The beginning of a line</td>
+                     </tr>
+                     <tr>
+                        <td align="left">$</td>
+                        <td align="left">The end of a line</td>
+                     </tr>
+                     <tr>
+                        <td align="left">\b</td>
+                        <td align="left">A word boundary</td>
+                     </tr>
+                     <tr>
+                        <td align="left">\B</td>
+                        <td align="left">A non-word boundary</td>
+                     </tr>
+                  </tbody>
+               </table>
+            </div>
+         </div><br class="table-break"><div class="table"><a name="d0e6968"></a><p class="title"><b>Table 16.8. Regex - Greedy quantifiers</b></p>
+            <div class="table-contents">
+               <table summary="Regex - Greedy quantifiers" border="1">
+                  <colgroup>
+                     <col width="100" align="left">
+                     <col>
+                  </colgroup>
+                  <thead>
+                     <tr>
+                        <th align="left">The construct</th>
+                        <th align="left">...matches the following</th>
+                     </tr>
+                  </thead>
+                  <tbody>
+                     <tr>
+                        <td align="left">X<span class="emphasis"><em>?</em></span></td>
+                        <td align="left">X, once or not at all</td>
+                     </tr>
+                     <tr>
+                        <td align="left">X<span class="emphasis"><em>*</em></span></td>
+                        <td align="left">X, zero or more times</td>
+                     </tr>
+                     <tr>
+                        <td align="left">X<span class="emphasis"><em>+</em></span></td>
+                        <td align="left">X, one or more times</td>
+                     </tr>
+                  </tbody>
+               </table>
+            </div>
+         </div><br class="table-break"><div class="note" title="Note" style="margin-left: 0.5in; margin-right: 0.5in;">
+            <h3 class="title">Note</h3>
+            <p>greedy quantifiers will match as much as they can. For example,
+                   <span class="emphasis"><em>a+?</em></span> will match the aaa in
+                   <span class="emphasis"><em>aaabbb</em></span></p>
+         </div>
+         <div class="table"><a name="d0e7009"></a><p class="title"><b>Table 16.9. Regex - Reluctant (non-greedy) quantifiers</b></p>
+            <div class="table-contents">
+               <table summary="Regex - Reluctant (non-greedy) quantifiers" border="1">
+                  <colgroup>
+                     <col width="100" align="left">
+                     <col>
+                  </colgroup>
+                  <thead>
+                     <tr>
+                        <th align="left">The construct</th>
+                        <th align="left">...matches the following</th>
+                     </tr>
+                  </thead>
+                  <tbody>
+                     <tr>
+                        <td align="left">X??</td>
+                        <td align="left">X, once or not at all</td>
+                     </tr>
+                     <tr>
+                        <td align="left">X*?</td>
+                        <td align="left">X, zero or more times</td>
+                     </tr>
+                     <tr>
+                        <td align="left">X+?</td>
+                        <td align="left">X, one or more times</td>
+                     </tr>
+                  </tbody>
+               </table>
+            </div>
+         </div><br class="table-break"><div class="note" title="Note" style="margin-left: 0.5in; margin-right: 0.5in;">
+            <h3 class="title">Note</h3>
+            <p>non-greedy quantifiers will match as little as they can. For
+                   example, <span class="emphasis"><em>a+?</em></span> will match the first
+                   <span class="emphasis"><em>a</em></span> in <span class="emphasis"><em>aaabbb</em></span></p>
+         </div>
+         <div class="table"><a name="d0e7047"></a><p class="title"><b>Table 16.10. Regex - Logical operators</b></p>
+            <div class="table-contents">
+               <table summary="Regex - Logical operators" border="1">
+                  <colgroup>
+                     <col width="100" align="left">
+                     <col>
+                  </colgroup>
+                  <thead>
+                     <tr>
+                        <th align="left">The construct</th>
+                        <th align="left">...matches the following</th>
+                     </tr>
+                  </thead>
+                  <tbody>
+                     <tr>
+                        <td align="left">XY</td>
+                        <td align="left">X followed by Y</td>
+                     </tr>
+                     <tr>
+                        <td align="left">X|Y</td>
+                        <td align="left">Either X or Y</td>
+                     </tr>
+                     <tr>
+                        <td align="left">(XY)</td>
+                        <td align="left">XY as a single group</td>
+                     </tr>
+                  </tbody>
+               </table>
+            </div>
+         </div><br class="table-break"><div class="section" title="1. Regex tools and examples of use">
+            <div class="titlepage">
+               <div>
+                  <div>
+                     <h2 class="title" style="clear: both"><a name="regex.tools.and.examples.of.use"></a>1. <a class="indexterm" name="d0e7076"></a>Regex tools and examples of use<a class="indexterm" name="d0e7082"></a></h2>
+                  </div>
+               </div>
+            </div>
+            <p>A number of interactive tools are available to develop and test
+                   regular expressions. They generally follow much the same pattern (for an
+                   example from the Regular Expression Tester see below): the regular
+                   expression (top entry) analyzes the search text (Text box in the middle) ,
+                   yielding the hits, shown in the result Text box.
+            </p>
+            <div class="figure"><a name="regerx.tester"></a><p class="title"><b>Figure 16.1. Regex Tester</b></p>
+               <div class="figure-contents">
+                  <div class="mediaobject"><img src="images/RegexTester.png" alt="Regex Tester"></div>
+               </div>
+            </div><br class="figure-break"><p>See <a class="ulink" href="http://weitz.de/regex-coach/" target="_top">The Regex
+                      Coach</a> for Windows,Linux, FreeBSD versions of a stand-alone tool.
+                   This is much the same as the above example.
+            </p>
+            <p>A nice collection of useful regex cases can be found in
+                   <span class="application">OmegaT</span> itself (see Options > Segmentation).
+                   The following list includes expressions you may find useful when searching
+                   through the translation memory:
+            </p>
+            <div class="table"><a name="d0e7107"></a><p class="title"><b>Table 16.11. Regex - Examples of regular expressions in translations</b></p>
+               <div class="table-contents">
+                  <table summary="Regex - Examples of regular expressions in translations" border="1">
+                     <colgroup>
+                        <col width="100" align="left">
+                        <col>
+                     </colgroup>
+                     <thead>
+                        <tr>
+                           <th align="left">Regular expression</th>
+                           <th align="left">Finds the following:</th>
+                        </tr>
+                     </thead>
+                     <tbody>
+                        <tr>
+                           <td align="left">(\b\w+\b)\s\1\b</td>
+                           <td align="left">double words</td>
+                        </tr>
+                        <tr>
+                           <td align="left">[\.,]\s*[\.,]+</td>
+                           <td align="left">comma or a period, followed by spaces and yet another comma
+                                          or period
+                           </td>
+                        </tr>
+                        <tr>
+                           <td align="left">\. \s+$</td>
+                           <td align="left">extra spaces after the period at the end of the
+                                          line
+                           </td>
+                        </tr>
+                        <tr>
+                           <td align="left">\s+a\s+[aeiou]</td>
+                           <td align="left">English: words, beginning with vowels, should generally be
+                                          preceded by "an", not "a"
+                           </td>
+                        </tr>
+                        <tr>
+                           <td align="left">\s+an\s+[^aeiou]</td>
+                           <td align="left">English: the same check as above, but concerning consonants
+                                          ("a", not "an")
+                           </td>
+                        </tr>
+                        <tr>
+                           <td align="left">\s\s+</td>
+                           <td align="left">more than one space</td>
+                        </tr>
+                        <tr>
+                           <td align="left">\.[A-Z]</td>
+                           <td align="left">Period, followed by an upper-case letter - possibly a space
+                                          is missing between the period and the start of a new
+                                          sentence?
+                           </td>
+                        </tr>
+                     </tbody>
+                  </table>
+               </div>
+            </div><br class="table-break"></div>
+      </div>
+      <div class="navfooter">
+         <hr>
+         <table width="100%" summary="Navigation footer">
+            <tr>
+               <td width="40%" align="left"><a accesskey="p" href="chapter.segmentation.html">Prev</a> 
+               </td>
+               <td width="20%" align="center"> </td>
+               <td width="40%" align="right"> <a accesskey="n" href="chapter.searches.html">Next</a></td>
+            </tr>
+            <tr>
+               <td width="40%" align="left" valign="top">Chapter 15. Source segmentation </td>
+               <td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td>
+               <td width="40%" align="right" valign="top"> Chapter 17. Searches</td>
+            </tr>
+         </table>
+      </div>
+   </body>
+</html>
\ No newline at end of file
diff --git a/docs/en/chapter.searches.html b/docs/en/chapter.searches.html
new file mode 100644
index 0000000..7bc2a1a
--- /dev/null
+++ b/docs/en/chapter.searches.html
@@ -0,0 +1,285 @@
+<html>
+   <head>
+      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+   
+      <title>Chapter 17. Searches</title>
+      <link rel="stylesheet" href="OmegaT.css" type="text/css">
+      <meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+      <link rel="home" href="index.html" title="OmegaT - User's Guide">
+      <link rel="up" href="index.html" title="OmegaT - User's Guide">
+      <link rel="prev" href="chapter.regexp.html" title="Chapter 16. Regular expressions">
+      <link rel="next" href="chapter.dictionaries.html" title="Chapter 18. Dictionaries">
+   </head>
+   <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+      <div class="navheader">
+         <table width="100%" summary="Navigation header">
+            <tr>
+               <th colspan="3" align="center">Chapter 17. Searches</th>
+            </tr>
+            <tr>
+               <td width="20%" align="left"><a accesskey="p" href="chapter.regexp.html">Prev</a> 
+               </td>
+               <th width="60%" align="center"> </th>
+               <td width="20%" align="right"> <a accesskey="n" href="chapter.dictionaries.html">Next</a></td>
+            </tr>
+         </table>
+         <hr>
+      </div>
+      <div class="chapter" title="Chapter 17. Searches">
+         <div class="titlepage">
+            <div>
+               <div>
+                  <h2 class="title"><a name="chapter.searches"></a>Chapter 17. Searches<a class="indexterm" name="d0e7157"></a></h2>
+               </div>
+            </div>
+         </div>
+         <div class="toc">
+            <dl>
+               <dt><span class="section"><a href="chapter.searches.html#search.window">1. Search window</a></span></dt>
+               <dd>
+                  <dl>
+                     <dt><span class="section"><a href="chapter.searches.html#d0e7179">1.1. Searching</a></span></dt>
+                     <dt><span class="section"><a href="chapter.searches.html#d0e7203">1.2. Search location</a></span></dt>
+                  </dl>
+               </dd>
+               <dt><span class="section"><a href="chapter.searches.html#using.wild.cards">2. Using wild cards</a></span></dt>
+               <dt><span class="section"><a href="chapter.searches.html#search.methoids">3. Search methods</a></span></dt>
+               <dt><span class="section"><a href="chapter.searches.html#search.result.display">4. Search results display</a></span></dt>
+            </dl>
+         </div>
+         <div class="section" title="1. Search window">
+            <div class="titlepage">
+               <div>
+                  <div>
+                     <h2 class="title" style="clear: both"><a name="search.window"></a>1. Search window
+                     </h2>
+                  </div>
+               </div>
+            </div>
+            <div class="figure"><a name="text.search.window"></a><p class="title"><b>Figure 17.1. Text search Window<a class="indexterm" name="d0e7166"></a></b></p>
+               <div class="figure-contents">
+                  <div class="mediaobject"><img src="images/TextSearch.png" alt="Text search WindowSearch windowExample"></div>
+               </div>
+            </div><br class="figure-break"><div class="note" title="Note" style="margin-left: 0.5in; margin-right: 0.5in;">
+               <h3 class="title">Note</h3>
+               <p>The above search finds all target segments where two or more white
+                        spaces - \s\s+ - occur.
+               </p>
+            </div>
+            <div class="section" title="1.1. Searching">
+               <div class="titlepage">
+                  <div>
+                     <div>
+                        <h3 class="title"><a name="d0e7179"></a>1.1. Searching<a class="indexterm" name="d0e7182"></a></h3>
+                     </div>
+                  </div>
+               </div>
+               <p><span class="application">OmegaT</span> provides a powerful range of
+                        search functions. Open the Search window with <span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>F</strong></span> and enter the word or phrase you wish to search for in the
+                        Search for box. Alternatively, in the Editor window, select a word or
+                        phrase in the editing field (target text of the current segment) and hit
+                        <span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>F</strong></span>. The word or phrase is entered in the Search for box
+                        automatically. You can have several Search windows open at the same
+                        time, but close them when they are no longer needed so that they do not
+                        clutter your desktop.
+               </p>
+            </div>
+            <div class="section" title="1.2. Search location">
+               <div class="titlepage">
+                  <div>
+                     <div>
+                        <h3 class="title"><a name="d0e7203"></a>1.2. Search location
+                        </h3>
+                     </div>
+                  </div>
+               </div>
+               <p>Searches are performed by default in both the source and target
+                        sections of the project, but you can limit your search to just the
+                        source or the target text . You may search in
+               </p>
+               <div class="itemizedlist">
+                  <ul class="itemizedlist" type="disc">
+                     <li class="listitem">
+                        <p>the project only (default setting)</p>
+                     </li>
+                  </ul>
+               </div>
+               <div class="itemizedlist">
+                  <ul class="itemizedlist" type="disc">
+                     <li class="listitem">
+                        <p>both the project and the reference translation memories in
+                                     /tm/ (check <span class="emphasis"><em>Search TMs)</em></span></p>
+                     </li>
+                  </ul>
+               </div>
+               <div class="itemizedlist">
+                  <ul class="itemizedlist" type="disc">
+                     <li class="listitem">
+                        <p>a single file or a folder containing a set of files (check
+                                     <span class="emphasis"><em>Search files)</em></span></p>
+                     </li>
+                  </ul>
+               </div>
+               <p>When searching through files (as opposed to translation memories),
+                        <span class="application">OmegaT</span> restricts the search to files in
+                        source file formats (See <a class="link" href="chapter.files.to.translate.html" title="Chapter 9. Files to translate">Files to
+                           translate -> File Formats</a>). Consequently, although OmegaT is
+                        quite able to handle<code class="filename"> tmx</code> files, it does not include
+                        them in the Search files search. If you turn on <span class="bold"><strong><a class="indexterm" name="d0e7236"></a>Advanced Options</strong></span>, you can combine the search
+                        with the name of the author of the translation and time of the last
+                        change made.
+               </p>
+            </div>
+         </div>
+         <div class="section" title="2. Using wild cards">
+            <div class="titlepage">
+               <div>
+                  <div>
+                     <h2 class="title" style="clear: both"><a name="using.wild.cards"></a>2. Using wild cards<a class="indexterm" name="d0e7246"></a></h2>
+                  </div>
+               </div>
+            </div>
+            <p>In both exact and keyword searches, the wild card search characters
+                   '*' and '?' can be used. To use wild cards, the regular expressions option
+                   should not be selected, as '*' and '?' have special meaning in regular
+                   expressions.
+            </p>
+            <div class="itemizedlist">
+               <ul class="itemizedlist" type="disc">
+                  <li class="listitem">
+                     <p>'*' matches zero or more characters, from the current position
+                                in a given word to its end. The search term<code class="literal">'run*'</code>
+                                for example would match words <code class="literal">'run'</code>, 
+                                <code class="literal">'runs'</code> and <code class="literal">'running'</code>.
+                     </p>
+                  </li>
+               </ul>
+            </div>
+            <div class="itemizedlist">
+               <ul class="itemizedlist" type="disc">
+                  <li class="listitem">
+                     <p>'?' matches any single character. For instance, <code class="literal">'run?'
+                                   </code>would match the word <code class="literal">'runs'</code> and
+                                <code class="literal">'runn'</code> in the word
+                                <code class="literal">'running'.</code></p>
+                  </li>
+               </ul>
+            </div>
+            <p>The matches will be displayed in bold blue.</p>
+         </div>
+         <div class="section" title="3. Search methods">
+            <div class="titlepage">
+               <div>
+                  <div>
+                     <h2 class="title" style="clear: both"><a name="search.methoids"></a>3. Search methods<a class="indexterm" name="d0e7289"></a></h2>
+                  </div>
+               </div>
+            </div>
+            <p>Select the method using the radio buttons. You can choose between
+                   two methods to search:
+            </p>
+            <div class="variablelist">
+               <dl>
+                  <dt><span class="term">exact search</span></dt>
+                  <dd>
+                     <p>Search for segments containing the exact string you specified.
+                                  An exact search looks for a phrase, i.e. if several words are
+                                  entered, they are found only if they occur in exactly that sequence.
+                                  Searching for <code class="literal">open file</code> will thus find all
+                                  occurrences of the string <span class="emphasis"><em><code class="literal">open
+                                           file</code></em></span>, but not <span class="emphasis"><em><code class="literal">file
+                                           opened</code></em></span> or <span class="emphasis"><em><code class="literal">open input
+                                           file</code></em></span>.
+                     </p>
+                  </dd>
+                  <dt><span class="term">keyword search</span></dt>
+                  <dd>
+                     <p>Search for segments containing all keywords you specified, in
+                                  any order. Select keyword search to search for any number of
+                                  individual full words, in any order. OmegaT displays a list of all
+                                  segments containing all of the words specified. Keyword searches are
+                                  similar to a search "with all of the words" in an Internet search
+                                  engine such as Google (AND logic). Using keyword search with
+                                  <span class="emphasis"><em><code class="literal">open file</code></em></span> will thus find all
+                                  occurrences of the string <span class="emphasis"><em><code class="literal">open
+                                           file</code>,</em></span> as well as <span class="emphasis"><em><code class="literal">file
+                                           opened</code>, <code class="literal">open input file</code>, <code class="literal">file
+                                           may not be safe to open</code></em></span>,
+                                  etc.
+                     </p>
+                  </dd>
+               </dl>
+            </div>
+            <p>For either of these two methods you can select the following three
+                   options:
+            </p>
+            <div class="itemizedlist">
+               <ul class="itemizedlist" type="disc">
+                  <li class="listitem">
+                     <p><span class="bold"><strong>case sensitive</strong></span>: the search will
+                                be performed for the exact string specified; i.e. capitalization is
+                                observed.
+                     </p>
+                  </li>
+                  <li class="listitem">
+                     <p><span class="bold"><strong>regular expressions:</strong></span> The search
+                                string will be treated as a regular expression. A regular expression
+                                search is a powerful way to look for instances of a string. It is
+                                similar to a wild card search, but allows far more flexibility. The
+                                regular expressions used in searches are those supported by Java. See
+                                more in the chapter on <a class="link" href="chapter.regexp.html" title="Chapter 16. Regular expressions">Regular
+                                   Expressions</a>.
+                     </p>
+                  </li>
+                  <li class="listitem">
+                     <p><span class="bold"><strong>search TMs</strong></span>: translation
+                                memories in the <code class="filename">tm</code> folder are included in the
+                                search.
+                     </p>
+                  </li>
+               </ul>
+            </div>
+         </div>
+         <div class="section" title="4. Search results display">
+            <div class="titlepage">
+               <div>
+                  <div>
+                     <h2 class="title" style="clear: both"><a name="search.result.display"></a>4. Search results display
+                     </h2>
+                  </div>
+               </div>
+            </div>
+            <p>Pressing the search button after entering a string in the search
+                   field displays all the segments in the project that include the entered
+                   string. As <span class="application">OmegaT</span> handles identical segments as
+                   one single entity, only the first unique segment is shown.
+            </p>
+            <p>The segments are displayed in order of appearance in the project.
+                   Translated segments are displayed with the original text at the top and
+                   the translated text at the bottom, untranslated segments are displayed as
+                   the source only.
+            </p>
+            <p>Clicking on a segment opens it in the Editor for modifications. You
+                   can then switch back to the Search window for the next segment found, for
+                   instance to check and, if necessary, correct the terminology.
+            </p>
+         </div>
+      </div>
+      <div class="navfooter">
+         <hr>
+         <table width="100%" summary="Navigation footer">
+            <tr>
+               <td width="40%" align="left"><a accesskey="p" href="chapter.regexp.html">Prev</a> 
+               </td>
+               <td width="20%" align="center"> </td>
+               <td width="40%" align="right"> <a accesskey="n" href="chapter.dictionaries.html">Next</a></td>
+            </tr>
+            <tr>
+               <td width="40%" align="left" valign="top">Chapter 16. Regular expressions </td>
+               <td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td>
+               <td width="40%" align="right" valign="top"> Chapter 18. Dictionaries</td>
+            </tr>
+         </table>
+      </div>
+   </body>
+</html>
\ No newline at end of file
diff --git a/docs/en/chapter.segmentation.html b/docs/en/chapter.segmentation.html
new file mode 100644
index 0000000..5deedfa
--- /dev/null
+++ b/docs/en/chapter.segmentation.html
@@ -0,0 +1,288 @@
+<html>
+   <head>
+      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+   
+      <title>Chapter 15. Source segmentation</title>
+      <link rel="stylesheet" href="OmegaT.css" type="text/css">
+      <meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+      <link rel="home" href="index.html" title="OmegaT - User's Guide">
+      <link rel="up" href="index.html" title="OmegaT - User's Guide">
+      <link rel="prev" href="chapter.translation.memories.html" title="Chapter 14. Translation memories">
+      <link rel="next" href="chapter.regexp.html" title="Chapter 16. Regular expressions">
+   </head>
+   <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+      <div class="navheader">
+         <table width="100%" summary="Navigation header">
+            <tr>
+               <th colspan="3" align="center">Chapter 15. Source segmentation</th>
+            </tr>
+            <tr>
+               <td width="20%" align="left"><a accesskey="p" href="chapter.translation.memories.html">Prev</a> 
+               </td>
+               <th width="60%" align="center"> </th>
+               <td width="20%" align="right"> <a accesskey="n" href="chapter.regexp.html">Next</a></td>
+            </tr>
+         </table>
+         <hr>
+      </div>
+      <div class="chapter" title="Chapter 15. Source segmentation">
+         <div class="titlepage">
+            <div>
+               <div>
+                  <h2 class="title"><a name="chapter.segmentation"></a>Chapter 15. Source segmentation
+                  </h2>
+               </div>
+            </div>
+         </div>
+         <div class="toc">
+            <dl>
+               <dt><span class="section"><a href="chapter.segmentation.html#segmentation.rules">1. Segmentation rules</a></span></dt>
+               <dt><span class="section"><a href="chapter.segmentation.html#rules.priority">2. Rule priority</a></span></dt>
+               <dt><span class="section"><a href="chapter.segmentation.html#creating.new.rule">3. Creating a new rule</a></span></dt>
+               <dt><span class="section"><a href="chapter.segmentation.html#few.simple.examples">4. A few simple examples</a></span></dt>
+            </dl>
+         </div>
+         <p>Translation memory tools work with textual units called segments.
+              <span class="application">OmegaT</span> has two ways to segment a text: by
+              paragraph or by sentence segmentation (also referred to as “rule-based
+              segmentation”). In order to select the type of segmentation, select
+              <span class="guimenu"><a class="indexterm" name="d0e6447"></a>Project</span> → <span class="guimenuitem">Properties...</span> from the main menu and tick or untick the check box
+              provided. Paragraph segmentation is advantageous in certain cases, such as
+              highly creative or stylistic translations in which the translator may wish
+              to change the order of entire sentences; for the majority of projects,
+              however, sentence segmentation is a choice to be preferred, since it
+              delivers better matches from previous translations. If sentence segmentation
+              has been selected, you can setup the rules by selecting <span class="guimenu"><a class="indexterm" name="d0e6458"></a>Options</span> → <span class="guimenuitem">Segmentation...</span>from the main menu.
+         </p>
+         <p>Dependable segmentation rules are already available for many
+              languages, so it is likely that you will not need to get involved with
+              writing your own segmentation rules. On the other hand this functionality
+              can be very useful in special cases, where you can increase your
+              productivity by tuning the segmentation rules to the text to be
+              translated.
+         </p>
+         <p><span class="bold"><strong>Warning: </strong></span>because the text will
+              segment differently after filter options have been changed, so you may have
+              to start translating from scratch. At the same time the previous valid
+              segments in the project translation memory will turn into orphan segments.
+              If you change segmentation options when a project is open, you must reload
+              the project in order for the changes to take effect.
+         </p>
+         <p><span class="application">OmegaT</span> uses the following sequence of
+              steps:
+         </p>
+         <div class="variablelist">
+            <dl>
+               <dt><span class="term"><a class="indexterm" name="d0e6480"></a>Structure level segmentation</span></dt>
+               <dd>
+                  <p><span class="application">OmegaT</span> first parses the text for
+                             structure-level segmentation. During this process it is only the
+                             structure of the source file that is used to produce segments.
+                  </p>
+                  <p>For example, text files may be segmented on line breaks, empty
+                             lines, or not be segmented at all. Files containing formatting
+                             (OpenOffice.org documents, HTML documents, etc.) are segmented on the
+                             block-level (paragraph) tags. Translatable object attributes in XHTML
+                             or HTML files can be extracted as separate segments.
+                  </p>
+               </dd>
+               <dt><span class="term"><a class="indexterm" name="d0e6495"></a>Sentence level segmentation</span></dt>
+               <dd>
+                  <p>After segmenting the source file into structural units,
+                             <span class="application">OmegaT</span> will segment these blocks further
+                             into sentences.
+                  </p>
+               </dd>
+            </dl>
+         </div>
+         <div class="section" title="1. Segmentation rules">
+            <div class="titlepage">
+               <div>
+                  <div>
+                     <h2 class="title" style="clear: both"><a name="segmentation.rules"></a>1. Segmentation rules<a class="indexterm" name="d0e6510"></a></h2>
+                  </div>
+               </div>
+            </div>
+            <p>The process of segmenting can be pictured as follows: the cursor
+                   moves along the text, one character at a time. At each cursor position
+                   rules, consisting of a <span class="bold"><strong>Before </strong></span>and
+                   <span class="bold"><strong>After </strong></span>pattern, are applied in their given
+                   order to see if any of the<span class="bold"><strong> Before</strong></span>
+                   patterns are valid for the text on the left and the corresponding
+                   <span class="bold"><strong>After</strong></span> pattern for the text on the right
+                   of the cursor. If the rule matches, either the cursor moves on without
+                   inserting a segment break (for an exception rule) or a new segment break
+                   is created at the current cursor position (for the break rule).
+            </p>
+            <p>The two types of rules behave as follows:</p>
+            <div class="variablelist">
+               <dl>
+                  <dt><span class="term"><a class="indexterm" name="d0e6534"></a>Break rule</span></dt>
+                  <dd>
+                     <p>Separates the source text into segments. For example,
+                                  "<span class="emphasis"><em>Did it make sense? I was not sure</em></span>." should be
+                                  split into two segments. For this to happen, there should be a break
+                                  rule for "?", when followed by spaces and a capitalized word. To
+                                  define a rule as a break rule, tick the Break/Exception check
+                                  box.
+                     </p>
+                  </dd>
+               </dl>
+            </div>
+            <div class="variablelist">
+               <dl>
+                  <dt><span class="term"><a class="indexterm" name="d0e6551"></a>Exception rule</span></dt>
+                  <dd>
+                     <p>specify what parts of text should NOT be separated. In spite
+                                  of the period, <span class="emphasis"><em>"Mrs. Dalloway "</em></span> should not be
+                                  split in two segments, so an exception rule should be established
+                                  for Mrs (and for Mr, for Dr, for prof etc), followed by a period. To
+                                  define a rule as an exception rule, leave the Break/Exception check
+                                  box unticked.
+                     </p>
+                  </dd>
+               </dl>
+            </div>
+            <p>The predefined break rules should be sufficient for most European
+                   languages and Japanese. In view of the flexibility, you may consider
+                   defining more exception rules for your source language in order to provide
+                   more meaningful and coherent segments.
+            </p>
+         </div>
+         <div class="section" title="2. Rule priority">
+            <div class="titlepage">
+               <div>
+                  <div>
+                     <h2 class="title" style="clear: both"><a name="rules.priority"></a>2. Rule priority<a class="indexterm" name="d0e6570"></a></h2>
+                  </div>
+               </div>
+            </div>
+            <p>All segmentation rule sets for a matching language pattern are
+                   active and are applied in the given order of priority, so rules for
+                   specific language should be higher than default ones. For example, rules
+                   for Canadian French (FR-CA) should be set higher than rules for French
+                   (FR.*), and higher than Default (.*) ones. Thus, when translating from
+                   Canadian French the rules for Canadian French - if any - will be applied
+                   first, followed by the rules for French and lastly, by the Default
+                   rules.
+            </p>
+         </div>
+         <div class="section" title="3. Creating a new rule">
+            <div class="titlepage">
+               <div>
+                  <div>
+                     <h2 class="title" style="clear: both"><a name="creating.new.rule"></a>3. Creating a new rule<a class="indexterm" name="d0e6580"></a></h2>
+                  </div>
+               </div>
+            </div>
+            <p>Major changes to the segmentation rules should be generally avoided,
+                   especially after completion of the first draft, but minor changes, such as
+                   the addition of a recognized abbreviation, can be advantageous.
+            </p>
+            <p>In order to edit or expand an existing set of rules, simply click on
+                   it in the top table. The rules for that set will appear in the bottom half
+                   of the window.
+            </p>
+            <p>In order to create an empty set of rules for a new language pattern
+                   click <span class="bold"><strong>Add </strong></span>in the upper half of the
+                   dialog. An empty line will appear at the bottom of the upper table (you
+                   may have to scroll down to see it). Change the name of the rule set and
+                   the language pattern to the language concerned and its code (see <a class="xref" href="appendix.languages.html" title="Appendix B. Languages - ISO 639 code list">Appendix B, <i>Languages - ISO 639 code list
+                       
+                       
+                       
+                       </i></a> for a list of language codes).
+                   The syntax of the language pattern conforms to regular expression syntax.
+                   If your set of rules handles a language-country pair, we advise you to
+                   move it to the top using the <span class="bold"><strong>Move Up</strong></span>
+                   button.
+            </p>
+            <p>Add the <span class="bold"><strong>Before</strong></span> and<span class="bold"><strong> After</strong></span> patterns. To check their syntax and their
+                   applicability, it is advisable to use tools which allow you to see their
+                   effect directly. See the chapter on <a class="link" href="chapter.regexp.html" title="Chapter 16. Regular expressions">Regular
+                      expressions</a>. A good starting point will always be the existing
+                   rules.
+            </p>
+         </div>
+         <div class="section" title="4. A few simple examples">
+            <div class="titlepage">
+               <div>
+                  <div>
+                     <h2 class="title" style="clear: both"><a name="few.simple.examples"></a>4. <a class="indexterm" name="d0e6614"></a>A few simple examples
+                     </h2>
+                  </div>
+               </div>
+            </div>
+            <div class="informaltable">
+               <table border="1">
+                  <colgroup>
+                     <col width="160" align="left">
+                     <col width="50" align="center">
+                     <col width="40" align="center">
+                     <col width="200" align="left">
+                  </colgroup>
+                  <thead>
+                     <tr>
+                        <th align="left">Intention</th>
+                        <th align="center">Before</th>
+                        <th align="center">After</th>
+                        <th align="left">Note</th>
+                     </tr>
+                  </thead>
+                  <tbody>
+                     <tr>
+                        <td align="left">Set a segment after a period ('.') and before a
+                                       space
+                        </td>
+                        <td align="center">\.</td>
+                        <td align="center">\s</td>
+                        <td align="left">"\." means the character "." "\s" means any white space
+                                       character ((space, tab, new page etc.)
+                        </td>
+                     </tr>
+                     <tr>
+                        <td align="left">Do not segment after Mr.</td>
+                        <td align="center">Mr\.</td>
+                        <td align="center">\s</td>
+                        <td align="left">This an exception rule, so the rule check box must not be
+                                       ticked
+                        </td>
+                     </tr>
+                     <tr>
+                        <td align="left">Set a segment after "。" (Japanese period)</td>
+                        <td align="center">。</td>
+                        <td align="center"> </td>
+                        <td align="left">Note that <code class="literal">after</code> is empty
+                        </td>
+                     </tr>
+                     <tr>
+                        <td align="left">Do not segment after M. Mr. Mrs. and Ms.</td>
+                        <td align="center">Mr??s??\.</td>
+                        <td align="center">\s</td>
+                        <td align="left">Exception rule - see the use of ? in regular
+                                       expressions
+                        </td>
+                     </tr>
+                  </tbody>
+               </table>
+            </div>
+         </div>
+      </div>
+      <div class="navfooter">
+         <hr>
+         <table width="100%" summary="Navigation footer">
+            <tr>
+               <td width="40%" align="left"><a accesskey="p" href="chapter.translation.memories.html">Prev</a> 
+               </td>
+               <td width="20%" align="center"> </td>
+               <td width="40%" align="right"> <a accesskey="n" href="chapter.regexp.html">Next</a></td>
+            </tr>
+            <tr>
+               <td width="40%" align="left" valign="top">Chapter 14. Translation memories </td>
+               <td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td>
+               <td width="40%" align="right" valign="top"> Chapter 16. Regular expressions</td>
+            </tr>
+         </table>
+      </div>
+   </body>
+</html>
\ No newline at end of file
diff --git a/docs/en/chapter.spellchecker.html b/docs/en/chapter.spellchecker.html
new file mode 100644
index 0000000..703f9ff
--- /dev/null
+++ b/docs/en/chapter.spellchecker.html
@@ -0,0 +1,227 @@
+<html>
+   <head>
+      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+   
+      <title>Chapter 21. Spell checker</title>
+      <link rel="stylesheet" href="OmegaT.css" type="text/css">
+      <meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+      <link rel="home" href="index.html" title="OmegaT - User's Guide">
+      <link rel="up" href="index.html" title="OmegaT - User's Guide">
+      <link rel="prev" href="chapter.machine.translate.html" title="Chapter 20. Machine Translation">
+      <link rel="next" href="chapter.misc.html" title="Chapter 22. Miscellaneous subjects">
+   </head>
+   <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+      <div class="navheader">
+         <table width="100%" summary="Navigation header">
+            <tr>
+               <th colspan="3" align="center">Chapter 21. Spell checker</th>
+            </tr>
+            <tr>
+               <td width="20%" align="left"><a accesskey="p" href="chapter.machine.translate.html">Prev</a> 
+               </td>
+               <th width="60%" align="center"> </th>
+               <td width="20%" align="right"> <a accesskey="n" href="chapter.misc.html">Next</a></td>
+            </tr>
+         </table>
+         <hr>
+      </div>
+      <div class="chapter" title="Chapter 21. Spell checker">
+         <div class="titlepage">
+            <div>
+               <div>
+                  <h2 class="title"><a name="chapter.spellchecker"></a>Chapter 21. Spell checker<a class="indexterm" name="d0e7939"></a></h2>
+               </div>
+            </div>
+         </div>
+         <div class="toc">
+            <dl>
+               <dt><span class="section"><a href="chapter.spellchecker.html#d0e7944">1. Installing spelling dictionaries</a></span></dt>
+               <dt><span class="section"><a href="chapter.spellchecker.html#d0e8015">2. Using spelling dictionaries</a></span></dt>
+               <dt><span class="section"><a href="chapter.spellchecker.html#hints">3. Hints</a></span></dt>
+            </dl>
+         </div>
+         <p>OmegaT has a built-in spell checker based on the spelling checker used
+              in OpenOffice.org, Firefox and Thunderbird. It is consequently able to use
+              the huge range of free spelling dictionaries available for these
+              applications.
+         </p>
+         <div class="section" title="1. Installing spelling dictionaries">
+            <div class="titlepage">
+               <div>
+                  <div>
+                     <h2 class="title" style="clear: both"><a name="d0e7944"></a>1. Installing spelling dictionaries
+                     </h2>
+                  </div>
+               </div>
+            </div>
+            <p>Before the spell check function can be used, a suitable dictionary
+                   or dictionaries (i.e. for your target language) must be installed. To
+                   install spelling dictionaries, follow this procedure:
+            </p>
+            <div class="itemizedlist">
+               <ul class="itemizedlist" type="disc">
+                  <li class="listitem">
+                     <p>In your file manager, create a new folder in a suitable location
+                                in which to store spelling dictionaries.
+                     </p>
+                  </li>
+               </ul>
+            </div>
+            <div class="itemizedlist">
+               <ul class="itemizedlist" type="disc">
+                  <li class="listitem">
+                     <p>In OmegaT, select <span class="guisubmenu"><a class="indexterm" name="d0e7958"></a></span><span class="guimenuitem">Options > Spell
+                                   Checking</span>, then click <span class="guibutton">Choose
+                                   </span>beside the Dictionary file folder field. Navigate to and
+                                select the folder you created for dictionaries.
+                     </p>
+                  </li>
+               </ul>
+            </div>
+            <div class="itemizedlist">
+               <ul class="itemizedlist" type="disc">
+                  <li class="listitem">
+                     <p>Place the dictionary files you wish to use in this folder. There
+                                are essentially two ways in which you can do this. You can either copy
+                                files manually, i.e. from elsewhere on your system, using your file
+                                manager; or you can use OmegaT's <span class="bold"><strong>"Install"</strong></span> function to provide a list of
+                                available dictionaries to select from. Note that the "Install"
+                                function requires an Internet connection. The selected languages will
+                                then be installed and will eventually appear in your spell checker
+                                setup window (this may take a while).
+                     </p>
+                  </li>
+               </ul>
+            </div>
+            <p>Copying the files manually is useful if you already have suitable
+                   dictionary files on your system, for instance as part of your
+                   OpenOffice.org or Thunderbird installation. The files you need will have
+                   the extensions <code class="filename">.aff</code> and <code class="filename">.dic</code>,
+                   and you need both files in order for the dictionary in question to work.
+                   You can use these file extensions to search your desktop for suitable
+                   dictionaries. In the case below, no extra folder has been created and no
+                   copying of files was necessary, as the OpenOffice dictionary folder is
+                   used instead:
+            </p>
+            <div class="figure"><a name="spellchecker.setup"></a><p class="title"><b>Figure 21.1. Spell checker setup</b></p>
+               <div class="figure-contents">
+                  <div class="mediaobject"><img src="images/SpellcheckerSetup2.png" alt="Spell checker setup"></div>
+               </div>
+            </div><br class="figure-break"><p>Note that in the above case, you may lose the spelling dictionaries,
+                   if the OpenOffice installation is removed from your system. Creating your
+                   own folder and copying the files may be extra work, but possibly worth the
+                   trouble.
+            </p>
+            <p>More recent OpenOffice.org spelling dictionaries are supplied as
+                   "OpenOffice.org extensions", with the filename extension .oxt. These are
+                   however zip archives: if you rename the file with the extension .zip, you
+                   can extract the contents in a zip utility, and you will find the .aff and
+                   .dic files that you need, which you can then place in the folder that you
+                   created for them.
+            </p>
+            <p>Please note that the application behind the<span class="guilabel">
+                      "Install"</span> depends on the Internet list of dictionaries. If it
+                   is out of date or does not include the desired language, you will have to
+                   look for appropriate vocabularies yourself. OpenOffice.org contains
+                   probably the largest vocabulary collection at the <a class="ulink" href="http://extensions.services.openoffice.org/dictionary" target="_top">OpenOffice.org
+                      Extensions site</a>. After the dictionary extension has been
+                   downloaded and installed, the corresponding <span class="emphasis"><em>aff</em></span> and
+                   <span class="emphasis"><em>dic</em></span> will become available. The same can be achieved
+                   by downloading a spell checker add-ons for Firefox or Thunderbird; in this
+                   case the spell checker files will be stored in your (Firefox or
+                   Thunderbird) profile.
+            </p>
+            <p>Make sure the language code of your target files corresponds to the
+                   dictionary's language code: an FR-FR dictionary will not work with an FR
+                   target setting. You need to change the setting to FR-FR to have the spell
+                   checker recognize the correct dictionary for your target. Look for files
+                   with the name, indicating the language used and having extensions
+                   <span class="emphasis"><em>aff</em></span> and <span class="emphasis"><em>dic.</em></span></p>
+         </div>
+         <div class="section" title="2. Using spelling dictionaries">
+            <div class="titlepage">
+               <div>
+                  <div>
+                     <h2 class="title" style="clear: both"><a name="d0e8015"></a>2. Using spelling dictionaries
+                     </h2>
+                  </div>
+               </div>
+            </div>
+            <p>There is no need to instruct OmegaT to use a particular spelling
+                   dictionary; OmegaT will use the correct language dictionary based upon the
+                   language codes of your project. Check however that the language codes are
+                   exactly the same: an FR-FR dictionary will not work with an FR target
+                   setting, for example. If necessary, edit the file names of the dictionary
+                   or change your project's language settings.
+            </p>
+            <p>To enable the spell checker, select <span class="guimenuitem">Options > Spell
+                      Checking</span> and tick the <span class="guilabel">Automatically check the
+                      spelling of text</span> checkbox (see above)
+            </p>
+            <div class="figure"><a name="spellchecker.in.action"></a><p class="title"><b>Figure 21.2. <a class="indexterm" name="d0e8030"></a>Spellchecker in action</b></p>
+               <div class="figure-contents">
+                  <div class="mediaobject"><img src="images/SpellcheckingText.png" alt="Spell checkerSpell checker - figureSpellchecker in action"></div>
+               </div>
+            </div><br class="figure-break"><p>Right-clicking on an underlined word (Artund in the figure above)
+                   opens a drop-down menu listing suggestions for the correction (Art und).
+                   You can also instruct the spell checker to ignore all the occurrences of
+                   the mis-spelled word, or add it to the dictionary.
+            </p>
+         </div>
+         <div class="section" title="3. Hints">
+            <div class="titlepage">
+               <div>
+                  <div>
+                     <h2 class="title" style="clear: both"><a name="hints"></a>3. Hints<a class="indexterm" name="d0e8044"></a></h2>
+                  </div>
+               </div>
+            </div>
+            <p>If the spell checker is not working, then make sure first that the
+                   check box <span class="guilabel">"Automatically check the spelling of text"</span>
+                   in the spell checker dialog (<span class="guisubmenu">Options > Spell
+                      checking...)</span> has been ticked.
+            </p>
+            <p>Also check that the target language code of your project against the
+                   available vocabularies in the setup window. The spell checker uses the
+                   target language code to determine the language to be used : if the target
+                   language is Brazilian Portuguese (PT_BR), the subfolder with vocabularies
+                   must contain the two vocabulary files, called
+                   <span class="emphasis"><em>pt_br.aff</em></span> and <span class="emphasis"><em>pt_br.dic</em></span>.
+            </p>
+            <p>If you have already translated a large body of text, and then
+                   realize the target language code of the project does not match the spell
+                   checker's language code (you specified pt_BR as the language, but there
+                   are no pt_BR vocabularies, for instance) you can simply copy the two
+                   corresponding files and rename them (e.g. from
+                   <span class="emphasis"><em>pt_PT.arr</em></span> and <span class="emphasis"><em>pt_PT.dic</em></span> to
+                   <span class="emphasis"><em>pt._BR.arr</em></span> and <span class="emphasis"><em>pt_BR.dic</em></span>). Of
+                   course it is much wiser, to take a short break and download the correct
+                   versions of the spell checker.
+            </p>
+            <p>Note that <code class="filename">Uninstall</code> physically removes the
+                   selected vocabularies. If they are part of OpenOffice.org, as in the above
+                   case, they will disappear from that application, too. If, for whatever
+                   reason, you need to do this from time to time, it may make sense to copy
+                   the files involved to a different folder, reserved just for use by
+                   OmegaT.
+            </p>
+         </div>
+      </div>
+      <div class="navfooter">
+         <hr>
+         <table width="100%" summary="Navigation footer">
+            <tr>
+               <td width="40%" align="left"><a accesskey="p" href="chapter.machine.translate.html">Prev</a> 
+               </td>
+               <td width="20%" align="center"> </td>
+               <td width="40%" align="right"> <a accesskey="n" href="chapter.misc.html">Next</a></td>
+            </tr>
+            <tr>
+               <td width="40%" align="left" valign="top">Chapter 20. Machine Translation </td>
+               <td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td>
+               <td width="40%" align="right" valign="top"> Chapter 22. Miscellaneous subjects</td>
+            </tr>
+         </table>
+      </div>
+   </body>
+</html>
\ No newline at end of file
diff --git a/docs/en/chapter.translation.editing.html b/docs/en/chapter.translation.editing.html
new file mode 100644
index 0000000..1dea530
--- /dev/null
+++ b/docs/en/chapter.translation.editing.html
@@ -0,0 +1,171 @@
+<html>
+   <head>
+      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+   
+      <title>Chapter 10. Editing behavior</title>
+      <link rel="stylesheet" href="OmegaT.css" type="text/css">
+      <meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+      <link rel="home" href="index.html" title="OmegaT - User's Guide">
+      <link rel="up" href="index.html" title="OmegaT - User's Guide">
+      <link rel="prev" href="chapter.files.to.translate.html" title="Chapter 9. Files to translate">
+      <link rel="next" href="chapter.font.html" title="Chapter 11. Font settings">
+   </head>
+   <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+      <div class="navheader">
+         <table width="100%" summary="Navigation header">
+            <tr>
+               <th colspan="3" align="center">Chapter 10. Editing behavior</th>
+            </tr>
+            <tr>
+               <td width="20%" align="left"><a accesskey="p" href="chapter.files.to.translate.html">Prev</a> 
+               </td>
+               <th width="60%" align="center"> </th>
+               <td width="20%" align="right"> <a accesskey="n" href="chapter.font.html">Next</a></td>
+            </tr>
+         </table>
+         <hr>
+      </div>
+      <div class="chapter" title="Chapter 10. Editing behavior">
+         <div class="titlepage">
+            <div>
+               <div>
+                  <h2 class="title"><a name="chapter.translation.editing"></a>Chapter 10. Editing behavior<a class="indexterm" name="d0e5425"></a></h2>
+               </div>
+            </div>
+         </div>
+         <div class="toc">
+            <dl>
+               <dt><span class="section"><a href="chapter.translation.editing.html#automatic.match.insertion">1. Automatic match insertion</a></span></dt>
+               <dt><span class="section"><a href="chapter.translation.editing.html#allow.translation.equal.to.source">2. Allow the translation to be equal to source</a></span></dt>
+               <dt><span class="section"><a href="chapter.translation.editing.html#export.segment.to.text.files">3. Export the segment to text files</a></span></dt>
+            </dl>
+         </div>
+         <p>The dialog in <span class="guimenu">Options</span> → <span class="guimenuitem">Editing Behavior...</span> enables the user to select, how the current segment in the
+              editing field is to be initialized and handled:
+         </p>
+         <div class="figure"><a name="editing.behavior.options"></a><p class="title"><b>Figure 10.1. Editing behavior options</b></p>
+            <div class="figure-contents">
+               <div class="mediaobject"><img src="images/EditingBehaviourOptions.png" alt="Editing behavior options"></div>
+            </div>
+         </div><br class="figure-break"><div class="section" title="1. Automatic match insertion">
+            <div class="titlepage">
+               <div>
+                  <div>
+                     <h2 class="title" style="clear: both"><a name="automatic.match.insertion"></a>1. Automatic match insertion<a class="indexterm" name="d0e5447"></a></h2>
+                  </div>
+               </div>
+            </div>
+            <p>You translate your files by moving from segment to segment, editing
+                   each current segment in turn. When moving between segments, you may wish
+                   to populate the editing field with an existing translation in the fuzzy
+                   match pane or with the source text. In <span class="guimenu">Options</span> → <span class="guimenuitem">Editing Behavior...</span> <span class="application">OmegaT</span> offers you the following
+                   alternatives:
+            </p>
+            <div class="variablelist">
+               <dl>
+                  <dt><span class="term">The source text</span></dt>
+                  <dd>
+                     <p>You can have the source text inserted automatically into the
+                                  editing field. This is useful for texts containing many trade marks
+                                  or other proper nouns you which must be left unchanged.
+                     </p>
+                  </dd>
+                  <dt><span class="term">Leave the segment empty</span></dt>
+                  <dd>
+                     <p>OmegaT leaves the editing field blank. This option allows you
+                                  to enter the translation without the need to remove the source text,
+                                  thus saving you two keystrokes (<span class="bold"><strong>Ctrl+A
+                                        </strong></span>and <span class="bold"><strong>Del)</strong></span></p>
+                  </dd>
+                  <dt><span class="term">Insert the best fuzzy match</span></dt>
+                  <dd>
+                     <p>OmegaT inserts the translation of the string most similar to
+                                  the current source, if it is above the similarity threshold that you
+                                  have selected in this dialog.
+                     </p>
+                  </dd>
+               </dl>
+            </div>
+         </div>
+         <div class="section" title="2. Allow the translation to be equal to source">
+            <div class="titlepage">
+               <div>
+                  <div>
+                     <h2 class="title" style="clear: both"><a name="allow.translation.equal.to.source"></a>2. Allow the translation to be equal to source<a class="indexterm" name="d0e5488"></a></h2>
+                  </div>
+               </div>
+            </div>
+            <p>Documents for translation may contain trade marks, names or other
+                   proper nouns that will be the same in translated documents. There are two
+                   strategies for segments that contain only such invariable text.
+            </p>
+            <p>You can decide not to translate such segments at all. OmegaT will
+                   then report these segments as not translated. This is the default. The
+                   alternative is to enter a translation that is identical to the source
+                   text. OmegaT is able to recognize that you have done this. To make this
+                   possible, go to <span class="guimenu">Options</span> → <span class="guimenuitem">Editing Behavior...</span> and check the box <span class="bold"><strong>Allow translation
+                         to be equal to source</strong></span>.
+            </p>
+         </div>
+         <div class="section" title="3. Export the segment to text files">
+            <div class="titlepage">
+               <div>
+                  <div>
+                     <h2 class="title" style="clear: both"><a name="export.segment.to.text.files"></a>3. Export the segment to text files<a class="indexterm" name="d0e5507"></a></h2>
+                  </div>
+               </div>
+            </div>
+            <p>The text export function exports data from within the current
+                   <span class="application">OmegaT</span> project to plain text files. The data
+                   are exported when the segment is opened. The files appear in the /script
+                   subfolder in the OmegaT user files folder, and include:
+            </p>
+            <div class="itemizedlist">
+               <ul class="itemizedlist" type="disc">
+                  <li class="listitem">
+                     <p>The content of the segment source text
+                                (<code class="filename">source.txt</code>).
+                     </p>
+                  </li>
+                  <li class="listitem">
+                     <p>The content of the segment target text
+                                (<code class="filename">target.txt</code>).
+                     </p>
+                  </li>
+                  <li class="listitem">
+                     <p>The text highlighted by the user, when
+                                <span class="keycap"><strong>Ctrl-Shift-C</strong></span> is pressed or <span class="guimenuitem">Edit >
+                                   Export Selection</span> is
+                                selected (<code class="filename">selection.txt</code>).
+                     </p>
+                  </li>
+               </ul>
+            </div>
+            <p>The content of the files is overwritten either when a new segment is
+                   opened (source.txt and target.txt) or when a new selection is exported
+                   (selection.txt). The files are unformatted plain text files. The whole
+                   process can be steered and controlled via Tck/Tcl-based scripting. See
+                   <a class="ulink" href="http://www.omegat.org/en/howtos/text_export.html" target="_top">Using the
+                      OmegaT text export function</a> for specifics, examples and
+                   suggestions.
+            </p>
+         </div>
+      </div>
+      <div class="navfooter">
+         <hr>
+         <table width="100%" summary="Navigation footer">
+            <tr>
+               <td width="40%" align="left"><a accesskey="p" href="chapter.files.to.translate.html">Prev</a> 
+               </td>
+               <td width="20%" align="center"> </td>
+               <td width="40%" align="right"> <a accesskey="n" href="chapter.font.html">Next</a></td>
+            </tr>
+            <tr>
+               <td width="40%" align="left" valign="top">Chapter 9. Files to translate </td>
+               <td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td>
+               <td width="40%" align="right" valign="top"> Chapter 11. Font settings</td>
+            </tr>
+         </table>
+      </div>
+   </body>
+</html>
\ No newline at end of file
diff --git a/docs/en/chapter.translation.memories.html b/docs/en/chapter.translation.memories.html
new file mode 100644
index 0000000..366d34f
--- /dev/null
+++ b/docs/en/chapter.translation.memories.html
@@ -0,0 +1,536 @@
+<html>
+   <head>
+      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+   
+      <title>Chapter 14. Translation memories</title>
+      <link rel="stylesheet" href="OmegaT.css" type="text/css">
+      <meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+      <link rel="home" href="index.html" title="OmegaT - User's Guide">
+      <link rel="up" href="index.html" title="OmegaT - User's Guide">
+      <link rel="prev" href="chapter.plain.text.html" title="Chapter 13. Working with plain text">
+      <link rel="next" href="chapter.segmentation.html" title="Chapter 15. Source segmentation">
+   </head>
+   <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+      <div class="navheader">
+         <table width="100%" summary="Navigation header">
+            <tr>
+               <th colspan="3" align="center">Chapter 14. Translation memories</th>
+            </tr>
+            <tr>
+               <td width="20%" align="left"><a accesskey="p" href="chapter.plain.text.html">Prev</a> 
+               </td>
+               <th width="60%" align="center"> </th>
+               <td width="20%" align="right"> <a accesskey="n" href="chapter.segmentation.html">Next</a></td>
+            </tr>
+         </table>
+         <hr>
+      </div>
+      <div class="chapter" title="Chapter 14. Translation memories">
+         <div class="titlepage">
+            <div>
+               <div>
+                  <h2 class="title"><a name="chapter.translation.memories"></a>Chapter 14. Translation memories<a class="indexterm" name="d0e6010"></a></h2>
+               </div>
+            </div>
+         </div>
+         <div class="toc">
+            <dl>
+               <dt><span class="section"><a href="chapter.translation.memories.html#OmegaT.and.tmx.files">1. Translation memories in OmegaT</a></span></dt>
+               <dd>
+                  <dl>
+                     <dt><span class="section"><a href="chapter.translation.memories.html#tmx.files.location.and.purpose">1.1. tmx folders - location and purpose</a></span></dt>
+                     <dt><span class="section"><a href="chapter.translation.memories.html#tmx.backup">1.2. tmx backup</a></span></dt>
+                     <dt><span class="section"><a href="chapter.translation.memories.html#tmx.files.and.language">1.3. tmx files and language</a></span></dt>
+                     <dt><span class="section"><a href="chapter.translation.memories.html#d0e6262">1.4. Orphan segments</a></span></dt>
+                  </dl>
+               </dd>
+               <dt><span class="section"><a href="chapter.translation.memories.html#using.translation.memories.from.previous.projects">2. Reusing translation memories</a></span></dt>
+               <dd>
+                  <dl>
+                     <dt><span class="section"><a href="chapter.translation.memories.html#d0e6349">2.1. Importing and exporting translation memories</a></span></dt>
+                  </dl>
+               </dd>
+               <dt><span class="section"><a href="chapter.translation.memories.html#pseudo.translated.memory">3. Pseudo-translated memory</a></span></dt>
+               <dt><span class="section"><a href="chapter.translation.memories.html#upgrading.translation.memories">4. Upgrading translation memories</a></span></dt>
+            </dl>
+         </div>
+         <div class="section" title="1. Translation memories in OmegaT">
+            <div class="titlepage">
+               <div>
+                  <div>
+                     <h2 class="title" style="clear: both"><a name="OmegaT.and.tmx.files"></a>1. Translation memories in OmegaT
+                     </h2>
+                  </div>
+               </div>
+            </div>
+            <div class="section" title="1.1. tmx folders - location and purpose">
+               <div class="titlepage">
+                  <div>
+                     <div>
+                        <h3 class="title"><a name="tmx.files.location.and.purpose"></a>1.1. tmx folders - location and purpose
+                        </h3>
+                     </div>
+                  </div>
+               </div>
+               <p><span class="application">OmegaT</span> projects can have translation
+                        memory files - i.e. files with the extension tmx - in four different
+                        places:
+               </p>
+               <div class="variablelist">
+                  <dl>
+                     <dt><span class="term"><a class="indexterm" name="d0e6026"></a>omegat folder</span></dt>
+                     <dd>
+                        <p>The omegat folder contains the project_save.tmx and possibly
+                                       a number of backup TMX files. The
+                                       <code class="filename">project_save.tmx</code>file contains all the
+                                       segments that have been recorded in memory since you started the
+                                       project. This file always exists in the project. Its contents will
+                                       always be sorted alphabetically by the source segment.
+                        </p>
+                     </dd>
+                     <dt><span class="term"><a class="indexterm" name="d0e6042"></a>main project folder</span></dt>
+                     <dd>
+                        <p>The main project folder contains 3 tmx files,
+                                       <code class="filename">project_name-omegat.tmx</code>,
+                                       <code class="filename">project_name-level1.tmx</code> and
+                                       <code class="filename">project_name-level2.tmx</code> (project_name being
+                                       the name of your project).
+                        </p>
+                        <div class="itemizedlist">
+                           <ul class="itemizedlist" type="disc">
+                              <li class="listitem">
+                                 <p>The level1 file contains only textual
+                                                    information.
+                                 </p>
+                              </li>
+                              <li class="listitem">
+                                 <p>The level2 file encapsulates
+                                                    <span class="application">OmegaT</span> specific tags in correct tmx
+                                                    tags so that the file can be used with its formatting
+                                                    information in a translation tool that supports tmx level 2
+                                                    memories, or <span class="application">OmegaT</span> itself.
+                                 </p>
+                              </li>
+                              <li class="listitem">
+                                 <p>The <span class="application">OmegaT</span> file includes
+                                                    <span class="application">OmegaT</span> specific formatting tags so
+                                                    that the file can be used in other
+                                                    <span class="application">OmegaT</span> projects
+                                 </p>
+                              </li>
+                           </ul>
+                        </div>
+                        <p>These files are copies of the file
+                                       <code class="filename">project_save.tmx</code> . i.e. of the project's main
+                                       translation memory, excluding the so-called orphan segments. They
+                                       carry appropriately changed names, so that its contents still
+                                       remain identifiable, when used elsewhere, for instance in
+                                       the<code class="filename"> tm</code> subfolder of some other project (see
+                                       below).
+                        </p>
+                     </dd>
+                     <dt><span class="term"><code class="filename"><a class="indexterm" name="d0e6096"></a>tm</code> folder</span></dt>
+                     <dd>
+                        <p>The /tm/ folder can contain any number of ancillary
+                                       translation memories - i.e. tmx files. Such files can be created
+                                       in any of the three varieties indicated above. Note that other CAT
+                                       tools can export (and import as well) tmx files, usually in all
+                                       three forms. The best thing of course is to use OmegaT-specific
+                                       TMX files (see above), so that the in-line formatting within the
+                                       segment is retained.
+                        </p>
+                        <p>The contents of translation memories in the tm subfolder
+                                       serve to generate suggestions for the text(s) to be translated.
+                                       Any text, already translated and stored in those files, will
+                                       appear among the fuzzy matches, if it is sufficiently similar to
+                                       the text currently being translated.
+                        </p>
+                        <p>If the source segment in one of the ancillary TMs is
+                                       identical to the text being translated, OmegaT acts as defined in
+                                       the <span class="guimenu">Options</span> → <span class="guimenuitem">Editing Behavior...</span> dialogue window. For instance (if the default is
+                                       accepted), the translation from the ancillary TM is accepted and
+                                       prefixed with<span class="emphasis"><em> [fuzzy]</em></span>, so that the translator
+                                       can review the translations at a later stage and check whether the
+                                       segments tagged this way, have been translated correctly (see the
+                                       <a class="link" href="chapter.translation.editing.html" title="Chapter 10. Editing behavior">Editing behavior</a>
+                                       chapter) <span class="guimenu">.</span></p>
+                     </dd>
+                     <dt><span class="term"><a class="indexterm" name="d0e6129"></a>tm/auto folder<a class="indexterm" name="d0e6137"></a></span></dt>
+                     <dd>
+                        <p>If it is clear from the very start, that translations in a
+                                       given TM (or TMs) are all correct, one can put them into
+                                       the<span class="bold"><strong> tm/auto</strong></span> folder and avoid
+                                       confirming a lot of<span class="emphasis"><em> [fuzzy]</em></span> cases. This will
+                                       effectively <span class="bold"><strong>pre-translate </strong></span>the
+                                       source text: all the segments in the source text, for which
+                                       translations can be found in those "auto" TMs, will land in the
+                                       main TM of the project without any user intervention.
+                        </p>
+                     </dd>
+                  </dl>
+               </div>
+               <p>Optionally, you can let <span class="application">OmegaT</span> have an
+                        additional tmx file (<span class="application">OmegaT</span>-style) anywhere
+                        you specify, containing all translatable segments of the project. See
+                        pseudo-translated memory below.
+               </p>
+               <p>Note that all the translation memories are loaded into memory when
+                        the project is opened. Back-ups are produced regularly of the project
+                        translation memory (see next chapter), and project_save.tmx is also
+                        saved/updated when the project is closed or loaded again. This means for
+                        instance that you do not need to exit a project you are currently
+                        working on if you decide to add another ancillary TM to it: you simply
+                        reload the project, and the changes you have made will be
+                        included.
+               </p>
+               <p>The locations of the various different translation memories for a
+                        given project are user-defined (see Project dialog window in <a class="link" href="chapter.instant.start.guide.html" title="Chapter 2. Instant Start Guide">Instant start guide)</a></p>
+               <p>Depending on the situation, different strategies are thus
+                        possible, for instance:
+               </p>
+               <p><span class="bold"><strong>several projects on the same subject:
+                              </strong></span>keep the project structure, and change source and target
+                        directories (Source = source/order1, target = target/order1 etc). Note
+                        that you segments from order1, that are not present in order2 and other
+                        subsequent jobs, will be tagged as orphan segments; however, they will
+                        still be useful for getting fuzzy matches.
+               </p>
+               <p><span class="bold"><strong>several translators working on the same
+                              project:</strong></span> split the source files into source/Alice,
+                        source/Bob... and allocate them to team members (Alice, Bob ...). They
+                        can then create their own projects and, deliver their
+                        own<code class="filename">project_save.tmx,</code> when finished or when a given
+                        milestone has been reached. The <code class="filename">project_save.tmx</code>
+                        files are then collected and possible conflicts as regards terminology
+                        for instance get resolved. A new version of the master TM is then
+                        created, either to be put in team members'
+                        <span class="emphasis"><em>tm/auto</em></span>subdirectories or to replace their
+                        project_save.tmx files. The team can also use the same subfolder
+                        structure for the target files. This allows them for instance to check
+                        at any moment, whether the target version for the complete project is
+                        still OK
+               </p>
+            </div>
+            <div class="section" title="1.2. tmx backup">
+               <div class="titlepage">
+                  <div>
+                     <div>
+                        <h3 class="title"><a name="tmx.backup"></a>1.2. tmx backup<a class="indexterm" name="d0e6190"></a></h3>
+                     </div>
+                  </div>
+               </div>
+               <p>As you translate your files, <span class="application">OmegaT</span>
+                        stores your work continually in <code class="filename">project_save.tm</code>x in
+                        the project's /<code class="filename">omegat</code> subdirectory.
+               </p>
+               <p><span class="application">OmegaT</span> also backups translation memory
+                        to <code class="filename">project_save.tmx.YEARMMDDHHNN.bak</code> in the same
+                        subfolder whenever a project is opened or reloaded. YEAR is 4-digit
+                        year, MM is a month, DD day of the month, HH and NN are hours and
+                        minutes when the previous translation memory was saved.
+               </p>
+               <p>If you believe you have lost translation data, follow the
+                        following procedure:
+               </p>
+               <div class="orderedlist">
+                  <ol class="orderedlist" type="1">
+                     <li class="listitem">
+                        <p>Close the project</p>
+                     </li>
+                     <li class="listitem">
+                        <p>Rename the current <code class="filename">project_save.tmx</code> file
+                                     ( e.g. to <code class="filename">project_save.tmx.temporary</code>)
+                        </p>
+                     </li>
+                     <li class="listitem">
+                        <p>Select the backup translation memory that is most likely -
+                                     e.g. the most recent one, or the last version from the day before)
+                                     to contain the data you are looking for
+                        </p>
+                     </li>
+                     <li class="listitem">
+                        <p>Copy it to <code class="filename">project_save.tmx </code></p>
+                     </li>
+                     <li class="listitem">
+                        <p>Open the project</p>
+                     </li>
+                  </ol>
+               </div>
+            </div>
+            <div class="section" title="1.3. tmx files and language">
+               <div class="titlepage">
+                  <div>
+                     <div>
+                        <h3 class="title"><a name="tmx.files.and.language"></a>1.3. tmx files and language<a class="indexterm" name="d0e6242"></a></h3>
+                     </div>
+                  </div>
+               </div>
+               <p>tmx files contain translation units, made of a number of
+                        equivalent segments in several languages. A translation unit comprises
+                        at least two translation unit variations (tuv). Either can be used as
+                        the source or target.
+               </p>
+               <p>The settings in your project indicate which is the source and
+                        which the target language. OmegaT thus takes the tuv segments
+                        corresponding to the project's source and target language codes and uses
+                        them as the source and target segments respectively. OmegaT recognizes
+                        the language codes using the following two standard conventions :
+               </p>
+               <div class="itemizedlist">
+                  <ul class="itemizedlist" type="disc">
+                     <li class="listitem">
+                        <p>2 letters (e.g. JA for Japanese), or</p>
+                     </li>
+                     <li class="listitem">
+                        <p>2- or 3-letter language code followed by the 2-letter country
+                                     code (e.g. EN-US - See <a class="xref" href="appendix.languages.html" title="Appendix B. Languages - ISO 639 code list">Appendix B, <i>Languages - ISO 639 code list
+                                   
+                                   
+                                   
+                                   </i></a> for a partial list of
+                                     language and country codes).
+                        </p>
+                     </li>
+                  </ul>
+               </div>
+               <p>If the project language codes and the tmx language codes fully
+                        match, the segments are loaded in memory. If languages match but not the
+                        country, the segments still get loaded. If neither the language code not
+                        the country code match, the segments will be ignored.
+               </p>
+            </div>
+            <div class="section" title="1.4. Orphan segments">
+               <div class="titlepage">
+                  <div>
+                     <div>
+                        <h3 class="title"><a name="d0e6262"></a>1.4. Orphan segments<a class="indexterm" name="d0e6265"></a></h3>
+                     </div>
+                  </div>
+               </div>
+               <p>The file <code class="filename">project_save.tmx</code> contains all the
+                        segments that have been translated since you started the project. If you
+                        modify the project segmentation or delete files from the source, some
+                        matches may appear as <span class="bold"><strong>orphan strings</strong></span> in
+                        the Match Viewer: such matches refer to segments that do not exist any
+                        more in the source documents, as they correspond to segments translated
+                        and recorded before the modifications took place.
+               </p>
+            </div>
+         </div>
+         <div class="section" title="2. Reusing translation memories">
+            <div class="titlepage">
+               <div>
+                  <div>
+                     <h2 class="title" style="clear: both"><a name="using.translation.memories.from.previous.projects"></a>2. Reusing translation memories<a class="indexterm" name="d0e6281"></a><a class="indexterm" name="d0e6286"></a></h2>
+                  </div>
+               </div>
+            </div>
+            <p>Initially, that is when the project is created, the main TM of the
+                   project, <code class="filename">project_save.tmx</code> is empty. This TM gradually
+                   becomes filled during the translation. To speed up this process, existing
+                   translations can be reused. If a given sentence has already been
+                   translated once, and translated correctly, there is no need for it to be
+                   retranslated. Translation memories may also contain reference
+                   translations: multinational legislation, such as that of the European
+                   Community, is a typical example.
+            </p>
+            <p>When you create the target documents in an
+                   <span class="application">OmegaT</span> project, the translation memory of the
+                   project is outputted in the form of three files in the root folder of your
+                   <span class="application">OmegaT</span> project (see the above description). You
+                   can regard these three tmx files (<code class="filename">-omegat.tmx</code>,
+                   <code class="filename">-level1.tmx</code> and <code class="filename">-level2.tmx</code>) as
+                   an "export translation memory", i.e. as an export of your current
+                   project's content in bilingual form.
+            </p>
+            <p>Should you wish to reuse a translation memory from a previous
+                   project (for example because the new project is similar to the previous
+                   project, or uses terminology which might have been used before), you can
+                   use these translation memories as "input translation memories", i.e. for
+                   import into your new project. In this case, place the translation memories
+                   you wish to use in the <span class="emphasis"><em>\tm</em></span> or
+                   <span class="emphasis"><em>\tm</em></span>\auto folder of your new project: in the former
+                   case you will get hits from these translation memories in the fuzzy
+                   matches viewer, and in the latter case these TMs will be used to
+                   pre-translate your source text.
+            </p>
+            <p>By default, the \tm folder is below the project's root folder (e.g.
+                   ...<span class="emphasis"><em>\MyProject\tm</em></span>), but you can choose a different
+                   folder in the project properties dialog if you wish. This is useful if you
+                   frequently use translation memories produced in the past, for example
+                   because they are on the same subject or for the same customer. In this
+                   case, a useful procedure would be:
+            </p>
+            <div class="itemizedlist">
+               <ul class="itemizedlist" type="disc">
+                  <li class="listitem">
+                     <p>Create a folder (a "repository folder") in a convenient location
+                                on your hard drive for the translation memories for a particular
+                                customer or subject.
+                     </p>
+                  </li>
+               </ul>
+            </div>
+            <div class="itemizedlist">
+               <ul class="itemizedlist" type="disc">
+                  <li class="listitem">
+                     <p>Whenever you finish a project, copy one of the three "export"
+                                translation memory files from the root folder of the project to the
+                                repository folder.
+                     </p>
+                  </li>
+               </ul>
+            </div>
+            <div class="itemizedlist">
+               <ul class="itemizedlist" type="disc">
+                  <li class="listitem">
+                     <p>When you begin a new project on the same subject or for the same
+                                customer, navigate to the repository folder in the
+                                <span class="guimenuitem">Project > Properties > Edit Project
+                                   dialog</span> and select it as the translation memory
+                                folder.
+                     </p>
+                  </li>
+               </ul>
+            </div>
+            <p>When you begin a new project on the same subject or for the same
+                   customer, navigate to the repository folder in the <span class="guilabel">Project >
+                      Properties > Edit Project</span> dialog and select it as the
+                   translation memory folder. Note that all the tmx files in the /tm
+                   repository are parsed when the project is opened, so putting everything
+                   you possibly can there, may slow OmegaT down unnecessarily. You may even
+                   consider removing those that are not required any more, once you have used
+                   their contents to fill up the <code class="filename">project-save.tmx
+                      </code>file.
+            </p>
+            <div class="section" title="2.1. Importing and exporting translation memories">
+               <div class="titlepage">
+                  <div>
+                     <div>
+                        <h3 class="title"><a name="d0e6349"></a>2.1. Importing and exporting translation memories
+                        </h3>
+                     </div>
+                  </div>
+               </div>
+               <p>OmegaT supports imported tmx versions 1.1-1.4b (both level 1 and
+                        level 2). This enables the translation memories produced by other tools
+                        to be read by OmegaT. However, OmegaT does not fully support imported
+                        level 2 tmx files (these store not only the translation, but also the
+                        formatting). Level 2 tmx files will still be imported and their textual
+                        content can be seen in OmegaT, but the quality of fuzzy matches will be
+                        somewhat lower.
+               </p>
+               <p>OmegaT follows very strict procedures when loading translation
+                        memory (tmx) files. If an error is found in such a file, OmegaT will
+                        indicate the position within the defective file at which the error is
+                        located.
+               </p>
+               <p>Some tools are known to produce invalid tmx files under certain
+                        conditions. If you wish to use such files as reference translations in
+                        OmegaT, they must be repaired, or OmegaT will report an error and fail
+                        to load them. Fixes are trivial operations and OmegaT assists
+                        troubleshooting with the related error message. You can ask the user
+                        group for advice if you have problems.
+               </p>
+               <p><span class="application"></span>OmegaT exports version 1.4 TMX files
+                        (both level 1 and level 2). The level 2 export is not fully compliant
+                        with the level 2 standard, but is sufficiently close and will generate
+                        correct matches in other translation memory tools supporting TMX Level
+                        2. If you only need textual information (and not formatting
+                        information), use the level 1 file that OmegaT has created.
+               </p>
+            </div>
+         </div>
+         <div class="section" title="3. Pseudo-translated memory">
+            <div class="titlepage">
+               <div>
+                  <div>
+                     <h2 class="title" style="clear: both"><a name="pseudo.translated.memory"></a>3. Pseudo-translated memory<a class="indexterm" name="d0e6364"></a></h2>
+                  </div>
+               </div>
+            </div>
+            <div class="note" title="Note" style="margin-left: 0.5in; margin-right: 0.5in;">
+               <h3 class="title">Note</h3>
+               <p>Of interest for advanced users only!</p>
+            </div>
+            <p>Before segments get translated, you may wish to pre-process them or
+                   address them in some other way than is possible with OmegaT. For example,
+                   if you wish to create a pseudo-translation for testing purposes, OmegaT
+                   enables you to create an additional tmx file that contains all segments of
+                   the project. The translation in this tmx can be either
+            </p>
+            <div class="itemizedlist">
+               <ul class="itemizedlist" type="disc">
+                  <li class="listitem">
+                     <p>translation equals source (default)</p>
+                  </li>
+               </ul>
+            </div>
+            <div class="itemizedlist">
+               <ul class="itemizedlist" type="disc">
+                  <li class="listitem">
+                     <p>translation segment is empty</p>
+                  </li>
+               </ul>
+            </div>
+            <p>The tmx file can be given any name you specify. A pseudo-translated
+                   memory can be generated with the following command line parameters:
+            </p>
+            <p><code class="literal">java -jar omegat.jar --pseudotranslatetmx=<filename>
+                      [pseudotranslatetype=[equal|empty]]</code></p>
+            <p>Replace <code class="literal"><filename></code> with the name of the
+                   file you wish to create, either absolute or relative to the working
+                   directory (the directory you start <span class="application">OmegaT</span>
+                   from).The second argument <code class="literal">--pseudotranslatetype</code> is
+                   optional. Its value is either <code class="literal">equal</code> (default value, for
+                   source=target) or <code class="literal">empty</code> (target segment is empty) .You
+                   can process the generated tmx with any tool you want. To reuse it in
+                   <span class="application">OmegaT</span> rename it to <span class="emphasis"><em>project_save.tmx
+                         </em></span>and place it in the <code class="literal">omegat</code>-folder of your
+                   project.
+            </p>
+         </div>
+         <div class="section" title="4. Upgrading translation memories">
+            <div class="titlepage">
+               <div>
+                  <div>
+                     <h2 class="title" style="clear: both"><a name="upgrading.translation.memories"></a>4. Upgrading translation memories<a class="indexterm" name="d0e6416"></a></h2>
+                  </div>
+               </div>
+            </div>
+            <p>Very early versions of <span class="application">OmegaT</span> were
+                   capable of segmenting source files into paragraphs only and were
+                   inconsistent when numbering formatting tags in HTML and Open Document
+                   files. <span class="application">OmegaT</span> 2.3 can detect and upgrade such
+                   tmx files on the fly to increase fuzzy matching quality and leverage your
+                   existing translation better, saving you the work of doing this
+                   manually.
+            </p>
+            <p>A project's tmx will be upgraded only once, and will be written in
+                   upgraded form into the <code class="filename">project-save.tmx</code>; legacy tmx
+                   files will be upgraded on the fly each time the project is loaded. Note
+                   that in some cases changes in file filters in
+                   <span class="application">OmegaT</span> 2.3 may lead to totally different
+                   segmentation; as a result, you will have to upgrade your translation
+                   manually in such rare cases.
+            </p>
+         </div>
+      </div>
+      <div class="navfooter">
+         <hr>
+         <table width="100%" summary="Navigation footer">
+            <tr>
+               <td width="40%" align="left"><a accesskey="p" href="chapter.plain.text.html">Prev</a> 
+               </td>
+               <td width="20%" align="center"> </td>
+               <td width="40%" align="right"> <a accesskey="n" href="chapter.segmentation.html">Next</a></td>
+            </tr>
+            <tr>
+               <td width="40%" align="left" valign="top">Chapter 13. Working with plain text </td>
+               <td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td>
+               <td width="40%" align="right" valign="top"> Chapter 15. Source segmentation</td>
+            </tr>
+         </table>
+      </div>
+   </body>
+</html>
\ No newline at end of file
diff --git a/docs/en/chapter.user.interface.html b/docs/en/chapter.user.interface.html
new file mode 100644
index 0000000..f14e5f0
--- /dev/null
+++ b/docs/en/chapter.user.interface.html
@@ -0,0 +1,789 @@
+<html>
+   <head>
+      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+   
+      <title>Chapter 4. The user interface</title>
+      <link rel="stylesheet" href="OmegaT.css" type="text/css">
+      <meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+      <link rel="home" href="index.html" title="OmegaT - User's Guide">
+      <link rel="up" href="index.html" title="OmegaT - User's Guide">
+      <link rel="prev" href="chapter.installing.and.running.html" title="Chapter 3. Installing and running OmegaT">
+      <link rel="next" href="chapter.menu.html" title="Chapter 5. Menu and Keyboard shortcuts">
+   </head>
+   <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+      <div class="navheader">
+         <table width="100%" summary="Navigation header">
+            <tr>
+               <th colspan="3" align="center">Chapter 4. The user interface</th>
+            </tr>
+            <tr>
+               <td width="20%" align="left"><a accesskey="p" href="chapter.installing.and.running.html">Prev</a> 
+               </td>
+               <th width="60%" align="center"> </th>
+               <td width="20%" align="right"> <a accesskey="n" href="chapter.menu.html">Next</a></td>
+            </tr>
+         </table>
+         <hr>
+      </div>
+      <div class="chapter" title="Chapter 4. The user interface">
+         <div class="titlepage">
+            <div>
+               <div>
+                  <h2 class="title"><a name="chapter.user.interface"></a>Chapter 4. The user interface
+                  </h2>
+               </div>
+            </div>
+         </div>
+         <div class="toc">
+            <dl>
+               <dt><span class="section"><a href="chapter.user.interface.html#user.interface.items">1. User interface items</a></span></dt>
+               <dd>
+                  <dl>
+                     <dt><span class="section"><a href="chapter.user.interface.html#windows.you.will.use.frequently">1.1. Frequently used windows</a></span></dt>
+                     <dt><span class="section"><a href="chapter.user.interface.html#windows.you.may.use.now.and.then">1.2. Less frequently used</a></span></dt>
+                     <dt><span class="section"><a href="chapter.user.interface.html#dialogs.to.change.settings">1.3. Project settings dialogs </a></span></dt>
+                  </dl>
+               </dd>
+               <dt><span class="section"><a href="chapter.user.interface.html#OmegaT.main.window">2. <span class="application">OmegaT</span> main window</a></span></dt>
+               <dd>
+                  <dl>
+                     <dt><span class="section"><a href="chapter.user.interface.html#editor.pane">2.1. Editor pane</a></span></dt>
+                     <dt><span class="section"><a href="chapter.user.interface.html#match.viewer">2.2. Match viewer</a></span></dt>
+                     <dt><span class="section"><a href="chapter.user.interface.html#d0e2555">2.3. Glossary</a></span></dt>
+                     <dt><span class="section"><a href="chapter.user.interface.html#dictionaries">2.4. Dictionary viewer</a></span></dt>
+                     <dt><span class="section"><a href="chapter.user.interface.html#Google.Translate">2.5. Machine Translation</a></span></dt>
+                     <dt><span class="section"><a href="chapter.user.interface.html#d0e2628">2.6. Main menu</a></span></dt>
+                     <dt><span class="section"><a href="chapter.user.interface.html#status.bar">2.7. Status bar</a></span></dt>
+                  </dl>
+               </dd>
+               <dt><span class="section"><a href="chapter.user.interface.html#other.windows">3. Other windows</a></span></dt>
+               <dd>
+                  <dl>
+                     <dt><span class="section"><a href="chapter.user.interface.html#section.project.files">3.1. Project files</a></span></dt>
+                     <dt><span class="section"><a href="chapter.user.interface.html#section.search.window">3.2. Search window</a></span></dt>
+                     <dt><span class="section"><a href="chapter.user.interface.html#section.tag.validation">3.3. Tag validation</a></span></dt>
+                     <dt><span class="section"><a href="chapter.user.interface.html#d0e2785">3.4. Match statistics</a></span></dt>
+                     <dt><span class="section"><a href="chapter.user.interface.html#d0e2868">3.5. Help browser</a></span></dt>
+                  </dl>
+               </dd>
+            </dl>
+         </div>
+         <div class="section" title="1. User interface items">
+            <div class="titlepage">
+               <div>
+                  <div>
+                     <h2 class="title" style="clear: both"><a name="user.interface.items"></a>1. User interface items
+                     </h2>
+                  </div>
+               </div>
+            </div>
+            <div class="section" title="1.1. Frequently used windows">
+               <div class="titlepage">
+                  <div>
+                     <div>
+                        <h3 class="title"><a name="windows.you.will.use.frequently"></a>1.1. Frequently used windows<a class="indexterm" name="d0e2012"></a></h3>
+                     </div>
+                  </div>
+               </div>
+               <div class="variablelist">
+                  <dl>
+                     <dt><span class="term"><span class="application">OmegaT</span> main window</span></dt>
+                     <dd>
+                        <p>contains the main menu, status bar and several panes:</p>
+                        <div class="itemizedlist">
+                           <ul class="itemizedlist" type="disc">
+                              <li class="listitem">
+                                 <p>Editor - where you type and edit the translation</p>
+                              </li>
+                              <li class="listitem">
+                                 <p>Match Viewer - displays the most similar segments from
+                                                    translation memories
+                                 </p>
+                              </li>
+                              <li class="listitem">
+                                 <p>Glossary Viewer - displays terminology</p>
+                              </li>
+                              <li class="listitem">
+                                 <p>Dictionary Viewer - displays information provided by
+                                                    dictionaries
+                                 </p>
+                              </li>
+                              <li class="listitem">
+                                 <p>Machine Translation - displays the translation, provided
+                                                    by MT services, like Google Translate
+                                 </p>
+                              </li>
+                           </ul>
+                        </div>
+                     </dd>
+                     <dt><span class="term"><a class="indexterm" name="d0e2042"></a>Project Files window</span></dt>
+                     <dd>
+                        <p>The list of your translatable files (open with <span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>L</strong></span>, close with <span class="keycap"><strong>Esc</strong></span>)
+                        </p>
+                     </dd>
+                     <dt><span class="term"><a class="indexterm" name="d0e2062"></a>Search window</span></dt>
+                     <dd>
+                        <p>Used to search for specific segments in the project (open
+                                       with <span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>F</strong></span>, close with <span class="keycap"><strong>Esc</strong></span>)
+                        </p>
+                     </dd>
+                  </dl>
+               </div>
+            </div>
+            <div class="section" title="1.2. Less frequently used">
+               <div class="titlepage">
+                  <div>
+                     <div>
+                        <h3 class="title"><a name="windows.you.may.use.now.and.then"></a>1.2. Less frequently used
+                        </h3>
+                     </div>
+                  </div>
+               </div>
+               <div class="variablelist">
+                  <dl>
+                     <dt><span class="term"><a class="indexterm" name="d0e2086"></a>Tag Validation window</span></dt>
+                     <dd>
+                        <p>Used to check for tag mistakes in translations (open with
+                                       <span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>T</strong></span> close with <span class="keycap"><strong>Esc</strong></span>)
+                        </p>
+                     </dd>
+                     <dt><span class="term"><a class="indexterm" name="d0e2106"></a>Help browser</span></dt>
+                     <dd>
+                        <p>Used to read the user manual (open with <span class="keycap"><strong>F1</strong></span>,
+                                       close with <span class="keycap"><strong>Esc)</strong></span></p>
+                     </dd>
+                     <dt><span class="term">Match statistics window</span></dt>
+                     <dd>
+                        <p>Used to open the window with the statistics of the project,
+                                       select <span class="guimenu"><a class="indexterm" name="d0e2128"></a>Tool</span> → <span class="guimenuitem">Match statistics.</span></p>
+                     </dd>
+                  </dl>
+               </div>
+            </div>
+            <div class="section" title="1.3. Project settings dialogs">
+               <div class="titlepage">
+                  <div>
+                     <div>
+                        <h3 class="title"><a name="dialogs.to.change.settings"></a>1.3. Project settings dialogs <a class="indexterm" name="d0e2139"></a></h3>
+                     </div>
+                  </div>
+               </div>
+               <p>The dialogs below are used to change OmegaT project settings. Each
+                        is described in detail in a separate section; the information below
+                        summarizes their use and how they are invoked::
+               </p>
+               <div class="variablelist">
+                  <dl>
+                     <dt><span class="term"><a class="indexterm" name="d0e2149"></a><a class="indexterm" name="d0e2154"></a>Project Properties</span></dt>
+                     <dd>
+                        <p>Used to modify the project folders and languages, (access
+                                       via <span class="guimenu">Project</span> → <span class="guimenuitem">properties...</span> (<span class="shortcut"><strong><span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>E</strong></span></strong></span>), close via <span class="keycap"><strong>Esc)</strong></span></p>
+                     </dd>
+                     <dt><span class="term"><a class="indexterm" name="d0e2179"></a>Font<a class="indexterm" name="d0e2185"></a></span></dt>
+                     <dd>
+                        <p>Used to modify the font <span class="application">used by
+                                          OmegaT</span> to display source, translation, matches and
+                                       glossary terms, (access via <span class="guimenu">Options</span> → <span class="guimenuitem">Font...</span>, close via
+                                       <span class="keycap"><strong>Esc</strong></span><span class="keycap"><strong>)</strong></span></p>
+                     </dd>
+                     <dt><span class="term"><a class="indexterm" name="d0e2208"></a>File filters<a class="indexterm" name="d0e2214"></a></span></dt>
+                     <dd>
+                        <p>Used to adjust the handling of supported file formats
+                                       (access via <span class="guimenu">Options</span> → <span class="guimenuitem">File Filters...</span>, close via <span class="keycap"><strong>Esc</strong></span>)
+                        </p>
+                     </dd>
+                     <dt><span class="term"><a class="indexterm" name="d0e2233"></a>Segmentation<a class="indexterm" name="d0e2239"></a></span></dt>
+                     <dd>
+                        <p>Used to change the way your text is segmented into sentences
+                                       (access via <span class="guimenu">Options</span> → <span class="guimenuitem">Segmentation</span>, close via <span class="keycap"><strong>Esc</strong></span>)
+                        </p>
+                     </dd>
+                     <dt><span class="term"><a class="indexterm" name="d0e2258"></a>Editing Behavior<a class="indexterm" name="d0e2264"></a></span></dt>
+                     <dd>
+                        <p>Used to change how <span class="application">OmegaT</span> behaves
+                                       when you iterate between the segments (access via <span class="guimenu">Options</span> → <span class="guimenuitem">Behavior...</span>, close via <span class="keycap"><strong>Esc</strong></span>)
+                        </p>
+                     </dd>
+                  </dl>
+               </div>
+            </div>
+         </div>
+         <div class="section" title="2. OmegaT main window">
+            <div class="titlepage">
+               <div>
+                  <div>
+                     <h2 class="title" style="clear: both"><a name="OmegaT.main.window"></a>2. <span class="application">OmegaT</span> main window<a class="indexterm" name="d0e2289"></a><a class="indexterm" name="d0e2296"></a></h2>
+                  </div>
+               </div>
+            </div>
+            <div class="figure"><a name="d0e2301"></a><p class="title"><b>Figure 4.1. OmegaT panes</b></p>
+               <div class="figure-contents">
+                  <div class="mediaobject"><img src="images/OmegaT_panes.png" alt="OmegaT panes"></div>
+               </div>
+            </div><br class="figure-break"><p>The main window consists of several panes, the main menu and a
+                   status bar. You can change the position of any pane or even undock it to a
+                   separate window by clicking and dragging the pane by its name. Depending
+                   on the pane status, different signs can appear at its top right
+                   corner:
+            </p>
+            <div class="table"><a name="d0e2311"></a><p class="title"><b>Table 4.1. Pane widgets<a class="indexterm" name="d0e2314"></a></b></p>
+               <div class="table-contents">
+                  <table summary="Pane widgetsWindows and panes in OmegaTPane widgets" border="1">
+                     <colgroup>
+                        <col width="60" align="left">
+                        <col>
+                     </colgroup>
+                     <tbody>
+                        <tr>
+                           <td align="left"><span class="inlinemediaobject"><img src="images/Minimize.gif" width="60%"></span></td>
+                           <td>minimizes the pane, so that only its name is shown at the
+                                          bottom of the window.
+                           </td>
+                        </tr>
+                        <tr>
+                           <td align="left"><span class="inlinemediaobject"><img src="images/Maximize.gif" width="60%"></span></td>
+                           <td>maximizes the pane</td>
+                        </tr>
+                        <tr>
+                           <td align="left"><span class="inlinemediaobject"><img src="images/undock.gif" width="60%"></span></td>
+                           <td>undocks the pane from the main window.</td>
+                        </tr>
+                        <tr>
+                           <td align="left"><span class="inlinemediaobject"><img src="images/dock.gif" width="60%"></span></td>
+                           <td>puts the pane back within the main window.</td>
+                        </tr>
+                     </tbody>
+                  </table>
+               </div>
+            </div><br class="table-break"><p>You can overlap panes if desired. When this is done the panes
+                   display a tab at the top. The separators between the panes can be dragged
+                   to resize panes. Should you lose track of your changes to the user
+                   interface, you can use <span class="guimenuitem"><a class="indexterm" name="d0e2361"></a> <a class="indexterm" name="d0e2367"></a>Options → Restore the main window</span> any time to
+                   return to the original layout.
+            </p>
+            <p>The counters in the lower right corner keep track of the progress of
+                   the translation (numbers in the left hand column refer to the figure
+                   above):
+            </p>
+            <div class="table"><a name="d0e2376"></a><p class="title"><b>Table 4.2. Main Window - counters<a class="indexterm" name="d0e2379"></a></b></p>
+               <div class="table-contents">
+                  <table summary="Main Window - countersWindows and panes in OmegaTCounters" border="1">
+                     <colgroup>
+                        <col width="60" align="left">
+                        <col>
+                     </colgroup>
+                     <tbody>
+                        <tr>
+                           <td align="left">33/33</td>
+                           <td>number of segments - translated vs total for the current
+                                          file
+                           </td>
+                        </tr>
+                        <tr>
+                           <td align="left">2780/2780</td>
+                           <td>number of unique segments - translated vs total in the
+                                          project
+                           </td>
+                        </tr>
+                        <tr>
+                           <td align="left">3760</td>
+                           <td>total number of segments (including repeats) in the
+                                          project
+                           </td>
+                        </tr>
+                        <tr>
+                           <td align="left">126/127</td>
+                           <td>number of source and target characters in the current
+                                          segment
+                           </td>
+                        </tr>
+                     </tbody>
+                  </table>
+               </div>
+            </div><br class="table-break"><p>From a practical point of view, the most important pair of numbers
+                   is the second pair: it tells, how much you have done so far, in relation
+                   to the total or second number. The project in the example is evidently
+                   finished, as all the unique segments have been translated.
+            </p>
+            <div class="section" title="2.1. Editor pane">
+               <div class="titlepage">
+                  <div>
+                     <div>
+                        <h3 class="title"><a name="editor.pane"></a>2.1. Editor pane<a class="indexterm" name="d0e2412"></a></h3>
+                     </div>
+                  </div>
+               </div>
+               <p>This is where you type and edit your translation. The Editor pane
+                        displays the text of the partially translated document: the text already
+                        translated is displayed in translation while the untranslated text is
+                        displayed in the original language. The displayed text is split into
+                        segments and you may scroll through the document and double-click on any
+                        segment to open and edit it. In the above case, the segments already
+                        translated are shown in yellow, but this may be changed to suit your
+                        preferences (see <a class="xref" href="chapter.menu.html#submenu.View" title="5. View">Section 5, “View”</a>).
+               </p>
+               <p>One of the above segments is the current segment. It is the
+                        segment that is displayed in two parts. The upper part is in the source
+                        language, in bold characters with a green background color, the lower
+                        part is the editing field, ended by a marker: <a class="indexterm" name="d0e2423"></a>the marker is <code class="literal"><segment
+                           nnnn></code> where nnnn is a number of the segment in the project.
+                        Use the upper part as a reference and replace or modify the contents of 
+                        the editing field with your translation.
+               </p>
+               <p>Depending upon the preferred editing behavior, the editing field
+                        for the untranslated segment may be empty, contain the source text, or
+                        contain the translation of the string most similar to the one to be
+                        translated. When you move to another segment, the translation is
+                        validated and stored. If you want the translation to be the same as the
+                        source, simply make the editing field empty by removing all the text
+                        (select all with <span class="keycap"><strong>Ctrl+A</strong></span> and delete with
+                        <span class="keycap"><strong>Del</strong></span>). OmegaT is able to store translations that are
+                        identical to the source. This is useful for documents that contain trade
+                        marks, names or other proper nouns, or parts in a third language that do
+                        not require translation. See <span class="emphasis"><em>Translation editing</em></span>
+                        for more details.
+               </p>
+               <p>If you right click on the Editor pane, a pop-up menu opens,
+                        offering<span class="bold"><strong> Cut, Copy, Paste</strong></span> (i.e. same
+                        functions as <span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>X</strong></span>, <span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>C</strong></span> and <span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>V</strong></span>) and the <span class="bold"><strong>GoTo segment</strong></span>
+                        functions.
+               </p>
+            </div>
+            <div class="section" title="2.2. Match viewer">
+               <div class="titlepage">
+                  <div>
+                     <div>
+                        <h3 class="title"><a name="match.viewer"></a>2.2. Match viewer
+                        </h3>
+                     </div>
+                  </div>
+               </div>
+               <div class="figure"><a name="matches.pane"></a><p class="title"><b>Figure 4.2. <a class="indexterm" name="d0e2473"></a><a class="indexterm" name="d0e2478"></a>Matches pane</b></p>
+                  <div class="figure-contents">
+                     <div class="mediaobject"><img src="images/MatchesPane.png" alt="MatchesMatches pane - figureWindows and panes in OmegaTMatches pane - figureMatches pane"></div>
+                  </div>
+               </div>
+               <p><br class="figure-break"></p>
+               <p>The match viewer shows the most similar segments from translation
+                        memories, both from internal project translation memory created in real
+                        time as you translate your project and from ancillary translation
+                        memories you have imported from your earlier jobs, or received from your
+                        client or translation agency.
+               </p>
+               <p>When you move to the next segment, the first fuzzy match (the one
+                        with the best matching percentage) is automatically selected. You may
+                        select a different match by pressing <span class="guimenuitem">Ctrl+2, 3, 4, or
+                           5</span>.<a class="indexterm" name="d0e2496"></a> Of course, pressing <span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>5</strong></span> will have no effect, if there is no match #5.To use the
+                        selected match in your translation, use
+                        <span class="guimenuitem">Ctrl+R</span><a class="indexterm" name="d0e2510"></a> to replace the target field with the match or use
+                        <span class="guimenuitem">Ctrl+I <a class="indexterm" name="d0e2518"></a></span> to insert it at the cursor position.
+               </p>
+               <p>The matching percentage is roughly equivalent to taking the number
+                        of common words in the matched and the matching segment and dividing by
+                        the number of words in the longer of the two. The selected fuzzy match
+                        is highlighted in bold, words that are missing in the segment you are
+                        translating are colored blue and words adjacent to the missing parts
+                        green. In the above example the source segment is <span class="bold"><strong>Duration of exposure <15 min</strong></span>. The top match is
+                        60%, because 3 out of 5 words match. The line with the matching
+                        percentage also includes the name of the translation memory <a class="indexterm" name="d0e2529"></a> containing the match. If there's no file name displayed,
+                        the source is the internal project translation memory. Orphan
+                        segments<a class="indexterm" name="d0e2535"></a> (the match #4) describe segments in the default project
+                        translation memory that have no corresponding source segment.
+               </p>
+               <p>There are actually three match estimates available (60/60/54 in
+                        the case of the top match above). They are defined as follows:
+               </p>
+               <div class="itemizedlist">
+                  <ul class="itemizedlist" type="disc">
+                     <li class="listitem">
+                        <p>match percentage when the tokenizer plugin is used</p>
+                     </li>
+                  </ul>
+               </div>
+               <div class="itemizedlist">
+                  <ul class="itemizedlist" type="disc">
+                     <li class="listitem">
+                        <p>default OmegaT match - number of matched words - with numerals
+                                     and tags ignored - divided by the total word count
+                        </p>
+                     </li>
+                  </ul>
+               </div>
+               <div class="itemizedlist">
+                  <ul class="itemizedlist" type="disc">
+                     <li class="listitem">
+                        <p>OmegaT match, including numbers, tags</p>
+                     </li>
+                  </ul>
+               </div>
+            </div>
+            <div class="section" title="2.3. Glossary">
+               <div class="titlepage">
+                  <div>
+                     <div>
+                        <h3 class="title"><a name="d0e2555"></a>2.3. Glossary<a class="indexterm" name="d0e2558"></a></h3>
+                     </div>
+                  </div>
+               </div>
+               <p>The Glossary pane allows you to access your own collection of
+                        expressions and specialist terminology which you have built up in your
+                        glossary files. It shows translation of terms found in the current
+                        segment, but only for reference purposes: there is no feature for
+                        inserting the translation or replacing the term with these.
+               </p>
+               <div class="figure"><a name="glossary.pane"></a><p class="title"><b>Figure 4.3. <a class="indexterm" name="d0e2568"></a>Glossary pane</b></p>
+                  <div class="figure-contents">
+                     <div class="mediaobject"><img src="images/Glossary_pane.png" alt="GlossariesGlossary window - figureGlossary pane"></div>
+                  </div>
+               </div>
+               <p><br class="figure-break"></p>
+               <p>The source segment in the above example was “I<span class="emphasis"><em>n most
+                              translation jobs it is considered important to have the translated
+                              document look similar to the original</em></span>.”, and two words in it,
+                        document and translation were found in the glossary file.
+                        <span class="application">OmegaT</span> also supports multi-word terms:
+               </p>
+               <div class="figure"><a name="multiword.pane"></a><p class="title"><b>Figure 4.4. <a class="indexterm" name="d0e2589"></a>multi-word entry in the glossary</b></p>
+                  <div class="figure-contents">
+                     <div class="mediaobject"><img src="images/MultiTerm_Glossary.png" alt="Glossariesmulti-word entry in the glossary - figuremulti-word entry in the glossary"></div>
+                  </div>
+               </div><br class="figure-break"><p>If you have TransTip option activated <span class="guimenuitem">Options →
+                           Transtip</span>), you can right click on the highlighted word in
+                        the source segment to open a drop-down menu with the alternative
+                        translations, as offered by your glossary. Selecting one of them will
+                        insert it at the current position into the target segment. You can also
+                        highlight your preferred alternative in the glossary pane and insert it
+                        into the target by right clicking on the selection.
+               </p>
+            </div>
+            <div class="section" title="2.4. Dictionary viewer">
+               <div class="titlepage">
+                  <div>
+                     <div>
+                        <h3 class="title"><a name="dictionaries"></a>2.4. Dictionary viewer<a class="indexterm" name="d0e2608"></a></h3>
+                     </div>
+                  </div>
+               </div>
+               <p>Dictionaries are the electronic equivalents of printed
+                        dictionaries like Merriam Webster, Duden, Larousse etc., that you may
+                        have on your desk.
+               </p>
+            </div>
+            <div class="section" title="2.5. Machine Translation">
+               <div class="titlepage">
+                  <div>
+                     <div>
+                        <h3 class="title"><a name="Google.Translate"></a>2.5. Machine Translation<a class="indexterm" name="d0e2618"></a></h3>
+                     </div>
+                  </div>
+               </div>
+               <p>The machine translation pane, when opened, contains the
+                        suggestions by machine translation tools for the current segment. Press
+                        <span class="keysym">Ctrl+M </span>to replace the translation of the current
+                        segment with the suggested translation.
+               </p>
+            </div>
+            <div class="section" title="2.6. Main menu">
+               <div class="titlepage">
+                  <div>
+                     <div>
+                        <h3 class="title"><a name="d0e2628"></a>2.6. Main menu
+                        </h3>
+                     </div>
+                  </div>
+               </div>
+               <p>The main menu provides access to all
+                        <span class="application">OmegaT</span> functions. See the<span class="emphasis"><em> Main
+                              Menu</em></span> appendix for a full description of all menus and menu
+                        items. The most frequently used functions are accessible with keyboard
+                        shortcuts, so once you become accustomed to them, you will no longer
+                        need to browse through the menus while translating.
+               </p>
+            </div>
+            <div class="section" title="2.7. Status bar">
+               <div class="titlepage">
+                  <div>
+                     <div>
+                        <h3 class="title"><a name="status.bar"></a>2.7. Status bar
+                        </h3>
+                     </div>
+                  </div>
+               </div>
+               <p>The status bar displays work-flow related messages at the bottom
+                        of the main window. This bar gives the user feedback on specific
+                        operations that are in progress. It also displays the number of fuzzy
+                        and glossary matches for the current segment.
+               </p>
+            </div>
+         </div>
+         <div class="section" title="3. Other windows">
+            <div class="titlepage">
+               <div>
+                  <div>
+                     <h2 class="title" style="clear: both"><a name="other.windows"></a>3. Other windows
+                     </h2>
+                  </div>
+               </div>
+            </div>
+            <div class="section" title="3.1. Project files">
+               <div class="titlepage">
+                  <div>
+                     <div>
+                        <h3 class="title"><a name="section.project.files"></a>3.1. Project files<a class="indexterm" name="d0e2650"></a></h3>
+                     </div>
+                  </div>
+               </div>
+               <p>The Project Files window lists the project files and displays
+                        other project information. It is displayed automatically when OmegaT
+                        loads a project. Use <span class="guimenuitem">Ctrl+L<a class="indexterm" name="d0e2659"></a></span> to open and <span class="keycap"><strong>Esc</strong></span> to close
+                        it. The Project Files Window displays the following information:
+               </p>
+               <div class="itemizedlist">
+                  <ul class="itemizedlist" type="disc">
+                     <li class="listitem">
+                        <p>the list of all translatable files in the project. These are
+                                     the files present in the Source files folder in a format that OmegaT
+                                     is able to recognize. Clicking on any file will open it for
+                                     translation
+                        </p>
+                     </li>
+                  </ul>
+               </div>
+               <div class="itemizedlist">
+                  <ul class="itemizedlist" type="disc">
+                     <li class="listitem">
+                        <p>the file currently available in the Editor pane is highlighted
+                                     with a blue background. Pressing <span class="keycap"><strong>Enter</strong></span> will move
+                                     the Editor pane to the top of the file selected
+                        </p>
+                     </li>
+                  </ul>
+               </div>
+               <div class="itemizedlist">
+                  <ul class="itemizedlist" type="disc">
+                     <li class="listitem">
+                        <p>the number of segments in each file is shown next to the file
+                                     name
+                        </p>
+                     </li>
+                  </ul>
+               </div>
+               <div class="itemizedlist">
+                  <ul class="itemizedlist" type="disc">
+                     <li class="listitem">
+                        <p>the total number of segments, the number of unique segments in
+                                     the whole project, and the number of unique segments already
+                                     translated are shown at the bottom
+                        </p>
+                     </li>
+                  </ul>
+               </div>
+               <p>The set of <span class="bold"><strong>Unique </strong></span>segments is
+                        computed by taking all the segments and removing all duplicate segments.
+                        (The definition of “unique” is case-sensitive: "Run" and "run" are
+                        treated as being different)
+               </p>
+               <p>The difference between "Number of segments" and "Number of unique
+                        segments" provides an approximate idea of the number of repetitions in
+                        the text. Note however that the numbers do not indicate how relevant the
+                        repetitions are: they could mean relatively long sentences repeated a
+                        number of times (in which case you are fortunate) or it could describe a
+                        table of keywords (not so fortunate). The
+                        <code class="filename">project_stats.txt</code> located in the omegat folder of
+                        your project contains more detailed segment information, broken down by
+                        file.
+               </p>
+               <p>Modifying the segmentation rules may have the effect of modifying
+                        the number of segments/unique segments. This, however, should generally
+                        be avoided once you have started translating the project. See the
+                        chapter <span class="emphasis"><em>Segmentation rules</em></span> for more
+                        information.
+               </p>
+               <p><span class="bold"><strong><a class="indexterm" name="d0e2704"></a>Adding files to the project: </strong></span>You can add source
+                        files to the project by clicking on the "<span class="guimenuitem">Import Source
+                           Files..."</span> button. This copies the selected files to the
+                        <code class="filename">source</code> folder and reloads the project to import the
+                        new files. You can also add source files from Internet pages, written in
+                        MediaWiki, by clicking on<span class="guimenuitem"> "Import from
+                           MediaWiki"</span> button and providing the corresponding
+                        URL.
+               </p>
+            </div>
+            <div class="section" title="3.2. Search window">
+               <div class="titlepage">
+                  <div>
+                     <div>
+                        <h3 class="title"><a name="section.search.window"></a>3.2. Search window<a class="indexterm" name="d0e2723"></a></h3>
+                     </div>
+                  </div>
+               </div>
+               <p>You can use the search window to find specific segments in a
+                        project. You can also have several search windows open simultaneously.
+                        To open a new search window, use <span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>F</strong></span> in the Main window. The search window consists of a text
+                        field for search strings or keywords, flags and radio buttons for
+                        setting up the search and a display area containing the results of the
+                        search. See the chapter<span class="emphasis"><em> <a class="link" href="chapter.user.interface.html" title="Chapter 4. The user interface">Searches</a> </em></span>for more
+                        information about the search window.
+               </p>
+            </div>
+            <div class="section" title="3.3. Tag validation">
+               <div class="titlepage">
+                  <div>
+                     <div>
+                        <h3 class="title"><a name="section.tag.validation"></a>3.3. Tag validation<a class="indexterm" name="d0e2745"></a><a class="indexterm" name="d0e2750"></a></h3>
+                     </div>
+                  </div>
+               </div>
+               <p>The tag validation window detects and lists any tag errors and
+                        inconsistencies in the translation. Open the window with
+                        <span class="guimenuitem">Ctrl+T. </span>The window features a 3 column table
+                        with a link to the segment and its source and target contents:
+               </p>
+               <div class="figure"><a name="tag.validator.window"></a><p class="title"><b>Figure 4.5. <a class="indexterm" name="d0e2765"></a>Tag validation window</b></p>
+                  <div class="figure-contents">
+                     <div class="mediaobject"><img src="images/TagValidator.png" alt="Tag validationWindow - figureTagsTag validation window"></div>
+                  </div>
+               </div>
+               <p><br class="figure-break"></p>
+               <p>Tags are highlighted in bold blue for easy comparison between the
+                        original and the translated contents. Click on the link to jump to the
+                        segment in the Editor pane. Correct the error if necessary and press
+                        <span class="guimenuitem">Ctrl+T</span> to return to the tag validation window
+                        to correct other errors. In the first and third case above tags are
+                        paired incorrectly, and in the second case the < sign is missing from
+                        the starting tag.
+               </p>
+               <p>Tag errors are cases in which the tags in the translation do not
+                        correspond in order and number to the original segment. Some tag
+                        scenarios flagged in the tag validation window are necessary and are
+                        benign, others will cause problems when the translated document is
+                        created. Tags generally represent some kind of formatting in the
+                        original text. Simplifying the original text formatting in the source
+                        file before commencing translation greatly contributes to reducing the
+                        number of tags.
+               </p>
+            </div>
+            <div class="section" title="3.4. Match statistics">
+               <div class="titlepage">
+                  <div>
+                     <div>
+                        <h3 class="title"><a name="d0e2785"></a>3.4. Match statistics<a class="indexterm" name="d0e2788"></a></h3>
+                     </div>
+                  </div>
+               </div>
+               <p>Statistics are accessed via<span class="guimenuitem">Tools/Match
+                           Statistics.</span> The evaluation is rather CPU intensive and can
+                        be time-consuming, so a progress bar is shown during the calculation. As
+                        far as categories are concerned, the de facto industry standard of
+                        classifying matches into the following groups is used:
+               </p>
+               <div class="itemizedlist">
+                  <ul class="itemizedlist" type="disc">
+                     <li class="listitem">
+                        <p>Exact match</p>
+                     </li>
+                     <li class="listitem">
+                        <p>95%-100%</p>
+                     </li>
+                     <li class="listitem">
+                        <p>85%-94%</p>
+                     </li>
+                     <li class="listitem">
+                        <p>75%-84%</p>
+                     </li>
+                     <li class="listitem">
+                        <p>50%-74%</p>
+                     </li>
+                     <li class="listitem">
+                        <p>No match</p>
+                     </li>
+                  </ul>
+               </div>
+               <p>The word counts are identical to the numbers, provided in the
+                        Project Files window, and are based strictly on OmegaT's method of
+                        counting, with a few differences in terminology to account for concept
+                        differences. This information is computed for segments, words and for
+                        characters (without and including spaces). Note that these totals are a
+                        good (or as-good-as-it-can-be) approximation of the work involved in the
+                        project and thus can serve as a basis for your cost and price
+                        calculations.
+               </p>
+               <div class="screenshot">
+                  <div class="mediaobject"><img src="images/MatchStatistics.png"></div>
+               </div>
+               <p>Spaces between segments are not taken into account in the last
+                        column. Repetitions stand for identical segments present several times
+                        in the text. The first segment and its contents will be classified as
+                        "no match", and the rest of them as a repetition of the first. If the
+                        translation for several identical source segments already exists in the
+                        translation memory of the project, these segments, together with other,
+                        already translated unique segments, will be classified as an "Exact
+                        match". The number of unique segments, if needed, is provided in the
+                        standard statistics window, regardless of whether they have been
+                        translated or not.
+               </p>
+               <p>The rest of the categories (50-100%) involves untranslated
+                        segments with a fuzzy match. Fuzzy matches can come from the
+                        <code class="filename">/tm</code> folder as well - and not just from the internal
+                        translation memory in <code class="filename">/omegaT,</code> as is the case for
+                        repetitions and exact matches. The only difference with matches from the
+                        <code class="filename">project_save</code> translation memory is that external
+                        TMs cannot give exact matches, only 100%. If one does not wish to use
+                        external TMs for counting, one will either have to empty the /tm folder
+                        or change the project setup (temporarily) so that the value for /tm
+                        points to a different location.
+               </p>
+               <p>The Match Statistics are tab-separated and you can use
+                        <span class="guimenuitem">Ctrl+A <a class="indexterm" name="d0e2844"></a></span><span class="guimenuitem">, Ctrl+C <a class="indexterm" name="d0e2851"></a></span>, <span class="guimenuitem">Ctrl+V <a class="indexterm" name="d0e2859"></a></span> to copy/paste them, for instance into a
+                        spreadsheet or into your cost-accounting application. Once computed, the
+                        data also available in
+                        <code class="filename">omegat/project_stats_match.txt.</code> Note that the file
+                        is time-stamped, as the calculation (contrary to the standard
+                        statistics) is not instantaneous and can thus quickly become
+                        obsolete.
+               </p>
+            </div>
+            <div class="section" title="3.5. Help browser">
+               <div class="titlepage">
+                  <div>
+                     <div>
+                        <h3 class="title"><a name="d0e2868"></a>3.5. Help browser<a class="indexterm" name="d0e2871"></a></h3>
+                     </div>
+                  </div>
+               </div>
+               <p>The help browser (which displays this manual) can be opened by
+                        pressing <span class="keycap"><strong><a class="indexterm" name="d0e2879"></a>F1</strong></span> or navigating to <span class="guimenuitem"><a class="indexterm" name="d0e2887"></a>Help → User Manual...</span> in the main menu. In
+                        the window, the manual and two buttons are displayed: Back and Contents.
+                        The user manual is an HTML document with links to different chapters.
+                        Clicking on a link as you would do in a web browser brings the desired
+                        page to the front.
+               </p>
+               <p>The user manual is located in the docs subfolder under the OmegaT
+                        installation folder, so you may can, for instance, view the English
+                        documentation by opening the <code class="filename">docs/en/index.html
+                           </code>file in your browser. Opening the user manual in this way
+                        also enables you to follow external links, as the built-in help browser
+                        does not accept external Internet links.
+               </p>
+            </div>
+         </div>
+      </div>
+      <div class="navfooter">
+         <hr>
+         <table width="100%" summary="Navigation footer">
+            <tr>
+               <td width="40%" align="left"><a accesskey="p" href="chapter.installing.and.running.html">Prev</a> 
+               </td>
+               <td width="20%" align="center"> </td>
+               <td width="40%" align="right"> <a accesskey="n" href="chapter.menu.html">Next</a></td>
+            </tr>
+            <tr>
+               <td width="40%" align="left" valign="top">Chapter 3. Installing and running <span class="application">OmegaT</span> 
+               </td>
+               <td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td>
+               <td width="40%" align="right" valign="top"> Chapter 5. Menu and Keyboard shortcuts</td>
+            </tr>
+         </table>
+      </div>
+   </body>
+</html>
\ No newline at end of file
diff --git a/docs/en/commandlineArguments.html b/docs/en/commandlineArguments.html
deleted file mode 100644
index f1444ab..0000000
--- a/docs/en/commandlineArguments.html
+++ /dev/null
@@ -1,320 +0,0 @@
-<html>
-<head>
-  <link rel="stylesheet" href="./OmegaT.css" type="text/css">
-  <meta http-equiv="CONTENT-TYPE" content="text/html; charset=utf-8">
-
-  <title>Command Line Arguments - OmegaT 2.1 User Manual</title>
-</head>
-
-<body>
-  <h1>Command Line Arguments</h1>
-
-  <p>OmegaT can be run with extra arguments that alter the behaviour of OmegaT 
-  or that tell OmegaT what actions to do on startup. To add the arguments, you 
-  need to type the startup commands with the arguments on the command line, 
-  or you have to alter the script that does that for you. For more information 
-  how to start OmegaT, see <a href="installingAndRunning.html">Installing and 
-  Running</a>.
-  
-  </p>
-  <h2>Behaviour altering arguments</h2>
-  
-  <p>Arguments that alter the behaviour of OmegaT are in fact arguments to the 
-  java virtual machine.<br>
-  Arguments are added after the initial "<em>java</em>", and before the 
-  "<em>-jar OmegaT.jar</em>" part.
-  Note that in Windows you can change the <em>OmegaT.l4J.ini</em> file to
-  reflect your preferences. On Mac OSX, you can change the <em>Info.plist</em>
-  located in <em>OmegaT.app/Contents/</em> to do the same.</p>
-
-  <p>A list of possible arguments is given below. You can have more information
-  about the arguments by typing <em>java</em> or <em>man java</em> in the 
-  terminal window - <em>man</em> is a terminal window command that displays a 
-  manual of the selected command. Your system may or may not have a manual for 
-  the command <em>java</em> in your language.</p>
-
-  <p><b>User interface language: </b> <em>-Duser.language=XX</em></p>
-
-  <table summary="just formatting">
-    <tbody>
-      <tr>
-        <td>     </td>
-
-        <td>
-          <p>Normally, i.e. when OmegaT is launched without any arguments, the
-          program first detects the language of the user's operating system. If
-          a user interface in this language is available, OmegaT uses it. So,
-          if the user's operating system is Russian and OmegaT has been
-          localized in Russian, OmegaT is displayed with a Russian user
-          interface, Russian menus, etc. If the language of the user's system
-          is not available, OmegaT defaults to English. This is the standard
-          behaviour.<br>
-          <br>
-          The "<em>-Duser.language=XX</em>" argument causes OmegaT to use the
-          language specified rather than the language of the user's operating
-          system. "XX" in the command stands for the two-digit code of the
-          desired language. To launch OmegaT with a French interface (for
-          example on a Russian operating system), the command would therefore
-          be:</p>
-
-          <p><em>java -Duser.language=fr -jar OmegaT.jar</em></p>
-        </td>
-      </tr>
-    </tbody>
-  </table>
-
-  <p><strong>User country setup:</strong><em> -Duser.country=XX</em></p>
-  
-  <table summary="just formatting">
-    <tbody>
-      <tr>
-        <td>     </td>
-
-        <td>
-          <p>Next to the language, you can also specify the country, for example
-           CN or TW in case of the Chinese language. To get the correct Instant 
-           start guide, you need to specify both the language and the country. 
-           This is necessary even if there's only one combination available, 
-           like pt_BR in case of Portuguese / Brazil.</p>
-        </td>
-      </tr>
-    </tbody>
-  </table>
-
-  <p><strong>Font antialiasing:</strong><em> -Dswing.aatext=true</em></p>
-
-  <table summary="just formatting">
-    <tbody>
-      <tr>
-        <td>     </td>
-
-        <td>
-          <p>This argument effects anti-aliasing of the fonts, thereby
-          improving their appearance.</p>
-        </td>
-      </tr>
-    </tbody>
-  </table>
-
-  <p><strong>Font antialiasing (Java 6 onwards)
-  :</strong><em> -</em><span style=
-  "font-style: italic;">Dawt.useSystemAAFontSettings=XX</span></p>
-
-  <table summary="just formatting">
-    <tbody>
-      <tr>
-        <td>     </td>
-
-        <td>
-          <p> Possible values for "XX" are "false", "on", "gasp" and
-          "lcd". Linux users may find that, depending upon the font type and
-          size selected, "on" or "lcd" enhance the appearance of fonts.</p>
-        </td>
-      </tr>
-    </tbody>
-  </table>
-
-  <p><strong>Memory assignment:</strong><em> -XmxZZM</em></p>
-
-  <table summary="just formatting">
-    <tbody>
-      <tr>
-        <td>     </td>
-
-        <td>
-          <p>This command assigns more memory to OmegaT. By default, 256 MB are
-          assigned, so there is no advantage in assigning less than this
-          figure. "ZZ" stands for the amount of memory assigned, in megabytes.
-          The command to launch OmegaT with assignment of 1024 MB (1 gigabyte)
-          of memory is therefore:</p>
-
-          <p><em>java -Xmx1024M -jar OmegaT.jar</em></p>
-        </td>
-      </tr>
-    </tbody>
-  </table>
-
-  <p><strong>Proxy server address and
-  port:</strong><em> -Dhttp.proxyHost=<server IP
-  address> -Dhttp.proxyPort=<port number></em></p>
-
-  <table summary="just formatting">
-    <tbody>
-      <tr>
-        <td>     </td>
-
-        <td>
-          <p>This command defines a proxy server, to be able to access the
-          Internet from behind a proxy.</p>
-
-          <p><em>java -Dhttp.proxyHost=192.198.1.1 -Dhttp.proxyPort=3128 -jar
-          OmegaT.jar</em></p>
-
-          <p>Arguments can be combined: to launch OmegaT with all the examples
-          described above, the command would be:<br>
-          <em>java -Dswing.aatext=true -Duser.language=pt -Duser.country=BR
-          -Xmx1024M -Dhttp.proxyHost=192.198.1.1 -Dhttp.proxyPort=3128 -jar
-          OmegaT.jar</em></p>
-        </td>
-      </tr>
-    </tbody>
-  </table>
-  
-  <h2>Action arguments</h2>
-  
-  <p>The following commands tell OmegaT what to do. They have to be placed 
-  AFTER the "<em>-jar OmegaT.jar</em>" part. You have to add the arguments to
-  the startup script / shortcut or type them on the command line yourself. You
-  can not put them in a config-file like the behaviour altering arguments.</p>
-  
-  <table style="width: 80%;" cellpadding="2" cellspacing="2" summary=
-  "just formatting">
-    <tbody>
-      <tr>
-        <td style="text-align: left;" valign="top">
-        <p><code><project-dir></code></p></td>
-
-        <td style="text-align: left;" valign="top">
-          <p>tells OmegaT to load the specified project on startup. E.g.
-          <code>/home/user/omegat_projects/myProject</code> or
-          <code>"C:\Localization Projects\myProject"</code>.</p>
-        </td>
-      </tr>
-
-      <tr>
-        <td style="text-align: left;" valign="top">
-        <p><code>--config-dir=<config-dir></code></p></td>
-
-        <td style="text-align: left;" valign="top">
-          <p> allows to tell OmegaT in which directory the configuration
-          files are stored. If not given, OmegaT reverts to default values
-          (OmegaT dir under user home, or if not available: the current working
-          directory).</p>
-        </td>
-      </tr>
-
-      <tr>
-        <td style="text-align: left;" valign="top">
-        <p><code>--mode=[console-translate |
-        console-createpseudotranslatetmx]</code></p></td>
-
-        <td style="text-align: left;" valign="top">
-          <p> OmegaT starts in <a href="consoleMode.html">console mode</a>.
-          If mode is
-          <code>console-translate</code> it will translate the given project.
-          If mode is <code>createpseudotranslatetmx</code> it will create a
-          transation memory file (specified by parameter
-          <code>--pseudotranslatetmx</code>) that includes all segments of the
-          project, even those segments that were not translated before. The
-          translation of the segments depends on the parameter
-          <code>--pseudotranslatetype</code>. The translation memory equals the
-          OmegaT format, and thus can be used in OmegaT. See also <a href=
-          "translationMemories.html#pseudo_translate">Translation
-          memories</a></p>
-        </td>
-      </tr>
-
-      <tr>
-        <td style="text-align: left;" valign="top">
-        <p><code>--source-pattern=<regular expression></code></p></td>
-
-        <td style="text-align: left;" valign="top">
-          <p> Only valid when mode is <code>console-translate</code>.
-          Specifies which source files will be translated. Target
-          subdirectories are however created regardless of whether some source
-          files match or not. The parameter is a regular expression.
-          Examples:</p>
-
-          <ul>
-            <li><code>.*</code>: all files will be translated. This is
-            equivalent to not using the parameter.</li>
-
-            <li><code>.*\.html</code>: all HTML files will be translated.</li>
-
-            <li><code>dir-10\\test\.html</code>: only the file
-            <code>test.html</code> in the directory <code>dir-10</code> will be
-            translated. Directories are relative to the root of the source
-            directory of the project. The directory separator is platform
-            dependent. <code>\\</code> has to be used under Windows, and
-            <code>/</code> on other platforms.</li>
-
-            <li><code>test\.html</code>: only the file <code>test.html</code>
-            at the root of the source directory will be translated. If there
-            are other files named test.html in other directories, they will be
-            ignored.</li>
-          </ul>
-
-          <p>The parameter is optional and defaults to <code>.*</code>.</p>
-        </td>
-      </tr>
-
-      <tr>
-        <td style="text-align: left;" valign="top">
-        <p><code>--pseudotranslatetmx=<file.tmx></code></p></td>
-
-        <td style="text-align: left;" valign="top">
-          <p> Only valid when mode is
-          <code>console-createpseudotranslatetmx</code>. Specifies to which
-          file the translation memory is written. If the filename does not end
-          with <code>.tmx</code> it will add the extension. The name can be
-          either absolute or relative to the working directory (the directory
-          you start OmegaT from).</p>
-        </td>
-      </tr>
-
-      <tr>
-        <td style="text-align: left;" valign="top">
-        <p><code>--pseudotranslatetype=[empty|equal]</code></p></td>
-
-        <td style="text-align: left;" valign="top">
-          <p> Only valid when mode is
-          <code>console-createpseudotranslatetmx</code>. Specifies what kind of
-          translation is created for each segment. Possible values are:</p>
-
-          <ul>
-            <li><code>empty</code>: the target segment will be an empty
-            segment</li>
-
-            <li><code>equal</code>: the target segment will be equal to the
-            source segment.</li>
-          </ul>
-
-          <p>The parameter is optional and defaults to <code>equal</code>.</p>
-        </td>
-      </tr>
-      
-      <tr>
-        <td style="text-align: left;" valign="top">
-        <p><code>--quiet</code></p></td>
-
-        <td style="text-align: left;" valign="top">
-          <p> Only valid in console-mode. In quiet mode, less info is 
-          logged to the screen. All messages that you would usually find in the
-          status bar are not shown.</p>
-
-          <p>The parameter is optional and by default messages are logged to 
-          the screen.</p>
-        </td>
-      </tr>
-    </tbody>
-  </table>
-
-  <hr>
-
-  <table style="width: 100%;" border="0" cellpadding="2" cellspacing="2"
-  summary="just formatting">
-    <tbody>
-      <tr>
-        <td style="text-align: left;"><a href="legalNotices.html">Legal
-        notices</a></td>
-
-        <td style="text-align: center;"><a href="index.html">Home</a></td>
-
-        <td style="text-align: right;"><a href="xindex.html">Index of
-        contents</a></td>
-      </tr>
-    </tbody>
-  </table>
-</body>
-</html>
-
diff --git a/docs/en/consoleMode.html b/docs/en/consoleMode.html
deleted file mode 100644
index aecc2a4..0000000
--- a/docs/en/consoleMode.html
+++ /dev/null
@@ -1,92 +0,0 @@
-<html>
-<head>
-  <link rel="stylesheet" href="OmegaT.css" type="text/css">
-  <meta http-equiv="CONTENT-TYPE" content="text/html; charset=utf-8">
-
-  <title>Console Mode - OmegaT 2.1 User Manual</title>
-</head>
-
-<body>
-  <h1>OmegaT Console Mode</h1>
-
-  <ul>
-    <li>
-      <p><a href="#prerequisites">Prerequisites</a></p>
-    </li>
-
-    <li>
-      <p><a href="#start">Starting in console mode</a></p>
-    </li>
-
-  </ul>
-  <p> </p>
-
-  <p>The purpose of the console mode is to use OmegaT as translation tool in a
-  scripting environment. When started in console mode, no GUI is loaded (so it
-  will work on any console). Depending on the running mode, the given project
-  is automatically translated or a pseudo-translated translation memory is
-  created.</p>
-  <hr>
-
-  <h3><a name="prerequisites" id="prerequisites"></a>Prerequisites</h3>
-
-  <p>To run OmegaT, a valid OmegaT-project must be present. The location does
-  not matter, since you have to add it to the command-line at startup
-  anyway.</p>
-
-  <p>If you need altered settings, the configuration files must be present.
-  This can be achieved in two ways:</p>
-
-  <ol>
-    <li>Run OmegaT normally (with the GUI) and set the settings. If you start
-    OmegaT in console mode, it will use the same settings. If you can't run
-    OmegaT normally (no graphical environment available):</li>
-
-    <li>Copy the settings files from some other OmegaT installation on another
-    machine to a specific directory. The location does not matter, since you
-    can add it to the command-line at startup. The relevant files are
-    filters.conf and segmentation.conf and can be found in the user home
-    directory (E.g. C:\Documents and Settings\%User%\OmegaT under windows,
-    %user%/.omegat/ under Linux)</li>
-  </ol><br>
-
-  <h3><a name="start" id="start"></a>Starting in console mode</h3>
-
-  <p>To start OmegaT in console mode, some extra parameters have to be passed
-  on startup. Required are <code><project-dir></code> and
-  <code>--mode=<mode></code>.</p>
-
-  <p>Depending on the mode, additional parameters have to be (or can be)
-  provided. See <a href="commandlineArguments.html">command line arguments</a> for
-  more information.</p>
-
-  <p>Example of translate project:<br>
-  <code>$>java -jar OmegaT.jar /path/to/project
-  --config-dir=/path/to/config-files/ --mode=console-translate</code><br>
-  Example of translate project for a single file:<br>
-  <code>$>java -jar OmegaT.jar /path/to/project
-  --config-dir=/path/to/config-files/ --mode=console-translate
-  --source-pattern=test\.html</code><br>
-  Example of create pseudo translated tmx:<br>
-  <code>java -jar OmegaT.jar /path/to/project
-  --config-dir=/path/to/config-files/ --mode=console-createpseudotranslatetmx
-  --pseudotranslatetmx=allsegments.tmx --pseudotranslatetype=equal</code></p>
-
-  <hr>
-
-  <table style="width: 100%;" border="0" cellpadding="2" cellspacing="2"
-  summary="just formatting">
-    <tbody>
-      <tr>
-        <td style="text-align: left;"><a href="legalNotices.html">Legal
-        notices</a></td>
-
-        <td style="text-align: center;"><a href="index.html">Home</a></td>
-
-        <td style="text-align: right;"><a href="xindex.html">Index of
-        contents</a></td>
-      </tr>
-    </tbody>
-  </table>
-</body>
-</html>
diff --git a/docs/en/dictionaries.html b/docs/en/dictionaries.html
deleted file mode 100644
index a20ecc3..0000000
--- a/docs/en/dictionaries.html
+++ /dev/null
@@ -1,97 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-  <link rel="stylesheet" href="./OmegaT.css" type="text/css">
-  <meta http-equiv="CONTENT-TYPE" content="text/html; charset=utf-8">
-  <title>Dictionaries - OmegaT 2.0 User Manual</title>
-</head>
-<body>
-<h2>Dictionaries</h2>
-<ul>
-  <li><a href="#How_to_download_and_install_dictionaries">How
-to download and install dictionaries</a></li>
-  <li><a href="#Problems_with_dictionaries">Problems with
-dictionaries</a><br>
-    <br>
-  </li>
-</ul>
-<h3><a name="How_to_download_and_install_dictionaries"></a>How
-to download and install dictionaries</h3>
-Dictionaries in OmegaT are based on the <a
- href="http://stardict.sourceforge.net/index.php" target="_blank">StarDict
-Platform</a>. To install the
-necessary files, proceed as follows:<br>
-<ul>
-  <li>Search for the
-required  language combination -for instance on the StarDict
-Platform above or on <a href="http://www.freedict.org/en/list.html"
- target="_blank">FreeDict</a></li>
-  <li>Download the file - it
-should be a tarball archive (extension <span
- style="font-style: italic;">tar.bz </span>or <span
- style="font-style: italic;">tar.bz2</span>). </li>
-  <li>Use untar (or equivalent
-(for instance winrar in Windows)  to extract its contents into
-the project folder "Dictionary". There should be
-three files, with extensions <span style="font-style: italic;">dict.dz,
- idx </span>and<span style="font-style: italic;"> ifo.</span></li>
-</ul>
-Note that additionally to "source-target" dictionaries you can, via
-Dictionary, get access to  information such as:<br>
-<ul>
-  <li>Webster's Revised Unabridged
-Dictionary (1913)</li>
-  <li>Longman Dictionary of
-Contemporary English</li>
-  <li>Merriam Webster 10th
-dictionary </li>
-  <li>The Britannica Concise
-Encyclopedia</li>
-  <li>...etc</li>
-</ul>
-Some of the dictionaries have no strings attached - i.e. are "Free to
-use", and some of them, like the selection above, are under
-the  GPL license.  The following example
-shows  Merriam Webster 10th
-dictionary  "in action":<br>
-<br>
-<img alt="MerriamWebster Dict in OmegaT"
- title="MerriamWebster Dict in OmegaT"
- src="images/DictMerriamWebster.png"><br>
-<br>
-<h3><a name="Problems_with_dictionaries"></a>Problems
-with
-dictionaries</h3>
-If  your Dictionary pane is empty, check the following:<br>
-<ul>
-  <li>Are your dict files in the
-folder (or in one of the subfolders thereof), specified in your Project
-file?
-Check in the Project Properties window (menu <strong>Project →
-Properties</strong> or <code>Ctrl+E</code>)?</li>
-  <li>Does the folder
-contain  three files of the same name, with extensions <span
- style="font-style: italic;">dict.dz,  idx </span>and <span
- style="font-style: italic;">ifo</span>?
- If there's just one file with the expected name, then
-check its extension. If it is <span style="font-style: italic;">tar.bz</span>,
-then you have forgotten to unpack (untar) it. </li>
-</ul>
-<br>
-<br>
- 
-<hr>
-<table style="width: 100%;" summary="just formatting" border="0"
- cellpadding="2" cellspacing="2">
-  <tbody>
-    <tr>
-      <td style="text-align: left;"><a href="legalNotices.html">Legal
-notices</a> </td>
-      <td style="text-align: center;"><a href="index.html">Home</a> </td>
-      <td style="text-align: right;"><a href="xindex.html">Index of
-contents</a> </td>
-    </tr>
-  </tbody>
-</table>
-</body>
-</html>
diff --git a/docs/en/fileFilters.html b/docs/en/fileFilters.html
deleted file mode 100644
index db86fb4..0000000
--- a/docs/en/fileFilters.html
+++ /dev/null
@@ -1,284 +0,0 @@
-<html>
-<head>
-  <link rel="stylesheet" href="./OmegaT.css" type="text/css">
-  <meta http-equiv="content-type" content="text/html; charset=utf-8">
-  <title>File Filters - OmegaT 2.0 User Manual</title>
-</head>
-
-<body>
-  <h1>File Filters</h1>
-  <hr>
-
-  <ul>
-    <li>
-      <p><a href="#filter_dialog">File filters dialog</a></p>
-
-      <ul>
-        <li>
-          <p><a href="#filter_options">Filters options</a></p>
-        </li>
-      </ul>
-    </li>
-
-    <li>
-      <p><a href="#edit_dialog">Edit filter dialog</a></p>
-
-      <ul>
-        <li>
-          <p><a href="#source_file_name">Source file type, filename
-          pattern</a>.</p>
-        </li>
-
-        <li>
-          <p><a href="#encoding">Source and target files encoding</a></p>
-        </li>
-
-        <li>
-          <p><a href="#target_file_name">Target filename</a></p>
-        </li>
-      </ul>
-    </li>
-  </ul>
-
-  <p>OmegaT features highly customizable filters, enabling you to setup most of
-  the aspects of their work. File filters are pieces of code capable of:</p>
-
-  <ul>
-    <li>
-      <p>Reading the document in some specific file format. For instance, plain
-      text files.</p>
-    </li>
-
-    <li>
-      <p>Extracting the translatable content out of the file.</p>
-    </li>
-
-    <li>
-      <p>Automating modifications of the translated document file names by
-      replacing translatable Contents with its translation.</p>
-    </li>
-  </ul>
-
-  <p>Most of the users should be happy with default file filter options. If you
-  are not, open the main dialog by selecting <strong>Options → File
-  Filters...</strong> from the main menu. <strong>Warning!</strong> Changing
-  the filters options when a project is open may cause data loss. If you change
-  filters options when a project is open, you will have to reload the project
-  for the changes to take effect.</p>
-
-  <h3><a name="filter_dialog" id="filter_dialog"></a>File filters dialog</h3>
-
-  <p>The dialog lists available file filters. If you don't want to use OmegaT
-  to translate the files of some type, you may turn off the filter by checking
-  off the check box near its name. OmegaT will then omit the appropriate files
-  while loading projects, and will copy them untouched while creating target
-  documents. Later when you decide to use the filter again, just tick the check
-  box. Click <strong>Defaults</strong> to reset the file filters to the default
-  settings. To edit what files in what encodings the filter will process,
-  select the filter from the list and click <strong>Edit</strong>.</p>
-
-  <h3><a name="filter_options" id="filter_options"></a>Filters options</h3>
-
-  <p>Five filters (Text files, XHTML files, HTML and XHTML files,
-  OpenDocument/OpenOffice.org files and Microsoft Open XML files) have one or
-  several specific options. To modify the options select the filter from the
-  list and click on <strong>Options</strong>. The available options are:</p>
-
-  <h4>Text files</h4>
-
-  <ul>
-    <li>
-      <p><i>Paragraph segmentation on line breaks, empty lines or never:</i> if
-      sentence segmentation rules are active, the text will further be
-      segmented according to the rules available.</p>
-    </li>
-  </ul>
-
-  <h4>HTML files and HTML and XHTML Files</h4>
-
-  <ul>
-    <li>
-      <p><i>Add or rewrite encoding declaration:</i> OmegaT may add or rewrite the file's
-      encoding declaration based on the target file selected encoding.</p>
-    </li>
-
-    <li>
-      <p><i>Translate the following attributes:</i> The selected attributes will appear as segments in the Editor window.</p>
-    </li>
-
-    <li>
-      <p><i>Start a new paragraph on:</i> The <br> HTML tag will create a
-      paragraph for segmentation purposes.</p>
-    </li>
-
-    <li>
-      <p><i>Skip text matching regular expression:</i> The text matching the
-      regular expression will be skipped.</p>
-    </li>
-  </ul>
-
-  <h4>OpenDocument/OpenOffice.org files</h4>
-
-  <p>The following elements can be translated or not. If translated, they will
-  appear as separate segments.</p>
-
-  <ul>
-    <li><i>Index entries</i></li>
-
-    <li><i>Bookmarks</i></li>
-
-    <li><i>Bookmark references</i></li>
-
-    <li><i>Notes</i></li>
-
-    <li><i>Comments</i></li>
-  </ul>
-
-  <h4>Microsoft Open XML files</h4>
-
-  <p>The following elements can be translated or not. If translated, they will
-  appear as separate segments.</p>
-
-  <ul>
-    <li><i>Hidden text (Word)</i></li>
-
-    <li><i>Comments (Word, Excel)</i></li>
-
-    <li><i>Footnotes (Word)</i></li>
-
-    <li><i>Endnotes (Word)</i></li>
-
-    <li><i>Header (Word)</i></li>
-
-    <li><i>Footer (Word)</i></li>
-
-    <li><i>Slide comments (PowerPoint)</i></li>
-
-    <li><i>Slide masters (PowerPoint)</i></li>
-  </ul>
-
-  <h3><a name="edit_dialog" id="edit_dialog"></a>Edit filter dialog</h3>
-
-  <p>The dialog allows you to setup the source filename patterns of files the
-  filter will process, customize the filenames of translated files, and select
-  what encodings it will use for loading the file and saving its translated
-  counterpart. To modify a file filter pattern, either modify the fields
-  directly or click <strong>Edit</strong>. To add a new file filter pattern,
-  click <strong>Add</strong>. The same dialog is used to add a pattern or to
-  edit a particular pattern. The dialog is useful because it includes a special
-  target filename pattern editor allows you to customize the names of output
-  files.</p>
-
-  <h3><a name="source_file_name" id="source_file_name"></a>Source file type,
-  filename pattern</h3>
-
-  <p>When an OmegaT encounters a file in its source folder, it tries to
-  select the filter using file's extension. More precisely, OmegaT tries to
-  match each filter's source filename patterns against the filename. For
-  example, <code>*.xhtml</code> pattern will match against any file with
-  <code>.xhtml</code> extension. If the appropriate filter is found, it is
-  given the file for processing. For example, by default XHTML filter will be
-  used for processing files with <code>.xhtml</code> extension. You may change
-  or add filename patterns of files each file filter will handle. Source
-  filename patterns use wild card characters similar to those used in
-  <strong>Searches</strong>. The '<strong>*</strong>' character matches zero or
-  more characters. The '<strong>?</strong>' character matches exactly one
-  character. All the other characters represent themselves. For example, if you
-  want the text filter to handle readme files (<code>readme</code>,
-  <code>read.me</code>, and <code>readme.txt</code>) you should use the pattern
-  <code>read*</code>.</p>
-
-  <h3><a name="encoding" id="encoding"></a>Source and target files
-  encoding</h3>
-
-  <p>Only a limited number of file formats specify a mandatory encoding. File
-  formats that do not specify their encoding will use the encoding you set up
-  for the extension that matches their name. For example, by default
-  <code>.txt</code> files will be loaded using OS-default encoding. You may
-  change the source encoding for each different source filename pattern. Such
-  files may also be written out in any encoding. By default, the translated
-  file encoding in is the same as the source file encoding. Source and target
-  encoding fields use combo boxes with all supported encodings included.
-  <strong><auto></strong> leaves the encoding choice to OmegaT. Here's
-  how it does:</p>
-
-  <ul>
-    <li>
-      <p style="margin-bottom: 0cm;">OmegaT finds the source file encoding by
-      using its encoding declaration if any (HTML files, XML based files).</p>
-    </li>
-
-    <li>
-      <p style="margin-bottom: 0cm;">OmegaT is set to use a mandatory encoding
-      for some file formats ( Java properties etc)</p>
-    </li>
-
-    <li>
-      <p>OmegaT uses the default encoding of the operating system for text
-      files.</p>
-    </li>
-  </ul>
-
-  <h3><a name="target_file_name" id="target_file_name"></a>Target filename</h3>
-
-  <p>Sometimes you may like to rename the files you translate automatically,
-  for example adding a language code after file name. Target filename pattern
-  uses a special syntax, so if you wish to edit this field, you have to click
-  <strong>Edit...</strong> and use the Edit Pattern Dialog. If you want to fall
-  back to default configuration of the filter, click <strong>Defaults</strong>.
-  You may also modify the name directly in the target filename pattern field of
-  the file filters dialog. The Edit Pattern Dialog offers the following
-  options:</p>
-
-  <ul>
-    <li>
-      <p>Default is <code>${filename}</code> -- full filename of the source
-      file with extension, so that the name of the translated file is the same
-      as the name of the source file.</p>
-    </li>
-
-    <li>
-      <p><code>${nameOnly}</code> allows you to insert only the name of the
-      source file without the extension.</p>
-    </li>
-
-    <li>
-      <p><code>${extension}</code> -- the extension of the source file.</p>
-    </li>
-
-    <li>
-      <p><code>${targetLocale}</code> - target locale code (of a form
-      "xx_YY").</p>
-    </li>
-
-    <li>
-      <p><code>${targetLanguage}</code> - the target language and country code
-      together (of a form "XX-YY").</p>
-    </li>
-
-    <li>
-      <p><code>${targetLanguageCode}</code> - the target language only
-      ("XX").</p>
-    </li>
-
-    <li>
-      <p><code>${targetCoutryCode}</code> - the target country only ("YY").</p>
-    </li>
-  </ul>
-  <hr>
-
-  <table style="width: 100%;" border="0" cellpadding="2" cellspacing="2" summary="just formatting">
-    <tbody>
-      <tr>
-        <td style="text-align: left;"><a href="legalNotices.html">Legal
-        notices</a></td>
-
-        <td style="text-align: center;"><a href="index.html">Home</a></td>
-
-        <td style="text-align: right;"><a href="xindex.html">Index of
-        contents</a></td>
-      </tr>
-    </tbody>
-  </table>
-</body>
-</html>
diff --git a/docs/en/filesAndDirectories.html b/docs/en/filesAndDirectories.html
deleted file mode 100644
index f474b24..0000000
--- a/docs/en/filesAndDirectories.html
+++ /dev/null
@@ -1,557 +0,0 @@
-<html>
-<head>
-  <link rel="stylesheet" href="OmegaT.css" type="text/css">
-  <meta http-equiv="CONTENT-TYPE" content="text/html; charset=utf-8">
-
-  <title>Files and directories - OmegaT 2.0 User Manual</title>
-</head>
-
-<body>
-  <h1>OmegaT Files and Directories</h1>
-
-  <ul>
-    <li>
-      <p><a href="#project">Translation project files</a></p>
-    </li>
-
-    <li>
-      <p><a href="#user">User files</a></p>
-    </li>
-
-    <li>
-      <p><a href="#application">Application files</a></p>
-
-      <p> </p>
-    </li>
-  </ul>
-
-  <p>OmegaT works with three types of files.</p>
-
-  <ul>
-    <li>Translation project files: They constitute a translation project.
-    Loosing them may affect the project's integrity and your ability to
-    complete a job. Project files are the most important files in OmegaT. They
-    are the files you will deal with on a daily basis while translating.</li>
-
-    <li>User setting files: They are created when OmegaT's behavior is modified
-    by user accessible preference settings. Loosing them will usually result in
-    having OmegaT work with "factory" settings. This can sometimes cause a
-    little trouble when you are in the middle of a translation.</li>
-
-    <li>Application files: They are included in the package you download, most
-    of them are necessary to have OmegaT function properly. If for some reason
-    such files are lost, just download and/or reinstall OmegaT to restore them
-    all.</li>
-  </ul>
-  <hr>
-
-  <h3><a name="project" id="project"></a>Translation project files</h3>
-
-  <p>An OmegaT translation project consists of a number of files and
-  directories.</p>
-
-  <h3><a name="project_location" id="project_location"></a>Translation project
-  files location</h3>
-
-  <p>When you create a translation project, OmegaT automatically creates a list
-  of directories that will later serve as files repositories, as well as a
-  number of files that will be used to set some project preferences and to keep
-  the project translation memory. By default, a translation project directories
-  are all grouped under the main project folder. Alternate locations for the
-  directories can be chosen at project creation or during the translation. This
-  way it is possible to select existing directories or create directories in
-  locations that reflect your work flow habits. To change the location of
-  directories after a project has been created, open <strong>Project →
-  Properties...</strong> and do the necessary changes.</p>
-
-  <h3><a name="project_list" id="project_list"></a>Translation project files
-  list</h3>
-
-  <p>In a file dialog opened by OmegaT, a translation project will look like a
-  file with an OmegaT icon associated to it. From a file browser, however, the
-  same translation project looks like just any other folder.</p>
-
-  <p><br></p><img src="images/OmegaT_projects_and_subdirectories.png" name=
-  "grafika3" alt="OmegaT projects and subdirectories" align="left" border="1"
-  id="grafika3"><br clear="left">
-
-  <p><br>
-  <br></p>
-
-  <p>Selecting the item with the OmegaT icon is enough to open the project A
-  translation project <b>Example_Project</b> created with the default settings
-  will be created as a new subfolder with the following structure:</p><img src=
-  "images/Omegatproject.png" name="grafika1" alt="OmegaT Project" align="left"
-  border="0" id="grafika1"><br clear="left">
-
-  <p>Initially all the subfolders of a project will be empty.</p>
-
-  <h3>Omegat</h3>
-
-  <dl>
-    <dt>The subfolder <b>omegat</b> will eventually contain several files, the
-    most important among them being the translation memory file
-    <em>project_save.tmx</em> (<a href="translationMemories.html">...</a>). The
-    file <em>project_save.tmx</em> is the working translation memory for the
-    project. With the autosave function activated, it will be automatically
-    updated when you quit. It is the translation memory used to create the
-    translated files. A number of TMX files with names of the form
-    project_save.tmx.<i><date and time</i>>.bak (<a href=
-    "translationMemories.html#TMX_backup">...</a>) will later on be added to
-    this subfolder. They serve as a backup for the project TM and are being
-    added each time you reopen a project, thus reflecting its contents before
-    the current session has changed it.</dt>
-
-    <dd>The <b>stats.txt</b> file (<a href="userInterface.html#files">...</a>)
-    contains the statistics about the current project and can be opened in a
-    spreadsheet application to display segment and word count information. The
-    information it contains is more detailed that what is displayed in the
-    <em>Project Files</em> window. The <strong>ignored_words.txt</strong> and
-    <strong>learned_words.txt</strong> files, if they exist, will be used by
-    the spell checker.</dd>
-  </dl>
-
-  <h3>Source</h3>
-
-  <dl>
-    <dt>The source subfolder is the space for the files to be translated. You
-    can specify a new subfolder and add the files to it the project later as
-    well in the project list window. Note that the structure of the source
-    subfolder is completely in your hands. If the files to be translated are
-    parts of a tree structure, you just need to specify the top subfolder and
-    OmegaT will copy it all, while keeping the tree structure intact.</dt>
-  </dl>
-
-  <h3>Target</h3>
-
-  <dl>
-    <dd>When <strong>Project → Create Translated Documents</strong> is
-    selected while a project is opened, all the files in
-    <strong>/source/</strong>, translated or not, will be reproduced here with
-    the same folder hierarchy to reflect the current state of the translation.
-    Practically speaking, OmegaT merges the translation information saved in
-    <strong>/omegat/project_save.tmx</strong> with the source documents to
-    produce the <strong>/target/</strong> contents.</dd>
-  </dl>
-
-  <h3>Tm</h3>
-
-  <dl>
-    <dd>Translation memories from previous translations can be put into this
-    subfolder. They have to be in the <b>tmx</b> format. Use available tools to
-    transform from other formats. Note that project_save.tmx is the translation
-    memory, mediating between your source and the eventual target. However, the
-    ancillary TM files are available for finding most convenient candidates for
-    untranslated segments.</dd>
-  </dl>
-
-  <h3>omegat.project</h3>
-
-  <dl>
-    <dd>OmegaT automatically creates this file when the project is created. It
-    contains the <a href="projectProperties.html">project parameters</a>. The
-    parameters included in this file can be modified from the Project
-    properties window.</dd>
-
-    <dt>project_name-omegat.tmx (<a href=
-    "translationMemories.html#TMX_files_location_and_purpose">...</a>)<br>
-    project_name-level1.tmx<br>
-    project_name-level2.tmx</dt>
-
-    <dd>These files contain the source and target segments corresponding to the
-    contents of the /source/ folder at the time of their creation (usually when
-    the translated files have been created).</dd>
-  </dl>
-  <hr>
-
-  <h3><a name="user" id="user"></a>User files</h3>
-
-  <h3><a name="user_location" id="user_location"></a>User files location</h3>
-
-  <p>User files are stored in a separate location where they can be accessed by
-  any version of OmegaT. The location depends on the platform you use:</p>
-
-  <table width="100%" border="1" cellpadding="4" cellspacing="0" summary=
-  "just formatting">
-    <col width="33*">
-    <col width="223*">
-
-    <tr valign="top">
-      <td width="13%">
-        <p>Windows</p>
-      </td>
-
-      <td width="87%">
-        <dl>
-          <dd><strong>2000 and XP: Documents and Settings\<User
-          Name>\Application Data\OmegaT</strong></dd>
-
-          <dd><strong>Vista: Users\<User
-          Name>\AppData\Roaming\OmegaT</strong></dd>
-
-          <dd><strong>Other: <Something>\OmegaT</strong>
-          (<Something> corresponds to the location of the "home" folder
-          as determined by Java.)</dd>
-        </dl>
-      </td>
-    </tr>
-
-    <tr valign="top">
-      <td width="13%">
-        <dl>
-          <dt>Linux/Solaris/FreeBSD</dt>
-        </dl>
-      </td>
-
-      <td width="87%">
-        <dl>
-          <dd><strong><User Home>/.omegat</strong> (.omegat is a
-          directory, the dot preceding its name makes it invisible unless you
-          type <code>ls -a</code> or an equivalent command.)</dd>
-        </dl>
-      </td>
-    </tr>
-
-    <tr valign="top">
-      <td width="13%">
-        <dl>
-          <dt>MacOSX</dt>
-        </dl>
-      </td>
-
-      <td width="87%">
-        <dl>
-          <dd><strong><User
-          Home>/Library/Preferences/OmegaT</strong></dd>
-        </dl>
-      </td>
-    </tr>
-
-    <tr valign="top">
-      <td width="13%">
-        <dl>
-          <dt>Other</dt>
-        </dl>
-      </td>
-
-      <td width="87%">
-        <dl>
-          <dd><strong><User Home></strong></dd>
-        </dl>
-      </td>
-    </tr>
-  </table>
-
-  <h3><a name="user_list" id="user_list"></a>User files list<br></h3>
-
-  <table width="100%" border="1" cellpadding="4" cellspacing="0" summary=
-  "just formatting">
-    <col width="27*">
-    <col width="229*">
-
-    <tr valign="top">
-      <td width="11%">
-        <dl>
-          <dt>log.txt</dt>
-        </dl>
-      </td>
-
-      <td width="89%">
-        <dl>
-          <dd>This file records Java error messages while OmegaT is running.
-          When you think OmegaT is behaving erratically it is important to
-          include this file or the relevant part in any <a href=
-          "website.html">trouble report</a>.</dd>
-        </dl>
-      </td>
-    </tr>
-
-    <tr valign="top">
-      <td width="11%">
-        <dl>
-          <dt>omegat.prefs</dt>
-        </dl>
-      </td>
-
-      <td width="89%">
-        <dl>
-          <dd>An xml file with all the GUI accessible option settings, as well
-          as window position data.</dd>
-        </dl>
-      </td>
-    </tr>
-
-    <tr valign="top">
-      <td width="11%">
-        <dl>
-          <dt>filters.conf</dt>
-        </dl>
-      </td>
-
-      <td width="89%">
-        <dl>
-          <dd>An xml file with all the data set by the <a href=
-          "fileFilters.html">file filters</a> preferences.</dd>
-        </dl>
-      </td>
-    </tr>
-
-    <tr valign="top">
-      <td width="11%">
-        <dl>
-          <dt>segmentation.conf</dt>
-        </dl>
-      </td>
-
-      <td width="89%">
-        <dl>
-          <dd>An xml file with all the data set by the <a href=
-          "segmentation.html">sentence segmentation</a> preferences.</dd>
-        </dl>
-      </td>
-    </tr>
-  </table>
-
-  <p><br>
-  <br></p>
-  <hr>
-
-  <h3><a name="application" id="application"></a>Application files</h3>
-
-  <p>OmegaT comes as a package you can download from SourceForge. In this
-  chapter we will consider the <a href=
-  "installingAndRunning.html#Other_systems">platform independent package</a>
-  that contains the application in a standard Java form. Other packages include
-  a Linux <code>.tar</code> package, a Windows installer -with or without a
-  Java Runtime Environment, a MacOSX installer and a source code package for
-  developers. This platform independent package can be used on
-  <strong>any</strong> platform with a running Java 1.5 runtime environment,
-  including the platforms for which there is a specific package. The platform
-  independent package comes as a compressed file that you need to decompress in
-  the folder of your choice for install. Decompression is usually done by
-  double clicking on the downloaded package. Once decompressed, a folder
-  containing the following contents will be created:</p>
-
-  <table width="100%" border="1" cellpadding="4" cellspacing="0" summary=
-  "just formatting">
-    <col width="19*">
-    <col width="237*">
-
-    <tr valign="top">
-      <td width="8%">
-        <p><b>File/<br>
-        subfolder</b></p>
-      </td>
-
-      <td width="92%">
-        <p><b>Contents</b></p>
-      </td>
-    </tr>
-
-    <tr valign="top">
-      <td width="8%">/docs/</td>
-
-      <td width="92%">
-        <dl>
-          <dt>All the user manual files are in this folder. You can open them
-          in an internet browser to have access to external links.</dt>
-        </dl>
-      </td>
-    </tr>
-
-    <tr valign="top">
-      <td width="8%">
-        <dl>
-          <dt>/images/</dt>
-        </dl>
-      </td>
-
-      <td width="92%">
-        <dl>
-          <dd>Icons and logo graphics are included here.</dd>
-        </dl>
-      </td>
-    </tr>
-
-    <tr valign="top">
-      <td width="8%">
-        <dl>
-          <dt>/lib/</dt>
-        </dl>
-      </td>
-
-      <td width="92%">
-        <dl>
-          <dd>Java files are included here. They are necessary to the well
-          functioning of OmegaT.</dd>
-        </dl>
-      </td>
-    </tr>
-
-    <tr valign="top">
-      <td width="8%">
-        <dl>
-          <dt>join.html</dt>
-        </dl>
-      </td>
-
-      <td width="92%">
-        <dl>
-          <dd>This is a normal html file that once opened in your internet
-          browser will redirect you to the OmegaT user group hosted on Yahoo
-          Groups. Joining is not necessary but will give you access to some
-          extra services like access to some files and irregular polls, besides
-          for being able to join in OmegaT related discussions. The group
-          archives are public and consultation does not require subscription to
-          the group.</dd>
-        </dl>
-      </td>
-    </tr>
-
-    <tr valign="top">
-      <td width="8%">
-        <dl>
-          <dt>changes.txt</dt>
-        </dl>
-      </td>
-
-      <td width="92%">
-        <dl>
-          <dd>A relatively detailed list of modifications between this version
-          and the preceding versions.</dd>
-        </dl>
-      </td>
-    </tr>
-
-    <tr valign="top">
-      <td width="8%">
-        <dl>
-          <dt>license.txt</dt>
-        </dl>
-      </td>
-
-      <td width="92%">
-        <dl>
-          <dd>The GNU GENERAL PUBLIC LICENSE. This license allows you to do
-          certain things with OmegaT, including modifying and distributing it.
-          If you are interested in modifying or distributing OmegaT, take a
-          good look at this document and make sure you are aware of all its
-          implications before doing anything. In case you are in doubt, don't
-          hesitate to ask project members directly either by sending them a
-          mail from the Source Forge page or by sending a public mail to the
-          user group.</dd>
-        </dl>
-      </td>
-    </tr>
-
-    <tr valign="top">
-      <td width="8%">
-        <dl>
-          <dt>doc-license.txt</dt>
-        </dl>
-      </td>
-
-      <td width="92%">
-        <dl>
-          <dd>The GNU GENERAL PUBLIC LICENSE. This license covers the
-          documentation. See above.</dd>
-        </dl>
-      </td>
-    </tr>
-
-    <tr valign="top">
-      <td width="8%">
-        <dl>
-          <dt>readme.txt</dt>
-        </dl>
-      </td>
-
-      <td width="92%">
-        <dl>
-          <dd>This file is very important and you should make sure you read it
-          before starting OmegaT. It includes general information about OmegaT,
-          where to find more information, how to contribute etc. It is
-          translated to a number of languages.</dd>
-        </dl>
-      </td>
-    </tr>
-
-    <tr valign="top">
-      <td width="8%">
-        <dl>
-          <dt>OmegaT</dt>
-        </dl>
-      </td>
-
-      <td width="92%">
-        <dl>
-          <dd>A text file that containing two lines:<br>
-          <code>#!/bin/bash</code><br>
-          <code>java -jar OmegaT.jar $*</code><br>
-          You may find this file useful if you make it executable (<code>chmod
-          +x OmegaT</code>) from the <a href=
-          "installingAndRunning.html#command_line">command line</a> after
-          making sure you are in the <code>/OmegaT_2.0/</code> directory. From
-          now on you'll be able to start OmegaT by calling this file from the
-          command line.</dd>
-        </dl>
-      </td>
-    </tr>
-
-    <tr valign="top">
-      <td width="8%">
-        <dl>
-          <dt>OmegaT.bat</dt>
-        </dl>
-      </td>
-
-      <td width="92%">
-        <dl>
-          <dd>A batch file, used to launch OmegaT from the Windows <a href=
-          "installingAndRunning.html#command_line">command line</a>. It
-          contains just the following line:</dd>
-
-          <dd><code>java -jar OmegaT.jar %*</code></dd>
-        </dl>
-      </td>
-    </tr>
-
-    <tr valign="top">
-      <td width="8%">
-        <dl>
-          <dt>OmegaT.jar</dt>
-        </dl>
-      </td>
-
-      <td width="92%">
-        <dl>
-          <dt>The main OmegaT application. To launch OmegaT you have to either
-          call this file from the command line or launch it from your file
-          manager (usually by double-clicking it).</dt>
-        </dl>
-      </td>
-    </tr>
-  </table>
-
-  <dl>
-    <dd><br>
-    <br></dd>
-  </dl>
-  <hr>
-
-  <table style="width: 100%;" border="0" cellpadding="2" cellspacing="2"
-  summary="just formatting">
-    <tbody>
-      <tr>
-        <td style="text-align: left;"><a href="legalNotices.html">Legal
-        notices</a></td>
-
-        <td style="text-align: center;"><a href="index.html">Home</a></td>
-
-        <td style="text-align: right;"><a href="xindex.html">Index of
-        contents</a></td>
-      </tr>
-    </tbody>
-  </table>
-</body>
-</html>
diff --git a/docs/en/filesToTranslate.html b/docs/en/filesToTranslate.html
deleted file mode 100644
index 66bd63c..0000000
--- a/docs/en/filesToTranslate.html
+++ /dev/null
@@ -1,380 +0,0 @@
-<html>
-<head>
-  <link rel="stylesheet" href="./OmegaT.css" type="text/css">
-  <meta http-equiv="CONTENT-TYPE" content="text/html; charset=utf-8">
-
-  <title>Files to Translate - OmegaT 2.0 User Manual</title>
-</head>
-
-<body>
-  <h1>Files to translate</h1>
-
-  <p><a href="#RTLbidi">Right-to left languages</a></p>
-
-  <ul>
-    <li>
-      <p><a href="#RTL_Changing_direction">Changing the direction of the
-      input/display text</a></p>
-    </li>
-
-    <li>
-      <p><a href="#RTL_mixing">Mixing LTR and RTL strings in segments</a></p>
-    </li>
-
-    <li>
-      <p><a href="#RTL_tags">OmegaT tags in RTL segments</a></p>
-    </li>
-
-    <li>
-      <p><a href="#RTL_CreatingTranslatedDocuments">Creating translated RTL
-      documents</a></p>
-    </li>
-  </ul>
-
-  <p><a href="#formats">File formats</a></p>
-
-  <ul>
-    <li>
-      <p><a href="#plaintext">Plain text files</a></p>
-    </li>
-
-    <li>
-      <p><a href="#tagged">Formatted text files</a></p>
-    </li>
-
-    <li>
-      <p><a href="#specifics">File formats specifics</a></p>
-    </li>
-
-    <li>
-      <p><a href="#others">Other file formats</a></p>
-
-      <ul>
-        <li>
-          <p><a href="#ooo">OpenOffice.org</a></p>
-        </li>
-
-        <li>
-          <p><a href="#okapi">Okapi Framework</a></p>
-        </li>
-
-        <li>
-          <p><a href="#tt">Translate Toolkit</a></p>
-        </li>
-
-        <li>
-          <p><a href="#po4a">po4a</a></p>
-        </li>
-      </ul>
-    </li>
-  </ul>
-  <hr>
-
-  <h2><a name="RTLbidi" id="RTLbidi"></a>Right to left
-  languages</h2>Justification of source and target segments depends on the
-  project languages. It is by default left justified for LTR languages and
-  right justified for RTL languages. <a name="RTL_Changing_direction" id="RTL_Changing_direction"></a>You can toggle between different display
-  modes by pressing Ctrl+Shift+O (this is the letter O and not the numeral 0).
-  The Shift+Ctrl+O toggle has three states:
-
-  <ul>
-    <li>default (i.e. language) justification</li>
-
-    <li>left justification</li>
-
-    <li>right justification</li>
-  </ul>Using the RTL mode in OmegaT has no influence whatsoever on the display
-  mode of the translated documents created in OmegaT. The display mode of the
-  translated documents will have to be modified within the application commonly
-  used to display or modify them (check the relevant manuals for details).
-  Using Ctrl+Shift+O causes both text input and display in OmegaT to be changed
-  to RTL. It can be used separately for all three panes (Editor, Fuzzy Matches
-  and Glossary) by clicking on the pane and toggling the display mode. It can
-  also be used in all the input fields found in OmegaT (search window,
-  segmentation rules etc.) <b>Note</b>: Mac OSX uses the same shortcut (and not
-  Cmd+Shift+O) .
-
-  <h3><a name="RTL_mixing" id="RTL_mixing"></a>Mixing RTL and LTR strings in
-  segments</h3>When writing purely RTL text, the default (LTR) view may be
-  used. In many cases, however, it is necessary to embed LTR text in RTL text.
-  For example, in OmegaT tags, product names that have to remain in the LTR
-  source language, place holders in localization files, and numbers in text. In
-  cases like these it becomes necessary to switch to RTL mode, so that the RTL
-  (in fact bidirectional) text is displayed correctly. It should be noted that
-  when OmegaT is in RTL mode, both source and target are displayed in RTL mode.
-  This means that if the source language is LTR and the target language is RTL,
-  or vice versa, it might be necessary to toggle back and forth between RTL and
-  LTR modes to easily view the source and enter the target in their respective
-  modes.
-
-  <h3><a name="RTL_tags" id="RTL_tags"></a>OmegaT tags in RTL segments</h3>
-
-  <p>As written above, OmegaT tags are LTR strings. When translating between
-  RTL and LTR langauges, to correctly read the tags from the source and to
-  enter them properly in the target may require the translator to toggle
-  between LTR and RTL modes numerous times.</p>
-
-  <p>If the document allows, the translator is strongly encouraged to remove
-  style information from the original document so that as few tags as possible
-  appear in the OmegaT interface. Follow the indications given in Hints for
-  tags management. Frequently validate tags (see <a href=
-  "userInterface.html#tag_validation">Tag validation)</a> and produce
-  translated documents (see below and <a href="menu.html">Menu</a>) at regular
-  intervals to make it easier to catch any problems that arise. It should be
-  possible to translate a plain text version of the text and to later add the
-  necessary style in the relevant application.</p>
-
-  <h3><a name="RTL_CreatingTranslatedDocuments" id=
-  "RTL_CreatingTranslatedDocuments"></a>Creating translated RTL documents</h3>
-
-  <p>When the translated document is created, its display direction will be the
-  same as the original document. If the original document was LTR, the display
-  direction of the target document must be changed manually to RTL in its
-  viewing application. Each output format has specific ways to deal with RTL
-  display, check the relevant application manuals for details.</p>
-
-  <p>To avoid changing the target files display parameters each time the files
-  are opened, it is sometimes possible to change the source file display
-  parameters so that such parameters are inherited by the target files. Such
-  modifications are possible in OpenOffice.org files for example.</p>
-  <hr>
-
-  <h2><a name="formats" id="formats"></a>File formats</h2>
-
-  <p>With OmegaT you can translate files in a number of file formats. There are
-  basically two types of file formats, the <strong>plain text</strong> and the
-  <strong>formatted text</strong> formats.</p>
-
-  <h3><a name="plaintext" id="plaintext"></a>Plain text files</h3>
-
-  <p>Plain text files contain text only, so their translation is as simple as
-  typing the translation. There are several <a href="plainText.html">methods</a>
-  to specify the file's encoding so that its contents is not garbled when
-  opened in OmegaT. Such files do not contain any formatting information beyond
-  the "white space" used to align text, indicate paragraphs or insert page
-  breaks. They are not able to contain / retain information regarding the color,
-  font etc of the text. Currently, OmegaT supports the following plain text
-  formats:</p>
-
-  <ul>
-    <li>
-      <p>ASCII text (.txt, etc.)</p>
-    </li>
-
-    <li>
-      <p>Encoded text</p>
-    </li>
-
-    <li>
-      <p>Java resource bundles (.properties)</p>
-    </li>
-
-    <li>
-      <p>PO files (.po)</p>
-    </li>
-
-    <li>
-      <p>INI (key=value) files (.ini)</p>
-    </li>
-  </ul>
-
-  <p>Other plain text file types can be handled by OmegaT by <a href=
-  "fileFilters.html">associating</a> their file extension to a supported file
-  type (for example, <code>.pod</code> files could be associated to the ASCII
-  text filter) and by pre-processing them with specific <a href=
-  "segmentation.html">segmentation</a> rules.</p>
-
-  <h3><a name="tagged" id="tagged"></a>Formatted text files</h3>
-
-  <p>Formatted text files contain text as well as information such as font
-  type, size, color etc. They are commonly created in word processors or home
-  page editors. Such file formats are conceived so that they retain formatting
-  information. Such formatting information can be as simple as <strong>this is
-  bold</strong> or as complex as table data with different font size, color,
-  position etc. In most translation jobs it is considered important to have the
-  translated document look similar to the original. OmegaT allows you to do
-  this by marking the characters/words that have a special formatting with easy
-  to manipulate <a href="formattedText.html">tags</a>. Simplifying the original
-  text formatting greatly contributes to reducing the number of tags. Unifying
-  used fonts, font sizes, colors etc should be considered if possible, to
-  simplify the translation and reduce the number of possible <a href=
-  "userInterface.html#tag_validation">tag errors</a>. <a name="specifics" id="specifics"></a> 
-  Each file type is handled differently in OmegaT. Specific
-  behavior can be setup in the <a href="fileFilters.html">file filters</a>.
-  Currently, OmegaT support the following formatted text formats:</p>
-
-  <ul>
-    <li>
-      <p>OpenOffice.org</p>
-    </li>
-
-    <li>
-      <p>OpenDocument</p>
-    </li>
-
-    <li>
-      <p>Microsoft Open XML</p>
-    </li>
-
-    <li>
-      <p>(X)HTML</p>
-    </li>
-
-    <li>
-      <p>HTML Help Compiler</p>
-    </li>
-
-    <li>
-      <p>DocBook</p>
-    </li>
-
-    <li>
-      <p>Okapi monolingual XLIFF</p>
-    </li>
-
-    <li>
-      <p>CopyFlow Gold for QuarkXPress</p>
-    </li>
-
-    <li>
-      <p>Subtitle files (SRT)</p>
-    </li>
-
-    <li>
-      <p>ResX</p>
-    </li>
-
-    <li>
-      <p>Android resource</p>
-    </li>
-
-    <li>
-      <p>LaTeX</p>
-    </li>
-
-    <li>
-      <p>Typo3 LocManager</p>
-    </li>
-
-    <li>
-      <p>Help & Manual</p>
-    </li>
-
-    <li>
-      <p>Windows Resources (RC)</p>
-    </li>
-
-    <li>
-      <p>Mozilla DTD files</p>
-    </li>
-
-  </ul>
-
-  <p>Other formatted text file types can be handled by OmegaT by <a href=
-  "fileFilters.html">associating</a> their file extension to a supported file
-  type and by pre-processing them with specific <a href=
-  "segmentation.html">segmentation</a> rules.</p>
-
-  <h3><a name="others" id="others"></a>Other file formats</h3>
-
-  <p>Other plain text or formatted text file formats may also be processed in
-  OmegaT.</p>
-
-  <p>External tools can be used to convert files to supported formats. Please
-  remember, that the translated files will need to be converted back to the
-  original format. This way, a number of plain text formats (including LaTex
-  etc) can be translated in OmegaT through conversion to the PO format.
-  Similarly, a number of formatted text formats (including Microsoft Office
-  files) can be translated in OmegaT through conversion to the Open Document
-  format.</p>
-
-  <p>The quality of the translated file will depend on the quality of the
-  round-trip conversion. Make sure you have tested all your options before
-  proceeding with such conversions. Available free conversion tools
-  include:</p>
-
-  <p><br></p>
-
-  <table width="100%" border="0" cellpadding="4" cellspacing="0" summary=
-  "just formatting">
-    <col width="50*">
-    <col width="206*">
-
-    <tr valign="top">
-      <td width="19%">
-        <p><a name="ooo" id="ooo"></a>OpenOffice.org<a href=
-        "http://www.openoffice.org/"><br>
-        OpenOffice.org official page</a></p>
-      </td>
-
-      <td width="81%">
-        <p>OmegaT does not offer direct support for Microsoft Office formats
-        Word, Excel and Power Point. However, OpenOffice.org (and variants) can
-        be used to convert such formats to OpenDocument, that OmegaT natively
-        supports.</p>
-      </td>
-    </tr>
-
-    <tr valign="top">
-      <td width="19%">
-        <p><a name="okapi" id="okapi"></a>Okapi Framework<a href=
-        "http://okapi.sourceforge.net/Release/Tikal/ReadMe_ForMono.htm"><br>
-        Okapi for Mono</a>, <a href=
-        "http://okapi.sourceforge.net/Release/Shared/Help/tutorial_02.htm">tutorial</a></p>
-      </td>
-
-      <td width="81%">
-        <p>The Text Extraction Utility from the Okapi Framework has an option
-        for creating an OmegaT project folder tree. It is also possible to
-        create an OmegaT specific XLIFF file. The Java implementation of Okapi Framework  
-        is available at <a href="http://okapi.opentag.com/">Okapi.opentag.com</a>.<br>
-        </p>
-      </td>
-    </tr>
-
-    <tr valign="top">
-      <td width="19%">
-        <p><a name="tt" id="tt"></a>Translate Toolkit<br>
-        <a href="http://translate.sourceforge.net/wiki/toolkit/index">Translate
-        Toolkit official page</a></p>
-      </td>
-
-      <td width="81%">
-        <p>The Translate Toolkit, a python tool set, provides users with a
-        number of converters to and from Portable Object, including Mozilla
-        .properties and dtd files, CSV files, Qt .ts files, XLIFF files. It
-        includes a number of tools to manipulate such files before or after
-        their translation in OmegaT.</p>
-      </td>
-    </tr>
-
-    <tr valign="top">
-      <td width="19%">
-        <p><a name="po4a" id="po4a"></a>Po4a<br>
-        <a href="http://po4a.alioth.debian.org/">po4a official page</a></p>
-      </td>
-
-      <td width="81%">
-        <p>po4a is a Debian perl tool. It can convert files formats such as
-        LaTeX, TeX, POD etc to and from Portable Object.</p>
-      </td>
-    </tr>
-  </table>
-  <hr>
-
-  <table style="width: 100%;" border="0" cellpadding="2" cellspacing="2"
-  summary="just formatting">
-    <tbody>
-      <tr>
-        <td style="text-align: left;"><a href="legalNotices.html">Legal
-        notices</a></td>
-
-        <td style="text-align: center;"><a href="index.html">Home</a></td>
-
-        <td style="text-align: right;"><a href="xindex.html">Index of
-        contents</a></td>
-      </tr>
-    </tbody>
-  </table>
-</body>
-</html>
diff --git a/docs/en/fontSettings.html b/docs/en/fontSettings.html
deleted file mode 100644
index 50169ec..0000000
--- a/docs/en/fontSettings.html
+++ /dev/null
@@ -1,69 +0,0 @@
-<html>
-<head>
-  <link rel="stylesheet" href="./OmegaT.css" type="text/css">
-  <meta http-equiv="CONTENT-TYPE" content="text/html; charset=utf-8">
-  <title>Font Settings - OmegaT 2.0 User Manual</title>
-</head>
-
-<body>
-  <h2>Font settings</h2>
-
-  <p>This dialog allows you to modify the font used by OmegaT in the following
-  windows:</p>
-
-  <ul>
-    <li>
-      <p>OmegaT main window (Editor, Match viewer,
-      Glossary viewer)</p>
-    </li>
-
-    <li>
-      <p>Search window</p>
-    </li>
-
-    <li>
-      <p>Tag validation window</p>
-    </li>
-  </ul>
-
-  <p>The dialog can be called up via the <strong>Options → Font...</strong>
-  item in the <a href="menu.html">Main menu</a>.</p>
-
-  <p>The dialog allows you to adjust the font settings as follows:</p>
-
-  <ul>
-    <li>
-      <p>Use the drop-down box to select among the fonts
-      available</p>
-    </li>
-
-    <li>
-      <p>Use the spin box to adjust size of the selected font</p>
-    </li>
-
-    <li>
-      <p>The sample text in the preview frame is shown using the selected font, so you can check it immediately</p>
-    </li>
-  </ul>
-
-  <p><strong>Warning!</strong> In some cases it make take quite some time for
-  OmegaT to update the display after you have changed the font setting,
-  especially when a big file with many segments is open in the editor. Note
-  also that some fonts behave better for some language pairs than for
-  others.</p>
-  <hr>
-  <table style="width: 100%;" border="0" cellpadding="2" cellspacing="2" summary="just formatting">
-    <tbody>
-      <tr>
-        <td style="text-align: left;"><a href="legalNotices.html">Legal
-notices</a> </td>
-        <td style="text-align: center;"><a href="index.html">Home</a>
-        </td>
-        <td style="text-align: right;"><a href="xindex.html">Index of
-contents</a> </td>
-      </tr>
-    </tbody>
-  </table>
-
-</body>
-</html>
diff --git a/docs/en/formattedText.html b/docs/en/formattedText.html
deleted file mode 100644
index 88de78c..0000000
--- a/docs/en/formattedText.html
+++ /dev/null
@@ -1,390 +0,0 @@
-<html>
-<head>
-  <link rel="stylesheet" href="./OmegaT.css" type="text/css">
-  <meta http-equiv="CONTENT-TYPE" content="text/html; charset=utf-8">
-
-  <title>Working with Formatted Text - OmegaT 2.0 User Manual</title>
-</head>
-
-<body>
-  <h2>Working with formatted texts</h2>
-
-  <ul>
-    <li>
-      <p><a href="#intro">Formatting tags</a></p>
-    </li>
-
-    <li>
-      <p><a href="#tag_segmenting">Tags and sentence segmenting</a></p>
-    </li>
-
-    <li>
-      <p><a href="#tag_operation">Tag operations</a></p>
-    </li>
-
-    <li>
-      <p><a href="#nesting">Tag group nesting</a></p>
-    </li>
-
-    <li>
-      <p><a href="#tag-overlapping">Tag group overlapping</a></p>
-    </li>
-
-    <li>
-      <p><a href="#tag_validation">Tag group validation</a></p>
-    </li>
-
-    <li>
-      <p><a href="#tag_hints">Hints for tags management</a></p>
-    </li>
-
-    <li>
-      <p><A href="#printf">printf-placeholders</A></p>
-    </li>
-  </ul>
-
-  <p>Formatting information present in the source file usually needs to be
-  reproduced in the target file. The in-line formatting information made
-  possible by the supported formats (at present DocBook, HTML, XHTML, Open
-  Document, and OpenOffice.org) is presented as tags in OmegaT. In a normal
-  case tags are ignored when considering the similarity between different texts
-  for matching purposes. Tags reproduced in the translated segment will be
-  present in the translated document.</p>
-  <hr>
-
-  <h3><a name="intro" id="intro"></a>Formatting tags</h3>
-
-  <p><a name="naming" id="naming"></a><b>Tag naming:</b> The tags consist of
-  one to three characters and a number. Unique number allows to group those tag
-  that correspond to each other, and differentiate the tags that can have the
-  same shortcut character, but are in fact different. The characters may or may
-  not reflect the value of the formatting the tag represents (e.g. bold,
-  italics, etc.)</p>
-
-  <p><a name="numbering" id="numbering"></a><b>Tag numbering:</b>Tags are
-  numbered in an incremental way by <strong>tag group</strong>. What we call
-  "tag groups" here is either a single tag (like <code><font color=
-  "#FB0000"><br1></font></code>), on its own, or 2 tags forming a pair
-  (like <code><font color="#FB0000"><i0></font></code> and
-  <code><font color="#FB0000"></i0></font></code>). Within a segment, the
-  first group (pair or singleton) gets the number <strong>0</strong>, the
-  second the number <strong>1</strong> etc. The first example below has 3 tag
-  groups (a pair, a singleton, and then another pair), the second example only
-  has one group (a pair).</p>
-
-  <p><a name="pairs" id="pairs"></a><b>Pairs and singletons:</b>Tags always
-  come either in singletons or in pairs. <strong>Single tags</strong> indicate
-  formatting information that does not affect the surrounding text (extra space
-  or line break for example).</p>
-  <pre>
- <strong><segment 2132></strong><font color=
-"#FB0000"><b0></font><Ctr+N><font color=
-"#FB0000"></b0></font>, <font color=
-"#FB0000"><br1><b2></font><Enter><font color=
-"#FB0000"></b2></font><strong><end segment></strong>
-</pre>
-
-  <p><code><strong><font color="#FB0000"><br1></font></strong></code> is
-  a single tag and does not affect any surrounding text. <strong>Paired
-  tags</strong> usually indicate style information that applies to the text
-  between the opening tag and the closing tag of a pair. Whatever happens to a
-  pair, the opening tag should always come before the closing tag:</p>
-  <pre>
- <strong><segment 3167></strong>Log file (<font color=
-"#FB0000"><b0></font>log.txt<font color=
-"#FB0000"></b0></font>) for tracking operations and errors.<strong><end segment></strong>
-</pre>
-
-  <p><code><strong><font color="#FB0000"><b0></font></strong></code>
-  <font size="3">and</font> <code><strong><font color=
-  "#FB0000"></b0></font></strong></code> are paired and affect the text
-  <code><strong>log.txt</strong></code>.</p>
-  <hr>
-
-  <h3><a name="tag_segmenting" id="tag_segmenting"></a>Tags and sentence
-  segmenting</h3>
-
-  <p>OmegaT creates its tags before sentences segmenting is applied. Depending
-  on the segmenting rules, it may appear as if tags do not respect the above
-  rules of numbering and grouping. Check the following text: "<em>Before: \.
-  After: \s"</em><font color="#FB0000">.</font> <font color="#000000">One would
-  expect segmentation as follows(<b0> and </b0> stand for the start
-  and end of italics):</font></p>
-  <pre>
- <strong><segment ....></strong> <font color=
-"#FB0000"><b0></font>Before: \. After: \s<font color=
-"#FB0000"></b0></font><strong><end segment></strong>
-</pre>
-
-  <p>However, when the default segmenting rules are applied to this segment, we
-  will end with the following result:</p>
-  <pre>
- <strong><segment 1990></strong> <font color=
-"#FB0000"><b0></font>Before: \. <strong><end segment></strong><br>
-<strong><segment 1991></strong> After: \s<font color=
-"#FB0000"></b0></font><strong><end segment></strong> <br>
-</pre>
-
-  <p>Applying the rule <i>segment after a period followed by a space</i>
-  splices the original text in two segments, even if the two tags
-  <code><font color="#FB0000"><b0></font></code> and <code><font color=
-  "#FB0000"></b0></font></code> should be kept together in the same
-  segment. In some cases that may even cause problems in the translation, when
-  tags must be placed differently in the target language to reflect the word
-  order of that language (see <a href="#tag_operation">Tag operations</a>
-  below).</p>
-  <hr>
-
-  <h3><a name="tag_operation" id="tag_operation"></a>Tag operations</h3>
-
-  <p>Care must be exercised with tags. If they are accidentally changed, the
-  formatting of the final file may be corrupted. The sound approach is "Don't
-  fix, what's not broken". However, it is still good to know, what is possible
-  and how to do it.</p>
-
-  <p><a name="duplication" id="duplication"></a><b>Tag group duplication:</b>
-  To duplicate tag groups, just copy them in the position of your choice. Keep
-  in mind that in a pair group the opening tag must come before the closing
-  tag. The formatting represented by the group you duplicated will be applied
-  to the section where you duplicated it.</p>
-
-  <p>Example:</p>
-  <pre>
- <strong><segment 0001></strong><font color=
-"#FB0000"><b0></font>This formatting<font color=
-"#FB0000"></b0></font> is going to be duplicated here.<strong><end segment></strong>
-</pre>
-
-  <p>After duplication:</p>
-  <pre>
- <strong><segment 0001></strong><font color=
-"#FB0000"><b0></font>This formatting<font color=
-"#FB0000"></b0></font> has been <font color=
-"#FB0000"><b0></font>duplicated here<font color=
-"#FB0000"></b0></font>.<strong><end segment></strong>
-</pre>
-
-  <p><a name="deletion" id="deletion"></a><b>Tag group deletion:</b>To delete
-  tag groups, just remove them from the segment. Keep in mind that a pair group
-  must have its opening as well as its closing tag deleted to ensure that all
-  traces of the formatting are properly erased, otherwise the translated file
-  might get corrupted. By deleting a tag group you will remove the related
-  formatting from the translated file.</p>
-
-  <p>Example:</p>
-  <pre>
- <strong><segment 0001></strong><font color=
-"#FB0000"><b0></font>This formatting<font color=
-"#FB0000"></b0></font> is going to be deleted.<strong><end segment></strong>
-</pre>
-
-  <p>After deletion:</p>
-  <pre>
- <strong><segment 0001></strong>This formatting has been deleted.<strong><end segment></strong>
-</pre>
-
-  <p><b>Modifying the order of tag groups:</b>To change the order of a tag
-  group to reflect a different language structure in the translation, simply
-  put the tag group where it should be in the translation. The formatting will
-  follow the part it is applied to.</p>
-
-  <p>Example:</p>
-  <pre>
- <strong><segment 0001></strong><font color=
-"#FB0000"><b0></font>Formatting zero<font color=
-"#FB0000"></b0></font> and <font color=
-"#FB0000"><b1></font>formatting one<font color=
-"#FB0000"></b1></font> are going to be inverted around.<strong><end segment></strong>
-</pre>
-
-  <p>After order modification:</p>
-  <pre>
- <strong><segment 0001></strong><font color=
-"#FB0000"><b1></font>Formatting one<font color=
-"#FB0000"></b1></font> and <font color=
-"#FB0000"><b0></font>formatting zero<font color=
-"#FB0000"></b0></font> have been inverted.<strong><end segment></strong>
-</pre>
-
-  <h3><a name="nesting" id="nesting"></a>Tag group nesting</h3>
-
-  <p>Modifying a tag group order may result in the nesting of a tag group
-  within another tag group. This is fine as long as the enclosing group totally
-  encloses the enclosed group. In other words, when moving paired tags make
-  sure that both the opening and the closing tag have been move in the target
-  otherwise the translated file might be corrupted and may not open. The nested
-  part will then have both formats apply to it.</p>
-
-  <p>Example:</p>
-  <pre>
- <strong><segment 0001></strong><font color=
-"#FB0000"><b0></font>Formatting<font color=
-"#FB0000"></b0></font> <font color=
-"#FB0000"><b1></font>one<font color=
-"#FB0000"></b1></font> is going to be nested inside formatting zero.<strong><end segment></strong>
-</pre>
-
-  <p>After nesting:</p>
-  <pre>
- <strong><segment 0001></strong><font color=
-"#FB0000"><b0></font>Formatting <font color=
-"#FB0000"><b1></font>one<font color=
-"#FB0000"></b1></b0></font> has been nested inside formatting zero.<strong><end segment</strong>
-</pre>
-  <hr>
-
-  <h3><a name="tag-overlapping" id="tag-overlapping"></a>Tag group
-  overlapping</h3>
-
-  <p>Overlapping is the result of bad manipulations of tag pairs and will
-  certainly result in formatting corruption and sometimes in the translating
-  file not opening at all. Example:</p>
-  <pre>
- <strong><segment 0001></strong><font color=
-"#FB0000"><b0></font>Formatting<font color=
-"#FB0000"></b0></font> <font color=
-"#FB0000"><b1></font>one<font color=
-"#FB0000"></b1></font> is going to be messed up.<strong><end segment></strong>
-</pre>
-
-  <p>After bad manipulation:</p>
-  <pre>
- <strong><segment 0001></strong><font color=
-"#FB0000"><b0></font>Formatting <font color=
-"#FB0000"><b1></font>one<font color=
-"#FB0000"></b0></font> <font color=
-"#FB0000"></b1></font>is very messed up now.<strong><end segment></strong>
-</pre>
-  <hr>
-
-  <h3><a name="tag_validation" id="tag_validation"></a>Tag group
-  validation</h3>
-
-  <p>The validate tags function detects changed tags (whether done deliberately
-  or by accident), and shows the affected segments. Starting this function - by
-  pressing Ctrl+T - will open a window containing all segments in the file that
-  may have suspected broken or bad tags in the translation. Bugs in the
-  translated tagged text are often a problem in OpenDocument or OpenOffice.org
-  files as they may not open due to tag problems created in the process of
-  translation. Fixing the tags and recreating the target documents is easy with
-  the validate tags function. The window, that opens on pressing Ctrl+T,
-  features a 3 column table with a link to the segment, the original
-  segment and the target segment:</p><br>
-
-  <table align="center" border="1" width="80%" summary="">
-    <tbody>
-      <tr>
-        <td>1</td>
-
-        <td>A different display font can be selected via the
-        <strong><font color="blue"><b0></font></strong>Display
-        Font<strong><font color="blue"></b0></font></strong> dialog. Open
-        it via the <strong><font color=
-        "blue"><i1></font></strong>Settings<strong><font color=
-        "blue"></i1></font></strong> > <strong><font color=
-        "blue"><i2></font></strong>Display Font...<strong><font color=
-        "blue"></i2></font></strong> menu item. The font type and size
-        can be changed from the dialog.</td>
-
-        <td>'n Mens kan 'n ander vertoonfont kies met die <strong><font color=
-        "blue"><b0></font></strong>Vertoonfont<strong><font color=
-        "blue"></b0></font></strong>-dialoogkassie. Kies
-        <strong><font color=
-        "blue"><i1></font></strong>Opstelling<strong><font color=
-        "blue"></i1></font></strong> > Vertoonfont... op die kieslys.
-        Die lettertipe én die lettergrootte kan met dié dialoogkassie verander
-        word.</td>
-      </tr>
-    </tbody>
-  </table>
-
-  <p>The tags are highlighted in bold blue for easy comparison between the
-  original and the translated contents. Click on the link to activate the
-  segment in the Editor. Correct the error if necessary and press
-  <code><a href="menu.html#shortcuts">Ctrl+T</a></code> to return to the tag
-  validation window to correct other errors. <a href="#intro">Tag</a> errors
-  are <a href="#tag_operation">tag manipulations</a> in the translation that do
-  not reproduce the same tag order and number as in the original segment. Some
-  tag manipulations are necessary and are benign, some will cause problems when
-  the translated document is created.</p>
-  <hr>
-
-  <h3><a name="tag_hints" id="tag_hints"></a>Hints for tags management</h3>
-
-  <p>Tags generally represent some kind of formatting of the original text.
-  <strong>Simplifying the original text formatting</strong> greatly contributes
-  to reducing the number of tags. Unifying used fonts, font sizes, colors etc
-  should be considered if possible as it could simplify the translation and
-  reduce the possibility for tag errors. Take a look at the <a href=
-  "#tag_operation">Tag operations</a> section to see what can be done with
-  tags. Remember that if tags bother you and formatting is not extremely
-  relevant for the current translation, removing tags may be the easiest way
-  out of problems.</p>
-
-  <p>If you need to see tags in OmegaT but do not need to retain most of the
-  format in the translated document you are free not to include tags in the
-  translation. In this case <strong>pay extra attention to tag pairs</strong>
-  since deleting one side of the pair but forgetting to delete the other one
-  will certainly corrupt your document's formatting. Since tags are included in
-  the text itself, it is possible to use <a href=
-  "segmentation.html">Segmentation rules</a> to create segments with less tags.
-  This is an advanced feature and some experience is required if you want to
-  apply it properly.</p>
-
-  <p><strong>Important:</strong> OmegaT is not yet able to detect mistakes in
-  formatting fully automatically, so it will not prompt you if you make an
-  error or change formatting to fit your target language better. Sometimes,
-  however, your translated file may look strange, and in case of OpenDocument /
-  OpenOffice.org files it may even refuse to open.</p>
-
-  <hr>
-
-  <h3><a name="printf"></a>printf-placeholders</h3>
-
-  <p>In some programming languages (e.g. PHP, C) special tags are used as 
-  placeholders in strings that are used in combination with the printf-function.
-  E.g.:
-  </p>
-  <pre>$var =_("cool");
-echo printf(_("OmegaT is very %s"),$var);</pre>
-
-  <p>If the text strings are extracted from this source code (e.g. via the 
-  PO-filter), OmegaT does not replace these variables with tags, because it 
-  cannot know for certain if e.g. <code>%s</code> is actually a placeholder or 
-  just a part of a text. You can however enable validation of these placeholders.
-  Select <strong>Options→ Tag Validation...</strong> from the menu. You can choose 
-  between simple and full validation.</p>
-
-  <p>The official syntax for printf-variables is</p>
-  <pre>"%" [ARGUMENTSWAPSPECIFIER] [SIGNSPECIFIER] [PADDINGSPECIFIER] [ALIGNMENTSPECIFIER] [WIDTHSPECIFIER] [PRECISIONSPECIFIER] TYPESPECIFIER</pre>
-
-  <p>Full validation fully supports this format, except for the 
-  <code>WIDTHSPECIFIER</code>.
-  In simple validation the following syntax is checked:</p>
-  <pre>"%" [ARGUMENTSWAPSPECIFIER] [PRECISIONSPECIFIER] TYPESPECIFIER</pre>
-
-  <p>You can change the order of the placeholders, but then you have to add the 
-  ARGUMENTSWAPSPECIFIER if it is not there yet. This means adding a sequence 
-  number and a dollar sign after the <code>%</code>. E.g. 
-  <code>"%s is a %s application"</code> equals 
-  <code>"%1$s is a %2$s application"</code> which you can translate with 
-  <code>"a %2$s application is %1$s"</code>.
-  </p>
-  <hr>
-
-  <table style="width: 100%;" summary="just formatting" border="0" cellpadding=
-  "2" cellspacing="2">
-    <tbody>
-      <tr>
-        <td style="text-align: left;"><a href="legalNotices.html">Legal
-        notices</a></td>
-
-        <td style="text-align: center;"><a href="index.html">Home</a></td>
-
-        <td style="text-align: right;"><a href="xindex.html">Index of
-        contents</a></td>
-      </tr>
-    </tbody>
-  </table>
-</body>
-</html>
diff --git a/docs/en/glossaries.html b/docs/en/glossaries.html
deleted file mode 100644
index 9badfb6..0000000
--- a/docs/en/glossaries.html
+++ /dev/null
@@ -1,232 +0,0 @@
-<html>
-<head>
-  <link rel="stylesheet" href="./OmegaT.css" type="text/css">
-  <meta http-equiv="CONTENT-TYPE" content="text/html; charset=utf-8">
-  <title>Glossaries - OmegaT 2.0 User Manual</title>
-</head>
-<body>
-<h2>Glossaries</h2>
-<ul>
-  <li>
-    <p><a href="#usage">Usage</a></p>
-  </li>
-  <li>
-    <p><a href="#fileformat">File format</a></p>
-  </li>
-  <li>
-    <p><a href="#howtocreate">How to create
-glossaries</a></p>
-  </li>
-  <li>
-    <p><a href="#multiterm">Using Trados Multiterm</a></p>
-  </li>
-  <li>
-    <p><a href="#commonglossaryproblems">Common
-glossary problems</a></p>
-  </li>
-</ul>
-<p>Glossaries are files that are
-created and updated manually for
-use in OmegaT.</p>
-<p>If an OmegaT project contains
-one or more glossaries, any
-terms in the glossary which are also found in the active segment will
-be automatically displayed in the <a href="userInterface.html#Glossary">Glossary
-viewer</a>.</p>
-<hr>
-<h2><a name="usage" id="usage"></a>Usage</h2>
-<p>To use an existing glossary,
-simply place it in the <span style="font-style: italic;">/glossary</span>
-folder after creating the project. OmegaT automatically detects
-glossary files in this folder when a project is opened. Terms in the
-active segment which OmegaT finds in the glossary file(s) are displayed
-in the Glossary pane:</p>
-<p><img src="images/Glossary_pane.png" name="graphics1"
- alt="Glossary pane" id="graphics1"
- style="border: 0px"><br>
-</p>
-<br>
-The word before the = sign is the source term, and its translation is
-(or are) the words behind =. The vocabulary entry can have a comment
-added (see "transitive verb" for the second item). The
-glossary function only
-finds exact matches with the
-glossary entry (e.g. does not find inflected forms etc.). New
-terms can
-be added
-manually to the glossary file(s) during translation (for example in a
-text editor), but newly added terms will not be recognized until the
-project is reloaded.
-<hr>
-<h2><a name="fileformat" id="fileformat"></a>File
-format</h2>
-<p>Glossary files are simply plain
-text files containing
-three-column, tab-delimited lists with the source and target terms in
-the first and second columns respectively. The third column can be used
-for additional information. Glossary files can be either in
-system default encoding (and indicated by the extension <code>.tab</code>)
-or in UTF-8 (the extension <code>.utf8</code>).
-The Unicode encoding (UTF8) is to be preferred for obvious
-reasons.</p>
-<hr>
-<h2><a name="howtocreate" id="howtocreate"></a>How
-to create glossaries</h2>
-The method here is foolproof, when followed in a reasonably careful
-fashion. You
-need OpenOffice.org Writer for it, so - if you haven't already done so
-- download and install OpenOffice.org. Launch
-OpenOffice.org and open a new text document or launch "OpenOffice.org
-Writer".<br>
-<br>
-In the empty document, enter your glossary terms as follows:
-a source-language term, tabspace, the
-target-language term , tabspace, a comment or explanation for the item,
-and a Return. Tabspace is the tabulator key on the lefthand
-side of the keyboard. If you do not want to add any comments, you can
-drop the second tabspace. A "term" can be a single word or a whole
-phrase. On the second line, enter the second term and its translation.<br>
-<br>
-When you have finished entering the terms, you will have two "columns"
-of terms, source-language terms on the left and their target-language
-terms on the right, and possibly a third column, containing you
-comments and explanations, The tabspace (→
-in the example below) 
-and Enter (¶ ) characters can be made visible by
-clicking on the  ¶ icon  in the
-Writer's Standard
-writer bar. Here's a few lines of an English
--German
-glossary:<br>
-<br>
-<div style="font-family: Courier New,Courier,monospace;">   
-word →Wort→das (-/e/s, Wörter/-e)¶</div>
-<div style="font-family: Courier New,Courier,monospace;">   
-small house→Häuschen→das,
-(pl Häuschen)¶</div>
-<div style="font-family: Courier New,Courier,monospace;">   
-dog →Hund→m, f Hündin ¶</div>
-<div style="font-family: Courier New,Courier,monospace;">   
-horse→Pferd→n, m Hengst f Stute n Fohlen¶</div>
-<br>
-Do NOT use OpenOffice.org's "columns"
-function to create columns:  just separate each source and
-target-language term pair with a single
-tabspace.<br>
-<br>
-When you are finished with the entries, Select <span
- style="font-style: italic;">File >
-Save As</span>.
-In the "File location" box, enter a name for your glossary file,
-followed by the extension "<span style="font-weight: bold;">.utf8</span>"
-(e.g.
-"<span style="font-style: italic;">MyGlossary.utf8</span>"). For
-"<span style="font-style: italic;">Filter</span>",
-select "<span style="font-style: italic;">Text
-Encoded (.txt.)</span>". 
-Uncheck the
-"<span style="font-style: italic;">Automatic
-file name extension</span>" box and
-activate "<span style="font-style: italic;">Edit
-filter settings</span>":<br>
-<br>
-<img alt="save file as dialog for the glossary"
- src="images/saveglossary.png"><br>
-<br>
-Confirm with OK. A dialog box appears with two options:  "<span
- style="font-style: italic;">Keep current format</span>"
-and 
-"<span style="font-style: italic;">Save in ODF format</span>".
-Select "<span style="font-style: italic;">Keep current format</span>"
-to save in
-text encoded file format. In the ASCII Filter Options dialog
-(see below), select "<span style="font-style: italic;">Unicode
-(UTF-8)</span>" as the character set:<br>
-<br>
-<img alt="ascii file filter options for glossary"
- src="./images/AsciiFilteroptions.png"><br>
-<br>
- Confirm with OK.<br>
-<br>
- After creating an OmegaT project, copy or move this file into the
- project's <span style="font-style: italic;">\glossary</span>
- folder. If the project is already open, reload it
- after copying the glossary file. You can make changes to a
- glossary file whilst it is being used in project. Glossary changes
- are being detected approximately once every second and modifications
- loaded transparently in the background, so there's no need to reload
- the project after saving the new glossary file.<br> 
-<br>
- When a segment containing a source-text term is opened, the
- glossary pane will display glossary entries for those items in the
- source segment that can be found in the glossary (or glossaries - you
- can have more than one available, and they can be stored in subfolders of <i>glossary</i> as well).
-<h3><a name="multiterm" id="multiterm"></a>Using
-Trados Multiterm</h3>
-<p>Glossaries created using Trados
-Multiterm's text export
-function for example can be used as OmegaT glossaries without further
-modification, provided they are given the file extension <code>.tab</code>
-and the source and target term fields are the first two fields
-respectively. If you export using the system option "Tab-delimited
-export", you will need to delete the first 5 columns (Seq. Nr, Date
-created etc) before the two items of interest.</p>
-<hr>
-<h2><a name="commonglossaryproblems" id="commonglossaryproblems"></a>Common
-glossary
-problems</h2>
-<dl>
-  <dt><span style="font-weight: bold;">Problem: </span>No
-glossary terms
-are displayed.</dt>
-  <dd>Possible causes:</dd>
-</dl>
-<ul>
-  <li>no glossary file in the
-"glossary" folder</li>
-  <li>glossary file is empty</li>
-  <li>the items are not separated
-with a TAB character</li>
-  <li>the glossary file does not
-have the correct extension (.tab
-or .utf8)</li>
-  <li>There is not an EXACT match
-between the glossary entry and the source text in your document - for
-instance when the item is in plural</li>
-  <li>the glossary file does not
-have the correct encoding</li>
-  <li>there are no terms in the
-active segment which match any
-terms in the glossary</li>
-  <li>one or more of the above
-problems may have been fixed, but
-the project has not been reloaded.</li>
-</ul>
-<dl>
-  <dt><span style="font-weight: bold;">Problem: </span>In
-the glossary
-pane, some characters are not
-displayed properly (but the same characters are displayed properly in
-the Editing pane).</dt>
-  <dd>Possible causes:</dd>
-</dl>
-<ul>
-  <li>the extension and
-the file encoding do not match.</li>
-</ul>
-  <hr>
-  <table style="width: 100%;" border="0" cellpadding="2" cellspacing="2" summary="just formatting">
-    <tbody>
-      <tr>
-        <td style="text-align: left;"><a href="legalNotices.html">Legal
-notices</a> </td>
-        <td style="text-align: center;"><a href="index.html">Home</a>
-        </td>
-        <td style="text-align: right;"><a href="xindex.html">Index of
-contents</a> </td>
-      </tr>
-    </tbody>
-  </table>
-
-</body>
-</html>
diff --git a/docs/en/images/AsciiFilteroptions.png b/docs/en/images/AsciiFilteroptions.png
index 039a0a2..0040afe 100644
Binary files a/docs/en/images/AsciiFilteroptions.png and b/docs/en/images/AsciiFilteroptions.png differ
diff --git a/docs/en/images/EditingBehaviourOptions.png b/docs/en/images/EditingBehaviourOptions.png
new file mode 100644
index 0000000..3fb7fa2
Binary files /dev/null and b/docs/en/images/EditingBehaviourOptions.png differ
diff --git a/docs/en/images/Glossary_pane.png b/docs/en/images/Glossary_pane.png
index fc1328d..41fe008 100644
Binary files a/docs/en/images/Glossary_pane.png and b/docs/en/images/Glossary_pane.png differ
diff --git a/docs/en/images/MatchStatistics.png b/docs/en/images/MatchStatistics.png
new file mode 100644
index 0000000..7297bf5
Binary files /dev/null and b/docs/en/images/MatchStatistics.png differ
diff --git a/docs/en/images/MatchesPane.png b/docs/en/images/MatchesPane.png
index e687be3..3bf219b 100644
Binary files a/docs/en/images/MatchesPane.png and b/docs/en/images/MatchesPane.png differ
diff --git a/docs/en/images/MultiTerm_Glossary.png b/docs/en/images/MultiTerm_Glossary.png
new file mode 100644
index 0000000..5cfbba7
Binary files /dev/null and b/docs/en/images/MultiTerm_Glossary.png differ
diff --git a/docs/en/images/OmT_Cyrillic.png b/docs/en/images/OmT_Cyrillic.png
new file mode 100644
index 0000000..fd74105
Binary files /dev/null and b/docs/en/images/OmT_Cyrillic.png differ
diff --git a/docs/en/images/OmT_Japanese.png b/docs/en/images/OmT_Japanese.png
new file mode 100644
index 0000000..b760d89
Binary files /dev/null and b/docs/en/images/OmT_Japanese.png differ
diff --git a/docs/en/images/OmegaT_panes.png b/docs/en/images/OmegaT_panes.png
index 250f657..1b823a1 100644
Binary files a/docs/en/images/OmegaT_panes.png and b/docs/en/images/OmegaT_panes.png differ
diff --git a/docs/en/images/SpellcheckingText.png b/docs/en/images/SpellcheckingText.png
index 3f0f7b9..44f1648 100644
Binary files a/docs/en/images/SpellcheckingText.png and b/docs/en/images/SpellcheckingText.png differ
diff --git a/docs/en/images/TagValidation.png b/docs/en/images/TagValidation.png
new file mode 100644
index 0000000..e109554
Binary files /dev/null and b/docs/en/images/TagValidation.png differ
diff --git a/docs/en/images/TextSearch.png b/docs/en/images/TextSearch.png
index 9d83c87..428a4e9 100644
Binary files a/docs/en/images/TextSearch.png and b/docs/en/images/TextSearch.png differ
diff --git a/docs/en/images/saveglossary.png b/docs/en/images/saveglossary.png
index 74c69ae..9923673 100644
Binary files a/docs/en/images/saveglossary.png and b/docs/en/images/saveglossary.png differ
diff --git a/docs/en/index.html b/docs/en/index.html
index 44007d7..9c3d64e 100644
--- a/docs/en/index.html
+++ b/docs/en/index.html
@@ -1,179 +1,356 @@
 <html>
-<head>
-  <link rel="stylesheet" href="./OmegaT.css" type="text/css">
-  <meta http-equiv="content-type" content="text/html; charset=utf-8">
-
-  <title>OmegaT 2.0 - Table of Contents</title>
-</head>
-
-<body>
-  <h2>OmegaT 2.0 User Manual - Table of Contents</h2>
-  <hr>
-
-  <h3><a href="./aboutOmegaT.html">About OmegaT</a><br></h3>
-
-  <h3><a href="./installingAndRunning.html">Installing and running
-  OmegaT</a></h3>
-
-  <table border="0" width="100%" summary="just formatting">
-    <tr>
-      <td valign="top">
-        <h3>Basics</h3>
-
-        <dl>
-          <dt><a href="./instantStartGuide.html">Start using OmegaT in 5
-          minutes!</a></dt>
-
-          <dd>→ a tutorial with links to all the other parts of the
-          manual.</dd>
-
-          <dt><a href="./userInterface.html">The user interface</a></dt>
-
-          <dd>→ all the windows and dialogs</dd>
-
-          <dt><a href="./menu.html">Main menu and shortcuts</a></dt>
-
-          <dd>→ all the functions available from the main menu and their
-          shortcuts</dd>
-
-          <dt><a href="./filesToTranslate.html">Files to translate</a></dt>
-
-          <dd>→ supported file formats, converters, right-to-left language
-          issues</dd>
-
-          <dt><a href="./plainText.html">Working with plain text</a></dt>
-
-          <dd>→ plain text files specific encoding issues</dd>
-
-          <dt><a href="./formattedText.html">Working with formatted
-          texts</a></dt>
-
-          <dd>→ tags, tag operations and validation</dd>
-
-          <dt><a href="./translationMemories.html">Translation
-          memories</a></dt>
-
-          <dd>→ project translation memories, external memories, memory
-          exchanges</dd>
-
-          <dt><a href="./glossaries.html">Glossaries</a>, <a href=
-          "./dictionaries.html">Dictionaries</a></dt>
-
-          <dd>→ Creating and Using Glossaries and Vocabularies</dd>
-
-          <dt><a href="./GoogleTranslate.html">Machine Translation</a></dt>
-
-          <dd>→ getting segments machine-translated by Google Translate</dd>
-
-          <dt><a href="./searches.html">Searches</a></dt>
-
-          <dd>→ search parameters and wild cards use</dd>
-
-          <dt><a href="spellchecker.html">Spell checker</a></dt>
-
-          <dd>→ checking the spelling while translating</dd>
-
-          <dt><a href="preventingDataLoss.html">Preventing data loss</a></dt>
-
-          <dd>→ backups and data restoration</dd>
-        </dl>
-      </td>
-
-      <td valign="top">
-        <h3>Customizing OmegaT</h3>
-
-        <dl>
-          <dt><a href="./projectProperties.html">Project properties</a></dt>
-
-          <dd>→ folder organization, language settings</dd>
-
-          <dt><a href="./fontSettings.html">Font settings</a></dt>
-
-          <dd>→ main windows display font</dd>
-
-          <dt><a href="./fileFilters.html">File filters</a></dt>
-
-          <dd>→ source and target files handling</dd>
-
-          <dt><a href="./segmentation.html">Source segmentation</a></dt>
-
-          <dd>→ per source language, generic segmentation</dd>
-
-          <dt><a href="./translationEditing.html">Editing field
-          behaviour</a></dt>
-
-          <dd>→ automatic target insertion</dd>
-
-          <dd><a href="translationEditing.html"></a></dd>
-        </dl>
-
-        <h3>Appendices</h3>
-
-        <dl>
-          <dt><a href="filesAndDirectories.html">Files and directories</a></dt>
-
-          <dd>→ all the files and directories used by OmegaT</dd>
-
-          <dt><a href="./languages.html">Languages and language codes</a></dt>
-
-          <dd>→ for project language properties as well as segmentation
-          rules</dd>
-
-          <dt><a href="./regexp.html">Regular expressions</a></dt>
-
-          <dd>→ for searches as well as segmentation rules</dd>
-
-          <dt><a href="./commandlineArguments.html">Command line arguments</a></dt>
-
-          <dd>→ starting OmegaT with different settings and actions</dd>
-
-          <dt><a href="./consoleMode.html">Console mode</a></dt>
-
-          <dd>→ for translating using OmegaT in scripts (without the GUI)</dd>
-
-          <dt><a href="./website.html">OmegaT on the Web</a></dt>
-
-          <dd>→ user support, development, contributions</dd>
-        </dl>
-      </td>
-    </tr>
-  </table>
-  <hr>
-
-  <h3>Credits</h3>
-
-  <p>This user manual is the joint work of Jean-Christophe Helary, Samuel
-  Murray, Maxym Mykhalchuk, Henry Pijffers and Vito Smolej.</p>
-
-  <p>It would not have been possible to write such a manual from scratch
-  without the original documentation that Marc Prior has authored and
-  maintained until OmegaT version 1.4.2, Dmitri Gabinski has updated for OmegaT
-  version 1.4.4, and without the input from the user list and the support of
-  the many people who participate to the development of OmegaT. Let us extend
-  our thanks to all the people in the OmegaT community for their energy and
-  inspiration.</p>
-
-  <h3>Contact</h3>
-
-  <p>This manual is not perfect and will be modified over the course of time
-  and following the evolution of OmegaT. If you notice discrepancies between
-  what is described here and OmegaT's behaviour do not hesitate to contact Vito
-  Smolej at vitosmolej AT users DOT sourceforge DOT net.</p>
-  <hr>
-
-  <table style="width: 100%;" border="0" cellpadding="2" cellspacing="2"
-  summary="just formatting">
-    <tbody>
-      <tr>
-        <td style="text-align: left;"><a href="legalNotices.html">Legal
-        notices</a></td>
-
-        <td style="text-align: center;"><a href="index.html">Home</a></td>
-
-        <td style="text-align: right;"><a href="xindex.html">Index of
-        contents</a></td>
-      </tr>
-    </tbody>
-  </table>
-</body>
-</html>
+   <head>
+      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+   
+      <title>OmegaT - User's Guide</title>
+      <link rel="stylesheet" href="OmegaT.css" type="text/css">
+      <meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+      <meta name="description" content="This document is the official user's guide to OmegaT, the free Computer Aided Translation tool. It also contains installation instructions.">
+      <link rel="home" href="index.html" title="OmegaT - User's Guide">
+      <link rel="next" href="chapter.about.OmegaT.html" title="Chapter 1. About OmegaT - introduction">
+   </head>
+   <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+      <div class="navheader">
+         <table width="100%" summary="Navigation header">
+            <tr>
+               <th colspan="3" align="center">OmegaT - User's Guide</th>
+            </tr>
+            <tr>
+               <td width="20%" align="left"> </td>
+               <th width="60%" align="center"> </th>
+               <td width="20%" align="right"> <a accesskey="n" href="chapter.about.OmegaT.html">Next</a></td>
+            </tr>
+         </table>
+         <hr>
+      </div>
+      <div lang="en" class="book" title="OmegaT - User's Guide">
+         <div class="titlepage">
+            <div>
+               <div>
+                  <h1 class="title"><a name="d0e1"></a>OmegaT - User's Guide
+                  </h1>
+               </div>
+               <div>
+                  <div class="author">
+                     <h3 class="author"><span class="firstname">Vito</span> <span class="surname">Smolej</span></h3>
+                  </div>
+               </div>
+               <div>
+                  <p class="pubdate">07/09/2011</p>
+               </div>
+               <div>
+                  <div class="abstract" title="Abstract">
+                     <p class="title"><b>Abstract</b></p>
+                     <p>This document is the official user's guide to OmegaT, the free Computer Aided Translation tool. It also contains installation
+                        instructions.
+                     </p>
+                  </div>
+               </div>
+            </div>
+            <hr>
+         </div>
+         <div class="toc">
+            <p><b>Table of Contents</b></p>
+            <dl>
+               <dt><span class="chapter"><a href="chapter.about.OmegaT.html">1. About <span class="application">OmegaT</span> - introduction</a></span></dt>
+               <dd>
+                  <dl>
+                     <dt><span class="section"><a href="chapter.about.OmegaT.html#OmegaT-Highlists">1. OmegaT highlights</a></span></dt>
+                     <dt><span class="section"><a href="chapter.about.OmegaT.html#OmegaT.chapters.summary">2. Summary of chapters</a></span></dt>
+                  </dl>
+               </dd>
+               <dt><span class="chapter"><a href="chapter.instant.start.guide.html">2. Instant Start Guide</a></span></dt>
+               <dd>
+                  <dl>
+                     <dt><span class="section"><a href="chapter.instant.start.guide.html#d0e184">1. Start Using <span class="application">OmegaT</span> in 5 Minutes!</a></span></dt>
+                     <dt><span class="section"><a href="chapter.instant.start.guide.html#d0e226">2. Translating with <span class="application">OmegaT</span></a></span></dt>
+                     <dt><span class="section"><a href="chapter.instant.start.guide.html#how.to.handle.tagged.text">3. Handling tagged text</a></span></dt>
+                  </dl>
+               </dd>
+               <dt><span class="chapter"><a href="chapter.installing.and.running.html">3. Installing and running <span class="application">OmegaT</span></a></span></dt>
+               <dd>
+                  <dl>
+                     <dt><span class="section"><a href="chapter.installing.and.running.html#d0e779">1. Windows Users</a></span></dt>
+                     <dt><span class="section"><a href="chapter.installing.and.running.html#Linux.Intel.users">2. Linux (Intel) Users</a></span></dt>
+                     <dt><span class="section"><a href="chapter.installing.and.running.html#MAC.OSX.users">3. Mac OS X Users</a></span></dt>
+                     <dt><span class="section"><a href="chapter.installing.and.running.html#other.systems">4. Other Systems</a></span></dt>
+                     <dt><span class="section"><a href="chapter.installing.and.running.html#using.Java.Web.Start">5. Using Java Web Start</a></span></dt>
+                     <dt><span class="section"><a href="chapter.installing.and.running.html#d0e1460">6. Starting OmegaT from the command line</a></span></dt>
+                     <dt><span class="section"><a href="chapter.installing.and.running.html#building.OmegaT.from.source">7. Building <span class="application">OmegaT</span> From Source</a></span></dt>
+                  </dl>
+               </dd>
+               <dt><span class="chapter"><a href="chapter.user.interface.html">4. The user interface</a></span></dt>
+               <dd>
+                  <dl>
+                     <dt><span class="section"><a href="chapter.user.interface.html#user.interface.items">1. User interface items</a></span></dt>
+                     <dt><span class="section"><a href="chapter.user.interface.html#OmegaT.main.window">2. <span class="application">OmegaT</span> main window</a></span></dt>
+                     <dt><span class="section"><a href="chapter.user.interface.html#other.windows">3. Other windows</a></span></dt>
+                  </dl>
+               </dd>
+               <dt><span class="chapter"><a href="chapter.menu.html">5. Menu and Keyboard shortcuts</a></span></dt>
+               <dd>
+                  <dl>
+                     <dt><span class="section"><a href="chapter.menu.html#ch04.main.menu">1. Main Menu</a></span></dt>
+                     <dt><span class="section"><a href="chapter.menu.html#submenu.Project">2. Project</a></span></dt>
+                     <dt><span class="section"><a href="chapter.menu.html#d0e3107">3. Edit</a></span></dt>
+                     <dt><span class="section"><a href="chapter.menu.html#submenu.GoTo">4. Go to</a></span></dt>
+                     <dt><span class="section"><a href="chapter.menu.html#submenu.View">5. View</a></span></dt>
+                     <dt><span class="section"><a href="chapter.menu.html#submenu.Tools">6. Tools</a></span></dt>
+                     <dt><span class="section"><a href="chapter.menu.html#submenu.Options">7. Options</a></span></dt>
+                     <dt><span class="section"><a href="chapter.menu.html#submenu.Help">8. Help</a></span></dt>
+                     <dt><span class="section"><a href="chapter.menu.html#keyboard.shortcuts">9. Keyboard shortcuts</a></span></dt>
+                  </dl>
+               </dd>
+               <dt><span class="chapter"><a href="chapter.project.properties.html">6. Project properties</a></span></dt>
+               <dd>
+                  <dl>
+                     <dt><span class="section"><a href="chapter.project.properties.html#properties.dialog">1. Properties dialog</a></span></dt>
+                     <dt><span class="section"><a href="chapter.project.properties.html#language.modification">2. Modifying project properties</a></span></dt>
+                  </dl>
+               </dd>
+               <dt><span class="chapter"><a href="chapter.file.filters.html">7. File Filters</a></span></dt>
+               <dd>
+                  <dl>
+                     <dt><span class="section"><a href="chapter.file.filters.html#file.filters.dialog">1. File filters dialog</a></span></dt>
+                     <dt><span class="section"><a href="chapter.file.filters.html#filters.options">2. Filter options</a></span></dt>
+                     <dt><span class="section"><a href="chapter.file.filters.html#edit.filter.dialog">3. Edit filter dialog</a></span></dt>
+                  </dl>
+               </dd>
+               <dt><span class="chapter"><a href="chapter.files.and.directories.html">8. <span class="application">OmegaT</span> Files and Directories</a></span></dt>
+               <dd>
+                  <dl>
+                     <dt><span class="section"><a href="chapter.files.and.directories.html#translation.project.files">1. Translation project files</a></span></dt>
+                     <dt><span class="section"><a href="chapter.files.and.directories.html#user.files">2. User files</a></span></dt>
+                     <dt><span class="section"><a href="chapter.files.and.directories.html#application.files">3. Application files</a></span></dt>
+                  </dl>
+               </dd>
+               <dt><span class="chapter"><a href="chapter.files.to.translate.html">9. Files to translate</a></span></dt>
+               <dd>
+                  <dl>
+                     <dt><span class="section"><a href="chapter.files.to.translate.html#file.formats">1. File formats</a></span></dt>
+                     <dt><span class="section"><a href="chapter.files.to.translate.html#other.file.formats">2. Other file formats</a></span></dt>
+                     <dt><span class="section"><a href="chapter.files.to.translate.html#right.to.left.languages">3. Right to left languages</a></span></dt>
+                  </dl>
+               </dd>
+               <dt><span class="chapter"><a href="chapter.translation.editing.html">10. Editing behavior</a></span></dt>
+               <dd>
+                  <dl>
+                     <dt><span class="section"><a href="chapter.translation.editing.html#automatic.match.insertion">1. Automatic match insertion</a></span></dt>
+                     <dt><span class="section"><a href="chapter.translation.editing.html#allow.translation.equal.to.source">2. Allow the translation to be equal to source</a></span></dt>
+                     <dt><span class="section"><a href="chapter.translation.editing.html#export.segment.to.text.files">3. Export the segment to text files</a></span></dt>
+                  </dl>
+               </dd>
+               <dt><span class="chapter"><a href="chapter.font.html">11. Font settings</a></span></dt>
+               <dd>
+                  <dl>
+                     <dt><span class="section"><a href="chapter.font.html#section.font.settings">1. Font settings</a></span></dt>
+                  </dl>
+               </dd>
+               <dt><span class="chapter"><a href="chapter.formatted.text.html">12. Working with formatted text</a></span></dt>
+               <dd>
+                  <dl>
+                     <dt><span class="section"><a href="chapter.formatted.text.html#formatting.tags">1. Formatting tags</a></span></dt>
+                     <dt><span class="section"><a href="chapter.formatted.text.html#tag.operations">2. Tag operations</a></span></dt>
+                     <dt><span class="section"><a href="chapter.formatted.text.html#tag.group.nesting">3. Tag group nesting</a></span></dt>
+                     <dt><span class="section"><a href="chapter.formatted.text.html#tag.group.overlapping">4. Tag group overlapping</a></span></dt>
+                     <dt><span class="section"><a href="chapter.formatted.text.html#tag.group.validation">5. Tag group validation</a></span></dt>
+                     <dt><span class="section"><a href="chapter.formatted.text.html#hints.for.tag.management">6. Hints for tags management</a></span></dt>
+                  </dl>
+               </dd>
+               <dt><span class="chapter"><a href="chapter.plain.text.html">13. Working with plain text</a></span></dt>
+               <dd>
+                  <dl>
+                     <dt><span class="section"><a href="chapter.plain.text.html#default.encoding">1. Default encoding</a></span></dt>
+                     <dt><span class="section"><a href="chapter.plain.text.html#OmegaT.solution">2. The <span class="application">OmegaT</span> solution</a></span></dt>
+                  </dl>
+               </dd>
+               <dt><span class="chapter"><a href="chapter.translation.memories.html">14. Translation memories</a></span></dt>
+               <dd>
+                  <dl>
+                     <dt><span class="section"><a href="chapter.translation.memories.html#OmegaT.and.tmx.files">1. Translation memories in OmegaT</a></span></dt>
+                     <dt><span class="section"><a href="chapter.translation.memories.html#using.translation.memories.from.previous.projects">2. Reusing translation memories</a></span></dt>
+                     <dt><span class="section"><a href="chapter.translation.memories.html#pseudo.translated.memory">3. Pseudo-translated memory</a></span></dt>
+                     <dt><span class="section"><a href="chapter.translation.memories.html#upgrading.translation.memories">4. Upgrading translation memories</a></span></dt>
+                  </dl>
+               </dd>
+               <dt><span class="chapter"><a href="chapter.segmentation.html">15. Source segmentation</a></span></dt>
+               <dd>
+                  <dl>
+                     <dt><span class="section"><a href="chapter.segmentation.html#segmentation.rules">1. Segmentation rules</a></span></dt>
+                     <dt><span class="section"><a href="chapter.segmentation.html#rules.priority">2. Rule priority</a></span></dt>
+                     <dt><span class="section"><a href="chapter.segmentation.html#creating.new.rule">3. Creating a new rule</a></span></dt>
+                     <dt><span class="section"><a href="chapter.segmentation.html#few.simple.examples">4. A few simple examples</a></span></dt>
+                  </dl>
+               </dd>
+               <dt><span class="chapter"><a href="chapter.regexp.html">16. Regular expressions</a></span></dt>
+               <dd>
+                  <dl>
+                     <dt><span class="section"><a href="chapter.regexp.html#regex.tools.and.examples.of.use">1. Regex tools and examples of use</a></span></dt>
+                  </dl>
+               </dd>
+               <dt><span class="chapter"><a href="chapter.searches.html">17. Searches</a></span></dt>
+               <dd>
+                  <dl>
+                     <dt><span class="section"><a href="chapter.searches.html#search.window">1. Search window</a></span></dt>
+                     <dt><span class="section"><a href="chapter.searches.html#using.wild.cards">2. Using wild cards</a></span></dt>
+                     <dt><span class="section"><a href="chapter.searches.html#search.methoids">3. Search methods</a></span></dt>
+                     <dt><span class="section"><a href="chapter.searches.html#search.result.display">4. Search results display</a></span></dt>
+                  </dl>
+               </dd>
+               <dt><span class="chapter"><a href="chapter.dictionaries.html">18. Dictionaries</a></span></dt>
+               <dd>
+                  <dl>
+                     <dt><span class="section"><a href="chapter.dictionaries.html#d0e7386">1. How to download and install dictionaries</a></span></dt>
+                     <dt><span class="section"><a href="chapter.dictionaries.html#d0e7494">2. Problems with dictionaries</a></span></dt>
+                  </dl>
+               </dd>
+               <dt><span class="chapter"><a href="chapter.glossaries.html">19. Glossaries</a></span></dt>
+               <dd>
+                  <dl>
+                     <dt><span class="section"><a href="chapter.glossaries.html#d0e7551">1. Usage</a></span></dt>
+                     <dt><span class="section"><a href="chapter.glossaries.html#d0e7599">2. File format</a></span></dt>
+                     <dt><span class="section"><a href="chapter.glossaries.html#d0e7623">3. How to create glossaries</a></span></dt>
+                     <dt><span class="section"><a href="chapter.glossaries.html#d0e7721">4. Using Trados Multiterm</a></span></dt>
+                     <dt><span class="section"><a href="chapter.glossaries.html#d0e7739">5. Common glossary problems</a></span></dt>
+                  </dl>
+               </dd>
+               <dt><span class="chapter"><a href="chapter.machine.translate.html">20. Machine Translation</a></span></dt>
+               <dd>
+                  <dl>
+                     <dt><span class="section"><a href="chapter.machine.translate.html#d0e7795">1. Introduction</a></span></dt>
+                     <dt><span class="section"><a href="chapter.machine.translate.html#introduction">2. Google Translate</a></span></dt>
+                     <dt><span class="section"><a href="chapter.machine.translate.html#d0e7825">3. <span class="application">OmegaT</span> users and Google
+                                  Translate</a></span></dt>
+                     <dt><span class="section"><a href="chapter.machine.translate.html#d0e7877">4. Belazar</a></span></dt>
+                     <dt><span class="section"><a href="chapter.machine.translate.html#d0e7889">5. Apertium</a></span></dt>
+                     <dt><span class="section"><a href="chapter.machine.translate.html#Google.Translate.troubleshooting">6. Machine translation - trouble shooting</a></span></dt>
+                  </dl>
+               </dd>
+               <dt><span class="chapter"><a href="chapter.spellchecker.html">21. Spell checker</a></span></dt>
+               <dd>
+                  <dl>
+                     <dt><span class="section"><a href="chapter.spellchecker.html#d0e7944">1. Installing spelling dictionaries</a></span></dt>
+                     <dt><span class="section"><a href="chapter.spellchecker.html#d0e8015">2. Using spelling dictionaries</a></span></dt>
+                     <dt><span class="section"><a href="chapter.spellchecker.html#hints">3. Hints</a></span></dt>
+                  </dl>
+               </dd>
+               <dt><span class="chapter"><a href="chapter.misc.html">22. Miscellaneous subjects</a></span></dt>
+               <dd>
+                  <dl>
+                     <dt><span class="section"><a href="chapter.misc.html#omegat.misc.console.mode">1. OmegaT Console Mode</a></span></dt>
+                     <dt><span class="section"><a href="chapter.misc.html#d0e8235">2. Automatic Java Properties Aligner</a></span></dt>
+                     <dt><span class="section"><a href="chapter.misc.html#font.settings">3. Font settings</a></span></dt>
+                     <dt><span class="section"><a href="chapter.misc.html#preventing.data.loss">4. Preventing data loss</a></span></dt>
+                  </dl>
+               </dd>
+               <dt><span class="appendix"><a href="appendix.website.html">A. OmegaT on the web</a></span></dt>
+               <dd>
+                  <dl>
+                     <dt><span class="section"><a href="appendix.website.html#OmegaT.sites.and.OmegaT.SourceForge.project">1. <span class="application">OmegaT</span> sites and
+                                  <span class="application">OmegaT</span> SourceForge project</a></span></dt>
+                     <dt><span class="section"><a href="appendix.website.html#bug.reports">2. Bug reports</a></span></dt>
+                     <dt><span class="section"><a href="appendix.website.html#contributing.to.omegat.project">3. Contributing to <span class="application">OmegaT</span> project</a></span></dt>
+                  </dl>
+               </dd>
+               <dt><span class="appendix"><a href="appendix.languages.html">B. Languages - ISO 639 code list
+                          
+                          
+                          
+                          </a></span></dt>
+               <dt><span class="appendix"><a href="appendix.keyboard.html">C. Keyboard shortcuts in the editor</a></span></dt>
+               <dt><span class="appendix"><a href="appendix.legal.notices.html">D. Legal notices</a></span></dt>
+               <dd>
+                  <dl>
+                     <dt><span class="section"><a href="appendix.legal.notices.html#legal.notices.for.documentation">1. For the documentation</a></span></dt>
+                     <dt><span class="section"><a href="appendix.legal.notices.html#legal.ntices.for.application">2. For the application</a></span></dt>
+                  </dl>
+               </dd>
+               <dt><span class="appendix"><a href="appendix.acknowledgements.html">E. Acknowledgements</a></span></dt>
+               <dd>
+                  <dl>
+                     <dt><span class="section"><a href="appendix.acknowledgements.html#d0e10154">1. Thank you all!</a></span></dt>
+                  </dl>
+               </dd>
+               <dt><span class="index"><a href="ix01.html">Index</a></span></dt>
+            </dl>
+         </div>
+         <div class="list-of-figures">
+            <p><b>List of Figures</b></p>
+            <dl>
+               <dt>2.1. <a href="chapter.instant.start.guide.html#New.project.dialog.window">New project - dialog window</a></dt>
+               <dt>2.2. <a href="chapter.instant.start.guide.html#d0e496">Matches pane</a></dt>
+               <dt>2.3. <a href="chapter.instant.start.guide.html#fig.tagged.segment.source">Source HTML segment</a></dt>
+               <dt>2.4. <a href="chapter.instant.start.guide.html#fig.tagged.segment.target">Target HTML segment</a></dt>
+               <dt>4.1. <a href="chapter.user.interface.html#d0e2301">OmegaT panes</a></dt>
+               <dt>4.2. <a href="chapter.user.interface.html#matches.pane">Matches pane</a></dt>
+               <dt>4.3. <a href="chapter.user.interface.html#glossary.pane">Glossary pane</a></dt>
+               <dt>4.4. <a href="chapter.user.interface.html#multiword.pane">multi-word entry in the glossary</a></dt>
+               <dt>4.5. <a href="chapter.user.interface.html#tag.validator.window">Tag validation window</a></dt>
+               <dt>6.1. <a href="chapter.project.properties.html#d0e4167">Project properties window</a></dt>
+               <dt>8.1. <a href="chapter.files.and.directories.html#OmegaT.projects.and.subdirectories">OmegaT projects and subdirectories</a></dt>
+               <dt>8.2. <a href="chapter.files.and.directories.html#OmegaT.project">OmegaT project</a></dt>
+               <dt>10.1. <a href="chapter.translation.editing.html#editing.behavior.options">Editing behavior options</a></dt>
+               <dt>12.1. <a href="chapter.formatted.text.html#tag.validation">Tag validation entry</a></dt>
+               <dt>16.1. <a href="chapter.regexp.html#regerx.tester">Regex Tester</a></dt>
+               <dt>17.1. <a href="chapter.searches.html#text.search.window">Text search Window</a></dt>
+               <dt>18.1. <a href="chapter.dictionaries.html#Dict.Merriam.Webster">Merriam Webster dictionary - use</a></dt>
+               <dt>19.1. <a href="chapter.glossaries.html#d0e7574">Glossary pane</a></dt>
+               <dt>19.2. <a href="chapter.glossaries.html#d0e7586">multiple words entries in glossaries - example</a></dt>
+               <dt>19.3. <a href="chapter.glossaries.html#d0e7681">Saving a glossary</a></dt>
+               <dt>20.1. <a href="chapter.machine.translate.html#moby.dick">Google Translate - example</a></dt>
+               <dt>21.1. <a href="chapter.spellchecker.html#spellchecker.setup">Spell checker setup</a></dt>
+               <dt>21.2. <a href="chapter.spellchecker.html#spellchecker.in.action">Spellchecker in action</a></dt>
+            </dl>
+         </div>
+         <div class="list-of-tables">
+            <p><b>List of Tables</b></p>
+            <dl>
+               <dt>4.1. <a href="chapter.user.interface.html#d0e2311">Pane widgets</a></dt>
+               <dt>4.2. <a href="chapter.user.interface.html#d0e2376">Main Window - counters</a></dt>
+               <dt>5.1. <a href="chapter.menu.html#table.main.menu">Main Menu</a></dt>
+               <dt>5.2. <a href="chapter.menu.html#d0e2968">Project menu</a></dt>
+               <dt>5.3. <a href="chapter.menu.html#d0e3117">Copy/cut/paste shortcuts</a></dt>
+               <dt>5.4. <a href="chapter.menu.html#d0e3162">Edit menu</a></dt>
+               <dt>5.5. <a href="chapter.menu.html#d0e3362">Go To menu</a></dt>
+               <dt>5.6. <a href="chapter.menu.html#d0e3479">View menu</a></dt>
+               <dt>5.7. <a href="chapter.menu.html#d0e3526">Tools menu</a></dt>
+               <dt>5.8. <a href="chapter.menu.html#d0e3580">Options menu</a></dt>
+               <dt>5.9. <a href="chapter.menu.html#d0e3704">Help menu</a></dt>
+               <dt>5.10. <a href="chapter.menu.html#d0e3787">Project management shortcuts</a></dt>
+               <dt>5.11. <a href="chapter.menu.html#d0e3867">Editing shortcuts</a></dt>
+               <dt>5.12. <a href="chapter.menu.html#d0e3992">Moving around shortcuts</a></dt>
+               <dt>5.13. <a href="chapter.menu.html#d0e4079">Various shortcuts</a></dt>
+               <dt>16.1. <a href="chapter.regexp.html#d0e6693">Regex - Flags</a></dt>
+               <dt>16.2. <a href="chapter.regexp.html#d0e6710">Regex - Character</a></dt>
+               <dt>16.3. <a href="chapter.regexp.html#d0e6787">Regex - Quotation</a></dt>
+               <dt>16.4. <a href="chapter.regexp.html#d0e6819">Regex - Classes for Unicode blocks and categories</a></dt>
+               <dt>16.5. <a href="chapter.regexp.html#d0e6862">Regex - Character classes</a></dt>
+               <dt>16.6. <a href="chapter.regexp.html#d0e6889">Regex - Predefined character classes</a></dt>
+               <dt>16.7. <a href="chapter.regexp.html#d0e6936">Regex - Boundary matchers</a></dt>
+               <dt>16.8. <a href="chapter.regexp.html#d0e6968">Regex - Greedy quantifiers</a></dt>
+               <dt>16.9. <a href="chapter.regexp.html#d0e7009">Regex - Reluctant (non-greedy) quantifiers</a></dt>
+               <dt>16.10. <a href="chapter.regexp.html#d0e7047">Regex - Logical operators</a></dt>
+               <dt>16.11. <a href="chapter.regexp.html#d0e7107">Regex - Examples of regular expressions in translations</a></dt>
+               <dt>B.1. <a href="appendix.languages.html#table.language.code.list">ISO 639-1/639-2 Language code list</a></dt>
+               <dt>C.1. <a href="appendix.keyboard.html#d0e9888">Key behavior in the editor</a></dt>
+            </dl>
+         </div>
+      </div>
+      <div class="navfooter">
+         <hr>
+         <table width="100%" summary="Navigation footer">
+            <tr>
+               <td width="40%" align="left"> </td>
+               <td width="20%" align="center"> </td>
+               <td width="40%" align="right"> <a accesskey="n" href="chapter.about.OmegaT.html">Next</a></td>
+            </tr>
+            <tr>
+               <td width="40%" align="left" valign="top"> </td>
+               <td width="20%" align="center"> </td>
+               <td width="40%" align="right" valign="top"> Chapter 1. About <span class="application">OmegaT</span> - introduction
+               </td>
+            </tr>
+         </table>
+      </div>
+   </body>
+</html>
\ No newline at end of file
diff --git a/docs/en/installingAndRunning.html b/docs/en/installingAndRunning.html
deleted file mode 100644
index bcd52f6..0000000
--- a/docs/en/installingAndRunning.html
+++ /dev/null
@@ -1,683 +0,0 @@
-<html>
-<head>
-  <link rel="stylesheet" href="./OmegaT.css" type="text/css">
-  <meta http-equiv="CONTENT-TYPE" content="text/html; charset=utf-8">
-
-  <title>About OmegaT - OmegaT 2.0 User Manual</title>
-</head>
-
-<body>
-  <h1>Installing and Running OmegaT</h1>Note: 2.0.x below indicates the latest
-  2.0 release of OmegaT.
-  <hr>
-
-  <table summary="just formatting" border="0" cellpadding="3" cellspacing="3">
-    <tbody>
-      <tr>
-        <td width="50%">
-          <h3><a href="#Linux_users">Linux (Intel) users</a></h3>
-
-          <ul>
-            <li>
-              <p><a href="#linux_which">Package to download</a></p>
-            </li>
-
-            <li>
-              <p><a href="#linux_install">Installation</a></p>
-            </li>
-
-            <li>
-              <p><a href="#linux_menu">OS menu setup</a></p>
-
-              <ul>
-                <li>
-                  <p><a href="#menu_kde">in KDE,</a></p>
-                </li>
-
-                <li>
-                  <p><a href="#menu_gnome">in GNOME</a></p>
-                </li>
-              </ul>
-            </li>
-
-            <li>
-              <p><a href="#linux_running">Running OmegaT</a></p>
-            </li>
-          </ul>
-        </td>
-
-        <td width="50%">
-          <h3><a href="#Windows_users">Windows users</a></h3>
-
-          <ul>
-            <li>
-              <p><a href="#windows_which">Package to download</a></p>
-            </li>
-
-            <li>
-              <p><a href="#windows_install">Installation</a></p>
-            </li>
-
-            <li>
-              <p><a href="#windows_menu">Windows menu setup</a></p>
-            </li>
-
-            <li>
-              <p><a href="#windows_running">Running OmegaT</a></p>
-            </li>
-          </ul>
-        </td>
-      </tr>
-
-      <tr>
-        <td width="50%">
-          <h3><a href="#MacOSX_users">Mac OS X users</a></h3>
-
-          <ul>
-            <li>
-              <p><a href="#osx_which">Package to download</a></p>
-            </li>
-
-            <li>
-              <p><a href="#osx_install">Installation</a></p>
-            </li>
-
-            <li>
-              <p><a href="#osx_dock">Dock setup</a></p>
-            </li>
-
-            <li>
-              <p><a href="#osx_running">Running OmegaT</a></p>
-            </li>
-          </ul>
-        </td>
-
-        <td width="50%">
-          <h3><a href="#Other_systems">Other systems - Solaris
-          SPARC/x86/x64,</a> <a href="#Other_systems">Linux x64/PowerPC,
-          Windows x64</a></h3>
-
-          <ul>
-            <li>
-              <p><a href="#other_which">Package to download</a></p>
-            </li>
-
-            <li>
-              <p><a href="#other_install">Installation</a></p>
-            </li>
-
-            <li>
-              <p><a href="#other_menu">OS menu setup</a></p>
-            </li>
-
-            <li>
-              <p><a href="#other_running">Running OmegaT</a></p>
-            </li>
-          </ul>
-        </td>
-      </tr>
-
-      <tr>
-        <td>
-          <h3><a href="installingAndRunning.html#command_line">Command line
-          launching</a></h3>
-
-          <ul>
-            <li>
-              <p><a href="installingAndRunning.html#command_line">Opening a
-              command-line window</a></p>
-            </li>
-
-            <li>
-              <p><a href="installingAndRunning.html#script">Changing the launch
-              script</a></p>
-            </li>
-
-            <li>
-              <p><a href="installingAndRunning.html#arguments">Launch command
-              argument</a></p>
-            </li>
-          </ul>
-        </td>
-
-        <td>
-          <h3><a href="installingAndRunning.html#source_build">Building OmegaT
-          from source</a></h3>
-
-          <ul>
-            <li>
-              <p><a href="installingAndRunning.html#build_which">Package to
-              download</a></p>
-            </li>
-
-            <li>
-              <p><a href="installingAndRunning.html#ant">Build
-              process </a></p>
-            </li>
-          </ul>
-        </td>
-      </tr>
-
-      <tr>
-        <td>
-          <h3><a href="#Using_WebStart_">Using Java Web Start</a></h3>
-        </td>
-
-        <td></td>
-      </tr>
-    </tbody>
-  </table><br>
-  <hr>
-
-  <h2><a name="Linux_users" id="Linux_users"></a>Linux (Intel) users</h2>
-
-  <h3><a name="linux_which" id="linux_which"></a>Which package to
-  download?</h3>
-
-  <p>Do you have a Java implementation compatible with SUN's Java 1.5 JRE?</p>
-
-  <table summary="just formatting" border="0" cellpadding="3" cellspacing="3">
-    <tbody>
-      <tr>
-        <td valign="top" width="11%">
-          <p><strong>Yes: </strong></p>
-        </td>
-
-        <td width="70%">
-          <p>Download <em>OmegaT_2.0.x_Without_JRE.zip</em>. This package can
-          be used on any platform where a Java 1.5 JRE compatible JRE is
-          installed.</p>
-        </td>
-      </tr>
-
-      <tr>
-        <td width="11%">
-          <p><strong>No / I don't know:</strong></p>
-        </td>
-
-        <td width="70%">
-          <p>Download <em>OmegaT_2.0.x_Linux.tar.gz</em>. This package is
-          bundled with SUN's Java Runtime Environment. This JRE will not
-          interfere with other Java implementations that may already be
-          installed on your system.</p>
-        </td>
-      </tr>
-    </tbody>
-  </table>
-
-  <h3><a name="linux_install" id="linux_install"></a>OmegaT installation</h3>
-
-  <p>To install OmegaT, simply unpack/untar the downloaded file. This will
-  create an omegat/ directory in the working folder in which you will find all
-  the files necessary to run OmegaT. To untar the <em>.tar.gz</em> file:</p>
-
-  <p><em>$ tar xf downloaded_file.tar.gz</em></p>
-
-  <h3><a name="linux_menu" id="linux_menu"></a>Adding OmegaT to your menus
-  (KDE) or panels (Gnome)</h3>
-
-  <h3><a name="menu_kde" id="menu_kde"></a>KDE users</h3>
-
-  <p>You can add OmegaT to your menus as follows:</p>
-
-  <ul>
-    <li>
-      <p><em>Control Center - Desktop - Panels - Menus - Edit K Menu - File -
-      New Item/New Submenu</em></p>
-    </li>
-
-    <li>
-      <p>Then, after selecting a suitable menu, add a submenu/item with
-      <em>File - New Submenu and File - New Item</em>. Enter OmegaT as the name
-      of the new item.</p>
-    </li>
-
-    <li>
-      <p>In the "Command" field, use the navigation button to find your OmegaT
-      launch script (the file named OmegaT in the unpacked folder), and select
-      it.</p>
-    </li>
-
-    <li>
-      <p>Click on the icon button (to the right of the Name/Description/Comment
-      fields) - Other Icons - Browse, and navigate to the /images subfolder in
-      the OmegaT application folder. Select the OmegaT icon.</p>
-    </li>
-
-    <li>
-      <p>Finally, save the changes with <em>File - Save</em>.</p>
-    </li>
-  </ul>
-
-  <h3><a name="menu_gnome" id="menu_gnome"></a>Gnome users</h3>
-
-  <p>You can add OmegaT to your panel (the bar at the top of the screen) as
-  follows:</p>
-
-  <ul>
-    <li>
-      <p>Right-click on the panel - <em>Add New Launcher</em>.</p>
-    </li>
-
-    <li>
-      <p>Enter "OmegaT" in the "Name" field; in the "Command" field, use the
-      navigation button to find your OmegaT launch script (the file named
-      OmegaT in the unpacked folder). Select it and confirm with OK.</p>
-    </li>
-
-    <li>Click on the icon button, then hit Browse... and navigate to the
-    /images subfolder in the OmegaT application folder. Select the <span style=
-    "font-style: italic;">OmegaT_icon.png</span> . GNOME may fail to display
-    the icon files in the available formats and initially appear to expect an
-    SVG file, but if the folder is selected, the files should appear and
-    OmegaT_icon.png can be selected.</li>
-  </ul>
-
-  <h3><a name="linux_running" id="linux_running"></a>Running OmegaT</h3>
-
-  <p>Once OmegaT is installed, you can launch it directly from the command
-  line, you can create a script that includes launch parameters for the command
-  line or you can click on <em>OmegaT.jar</em> to launch it directly. Methods
-  differ depending on the distribution. Make sure that your <em>PATH</em>
-  settings are correct and that <em>.jar</em> files are properly associated
-  with a Java launcher.</p>
-  <hr>
-
-  <h2><a name="Windows_users" id="Windows_users"></a>Windows users</h2>
-
-  <h3><a name="windows_which" id="windows_which"></a>Which package to
-  download?</h3>
-
-  <p>Do you have a Java implementation compatible with SUN's Java 1.5 JRE?</p>
-
-  <table summary="just formatting" border="0" cellpadding="3" cellspacing="0">
-    <tbody>
-      <tr>
-        <td valign="top" width="11%">
-          <p><strong>Yes:</strong></p>
-        </td>
-
-        <td width="70%">
-          <p>Download <em>OmegaT_2.0.x_Windows_without_JRE.exe</em>. This
-          package can be used on any Windows platform where a Java 1.5 JRE
-          compatible JRE is installed.</p>
-        </td>
-      </tr>
-
-      <tr>
-        <td width="11%">
-          <p><strong>No / I don't know:</strong></p>
-        </td>
-
-        <td width="70%">
-          <p>Download <em>OmegaT_2.0.x_Windows.exe</em>. This package is
-          bundled with SUN's Java Runtime Environment. This JRE will not
-          interfere with other Java implementations that may already be
-          installed on your system.</p>
-        </td>
-      </tr>
-    </tbody>
-  </table>
-
-  <h3><a name="windows_install" id="windows_install"></a>OmegaT
-  installation</h3>
-
-  <p>To install OmegaT, double-click on the program you have downloaded, and
-  follow the instructions</p>
-
-  <h3><a name="windows_menu" id="windows_menu"></a>Adding OmegaT to the start
-  menu or desktop</h3>
-
-  <p>During the installation, the setup program asks you whether you want to
-  create a folder in the <em>start</em> menu, and whether you want to create a
-  shortcut on the desktop and in the quick launch bar.</p>
-
-  <p>You can still create a shortcut afterward, by dragging <em>OmegaT.exe</em>
-  to the desktop or <em>start</em> menu to link it from there.</p>
-
-  <h3><a name="windows_running" id="windows_running"></a>Running OmegaT</h3>
-
-  <p>Once OmegaT is installed, you can click on <em>OmegaT.jar</em> to launch
-  it directly or you can launch it directly from the command line.</p>
-
-  <p>The simplest, however, is to execute the OmegaT.exe program. The launch
-  parameters in this case will be read from the <em>OmegaT.l4J.ini</em> file,
-  residing in the same folder as the exe file and which you can edit to reflect
-  your setup. The following INI file will reserve 1GB of memory, request
-  French as the user language and Portugal as the country:</p>
-
-  <p><code># OmegaT.exe runtime configuration<br>
-  #<br>
-  # To use a parameter, remove the '#' before the '-'<br>
-  # Memory<br>
-  -Xmx1024M<br>
-  # Language<br>
-  -Duser.language=FR<br>
-  # Country<br>
-  -Duser.country=PT<br>
-  # Anti-aliasing (Java 1.5 only)<br>
-  #-Dswing.aatext=true<br>
-  # Settings to access the Internet behind a proxy<br>
-  #-Dhttp.proxyHost=192.168.1.1<br>
-  #-Dhttp.proxyPort=3128<br>
-  </code></p>
-  <hr>
-
-  <h2><a name="MacOSX_users" id="MacOSX_users"></a>Mac OS X users</h2>
-
-  <h3><a name="osx_which" id="osx_which"></a>Which package to download?</h3>
-
-  <p>OmegaT 2.0 requires Java 1.5 to run. Mac OS X 10.4 (Tiger) users should
-  make sure that they use the latest version of Java before installing OmegaT.
-  Use "Software Update..." from the Apple menu to update your Java version.</p>
-
-  <p>Download <em>OmegaT_2.0.x_Mac.zip</em>.</p>
-
-  <h3><a name="osx_install" id="osx_install"></a>OmegaT installation</h3>
-
-  <p>Double click on <em>OmegaT_2.0.x_Mac.zip</em> to unpack it. This will
-  create a folder called <em>OmegaT</em>, with the OmegaT icon on it. The
-  folder contains 2 files: <em>documentation.html</em> and <em>OmegaT.app</em>.
-  Copy the folder to a suitable folder (e.g. Applications). Once you have done
-  this, you can delete the <em>OmegaT_2.0.x_Mac.zip</em> file.</p>
-
-  <h3><a name="osx_dock" id="osx_dock"></a>Adding OmegaT to the Dock</h3>
-
-  <p>Add OmegaT to the Dock by dragging and dropping the file
-  <em>OmegaT.app</em> on the Dock.</p>
-
-  <h3><a name="osx_running" id="osx_running"></a>Running OmegaT</h3>
-
-  <p>Double-click on <em>OmegaT.app</em> or click on its location in the
-  Dock</p>
-
-  <p>If you want to change the Java launch parameters you can modify the
-  OmegaT.app default settings by editing the <em>Info.plist</em> file located
-  in <em>OmegaT.app/Contents/</em>. Open the file "Info.plist" by
-  right-clicking on it and selecting your text editor of choice. You can modify
-  the <em>Properties</em> part as well as the <em>VMOptions</em> part. If you
-  want to add values to <em>VMOptions</em>, put a space between them. For
-  example, <code>-Xmx1024M -Duser.language=ja</code> will launch OmegaT with
-  1024MB of memory and with the user interface in Japanese.</p>
-
-  <p>Launching <em>OmegaT.app</em> directly will not allow you to run multiple
-  instances of <em>OmegaT.app</em>. If you need to run multiple instances of
-  <em>OmegaT.app</em>, use the file <em>JavaApplicationStub</em> located in
-  <em>OmegaT.app/ Contents/MacOS/</em> instead.</p>
-
-  <p>It is not possible to use the Lucene stemmer from the <em>OmegaT.app</em>
-  package. You need to run OmegaT from the command line (see below).</p>
-
-  <p>To change Java launch parameters from the command line, call the
-  <em>OmegaT.jar</em> file that is located in
-  <em>OmegaT.app/Contents/Resources/ Java/</em>. Launching <em>OmegaT.app</em>
-  from the command line is equivalent to using the "generic" package of OmegaT.
-  You'll be able to run multiple instances of OmegaT, as well as to use the
-  Lucene stemmer. Check "Command line launching" below for more
-  informations.</p>
-
-  <p>To access any location within the <em>OmegaT.app</em> package, right-click
-  on <em>OmegaT.app</em> and select "Show Package Contents", or "cd" there
-  directly from the command line.</p>
-
-  <p><em>OmegaT.app</em> can be accessed from the Services Mac OS X offers. You
-  can thus select a word anywhere in OmegaT and use the Services to check that
-  word in your Services providing dictionary applications, in Spotlight or in
-  Google. You can also use AppleScript or Automator to create Services or
-  scripts that will automate frequent actions.</p>
-  <hr>
-
-  <h2><a name="Other_systems" id="Other_systems"></a>Other systems</h2>
-
-  <h3><a name="other_which" id="other_which"></a>Which package to
-  download?</h3>
-
-  <p>OmegaT is available bundled with a SUN Java JRE for Linux (Intel x86) and
-  Windows platforms. Users of other platforms (Linux PowerPC, Linux x64,
-  Solaris SPARC/x86/x64, Windows x64 etc) must have a running compatible Java
-  JRE on their system to be able to use OmegaT.</p>
-
-  <p>Do you have a Java implementation compatible with SUN's Java 1.5 JRE?</p>
-
-  <table summary="just formatting" border="0" cellpadding="3" cellspacing="0">
-    <tbody>
-      <tr>
-        <td valign="top" width="11%">
-          <p><strong>Yes:</strong></p>
-        </td>
-
-        <td width="70%">
-          <p>Download <em>OmegaT_2.0.x_Without_JRE.zip</em>. This package can
-          be used on any platform where a Java 1.5 compatible JRE is
-          installed.</p>
-        </td>
-      </tr>
-
-      <tr>
-        <td valign="top" width="11%">
-          <p><strong>I don't know:</strong></p>
-        </td>
-
-        <td width="70%">
-          <p>Open a terminal and type "java -version". If a "command not found"
-          or similar message is returned, it is likely that Java is not
-          installed on your system.</p>
-        </td>
-      </tr>
-
-      <tr>
-        <td valign="top" width="11%">
-          <p><strong>No:</strong></p>
-        </td>
-
-        <td width="70%">
-          <dl>
-            <dd>Obtain a Java JRE for your system (see below) and download
-            <em>OmegaT_2.0.x_Without_JRE.zip</em>. SUN provides JREs for
-            Solaris SPARC/x86 (Java 1.5) and for Linux x64, Solaris x64,
-            Windows x64 (Java 1.5):
-            <strong>http://java.sun.com/products/archive/</strong>. IBM
-            provides JREs for Linux PowerPC:</dd>
-
-            <dd>
-            <strong>http://www.ibm.com/developerworks/java/jdk/linux/download.html</strong></dd>
-
-            <dd>Follow the installation instructions of the package you
-            need.</dd>
-          </dl>
-        </td>
-      </tr>
-    </tbody>
-  </table>
-
-  <h3><a name="other_install" id="other_install"></a>OmegaT installation</h3>
-
-  <p>To install OmegaT, simply unpack the
-  <strong><em>OmegaT_2.0.x_Without_JRE.zip</em></strong> file. This creates an
-  <em>./OmegaT_2.0.x_Without_JRE/</em> directory in the working folder with all
-  the files necessary to run OmegaT.</p>
-
-  <h3><a name="other_menu" id="other_menu"></a>Installing convenient
-  shortcuts</h3>
-
-  <p>Follow your system's instructions to install OmegaT shortcuts in
-  convenient places.</p>
-
-  <h3><a name="other_running" id="other_running"></a>Running OmegaT</h3>
-
-  <p>Once OmegaT is installed, you can launch it directly from the command
-  line, you can create a script that includes launch parameters for the command
-  line or you can click on <em>OmegaT.jar</em> to launch it directly. Methods
-  differ depending on the distribution. Make sure that your <em>PATH</em>
-  settings are correct and that <em>.jar</em> files are properly associated
-  with a Java launcher.</p>
-  <hr>
-
-  <h2><a name="command_line" id="command_line"></a>Command line launching</h2>
-
-  <p>Normally, it is not necessary to launch OmegaT from the command line.
-  However, the command-line method of launching OmegaT enables aspects of the
-  program's behaviour to be controlled by means of modifications. There are two
-  ways of launching OmegaT using the command line.</p>
-
-  <h3>Method 1: opening a command-line window</h3>
-
-  <p>A command-line window is also referred to as a "terminal window". On
-  Windows it is called an "MS-DOS window" and is available from the Start Menu,
-  inside Programs, through the "MS-DOS" item. The Mac OS X equivalent is the
-  application Terminal located in Applications → Utilities.</p>
-
-  <p>To launch OmegaT, you must normally type two commands. The first of these
-  is:</p>
-
-  <p><em>cd {folder}</em></p>
-
-  <p>where <em>{folder}</em> is the name of the folder, with complete path, in
-  which your OmegaT program - specifically, the file <em>OmegaT.jar</em> - is
-  located. In practice, this command will therefore be something like this:</p>
-
-  <dl>
-    <dt>On Windows</dt>
-
-    <dd><em>cd C:\Program Files\OmegaT</em></dd>
-
-    <dt>On Mac OS X</dt>
-
-    <dd><em>cd <OmegaT.app
-    location>/OmegaT.app/Contents/Resources/Java/</em></dd>
-
-    <dt>On Linux</dt>
-
-    <dd><em>cd /usr/local/omegat</em></dd>
-  </dl>
-
-  <p>This command changes the folder to the folder containing the executable
-  OmegaT file. The second command is the command which actually launches
-  OmegaT. In its most basic form, this command is:</p>
-
-  <p><em>java -jar OmegaT.jar</em></p>
-
-  <p>Pay attention to the capitalization - it is important.</p>
-
-  <p>This method has a particular benefit of being suitable for debugging: if
-  an error occurs during use of the program, an error message is output in the
-  terminal window which may contain useful information on the cause.</p>
-
-  <h3><a name="script" id="script"></a>Method 2: changing the <em>.bat</em>
-  file/launch script</h3>
-
-  <p>Method 1 is a somewhat impractical way of launching a program routinely.
-  For this reason, the two commands described above are contained in a file (a
-  "script", also called a "<em>.bat</em> file" on Windows systems).</p>
-
-  <p>When this file is executed, the commands within it are automatically
-  carried out. Consequently, to make changes to the launch command, it is
-  sufficient to modify the file. When OmegaT is launched from the file, the new
-  commands are then executed.</p>
-
-  <h3><a name="arguments" id="arguments"></a>Launch command arguments</h3>
-
-  <p>The basic command has already been mentioned above. Changes to this
-  command involve the addition of "arguments" to it. These are described in 
-  detail in <a href="commandlineArguments.html">Command Line Arguments</a>.
-  </p>
-  <hr>
-
-  <h2><a name="source_build" id="source_build"></a>Building OmegaT from
-  source</h2>
-
-  <h3><a name="build_which" id="build_which"></a>Which package to
-  download?</h3>
-
-  <dl>
-    <dt>Download <em>OmegaT_2.0.x_Source.zip</em></dt>
-
-    <dd>This package contains the source files corresponding to the released
-    version and can be used on any system that is installed with a Java 1.5 JDK
-    or compatible Java system. You will also need the <em>ant</em> utility to
-    build OmegaT.</dd>
-
-    <dt>OmegaT uses Subversion for the versioning control. The most recent
-    code is available on the SVN server:</dt>
-
-    <dd><em>https://omegat.svn.sourceforge.net/svnroot/omegat/trunk</em></dd>
-  </dl>
-
-  <h3><a name="ant" id="ant"></a>Building OmegaT</h3>
-
-  <dl>
-    <dd>Unpack the <em>OmegaT_2.0.x_Source.zip</em> file and enter the
-    <em>OmegaT_2.0.x_Source</em> directory or enter the <em>./omegat/</em>
-    directory of the SVN checked out code. Check that a <em>build.xml</em> file
-    is present in that folder. Then, on the command line, type:</dd>
-  </dl>
-
-  <p><em>$ ant jar release</em></p>
-
-  <dl>
-    <dd>This will create a full distribution of OmegaT in the <em>./dist/</em>
-    directory, in which you will find all the files necessary to run
-    OmegaT.</dd>
-  </dl>
-  <hr style="width: 100%; height: 2px;">
-
-  <h2><a name="Using_WebStart_" id="Using_WebStart_"></a>Using Java Web
-  Start</h2>
-
-  <dl>
-    <dt>Using Java Web Start technology (part of Java 1.5 and above),
-    standalone Java software applications can be deployed with a single click
-    over the network. Java Web Start ensures the most current version of the
-    application will be deployed, as well as the correct version of the
-    <a href="http://java.sun.com/j2se/desktopjava/jre/index.jsp" title=
-    "Java Runtime Environment (JRE)">Java Runtime Environment (JRE)</a>. To
-    start OmegaT for the first time with Java Web Start, load the following
-    URL in your browser:</dt>
-
-    <dd><span style="font-style: italic;">   
-    http://omegat.sourceforge.net/webstart/OmegaT.jnlp</span><br>
-    <br>
-    Download the file <span style="font-style: italic;">OmegaT.jnlp</span> and
-    then click on it. During the installation, depending on your operating
-    system, you may receive several security warnings. The certificate is
-    self-signed by "Didier Briel". The permissions you give to this version
-    (which might be mentioned as an "unrestricted access to the computer") are
-    identical to permissions you give to the local version, i.e., they allow an
-    access to the hard drive of the computer. Subsequent clicks on <span style=
-    "font-style: italic;">OmegaT.jnlp</span> will check for any upgrades,
-    install them, if there's any, and then start OmegaT. After the initial
-    installation you can of course use <span style=
-    "font-style: italic;">OmegaT.jnlp</span> also when you are offline.
-    <span style="font-weight: bold;"><br>
-    <br>
-    Privacy:</span> OmegaT Java Web Start does not save any of your information
-    outside the computer you are running it on. The application runs on your
-    machine only. Your documents and translation memories remain on your
-    computer, and the OmegaT project will have no access to your work or
-    information.<br>
-    <br>
-    Note that if you need any launch command arguments (see above), you will
-    have to use the normal installation.</dd>
-  </dl>
-
-  <dl>
-    <dt><br></dt>
-  </dl>
-  <hr>
-
-  <table summary="just formatting" style="width: 100%;" border="0" cellpadding=
-  "2" cellspacing="2">
-    <tbody>
-      <tr>
-        <td style="text-align: left;"><a href="legalNotices.html">Legal
-        notices</a></td>
-
-        <td style="text-align: center;"><a href="index.html">Home</a></td>
-
-        <td style="text-align: right;"><a href="xindex.html">Index of
-        contents</a></td>
-      </tr>
-    </tbody>
-  </table>
-</body>
-</html>
diff --git a/docs/en/instantStartGuide.html b/docs/en/instantStartGuide.html
deleted file mode 100644
index 2130005..0000000
--- a/docs/en/instantStartGuide.html
+++ /dev/null
@@ -1,422 +0,0 @@
-<html>
-<head>
-  <link rel="stylesheet" href="./OmegaT.css" type="text/css">
-  <meta http-equiv="CONTENT-TYPE" content="text/html; charset=utf-8">
-
-  <title>Instant Start Guide - OmegaT 2.0 User Manual</title>
-</head>
-
-<body>
-  <h2>Start using OmegaT in 5 minutes!<br>
-  - Instant Start Guide</h2>
-
-  <ul>
-    <li>
-      <p><a href="#summary">Briefly, how OmegaT works</a></p>
-    </li>
-
-    <li>
-      <p><a href="#translate">How to translate using OmegaT</a></p>
-
-      <ul>
-        <li>
-          <p><a href="#create">Create and open a new project</a></p>
-        </li>
-      </ul>
-    </li>
-
-    <li>
-      <p><a href="#segments">Translate the segments one by one</a></p>
-    </li>
-
-    <li>
-      <p><a href="#tm">Use matches in the translation memory, glossaries and
-      dictionaries</a></p>
-    </li>
-
-    <li>
-      <p><a href="#searches">Use searches and Google Translate</a></p>
-    </li>
-
-    <li>
-      <p><a href="#create_trans">Create the translated documents</a></p>
-    </li>
-
-    <li>
-      <p><a href="#tags">How to handle tagged text</a></p>
-
-      <ul>
-        <li>
-          <p><a href="#example">An example...</a></p>
-        </li>
-      </ul>
-    </li>
-
-    <li>
-      <p><a href="#tag_verif">Tag verification</a></p>
-    </li>
-  </ul>
-
-  <p>This instant start guide covers only the very basics. Ideally, all users
-  should read the User Manual to familiarize themselves with everything OmegaT
-  has to offer. Shortcuts described here use the "ctrl+key" convention but Mac
-  users should read "cmd+key" instead. The "cmd" key either has a "command"
-  label or an apple mark on Apple keyboards.</p>
-  <hr>
-
-  <h2><a name="summary" id="summary"></a>Briefly, how OmegaT works</h2>
-
-  <p>The OmegaT screen consists of <a href="userInterface.html">one space with
-  three distinct windows</a>. Each of these can be resized using the mouse. On
-  the left is the Editor where you type your translation. On the right, at the
-  top, is the Match Viewer, where translation memory matches will be displayed.
-  Below this is the Glossary Viewer, where glossary matches will be
-  displayed.</p>
-
-  <p>In the Editor window OmegaT presents the source text '<a href=
-  "segmentation.html">segmented</a>' into sentences (or paragraphs). You
-  translate these segments one by one. As you pass from segment to segment your
-  translations are recorded in a <a href="translationMemories.html">translation
-  memory</a>. Once all the segments have been translated (or before, if you
-  request) OmegaT will use the translation memory to generate the translated
-  document(s) in a “Target” folder.</p>
-
-  <p>OmegaT organizes your translation work in so-called translation projects.
-  For each project OmegaT will create a set of folders. These are used to store
-  the <a href="filesToTranslate.html">source documents</a> to be translated,
-  the <a href="glossaries.html">glossaries</a> you may wish to use, and any
-  <a href="translationMemories.html">translation memories</a> you may want to
-  use. OmegaT also creates a “Target” folder which will contain the final
-  translated documents.</p>
-  <hr>
-
-  <h2><a name="translate" id="translate"></a>How to translate using OmegaT</h2>
-
-  <h3><a name="create" id="create"></a>Create and open a new project</h3>
-
-  <p>Select <strong>Project → New...</strong> from the menu.</p>
-
-  <p>Navigate to the folder where you wish to save the project files, and type
-  in a name for the translation project. This name will be used for the main
-  project folder; all the project files will be stored in this folder or its
-  subfolders.</p>
-
-  <p>OmegaT will prompt you to confirm or change the project folders to be
-  created, using the dialog below:</p>
-
-  <p align="center"><a name="graphics2" id="graphics2"></a></p>
-
-  <p><img alt="new project dialogue"
-  title="new project dialogue" src="images/NewProject.png"></p>
-
-  <p>You can simply accept the location of the subfolders, but make sure first
-  that the source and translation <a href="languages.html">language codes</a>
-  are correct. Select the language code (2 letters) or language-and-region code
-  (2 + 2 letters) from the drop-down list, or type them in by hand (the
-  language code can be 2 or 3 letters). Make a mental note of the location of
-  the Target subfolder (for your translated documents). If you want OmegaT to
-  segment by sentence instead of by "paragraph", it's a good idea to
-  double-check the <a href="segmentation.html">Segmentation Rules</a>.</p>
-
-  <p>When you click OK to accept the project set-up, OmegaT will prompt you to
-  select the source documents for import. You can import individual files, or
-  you can import entire folder trees (with all files in all subfolders). If
-  you've accidentally imported the wrong documents, or too many documents, you
-  can simply remove them from the Source folder of your OmegaT project (using
-  your system's file manager, for example).</p>
-
-  <p>To check your list of files to be translated, consult the <strong>Project
-  Files</strong> window (Menu: <strong>Project → Project Files...</strong>, if
-  it does not open automatically). If you have had to change the Contents of
-  the Source folder, remember to reload the project first (Menu:
-  <strong>Project → Reload</strong>). OmegaT opens the first file in the
-  project list by default. Remember, OmegaT can only translate files in the
-  <a href="filesToTranslate.html">formats</a> below if they match the patterns
-  defined in the <a href="fileFilters.html">file filters</a>. Any other files
-  will be ignored.</p>
-
-  <ul>
-    <li>
-      <p>OpenDocument/OpenOffice.org</p>
-    </li>
-
-    <li>
-      <p>Plain text</p>
-    </li>
-
-    <li>
-      <p>.po</p>
-    </li>
-
-    <li>
-      <p>Bundle.properties Java</p>
-    </li>
-
-    <li>
-      <p>XHTML, HTML</p>
-    </li>
-
-    <li>
-      <p>HTML Help Compiler</p>
-    </li>
-
-    <li>
-      <p>INI ('key=value' format)</p>
-    </li>
-
-    <li>
-      <p>DocBook</p>
-    </li>
-
-    <li>
-      <p>Microsoft Open XML</p>
-    </li>
-
-    <li>
-      <p>Okapi monolingual XLIFF</p>
-    </li>
-
-    <li>
-      <p>QuarkXPress CopyFlowGold</p>
-    </li>
-
-    <li>
-      <p>Subtitle files (SRT)</p>
-    </li>
-
-    <li>
-      <p>ResX</p>
-    </li>
-
-    <li>
-      <p>Android resource</p>
-    </li>
-
-    <li>
-      <p>LaTeX</p>
-    </li>
-  </ul>
-
-  <h3><a name="segments" id="segments"></a>Translate the segments one by
-  one</h3>
-
-  <p>Once you have defined the project and the files to be translated, OmegaT
-  will open the first source file in the Editor.</p>
-
-  <p>The active segment is highlighted in green; a copy of the source text is
-  displayed below it, in the “target field”. (At this point, all text outside
-  the target field is protected and cannot be modified.) You must type your
-  translation between the tags <code><segment 0001></code> and
-  <code><end segment></code>, overwriting the source text. Press
-  "<strong>ENTER</strong>" to advance to the next segment. Note:</p>
-
-  <ul>
-    <li>
-      <p>To move to any other part of the text, whether above or below,
-      double-click on the sentence or paragraph you wish to open.</p>
-    </li>
-
-    <li>
-      <p>If you prefer to translate into an empty target field, set this option
-      in <strong>Options → <a href="translationEditing.html">Editing
-      Behaviour...</a></strong>.</p>
-    </li>
-
-    <li>
-      <p>You can change the setup of the Editor pane (for instance to show or
-      not the source text, highlight the translated text etc) in the Main menu
-      entry <a href="menu.html"><b>View</b></a></p>
-    </li>
-  </ul>
-
-  <p>When you press "<strong>ENTER</strong>", several things happen invisibly:
-  OmegaT adds the segment pair (the source segment and its translation) to the
-  translation memory and also automatically translates any other identical
-  segments that it detects in the other project files. It also scans the
-  translation memory and glossary in search of matches for the next
-  untranslated segment.</p>
-
-  <h3><a name="tm" id="tm"></a>Use matches in the translation memories,
-  glossaries and dictionaries</h3>
-
-  <h3><a name="tm_matches" id="tm_matches"></a>Translation memory matches</h3>
-
-  <p>If OmegaT finds any fuzzy matches (30% or over) for the next segment in
-  translation memories available, it displays these in the Match Viewer. The
-  first match is pre-selected in the Match Viewer by default.</p>
-
-  <p><br>
-  <br></p><img src="images/MatchesPane.png" name="graphics4" alt="matches pane"
-  id="graphics4" align="left" border="0"><br clear=
-  "left">
-
-  <p><br>
-  <br></p>
-
-  <p>To insert translation memory matches from the Match Viewer into your
-  target field, you can use <a href="menu.html#shortcuts">keyboard
-  shortcuts</a>:</p>
-
-  <ul>
-    <li>
-      <p>Press <code>Ctrl+I</code> to insert the pre-selected match at the
-      cursor position, or...</p>
-    </li>
-
-    <li>
-      <p>Press <code>Ctrl+R</code> to overwrite the entire segment with the
-      pre-selected match.</p>
-    </li>
-  </ul>
-
-  <p>If several matches have been found and you prefer not to use the
-  pre-selected match:</p>
-
-  <ul>
-    <li>
-      <p>Select the match you prefer in the Match Viewer: <code>Ctrl+2</code>
-      for the second match displayed, <code>Ctrl+3</code> for the third match,
-      etc.</p>
-    </li>
-
-    <li>
-      <p>Then use the <code>Ctrl+I</code> or <code>Ctrl+R</code> shortcuts as
-      above.</p>
-    </li>
-  </ul>
-
-  <p>(You can tell OmegaT to insert any first match above a specified matching
-  percentage automatically into the target field whenever the segment opens.
-  Set this option using <strong>Options → <a href=
-  "translationEditing.html">Editing Behaviour...</a></strong>)</p>
-
-  <h3><a name="gloss_matches" id="gloss_matches"></a>Glossary and
-  dictionary  matches</h3>
-
-  <p>Matching terms in <a href="glossaries.html">glossaries</a> and
-  dictionaries, that you may have included in the project, will be displayed
-  for reference in the glossary and dictionary panes. </p>
-
-  <h3><a name="searches" id="searches"></a>Use searches</h3>
-
-  <p>OmegaT provides a powerful range of <a href="searches.html">search</a>
-  functions. Call up the Search window with <code>Ctrl+F</code> and enter the
-  word or phrase you wish to search for in the "Search for" box. Alternatively,
-  select a word or phrase anywhere in the Editor pane and hit <code>Ctrl+F
-  </code>. The word or phrase is entered in the "Search for" box automatically
-  in this case.</p>
-
-  <h3>Use Google Translate</h3>In the <a href="GoogleTranslate.html">Google
-  Translate</a> pane, if activated, you will automatically get a suggestion for
-  the translation of the current segment. Press
-  <code>Ctrl+M</code> and it will replace the current content of the target segment.
-
-  <h3><a name="create_trans" id="create_trans"></a>Create translated
-  documents</h3>
-
-  <p>When you have translated all the segments (or earlier if you wish), OmegaT
-  will update the target document(s) using the translations stored in the
-  translation memory. To do so, select <strong>Project → Create Translated
-  Documents</strong> from the menu. OmegaT will build translated versions of
-  all the translatable documents in the Source folder of the project, whether
-  or not they have been fully translated. The wholly or partially translated
-  files will be saved to the project's Target folder. To finalize your
-  translation, open the target files in their associated applications (browser,
-  word processor...) to check the content and formatting of your translation.
-  You can then return to OmegaT to make any necessary corrections; do not
-  forget to recreating the translated documents.</p>
-  <hr>
-
-  <h2><a name="tags" id="tags"></a>How to handle tagged text</h2>
-
-  <p>OmegaT ensures that the formatting of the source documents (bold, italic
-  etc.) is not lost by marking it with <a href=
-  "formattedText.html#intro">special tags</a>. OmegaT tags are composed of one
-  or more letters followed by one or more digit, using the "/" character for
-  closure (for example: <f0>, </f0> <br>, </s2> etc.).
-  You must handle these tags with care and make sure they will be included in
-  the target segments in a proper fashion (see <a href=
-  "formattedText.html#Tag_operations">tag operations</a>).</p>
-
-  <h3><a name="example" id="example"></a>An example...</h3>
-
-  <p>In these examples we've highlighted the tags to make them easier to see,
-  but in OmegaT they will not be highlighted. The HTML tags, highlighted in
-  <font color="#0000FF">blue,</font> will be ignored by OmegaT as they fully
-  enclose the segment. The tags, highlighted below in <font color=
-  "#008000">green</font> have to be handled by OmegaT because they are within
-  the segment. Here is an example of a segment in HTML:</p>
-
-  <p><code><font color="#0000FF"><p></font>A different display font can
-  be selected via the <font color="#008000"><b></font>Display
-  Font<font color="#008000"></b></font>dialog. Open it via
-  the <font color="#008000"><i></font>Settings<font color=
-  "#008000"></i></font> →<font color="#008000"><i></font>Display
-  Font...<font color="#008000"></i></font> menu item. The font type and
-  size can be changed from the dialog.<font color=
-  "#0000FF"></p></font></code></p>
-
-  <p><br></p>
-
-  <p>Here is how OmegaT will display it, with the translation in Afrikaans:</p>
-
-  <p><br>
-  <br></p>
-
-  <p><img src="images/tagged_segment.png" name="graphics6" alt="tagged segment"
-  id="graphics6" align="bottom" border="0"></p>
-
-  <p><br>
-  <br></p>
-
-  <p>When OmegaT has created the translated document, the HTML will look like
-  this:</p>
-
-  <p><img src="images/tagged_segment_target.png" name="graphics5" alt=
-  "tagged segment - target" id="graphics5" align="bottom" border="0"></p>
-
-  <h3><a name="tag_verif" id="tag_verif"></a>Tag verification</h3>
-
-  <p>OmegaT doesn't automatically detect faulty tagging in the translated
-  document. Before you deliver the document to your client, you should
-  therefore check your tags for errors. Select <strong>Tools→ <a href=
-  "formattedText.html#tag_validation">Validate Tags</a></strong> from the menu.
-  A table will be displayed showing the segments where the source and target
-  tags do not correspond. Click on the segment number. You will be taken
-  automatically to the questionable segment in the Editor, where you can
-  correct the tagging. Hit <code>Enter</code> to
-  validate the corrected segment and check the correction by pressing again
-  <code>Ctrl-T</code>.</p>
-
-  <p>In some cases tag errors may even prevent a document from opening. You
-  should therefore ensure that you have corrected any tag errors before you
-  create the translated files. Finally, you should always double-check the
-  final formatting by opening the translated document in its associated viewer
-  or editor.</p>
-  
-  <p>In some programming languages (e.g. PHP, C) special tags are used as 
-  placeholders in strings that are used in combination with the printf-function.
-  OmegaT can detect and validate these tags if you enable it. Select 
-  <strong>Options→ <a href="formattedText.html#printf">Tag Validation...</a>
-  </strong> from the menu. You can choose between simple and full validation. 
-  In simple validation only simple variants of the possible placeholder values 
-  are used. This is usefull when the source code does not contain the more 
-  expressive and complex placeholders and you get a lot of false positives.</p>
-  <hr>
-
-  <table style="width: 100%;" summary="just formatting" border="0" cellpadding=
-  "2" cellspacing="2">
-    <tbody>
-      <tr>
-        <td style="text-align: left;"><a href="legalNotices.html">Legal
-        notices</a></td>
-
-        <td style="text-align: center;"><a href="index.html">Home</a></td>
-
-        <td style="text-align: right;"><a href="xindex.html">Index of
-        contents</a></td>
-      </tr>
-    </tbody>
-  </table>
-</body>
-</html>
diff --git a/docs/en/instantStartGuideNoTOC.html b/docs/en/instantStartGuideNoTOC.html
index 801019a..9282259 100644
--- a/docs/en/instantStartGuideNoTOC.html
+++ b/docs/en/instantStartGuideNoTOC.html
@@ -1,297 +1,546 @@
-<html>
-<head>
-  <link rel="stylesheet" href="./OmegaT.css" type="text/css">
-  <meta http-equiv="content-type" content="text/html; charset=utf-8">
-
-  <title>Instant Start Guide - OmegaT 2.0 User Manual</title>
-</head>
-
-<body>
-  <h2>Start using OmegaT in 5 minutes!<br>
-  - Instant Start Guide</h2>
-
-  <p>This instant start guide covers only the very basics. Ideally, all users
-  should read the User Manual to familiarize themselves with everything OmegaT
-  has to offer. Shortcuts described here use the "ctrl+key" convention but Mac
-  users should read "cmd+key" instead. The "cmd" key either has a "command"
-  label or an apple mark on Apple keyboards.</p>
-  <hr>
-  <a name="summary" id="summary"></a>
-
-  <h2>Briefly, how OmegaT works</h2>
-
-  <p>The OmegaT screen consists of one space with three distinct windows. Each
-  of these can be resized using the mouse. On the left is the Editor where you
-  type your translation. On the right, at the top, is the Match Viewer, where
-  translation memory matches will be displayed. Below this is the Glossary
-  Viewer, where glossary matches will be displayed.</p>
-
-  <p>In the Editor window OmegaT presents the source text 'segmented' into
-  sentences (or paragraphs). You translate these segments one by one. As you
-  pass from segment to segment your translations are recorded in a translation
-  memory. Once all the segments have been translated (or before, if you
-  request) OmegaT will use the translation memory to generate the translated
-  document(s) in a “Target” folder.</p>
-
-  <p>OmegaT organizes your translation work in so-called translation projects.
-  For each project OmegaT will create a set of folders. These are used to store
-  the source documents to be translated, the glossaries you may wish to use,
-  and any translation memories you may want to use. OmegaT also creates a
-  “Target” folder which will contain the final translated documents.</p>
-  <hr>
-  <a name="translate" id="translate"></a>
-
-  <h2>How to translate using OmegaT</h2><a name="create" id="create"></a>
-
-  <h3>Create and open a new project</h3>
-
-  <p>Select <strong>Project → New...</strong> from the menu.</p>
-
-  <p>Navigate to the folder where you wish to save the project files, and type
-  in a name for the translation project. This name will be used for the main
-  project folder; all the project files will be stored in this folder or its
-  subfolders.</p>
-
-  <p>OmegaT will prompt you to confirm or change the project folders to be
-  created, using the dialog below:</p>
-
-  <p align="center"><img src="images/NewProject.png" name="graphics1" alt=
-  "Project settings window" id="graphics1" align="bottom" border="0"></p>
-
-  <p>You can simply accept the location of the subfolders, but make sure first
-  that the source and translation language codes are correct. Select the
-  language code (2 letters) or language-and-region code (2 + 2 letters) from
-  the drop-down list, or type them in by hand (the language code can be 2 or 3
-  letters). Make a mental note of the location of the Target subfolder (for
-  your translated documents). If you want OmegaT to segment by sentence instead
-  of by "paragraph", it's a good idea to double-check the Segmentation
-  Rules.</p>
-
-  <p>When you click OK to accept the project set-up, OmegaT will prompt you to
-  select the source documents for import. You can import individual files, or
-  you can import entire folder trees (with all files in all subfolders). If
-  you've accidentally imported the wrong documents, or too many documents, you
-  can simply remove them from the Source folder of your OmegaT project (using
-  your system's file manager, for example).</p>
-
-  <p>To check your list of files to be translated, consult the <strong>Project
-  Files</strong> window (Menu: <strong>Project → Project Files...</strong>, if
-  it does not open automatically). If you have had to change the Contents of
-  the Source folder, remember to reload the project first (Menu:
-  <strong>Project → Reload</strong>). OmegaT opens the first file in the
-  project list by default. Remember, OmegaT can only translate files in the
-  formats below if they match the patterns defined in the file filters. Any
-  other files will be ignored.</p>
-
-  <ul>
-    <li>OpenDocument/OpenOffice.org</li>
-
-    <li>Plain text</li>
-
-    <li>.po</li>
-
-    <li>Bundle.properties Java</li>
-
-    <li>XHTML, HTML</li>
-
-    <li>HTML Help Compiler</li>
-
-    <li>INI ('key=value' format)</li>
-
-    <li>DocBook</li>
-
-    <li>Microsoft Open XML</li>
-
-    <li>Okapi monolingual XLIFF</li>
-
-    <li>QuarkXPress CopyFlowGold</li>
-
-    <li>Subtitle files (SRT)</li>
-
-    <li>ResX</li>
-
-    <li>Android resource</li>
-
-    <li>LaTeX</li>
-  </ul><a name="segments" id="segments"></a>
-
-  <h3>Translate the segments one by one</h3>
-
-  <p>Once you have defined the project and the files to be translated, OmegaT
-  will open the first source file in the Editor. The first segment is
-  highlighted in green; a copy of the source text is displayed below it, in the
-  “target field”. (At this point, all text outside the target field is
-  protected and cannot be modified.) You must type your translation between the
-  tags <code><segment 0001></code> and <code><end segment></code>,
-  overwriting the source text. Press "<strong>ENTER</strong>" to advance to the
-  next segment. Note:</p>
-
-  <ul>
-    <li>To move to any other part of the text, whether above or below,
-    double-click on the sentence or paragraph you wish to open.</li>
-
-    <li>If you prefer to translate into an empty target field, set this option
-    in <strong>Options → Editing Behaviour...</strong>.</li>
-
-    <li>
-      <p>You can change the setup of the Editor pane (for instance to show or
-      not the source text, highlight the translated text etc) in the Main menu
-      entry <span style="font-weight: bold;">View.</span></p>
-    </li>
-  </ul>
-
-  <p>When you press "<strong>ENTER</strong>", several things happen invisibly:
-  OmegaT adds the segment pair (the source segment and its translation) to the
-  translation memory and also automatically translates any other identical
-  segments that it detects in the other project files. It also scans the
-  translation memory and glossary in search of matches for the next
-  untranslated segment.</p><a name="tm" id="tm"></a>
-
-  <h3>Use matches in the translation memories, glossaries and
-  dictionaries</h3><a name="tm_matches" id="tm_matches"></a>
-
-  <h3>Translation memory matches</h3>
-
-  <p>If OmegaT finds any fuzzy matches (30% or over) for the next segment in
-  the translation memory, it displays them in the Match Viewer. The first match
-  is pre-selected in the Match Viewer by default.</p><img src=
-  "images/MatchesPane.png" name="graphics4" alt="matches pane" id="graphics4"
-  style="border: 0px solid ;"><br clear="left">
-
-  <p><br></p>
-
-  <p>To insert translation memory matches from the Match Viewer into your
-  target field, you can use keyboard shortcuts:</p>
-
-  <ul>
-    <li>Press <code>Ctrl+I</code> to insert the pre-selected match at the
-    cursor position, or...</li>
-
-    <li>Press <code>Ctrl+R</code> to overwrite the entire segment with the
-    pre-selected match.</li>
-  </ul>
-
-  <p>If several matches have been found and you prefer not to use the
-  pre-selected match:</p>
-
-  <ul>
-    <li>Select the match you prefer in the Match Viewer: <code>Ctrl+2</code>
-    for the second match displayed, <code>Ctrl+3</code> for the third match,
-    etc.</li>
-
-    <li>Then use the <code>Ctrl+I</code> or <code>Ctrl+R</code> shortcuts as
-    above.</li>
-  </ul>
-
-  <p>(You can tell OmegaT to insert any first match above a specified matching
-  percentage automatically into the target field whenever the segment opens.
-  Set this option using <strong>Options → Editing
-  Behaviour...</strong>)</p><a name="gloss_matches" id="gloss_matches"></a>
-
-  <h3>Glossary and dictionary matches</h3>
-
-  <p>Matching terms in glossaries and dictionaries, that you may have included
-  in the project, will be displayed for reference in the glossary and
-  dictionary panes.</p><a name="searches" id="searches"></a>
-
-  <h3>Use searches</h3>
-
-  <p>OmegaT provides a powerful range of search functions. Call up the Search
-  window with <code>Ctrl+F</code> and enter the word or phrase you wish to
-  search for in the "Search for" box. Alternatively, select a word or phrase
-  anywhere in the Editor pane and hit <code>Ctrl+F</code>. The word or phrase
-  is entered in the "Search for" box automatically in this case.</p>
-
-  <h3>Use Google Translate</h3>
-
-  <p>In the Google Translate pane, you will automatically get a suggestion for
-  the translation of the current segment. Press
-  <code>Ctrl+M</code> and it will replace the current content of the target segment.<br></p>
-
-  <p><a name="create_trans" id="create_trans"></a></p>
-
-  <h3>Create translated documents</h3>
-
-  <p>When you have translated all the segments (or earlier if you wish), OmegaT
-  will update the target document(s) using the translations stored in the
-  translation memory. To do so, select <strong>Project → Create Translated
-  Documents</strong> from the menu. OmegaT will build translated versions of
-  all the translatable documents in the Source folder of the project, whether
-  or not they have been fully translated. The wholly or partially translated
-  files will be saved to the project's Target folder. To finalize your
-  translation, open the target files in their associated applications (browser,
-  word processor...) to check the content and formatting of your translation.
-  You can then return to OmegaT to make any necessary corrections; do not
-  forget to recreating the translated documents.</p>
-  <hr>
-  <a name="tags" id="tags"></a>
-
-  <h2>How to handle tagged text</h2>
-
-  <p>OmegaT ensures that the formatting of the source documents (bold, italic
-  etc.) is not lost by marking it with special tags. OmegaT tags are composed
-  of one or more letters followed by one or more digit, using the "/" character
-  for closure (for example: <f0>, </f0> <br>, </s2>
-  etc.). You must handle these tags with care and make sure they will be
-  included in the target segments in a proper fashion (see <em>tag
-  operations</em>).</p><a name="example" id="example"></a>
-
-  <h3>An example...</h3>
-
-  <p>In these examples we've highlighted the tags to make them easier to see,
-  but in OmegaT they will not be highlighted. The HTML tags, highlighted in
-  <font color="blue">blue</font>, will be ignored by OmegaT as they fully
-  enclose the segment. The tags, highlighted below in <font color=
-  "green">green</font> have to be handled by OmegaT because they are within the
-  segment. Here is an example of a segment in HTML:</p>
-
-  <p><code><font color="blue"><p></font>A different display font can be
-  selected via the <font color="green"><b></font>Display Font<font color=
-  "green"></b></font> dialog. Open it via the <font color=
-  "green"><i></font>Settings<font color="green"></i></font> →
-  <font color="green"><i></font>Display Font...<font color=
-  "green"></i></font> menu item. The font type and size can be changed
-  from the dialog.<font color="blue"></p></font></code></p>
-
-  <p>Here is how OmegaT will display it, with the translation in
-  Afrikaans:</p><br>
-
-  <p><img src="images/tagged_segment.png" alt="" border="0"></p><br>
-
-  <p>When OmegaT has created the translated document, the HTML will look like
-  this:</p>
-
-  <p><img src="images/tagged_segment_target.png" alt="" border="0"></p><a name=
-  "tag_verif" id="tag_verif"></a>
-
-  <h3>Tag verification</h3>
-
-  <p>OmegaT doesn't automatically detect faulty tagging in the translated
-  document. Before you deliver the document to your client, you should
-  therefore check your tags for errors.</p>
-
-  <p>Select <strong>Tools → Validate Tags</strong> from the menu. A table will
-  be displayed showing the segments where the source and target tags do not
-  correspond. Click on the segment number. You will be taken automatically to
-  the questionable segment in the Editor, where you can correct the tagging.
-  Hit <code>Enter</code> to validate the corrected segment and check the
-  correction by pressing again <code>Control-T</code>.</p>
-
-  <p>In some cases tag errors may even prevent a document from opening. You
-  should therefore ensure that you have corrected any tag errors before you
-  create the translated files. Finally, you should always double-check the
-  final formatting by opening the translated document in its associated viewer
-  or editor.</p>
-
-  <p>In some programming languages (e.g. PHP, C) special tags are used as 
-  placeholders in strings that are used in combination with the printf-function.
-  OmegaT can detect and validate these tags if you enable it. Select 
-  <strong>Options→ Tag Validation...</strong>
-  from the menu. You can choose between simple and full validation. 
-  In simple validation only simple variants of the possible placeholder values 
-  are used. This is usefull when the source code does not contain the more 
-  expressive and complex placeholders and you get a lot of false positives.</p>
-
-  <hr>
-</body>
-</html>
+<html>
+   <head>
+      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+   
+      <title>Instant Start Guide</title>
+      <link rel="stylesheet" href="OmegaT.css" type="text/css">
+      <meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+   </head>
+   <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+      <div class="chapter" title="Instant Start Guide">
+         <div class="titlepage">
+            <div>
+               <div>
+                  <h2 class="title"><a name="chapter.instant.start.guide"></a>Instant Start Guide
+                  </h2>
+               </div>
+            </div>
+         </div>
+         <div class="section" title="1. Start Using OmegaT in 5 Minutes!">
+            <div class="titlepage">
+               <div>
+                  <div>
+                     <h2 class="title" style="clear: both"><a name="d0e4"></a>1. Start Using <span class="application">OmegaT</span> in 5 Minutes!
+                     </h2>
+                  </div>
+               </div>
+            </div>
+            <p>This instant start guide covers only the very basics of OmegaT.
+               Ideally, users should read the User Manual to familiarize themselves with
+               everything <span class="application">OmegaT</span> has to offer. Note for Mac
+               users: shortcuts are described here as "<span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>key</strong></span>" but Mac users should instead use "<span class="keycap"><strong>Cmd</strong></span>+<span class="keycap"><strong>key</strong></span>". The "<span class="keycap"><strong>Cmd</strong></span>" key either has a "command"
+               label or an apple symbol on Apple keyboards.
+            </p>
+            <p>The <span class="application">OmegaT</span> screen consists of one
+               workspace with five distinct panes<a class="indexterm" name="d0e35"></a>. Each of these can be resized using the mouse. On the left
+               is the Editor where you type your translation. On the top right is the
+               Match Viewer, where translation memory matches are displayed. Below this
+               is the Glossary Viewer, where glossary matches are displayed. Two
+               additional tabs at the bottom of the window open the Dictionary and
+               Machine Translation panes. (Note: you can of course rearrange the panes to
+               your own liking - the above description applies to your OmegaT after
+               installation).
+            </p>
+            <p>In the Editor pane OmegaT presents the source text 'segmented' into
+               either sentences or paragraphs. These are then translated, one by one. As
+               you progress from segment to segment, your translations are recorded
+               automatically in a translation memory. Once all the segments have been
+               translated (or before, if you request) <span class="application">OmegaT</span>
+               uses the translation memory to generate the translated document(s) in a
+               “Target” folder.
+            </p>
+            <p>OmegaT organizes your translation work in translation “projects”.
+               For each project, OmegaT creates a set of folders which, in turn, are used
+               to store the source documents to be translated as well as any glossaries
+               and translation memories you may wish to use. OmegaT also creates a
+               “Target” folder, in which OmegaT places the final translated
+               documents.
+            </p>
+         </div>
+         <div class="section" title="2. Translating with OmegaT">
+            <div class="titlepage">
+               <div>
+                  <div>
+                     <h2 class="title" style="clear: both"><a name="d0e46"></a>2. Translating with <span class="application">OmegaT</span></h2>
+                  </div>
+               </div>
+            </div>
+            <div class="section" title="2.1. Creating and opening a new project">
+               <div class="titlepage">
+                  <div>
+                     <div>
+                        <h3 class="title"><a name="create.and.open.new.project"></a>2.1. Creating and opening a new project<a class="indexterm" name="d0e54"></a></h3>
+                     </div>
+                  </div>
+               </div>
+               <p>Select <span class="guimenu">Project</span> → <span class="guimenuitem">New...</span><a class="indexterm" name="d0e66"></a> from the menu.
+               </p>
+               <p>Navigate to the folder where you wish to save the project files,
+                  and type in a name for the translation project. This name will be used
+                  for the main project folder; all the project files will be stored in
+                  this folder or its subfolders.
+               </p>
+               <p><span class="application">OmegaT</span> will prompt you to confirm or
+                  change the project folders to be created, using the dialog below:
+               </p>
+               <div class="figure"><a name="New.project.dialog.window"></a><p class="title"><b>Figure 1. <a class="indexterm" name="d0e80"></a>New project - dialog window</b></p>
+                  <div class="figure-contents">
+                     <div class="mediaobject"><img src="images/NewProject.png" alt="ProjectProject dialog window - figureNew project - dialog window"></div>
+                  </div>
+               </div><br class="figure-break"><p>You can simply accept the default locations of the subfolders, but
+                  be sure to check that the source language and target language codes are
+                  correct. Select the language code (2 letters) or language-and-region
+                  code (2 + 2 letters) from the drop-down list, or type them in by hand
+                  (the language code can be 2 to 3 letters). Make a mental note of the
+                  location of the Target subfolder (for your translated documents). If you
+                  prefer OmegaT to segment by sentence instead of by "paragraph", please
+                  read the chapter on Segmentation Rules<a class="indexterm" name="d0e91"></a>.
+               </p>
+               <p>When you click OK to accept the project set-up, OmegaT prompts you
+                  to select the source documents for import. You can import individual
+                  files with<em class="firstterm"> Project > Import Source Files</em>, or
+                  you can copy files or even entire folder trees (with all files in all
+                  subfolders) manually into the Source folder of your OmegaT project
+                  (using your system's file manager, for example). If you've accidentally
+                  imported the wrong documents, or too many documents, you can simply
+                  remove them again from the Source folder.
+               </p>
+               <p>To check your list of files to be translated, consult the
+                  <span class="bold"><strong>Project Files</strong></span> <a class="indexterm" name="d0e107"></a>window (Menu: <span class="guimenu">Project</span> → <span class="guimenuitem">Project Files...</span>,<a class="indexterm" name="d0e119"></a> if it does not open automatically). If you had to change
+                  the Contents of the Source folder, remember to reload the project first
+                  (Menu: <span class="guimenu">Project</span> → <span class="guimenuitem">Reload</span> (<span class="shortcut"><strong><span class="keycap"><strong>F5</strong></span></strong></span>)). <span class="application">OmegaT</span> opens the first
+                  file in the project list by default. Bear in mind that
+                  <span class="application">OmegaT</span> can only translate files in the
+                  formats below if they match the patterns defined in the file filters.
+                  Any other files will be ignored.<a class="indexterm" name="d0e140"></a></p>
+               <div class="itemizedlist">
+                  <ul class="itemizedlist" type="disc">
+                     <li class="listitem">
+                        <p><span class="bold"><strong> Plain text file formats<a class="indexterm" name="d0e150"></a></strong></span></p>
+                        <div class="itemizedlist">
+                           <ul class="itemizedlist" type="circle">
+                              <li class="listitem">
+                                 <p>ASCII text (.txt, etc.)</p>
+                              </li>
+                              <li class="listitem">
+                                 <p>Encoded text (*.UTF8)</p>
+                              </li>
+                           </ul>
+                        </div>
+                        <div class="itemizedlist">
+                           <ul class="itemizedlist" type="circle">
+                              <li class="listitem">
+                                 <p>Java resource bundles (*.properties)</p>
+                              </li>
+                           </ul>
+                        </div>
+                        <div class="itemizedlist">
+                           <ul class="itemizedlist" type="circle">
+                              <li class="listitem">
+                                 <p>PO files (*.po)</p>
+                              </li>
+                           </ul>
+                        </div>
+                        <div class="itemizedlist">
+                           <ul class="itemizedlist" type="circle">
+                              <li class="listitem">
+                                 <p>INI (key=value) files (*.ini)</p>
+                              </li>
+                           </ul>
+                        </div>
+                        <div class="itemizedlist">
+                           <ul class="itemizedlist" type="circle">
+                              <li class="listitem">
+                                 <p>DTD files (*.DTD)</p>
+                              </li>
+                              <li class="listitem">
+                                 <p>DocuWiki files (*.txt)</p>
+                              </li>
+                           </ul>
+                        </div>
+                     </li>
+                  </ul>
+               </div>
+               <div class="itemizedlist">
+                  <ul class="itemizedlist" type="disc">
+                     <li class="listitem">
+                        <p><span class="bold"><strong>Tagged text file formats<a class="indexterm" name="d0e186"></a></strong></span></p>
+                        <div class="itemizedlist">
+                           <ul class="itemizedlist" type="circle">
+                              <li class="listitem">
+                                 <p>OpenOffice.org / OpenDocument (*.odt, *.ott, *.ods, *.ots,
+                                    *.odp, *.otp)
+                                 </p>
+                              </li>
+                           </ul>
+                        </div>
+                        <div class="itemizedlist">
+                           <ul class="itemizedlist" type="circle">
+                              <li class="listitem">
+                                 <p>Microsoft Open XML (*.docx. *.xlsx, *.pptx)</p>
+                              </li>
+                           </ul>
+                        </div>
+                        <div class="itemizedlist">
+                           <ul class="itemizedlist" type="circle">
+                              <li class="listitem">
+                                 <p>(X)HTML (*.html, *.xhtml,*.xht)</p>
+                              </li>
+                           </ul>
+                        </div>
+                        <div class="itemizedlist">
+                           <ul class="itemizedlist" type="circle">
+                              <li class="listitem">
+                                 <p>HTML Help Compiler (*.hhc, *.hhk)</p>
+                              </li>
+                           </ul>
+                        </div>
+                        <div class="itemizedlist">
+                           <ul class="itemizedlist" type="circle">
+                              <li class="listitem">
+                                 <p>DocBook (*.xml)</p>
+                              </li>
+                           </ul>
+                        </div>
+                        <div class="itemizedlist">
+                           <ul class="itemizedlist" type="circle">
+                              <li class="listitem">
+                                 <p>monolingual XLIFF (*.xlf, *.xliff, *.sdlxliff)</p>
+                              </li>
+                           </ul>
+                        </div>
+                        <div class="itemizedlist">
+                           <ul class="itemizedlist" type="circle">
+                              <li class="listitem">
+                                 <p>QuarkXPress CopyFlowGold (*.tag, *.xtg)</p>
+                              </li>
+                           </ul>
+                        </div>
+                        <div class="itemizedlist">
+                           <ul class="itemizedlist" type="circle">
+                              <li class="listitem">
+                                 <p>SubRip title files (*.srt)</p>
+                              </li>
+                           </ul>
+                        </div>
+                        <div class="itemizedlist">
+                           <ul class="itemizedlist" type="circle">
+                              <li class="listitem">
+                                 <p>ResX files (*.resx)</p>
+                              </li>
+                           </ul>
+                        </div>
+                        <div class="itemizedlist">
+                           <ul class="itemizedlist" type="circle">
+                              <li class="listitem">
+                                 <p>Android resource (*.xml)</p>
+                              </li>
+                           </ul>
+                        </div>
+                        <div class="itemizedlist">
+                           <ul class="itemizedlist" type="circle">
+                              <li class="listitem">
+                                 <p>LaTex (*.tex, *.latex)</p>
+                              </li>
+                              <li class="listitem">
+                                 <p>Help (*.xml) and Manual (*.hmxp) files</p>
+                              </li>
+                              <li class="listitem">
+                                 <p>Typo3 LocManager (*.xml)</p>
+                              </li>
+                           </ul>
+                        </div>
+                        <div class="itemizedlist">
+                           <ul class="itemizedlist" type="circle">
+                              <li class="listitem">
+                                 <p>WiX Localization (*.wxl)</p>
+                              </li>
+                              <li class="listitem">
+                                 <p>Iceni Infix (*.xml)</p>
+                              </li>
+                              <li class="listitem">
+                                 <p>Flash XML export (*.xml)</p>
+                              </li>
+                           </ul>
+                        </div>
+                     </li>
+                  </ul>
+               </div>
+               <p>In addition to the text you wish to translate, tagged text files
+                  contain formatting information made visible in OmegaT in the form of
+                  “tags”. The tags must also be present in the translated text, even if
+                  the formatting does not need to be “translated”. If tags happen to be
+                  missing or are misplaced, the text may not be shown as intended and the
+                  translation will have to be corrected - see the chapter "Tag verification"
+                  below.
+               </p>
+            </div>
+            <div class="section" title="2.2. Translating segments one by one">
+               <div class="titlepage">
+                  <div>
+                     <div>
+                        <h3 class="title"><a name="translate.the.segments.one.by.one"></a>2.2. Translating segments one by one
+                        </h3>
+                     </div>
+                  </div>
+               </div>
+               <p>Once you have defined the project and the files to be translated,
+                  <span class="application">OmegaT</span> opens the first source file in the
+                  Editor.
+               </p>
+               <p>The active segment is highlighted in green; a copy of the source
+                  text is displayed just below this in the “target field”. (At this point,
+                  all text outside the target field is protected and cannot be modified.)
+                  You must type your translation before the tag <<code class="literal">segment
+                     0001></code>. OmegaT
+                  can be set up to automatically copy the source text into the target text
+                  (see <span class="emphasis"><em>Options > Editing Behaviour...</em></span>), which can
+                  be useful when parts of the source text are to remain unchanged. In such
+                  cases you will overwrite the source text. Press <span class="bold"><strong>"ENTER"</strong></span> to advance to the next segment.
+                  Note:
+               </p>
+               <div class="itemizedlist">
+                  <ul class="itemizedlist" type="disc">
+                     <li class="listitem">
+                        <p>To move to any other part of the text, whether above or below,
+                           double-click on the sentence or paragraph you wish to open.
+                        </p>
+                     </li>
+                     <li class="listitem">
+                        <p>If you prefer to translate into an empty target field, set
+                           this option in <span class="guimenu">Options</span> → <span class="guimenuitem">Editing Behaviour...<a class="indexterm" name="d0e284"></a></span></p>
+                     </li>
+                     <li class="listitem">
+                        <p>You can change the setup of the Editor pane (for instance to
+                           show the source text or not, highlight the translated text etc) in
+                           the Main menu under View.
+                        </p>
+                        <p>When you press <span class="bold"><strong>"ENTER"</strong></span>,
+                           several things happen invisibly: <span class="application">OmegaT</span>
+                           adds the segment pair (the source segment and its translation) to
+                           the internal translation memory . It also automatically translates
+                           any other identical segments that it detects. Additionally it scans
+                           the translation memory and glossary in search of matches for the
+                           next untranslated segment, which it then opens.
+                        </p>
+                     </li>
+                  </ul>
+               </div>
+            </div>
+            <div class="section" title="2.3. Using matches in the translation memories, dictionaries and glossaries">
+               <div class="titlepage">
+                  <div>
+                     <div>
+                        <h3 class="title"><a name="use.matches.in.TMs.dictionaries.and.glossaries"></a>2.3. Using matches in the translation memories, dictionaries and
+                           glossaries
+                        </h3>
+                     </div>
+                  </div>
+               </div>
+               <div class="section" title="2.3.1. Translation memory matches">
+                  <div class="titlepage">
+                     <div>
+                        <div>
+                           <h4 class="title"><a name="translation.memory.matches"></a>2.3.1. Translation memory matches<a class="indexterm" name="d0e306"></a><a class="indexterm" name="d0e311"></a></h4>
+                        </div>
+                     </div>
+                  </div>
+                  <div class="figure"><a name="d0e316"></a><p class="title"><b>Figure 2. Matches pane</b></p>
+                     <div class="figure-contents">
+                        <div class="mediaobject"><img src="images/MatchesPane.png" alt="Matches pane"></div>
+                     </div>
+                  </div><br class="figure-break"><p>If <span class="application">OmegaT</span> finds any fuzzy matches
+                     (30% or over) for the next segment in the translation memories in the
+                     project, it displays them in the Match Viewer. The first match is
+                     pre-selected in the Match Viewer by default.
+                  </p>
+                  <div class="itemizedlist">
+                     <ul class="itemizedlist" type="disc">
+                        <li class="listitem">
+                           <p>Press <span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>I</strong></span><a class="indexterm" name="d0e338"></a> to insert the pre-selected match at the cursor
+                              position, or...
+                           </p>
+                        </li>
+                        <li class="listitem">
+                           <p>Press <span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>R</strong></span> <a class="indexterm" name="d0e353"></a><a class="indexterm" name="d0e358"></a>
+                              to overwrite the entire segment with the
+                              pre-selected match.
+                           </p>
+                        </li>
+                     </ul>
+                  </div>
+                  <p>If several matches have been found and you prefer to use a match
+                     other than the pre-selected match:
+                  </p>
+                  <div class="itemizedlist">
+                     <ul class="itemizedlist" type="disc">
+                        <li class="listitem">
+                           <p>Select the match you prefer in the Match Viewer: <span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>2</strong></span> for the second match displayed, <span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>3</strong></span> for the third match, etc.
+                           </p>
+                        </li>
+                        <li class="listitem">
+                           <p>Then use the <span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>I</strong></span> or <span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>R</strong></span> shortcuts as above.
+                           </p>
+                        </li>
+                     </ul>
+                  </div>
+                  <p>You can tell OmegaT to insert any first match above a specified
+                     percentage into the target field automatically. Set this option using
+                     <span class="guimenu">Options</span></p>
+               </div>
+               <div class="section" title="2.3.2. Glossary and Dictionary matches">
+                  <div class="titlepage">
+                     <div>
+                        <div>
+                           <h4 class="title"><a name="glossary.and.dictionary.matches"></a>2.3.2. Glossary and Dictionary matches<a class="indexterm" name="d0e403"></a></h4>
+                        </div>
+                     </div>
+                  </div>
+                  <p>Any matching terms in glossaries and dictionaries, that you may
+                     have included in the project will be displayed for reference in the
+                     glossary and dictionary panes.
+                  </p>
+               </div>
+               <div class="section" title="2.3.3. Use searches">
+                  <div class="titlepage">
+                     <div>
+                        <div>
+                           <h4 class="title"><a name="use.searches"></a>2.3.3. Use searches
+                           </h4>
+                        </div>
+                     </div>
+                  </div>
+                  <p><span class="application">OmegaT</span> provides a powerful range of
+                     search functions. Call up the Search window with <span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>F</strong></span> and type in the word or phrase you wish to search for in
+                     the "Search for" box. Alternatively, select a word or phrase anywhere
+                     in the Editor pane and press <span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>F</strong></span>: the selected word or phrase will be inserted
+                     automatically into the "Search for" box in the window, that then
+                     opens.
+                  </p>
+               </div>
+               <div class="section" title="2.3.4. Use Machine Translation services">
+                  <div class="titlepage">
+                     <div>
+                        <div>
+                           <h4 class="title"><a name="use.Google.Translate"></a>2.3.4. Use Machine Translation services<a class="indexterm" name="d0e432"></a></h4>
+                        </div>
+                     </div>
+                  </div>
+                  <p>In the Machine Translation pane, if any of the services is
+                     activated (see <span class="emphasis"><em>Options > Machine Translate</em></span>),
+                     you will receive an automatic suggestion for the translation of the
+                     current segment. Press <span class="emphasis"><em>Ctrl+M </em></span> to replace the
+                     target segment with this suggestion.
+                  </p>
+               </div>
+            </div>
+            <div class="section" title="2.4. Creating translated documents">
+               <div class="titlepage">
+                  <div>
+                     <div>
+                        <h3 class="title"><a name="create.translated.documents"></a>2.4. Creating translated documents<a class="indexterm" name="d0e448"></a></h3>
+                     </div>
+                  </div>
+               </div>
+               <p>When you have translated all the segments (or earlier if you
+                  wish), <span class="application">OmegaT</span> will create the target
+                  document(s) using the translations stored in the translation memory. To
+                  do this, select <span class="guimenu">Project</span> → <span class="guimenuitem">Create Translated Documents</span> (<span class="shortcut"><strong><span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>D</strong></span></strong></span>)<a class="indexterm" name="d0e469"></a> <a class="indexterm" name="d0e475"></a>from the menu. <span class="application">OmegaT</span> will
+                  build translated versions of all the translatable documents in the
+                  Source folder of the project, whether or not they have been fully
+                  translated. The wholly or partially translated files will be saved to
+                  the project's Target folder. To finalize your translation, open the
+                  target files in their associated applications (browser, word
+                  processor...) to check the content and formatting of your translation.
+                  You can then return to <span class="application">OmegaT</span> to make any
+                  necessary corrections; do not forget to recreating the translated
+                  documents.
+               </p>
+            </div>
+         </div>
+         <div class="section" title="3. Handling tagged text">
+            <div class="titlepage">
+               <div>
+                  <div>
+                     <h2 class="title" style="clear: both"><a name="how.to.handle.tagged.text"></a>3. Handling tagged text<a class="indexterm" name="d0e490"></a></h2>
+                  </div>
+               </div>
+            </div>
+            <p><span class="application">OmegaT</span> ensures that the formatting of the
+               source documents (bold, italic etc.) is not lost by marking it with
+               special tags. <span class="application">OmegaT</span> tags are composed of one
+               or more letters followed by one or more digit, using the "/" character for
+               closure (for example: <f0>, </f0> <br>, </s2>
+               etc.). You must handle these tags with care and make sure they are
+               included in the target segments in a proper fashion (see tag
+               operations).
+            </p>
+            <div class="section" title="3.1. An example...">
+               <div class="titlepage">
+                  <div>
+                     <div>
+                        <h3 class="title"><a name="d0e500"></a>3.1. An example...<a class="indexterm" name="d0e503"></a></h3>
+                     </div>
+                  </div>
+               </div>
+               <p>In these examples we've highlighted the tags to make them easier
+                  to see, but in <span class="application">OmegaT</span> they will not be
+                  highlighted. The HTML tags, highlighted in blue, will be ignored by
+                  <span class="application">OmegaT</span> as they fully enclose the segment. The
+                  tags highlighted below in green, however, have to be handled by
+                  <span class="application">OmegaT</span> because they are within the segment.
+                  Here is an example of a segment in HTML:
+               </p>
+               <p><code class="literal"><p>A different display font can be selected via
+                     the <b>Display Font</b>dialog. Open it via
+                     the <i>Options</i> →<i>Display Font...</i> menu
+                     item. The font type and size can be changed from the
+                     dialog.</p></code></p>
+               <p>Here is how <span class="application">OmegaT</span> will display this,
+                  with the translation in Afrikaans:
+               </p>
+               <div class="figure"><a name="fig.tagged.segment.source"></a><p class="title"><b>Figure 3. Source <a class="indexterm" name="d0e530"></a>HTML segment</b></p>
+                  <div class="figure-contents">
+                     <div class="mediaobject"><img src="images/tagged_segment.png" alt="Source Segment, Source and Target - figureHTML segment"></div>
+                  </div>
+               </div><br class="figure-break"><p>When <span class="application">OmegaT</span> has created the translated
+                  document, the HTML will look like this:
+               </p>
+               <div class="figure"><a name="fig.tagged.segment.target"></a><p class="title"><b>Figure 4. Target HTML segment</b></p>
+                  <div class="figure-contents">
+                     <div class="mediaobject"><img src="images/tagged_segment_target.png" alt="Target HTML segment"></div>
+                  </div>
+               </div><br class="figure-break"></div>
+            <div class="section" title="3.2. Tag verification">
+               <div class="titlepage">
+                  <div>
+                     <div>
+                        <h3 class="title"><a name="tag.verification"></a>3.2. Tag verification<a class="indexterm" name="d0e555"></a><a class="indexterm" name="d0e560"></a></h3>
+                     </div>
+                  </div>
+               </div>
+               <p><span class="application">OmegaT</span> doesn't automatically detect
+                  faulty tagging in the translated document. Therefore before you deliver
+                  the document to your client, you should always check your tags for
+                  errors. Select <span class="guimenu">Tools</span> → <span class="guimenuitem">Validate Tags...</span> (<span class="shortcut"><strong><span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>T</strong></span></strong></span>) from the menu. A table will be displayed showing the
+                  segments where the source and target tags do not correspond. Click on
+                  the segment number. You will be taken automatically to the questionable
+                  segment in the Editor, where you can correct the tagging. When you have
+                  carried out the corrections, check these by pressing <span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>T<a class="indexterm" name="d0e584"></a></strong></span> again. Note that the tag verifier may find an error in
+                  cases where the tags are correct - for instance when it was necessary to
+                  change the order of tags involved in making a grammatically correct
+                  translation. Please regard this as a sign that the verifier prefers to
+                  err on the side of caution.
+               </p>
+               <p>In some cases tag errors may even prevent a document from opening.
+                  This is no reason to panic - you still have both the source file and the
+                  translation available, you just need to make sure you have corrected any
+                  tag errors before you create the translated files. Finally, you should
+                  always doublecheck the final formatting by opening the translated
+                  document in its associated viewer or editor.
+               </p>
+            </div>
+         </div>
+      </div>
+   </body>
+</html>
\ No newline at end of file
diff --git a/docs/en/ix01.html b/docs/en/ix01.html
new file mode 100644
index 0000000..24827b3
--- /dev/null
+++ b/docs/en/ix01.html
@@ -0,0 +1,770 @@
+<html>
+   <head>
+      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+   
+      <title>Index</title>
+      <link rel="stylesheet" href="OmegaT.css" type="text/css">
+      <meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+      <link rel="home" href="index.html" title="OmegaT - User's Guide">
+      <link rel="up" href="index.html" title="OmegaT - User's Guide">
+      <link rel="prev" href="appendix.acknowledgements.html" title="Appendix E. Acknowledgements">
+   </head>
+   <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+      <div class="navheader">
+         <table width="100%" summary="Navigation header">
+            <tr>
+               <th colspan="3" align="center">Index</th>
+            </tr>
+            <tr>
+               <td width="20%" align="left"><a accesskey="p" href="appendix.acknowledgements.html">Prev</a> 
+               </td>
+               <th width="60%" align="center"> </th>
+               <td width="20%" align="right"> </td>
+            </tr>
+         </table>
+         <hr>
+      </div>
+      <div class="index" title="Index">
+         <div class="titlepage">
+            <div>
+               <div>
+                  <h2 class="title"><a name="d0e10184"></a>Index
+                  </h2>
+               </div>
+            </div>
+         </div>
+         <div class="index">
+            <div class="indexdiv">
+               <h3></h3>
+               <dl>
+                  <dt></dt>
+                  <dd>
+                     <dl>
+                        <dt>Replace text, <a class="indexterm" href="chapter.instant.start.guide.html#translation.memory.matches">Translation memory matches</a></dt>
+                     </dl>
+                  </dd>
+               </dl>
+            </div>
+            <div class="indexdiv">
+               <h3>A</h3>
+               <dl>
+                  <dt>Automatic match insertion, <a class="indexterm" href="chapter.translation.editing.html#automatic.match.insertion">Automatic match insertion</a></dt>
+               </dl>
+            </div>
+            <div class="indexdiv">
+               <h3>B</h3>
+               <dl>
+                  <dt>Britannica, <a class="indexterm" href="chapter.dictionaries.html#d0e7386">How to download and install dictionaries</a></dt>
+                  <dd>
+                     <dl>
+                        <dt>(see also Dictionaries)</dt>
+                     </dl>
+                  </dd>
+               </dl>
+            </div>
+            <div class="indexdiv">
+               <h3>C</h3>
+               <dl>
+                  <dt>Customizing OmegaT</dt>
+                  <dd>
+                     <dl>
+                        <dt>GNOME, <a class="indexterm" href="chapter.installing.and.running.html#GNOME.users">GNOME Users</a></dt>
+                        <dt>KDE 4, <a class="indexterm" href="chapter.installing.and.running.html#KDE.users">KDE 4 Users</a></dt>
+                        <dt>Windows, <a class="indexterm" href="chapter.installing.and.running.html#adding.OmegaT.to.the.start.menu.or.desktop">Adding OmegaT to the start menu or
+                                    desktop</a></dt>
+                     </dl>
+                  </dd>
+               </dl>
+            </div>
+            <div class="indexdiv">
+               <h3>D</h3>
+               <dl>
+                  <dt>Default encoding</dt>
+                  <dd>
+                     <dl>
+                        <dt>Central and Eastern European, <a class="indexterm" href="chapter.plain.text.html#OmegaT.solution">The OmegaT solution</a></dt>
+                        <dt>OmegaT solution, <a class="indexterm" href="chapter.plain.text.html#OmegaT.solution">The OmegaT solution</a></dt>
+                        <dt>Plain text files, <a class="indexterm" href="chapter.plain.text.html#default.encoding">Default encoding</a></dt>
+                        <dt>Unicode, <a class="indexterm" href="chapter.plain.text.html#OmegaT.solution">The OmegaT solution</a></dt>
+                        <dt>Western, <a class="indexterm" href="chapter.plain.text.html#OmegaT.solution">The OmegaT solution</a></dt>
+                     </dl>
+                  </dd>
+                  <dt>Dictionaries, <a class="indexterm" href="chapter.dictionaries.html">Dictionaries</a></dt>
+                  <dd>
+                     <dl>
+                        <dt>Downloading and installing, <a class="indexterm" href="chapter.dictionaries.html#d0e7386">How to download and install dictionaries</a></dt>
+                        <dt>Problems with, <a class="indexterm" href="chapter.dictionaries.html#d0e7494">Problems with dictionaries</a></dt>
+                     </dl>
+                  </dd>
+                  <dt>Dictionary</dt>
+                  <dd>
+                     <dl>
+                        <dt>Merriam Webster - figure, <a class="indexterm" href="chapter.dictionaries.html#d0e7386">How to download and install dictionaries</a></dt>
+                        <dd>
+                           <dl>
+                              <dt>(see also Dictionaries)</dt>
+                           </dl>
+                        </dd>
+                     </dl>
+                  </dd>
+               </dl>
+            </div>
+            <div class="indexdiv">
+               <h3>E</h3>
+               <dl>
+                  <dt>Exporting the current segment, <a class="indexterm" href="chapter.translation.editing.html#export.segment.to.text.files">Export the segment to text files</a></dt>
+               </dl>
+            </div>
+            <div class="indexdiv">
+               <h3>F</h3>
+               <dl>
+                  <dt>File filters</dt>
+                  <dd>
+                     <dl>
+                        <dt>Dialog, <a class="indexterm" href="chapter.file.filters.html#file.filters.dialog">File filters dialog</a>, <a class="indexterm" href="chapter.file.filters.html#target.name">Target filename</a></dt>
+                        <dt>Editing, <a class="indexterm" href="chapter.file.filters.html#edit.filter.dialog">Edit filter dialog</a></dt>
+                        <dt>Options, <a class="indexterm" href="chapter.file.filters.html#filters.options">Filter options</a></dt>
+                        <dt>Source file type, filename, <a class="indexterm" href="chapter.file.filters.html#source.filetype.and.filename.pattern">Source file type, filename pattern</a></dt>
+                        <dt>Source, target encoding, <a class="indexterm" href="chapter.file.filters.html#source.and.target.files.encoding">Source and Target file encoding</a></dt>
+                     </dl>
+                  </dd>
+                  <dt>File Formats</dt>
+                  <dd>
+                     <dl>
+                        <dt>formatted, <a class="indexterm" href="chapter.instant.start.guide.html#create.and.open.new.project">Creating and opening a new project</a></dt>
+                        <dt>plain text files, <a class="indexterm" href="chapter.instant.start.guide.html#create.and.open.new.project">Creating and opening a new project</a></dt>
+                     </dl>
+                  </dd>
+                  <dt>File formats</dt>
+                  <dd>
+                     <dl>
+                        <dt>formatted, <a class="indexterm" href="chapter.files.to.translate.html#d0e5148">Formatted text files</a></dt>
+                        <dd>
+                           <dl>
+                              <dt>(see also Source files)</dt>
+                           </dl>
+                        </dd>
+                        <dt>Unformatted, <a class="indexterm" href="chapter.files.to.translate.html#d0e5088">Plain text files</a></dt>
+                        <dd>
+                           <dl>
+                              <dt>(see also Source files)</dt>
+                           </dl>
+                        </dd>
+                     </dl>
+                  </dd>
+                  <dt>Font settings, <a class="indexterm" href="chapter.font.html#section.font.settings">Font settings</a></dt>
+                  <dt>FreeDict, <a class="indexterm" href="chapter.dictionaries.html#d0e7386">How to download and install dictionaries</a></dt>
+                  <dd>
+                     <dl>
+                        <dt>(see also Dictionaries)</dt>
+                     </dl>
+                  </dd>
+               </dl>
+            </div>
+            <div class="indexdiv">
+               <h3>G</h3>
+               <dl>
+                  <dt>Glossaries, <a class="indexterm" href="chapter.glossaries.html">Glossaries</a></dt>
+                  <dd>
+                     <dl>
+                        <dt>Creating a glossary, <a class="indexterm" href="chapter.glossaries.html#d0e7623">How to create glossaries</a></dt>
+                        <dt>File format, <a class="indexterm" href="chapter.glossaries.html#d0e7599">File format</a></dt>
+                        <dt>Glossary window - figure, <a class="indexterm" href="chapter.user.interface.html#d0e2555">Glossary</a></dt>
+                        <dt>multi-word entry in the glossary - figure, <a class="indexterm" href="chapter.user.interface.html#d0e2555">Glossary</a></dt>
+                        <dt>Problems with glossaries, <a class="indexterm" href="chapter.glossaries.html#d0e7739">Common glossary problems</a></dt>
+                        <dt>Trados MultiTerm, <a class="indexterm" href="chapter.glossaries.html#d0e7721">Using Trados Multiterm</a></dt>
+                     </dl>
+                  </dd>
+                  <dt>Glossary pane, <a class="indexterm" href="chapter.glossaries.html#d0e7551">Usage</a></dt>
+                  <dt>Glossary pane - multiple-words entries, <a class="indexterm" href="chapter.glossaries.html#d0e7551">Usage</a></dt>
+               </dl>
+            </div>
+            <div class="indexdiv">
+               <h3>I</h3>
+               <dl>
+                  <dt>Installing OmegaT</dt>
+                  <dd>
+                     <dl>
+                        <dt>Linux, <a class="indexterm" href="chapter.installing.and.running.html#Linux.Intel.users">Linux (Intel) Users</a></dt>
+                        <dt>OS X, <a class="indexterm" href="chapter.installing.and.running.html#MAC.OSX.users">Mac OS X Users</a></dt>
+                        <dt>Other systems, <a class="indexterm" href="chapter.installing.and.running.html#other.systems">Other Systems</a>, <a class="indexterm" href="chapter.installing.and.running.html#OmegaT.installation.other">Installing OmegaT</a></dt>
+                        <dt>Windows, <a class="indexterm" href="chapter.installing.and.running.html#d0e779">Windows Users</a></dt>
+                     </dl>
+                  </dd>
+                  <dt>ISO language codes, <a class="indexterm" href="appendix.languages.html">Languages - ISO 639 code list
+                          
+                          
+                          
+                          </a></dt>
+               </dl>
+            </div>
+            <div class="indexdiv">
+               <h3>K</h3>
+               <dl>
+                  <dt>Keyboard shortcuts, <a class="indexterm" href="chapter.menu.html#keyboard.shortcuts">Keyboard shortcuts</a></dt>
+                  <dd>
+                     <dl>
+                        <dt>Editing, <a class="indexterm" href="chapter.menu.html#keyboard.editing">Editing</a></dt>
+                        <dt>Goto, <a class="indexterm" href="chapter.menu.html#keyboard.editing">Editing</a>, <a class="indexterm" href="chapter.menu.html#keyboard.moving.around">Moving around</a></dt>
+                        <dt>Other, <a class="indexterm" href="chapter.menu.html#keyboard.other">Other</a></dt>
+                        <dt>Project, <a class="indexterm" href="chapter.menu.html#d0e3774">Project management</a></dt>
+                     </dl>
+                  </dd>
+               </dl>
+            </div>
+            <div class="indexdiv">
+               <h3>L</h3>
+               <dl>
+                  <dt>Languages, <a class="indexterm" href="appendix.languages.html">Languages - ISO 639 code list
+                          
+                          
+                          
+                          </a></dt>
+                  <dt>Legal notices, <a class="indexterm" href="appendix.legal.notices.html">Legal notices</a></dt>
+                  <dd>
+                     <dl>
+                        <dt>For the application, <a class="indexterm" href="appendix.legal.notices.html#legal.ntices.for.application">For the application</a></dt>
+                        <dt>For the documentation, <a class="indexterm" href="appendix.legal.notices.html#legal.notices.for.documentation">For the documentation</a></dt>
+                     </dl>
+                  </dd>
+                  <dt>Longman, <a class="indexterm" href="chapter.dictionaries.html#d0e7386">How to download and install dictionaries</a></dt>
+                  <dd>
+                     <dl>
+                        <dt>(see also Dictionaries)</dt>
+                     </dl>
+                  </dd>
+               </dl>
+            </div>
+            <div class="indexdiv">
+               <h3>M</h3>
+               <dl>
+                  <dt>Machine Translation, <a class="indexterm" href="chapter.machine.translate.html">Machine Translation</a></dt>
+                  <dd>
+                     <dl>
+                        <dt>Apertium, <a class="indexterm" href="chapter.machine.translate.html#d0e7889">Apertium</a></dt>
+                        <dt>Belazar, <a class="indexterm" href="chapter.machine.translate.html#d0e7877">Belazar</a></dt>
+                        <dt>Google Translate, <a class="indexterm" href="chapter.machine.translate.html#introduction">Google Translate</a></dt>
+                        <dt>Introduction, <a class="indexterm" href="chapter.machine.translate.html#d0e7795">Introduction</a></dt>
+                        <dt>Troubleshooting, <a class="indexterm" href="chapter.machine.translate.html#Google.Translate.troubleshooting">Machine translation - trouble shooting</a></dt>
+                     </dl>
+                  </dd>
+                  <dt>Main menu, <a class="indexterm" href="chapter.menu.html#ch04.main.menu">Main Menu</a></dt>
+                  <dd>
+                     <dl>
+                        <dt>Edit, <a class="indexterm" href="chapter.menu.html#d0e3107">Edit</a></dt>
+                        <dt>Goto, <a class="indexterm" href="chapter.menu.html#submenu.GoTo">Go to</a></dt>
+                        <dt>Help, <a class="indexterm" href="chapter.menu.html#submenu.Help">Help</a></dt>
+                        <dt>Options, <a class="indexterm" href="chapter.menu.html#submenu.Options">Options</a></dt>
+                        <dt>Project, <a class="indexterm" href="chapter.menu.html#submenu.Project">Project</a></dt>
+                        <dt>Tools, <a class="indexterm" href="chapter.menu.html#submenu.Tools">Tools</a></dt>
+                        <dt>View, <a class="indexterm" href="chapter.menu.html#submenu.View">View</a></dt>
+                     </dl>
+                  </dd>
+                  <dt>Match Statistics, <a class="indexterm" href="chapter.user.interface.html#d0e2785">Match statistics</a></dt>
+                  <dd>
+                     <dl>
+                        <dt>(see also Menu Tools)</dt>
+                     </dl>
+                  </dd>
+                  <dt>Matches</dt>
+                  <dd>
+                     <dl>
+                        <dt>Glossary, Dictionary matches, <a class="indexterm" href="chapter.instant.start.guide.html#glossary.and.dictionary.matches">Glossary and Dictionary matches</a></dt>
+                        <dt>Machine translation, <a class="indexterm" href="chapter.instant.start.guide.html#use.Google.Translate">Use Machine Translation services</a></dt>
+                        <dt>Matches pane - figure, <a class="indexterm" href="chapter.user.interface.html#match.viewer">Match viewer</a></dt>
+                        <dt>Matches statistics, <a class="indexterm" href="chapter.menu.html#submenu.Tools">Tools</a></dt>
+                     </dl>
+                  </dd>
+                  <dt>Menu Help</dt>
+                  <dd>
+                     <dl>
+                        <dt>Help browser, <a class="indexterm" href="chapter.user.interface.html#d0e2868">Help browser</a></dt>
+                        <dt>User Manual..., <a class="indexterm" href="chapter.user.interface.html#d0e2868">Help browser</a></dt>
+                     </dl>
+                  </dd>
+                  <dt>Menu Options</dt>
+                  <dd>
+                     <dl>
+                        <dt>Editing Behavior, <a class="indexterm" href="chapter.user.interface.html#dialogs.to.change.settings">Project settings dialogs </a></dt>
+                        <dt>Editing behaviour..., <a class="indexterm" href="chapter.instant.start.guide.html#translate.the.segments.one.by.one">Translating segments one by one</a></dt>
+                        <dt>File filters, <a class="indexterm" href="chapter.user.interface.html#dialogs.to.change.settings">Project settings dialogs </a></dt>
+                        <dt>Font, <a class="indexterm" href="chapter.user.interface.html#dialogs.to.change.settings">Project settings dialogs </a></dt>
+                        <dt>Font..., <a class="indexterm" href="chapter.font.html#section.font.settings">Font settings</a>, <a class="indexterm" href="chapter.misc.html#font.settings">Font settings</a></dt>
+                        <dt>Segmentation, <a class="indexterm" href="chapter.user.interface.html#dialogs.to.change.settings">Project settings dialogs </a></dt>
+                        <dt>Spell checking.., <a class="indexterm" href="chapter.spellchecker.html#d0e7944">Installing spelling dictionaries</a></dt>
+                     </dl>
+                  </dd>
+                  <dt>Menu options</dt>
+                  <dd>
+                     <dl>
+                        <dt>Editing behavior..., <a class="indexterm" href="chapter.translation.editing.html">Editing behavior</a></dt>
+                     </dl>
+                  </dd>
+                  <dt>Menu Project</dt>
+                  <dd>
+                     <dl>
+                        <dt>Create Translated Documents, <a class="indexterm" href="chapter.instant.start.guide.html#create.translated.documents">Creating translated documents</a></dt>
+                        <dt>New..., <a class="indexterm" href="chapter.instant.start.guide.html#create.and.open.new.project">Creating and opening a new project</a></dt>
+                        <dt>Project Files..., <a class="indexterm" href="chapter.instant.start.guide.html#create.and.open.new.project">Creating and opening a new project</a></dt>
+                        <dt>Properties, <a class="indexterm" href="chapter.user.interface.html#dialogs.to.change.settings">Project settings dialogs </a></dt>
+                     </dl>
+                  </dd>
+                  <dt>Menu Tools</dt>
+                  <dd>
+                     <dl>
+                        <dt>Match statistics, <a class="indexterm" href="chapter.user.interface.html#windows.you.may.use.now.and.then">Less frequently used</a></dt>
+                     </dl>
+                  </dd>
+                  <dt>Miscellanea, <a class="indexterm" href="chapter.misc.html">Miscellaneous subjects</a></dt>
+                  <dd>
+                     <dl>
+                        <dt>Automatic aligner for Java properties, <a class="indexterm" href="chapter.misc.html#d0e8235">Automatic Java Properties Aligner</a></dt>
+                        <dd>
+                           <dl>
+                              <dt>(see also Miscelanea)</dt>
+                           </dl>
+                        </dd>
+                        <dt>Font settings, <a class="indexterm" href="chapter.misc.html#font.settings">Font settings</a></dt>
+                        <dt>OmegaT console mode, <a class="indexterm" href="chapter.misc.html#omegat.misc.console.mode">OmegaT Console Mode</a></dt>
+                        <dt>Preventing data Loss, <a class="indexterm" href="chapter.misc.html#preventing.data.loss">Preventing data loss</a></dt>
+                     </dl>
+                  </dd>
+               </dl>
+            </div>
+            <div class="indexdiv">
+               <h3>O</h3>
+               <dl>
+                  <dt>OmegaT console mode, <a class="indexterm" href="chapter.misc.html#omegat.misc.console.mode">OmegaT Console Mode</a></dt>
+                  <dd>
+                     <dl>
+                        <dt>(see also Miscellanea)</dt>
+                     </dl>
+                  </dd>
+                  <dt>OmegaT on the web, <a class="indexterm" href="appendix.website.html">OmegaT on the web</a></dt>
+                  <dd>
+                     <dl>
+                        <dt>Contributing to OmegaT, <a class="indexterm" href="appendix.website.html#contributing.to.omegat.project">Contributing to OmegaT project</a></dt>
+                        <dt>Development, Localizing, <a class="indexterm" href="appendix.website.html#contributing.to.omegat.project">Contributing to OmegaT project</a></dt>
+                        <dt>Donating to OmegaT, <a class="indexterm" href="appendix.website.html#contributing.to.omegat.project">Contributing to OmegaT project</a></dt>
+                        <dt>Financial support, <a class="indexterm" href="appendix.website.html#contributing.to.omegat.project">Contributing to OmegaT project</a></dt>
+                        <dt>Reporting bugs, <a class="indexterm" href="appendix.website.html#bug.reports">Bug reports</a></dt>
+                        <dt>SourceForge Project, <a class="indexterm" href="appendix.website.html#OmegaT.sites.and.OmegaT.SourceForge.project">OmegaT sites and
+                                  OmegaT SourceForge project</a></dt>
+                     </dl>
+                  </dd>
+                  <dt>OmegaT windows, <a class="indexterm" href="chapter.user.interface.html#OmegaT.main.window">OmegaT main window</a></dt>
+                  <dd>
+                     <dl>
+                        <dt>(see also Windows and panes in OmegaT)</dt>
+                        <dt>Restoring to factory setup, <a class="indexterm" href="chapter.user.interface.html#OmegaT.main.window">OmegaT main window</a></dt>
+                     </dl>
+                  </dd>
+                  <dt>OS X</dt>
+                  <dd>
+                     <dl>
+                        <dt>Adding OmegaT to the Dock, <a class="indexterm" href="chapter.installing.and.running.html#adding.OmegaT.to.the.dock">Adding OmegaT to the Dock</a></dt>
+                        <dd>
+                           <dl>
+                              <dt>(see also Customizing OmegaT)</dt>
+                           </dl>
+                        </dd>
+                        <dt>Customizing OmegaT, <a class="indexterm" href="chapter.installing.and.running.html#running.OmegaT.OSX">Running OmegaT</a></dt>
+                        <dd>
+                           <dl>
+                              <dt>Launch parameters, <a class="indexterm" href="chapter.installing.and.running.html#running.OmegaT.OSX">Running OmegaT</a></dt>
+                           </dl>
+                        </dd>
+                        <dt>Installing OmegaT, <a class="indexterm" href="chapter.installing.and.running.html#MAC.OSX.users">Mac OS X Users</a></dt>
+                        <dt>Running OmegaT, <a class="indexterm" href="chapter.installing.and.running.html#running.OmegaT.OSX">Running OmegaT</a></dt>
+                     </dl>
+                  </dd>
+               </dl>
+            </div>
+            <div class="indexdiv">
+               <h3>P</h3>
+               <dl>
+                  <dt>Project</dt>
+                  <dd>
+                     <dl>
+                        <dt>Changing the folder structure, <a class="indexterm" href="chapter.project.properties.html#language.modification">Modifying project properties</a></dt>
+                        <dt>Create / open new, <a class="indexterm" href="chapter.instant.start.guide.html#create.and.open.new.project">Creating and opening a new project</a></dt>
+                        <dt>Match statistics, <a class="indexterm" href="chapter.menu.html#submenu.Tools">Tools</a></dt>
+                        <dt>Modifying during the session, <a class="indexterm" href="chapter.project.properties.html#language.modification">Modifying project properties</a></dt>
+                        <dt>Modifying segmentation, <a class="indexterm" href="chapter.project.properties.html#language.modification">Modifying project properties</a></dt>
+                        <dt>Options, <a class="indexterm" href="chapter.segmentation.html">Source segmentation</a></dt>
+                        <dt>Pretranslation, <a class="indexterm" href="chapter.translation.memories.html#tmx.files.location.and.purpose">tmx folders - location and purpose</a></dt>
+                        <dt>Project dialog window - figure, <a class="indexterm" href="chapter.instant.start.guide.html#create.and.open.new.project">Creating and opening a new project</a></dt>
+                        <dt>Project management shortcuts, <a class="indexterm" href="chapter.menu.html#d0e3774">Project management</a></dt>
+                        <dt>Project Settings, <a class="indexterm" href="chapter.user.interface.html#dialogs.to.change.settings">Project settings dialogs </a></dt>
+                        <dt>Properties, <a class="indexterm" href="chapter.project.properties.html">Project properties</a>, <a class="indexterm" href="chapter.segmentation.html">Source segmentation</a>, <a class="indexterm" href="appendix.languages.html">Languages - ISO 639 code list
+                                
+                                
+                                
+                                </a></dt>
+                        <dd>
+                           <dl>
+                              <dt>(see also Languages)</dt>
+                           </dl>
+                        </dd>
+                        <dt>Source and target languages, <a class="indexterm" href="chapter.project.properties.html#language.modification">Modifying project properties</a></dt>
+                        <dt>Statistics, <a class="indexterm" href="chapter.menu.html#submenu.Tools">Tools</a></dt>
+                     </dl>
+                  </dd>
+                  <dt>Project files</dt>
+                  <dd>
+                     <dl>
+                        <dt>Application files, <a class="indexterm" href="chapter.files.and.directories.html#application.files">Application files</a></dt>
+                        <dt>Application folders, <a class="indexterm" href="chapter.files.and.directories.html#application.files">Application files</a></dt>
+                        <dt>File omegat.project, <a class="indexterm" href="chapter.files.and.directories.html#file.omegat.project">omegat.project</a></dt>
+                        <dt>Files project_name....tmx, <a class="indexterm" href="chapter.files.and.directories.html#file.omegat.project">omegat.project</a></dt>
+                        <dt>Glossary subfolder, <a class="indexterm" href="chapter.glossaries.html#d0e7551">Usage</a></dt>
+                        <dt>ignore_word and learned_word, <a class="indexterm" href="chapter.files.and.directories.html#folder.OmegaT">Omegat</a></dt>
+                        <dt>List, <a class="indexterm" href="chapter.files.and.directories.html#translation.project.files.list">Translation project files list</a></dt>
+                        <dt>Location, <a class="indexterm" href="chapter.files.and.directories.html#translation.project.files.location">Translation project files location</a></dt>
+                        <dt>Source files, <a class="indexterm" href="chapter.instant.start.guide.html#create.and.open.new.project">Creating and opening a new project</a></dt>
+                        <dt>Source subfolder, <a class="indexterm" href="chapter.files.and.directories.html#folder.source">Source files</a></dt>
+                        <dt>statistics file, <a class="indexterm" href="chapter.files.and.directories.html#folder.OmegaT">Omegat</a></dt>
+                        <dt>Subfolder omegat, <a class="indexterm" href="chapter.files.and.directories.html#folder.OmegaT">Omegat</a></dt>
+                        <dt>Target files, <a class="indexterm" href="chapter.instant.start.guide.html#create.translated.documents">Creating translated documents</a></dt>
+                        <dt>Target subfolder, <a class="indexterm" href="chapter.files.and.directories.html#folder.target">Target files</a></dt>
+                        <dt>User files, <a class="indexterm" href="chapter.files.and.directories.html#user.files">User files</a>, <a class="indexterm" href="chapter.glossaries.html#d0e7599">File format</a></dt>
+                        <dd>
+                           <dl>
+                              <dt>(see also Glossaries)</dt>
+                              <dt>Location, <a class="indexterm" href="chapter.files.and.directories.html#d0e4836">User files location </a></dt>
+                           </dl>
+                        </dd>
+                        <dt>User files list, <a class="indexterm" href="chapter.files.and.directories.html#user.files.list">User files list</a></dt>
+                     </dl>
+                  </dd>
+                  <dt>Project Settings</dt>
+                  <dd>
+                     <dl>
+                        <dt>Editing Behavior, <a class="indexterm" href="chapter.user.interface.html#dialogs.to.change.settings">Project settings dialogs </a></dt>
+                        <dt>File filters, <a class="indexterm" href="chapter.user.interface.html#dialogs.to.change.settings">Project settings dialogs </a></dt>
+                        <dt>Font, <a class="indexterm" href="chapter.user.interface.html#dialogs.to.change.settings">Project settings dialogs </a></dt>
+                        <dt>Segmentation, <a class="indexterm" href="chapter.user.interface.html#dialogs.to.change.settings">Project settings dialogs </a></dt>
+                     </dl>
+                  </dd>
+               </dl>
+            </div>
+            <div class="indexdiv">
+               <h3>R</h3>
+               <dl>
+                  <dt>Regular expressions, <a class="indexterm" href="chapter.regexp.html">Regular expressions</a></dt>
+                  <dd>
+                     <dl>
+                        <dt>(see also Searching)</dt>
+                        <dt>(see also Segmentation)</dt>
+                        <dt>Examples of use, <a class="indexterm" href="chapter.regexp.html#regex.tools.and.examples.of.use">Regex tools and examples of use</a></dt>
+                        <dt>Tools, <a class="indexterm" href="chapter.regexp.html#regex.tools.and.examples.of.use">Regex tools and examples of use</a></dt>
+                     </dl>
+                  </dd>
+                  <dt>Right to left languages, <a class="indexterm" href="chapter.files.to.translate.html#right.to.left.languages">Right to left languages</a></dt>
+                  <dd>
+                     <dl>
+                        <dt>Creating RTL target files, <a class="indexterm" href="chapter.files.to.translate.html#d0e5400">Creating translated RTL documents</a></dt>
+                        <dt>Creating RTL target text, <a class="indexterm" href="chapter.files.to.translate.html#d0e5400">Creating translated RTL documents</a></dt>
+                        <dt>Mixing RTL and LTR strings, <a class="indexterm" href="chapter.files.to.translate.html#d0e5363">Mixing RTL and LTR strings in segments</a></dt>
+                        <dt>OmegaT tags in RTL languages, <a class="indexterm" href="chapter.files.to.translate.html#d0e5386">OmegaT tags in RTL segments</a></dt>
+                        <dt>Target files, <a class="indexterm" href="chapter.files.to.translate.html#d0e5400">Creating translated RTL documents</a></dt>
+                     </dl>
+                  </dd>
+                  <dt>Running OmegaT</dt>
+                  <dd>
+                     <dl>
+                        <dt>Building OmegaT from source, <a class="indexterm" href="chapter.installing.and.running.html#building.OmegaT.from.source">Building OmegaT From Source</a></dt>
+                        <dt>Command line launching, <a class="indexterm" href="chapter.installing.and.running.html#d0e1460">Starting OmegaT from the command line</a></dt>
+                        <dt>Command line mode, <a class="indexterm" href="chapter.installing.and.running.html#omegat.command.arguments">OmegaT in the command line mode</a></dt>
+                        <dt>Launch script arguments, <a class="indexterm" href="chapter.installing.and.running.html#launch.command.arguments">Launch command arguments</a></dt>
+                        <dd>
+                           <dl>
+                              <dt>Font antialiasing, <a class="indexterm" href="chapter.installing.and.running.html#launch.command.arguments">Launch command arguments</a></dt>
+                              <dt>Memory assignment, <a class="indexterm" href="chapter.installing.and.running.html#launch.command.arguments">Launch command arguments</a></dt>
+                              <dt>Proxy server - Port Number, <a class="indexterm" href="chapter.installing.and.running.html#launch.command.arguments">Launch command arguments</a></dt>
+                              <dt>Proxy server IOP address, <a class="indexterm" href="chapter.installing.and.running.html#launch.command.arguments">Launch command arguments</a></dt>
+                              <dt>User.country, <a class="indexterm" href="chapter.installing.and.running.html#launch.command.arguments">Launch command arguments</a></dt>
+                              <dt>User.language, <a class="indexterm" href="chapter.installing.and.running.html#launch.command.arguments">Launch command arguments</a></dt>
+                           </dl>
+                        </dd>
+                        <dt>Linux, <a class="indexterm" href="chapter.installing.and.running.html#running.OmegaT.Linux">Running OmegaT</a></dt>
+                        <dt>OS X, <a class="indexterm" href="chapter.installing.and.running.html#running.OmegaT.OSX">Running OmegaT</a></dt>
+                        <dt>Other systems, <a class="indexterm" href="chapter.installing.and.running.html#running.OmegaT.other">Running OmegaT</a></dt>
+                        <dt>Using Java Web Start, <a class="indexterm" href="chapter.installing.and.running.html#using.Java.Web.Start">Using Java Web Start</a></dt>
+                        <dt>Windows, <a class="indexterm" href="chapter.installing.and.running.html#running.OmegaT.Windows">Running OmegaT</a></dt>
+                        <dd>
+                           <dl>
+                              <dt>INI file, <a class="indexterm" href="chapter.installing.and.running.html#running.OmegaT.Windows">Running OmegaT</a></dt>
+                           </dl>
+                        </dd>
+                     </dl>
+                  </dd>
+               </dl>
+            </div>
+            <div class="indexdiv">
+               <h3>S</h3>
+               <dl>
+                  <dt>Search window</dt>
+                  <dd>
+                     <dl>
+                        <dt>Example, <a class="indexterm" href="chapter.searches.html#search.window">Search window</a></dt>
+                     </dl>
+                  </dd>
+                  <dt>Searches, <a class="indexterm" href="chapter.searches.html">Searches</a></dt>
+                  <dd>
+                     <dl>
+                        <dt>Advanced Options, <a class="indexterm" href="chapter.searches.html#d0e7203">Search location</a></dt>
+                        <dt>Methods, <a class="indexterm" href="chapter.searches.html#search.methoids">Search methods</a></dt>
+                        <dt>Using wild cards, <a class="indexterm" href="chapter.searches.html#using.wild.cards">Using wild cards</a></dt>
+                     </dl>
+                  </dd>
+                  <dt>Segment marker, <a class="indexterm" href="chapter.user.interface.html#editor.pane">Editor pane</a></dt>
+                  <dt>Segment, Source and Target - figure, <a class="indexterm" href="chapter.instant.start.guide.html#d0e680">An example...</a></dt>
+                  <dt>Segmentation</dt>
+                  <dd>
+                     <dl>
+                        <dt>Creating a new rule, <a class="indexterm" href="chapter.segmentation.html#creating.new.rule">Creating a new rule</a></dt>
+                        <dd>
+                           <dl>
+                              <dt>(see also Regular expressions)</dt>
+                           </dl>
+                        </dd>
+                        <dt>Examples, <a class="indexterm" href="chapter.segmentation.html#few.simple.examples">A few simple examples</a></dt>
+                        <dt>Rules, <a class="indexterm" href="chapter.segmentation.html#segmentation.rules">Segmentation rules</a></dt>
+                        <dd>
+                           <dl>
+                              <dt>Break rule, <a class="indexterm" href="chapter.segmentation.html#segmentation.rules">Segmentation rules</a></dt>
+                              <dt>Exception rule, <a class="indexterm" href="chapter.segmentation.html#segmentation.rules">Segmentation rules</a></dt>
+                           </dl>
+                        </dd>
+                        <dt>Rules priority, <a class="indexterm" href="chapter.segmentation.html#rules.priority">Rule priority</a></dt>
+                        <dt>Segmentation rules, <a class="indexterm" href="chapter.instant.start.guide.html#create.and.open.new.project">Creating and opening a new project</a></dt>
+                        <dt>Sentence level segmentation, <a class="indexterm" href="chapter.segmentation.html">Source segmentation</a></dt>
+                        <dt>Source level segmentation, <a class="indexterm" href="chapter.segmentation.html">Source segmentation</a></dt>
+                     </dl>
+                  </dd>
+                  <dt>Shortcuts</dt>
+                  <dd>
+                     <dl>
+                        <dt>Ctrl+A - Select All, <a class="indexterm" href="chapter.user.interface.html#d0e2785">Match statistics</a></dt>
+                        <dt>Ctrl+C - copy text, <a class="indexterm" href="chapter.user.interface.html#d0e2785">Match statistics</a></dt>
+                        <dt>Ctrl+D - Create Translated Documents, <a class="indexterm" href="chapter.instant.start.guide.html#create.translated.documents">Creating translated documents</a></dt>
+                        <dt>Ctrl+E - Project properties, <a class="indexterm" href="chapter.user.interface.html#dialogs.to.change.settings">Project settings dialogs </a>, <a class="indexterm" href="chapter.dictionaries.html#d0e7494">Problems with dictionaries</a></dt>
+                        <dt>Ctrl+F - Search, <a class="indexterm" href="chapter.searches.html#d0e7179">Searching</a></dt>
+                        <dt>Ctrl+F - Search window, <a class="indexterm" href="chapter.user.interface.html#windows.you.will.use.frequently">Frequently used windows</a></dt>
+                        <dt>Ctrl+I - Insert text, <a class="indexterm" href="chapter.instant.start.guide.html#translation.memory.matches">Translation memory matches</a>, <a class="indexterm" href="chapter.user.interface.html#match.viewer">Match viewer</a></dt>
+                        <dt>Ctrl+L - Project files list, <a class="indexterm" href="chapter.user.interface.html#section.project.files">Project files</a></dt>
+                        <dt>Ctrl+L - Project files window, <a class="indexterm" href="chapter.user.interface.html#windows.you.will.use.frequently">Frequently used windows</a></dt>
+                        <dt>Ctrl+M - Machine Translate, <a class="indexterm" href="chapter.machine.translate.html#d0e7825">OmegaT users and Google
+                                  Translate</a></dt>
+                        <dt>Ctrl+N - Selecting the match, <a class="indexterm" href="chapter.user.interface.html#match.viewer">Match viewer</a></dt>
+                        <dt>Ctrl+R - Replace text, <a class="indexterm" href="chapter.instant.start.guide.html#translation.memory.matches">Translation memory matches</a>, <a class="indexterm" href="chapter.user.interface.html#match.viewer">Match viewer</a></dt>
+                        <dt>Ctrl+T - Tag validation, <a class="indexterm" href="chapter.formatted.text.html#tag.group.validation">Tag group validation</a></dt>
+                        <dt>Ctrl+T - Tag validation window, <a class="indexterm" href="chapter.user.interface.html#windows.you.may.use.now.and.then">Less frequently used</a></dt>
+                        <dt>Ctrl+T - Tag verification, <a class="indexterm" href="chapter.instant.start.guide.html#tag.verification">Tag verification</a></dt>
+                        <dd>
+                           <dl>
+                              <dt>(see also Tagged text)</dt>
+                           </dl>
+                        </dd>
+                        <dt>Ctrl+V - Paste text, <a class="indexterm" href="chapter.user.interface.html#d0e2785">Match statistics</a></dt>
+                        <dt>F1 - Help, <a class="indexterm" href="chapter.user.interface.html#windows.you.may.use.now.and.then">Less frequently used</a>, <a class="indexterm" href="chapter.user.interface.html#d0e2868">Help browser</a></dt>
+                        <dt>Main menu, <a class="indexterm" href="chapter.menu.html#ch04.main.menu">Main Menu</a></dt>
+                        <dt>Shift+F3 - Case selection, <a class="indexterm" href="chapter.menu.html#d0e3107">Edit</a></dt>
+                     </dl>
+                  </dd>
+                  <dt>Source files</dt>
+                  <dd>
+                     <dl>
+                        <dt>Adding files to the project, <a class="indexterm" href="chapter.user.interface.html#section.project.files">Project files</a></dt>
+                        <dt>Default encoding, <a class="indexterm" href="chapter.plain.text.html#default.encoding">Default encoding</a></dt>
+                        <dt>Encoding, <a class="indexterm" href="chapter.file.filters.html#source.and.target.files.encoding">Source and Target file encoding</a></dt>
+                        <dt>File formats, <a class="indexterm" href="chapter.instant.start.guide.html#create.and.open.new.project">Creating and opening a new project</a>, <a class="indexterm" href="chapter.files.to.translate.html#file.formats">File formats</a></dt>
+                        <dt>File type, filename pattern, <a class="indexterm" href="chapter.file.filters.html#source.filetype.and.filename.pattern">Source file type, filename pattern</a></dt>
+                        <dt>Formatted text, <a class="indexterm" href="chapter.formatted.text.html">Working with formatted text</a></dt>
+                        <dt>Formatted text files, <a class="indexterm" href="chapter.files.to.translate.html#d0e5148">Formatted text files</a></dt>
+                        <dt>Mixing RTL and LTR string, <a class="indexterm" href="chapter.files.to.translate.html#d0e5363">Mixing RTL and LTR strings in segments</a></dt>
+                        <dt>Other file formats, <a class="indexterm" href="chapter.files.to.translate.html#other.file.formats">Other file formats</a></dt>
+                        <dt>Plain text files, <a class="indexterm" href="chapter.files.to.translate.html#d0e5088">Plain text files</a>, <a class="indexterm" href="chapter.plain.text.html">Working with plain text</a></dt>
+                        <dt>Right to left languages, <a class="indexterm" href="chapter.files.to.translate.html#right.to.left.languages">Right to left languages</a></dt>
+                     </dl>
+                  </dd>
+                  <dt>Spell checker, <a class="indexterm" href="chapter.spellchecker.html">Spell checker</a></dt>
+                  <dd>
+                     <dl>
+                        <dt>Hints, <a class="indexterm" href="chapter.spellchecker.html#hints">Hints</a></dt>
+                        <dt>Spell checker - figure, <a class="indexterm" href="chapter.spellchecker.html#d0e8015">Using spelling dictionaries</a></dt>
+                     </dl>
+                  </dd>
+                  <dt>Stardict, <a class="indexterm" href="chapter.dictionaries.html#d0e7386">How to download and install dictionaries</a></dt>
+                  <dd>
+                     <dl>
+                        <dt>(see also Dictionaries)</dt>
+                     </dl>
+                  </dd>
+               </dl>
+            </div>
+            <div class="indexdiv">
+               <h3>T</h3>
+               <dl>
+                  <dt>Tag validation, <a class="indexterm" href="chapter.user.interface.html#section.tag.validation">Tag validation</a></dt>
+                  <dd>
+                     <dl>
+                        <dt>(see also Shortcuts, Tags)</dt>
+                        <dt>Window - figure, <a class="indexterm" href="chapter.user.interface.html#section.tag.validation">Tag validation</a></dt>
+                        <dd>
+                           <dl>
+                              <dt>(see also Tags)</dt>
+                           </dl>
+                        </dd>
+                     </dl>
+                  </dd>
+                  <dt>Tag Verification, <a class="indexterm" href="chapter.instant.start.guide.html#tag.verification">Tag verification</a></dt>
+                  <dt>Tagged text, <a class="indexterm" href="chapter.instant.start.guide.html#how.to.handle.tagged.text">Handling tagged text</a></dt>
+                  <dd>
+                     <dl>
+                        <dt>An example, <a class="indexterm" href="chapter.instant.start.guide.html#d0e680">An example...</a></dt>
+                        <dt>Tag verification, <a class="indexterm" href="chapter.instant.start.guide.html#tag.verification">Tag verification</a></dt>
+                     </dl>
+                  </dd>
+                  <dt>Tags, <a class="indexterm" href="chapter.formatted.text.html#formatting.tags">Formatting tags</a></dt>
+                  <dd>
+                     <dl>
+                        <dt>Duplication, <a class="indexterm" href="chapter.formatted.text.html#tag.operations">Tag operations</a></dt>
+                        <dt>Group deletion, <a class="indexterm" href="chapter.formatted.text.html#tag.operations">Tag operations</a></dt>
+                        <dt>Group nesting, <a class="indexterm" href="chapter.formatted.text.html#tag.group.nesting">Tag group nesting</a></dt>
+                        <dt>Group overlapping, <a class="indexterm" href="chapter.formatted.text.html#tag.group.overlapping">Tag group overlapping</a></dt>
+                        <dt>Group validation, <a class="indexterm" href="chapter.formatted.text.html#tag.group.validation">Tag group validation</a></dt>
+                        <dt>Hints, <a class="indexterm" href="chapter.formatted.text.html#hints.for.tag.management">Hints for tags management</a></dt>
+                        <dt>Inserting source tags, <a class="indexterm" href="chapter.menu.html#d0e3107">Edit</a></dt>
+                        <dt>Naming, <a class="indexterm" href="chapter.formatted.text.html#formatting.tags">Formatting tags</a></dt>
+                        <dt>Numbering, <a class="indexterm" href="chapter.formatted.text.html#formatting.tags">Formatting tags</a></dt>
+                        <dt>Operations, <a class="indexterm" href="chapter.formatted.text.html#tag.operations">Tag operations</a></dt>
+                        <dt>Pairs and singles, <a class="indexterm" href="chapter.formatted.text.html#formatting.tags">Formatting tags</a></dt>
+                     </dl>
+                  </dd>
+                  <dt>Target files</dt>
+                  <dd>
+                     <dl>
+                        <dt>Encoding, <a class="indexterm" href="chapter.file.filters.html#source.and.target.files.encoding">Source and Target file encoding</a></dt>
+                        <dt>File conversion tools, <a class="indexterm" href="chapter.files.to.translate.html#other.file.formats">Other file formats</a></dt>
+                        <dt>File formats, <a class="indexterm" href="chapter.files.to.translate.html#file.formats">File formats</a></dt>
+                        <dt>Filenames, <a class="indexterm" href="chapter.file.filters.html#target.name">Target filename</a></dt>
+                        <dt>Formatted text, <a class="indexterm" href="chapter.formatted.text.html">Working with formatted text</a></dt>
+                        <dt>Formatted text files, <a class="indexterm" href="chapter.files.to.translate.html#d0e5148">Formatted text files</a></dt>
+                        <dd>
+                           <dl>
+                              <dt>(see also Tagged text)</dt>
+                           </dl>
+                        </dd>
+                        <dt>Mixing RTL and LTR strings, <a class="indexterm" href="chapter.files.to.translate.html#d0e5363">Mixing RTL and LTR strings in segments</a></dt>
+                        <dt>Other file formats, <a class="indexterm" href="chapter.files.to.translate.html#other.file.formats">Other file formats</a></dt>
+                        <dt>Plain text files, <a class="indexterm" href="chapter.files.to.translate.html#d0e5088">Plain text files</a></dt>
+                        <dt>Right to left languages, <a class="indexterm" href="chapter.files.to.translate.html#right.to.left.languages">Right to left languages</a></dt>
+                     </dl>
+                  </dd>
+                  <dt>Translation equal to source, <a class="indexterm" href="chapter.translation.editing.html#allow.translation.equal.to.source">Allow the translation to be equal to source</a></dt>
+                  <dt>Translation memories, <a class="indexterm" href="chapter.translation.memories.html">Translation memories</a></dt>
+                  <dd>
+                     <dl>
+                        <dt>Backup, <a class="indexterm" href="chapter.translation.memories.html#tmx.backup">tmx backup</a></dt>
+                        <dt>Fuzzy matches, <a class="indexterm" href="chapter.instant.start.guide.html#translation.memory.matches">Translation memory matches</a></dt>
+                        <dt>Import and export, <a class="indexterm" href="chapter.translation.memories.html#using.translation.memories.from.previous.projects">Reusing translation memories</a></dt>
+                        <dt>Language, <a class="indexterm" href="chapter.translation.memories.html#tmx.files.and.language">tmx files and language</a></dt>
+                        <dt>Matches, <a class="indexterm" href="chapter.instant.start.guide.html#translation.memory.matches">Translation memory matches</a>, <a class="indexterm" href="chapter.user.interface.html#match.viewer">Match viewer</a></dt>
+                        <dt>Orphan segments, <a class="indexterm" href="chapter.user.interface.html#match.viewer">Match viewer</a>, <a class="indexterm" href="chapter.translation.memories.html#d0e6262">Orphan segments</a></dt>
+                        <dt>Project main folder, <a class="indexterm" href="chapter.translation.memories.html#tmx.files.location.and.purpose">tmx folders - location and purpose</a></dt>
+                        <dt>Pseudotranslation, <a class="indexterm" href="chapter.translation.memories.html#pseudo.translated.memory">Pseudo-translated memory</a></dt>
+                        <dt>Reusing translation memories, <a class="indexterm" href="chapter.translation.memories.html#using.translation.memories.from.previous.projects">Reusing translation memories</a></dt>
+                        <dt>Subfolder omegat, <a class="indexterm" href="chapter.translation.memories.html#tmx.files.location.and.purpose">tmx folders - location and purpose</a></dt>
+                        <dd>
+                           <dl>
+                              <dt>(see also Project files)</dt>
+                           </dl>
+                        </dd>
+                        <dt>Subfolder tm, <a class="indexterm" href="chapter.translation.memories.html#tmx.files.location.and.purpose">tmx folders - location and purpose</a></dt>
+                        <dd>
+                           <dl>
+                              <dt>(see also Project files)</dt>
+                           </dl>
+                        </dd>
+                        <dt>Subfolder tm/auto, <a class="indexterm" href="chapter.translation.memories.html#tmx.files.location.and.purpose">tmx folders - location and purpose</a></dt>
+                        <dd>
+                           <dl>
+                              <dt>(see also Project files)</dt>
+                           </dl>
+                        </dd>
+                        <dt>Upgrading to sentence segmentation, <a class="indexterm" href="chapter.translation.memories.html#upgrading.translation.memories">Upgrading translation memories</a></dt>
+                     </dl>
+                  </dd>
+               </dl>
+            </div>
+            <div class="indexdiv">
+               <h3>U</h3>
+               <dl>
+                  <dt>Upgrading OmegaT</dt>
+                  <dd>
+                     <dl>
+                        <dt>Windows, <a class="indexterm" href="chapter.installing.and.running.html#d0e886">Upgrading OmegaT </a></dt>
+                     </dl>
+                  </dd>
+               </dl>
+            </div>
+            <div class="indexdiv">
+               <h3>W</h3>
+               <dl>
+                  <dt>Webster, <a class="indexterm" href="chapter.dictionaries.html#d0e7386">How to download and install dictionaries</a></dt>
+                  <dd>
+                     <dl>
+                        <dt>(see also Dictionaries)</dt>
+                     </dl>
+                  </dd>
+                  <dt>Windows and panes in OmegaT, <a class="indexterm" href="chapter.user.interface.html#windows.you.will.use.frequently">Frequently used windows</a></dt>
+                  <dd>
+                     <dl>
+                        <dt>Counters, <a class="indexterm" href="chapter.user.interface.html#OmegaT.main.window">OmegaT main window</a></dt>
+                        <dt>Dictionary pane, <a class="indexterm" href="chapter.user.interface.html#dictionaries">Dictionary viewer</a></dt>
+                        <dt>Editor pane, <a class="indexterm" href="chapter.user.interface.html#editor.pane">Editor pane</a></dt>
+                        <dt>Glossary pane, <a class="indexterm" href="chapter.user.interface.html#d0e2555">Glossary</a>, <a class="indexterm" href="chapter.glossaries.html">Glossaries</a></dt>
+                        <dt>Machine Translation, <a class="indexterm" href="chapter.user.interface.html#Google.Translate">Machine Translation</a></dt>
+                        <dt>Main window, <a class="indexterm" href="chapter.user.interface.html#OmegaT.main.window">OmegaT main window</a></dt>
+                        <dd>
+                           <dl>
+                              <dt>- figure, <a class="indexterm" href="chapter.user.interface.html#OmegaT.main.window">OmegaT main window</a></dt>
+                           </dl>
+                        </dd>
+                        <dt>Matches pane - figure, <a class="indexterm" href="chapter.user.interface.html#match.viewer">Match viewer</a></dt>
+                        <dt>Pane widgets, <a class="indexterm" href="chapter.user.interface.html#OmegaT.main.window">OmegaT main window</a></dt>
+                        <dt>Project files, <a class="indexterm" href="chapter.user.interface.html#section.project.files">Project files</a></dt>
+                        <dt>Search pane, <a class="indexterm" href="chapter.user.interface.html#section.search.window">Search window</a></dt>
+                        <dt>Tag validation, <a class="indexterm" href="chapter.user.interface.html#section.tag.validation">Tag validation</a></dt>
+                        <dd>
+                           <dl>
+                              <dt>(see also Tags)</dt>
+                           </dl>
+                        </dd>
+                     </dl>
+                  </dd>
+                  <dt>Windows in OmegaT, <a class="indexterm" href="chapter.instant.start.guide.html#d0e184">Start Using OmegaT in 5 Minutes!</a></dt>
+               </dl>
+            </div>
+         </div>
+      </div>
+      <div class="navfooter">
+         <hr>
+         <table width="100%" summary="Navigation footer">
+            <tr>
+               <td width="40%" align="left"><a accesskey="p" href="appendix.acknowledgements.html">Prev</a> 
+               </td>
+               <td width="20%" align="center"> </td>
+               <td width="40%" align="right"> </td>
+            </tr>
+            <tr>
+               <td width="40%" align="left" valign="top">Appendix E. Acknowledgements </td>
+               <td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td>
+               <td width="40%" align="right" valign="top"> </td>
+            </tr>
+         </table>
+      </div>
+   </body>
+</html>
\ No newline at end of file
diff --git a/docs/en/languages.html b/docs/en/languages.html
deleted file mode 100644
index 8b75a77..0000000
--- a/docs/en/languages.html
+++ /dev/null
@@ -1,636 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-
-<html>
-<head>
-  <link rel="stylesheet" href="./OmegaT.css" type="text/css">
-  <meta http-equiv="content-type" content="text/html; charset=utf-8">
-
-  <title>Languages and language codes - ISO 639.2 code list</title>
-</head>
-
-<body>
-  <h2>Languages - ISO 639.2 code list</h2>
-
-  <p>Please check the <a href="http://www.sil.org/ISO639-3/codes.asp">ISO 639
-  Code Tables</a> for further and up-to-date information about language
-  codes.</p>
-
-  <table summary="just formatting" border="0" cellpadding="3" cellspacing="0">
-    <tbody>
-      <tr>
-        <td style="" width="40%">
-          <h3>Name</h3>
-        </td>
-
-        <td style="" width="40%">
-          <h3>ISO Code</h3>
-        </td>
-      </tr>
-
-      <tr>
-        <td>Afrikaans</td>
-
-        <td>af</td>
-      </tr>
-
-      <tr bgcolor="#DDDDDD">
-        <td>Amharic</td>
-
-        <td>am</td>
-      </tr>
-
-      <tr>
-        <td>Arabic</td>
-
-        <td>ar</td>
-      </tr>
-
-      <tr bgcolor="#DDDDDD">
-        <td>Assamese (India)</td>
-
-        <td>as-IN</td>
-      </tr>
-
-      <tr>
-        <td>Azerbaijani</td>
-
-        <td>az</td>
-      </tr>
-
-      <tr bgcolor="#DDDDDD">
-        <td>Belarusian</td>
-
-        <td>be</td>
-      </tr>
-
-      <tr>
-        <td>Belarusian (Belarus)</td>
-
-        <td>be-BY</td>
-      </tr>
-
-      <tr bgcolor="#DDDDDD">
-        <td>Bulgarian</td>
-
-        <td>bg</td>
-      </tr>
-
-      <tr>
-        <td>Bengali</td>
-
-        <td>bn</td>
-      </tr>
-
-      <tr bgcolor="#DDDDDD">
-        <td>Bengali (Bangladesh)</td>
-
-        <td>bn-BD</td>
-      </tr>
-
-      <tr>
-        <td>Bengali (India)</td>
-
-        <td>bn-IN</td>
-      </tr>
-
-      <tr bgcolor="#DDDDDD">
-        <td>Breton</td>
-
-        <td>br</td>
-      </tr>
-
-      <tr>
-        <td>Bosnian</td>
-
-        <td>bs</td>
-      </tr>
-
-      <tr bgcolor="#DDDDDD">
-        <td>Bosnian (Bosnia)</td>
-
-        <td>bs-BA</td>
-      </tr>
-
-      <tr>
-        <td>Catalan</td>
-
-        <td>ca</td>
-      </tr>
-
-      <tr bgcolor="#DDDDDD">
-        <td>Czech</td>
-
-        <td>cs</td>
-      </tr>
-
-      <tr>
-        <td>Welsh</td>
-
-        <td>cy</td>
-      </tr>
-
-      <tr bgcolor="#DDDDDD">
-        <td>Danish</td>
-
-        <td>da</td>
-      </tr>
-
-      <tr>
-        <td>German</td>
-
-        <td>de</td>
-      </tr>
-
-      <tr bgcolor="#DDDDDD">
-        <td>Dzongkha</td>
-
-        <td>dz</td>
-      </tr>
-
-      <tr>
-        <td>Greek</td>
-
-        <td>el</td>
-      </tr>
-
-      <tr bgcolor="#DDDDDD">
-        <td>English (GB)</td>
-
-        <td>en-GB</td>
-      </tr>
-
-      <tr>
-        <td>English (USA)</td>
-
-        <td>en-US</td>
-      </tr>
-
-      <tr bgcolor="#DDDDDD">
-        <td>English (South Africa)</td>
-
-        <td>en-ZA</td>
-      </tr>
-
-      <tr>
-        <td>Esperanto</td>
-
-        <td>eo</td>
-      </tr>
-
-      <tr bgcolor="#DDDDDD">
-        <td>Spanish</td>
-
-        <td>es</td>
-      </tr>
-
-      <tr>
-        <td>Estonian</td>
-
-        <td>et</td>
-      </tr>
-
-      <tr bgcolor="#DDDDDD">
-        <td>Basque</td>
-
-        <td>eu</td>
-      </tr>
-
-      <tr>
-        <td>Farsi</td>
-
-        <td>fa</td>
-      </tr>
-
-      <tr bgcolor="#DDDDDD">
-        <td>Finnish</td>
-
-        <td>fi</td>
-      </tr>
-
-      <tr>
-        <td>French</td>
-
-        <td>fr</td>
-      </tr>
-
-      <tr bgcolor="#DDDDDD">
-        <td>French (Canada)</td>
-
-        <td>fr-CA</td>
-      </tr>
-
-      <tr>
-        <td>Irish</td>
-
-        <td>ga</td>
-      </tr>
-
-      <tr bgcolor="#DDDDDD">
-        <td>Gaelic (Scotland)</td>
-
-        <td>gd</td>
-      </tr>
-
-      <tr>
-        <td>Galician</td>
-
-        <td>gl</td>
-      </tr>
-
-      <tr bgcolor="#DDDDDD">
-        <td>Gujarati</td>
-
-        <td>gu-IN</td>
-      </tr>
-
-      <tr>
-        <td>Hebrew</td>
-
-        <td>he</td>
-      </tr>
-
-      <tr bgcolor="#DDDDDD">
-        <td>Hindi</td>
-
-        <td>hi-IN</td>
-      </tr>
-
-      <tr>
-        <td>Croatian</td>
-
-        <td>hr</td>
-      </tr>
-
-      <tr bgcolor="#DDDDDD">
-        <td>Upper Sorbian</td>
-
-        <td>hsb</td>
-      </tr>
-
-      <tr>
-        <td>Hungarian</td>
-
-        <td>hu</td>
-      </tr>
-
-      <tr bgcolor="#DDDDDD">
-        <td>Italian</td>
-
-        <td>it</td>
-      </tr>
-
-      <tr>
-        <td>Japanese</td>
-
-        <td>ja</td>
-      </tr>
-
-      <tr bgcolor="#DDDDDD">
-        <td>Khmer Cambodia</td>
-
-        <td>km</td>
-      </tr>
-
-      <tr>
-        <td>Kannada</td>
-
-        <td>kn-IN</td>
-      </tr>
-
-      <tr bgcolor="#DDDDDD">
-        <td>Korean</td>
-
-        <td>ko</td>
-      </tr>
-
-      <tr>
-        <td>Kurdish</td>
-
-        <td>ku</td>
-      </tr>
-
-      <tr bgcolor="#DDDDDD">
-        <td>Lao</td>
-
-        <td>lo</td>
-      </tr>
-
-      <tr>
-        <td>Lithuanian</td>
-
-        <td>lt</td>
-      </tr>
-
-      <tr bgcolor="#DDDDDD">
-        <td>Latvian</td>
-
-        <td>lv</td>
-      </tr>
-
-      <tr>
-        <td>Macedonian</td>
-
-        <td>mk</td>
-      </tr>
-
-      <tr bgcolor="#DDDDDD">
-        <td>Malayalam</td>
-
-        <td>ml</td>
-      </tr>
-
-      <tr>
-        <td>Malayalam (India)</td>
-
-        <td>ml-IN</td>
-      </tr>
-
-      <tr bgcolor="#DDDDDD">
-        <td>Mongolian</td>
-
-        <td>mn</td>
-      </tr>
-
-      <tr>
-        <td>Marathi</td>
-
-        <td>mr-IN</td>
-      </tr>
-
-      <tr bgcolor="#DDDDDD">
-        <td>Malay</td>
-
-        <td>ms</td>
-      </tr>
-
-      <tr>
-        <td>Norwegian Bokmål</td>
-
-        <td>nb</td>
-      </tr>
-
-      <tr bgcolor="#DDDDDD">
-        <td>Nepali</td>
-
-        <td>ne</td>
-      </tr>
-
-      <tr>
-        <td>Dutch</td>
-
-        <td>nl</td>
-      </tr>
-
-      <tr bgcolor="#DDDDDD">
-        <td>Norwegian Nynorsk</td>
-
-        <td>nn</td>
-      </tr>
-
-      <tr>
-        <td>Southern Ndebele</td>
-
-        <td>nr</td>
-      </tr>
-
-      <tr bgcolor="#DDDDDD">
-        <td>Northern Sotho, Pedi, Sepedi</td>
-
-        <td>nso</td>
-      </tr>
-
-      <tr>
-        <td>Oriya</td>
-
-        <td>or</td>
-      </tr>
-
-      <tr bgcolor="#DDDDDD">
-        <td>Oriya (India)</td>
-
-        <td>or-IN</td>
-      </tr>
-
-      <tr>
-        <td>Punjabi</td>
-
-        <td>pa-IN</td>
-      </tr>
-
-      <tr bgcolor="#DDDDDD">
-        <td>Papiamento</td>
-
-        <td>pap</td>
-      </tr>
-
-      <tr>
-        <td>Polish</td>
-
-        <td>pl</td>
-      </tr>
-
-      <tr bgcolor="#DDDDDD">
-        <td>Portuguese</td>
-
-        <td>pt</td>
-      </tr>
-
-      <tr>
-        <td>Portuguese (Brazil)</td>
-
-        <td>pt-BR</td>
-      </tr>
-
-      <tr bgcolor="#DDDDDD">
-        <td>Romanian</td>
-
-        <td>ro</td>
-      </tr>
-
-      <tr>
-        <td>Russian</td>
-
-        <td>ru</td>
-      </tr>
-
-      <tr bgcolor="#DDDDDD">
-        <td>Kinyarwanda</td>
-
-        <td>rw</td>
-      </tr>
-
-      <tr>
-        <td>Serbo-Croatian</td>
-
-        <td>sh-YU</td>
-      </tr>
-
-      <tr bgcolor="#DDDDDD">
-        <td>Slovak</td>
-
-        <td>sk</td>
-      </tr>
-
-      <tr>
-        <td>Slovenian</td>
-
-        <td>sl</td>
-      </tr>
-
-      <tr bgcolor="#DDDDDD">
-        <td>Albanian</td>
-
-        <td>sq</td>
-      </tr>
-
-      <tr>
-        <td>Serbian</td>
-
-        <td>sr-CS</td>
-      </tr>
-
-      <tr bgcolor="#DDDDDD">
-        <td>Swati</td>
-
-        <td>ss</td>
-      </tr>
-
-      <tr>
-        <td>Southern Sotho</td>
-
-        <td>sot-st</td>
-      </tr>
-
-      <tr bgcolor="#DDDDDD">
-        <td>Swedish</td>
-
-        <td>sv</td>
-      </tr>
-
-      <tr>
-        <td>Swahili</td>
-
-        <td>sw</td>
-      </tr>
-
-      <tr bgcolor="#DDDDDD">
-        <td>Swahili (Tanzania)</td>
-
-        <td>sw-TZ</td>
-      </tr>
-
-      <tr>
-        <td>Tamil</td>
-
-        <td>ta-IN</td>
-      </tr>
-
-      <tr bgcolor="#DDDDDD">
-        <td>Telugu (India)</td>
-
-        <td>te-IN</td>
-      </tr>
-
-      <tr>
-        <td>Tajik</td>
-
-        <td>tg</td>
-      </tr>
-
-      <tr bgcolor="#DDDDDD">
-        <td>Thai</td>
-
-        <td>th</td>
-      </tr>
-
-      <tr>
-        <td>Tigrinya (Eritrea)</td>
-
-        <td>ti-ER</td>
-      </tr>
-
-      <tr bgcolor="#DDDDDD">
-        <td>Tswana</td>
-
-        <td>tn</td>
-      </tr>
-
-      <tr>
-        <td>Turkish</td>
-
-        <td>tr</td>
-      </tr>
-
-      <tr bgcolor="#DDDDDD">
-        <td>Tsonga</td>
-
-        <td>ts</td>
-      </tr>
-
-      <tr>
-        <td>Ukrainian</td>
-
-        <td>uk</td>
-      </tr>
-
-      <tr bgcolor="#DDDDDD">
-        <td>Urdu (India)</td>
-
-        <td>ur-IN</td>
-      </tr>
-
-      <tr>
-        <td>Venda</td>
-
-        <td>ve</td>
-      </tr>
-
-      <tr bgcolor="#DDDDDD">
-        <td>Vietnamese</td>
-
-        <td>vi</td>
-      </tr>
-
-      <tr>
-        <td>Xhosa</td>
-
-        <td>xh</td>
-      </tr>
-
-      <tr bgcolor="#DDDDDD">
-        <td>Chinese (simplified)</td>
-
-        <td>zh-CN</td>
-      </tr>
-
-      <tr>
-        <td>Chinese (traditional)</td>
-
-        <td>zh-TW</td>
-      </tr>
-
-      <tr bgcolor="#DDDDDD">
-        <td>Zulu</td>
-
-        <td>zu</td>
-      </tr>
-    </tbody>
-  </table>
-  <hr>
-
-  <table style="width: 100%;" summary="just formatting" border="0" cellpadding=
-  "2" cellspacing="2">
-    <tbody>
-      <tr>
-        <td style="text-align: left;"><a href="legalNotices.html">Legal
-        notices</a></td>
-
-        <td style="text-align: center;"><a href="index.html">Home</a></td>
-
-        <td style="text-align: right;"><a href="xindex.html">Index of
-        contents</a></td>
-      </tr>
-    </tbody>
-  </table>
-</body>
-</html>
diff --git a/docs/en/legalNotices.html b/docs/en/legalNotices.html
deleted file mode 100644
index a74026c..0000000
--- a/docs/en/legalNotices.html
+++ /dev/null
@@ -1,77 +0,0 @@
-<html>
-<head>
-  <link rel="stylesheet" href="./OmegaT.css" type="text/css">
-  <meta http-equiv="content-type" content="text/html; charset=utf-8">
-
-  <title>Legal Notices - OmegaT 2.0 User Manual</title>
-</head>
-
-<body>
-  <h2>Legal notices</h2>
-  <hr>
-
-  <h3>For the documentation</h3>
-
-  <h3>Copyright</h3>
-
-  <p>The documentation distributed with <strong>OmegaT 2.0</strong> includes
-  the User Manual and the readme.txt document. The documentation, except for
-  the <strong>Instant Start Guide</strong> chapter, is Copyright ©2009 Vito
-  Smolej. The <strong>Instant Start Guide</strong> chapter is Copyright
-  ©2005-2009 Samuel Murray.</p>
-
-  <h3>Distribution and modifications</h3>
-
-  <p><strong>The documentation</strong> is a free document; 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.</p>
-
-  <h3>Warranty</h3>
-
-  <p><strong>The documentation</strong> 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 <a href=
-  "license.txt">GNU General Public License</a> for more details.</p>
-  <hr>
-
-  <h3>For the application</h3>
-
-  <h3>Copyright</h3>
-
-  <p><strong>OmegaT 2.0</strong> is Copyright  Â© 2000-2009 Keith Godfrey,
-  Maxym Mykhalchuk, Zoltan Bartko, Didier Briel, Kim Bruning, Alex Buloichik, Sandra
-  Jean Chua, Martin Fleurke, Thomas Huriaux, Fabián Mandelbaum, Arno Peters, 
-  Henry Pijffers, Tiago Saboga, Andrzej Sawuła, Benjamin Siband and Martin Wunderlich.</p>
-
-  <h3>Distribution and modifications</h3>
-
-  <p><strong>OmegaT 2.0</strong> is a 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.</p>
-
-  <h3>Warranty</h3>
-
-  <p><strong>OmegaT 2.0</strong> 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 <a href=
-  "license.txt">GNU General Public License</a> for more details.</p>
-  <hr>
-
-  <table style="width: 100%;" summary="just formatting" border="0" cellpadding=
-  "2" cellspacing="2">
-    <tbody>
-      <tr>
-        <td style="text-align: left;"><a href="legalNotices.html">Legal
-        notices</a></td>
-
-        <td style="text-align: center;"><a href="index.html">Home</a></td>
-
-        <td style="text-align: right;"><a href="xindex.html">Index of
-        contents</a></td>
-      </tr>
-    </tbody>
-  </table>
-</body>
-</html>
diff --git a/docs/en/menu.html b/docs/en/menu.html
deleted file mode 100644
index 0e63764..0000000
--- a/docs/en/menu.html
+++ /dev/null
@@ -1,1255 +0,0 @@
-<html>
-<head>
-  <link rel="stylesheet" href="./OmegaT.css" type="text/css">
-  <meta http-equiv="CONTENT-TYPE" content="text/html; charset=utf-8">
-
-  <title>OmegaT Menu and Keyboard Short-cuts - OmegaT 2.0 User Manual</title>
-</head>
-
-<body>
-  <h2>Main Menu and Keyboard Short-cuts</h2>
-
-  <h3><a href="#menu">Main Menu</a></h3>
-
-  <h3><a href="#shortcuts">Keyboard Short-cuts</a></h3>
-
-  <ul>
-    <li>
-      <p><a href="#Project_management">Project management</a></p>
-    </li>
-
-    <li>
-      <p><a href="#Editing">Editing</a></p>
-    </li>
-
-    <li>
-      <p><a href="#Moving_around">Moving around</a></p>
-    </li>
-
-    <li>
-      <p><a href="#Reference_windows">Reference windows</a></p>
-    </li>
-
-    <li>
-      <p><a href="#Other">Other</a></p>
-    </li>
-  </ul>
-  <hr>
-
-  <h2><a name="menu" id="menu"></a>Main Menu</h2>
-
-  <p>All of OmegaT's functionality is available through the menu bar at the top
-  of the Editor window. Most functions are also available via <a href=
-  "#shortcuts">keyboard short-cuts</a>. Short-cuts are activated by pressing
-  <strong>Ctrl</strong> and a letter. Some short-cuts involve other keys. For
-  readability purposes, letters are written in uppercase here.
-  <strong>Ctrl</strong> is used on Windows, UNIX and UNIX-like operating
-  systems with keyboards featuring a <strong>Ctrl</strong> /
-  <strong>Control</strong> key. Mac users should read <strong>cmd+key</strong>
-  instead. The <strong>cmd</strong> key either has a <strong>command</strong>
-  label or an <strong>apple</strong> mark on Apple keyboards.</p>
-
-  <table summary="just formatting" border="1" cellpadding="3" cellspacing="0"
-  width="500">
-    <tbody>
-      <tr bgcolor="#DDDDDD">
-        <td>
-          <p align="center"><a href="#ProjectMenu">Project</a></p>
-        </td>
-
-        <td>
-          <p align="center"><a href="#EditMenu">Edit</a></p>
-        </td>
-
-        <td>
-          <p align="center"><a href="#GoToMenu">Go to</a></p>
-        </td>
-
-        <td>
-          <p align="center"><a href="#ViewMenu">View</a></p>
-        </td>
-
-        <td>
-          <p align="center"><a href="#ToolsMenu">Tools</a></p>
-        </td>
-
-        <td>
-          <p align="center"><a href="#OptionsMenu">Options</a></p>
-        </td>
-
-        <td>
-          <p align="center"><a href="#HelpMenu">Help</a></p>
-        </td>
-      </tr>
-    </tbody>
-  </table>
-
-  <table summary="just formatting" border="0" cellpadding="5" cellspacing="0">
-    <tbody>
-      <tr bgcolor="#FFFFFF">
-        <td colspan="3">
-          <hr>
-
-          <h3><a name="ProjectMenu" id="ProjectMenu"></a>Project</h3>
-        </td>
-      </tr>
-
-      <tr bgcolor="#DDDDDD">
-        <td width="23%">
-          <p><code>New</code></p>
-        </td>
-
-        <td width="17%"></td>
-
-        <td>
-          <p>Creates and opens a new project. The dialog to create a project is
-          the same as to <a href="projectProperties.html">edit the
-          project</a>.</p>
-        </td>
-      </tr>
-
-      <tr bgcolor="#FFFFFF">
-        <td width="23%">
-          <p><code>Open</code></p>
-        </td>
-
-        <td width="17%">
-          <p><code>Ctrl+O</code></p>
-        </td>
-
-        <td>
-          <p>Opens a previously created project.</p>
-        </td>
-      </tr>
-
-      <tr bgcolor="#DDDDDD">
-        <td width="23%">
-          <p><code>Import Source Files...</code></p>
-        </td>
-
-        <td width="17%"></td>
-
-        <td>
-          <p>Copies the selected files to the <code>/source</code> folder and
-          reloads the project to load the new files.</p>
-        </td>
-      </tr>
-
-      <tr bgcolor="#FFFFFF">
-        <td width="23%">
-          <p><code>Import From MediaWiki...</code></p>
-        </td>
-
-        <td width="17%"></td>
-
-        <td>
-          <p>Imports units from MediaWiki pages, based on the URL entered.</p>
-        </td>
-      </tr>
-
-      <tr bgcolor="#DDDDDD">
-        <td width="23%">
-          <p><code>Reload</code></p>
-        </td>
-
-        <td width="17%"><code>F5</code></td>
-
-        <td>
-          <p>Reloads the project to take external changes in source files,
-          legacy translation memories or glossaries into account.</p>
-        </td>
-      </tr>
-
-      <tr bgcolor="#FFFFFF">
-        <td width="23%">
-          <p><code>Close</code></p>
-        </td>
-
-        <td width="17%"><code>Ctrl+Shift+W</code></td>
-
-        <td>
-          <p>Saves the translation and closes the project.</p>
-        </td>
-      </tr>
-
-      <tr bgcolor="#DDDDDD">
-        <td width="23%">
-          <p><code>Save</code></p>
-        </td>
-
-        <td width="17%">
-          <p><code>Ctrl+S</code></p>
-        </td>
-
-        <td>
-          <p>Saves the translation to project's translation memory. OmegaT
-          automatically saves the translation every 10 minutes or when you
-          close the project or quit OmegaT.</p>
-        </td>
-      </tr>
-
-      <tr bgcolor="#FFFFFF">
-        <td width="23%">
-          <p><code>Create Translated Documents</code></p>
-        </td>
-
-        <td width="17%"><code>Ctrl+D</code></td>
-
-        <td>
-          <p>Creates the target documents based on your translation of
-          documents' text. The documents will be located in the
-          <code>/target</code> folder.</p>
-        </td>
-      </tr>
-
-      <tr bgcolor="#DDDDDD">
-        <td width="23%">
-          <p><code>Properties</code></p>
-        </td>
-
-        <td width="17%">
-          <p><code>Ctrl+E</code></p>
-        </td>
-
-        <td>
-          <p>Displays <a href="projectProperties.html">Project properties</a>
-          dialog to edit project languages and folder locations.</p>
-        </td>
-      </tr>
-
-      <tr bgcolor="#FFFFFF">
-        <td width="23%">
-          <p><code>Project Files...</code></p>
-        </td>
-
-        <td width="17%">
-          <p><code>Ctrl+L</code></p>
-        </td>
-
-        <td>
-          <p>Closes or opens <a href="userInterface.html#Project_Files">Project
-          files window</a> (depending whether it is opened or closed).</p>
-        </td>
-      </tr>
-
-      <tr bgcolor="#DDDDDD">
-        <td width="23%">
-          <p><code>Quit</code></p>
-        </td>
-
-        <td width="17%">
-          <p><code>Ctrl+Q</code></p>
-        </td>
-
-        <td>
-          <p>Saves the project and quits OmegaT. If you haven't yet saved the
-          project manually confirms whether you would really like to quit.</p>
-        </td>
-      </tr>
-
-      <tr bgcolor="#FFFFFF">
-        <td colspan="3">
-          <hr>
-
-          <h3><a name="EditMenu" id="EditMenu"></a>Edit</h3>
-        </td>
-      </tr>
-
-      <tr bgcolor="#FFFFFF">
-        <td colspan="3">
-          <p>Note: Items that one can find in most applications
-          (copy/cut/paste) are not displayed in this menu but are available
-          with your system short-cuts. For example:</p>
-        </td>
-      </tr>
-
-      <tr bgcolor="#DDDDDD">
-        <td width="23%">
-          <p><code>Copy</code></p>
-        </td>
-
-        <td width="17%">
-          <p><code>Ctrl+C</code></p>
-        </td>
-
-        <td>
-          <p>Copies selected text to clipboard.</p>
-        </td>
-      </tr>
-
-      <tr bgcolor="#FFFFFF">
-        <td width="23%">
-          <p><code>Cut</code></p>
-        </td>
-
-        <td width="17%">
-          <p><code>Ctrl+X</code></p>
-        </td>
-
-        <td>
-          <p>Copies selected text to clipboard and deletes selected text.</p>
-        </td>
-      </tr>
-
-      <tr bgcolor="#DDDDDD">
-        <td width="23%">
-          <p><code>Paste</code></p>
-        </td>
-
-        <td width="17%">
-          <p><code>Ctrl+V</code></p>
-        </td>
-
-        <td>
-          <p>Pastes the text from clipboard at cursor.</p>
-        </td>
-      </tr>
-
-      <tr bgcolor="#FFFFFF">
-        <td colspan="3">
-          <p>The <strong>Edit</strong> menu contains the following shortcuts:</p>
-
-      <tr bgcolor="#DDDDDD">
-        <td>
-          <p>Undo last action</p>
-        </td>
-
-        <td>
-          <p><code>Ctrl+Z</code></p>
-        </td>
-
-        <td>
-          <p>Undoes the last editing actions, in the current target segment.</p>
-        </td>
-      </tr>
-
-      <tr bgcolor="#FFFFFF">
-        <td>
-          <p>Redo last action</p>
-        </td>
-
-        <td>
-          <p><code>Ctrl+Y</code></p>
-        </td>
-
-        <td>
-          <p>Redoes the editing actions that have just been undone, in the
-          current target segment.</p>
-        </td>
-      </tr>
-
-      <tr bgcolor="#DDDDDD">
-        <td>
-          <p>Select match #N</p>
-        </td>
-
-        <td>
-          <p><code>Ctrl+#N</code></p>
-        </td>
-
-        <td>
-          <p>#N is a digit from 1 to 5. The short-cut selects the
-          N<sup>th</sup> match displayed in the match window (the first match
-          is selected by default).</p>
-        </td>
-      </tr>
-
-      <tr bgcolor="#FFFFFF">
-        <td>
-          <p>Replace with match</p>
-        </td>
-
-        <td>
-          <p><code>Ctrl+R</code></p>
-        </td>
-
-        <td>
-          <p>Replaces the current target segment contents with the selected
-          match (the first match is selected by default).</p>
-        </td>
-      </tr>
-
-      <tr bgcolor="#DDDDDD">
-        <td>
-          <p>Insert match</p>
-        </td>
-
-        <td>
-          <p><code>Ctrl+I</code></p>
-        </td>
-
-        <td>
-          <p>Inserts the selected match at the cursor position in the current
-          target segment (the first match is inserted by default).</p>
-        </td>
-      </tr>
-
-      <tr bgcolor="#FFFFFF">
-        <td>
-          <p>Replace with source</p>
-        </td>
-
-        <td>
-          <p><code>Ctrl+Shift+R</code></p>
-        </td>
-
-        <td>
-          <p>Replaces the current target segment contents with the source text
-          Contents.</p>
-        </td>
-      </tr>
-
-      <tr bgcolor="#DDDDDD">
-        <td>
-          <p>Insert source</p>
-        </td>
-
-        <td>
-          <p><code>Ctrl+Shift+I</code></p>
-        </td>
-
-        <td>
-          <p>Inserts the source text Contents at the cursor position in the
-          current target segment.</p>
-        </td>
-      </tr>
-
-      <tr bgcolor="#FFFFFF">
-        <td>
-          <p>Search project</p>
-        </td>
-
-        <td>
-          <p><code>Ctrl+F</code></p>
-        </td>
-
-        <td>
-          <p>Displays a dialogue to conduct searches in the project.</p>
-        </td>
-      </tr>
-
-      <tr bgcolor="#DDDDDD">
-        <td width="23%">
-          <p>Replace with Machine Translation</p>
-        </td>
-
-        <td width="17%">
-          <p><code>Ctrl+M</code></p>
-        </td>
-
-        <td>
-          <p>Replaces the target segment with the Google Translate translation
-          of the source. No action, if  Google Translate not activated
-          (see Menu > options > Google Translate).</p>
-        </td>
-      </tr>
-
-      <tr bgcolor="#FFFFFF">
-        <td colspan="3">
-          <hr>
-
-          <h3><a name="GoToMenu" id="GoToMenu"></a>Go to</h3>
-        </td>
-      </tr>
-
-      <tr bgcolor="#DDDDDD">
-        <td width="23%">
-          <p><code>Next Untranslated Segment</code></p>
-        </td>
-
-        <td width="17%">
-          <p><code>Ctrl+U</code></p>
-        </td>
-
-        <td>
-          <p>Moves to the next segment that has no equivalent in the
-          translation memory.</p>
-        </td>
-      </tr>
-
-      <tr bgcolor="#FFFFFF">
-        <td width="23%">
-          <p><code>Next Segment</code></p>
-        </td>
-
-        <td width="17%">
-          <p><code>Ctrl+N</code> or <code>Enter</code> or <code>Tab</code></p>
-        </td>
-
-        <td>
-          <p>Moves to the next segment. If current segment is the last one in a
-          file, moves to the first segment of the next file.</p>
-        </td>
-      </tr>
-
-      <tr bgcolor="#DDDDDD">
-        <td width="23%">
-          <p><code>Previous Segment</code></p>
-        </td>
-
-        <td width="17%">
-          <p><code>Ctrl+P</code> or <code>Ctrl+Enter</code> or
-          <code>Ctrl+Tab</code></p>
-        </td>
-
-        <td>
-          <p>Moves to the previous segment. Moves to the last segment of the
-          previous file, if current segment is the first one one in a file.</p>
-        </td>
-      </tr>
-
-      <tr bgcolor="#FFFFFF">
-        <td width="23%">
-          <p><code>Segment number...</code></p>
-        </td>
-
-        <td width="17%">
-          <p><code>Ctrl+J</code></p>
-        </td>
-
-        <td>
-          <p>The segment is opened on entering its segment number.</p>
-        </td>
-      </tr>
-
-      <tr bgcolor="#DDDDDD">
-        <td width="23%">
-          <p><code>Forward in history...</code></p>
-        </td>
-
-        <td width="17%">
-          <p><code>Ctrl+Shift+N</code></p>
-        </td>
-
-        <td>
-          <p>OmegaT remembers the segments executed. With this command you
-          can step forward to the segment, you have previously left by the
-          "back in history" command. </p>
-        </td>
-      </tr>
-
-      <tr bgcolor="#FFFFFF">
-        <td width="23%">
-          <p><code>Back in history...</code></p>
-        </td>
-
-        <td width="17%">
-          <p><code>Ctrl+Shift+P</code></p>
-        </td>
-
-        <td>
-          <p>With this command you can move backward one or several segments in
-          time, to return later to the current segment.</p>
-        </td>
-      </tr>
-
-      <tr bgcolor="#FFFFFF">
-        <td colspan="3">
-          <hr>
-
-          <h3><a name="ViewMenu" id="ViewMenu"></a>View</h3>
-        </td>
-      </tr>
-
-      <tr bgcolor="#DDDDDD">
-        <td width="23%">
-          <p><code>Mark Translated Segments</code></p>
-        </td>
-
-        <td width="17%"></td>
-
-        <td>
-          <p>If checked, the translated segments will be marked in yellow.</p>
-        </td>
-      </tr>
-
-      <tr bgcolor="#FFFFFF">
-        <td width="23%">
-          <p><code>Mark Untranslated Segments</code></p>
-        </td>
-
-        <td width="17%"></td>
-
-        <td>
-          <p>If checked, the untranslated segments will be marked in
-          violet.</p>
-        </td>
-      </tr>
-
-      <tr bgcolor="#DDDDDD">
-        <td width="23%">
-          <p><code>Display Source Segments</code></p>
-        </td>
-
-        <td width="17%"></td>
-
-        <td>
-          <p>If checked, source segments will be shown and marked in green. If
-          not checked, source segments will not be shown.</p>
-        </td>
-      </tr>
-
-      <tr bgcolor="#FFFFFF">
-        <td colspan="3">
-          <hr>
-
-          <h3><a name="ToolsMenu" id="ToolsMenu"></a>Tools</h3>
-        </td>
-      </tr>
-
-      <tr bgcolor="#DDDDDD">
-        <td width="23%">
-          <p><code>Validate Tags</code></p>
-        </td>
-
-        <td width="17%">
-          <p><code>Ctrl+T</code></p>
-        </td>
-
-        <td>
-          <p>Checks for missing or displaced tags in formatted files. Will
-          display a list of segments with tag mistakes. The <a href=
-          "userInterface.html#tag_Validation">Tag validation window</a> section
-          lists what you see there, and <a href="formattedText.html">Working
-          with formatted texts</a> tells you why.</p>
-        </td>
-      </tr>
-
-      <tr bgcolor="#FFFFFF">
-        <td colspan="3">
-          <hr>
-
-          <h3><a name="OptionsMenu" id="OptionsMenu"></a>Options</h3>
-        </td>
-      </tr>
-
-      <tr bgcolor="#DDDDDD">
-        <td width="23%">
-          <p><code>Use TAB To Advance</code></p>
-        </td>
-
-        <td width="17%"></td>
-
-        <td>
-          <p>Sets segment validation key to <code>Tab</code> instead of the
-          default <code>Enter</code>. This option is useful for some of
-          Chinese, Japanese or Korean character input systems.</p>
-        </td>
-      </tr>
-
-      <tr bgcolor="#FFFFFF">
-        <td width="23%">
-          <p><code>Always Confirm Quit</code></p>
-        </td>
-
-        <td width="17%"></td>
-
-        <td>
-          <p>The program will always check with you before closing down.</p>
-        </td>
-      </tr>
-
-      <tr bgcolor="#DDDDDD">
-        <td><code>Google Translate</code></td>
-
-        <td></td>
-
-        <td>
-          <p><a href="GoogleTranslate.html">Google Translate</a> active/not
-          active. When active, <code>Ctrl+M</code> will replace the target part
-          of the active segment with the Google Translate suggestion. The
-          suggestion can be reviewed before insertion by looking at the Google
-          Translate pane</p>
-        </td>
-      </tr>
-
-      <tr bgcolor="#FFFFFF">
-        <td width="23%">
-          <p><code>Font...</code></p>
-        </td>
-
-        <td width="17%"></td>
-
-        <td>
-          <p>Shows <a href="fontSettings.html">Font settings</a> dialogue to
-          modify the text display font. Users of old computers who feel window
-          resizing is very slow can try changing the font.</p>
-        </td>
-      </tr>
-
-      <tr bgcolor="#DDDDDD">
-        <td width="23%">
-          <p><code>File Filters..</code></p>
-        </td>
-
-        <td width="17%"></td>
-
-        <td>
-          <p>Displays <a href="fileFilters.html">File filters</a> dialogue to
-          configure file handling and parsing.</p>
-        </td>
-      </tr>
-
-      <tr bgcolor="#FFFFFF">
-        <td width="23%">
-          <p><code>Segmentation...</code></p>
-        </td>
-
-        <td width="17%"></td>
-
-        <td>
-          <p>Opens <a href="segmentation.html">Source segmentation</a> dialogue
-          to configure text segmentation.</p>
-        </td>
-      </tr>
-
-      <tr bgcolor="#DDDDDD">
-        <td width="23%">
-          <p><code>Spell checking...</code></p>
-        </td>
-
-        <td width="17%"></td>
-
-        <td>
-          <p>Displays the <a href="spellchecker.html">Spellchecker setup</a>
-          window to install, configure and activate the spell checker.</p>
-        </td>
-      </tr>
-
-      <tr bgcolor="#FFFFFF">
-        <td width="23%">
-          <p><code>Editing Behaviour...</code></p>
-        </td>
-
-        <td width="17%"></td>
-
-        <td>
-          <p>Displays <a href="translationEditing.html">Translation editing</a>
-          dialogue to configure</p>
-        </td>
-      </tr>
-
-      <tr bgcolor="#DDDDDD">
-        <td width="23%">
-          <p><code>Restore Main Window</code></p>
-        </td>
-
-        <td width="17%"></td>
-
-        <td>
-          <p>Restores the components (editor, match, glossary and dictionary
-          viewer, and Google Translate pane) of the main OmegaT window to their
-          default state. Use this feature in case you have undocked, moved, or
-          hidden one or more components and you cannot get them back the way
-          you want them. Use it also if you have changed of OmegaT version and
-          you have problems with windows not appearing anymore.</p>
-        </td>
-      </tr>
-
-      <tr bgcolor="#FFFFFF">
-        <td colspan="3">
-          <hr>
-
-          <h3><a name="HelpMenu" id="HelpMenu"></a>Help</h3>
-        </td>
-      </tr>
-
-      <tr bgcolor="#DDDDDD">
-        <td width="23%">
-          <p><code>User Manual...</code></p>
-        </td>
-
-        <td width="17%">
-          <p><code>F1</code></p>
-        </td>
-
-        <td>
-          <p>Opens <a href="userInterface.html#Help_Browser">Help browser</a>
-          with this manual in a separate window.</p>
-        </td>
-      </tr>
-
-      <tr bgcolor="#FFFFFF">
-        <td width="23%">
-          <p><code>About...</code></p>
-        </td>
-
-        <td width="17%"></td>
-
-        <td>
-          <p>Displays copyright, credits and license information.</p>
-        </td>
-      </tr>
-    </tbody>
-  </table>
-  <hr>
-
-  <h2><a name="shortcuts" id="shortcuts"></a>Keyboard Short-cuts</h2>
-
-  <p>The following short-cuts are available from the main window. When another
-  window is on the foreground, click on the main window to put it on the
-  foreground or press <code><strong>Esc</strong></code> to close that
-  window.</p>
-
-  <p>Short-cuts are activated by pressing <code><strong>Ctrl</strong></code>
-  and a letter. Some short-cuts involve other keys. For readability purposes,
-  letters are written in uppercase here.</p>
-
-  <p><strong><code>Ctrl</code></strong> is used on Windows, UNIX and UNIX-like
-  operating systems with keyboards featuring a
-  <strong><code>Ctrl</code></strong> / <code><strong>Control</strong></code>
-  key. Mac users should read <code><strong>cmd+key</strong></code> instead. The
-  <code><strong>cmd</strong></code> key either has a
-  <code><strong>command</strong></code> label or an <strong>apple</strong> mark
-  on Apple keyboards.</p>
-
-  <ul>
-    <li>
-      <p><a href="#Project_management">Project management</a></p>
-    </li>
-
-    <li>
-      <p><a href="#Editing">Editing</a></p>
-    </li>
-
-    <li>
-      <p><a href="#Moving_around">Moving around</a></p>
-    </li>
-
-    <li>
-      <p><a href="#Reference_windows">Reference windows</a></p>
-    </li>
-
-    <li>
-      <p><a href="#Other">Other</a></p>
-    </li>
-  </ul>
-
-  <table summary="just formatting" border="0" cellpadding="3" cellspacing="0">
-    <tbody>
-      <tr bgcolor="#FFFFFF">
-        <td colspan="3">
-          <hr>
-
-          <h3><a name="Project_management" id="Project_management"></a>Project
-          management</h3>
-        </td>
-      </tr>
-
-      <tr bgcolor="#DDDDDD">
-        <td>
-          <p>Open project</p>
-        </td>
-
-        <td>
-          <p><code>Ctrl+O</code></p>
-        </td>
-
-        <td>
-          <p>Displays a dialogue to locate an already existing project.</p>
-        </td>
-      </tr>
-
-      <tr bgcolor="#FFFFFF">
-        <td>
-          <p>Save</p>
-        </td>
-
-        <td>
-          <p><code>Ctrl+S</code></p>
-        </td>
-
-        <td>
-          <p>Saves the current work to the file project_save.tmx located in the
-          project's /omegat/ folder.</p>
-        </td>
-      </tr>
-
-      <tr bgcolor="#DDDDDD">
-        <td>
-          <p>Close Project</p>
-        </td>
-
-        <td>
-          <p><code>Shift+Ctrl+W</code></p>
-        </td>
-
-        <td>
-          <p>Closes the current project.</p>
-        </td>
-      </tr>
-
-      <tr bgcolor="#FFFFFF">
-        <td>
-          <p>Create Translated Documents</p>
-        </td>
-
-        <td>
-          <p><code>Ctrl+D</code></p>
-        </td>
-
-        <td>
-          <p>Creates the translated documents in the project's Target
-          folder.</p>
-        </td>
-      </tr>
-
-      <tr bgcolor="#DDDDDD">
-        <td>
-          <p>Project properties</p>
-        </td>
-
-        <td>
-          <p><code>Ctrl+E</code></p>
-        </td>
-
-        <td>
-          <p>Displays the project's settings for eventual modification.</p>
-        </td>
-      </tr>
-
-      <tr bgcolor="#FFFFFF">
-        <td colspan="3">
-          <hr>
-
-          <h3><a name="Editing" id="Editing"></a>Editing</h3>
-        </td>
-      </tr>
-
-      <tr bgcolor="#DDDDDD">
-        <td>
-          <p>Undo last action</p>
-        </td>
-
-        <td>
-          <p><code>Ctrl+Z</code></p>
-        </td>
-
-        <td>
-          <p>Undoes the last editing actions, in the current target segment.</p>
-        </td>
-      </tr>
-
-      <tr bgcolor="#FFFFFF">
-        <td>
-          <p>Redo last action</p>
-        </td>
-
-        <td>
-          <p><code>Ctrl+Y</code></p>
-        </td>
-
-        <td>
-          <p>Redoes the editing actions that have just been undone, in the
-          current target segment.</p>
-        </td>
-      </tr>
-
-      <tr bgcolor="#DDDDDD">
-        <td>
-          <p>Select match #N</p>
-        </td>
-
-        <td>
-          <p><code>Ctrl+#N</code></p>
-        </td>
-
-        <td>
-          <p>#N is a digit from 1 to 5. The short-cut selects the
-          N<sup>th</sup> match displayed in the match window (the first match
-          is selected by default).</p>
-        </td>
-      </tr>
-
-      <tr bgcolor="#FFFFFF">
-        <td>
-          <p>Replace with match</p>
-        </td>
-
-        <td>
-          <p><code>Ctrl+R</code></p>
-        </td>
-
-        <td>
-          <p>Replaces the current target segment contents with the selected
-          match (the first match is selected by default).</p>
-        </td>
-      </tr>
-
-      <tr bgcolor="#DDDDDD">
-        <td>
-          <p>Insert match</p>
-        </td>
-
-        <td>
-          <p><code>Ctrl+I</code></p>
-        </td>
-
-        <td>
-          <p>Inserts the selected match at the cursor position in the current
-          target segment (the first match is inserted by default).</p>
-        </td>
-      </tr>
-
-      <tr bgcolor="#FFFFFF">
-        <td>
-          <p>Replace with source</p>
-        </td>
-
-        <td>
-          <p><code>Ctrl+Shift+R</code></p>
-        </td>
-
-        <td>
-          <p>Replaces the current target segment contents with the source text
-          Contents.</p>
-        </td>
-      </tr>
-
-      <tr bgcolor="#DDDDDD">
-        <td>
-          <p>Insert source</p>
-        </td>
-
-        <td>
-          <p><code>Ctrl+Shift+I</code></p>
-        </td>
-
-        <td>
-          <p>Inserts the source text Contents at the cursor position in the
-          current target segment.</p>
-        </td>
-      </tr>
-
-      <tr bgcolor="#FFFFFF">
-        <td>
-          <p>Search project</p>
-        </td>
-
-        <td>
-          <p><code>Ctrl+F</code></p>
-        </td>
-
-        <td>
-          <p>Displays a dialogue to conduct searches in the project.</p>
-        </td>
-      </tr>
-
-      <tr bgcolor="#DDDDDD">
-        <td width="23%">
-          <p>Replace with Machine Translation</p>
-        </td>
-
-        <td width="17%">
-          <p><code>Ctrl+M</code></p>
-        </td>
-
-        <td>
-          <p>Replaces the target segment with the Google Translate translation
-          of the source. No action, if  Google Translate not activated
-          (see Menu > options > Google Translate).</p>
-        </td>
-      </tr>
-
-      <tr bgcolor="#FFFFFF">
-        <td colspan="3">
-          <hr>
-
-          <h3><a name="Moving_around" id="Moving_around"></a>Moving around</h3>
-        </td>
-      </tr>
-
-      <tr bgcolor="#DDDDDD">
-        <td>
-          <p>Next untranslated segment</p>
-        </td>
-
-        <td>
-          <p><code>Ctrl+U</code></p>
-        </td>
-
-        <td>
-          <p>Moves the editing field to the next segment that is not registered
-          in the project's translation memory.</p>
-        </td>
-      </tr>
-
-      <tr bgcolor="#FFFFFF">
-        <td>
-          <p>Next segment</p>
-        </td>
-
-        <td>
-          <p><code>Ctrl+N<br>
-          Enter or Return </code></p>
-        </td>
-
-        <td>
-          <p>Moves the editing field to the next segment.</p>
-        </td>
-      </tr>
-
-      <tr bgcolor="#DDDDDD">
-        <td>
-          <p>Previous segment</p>
-        </td>
-
-        <td>
-          <p><code>Ctrl+P</code></p>
-        </td>
-
-        <td>
-          <p>Moves the editing field to the previous segment.</p>
-        </td>
-      </tr>
-
-      <tr bgcolor="#FFFFFF">
-        <td>
-          <p>Segment number...</p>
-        </td>
-
-        <td>
-          <p><code>Ctrl+J</code></p>
-        </td>
-
-        <td>
-          <p>Moves to the segment number provided.</p>
-        </td>
-      </tr>
-
-      <tr bgcolor="#DDDDDD">
-        <td>
-          <p>Back in history...</p>
-        </td>
-
-        <td width="17%">
-          <p><code>Ctrl+Shift+P</code></p>
-        </td>
-
-        <td>
-          <p>Moves one segment back in history.</p>
-        </td>
-      </tr>
-
-      <tr bgcolor="#FFFFFF">
-        <td>
-          <p>Forward in history...</p>
-        </td>
-
-        <td width="17%">
-          <p><code>Ctrl+Shift+N</code></p>
-        </td>
-
-        <td>
-          <p>Moves one segment forward in history.</p>
-        </td>
-      </tr>
-
-      <tr bgcolor="#FFFFFF">
-        <td colspan="3">
-          <hr>
-
-          <h3><a name="Reference_windows" id="Reference_windows"></a>Reference
-          windows</h3>
-        </td>
-      </tr>
-
-      <tr bgcolor="#DDDDDD">
-        <td>
-          <p>Project files listing</p>
-        </td>
-
-        <td>
-          <p><code>Ctrl+L</code></p>
-        </td>
-
-        <td>
-          <p>Displays the Project files listing.</p>
-        </td>
-      </tr>
-
-      <tr bgcolor="#FFFFFF">
-        <td colspan="3">
-          <hr>
-
-          <h3><a name="Other" id="Other"></a>Other</h3>
-        </td>
-      </tr>
-
-      <tr bgcolor="#DDDDDD">
-        <td>
-          <p>Validate tags</p>
-        </td>
-
-        <td>
-          <p><code>Ctrl+T</code></p>
-        </td>
-
-        <td>
-          <p>Opens the <a href="userInterface.html#tag_Validation">Tag
-          validation</a> window.</p>
-        </td>
-      </tr>
-
-      <tr bgcolor="#FFFFFF">
-        <td>
-          <p>Export Selection</p>
-        </td>
-
-        <td>
-          <p><code>Shift+</code><code>Ctrl+C</code></p>
-        </td>
-
-        <td>
-          <p>Exports the current selection or the current source, if there's no
-          selection.</p>
-        </td>
-      </tr>
-
-      <tr bgcolor="#DDDDDD">
-        <td>
-          <p>Search Project    </p>
-        </td>
-
-        <td>
-          <p><code>Ctrl+F    </code></p>
-        </td>
-
-        <td>
-          <p>Opens a new Search window.</p>
-        </td>
-      </tr>
-
-      <tr bgcolor="#FFFFFF">
-        <td>
-          <p>Help files</p>
-        </td>
-
-        <td>
-          <p><code>F1</code></p>
-        </td>
-
-        <td>
-          <p>Displays the OmegaT help files in a separate window.</p>
-        </td>
-      </tr>
-    </tbody>
-  </table>
-  <hr>
-
-  <table style="width: 100%;" summary="just formatting" border="0" cellpadding=
-  "2" cellspacing="2">
-    <tbody>
-      <tr>
-        <td style="text-align: left;"><a href="legalNotices.html">Legal
-        notices</a></td>
-
-        <td style="text-align: center;"><a href="index.html">Home</a></td>
-
-        <td style="text-align: right;"><a href="xindex.html">Index of
-        contents</a></td>
-      </tr>
-    </tbody>
-  </table>
-</body>
-</html>
diff --git a/docs/en/plainText.html b/docs/en/plainText.html
deleted file mode 100644
index 94de054..0000000
--- a/docs/en/plainText.html
+++ /dev/null
@@ -1,164 +0,0 @@
-<html>
-<head>
-  <link rel="stylesheet" href="./OmegaT.css" type="text/css">
-  <meta http-equiv="content-type" content="text/html; charset=utf-8">
-
-  <title>Working with Plain Text - OmegaT 2.0 User Manual</title>
-</head>
-
-<body>
-  <h2>Working with plain text</h2>
-
-  <ul>
-    <li><a href="#Plain_Text_in_OmegaT">Default encoding</a></li>
-
-    <li><a href="#Garbled_displays_3F">Garbled displays</a></li>
-
-    <li><a href="#Character_sets_and_encoding">Character sets and
-    encoding</a></li>
-
-    <li><a href="#The_OmegaT_solution">The OmegaT solution</a></li>
-  </ul>
-  <hr>
-  <a name="Plain_Text_in_OmegaT" id="Plain_Text_in_OmegaT"></a>
-
-  <h2>Default encoding</h2>
-
-  <p>Plain text files - in most of the cases with a <code>.txt</code>
-  extension - contain exclusively textual information. There is no clearly
-  defined way to inform the computer which language they contain. In (very)
-  simple terms, that means the computer will per default assume the text is
-  written in the same language the computer itself uses.</p>
-  <hr>
-  <a name="Garbled_displays_3F" id="Garbled_displays_3F"></a>
-
-  <h2>Garbled displays</h2>
-
-  <p>If you are Russian, it is very likely that your computer works in Russian
-  too: the menus are in Russian, the files you open will be in Russian etc. In
-  most cases, the computer makes the right assumption regarding the Contents of
-  files in general: they all contain Russian and nothing Russian characters
-  could not display.</p>
-
-  <p>Now, if you are a Russian translator who translates from Japanese, the
-  Japanese files you will get, if they are <strong>plain text</strong> files,
-  will most probably be considered by the computer to be files containing
-  Russian. Because there is no information in the file itself that indicates to
-  the computer in which language they are written. The Japanese file contents
-  could be:</p>
-
-  <p>OmegaTとは、コンピュータを利用した翻訳ツールです。</p><br>
-
-  <p>Because it expects the contents to be Russian, your text editor could very
-  well display it like this:</p>
-
-  <p>OmegaTВ∆ВЌБAГRГУГsГЕБ[Г^ВрЧШЧpµšЦ|ЦуГcБ[ГЛВ≈ВЈБB</p><br>
-
-  <p>However, it is far from Russian, it is Japanese characters wrongly
-  displayed as Russian characters.</p>
-
-  <p>As any other application, OmegaT is subject to this problem too. It can
-  only assume that per default <strong>plain text</strong> files can be
-  displayed using the system defaults. That works well when the computer works
-  in French for instance and the files are in English, or when the computer is
-  German and you deal with get Italian files.</p>
-  <hr>
-  <a name="Character_sets_and_encoding" id="Character_sets_and_encoding"></a>
-
-  <h2>Character sets and encoding</h2>
-
-  <p>Why would that work with English and French but not with Russian and
-  Japanese? Because English and French share a common <strong>character
-  set</strong>. Namely <strong>Latin-1</strong>, or some variation of it. Until
-  recently, Russian and Japanese have not shared any character sets. Most
-  current Russian characters sets do not cover Japanese and vice versa. The
-  result is what you have seen above.</p>
-
-  <p>The Japanese client works with a Japanese computer and creates text files
-  that contain Japanese. The character set selected by the client computer will
-  depend on the operating system and on other settings, but it is highly
-  unlikely that the chosen (Japanese) character set will be correctly
-  interpreted by the Russian computer.</p>
-
-  <p>How the textual information in the specified character set is physically
-  transmitted (i.e. what are the numeric codes the computer uses to interpret
-  and display text) depends on the <strong>encoding</strong>. When the computer
-  reads the file, it "decodes" the information according to the encoding and
-  displays it according to the character set. Roughly speaking, one encoding
-  corresponds to one character set...</p>
-  <hr>
-  <a name="The_OmegaT_solution" id="The_OmegaT_solution"></a>
-
-  <h2>The OmegaT solution</h2>
-
-  <p>There are basically three ways to address this problem in OmegaT. They all
-  involve the application of <a href="fileFilters.html">file filters</a> in the
-  <strong>Options</strong> menu.</p>
-
-  <ol>
-    <li>Specify the encoding for your <strong>plain text</strong> files - i.e.
-    files with <code>.txt</code> extension - : in the <strong>Text
-    files</strong> section of the <a href="fileFilters.html">file filters</a>
-    dialog, change the <strong>Source File Encoding</strong> from
-    <strong><auto></strong> to the encoding that corresponds to your
-    source <code>.txt</code> file.</li>
-
-    <li>Change the extensions of your plain text source files (from
-    <code>.txt</code> to <code>.jp</code> for Japanese plain texts for
-    instance): In the <strong>Text files</strong> section of the <a href=
-    "fileFilters.html">file filters</a> dialog, add a new <strong>Source
-    Filename Pattern</strong> (for example <code>*.jp) </code>and select
-    the appropriate parameters for the source and target encoding.</li>
-
-    <li>Change the encoding of your files to Unicode: open your source
-    file in a text editor that correctly interprets its encoding and save the
-    file in the "UTF-8" encoding. Change the file extension from
-    <code>.txt</code> to <code>.utf8</code>.OmegaT will automatically interpret
-    the file as a UTF-8 file.</li>
-  </ol>
-
-  <p>OmegaT has by default the following short list available to make it easier
-  for you to deal with some plain text files:</p>
-
-  <ul>
-    <li><code>.txt</code> files are automatically
-    (<strong><auto></strong>) interpreted by OmegaT as being encoded in
-    the computer's default encoding.</li>
-
-    <li><code>.txt1</code> files are files in ISO-8859-1, covering most
-    <strong>Western Europe</strong> languages.</li>
-
-    <li><code>.txt2</code> files are files in ISO-8859-2, that covers most
-    <strong>Central and Eastern Europe</strong> languages</li>
-
-    <li><code>.utf8</code> files are interpreted by OmegaT as being encoded in
-    UTF-8 (an encoding that covers almost <strong>all</strong> languages in the
-    world).</li>
-  </ul>
-
-  <p>You can check that yourself by selecting the item <strong>File
-  Filters</strong> in the menu <strong>Options</strong>. For example, when you
-  have a Czech text file (very probably written in the
-  <strong>ISO-8859-2</strong> code) you just need to change the extension
-  <code>.txt</code> to <code>.txt2</code> and OmegaT will interpret its
-  contents correctly. And of course, if you want to be on the safe side,
-  consider converting this kind of files to Unicode, i.e. to the .utf8 file
-  format.</p>
-  <hr>
-
-  <table style="width: 100%;" summary="just formatting" border="0" cellpadding=
-  "2" cellspacing="2">
-    <tbody>
-      <tr>
-        <td style="text-align: left;"><a href="legalNotices.html">Legal
-        notices</a></td>
-
-        <td style="text-align: center;"><a href="index.html">Home</a></td>
-
-        <td style="text-align: right;"><a href="xindex.html">Index of
-        contents</a></td>
-      </tr>
-    </tbody>
-  </table>
-</body>
-</html>
diff --git a/docs/en/preventingDataLoss.html b/docs/en/preventingDataLoss.html
deleted file mode 100644
index 8deaeca..0000000
--- a/docs/en/preventingDataLoss.html
+++ /dev/null
@@ -1,81 +0,0 @@
-<html>
-<head>
-  <link rel="stylesheet" href="./OmegaT.css" type="text/css">
-  <meta http-equiv="content-type" content="text/html; charset=utf-8">
-
-  <title>Preventing Data Loss - OmegaT 2.0 User Manual</title>
-</head>
-
-<body>
-  <h2>Preventing data loss</h2>
-
-  <p>OmegaT is a robust application. However, you should take precautions
-  against data loss when using OmegaT, just as with any other application. When
-  you translate your files, OmegaT stores all your progress in translation
-  memory <code>project_save.tmx</code> that resides in the project's
-  <code>/omegat</code> subfolder.</p>
-
-  <p>OmegaT also backs up the translation memory to
-  <code>project_save.tmx.YEARMMDDHHNN.bak</code> in the same subfolder every
-  time when a project is opened or reloaded. <code>YEAR</code> is 4-digit year,
-  <code>MM</code> is a month, <code>DD</code> day of the month, <code>HH</code>
-  and <code>NN</code> are hours and minutes when the previous translation
-  memory was saved.</p>
-
-  <p>If you think you have lost translation data follow the procedure below
-  which will restore the project to its most recently saved state, in most
-  cases within 10 minutes of the most recent modifications:</p>
-
-  <ol>
-    <li>close the project</li>
-
-    <li>rename the current <code>project_save.tmx</code> file to something you
-    will remember (like <code>project_save.tmx.temporary</code> for
-    example)</li>
-
-    <li>select the backup translation memory that is the most likely to contain
-    the data you are looking for</li>
-
-    <li>rename it to <code>project_save.tmx</code></li>
-
-    <li>open the project</li>
-  </ol>
-
-  <p>To avoid losing important data:</p>
-
-  <ul>
-    <li>Make regular copies of the file <code>/omegat/project_save.tmx</code>
-    to backup media, such as CD or DVD.</li>
-
-    <li>Until you are familiar with OmegaT, create translated files at regular
-    intervals and check that the translated file contains the latest version of
-    your translation.</li>
-
-    <li>Take particular care when making changes to the files in
-    <code>/source</code> whilst in the middle of a project. If the source file
-    is modified after you have begun translating, OmegaT may be unable to find
-    a segment that you have already translated.</li>
-
-    <li>Get started with the aid of these Help texts. Should you run into
-    problems, post a message in the <a href=
-    "http://groups.yahoo.com/group/omegat">OmegaT user group</a>. Do not
-    hesitate to post in the language you feel the most familiar with.</li>
-  </ul>
-  <hr>
-
-  <table style="width: 100%;" summary="just formatting" border="0" cellpadding=
-  "2" cellspacing="2">
-    <tbody>
-      <tr>
-        <td style="text-align: left;"><a href="legalNotices.html">Legal
-        notices</a></td>
-
-        <td style="text-align: center;"><a href="index.html">Home</a></td>
-
-        <td style="text-align: right;"><a href="xindex.html">Index of
-        contents</a></td>
-      </tr>
-    </tbody>
-  </table>
-</body>
-</html>
diff --git a/docs/en/projectProperties.html b/docs/en/projectProperties.html
deleted file mode 100644
index 1f564e2..0000000
--- a/docs/en/projectProperties.html
+++ /dev/null
@@ -1,108 +0,0 @@
-<html>
-<head>
-  <link rel="stylesheet" href="./OmegaT.css" type="text/css">
-  <meta http-equiv="content-type" content="text/html; charset=utf-8">
-
-  <title>Project Properties - OmegaT 2.0 User Manual</title>
-</head>
-
-<body>
-  <h2>Project properties</h2>
-
-  <ul>
-    <li>
-      <a href="#dialog">Properties dialog</a>
-
-      <ul>
-        <li><a href="#language">Language modifications</a></li>
-
-        <li><a href="#segments">Segmentation modifications</a></li>
-
-        <li><a href="#folder">Folder structure modifications</a></li>
-      </ul>
-    </li>
-
-    <li><a href="#warning">Modifying project properties during the
-    session</a></li>
-  </ul>
-  <hr>
-  <a name="dialog" id="dialog"></a>
-
-  <h2>Properties dialog</h2>
-
-  <p>This dialog is used to modify the project folders and languages. It may be
-  opened by pressing <code><a href="menu.html#shortcuts">Ctrl+E</a></code> or
-  by calling <strong>Project → Properties...</strong> from the <a href=
-  "menu.html">main menu</a>. The dialog contains:</p>
-
-  <ul>
-    <li>Area for setting project source and target languages with drop-down
-    menus</li>
-
-    <li>Segmentation settings flag</li>
-
-    <li>Area for setting project folders</li>
-  </ul>
-
-  <p>All the fields are editable. You can either enter the languages by hand or
-  use the drop down menu. You can type names of folders that do not exist yet,
-  and OmegaT will create them for you.</p><a name="language" id="language"></a>
-
-  <h3>Language modification</h3>
-
-  <p>You have to bear in mind that changing the languages may render the
-  currently used translation memories useless since their language may not
-  match new languages anymore.</p><a name="segments" id="segments"></a>
-
-  <h3>Segmentation modifications</h3>
-
-  <p>The segmentation settings only address the way the source files are
-  handled by OmegaT. They do not modify the segmentation of already existing
-  translation memories.</p>
-
-  <p>If you change the segmentation settings, some already translated segments
-  may get split or merged. This will practically return them to the
-  "untranslated" status, as they will not match segments recorded in the
-  project memory anymore, even though the old and now not matching translation
-  is still there.</p>
-
-  <p>OmegaT may <a href="translationMemories.html#upgrading_TM">upgrade old
-  translation memories</a> that did not use sentence segmentation, but not vice
-  versa. If you change your mind in the middle of the translation, the
-  project's translation memory will not be changed.</p><a name="folder" id=
-  "folder"></a>
-
-  <h3>Folder structure modifications</h3>
-
-  <p>In case you intend to modify project folders, remember that this will not
-  move the contained files from old folders to new ones. You risk ending up in
-  a situation neither you or OmegaT know what the folders really mean, and
-  which of them are being used.</p>
-  <hr>
-  <a name="warning" id="warning"></a>
-
-  <h2>Modifying project properties during the session</h2>
-
-  <p>It is possible to modify the project properties during a translation
-  session. However, the safest way is to consider all settings as final once
-  the translation has started - unless of course you realize a major mistake
-  has been made. See the <a href="preventingDataLoss.html">Preventing data
-  loss</a> section for ways to protect your work.</p>
-  <hr>
-
-  <table style="width: 100%;" summary="just formatting" border="0" cellpadding=
-  "2" cellspacing="2">
-    <tbody>
-      <tr>
-        <td style="text-align: left;"><a href="legalNotices.html">Legal
-        notices</a></td>
-
-        <td style="text-align: center;"><a href="index.html">Home</a></td>
-
-        <td style="text-align: right;"><a href="xindex.html">Index of
-        contents</a></td>
-      </tr>
-    </tbody>
-  </table>
-</body>
-</html>
diff --git a/docs/en/regexp.html b/docs/en/regexp.html
deleted file mode 100644
index cbc3207..0000000
--- a/docs/en/regexp.html
+++ /dev/null
@@ -1,782 +0,0 @@
-<html>
-<head>
-  <link rel="stylesheet" href="./OmegaT.css" type="text/css">
-  <meta http-equiv="CONTENT-TYPE" content="text/html; charset=utf-8">
-  <title>Regular Expressions - OmegaT 2.0 User Manual</title>
-</head>
-
-<body>
-  <h2>Regular-expression constructs</h2>
-
-  <p>The regular expressions (or regex for short) used in searches and
-  segmentation rules are those supported by Java. If you need more specific
-  information, please consult <a href=
-  "http://java.sun.com/j2se/1.5/docs/api/java/util/regex/Pattern.html">http://java.sun.com/j2se/1.5/docs/api/java/util/regex/Pattern.html</a>.
-  See additional references and examples below. </p>
-
-  <table summary="just formatting" style="width: 80%;" border="0" cellpadding=
-  "2" cellspacing="2">
-    <tbody>
-      <tr>
-        <td style="width: 40%;">
-          <h3><a href="#Flags__">Flags</a></h3>
-        </td>
-
-        <td style="width: 60%;">
-          <h3><a href="#Characters_">Characters</a></h3>
-        </td>
-      </tr>
-
-      <tr>
-        <td>
-          <h3><a href="#Quotation_">Quotation</a></h3>
-        </td>
-
-        <td>
-          <h3><a name="Classes_for_Uncode_blocks_and_" id=
-          "Classes_for_Uncode_blocks_and_"></a><a href=
-          "#Classes_for_Uncode_blocks_and_">Classes for Unicode blocks
-          and  categories</a></h3>
-        </td>
-      </tr>
-
-      <tr>
-        <td>
-          <h3><a href="#Character_classes_">Character classes</a></h3>
-        </td>
-
-        <td>
-          <h3><a href="#Predefined_character_classes_">Predefined character
-          classes</a></h3>
-        </td>
-      </tr>
-
-      <tr>
-        <td style="width: 257px;">
-          <h3><a href="#Boundary_matchers_">Boundary matchers</a></h3>
-        </td>
-
-        <td style="width: 517px;">
-          <h3><a href="#Greedy_quantifiers_">Greedy quantifiers</a></h3>
-        </td>
-      </tr>
-
-      <tr>
-        <td>
-          <h3><a href="#Reluctant_non-greedy_quantifiers_">Reluctant
-          (non-greedy) quantifiers</a></h3>
-        </td>
-
-        <td>
-          <h3><a href="#Logical_operators_">Logical operators</a></h3>
-        </td>
-      </tr>
-
-      <tr>
-        <td>
-          <h3><a href="#References_and_examples_">Regex tools and examples of
-          use</a></h3>
-        </td>
-      </tr>
-    </tbody>
-  </table>    
-
-  <p> <br></p>
-  <hr>
-
-  <table summary="just formatting" border="0" cellpadding="3" cellspacing="0">
-    <col width="15%">
-    <col width="80%">
-
-    <tbody>
-      <tr>
-        <td width="355">
-          <h3>The construct...</h3>
-        </td>
-
-        <td width="877">
-          <h3>...matches the following:</h3>
-        </td>
-      </tr>
-
-      <tr>
-        <td colspan="2" width="1238">
-          <hr>
-
-          <h3><a name="Flags__" id="Flags__"></a>Flags</h3>
-        </td>
-      </tr>
-
-      <tr bgcolor="#DDDDDD">
-        <td width="355">
-          <p><code>(?i)</code></p>
-        </td>
-
-        <td width="877">
-          <p>Enables case-insensitive matching (by default, the pattern is
-          case-sensitive).</p>
-        </td>
-      </tr>
-
-      <tr>
-        <td colspan="2" width="1238">
-          <hr>
-
-          <h3><a name="Characters_" id="Characters_"></a>Characters</h3>
-        </td>
-      </tr>
-
-      <tr bgcolor="#DDDDDD">
-        <td width="355">
-          <p><code>x</code></p>
-        </td>
-
-        <td width="877">
-          <p>The character <strong>x</strong>, except the following...</p>
-        </td>
-      </tr>
-
-      <tr>
-        <td width="355">
-          <p><code>\uhhhh</code></p>
-        </td>
-
-        <td width="877">
-          <p>The character with
-          hexadecimal value <code>0x</code><strong>hhhh</strong></p>
-        </td>
-      </tr>
-
-      <tr bgcolor="#DDDDDD">
-        <td width="355">
-          <p><code>\t</code></p>
-        </td>
-
-        <td width="877">
-          <p>The tab character (<code>'\u0009'</code>)</p>
-        </td>
-      </tr>
-
-      <tr>
-        <td width="355">
-          <p><code>\n</code></p>
-        </td>
-
-        <td width="877">
-          <p>The newline (line feed) character (<code>'\u000A'</code>)</p>
-        </td>
-      </tr>
-
-      <tr bgcolor="#DDDDDD">
-        <td width="355">
-          <p><code>\r</code></p>
-        </td>
-
-        <td width="877">
-          <p>The carriage-return character (<code>'\u000D'</code>)</p>
-        </td>
-      </tr>
-
-      <tr>
-        <td width="355">
-          <p><tt>\f</tt></p>
-        </td>
-
-        <td width="877">
-          <p>The form-feed character (<tt>'\u000C'</tt>)</p>
-        </td>
-      </tr>
-
-      <tr bgcolor="#DDDDDD">
-        <td width="355">
-          <p><tt>\a</tt></p>
-        </td>
-
-        <td width="877">
-          <p>The alert (bell) character (<tt>'\u0007'</tt>)</p>
-        </td>
-      </tr>
-
-      <tr>
-        <td width="355">
-          <p><tt>\e</tt></p>
-        </td>
-
-        <td width="877">
-          <p>The escape character (<tt>'\u001B'</tt>)</p>
-        </td>
-      </tr>
-
-      <tr bgcolor="#DDDDDD">
-        <td width="355">
-          <p><tt>\c</tt><i>x</i></p>
-        </td>
-
-        <td width="877">
-          <p>The control character corresponding to <i>x</i></p>
-        </td>
-      </tr>
-
-      <tr>
-        <td width="355">
-          <p><tt>\0</tt><i>n</i></p>
-        </td>
-
-        <td width="877">
-          <p>The character with octal value <tt>0</tt><i>n</i>
-          (0 <tt><=</tt> <i>n</i> <tt><=</tt> 7)</p>
-        </td>
-      </tr>
-
-      <tr bgcolor="#DDDDDD">
-        <td width="355">
-          <p><tt>\0</tt><i>nn</i></p>
-        </td>
-
-        <td width="877">
-          <p>The character with octal value <tt>0</tt><i>nn</i>
-          (0 <tt><=</tt> <i>n</i> <tt><=</tt> 7)</p>
-        </td>
-      </tr>
-
-      <tr>
-        <td width="355">
-          <p><tt>\0</tt><i>mnn</i></p>
-        </td>
-
-        <td width="877">
-          <p>The character with octal value <tt>0</tt><i>mnn</i>
-          (0 <tt><=</tt> <i>m</i> <tt><=</tt> 3,
-          0 <tt><=</tt> <i>n</i> <tt><=</tt> 7)</p>
-        </td>
-      </tr>
-
-      <tr bgcolor="#DDDDDD">
-        <td width="355">
-          <p><tt>\x</tt><i>hh</i></p>
-        </td>
-
-        <td width="877">
-          <p>The character with
-          hexadecimal value <tt>0x</tt><i>hh</i></p>
-        </td>
-      </tr>
-
-      <tr>
-        <td colspan="2" width="1238">
-          <hr>
-
-          <h3><a name="Quotation_" id="Quotation_"></a>Quotation</h3>
-        </td>
-      </tr>
-
-      <tr bgcolor="#DDDDDD">
-        <td width="355">
-          <p><code>\</code></p>
-        </td>
-
-        <td width="877">
-          <p>Nothing, but quotes the following character. This is required if
-          you would like to enter of the meta characters
-          <code>!$()*+.<>?[\]^{|}</code> to match as themselves.</p>
-        </td>
-      </tr>
-
-      <tr>
-        <td width="355">
-          <p><code>\\</code></p>
-        </td>
-
-        <td width="877">
-          <p>For example, this is the backslash character</p>
-        </td>
-      </tr>
-
-      <tr bgcolor="#DDDDDD">
-        <td width="355">
-          <p><code>\Q</code></p>
-        </td>
-
-        <td width="877">
-          <p>Nothing, but quotes all characters until <code>\E</code></p>
-        </td>
-      </tr>
-
-      <tr>
-        <td width="355">
-          <p><code>\E</code></p>
-        </td>
-
-        <td width="877">
-          <p>Nothing, but ends quoting started by <tt>\Q</tt></p>
-        </td>
-      </tr>
-
-      <tr>
-        <td colspan="2" width="1238">
-          <hr>
-
-          <h3><a name="Classes_for_Unicode_blocks_and" id=
-          "Classes_for_Unicode_blocks_and"></a>Classes for Unicode blocks and
-          categories</h3>
-        </td>
-      </tr>
-
-      <tr bgcolor="#DDDDDD">
-        <td width="355">
-          <p><code><tt>\p{InGreek}</tt></code></p>
-        </td>
-
-        <td width="877">
-          <p>A character in the Greek block (simple <a href=
-          "http://java.sun.com/j2se/1.5/docs/api/java/util/regex/Pattern.html#ubc">
-          block</a>)</p>
-        </td>
-      </tr>
-
-      <tr>
-        <td width="355">
-          <p><code><tt>\p{Lu}</tt></code></p>
-        </td>
-
-        <td width="877">
-          <p>An uppercase letter (simple <a href=
-          "http://java.sun.com/j2se/1.5/docs/api/java/util/regex/Pattern.html#ubc">
-          category</a>)</p>
-        </td>
-      </tr>
-
-      <tr bgcolor="#DDDDDD">
-        <td width="355">
-          <p><code><tt>\p{Sc}</tt></code></p>
-        </td>
-
-        <td width="877">
-          <p>A currency symbol</p>
-        </td>
-      </tr>
-
-      <tr>
-        <td width="355">
-          <p><code><tt>\P{InGreek}</tt></code></p>
-        </td>
-
-        <td width="877">
-          <p>Any character except one in the Greek block (negation)</p>
-        </td>
-      </tr>
-
-      <tr bgcolor="#DDDDDD">
-        <td height="33" width="355">
-          <p><code><tt>[\p{L}&&[^\p{Lu}]]</tt></code></p>
-        </td>
-
-        <td width="877">
-          <p>Any letter except an uppercase letter (subtraction)</p>
-        </td>
-      </tr>
-
-      <tr>
-        <td colspan="2" width="1238">
-          <hr>
-
-          <h3><a name="Character_classes_" id=
-          "Character_classes_"></a>Character classes</h3>
-        </td>
-      </tr>
-
-      <tr bgcolor="#DDDDDD">
-        <td width="355">
-          <p><code>[abc]</code></p>
-        </td>
-
-        <td width="877">
-          <p><code>a</code>, <code>b</code>, or <code>c</code> (simple
-          class)</p>
-        </td>
-      </tr>
-
-      <tr>
-        <td width="355">
-          <p><code>[^abc]</code></p>
-        </td>
-
-        <td width="877">
-          <p>Any character except <code>a</code>, <code>b</code>, or
-          <code>c</code> (negation)</p>
-        </td>
-      </tr>
-
-      <tr bgcolor="#DDDDDD">
-        <td width="355">
-          <p><code>[a-zA-Z]</code></p>
-        </td>
-
-        <td width="877">
-          <p><code>a</code> through <code>z</code> or <code>A</code> through
-          <code>Z</code>, inclusive (range)</p>
-        </td>
-      </tr>
-
-      <tr>
-        <td colspan="2" width="1238">
-          <hr>
-
-          <h3><a name="Predefined_character_classes_" id=
-          "Predefined_character_classes_"></a>Predefined character classes</h3>
-        </td>
-      </tr>
-
-      <tr bgcolor="#DDDDDD">
-        <td width="355">
-          <p><code>.</code></p>
-        </td>
-
-        <td width="877">
-          <p>Any character (except for line terminators)</p>
-        </td>
-      </tr>
-
-      <tr>
-        <td width="355">
-          <p><code>\d</code></p>
-        </td>
-
-        <td width="877">
-          <p>A digit: <code>[0-9]</code></p>
-        </td>
-      </tr>
-
-      <tr bgcolor="#DDDDDD">
-        <td width="355">
-          <p><code>\D</code></p>
-        </td>
-
-        <td width="877">
-          <p>A non-digit: <code>[^0-9]</code></p>
-        </td>
-      </tr>
-
-      <tr>
-        <td width="355">
-          <p><code>\s</code></p>
-        </td>
-
-        <td width="877">
-          <p>A whitespace character: <code>[ \t\n\x0B\f\r]</code></p>
-        </td>
-      </tr>
-
-      <tr bgcolor="#DDDDDD">
-        <td width="355">
-          <p><code>\S</code></p>
-        </td>
-
-        <td width="877">
-          <p>A non-whitespace character: <code>[^\s]</code></p>
-        </td>
-      </tr>
-
-      <tr>
-        <td width="355">
-          <p><code>\w</code></p>
-        </td>
-
-        <td width="877">
-          <p>A word character: <code>[a-zA-Z_0-9]</code></p>
-        </td>
-      </tr>
-
-      <tr bgcolor="#DDDDDD">
-        <td width="355">
-          <p><code>\W</code></p>
-        </td>
-
-        <td width="877">
-          <p>A non-word character: <code>[^\w]</code></p>
-        </td>
-      </tr>
-
-      <tr>
-        <td colspan="2" width="1238">
-          <hr>
-
-          <h3><a name="Boundary_matchers_" id="Boundary_matchers_"></a>Boundary
-          matchers</h3>
-        </td>
-      </tr>
-
-      <tr bgcolor="#DDDDDD">
-        <td width="355">
-          <p><code>^</code></p>
-        </td>
-
-        <td width="877">
-          <p>The beginning of a line</p>
-        </td>
-      </tr>
-
-      <tr>
-        <td width="355">
-          <p><code>$</code></p>
-        </td>
-
-        <td width="877">
-          <p>The end of a line</p>
-        </td>
-      </tr>
-
-      <tr bgcolor="#DDDDDD">
-        <td width="355">
-          <p><code>\b</code></p>
-        </td>
-
-        <td width="877">
-          <p>A word boundary</p>
-        </td>
-      </tr>
-
-      <tr>
-        <td width="355">
-          <p><code>\B</code></p>
-        </td>
-
-        <td width="877">
-          <p>A non-word boundary</p>
-        </td>
-      </tr>
-
-      <tr>
-        <td colspan="2" width="1238">
-          <hr>
-
-          <h3><a name="Greedy_quantifiers_" id="Greedy_quantifiers_"></a>Greedy
-          quantifiers</h3>
-        </td>
-      </tr>
-
-      <tr>
-        <td colspan="2" width="1238">
-          <p>These will match as much as they can. For example, <code>a+</code>
-          will match <code>aaa</code> in <code>aaabbb</code></p>
-        </td>
-      </tr>
-
-      <tr bgcolor="#DDDDDD">
-        <td width="355">
-          <p><strong>X</strong><code>?</code></p>
-        </td>
-
-        <td width="877">
-          <p><strong>X</strong>, once or not at all</p>
-        </td>
-      </tr>
-
-      <tr>
-        <td width="355">
-          <p><strong>X</strong><code>*</code></p>
-        </td>
-
-        <td width="877">
-          <p><strong>X</strong>, zero or more times</p>
-        </td>
-      </tr>
-
-      <tr bgcolor="#DDDDDD">
-        <td width="355">
-          <p><strong>X</strong><code>+</code></p>
-        </td>
-
-        <td width="877">
-          <p><strong>X</strong>, one or more times</p>
-        </td>
-      </tr>
-
-      <tr>
-        <td colspan="2" width="1238">
-          <hr>
-
-          <h3><a name="Reluctant_non-greedy_quantifiers_" id=
-          "Reluctant_non-greedy_quantifiers_"></a>Reluctant (non-greedy)
-          quantifiers</h3>
-        </td>
-      </tr>
-
-      <tr>
-        <td colspan="2" width="1238">
-          <p>These will match as little as they can. For example,
-          <code>a+?</code> will match the first <code>a</code> in
-          <code>aaabbb</code></p>
-        </td>
-      </tr>
-
-      <tr bgcolor="#DDDDDD">
-        <td width="355">
-          <p><strong>X</strong><code>??</code></p>
-        </td>
-
-        <td width="877">
-          <p><strong>X</strong>, once or not at all</p>
-        </td>
-      </tr>
-
-      <tr>
-        <td width="355">
-          <p><strong>X</strong><code>*?</code></p>
-        </td>
-
-        <td width="877">
-          <p><strong>X</strong>, zero or more times</p>
-        </td>
-      </tr>
-
-      <tr bgcolor="#DDDDDD">
-        <td width="355">
-          <p><strong>X</strong><code>+?</code></p>
-        </td>
-
-        <td width="877">
-          <p><strong>X</strong>, one or more times</p>
-        </td>
-      </tr>
-
-      <tr>
-        <td colspan="2" width="1238">
-          <hr>
-
-          <h3><a name="Logical_operators_" id="Logical_operators_"></a>Logical
-          operators</h3>
-        </td>
-      </tr>
-
-      <tr bgcolor="#DDDDDD">
-        <td width="355">
-          <p><strong>XY</strong></p>
-        </td>
-
-        <td width="877">
-          <p><strong>X</strong> followed by <strong>Y</strong></p>
-        </td>
-      </tr>
-
-      <tr>
-        <td width="355">
-          <p><strong>X</strong><code>|</code><strong>Y</strong></p>
-        </td>
-
-        <td width="877">
-          <p>Either <strong>X</strong> or <strong>Y</strong></p>
-        </td>
-      </tr>
-
-      <tr bgcolor="#DDDDDD">
-        <td width="355">
-          <p><code>(</code><strong>XY</strong><code>)</code></p>
-        </td>
-
-        <td width="877">
-          <p><strong>XY</strong> as a single group</p>
-        </td>
-      </tr>
-    </tbody>
-  </table>
-  <hr>
-  <br>
-
-  <h2><a name="References_and_examples_" id=
-  "References_and_examples_"></a>Regex tools and examples of use</h2><br>
-  There's a number of interactive tools available to develop and test regular
-  expressions. They all pretty much follow the same pattern (see below for
-  an  example ina form of a plug-in for Firefox): the regular
-  expression (top entry)  analyzes the search text (Text box in the
-  middle) , yielding the hits, shown in the result Text box.<br>
-  <br>
-  <img alt=
-  "regular expressions tester plug-in for FireFox" src=
-  "images/RegexTester.png"><br>
-  <br>
-  See <a href="http://www.weitz.de/regex-coach/">The Regex Coach</a> for
-  Windows,Linux, Mac, FreeBSD versions of a stand-alone tool, that's pretty
-  much identical to the above example.<br>
-  <br>
-  A nice collection  of  useful regex cases can be found in the
-  OmegaT itself (see Options > <a href=
-  "segmentation.html">Segmentation</a>).  The following list includes
-  expressions, you may find useful when searching through the translation
-  memory:<br>
-  <br>
-
-  <table summary="just formatting" style="text-align: left; width: 600px;"
-  border="1" cellpadding="0" cellspacing="2">
-    <tbody>
-      <tr>
-        <td style="font-weight: bold;">Regular expression</td>
-
-        <td style="font-weight: bold;">Finds the following:</td>
-      </tr>
-
-      <tr>
-        <td>(\b\w+\b)\s\1\b<br></td>
-
-        <td>double words </td>
-      </tr>
-
-      <tr>
-        <td>[\.,]\s*[\.,]+</td>
-
-        <td>t commas and periods  mix-up</td>
-      </tr>
-
-      <tr>
-        <td>\. \s$</td>
-
-        <td>extra blanks, following the period at the end of the line</td>
-      </tr>
-
-      <tr>
-        <td>\s+a\s+[aeiou]</td>
-
-        <td> English:  words, starting on vowels, should be preceded
-        by "an", not "a"</td>
-      </tr>
-
-      <tr>
-        <td>\s+an\s+[^aeiou]</td>
-
-        <td> English: the same check as above, but for consonants ("a",
-        not "an")</td>
-      </tr>
-
-      <tr>
-        <td>\s\s+</td>
-
-        <td>more than one space</td>
-      </tr>
-
-      <tr>
-        <td>\.[A-Z]</td>
-
-        <td>space missing between a period and the start of a new
-        sentence</td>
-      </tr>
-    </tbody>
-  </table><br>
-  <br>
-  <hr>
-
-  <table summary="just formatting" style="width: 100%;" border="0" cellpadding=
-  "2" cellspacing="2">
-    <tbody>
-      <tr>
-        <td style="text-align: left;"><a href="legalNotices.html">Legal
-        notices</a></td>
-
-        <td style="text-align: center;"><a href="index.html">Home</a></td>
-
-        <td style="text-align: right;"><a href="xindex.html">Index of
-        contents</a></td>
-      </tr>
-    </tbody>
-  </table>
-</body>
-</html>
diff --git a/docs/en/searches.html b/docs/en/searches.html
deleted file mode 100644
index 95f5984..0000000
--- a/docs/en/searches.html
+++ /dev/null
@@ -1,256 +0,0 @@
-<html>
-<head>
-	<link rel="stylesheet" href="./OmegaT.css" type="text/css">
-  <meta http-equiv="CONTENT-TYPE" content="text/html; charset=utf-8">
-  <title>Searches - OmegaT 2.0 User Manual</title>
-</head>
-
-<body>
-  <h2>Searches</h2>
-
-  <p><a href="#searchwindow">Search window</a></p>
-
-  <ul>
-      <li>
-        <a href="#calling">Calling up a search</a>
-      </li>
-
-      <li>
-        <a href="#location">Search location</a>
-      </li>
-  </ul>
-
-  <p><a href="#searchmethods">Search methods</a></p>
-
-  <p><a href="#usingwildcards">Using wild cards</a></p>
-
-  <p><a href="#usingregularexpressions">Using regular expressions</a></p>
-
-  <p><a href="#display">Search results display</a></p>
-  
-  <p><a href="#filter">Filter entries in editor according to search</a></p>
-  <hr>
-
-  <h2><a name="searchwindow" id="searchwindow"></a>Search window</h2><img src=
-  "images/TextSearch.png" name="graphics1" align="left" width="659" height=
-  "446" border="0" id="graphics1" alt="Text search window"><br clear="left">
-
-  <p><br>
-  <br></p>
-
-  <h3><a name="calling" id="calling"></a>Calling up a search</h3>
-
-  <p>OmegaT provides a powerful range of search functions. Call up the
-  <strong>Search</strong> window with <code>Ctrl+F</code> and enter the word or
-  phrase you wish to search for in the <strong>Search for</strong> box.
-  Alternatively, select a word or phrase anywhere in the Editor pane and hit
-  <code>Ctrl+F</code>. The  word or phrase is entered in the <strong>Search
-  for</strong> box automatically in this case. Every call of the <strong>
-  Search</strong> window creates its own new window. Do not forget to close
-  them, so that they do not clutter your desktop.</p>
-
-  <h3><a name="location" id="location"></a>Search location</h3>
-
-  <p>Searches occur both in the source as well as in the target section of the
-  project. You may search in</p>
-
-  <ul>
-    <li>
-      <p>the project only (default setting)</p>
-    </li>
-
-    <li>
-      <p>the project as well as in the reference translation memories in /tm/
-      (check <i>Search TMs</i>)</p>
-    </li>
-
-    <li>
-      <p>a single file or a folder containing a set of files (check <i>Search
-      files</i>)</p>
-    </li>
-  </ul>
-
-  <p>When searching through files, OmegaT will restrict the search to files in source file formats 
-  (See <a href="filesToTranslate.html#formats">File
-  Formats</a>). For instance, while OmegaT is well able to handle TMX files, it will not include them in the search.</p>
-  <hr>
-
-  <h2><a name="searchmethods" id="searchmethods"></a>Search methods</h2>
-
-  <p>Select the method using the radio buttons. You can choose between two
-  methods to search:</p>
-
-  <table summary= "just formatting" width="100%" border="0" cellpadding="3" cellspacing="0">
-    <col width="20%">
-    <col width="80%">
-
-    <tr>
-      <td width="20%">
-        <p><strong>exact search</strong></p>
-      </td>
-
-      <td width="80%">
-        <p>Search for segments containing of the string you specified.</p>
-      </td>
-    </tr>
-
-    <tr>
-      <td width="20%">
-        <p><strong>keyword search</strong></p>
-      </td>
-
-      <td width="80%">
-        <p>Search for segments containing all keywords you specified, in any
-        order.</p>
-      </td>
-    </tr>
-  </table>
-
-  <p>An <strong>exact search</strong> looks for a phrase, i.e. if several words
-  are entered, they are found only if they occur in exactly the same sequence.
-  Exact searches are similar to an "exact phrase" search in an Internet search
-  engine such as Google. Select <strong>keyword search</strong> to search for
-  any number of individual words, separated by spaces and in any order. OmegaT
-  will display a list of all segments in which all the words occur. Keyword 
-  searches are similar to a search "with all of the words" in an Internet search 
-  engine such as Google (AND logic).</p>
-
-  <p>For either of these two methods you can select the following three
-  options:</p>
-
-  <table summary= "just formatting" width="100%" border="0" cellpadding="3" cellspacing="0">
-    <col width="20%">
-    <col width="80%">
-
-    <tr>
-      <td width="20%">
-        <p><strong>case sensitive</strong></p>
-      </td>
-
-      <td width="80%">
-        <p>The search will be performed for the exact string specified;
-        otherwise capitals will be ignored.</p>
-      </td>
-    </tr>
-
-    <tr>
-      <td width="20%">
-        <p><strong>regular expressions</strong></p>
-      </td>
-
-      <td width="80%">
-        <p>The search string will be treated as a regular expression (in case
-        of a keyword search it will be treated as multiple expressions).</p>
-      </td>
-    </tr>
-
-    <tr>
-      <td width="20%">
-        <p><strong>search TMs</strong></p>
-      </td>
-
-      <td width="80%">
-        <p>All translation memories are included in the search.</p>
-      </td>
-    </tr>
-  </table>
-  <hr>
-
-  <h2><a name="usingwildcards" id="usingwildcards"></a>Using wild cards</h2>
-
-  <p>In both exact and keyword searches, the wild card search characters
-  '<code>*</code>' and '<code>?</code>' can be used. To use wild cards, make
-  sure the option <strong>regular expressions</strong> is not selected,
-  otherwise these characters are interpreted as special regular expression
-  characters.</p>
-
-  <ul>
-    <li>
-      <p>'<strong>*</strong>' matches zero or more characters. The search term
-      '<strong>run*</strong>' for example would match '<strong>run</strong>',
-      '<strong>runs</strong>', and '<strong>running</strong>'.</p>
-    </li>
-
-    <li>
-      <p>'<strong>?</strong>' matches any single character. For instance,
-      '<strong>run?</strong>' would match '<strong>runs</strong>' and
-      '<strong>rung</strong>', but not '<strong>run</strong>' or
-      '<strong>running</strong>'.</p>
-    </li>
-  </ul>
-
-  <p>If you wish to search for segments containing either <strong>*</strong> or
-  <strong>?</strong>, you will need to switch on regular expressions, and
-  escape these characters by prefixing a backslash ('\') to them, i.e. 'x\*y'
-  to find instances of 'x*y' and 'x\?<code>y</code>' to find instances of
-  '<code>x?y</code>'.</p>
-  <hr>
-
-  <h2><a name="usingregularexpressions" id="usingregularexpressions"></a>Using
-  regular expressions</h2>
-
-  <p>A regular expression search is a powerful way to look for instances of a
-  string. It is similar to a wild card search, but allows far more flexibility.
-  The regular expressions used in searches are those supported by Java. A short
-  summary is available in the <a href="regexp.html">Regular Expressions
-  Constructs</a> appendix. If you need more specific information, please
-  consult <a href=
-  "http://java.sun.com/j2se/1.5/docs/api/java/util/regex/Pattern.html">http://java.sun.com/j2se/1.5/docs/api/java/util/regex/Pattern.html</a>.</p>
-
-  <p>You can find simple tutorials on the web (<a href=
-  "http://www.regular-expressions.info/quickstart.html">http://www.regular-expressions.info/quickstart.html</a>,
-  for example.)</p>
-  <hr>
-
-  <h2><a name="display" id="display"></a>Search results display</h2>
-
-  <p>Pressing the search button after entering a string in the search field
-  will display all the segments in the project that include the searched
-  string. As OmegaT handles identical segments as one single entity, only the
-  first unique segment is shown.</p>
-
-  <p>The segments are displayed in order of appearance in the project.
-  Translated segments will be displayed with the original text at the top and
-  the translated text at the bottom, untranslated segments will be displayed
-  as the source only.</p>
-
-  <p>Clicking on a segment will open it in the Editor for modifications. You may
-  then switch back to Search window for the next found segment, for instance to
-  control and if necessary correct the terminology.</p>
-  <hr>
-
-  <h2><a name="filter" id="filter"></a>Filter entries in editor according to search</h2>
-
-  <p>For easier navigation in the search result set, you can apply the search to
-  the editor. Press the 'filter' button on the bottom to limit the shown entries 
-  in the editor window to those that match the current search. You can use 
-  normal navigation to go to e.g. the next (untranslated) segment that matches
-  the search criteria.</p>
-  <p>NB:</p>
-  <ul><li>a search is limited to 1000 items, so if you search on a common
-  phrase, the editor then shows only those 1000 matching entries, and not all 
-  entries that match the search criteria.</li>
-  <li>a file might have no matching entries, so it will show empty.</li> 
-  <li>if a search removes duplicates, you might miss duplicates in the editor.</li>
-  </ul>
-
-  <p>To remove a filter, press the 'remove filter' button, or reload a project.
-  </p>
-
-  <hr>
-  <table summary= "just formatting" style="width: 100%;" border="0" cellpadding="2" cellspacing="2">
-    <tbody>
-      <tr>
-        <td style="text-align: left;"><a href="legalNotices.html">Legal
-notices</a> </td>
-        <td style="text-align: center;"><a href="index.html">Home</a>
-        </td>
-        <td style="text-align: right;"><a href="xindex.html">Index of
-contents</a> </td>
-      </tr>
-    </tbody>
-  </table>
-
-
-</body>
-</html>
diff --git a/docs/en/segmentation.html b/docs/en/segmentation.html
deleted file mode 100644
index cec0771..0000000
--- a/docs/en/segmentation.html
+++ /dev/null
@@ -1,298 +0,0 @@
-<html>
-<head>
-  <link rel="stylesheet" href="./OmegaT.css" type="text/css">
-  <meta http-equiv="CONTENT-TYPE" content="text/html; charset=utf-8">
-
-  <title>Source Segmentation - OmegaT 2.0 User Manual</title>
-</head>
-
-<body>
-  <h2>Source segmentation</h2>
-
-  <ul>
-    <li>
-      <p><a href="#structure">Structure level segmentation</a></p>
-    </li>
-
-    <li>
-      <p><a href="#sentence">Sentence level segmentation</a></p>
-
-      <ul>
-        <li>
-          <p><a href="#about">Segmentation rules</a></p>
-        </li>
-
-        <li>
-          <p><a href="#setup">Rules setup</a></p>
-
-          <ul>
-            <li>
-              <p><a href="#priority">Priority</a></p>
-            </li>
-
-            <li>
-              <p><a href="#creation">Rules creation</a></p>
-            </li>
-
-            <li>
-              <p><a href="#break">Break/Exception</a></p>
-            </li>
-
-            <li>
-              <p><a href="#examples">A few simple examples</a></p>
-            </li>
-          </ul>
-        </li>
-      </ul>
-    </li>
-
-    <li>
-      <p><a href="regexp.html">Regular expression constructs</a></p>
-    </li>
-  </ul>
-
-  <p>Translation memory tools work with textual units called segments. OmegaT
-  has 2 ways to segment a text: paragraph segmentation and sentence
-  segmentation. In order to select the type of segmentation, select
-  <strong>Project → Properties...</strong> from the main menu and use the
-  available check box. Note that paragraph segmentation is pretty much outdated
-  and that for the majority of projects the sentence segmentation is a choice
-  to be preferred. If sentence segmentation has been selected, you can setup
-  the rules by selecting <strong>Options → Segmentation...</strong> from the
-  main menu.</p>
-
-  <p>Note that a good part of the development has been spent in developing
-  dependable segmentation rules, so in a majority of cases you will not need to
-  get involved with writing your own segmentation rules. On the other hand this
-  functionality can be very useful in special cases, allowing you to translate
-  what needs to be translated without running the danger of changing, what
-  needs to stay unchanged.</p>
-
-  <p><strong>Warning!</strong> Changing the filters options while the project
-  is open, may result in the loss of data. If you change segmentation options
-  when a project is open, you will have to reload the project for the changes
-  to take effect.</p>
-  <hr>
-
-  <h2><a name="structure" id="structure"></a>Structure level segmentation</h2>
-
-  <p>OmegaT first parses the text for structure-level segmentation. During this
-  process it is only the structure of the source file that is used to produce
-  segments.</p>
-
-  <p>For example, <a href="fileFilters.html#filter_options">text files</a> may
-  be segmented on line breaks, empty lines, or not be segmented at all. Files
-  with formatting (OpenOffice.org documents, HTML documents, etc.) are
-  segmented on block-level (paragraph) tags. Translatable object <a href=
-  "fileFilters.html#filter_options">attributes</a> in XHTML or HTML files can
-  be extracted as separate segments.</p>
-  <hr>
-
-  <h2><a name="sentence" id="sentence"></a>Sentence level segmentation</h2>
-
-  <p>After segmenting the source file into logical units, OmegaT will further
-  segment these blocks into sentences.</p>
-
-  <h3><a name="about" id="about"></a>Segmentation rules</h3>
-
-  <p>The process of segmenting can be pictured as follows: imagine the cursor
-  move along the text, one character at a time. For each cursor position each
-  rule is applied in the given order to see if the <strong>Before</strong>
-  pattern applies the text on the left and the <strong>After</strong> pattern
-  to the text on the right of the cursor. If the rule matches, the program
-  stops the rules examination (´for the exception rule) or creates a new
-  segment (for the break rule).</p>
-
-  <p>The Sentence Segmentation has been implemented with the help of the
-  <a href="http://www.lisa.org/standards/srx/">Segmentation Rules eXchange
-  (SRX)</a> standard - please note that not all SRX features are supported. And
-  it is not possible to import/export rules defined in SRX format. However, if
-  you know how SRX works, you will already know a lot about how OmegaT does the
-  segmentation.</p>
-
-  <p>There are two kinds of rules:</p>
-
-  <ul>
-    <li>
-      <p><strong>Break rules</strong> separate the source text into segments.
-      For example, <i>"Did it make sense? I was not sure."</i> should be
-      separated in two segments means, there should be a break rule for
-      "<code>?</code>".</p>
-    </li>
-
-    <li>
-      <p><strong>Exception rules</strong> specify what parts of text should NOT
-      be separated. In spite of the period, <i>"Mrs. Dalloway "</i> should not
-      be separated in two segments, so an exception rule should be established
-      for Mrs (and Mr and Dr and prof etc), followed by a period.</p>
-    </li>
-  </ul>
-
-  <p>The predefined break rules should be sufficient for most European
-  languages and Japanese. Given the flexibility you may consider defining more
-  exception rules for the language you translate from, to give you more
-  meaningful and coherent segments.</p>
-
-  <h3><a name="setup" id="setup"></a>Rules setup</h3>
-
-  <h3><a name="priority" id="priority"></a>Priority</h3>
-
-  <p>All the segmentation rule sets with a matching Language Pattern are
-  applied in the given order of priority, so rules for specific language should
-  be higher than default ones. For example, rules for Canadian French (FR-CA)
-  should be higher than rules for French (FR.*), and higher than Default (.*)
-  ones. Then while translating from Canadian French your project will use the
-  rules defined for this language, the rules for French, and the Default rules
-  in a correct order.</p>
-
-  <h3><a name="creation" id="creation"></a>Rules creation</h3>
-
-  <p>In order to edit or expand an existing set of rules, simply click on it in
-  the top table. The rules of the set will appear in the bottom half of the
-  window.</p>
-
-  <p>In order to create an empty set of rules for a new language pattern click
-  <strong>Add</strong> in the upper half of the dialog. An empty line will
-  appear at the bottom of the upper table <font color="black" face=
-  "Times New Roman" size="3"><span style="font-size: 12pt; color: black;" lang=
-  "EN-US">(you may have to scroll down to see it)</span></font>. Change the
-  name of the rule set and the language pattern. Syntax of the language pattern
-  conforms to <a href="regexp.html">regular expression</a> syntax. If your set
-  of rules handles a language-country pair, we advise you to move it to the top
-  using <strong>Move Up</strong> button. </p>
-
-  <h3><a name="break" id="break"></a>Break/Exception</h3>
-
-  <p>The Break/Exception check box determines whether it is a break rule (check
-  box set) or an exception rule (check box unset). Two regular expressions
-  Before and After specify what must be before and after some position so that
-  it qualifies for exception rule or for break rule.</p>
-
-  <h3><a name="examples" id="examples"></a>A few simple examples</h3>
-
-  <table summary="just formatting" border="0" cellpadding="4" cellspacing="0">
-    <tbody>
-      <tr bgcolor="#DDDDDD">
-        <td width="26%">
-          <p><strong>Intention</strong></p>
-        </td>
-
-        <td>
-          <p><strong>Before</strong></p>
-        </td>
-
-        <td>
-          <p><strong>After</strong></p>
-        </td>
-
-        <td width="52%">
-          <p><strong>Note</strong></p>
-        </td>
-      </tr>
-
-      <tr>
-        <td width="26%">
-          <p>set a segment after a period ('<code>.</code>') and before a
-          space</p>
-        </td>
-
-        <td>
-          <p><code>\.</code></p>
-        </td>
-
-        <td>
-          <p><code>\s</code></p>
-        </td>
-
-        <td width="52%">
-          <p>"<code>\.</code>" means the character "<code>.</code>"
-          "<code>\s</code>" means any white space character</p>
-        </td>
-      </tr>
-
-      <tr bgcolor="#DDDDDD">
-        <td width="26%">
-          <p>do not segment after Mr.</p>
-        </td>
-
-        <td>
-          <p><code>Mr\.</code></p>
-        </td>
-
-        <td>
-          <p><code>\s</code></p>
-        </td>
-
-        <td width="52%">
-          <p>It's an exception rule, so the rule check box must be
-          unchecked</p>
-        </td>
-      </tr>
-
-      <tr>
-        <td width="26%">
-          <p>set a segment after "。" (Japanese period)</p>
-        </td>
-
-        <td>
-          <p><span lang="zxx"><code>。</code></span></p>
-        </td>
-
-        <td></td>
-
-        <td width="52%">
-          <p>Note that <i>after</i> is empty</p>
-        </td>
-      </tr>
-
-      <tr bgcolor="#DDDDDD">
-        <td width="26%">
-          <p>do not segment after M. Mr. Mrs. and Ms.</p>
-        </td>
-
-        <td>
-          <p><code>Mr??s??\.</code></p>
-        </td>
-
-        <td>
-          <p><code>\s</code></p>
-        </td>
-
-        <td width="52%">
-          <p>exception rule - see the use of ? in regular expressions
-          (non-greedy identifier)</p>
-        </td>
-      </tr>
-    </tbody>
-  </table>
-  <hr>
-
-  <h2><a name="regex" id="regex"></a>Regular-expression constructs</h2>
-
-  <p>The regular expressions used in segmentation rules are those supported by
-  Java. A short summary is available in the <a href="regexp.html">Regular
-  Expressions Constructs</a> appendix. If you need more specific information,
-  please consult <a href=
-  "http://java.sun.com/j2se/1.5/docs/api/java/util/regex/Pattern.html">http://java.sun.com/j2se/1.5/docs/api/java/util/regex/Pattern.html</a>.</p>
-
-  <p>You can find simple tutorials on the web (<a href=
-  "http://www.regular-expressions.info/quickstart.html">http://www.regular-expressions.info/quickstart.html</a>,
-  for example.)</p>
-  <hr>
-
-  <table summary="just formatting" style="width: 100%;" border="0" cellpadding=
-  "2" cellspacing="2">
-    <tbody>
-      <tr>
-        <td style="text-align: left;"><a href="legalNotices.html">Legal
-        notices</a></td>
-
-        <td style="text-align: center;"><a href="index.html">Home</a></td>
-
-        <td style="text-align: right;"><a href="xindex.html">Index of
-        contents</a></td>
-      </tr>
-    </tbody>
-  </table>
-</body>
-</html>
diff --git a/docs/en/spellchecker.html b/docs/en/spellchecker.html
deleted file mode 100644
index 8520f41..0000000
--- a/docs/en/spellchecker.html
+++ /dev/null
@@ -1,161 +0,0 @@
-<html>
-<head>
-  <link rel="stylesheet" href="OmegaT.css" type="text/css">
-  <meta http-equiv="CONTENT-TYPE" content="text/html; charset=utf-8">
-
-  <title>Spell checker - OmegaT 2.0 User Manual</title>
-</head>
-
-<body>
-  <h2>Spell checker</h2>
-  <hr>
-
-  <ul>
-    <li>
-      <p><a href="#introduction">Introduction</a></p>
-    </li>
-
-    <li>
-      <p><a href="#edit_dialog">Spell checker options</a></p>
-    </li>
-
-    <li>
-      <p><a href="#Hints">Hints</a></p>
-    </li>
-  </ul>
-
-  <p><br></p>
-
-  <h3><a name="introduction" id="introduction"></a> Introduction</h3>
-
-  <p><br></p>
-
-  <p>To correct the spelling mistakes during the translation, the spell checker
-  can be installed and used to indicate words in the target text, that need to
-  be corrected. This should come as no surprise: OmegaT uses the <a href=
-  "http://hunspell.sourceforge.net/">Hunspell</a> spell checker, used among
-  others in OpenOffice.org, Firefox and Thunderbird. If you use any of these
-  programs, you may already have the essentials of the spell checker installed
-  and just need to get OmegaT connected.</p>
-
-  <p>Once the spell checker has been activated and the vocabulary for the
-  target language is available, the spell checker will monitor target segments,
-  that are being displayed in the editing pane. Questionable words get
-  underlined in wiggly red:</p>
-
-  <p><br>
-  <br></p><img src="images/SpellcheckingText.png" name="grafika1" alt=
-  "Spell checking the text" align="left" border="0"
-  id="grafika1"><br clear="left">
-
-  <p><br>
-  <br></p>
-
-  <p>Right clicking on a highlighted word (<i>Artund</i> above) opens a
-  drop-down menu, where the suggestions for the correction are listed (<i>Art
-  und</i>) . Additionally you can ask the spell checker to <b>ignore all</b>
-  the occurrences of the word or <b>add it to the dictionary</b>. Note that
-  this is an online spell checker: if you have to do a global spell check of
-  texts you will have to browse through the text yourself and watch for wiggly
-  lines. The alternative is to spell check the target files with an editor, in
-  other words outside of OmegaT so the changes you may make will not be in the
-  translation memory.</p>
-
-  <p><br>
-  <br></p>
-
-  <h3><a name="edit_dialog" id="edit_dialog"></a>Spell checker options</h3>
-
-  <p>Clicking on <b>Options > Spell checking...</b> will open the window
-  below:</p>
-
-  <p><br></p><img src="images/SpellcheckerSetup2.png" name="grafika2" alt=
-  "Spell checker setup" align="left" border="0" id=
-  "grafika2"><br clear="left">
-
-  <p><br></p>
-
-  <p>The above example contains already the available vocabularies. Initially
-  it will be unpopulated as you need to specify where OmegaT should look for
-  the vocabularies. Click on <strong>Choose...</strong> to open a dialog
-  window, where you can select a subfolder with existing OpenOffice.org or
-  Mozilla vocabularies. The simplest way find them is to look for files with an
-  extensions <i>aff</i> or <i>dic</i>. OmegaT will recognize all valid
-  dictionaries available at that location and display them. If the dictionary
-  you want to use is already there and visible to OmegaT, you're done. If
-  there's no dictionaries to be found, you can select an appropriate place for
-  them and then click <b>Install</b> to let OmegaT look for available
-  vocabularies. Select the vocabularies that you need in the pop-up window and
-  then click <b>install</b>. The selected languages will then get installed and
-  will eventually appear in the spell checker setup window (this may take a
-  while ).</p>
-
-  <p>Please note that the installer depends on the Internet list of
-  dictionaries. In case it is out of date or does not include the desired
-  language, you will have to hunt for the vocabularies yourself. The
-  OpenOffice.org contains probably the largest vocabulary collection at
-  <a href="http://extensions.services.openoffice.org/dictionary">OpenOffice.org
-  Dictionary site</a>. After the dictionary extension has been downloaded and
-  installed, the corresponding <i>aff</i> and <i>dic</i> will become available.
-  The same can be achieved by adding a spellchecker extension to the Firefox or
-  Thunderbird; in this case the spellchecker files will be stored in your
-  (Firefox or Thunderbird) profile.</p>
-
-  <p>Make sure the language code of target files corresponds to the
-  dictionary's language code: an FR-FR dictionary will not work with an FR
-  target setting. You need to change the setting to FR-FR to have the spell
-  checker recognize the correct dictionary for your target. Look for files with
-  the name, indicating the language used and having extensions <i>aff</i> and
-  <i>dic.</i></p>
-
-  <h3><a name="Hints" id="Hints"></a>Hints</h3>
-
-  <p>Possible reasons for the spell checker not working:</p>
-
-  <ol>
-    <li>
-      <p>The check box "Automatically check the spelling of text" must be
-      checked.</p>
-    </li>
-
-    <li>
-      <p>Check that the target language code of your project against the
-      available vocabularies in the setup window. The spell checker determines
-      the language to use from the target language code: if the target language
-      is Brazilian Portuguese (PT_BR), the subfolder with vocabularies must
-      contain the two vocabulary files, called <i>pt_br.aff</i> and
-      <i>pt_br.dic</i>.</p>
-    </li>
-  </ol>
-
-  <p>In case you have a large body of text already translated, but then realize
-  the target language code of the project does not match the spell checker's
-  language code (you specified pt_BR as the language, but there's no pt_BR
-  vocabularies, for instance) you can simply copy the two corresponding files
-  and rename them (from pt_PT.aff resp. pt_PT.dic to pt_BR.aff and pt_BR.dic).
-  Of course it is much wiser, to take a short break and download the correct
-  versions of the spellchecker.</p>
-
-  <p>Note that Uninstall physically deletes the highlighted vocabularies. If
-  they are part of OpenOffice as in the above case, they will disappear from
-  that application too. If for whatever reason you have to do that now and
-  again, it may make sense to copy the files involved to a different folder,
-  reserved just for OmegaT purposes.</p>
-  <hr>
-
-  <table style="width: 100%;" border="0" cellpadding="2" cellspacing="2"
-  summary="just formatting">
-    <tbody>
-      <tr>
-        <td style="text-align: left;"><a href="legalNotices.html">Legal
-        notices</a></td>
-
-        <td style="text-align: center;"><a href="index.html">Home</a></td>
-
-        <td style="text-align: right;"><a href="xindex.html">Index of
-        contents</a></td>
-      </tr>
-    </tbody>
-  </table>
-</body>
-</html>
diff --git a/docs/en/translationEditing.html b/docs/en/translationEditing.html
deleted file mode 100644
index e9932a1..0000000
--- a/docs/en/translationEditing.html
+++ /dev/null
@@ -1,124 +0,0 @@
-<html>
-<head>
-  <link rel="stylesheet" href="./OmegaT.css" type="text/css">
-  <meta http-equiv="CONTENT-TYPE" content="text/html; charset=utf-8">
-
-  <title>Translation Editing - OmegaT 2.0 User Manual</title>
-</head>
-
-<body>
-  <h2>Editing field behaviour</h2>
-
-  <ul>
-    <li>
-      <p><a href="#auto_insert">Automatic match insertion</a></p>
-    </li>
-
-    <li>
-      <p><a href="#validation">Allow the translation to be equal to
-      source</a></p>
-    </li>
-
-    <li>
-      <p><a href="#Export">Export the segment to text files</a></p>
-    </li>
-  </ul><img alt="Editing Behaviour - dialog" src=
-  "images/EditingBehaviourOptions.png"><br>
-
-  <p>This dialogue window, available under Options > Editing Behaviour..,
-  lets the user determine, how the current segment be initialized and
-  handled.</p>
-
-  <h2><a name="auto_insert" id="auto_insert"></a>Automatic match insertion</h2>
-
-  <p>You translate your files by moving from segment to segment, at the same
-  time editing the current segment. When moving between segments, you may wish
-  the editing field were populated with the existing translation or with the
-  source text.</p>
-
-  <p>In <strong>Options → Editing Behaviour...</strong> OmegaT offers you the
-  following alternatives:</p>
-
-  <table summary="just formatting" cellpadding="2" cellspacing="2">
-    <tr valign="top">
-      <td>
-        <p><strong>The source text</strong></p>
-      </td>
-
-      <td>
-        <p>you may automatically populate the editing field with the source
-        text. This is pretty useful for the text containing many trade marks
-        and other proper nouns you need to leave intact.</p>
-      </td>
-    </tr>
-
-    <tr valign="top">
-      <td>
-        <p><strong>Leave the segment empty</strong></p>
-      </td>
-
-      <td>
-        <p>OmegaT will leave the editing field blank. This option allows you to
-        enter the translation without the need to remove the source text, thus
-        saving you a pair of keystrokes (<code>Ctrl+A</code> and
-        <code>Del</code>)</p>
-      </td>
-    </tr>
-
-    <tr valign="top">
-      <td>
-        <p><strong>Insert the best fuzzy match</strong></p>
-      </td>
-
-      <td>
-        <p>OmegaT will insert the translation of the string most similar to the
-        current source, if it is above the similarity threshold, set in the
-        dialogue (100% in the above case). If the match has been found, the
-        target segment will get a prefix, specified in the Prefix text field
-        ([fuzzy] in the example above). This makes it easy to search for
-        pretranslated segments later.</p>
-      </td>
-    </tr>
-  </table>
-  <hr>
-
-  <h2><a name="validation" id="validation"></a>Allow the translation to be
-  equal to source</h2>
-
-  <p>Documents you need to translate might contain trade marks, names or other
-  proper nouns that have to be the same in translated documents. There are two
-  strategies for segments that contain only such invariable text.</p>
-
-  <p>You may decide not to translate such segments at all - as a result OmegaT
-  will report these segments as not translated. This is the default.</p>
-
-  <p>The alternative is to enter the translation even if it's equal to the
-  source text, so that OmegaT remembers you have reviewed the text and decided
-  to keep the target segment equal to the source. To be able to do so, go to
-  <strong>Options → Editing Behaviour...</strong> and check the box
-  <strong>Allow translation to be equal to source</strong>.</p>
-
-  <h2><a name="Export" id="Export"></a>Export the segment to text files</h2>
-
-  <p>You may prefer to leave the untranslated segments as they are and come
-  back later to them. In this case you can activate the checkbox Allow the
-  translation to be equal to source and OmegaT will save such source segments
-  to a file to be translated later.</p>
-  <hr>
-
-  <table summary="just formatting" style="width: 100%;" border="0" cellpadding=
-  "2" cellspacing="2">
-    <tbody>
-      <tr>
-        <td style="text-align: left;"><a href="legalNotices.html">Legal
-        notices</a></td>
-
-        <td style="text-align: center;"><a href="index.html">Home</a></td>
-
-        <td style="text-align: right;"><a href="xindex.html">Index of
-        contents</a></td>
-      </tr>
-    </tbody>
-  </table>
-</body>
-</html>
diff --git a/docs/en/translationMemories.html b/docs/en/translationMemories.html
deleted file mode 100644
index 725e6f1..0000000
--- a/docs/en/translationMemories.html
+++ /dev/null
@@ -1,319 +0,0 @@
-<html>
-<head>
-  <link rel="stylesheet" href="./OmegaT.css" type="text/css">
-  <meta http-equiv="content-type" content="text/html; charset=utf-8">
-  <title>Translation Memories - OmegaT 2.0 User Manual</title>
-</head>
-
-<body>
-  <h2>Translation memories</h2>
-
-  <ul>
-    <li>
-      <a href="#OmegaT_and_TMX_files">OmegaT and TMX files</a>
-
-      <ul>
-        <li><a href="#TMX_files_location_and_purpose">Location and
-        purpose</a></li>
-
-        <li><a href="#TMX_backup">TMX backup</a></li>
-
-        <li><a href="#TMX_files_and_language">TMX and Language</a></li>
-      </ul>
-    </li>
-
-    <li><a href="#keeping_a_memory">How OmegaT remembers your
-    translations</a></li>
-
-    <li><a href="#Using_TMs_from_previous_projects">Using translation memories
-    from previous projects</a></li>
-
-    <li>
-      <a href="#using_memories">Using memories created by other translation
-      tools</a>
-
-      <ul>
-        <li><a href="#importing_files">Importing files</a></li>
-
-        <li><a href="#imported_files_handling">Imported files handling</a></li>
-      </ul>
-    </li>
-
-    <li><a href="#using_OmegaT_TM">Using OmegaT translation memories in other
-    translation tools</a></li>
-    
-    <li><a href="#pseudo_translate">Pseudo-translated memory</a></li>
-
-    <li><a href="#upgrading_TM">Upgrading Translation Memories</a></li>
-  </ul>
-  <hr>
-  <a name="OmegaT_and_TMX_files" id="OmegaT_and_TMX_files"></a>
-
-  <h2>OmegaT and TMX files</h2><a name="TMX_files_location_and_purpose" id=
-  "TMX_files_location_and_purpose"></a>
-
-  <h3>TMX files - location and purpose</h3>
-
-  <p>OmegaT uses TMX files in 3 separate locations.</p>
-
-  <ul>
-    <li>
-      <p>The <em>/omegat/</em> folder contains <em>project_save.tmx</em> and
-      eventually a number of backup TMX files.</p>
-
-      <p>The file <em>project_save.tmx</em> contains all the segments that have
-      been memorized since you started the project.</p>
-    </li>
-
-    <li>
-      <p>The project main folder will contain 3 TMX files:</p>
-
-      <ol>
-        <li><em>project_name-omegat.tmx</em></li>
-
-        <li><em>project_name-level1.tmx</em></li>
-
-        <li><em>project_name-level2.tmx</em></li>
-      </ol>(<i>project_name</i> being the name of your project).
-
-      <p>These files contain the source and target segments corresponding to
-      the contents of the /source/ folder at the time of their creation
-      (usually when the translated files have been created).</p>
-
-      <ul>
-        <li>The <em>level1</em> file contains only textual information.</li>
-
-        <li>The <em>level2</em> file encapsulates OmegaT specific tags in
-        correct TMX tags so that the file can be used with its formatting
-        information in a translation tool that supports TMX level 2 memories,
-        or OmegaT itself.</li>
-
-        <li>The <em>omegat</em> file includes OmegaT specific formatting tags so
-        that the file can be used in other OmegaT projects</li>
-      </ul>
-    </li>
-
-    <li>The <em>/tm/</em> folder can contain any number of TMX files. Such
-      files must be correct TMX files and can either contain only textual
-      information (level 1 TMX), OmegaT textual and formatting information
-      (omegat TMX) or TMX textual and formatting information (level 2 TMX). The
-      differences between them are technical (see below for details), and if
-      you wish to use a translation memory from a past project, they are
-      largely interchangeable, i.e. they will all work equally well.
-    </li>
-  </ul>
-  <p>Optionally, you can let OmegaT make an additional TMX file (OmegaT-style) 
-  anywhere you specify, containing all translateable segments of the project. 
-  See <a href="#pseudo_translate">pseudo-translated memory</a>.</p>
-  
-
-  <a name="TMX_backup" id="TMX_backup"></a>
-  <h3>TMX backup</h3>
-
-  <p>When you translate your files, OmegaT stores all your progress in
-  translation memory in the project's <em>/omegat</em> subdirectory.</p>
-
-  <p>OmegaT also backups translation memory to
-  <em>project_save.tmx.YEARMMDDHHNN.bak</em> in the same subfolder every
-  time when a project is opened or reloaded. <em>YEAR</em> is 4-digit year,
-  <em>MM</em> is a month, <em>DD</em> day of the month, <em>HH</em> and
-  <em>NN</em> are hours and minutes when the previous translation memory was
-  saved.</p>
-
-  <p>If you think you have lost translation data follow this procedure:</p>
-
-  <ol>
-    <li>close the project</li>
-
-    <li>rename the current <em>project_save.tmx</em> file to something you will
-    remember (like <em>project_save.tmx.temporary</em> for example)</li>
-
-    <li>select the backup translation memory that is the most likely to contain
-    the data you are looking for</li>
-
-    <li>rename it to <em>project_save.tmx</em></li>
-
-    <li>open the project</li>
-  </ol><a name="TMX_files_and_language" id="TMX_files_and_language"></a>
-
-  <h3>TMX files and language</h3>
-
-  <p>TMX files contain <i>translation units</i> that are made of a number of
-  equivalent segments in different languages. A translation unit is made of at
-  least two <i>translation unit variations</i> (tuv). Either can be used as
-  source or target.</p>
-
-  <p>The settings in your project will indicate which is the source language
-  and which is the target language. OmegaT will thus take the
-  <strong>tuv</strong> corresponding to the project source language code and
-  use that segment as the source segment, and it will take the
-  <strong>tuv</strong> corresponding to the project target language code and
-  use that segment as the target segment. OmegaT recognizes them using the
-  following two standard conventions:</p>
-
-  <ul>
-    <li>2 letters (e.g. <strong>JA</strong> for Japanese), or</li>
-
-    <li>2-letter language code followed by the 2-letter country code (e.g.
-    <strong>EN-US</strong>)</li>
-  </ul>
-
-  <p>See <a href="languages.html">Languages</a> for a partial list of language
-  and country codes.</p>
-
-  <p>If the project language codes and the TMX language codes fully match, the
-  segments are loaded in memory. If the codes match only the language but not
-  the country, the segments are also loaded in memory. If neither the language
-  code not the country code match, the segments are not loaded in memory.</p>
-  <hr>
-  <a name="keeping_a_memory" id="keeping_a_memory"></a>
-
-  <h2>How OmegaT remembers your translations</h2>
-
-  <p>The file project_save.tmx contains all the segments that have been
-  memorized since you started the project. If you do any modification on the
-  project segmentation for example, <em>project_save.tmx</em> will record new
-  translation pairs but will retain all the previous information.</p>
-
-  <p>This will occasionally lead to the display of <strong>orphan
-  strings</strong> in the Match Viewer. Such matches no longer refer to
-  segments existing in the source documents, but to segments recorded before
-  the modifications took place. If the modification was a mistake, revert to
-  the previous settings and the older recordings will reappear.</p>
-  <hr>
-  <a name="Using_TMs_from_previous_projects" id=
-  "Using_TMs_from_previous_projects"></a>
-
-  <h2>Using translation memories from previous projects</h2>
-
-  <p>When you create the target documents in an OmegaT project, the translation
-  memory of the project is output in the form of three files in the root folder
-  of your OmegaT project (see the above description). You can regard these
-  three TMX files (-<em>omegat.tmx</em>", "<em>-level1.tmx</em>" and
-  "<em>-level2.tmx</em>") as an "export translation memory", i.e. as an
-  exportable bilingual summary of your current project.</p>
-
-  <p>Should you wish to reuse a translation memory from a previous project (for
-  example because the new project is similar to the previous project, or uses
-  terminology which might have been used before), you can use these translation
-  memories as "input translation memories", i.e. for import into your new
-  project. In this case, place the translation memories you wish to use in the
-  <em>\tm</em> folder of your new project.</p>
-
-  <p>By default, the <em>\tm</em> folder is below the project's root folder
-  (e.g. ..<em>\MyProject\tm)</em>, but you can choose a different folder in the
-  project properties dialog if you wish. This is useful if you frequently use
-  translation memories produced in the past, for example because they are on
-  the same subject or for the same customer. In this case, a useful procedure
-  would be:</p>
-
-  <ul>
-    <li>Create a folder (a "repository folder") in a convenient location on
-    your hard drive for the translation memories for a particular customer or
-    subject.</li>
-
-    <li>Whenever you finish a project, copy one of the three "export"
-    translation memory files from the root folder of the project to the
-    repository folder.</li>
-
-    <li>When you begin a new project on the same subject or for the same
-    customer, navigate to the repository folder in the <em>Project >
-    Properties > Edit Project</em> dialog and select it as the translation
-    memory folder.</li>
-  </ul>
-
-  <p>Note that all the TMX files in the <em>/tm</em> repository get parsed
-  during the startup of the program, so putting in all the TMX files you
-  can get your hands on will unnecessarily slow down OmegaT. You may even
-  consider eliminating those that are strictly necessary (for example by
-  leaving them in the <em>/tm</em> subdirectory, but changing their extension),
-  once their contents have migrated to the <em>project_save.tmx</em> of your
-  current project.</p>
-
-  <p><a name="using_memories" id="using_memories"></a></p>
-
-  <h2>Using memories created by other translation tools</h2>
-
-  <h3><a name=
-  "importing_files" id="importing_files"></a>Importing files</h3>
-
-  <p>OmegaT supports importing TMX versions 1.1-1.4b (both level 1 and level
-  2). This enables the translation memories produced by other tools to be read
-  by OmegaT. However, OmegaT does not <i>fully</i> support imported level 2 TMX
-  files (that store not only the translation, but also the formatting), so the
-  quality of fuzzy matches will be a bit lower when importing level 2 TMX
-  files.</p>
-
-  <h3><a name=
-  "imported_files_handling" id="imported_files_handling"></a>Imported files handling</h3>
-
-  <p>OmegaT follows very strict procedures when handling translation memory
-  files (TMX files). If any mistake is found in such a file, OmegaT will simply
-  not load it.</p>
-
-  <p>Some tools are known to produce invalid TMX files in certain conditions.
-  If you want to use such files as reference translations in OmegaT, they will
-  need to be fixed if OmegaT refuses them. Fixes are trivial operations and
-  OmegaT will give you indications in the related error message. You can ask
-  the <a href="http://groups.yahoo.com/group/OmegaT/">user group</a> for advice
-  if you have problems.</p>
-  <hr>
-  <a name="using_OmegaT_TM" id="using_OmegaT_TM"></a>
-
-  <h2>Using OmegaT translation memories in other translation tools</h2>
-
-  <p>OmegaT exports TMX files version 1.4 (both level 1 and level 2). The level
-  2 export is not a standard level 2 but is enough to generate correct matches
-  in TMX Level 2 supporting translation tools. If you only need textual
-  information (and not formatting information), use the level 1 file that
-  OmegaT has created.</p>
-  <hr>
-  <a name="pseudo_translate" id="pseudo_translate"></a>
-  <h2>Pseudo-translated memory</h2>
-  <p>There might be a case in which you want to do pre-processing or other 
-  processing of the segments than OmegaT allows. For example you want to create 
-  a pseudo-translation for testing purposes.</p>
-  <p>OmegaT allows you to create an extra tmx file that contains all segments of
-  the project. The translation in this tmx can be either</p>
-  <ul><li>translation equals source (default)</li>
-  <li>translation segment is empty</li></ul>
-  <p>The tmx file can get any name you specify, but the extension '.tmx' is 
-  added if not given.</p>
-  <P>The generation is activated in console mode. See 
-  <a href="consoleMode.html">console mode</a> how to do this.</P>
-  <p>You can process the generated tmx with any tool you want. To reuse it in 
-  OmegaT:<br>
-  rename it to <em>project_save.tmx</em> and put it in the 
-  <em>omegat</em>-folder of your project.</p>
-  <hr>
-
-  <a name="upgrading_TM" id="upgrading_TM"></a>
-  <h2>Upgrading translation memories</h2>
-
-  <p>Previous versions of OmegaT were capable of segmenting source files into
-  paragraphs only, and were inconsistently numbering formatting tags in HTML
-  and Open Document files. OmegaT 2.0 can detect and upgrade such TMX files on
-  the fly to increase fuzzy matching quality and leverage your existing
-  translation better -- so that you don't have to redo it.</p>
-
-  <p>A project's TMX will be upgraded only once, and will be written in
-  upgraded form, and legacy TMX files will be upgraded on the fly each time the
-  project is loaded. Note that some changes in file filters in OmegaT 2.0 may
-  lead to totally different segmentation, thus in rare cases you will have to
-  upgrade your translation manually.</p>
-  <hr>
-  <table summary="just formatting"  style="width: 100%;" border="0" cellpadding="2" cellspacing="2">
-    <tbody>
-      <tr>
-        <td style="text-align: left;"><a href="legalNotices.html">Legal
-notices</a> </td>
-        <td style="text-align: center;"><a href="index.html">Home</a>
-        </td>
-        <td style="text-align: right;"><a href="xindex.html">Index of
-contents</a> </td>
-      </tr>
-    </tbody>
-  </table>
-
-</body>
-</html>
diff --git a/docs/en/userInterface.html b/docs/en/userInterface.html
deleted file mode 100644
index 9945f15..0000000
--- a/docs/en/userInterface.html
+++ /dev/null
@@ -1,755 +0,0 @@
-<html>
-<head>
-  <link type="text/css" href="./OmegaT.css" rel="stylesheet">
-  <meta content="text/html; charset=utf-8" http-equiv="content-type">
-
-  <title>The User Interface - OmegaT 2.0 User Manual</title>
-</head>
-
-<body>
-  <h2>The User Interface</h2>
-
-  <table summary="just formatting" border="0" cellpadding="0" cellspacing="0"
-  width="100%">
-    <tbody>
-      <tr>
-        <td>
-          <ul>
-            <li>
-              <p><a href="#item">User interface items</a></p>
-
-              <ul>
-                <li>
-                  <p><a href="#most">Windows you'll use most of the
-                  time</a></p>
-                </li>
-
-                <li>
-                  <p><a href="#some">Windows you may use now and then</a></p>
-                </li>
-
-                <li>
-                  <p><a href="#dialogs">Dialogs you'll use to change your
-                  project settings</a></p>
-                </li>
-              </ul>
-            </li>
-
-            <li>
-              <p><a href="#OmegaT_Main_Window">OmegaT main window</a></p>
-
-              <ul>
-                <li>
-                  <p><a href="#Editor">Editor pane</a></p>
-                </li>
-
-                <li>
-                  <p><a href="#Match">Match viewer</a></p>
-                </li>
-
-                <li>
-                  <p><a href="#Glossary">Glossary</a></p>
-                </li>
-
-                <li>
-                  <p><a href="#Glossary">Glossary</a></p>
-                </li>
-
-                <li>
-                  <p><a href="#Dictionaries">Dictionaries</a></p>
-                </li>
-
-                <li>
-                  <p><a href="#Google_Translate">Google Translate</a></p>
-                </li>
-
-                <li>
-                  <p><a href="#menu">Main menu</a></p>
-                </li>
-
-                <li>
-                  <p><a href="#bar">Status bar</a></p>
-                </li>
-              </ul>
-            </li>
-
-            <li>
-              <p><a href="#dialogs">Dialogs you'll use to change your project
-              settings</a></p>
-            </li>
-          </ul>
-        </td>
-
-        <td>
-          <ul>
-            <li>
-              <p><a href="#Other_windows">Other windows</a></p>
-
-              <ul>
-                <li>
-                  <p><a href="#files">Project files</a></p>
-
-                  <ul>
-                    <li>
-                      <p><a href="#proj_files">Project Files Window
-                      features</a></p>
-                    </li>
-
-                    <li>
-                      <p><a href="#unique">Unique segments</a></p>
-                    </li>
-
-                    <li>
-                      <p><a href="#adding_files">Adding files to the
-                      project</a></p>
-                    </li>
-                  </ul>
-                </li>
-
-                <li>
-                  <p><a href="#search">Search window</a></p>
-
-                  <ul>
-                    <li>
-                      <p><a href="#search_types">Search types</a></p>
-                    </li>
-
-                    <li>
-                      <p><a href="#wildcards_regexp">Wild cards and regular
-                      expressions</a></p>
-                    </li>
-
-                    <li>
-                      <p><a href="#search_display">Search results
-                      display</a></p>
-                    </li>
-                  </ul>
-                </li>
-
-                <li>
-                  <p><a href="#tag_validation">Tag validation</a></p>
-                </li>
-
-                <li>
-                  <p><a href="#manual">Help browser</a></p>
-                </li>
-              </ul>
-            </li>
-          </ul>
-        </td>
-      </tr>
-    </tbody>
-  </table>
-  <hr>
-
-  <h2><a name="item" id="item"></a>User interface items</h2>
-
-  <h3><a name="most" id="most"></a>Windows you'll use most of the time</h3>
-
-  <table summary="just formatting" border="0" cellpadding="0" cellspacing="0"
-  width="100%">
-    <col width="43*">
-    <col width="213*">
-
-    <tbody>
-      <tr>
-        <td width="24%">
-          <p><strong>OmegaT main window</strong></p>
-        </td>
-
-        <td width="83%">
-          <p>contains the Main menu, status bar and 3 panes:</p>
-        </td>
-      </tr>
-
-      <tr>
-        <td width="24%">
-          <p>--- Editor pane</p>
-        </td>
-
-        <td width="83%">
-          <p>where you type and edit the translation</p>
-        </td>
-      </tr>
-
-      <tr>
-        <td width="24%">
-          <p>--- Match Viewer pane</p>
-        </td>
-
-        <td width="83%">
-          <p>with the most similar segments from translation memories</p>
-        </td>
-      </tr>
-
-      <tr>
-        <td width="24%">
-          <p>--- Glossary Viewer pane</p>
-        </td>
-
-        <td width="83%">
-          <p>with the terminology translation</p>
-        </td>
-      </tr>
-
-      <tr>
-        <td width="24%">
-          <p><strong>Project Files window</strong></p>
-        </td>
-
-        <td width="83%">
-          <dl>
-            <dd>with the list of your translatable files, triggered with
-            <code>Ctrl+L</code>, closed with <code>esc</code></dd>
-          </dl>
-        </td>
-      </tr>
-
-      <tr>
-        <td width="24%">
-          <dl>
-            <dt><strong>Search window</strong></dt>
-          </dl>
-        </td>
-
-        <td width="83%">
-          <dl>
-            <dd>to search for specific segments in the project, triggered with
-            <code>Ctrl+F</code>, closed with <code>esc</code></dd>
-          </dl>
-        </td>
-      </tr>
-    </tbody>
-  </table>
-
-  <h3><a name="some" id="some"></a>Windows you may use now and then</h3>
-
-  <table summary="just formatting" border="0" cellpadding="0" cellspacing="0"
-  width="100%">
-    <col width="43*">
-    <col width="213*">
-
-    <tbody>
-      <tr>
-        <td width="23%">
-          <dl>
-            <dt><strong>Tag Validation window</strong></dt>
-          </dl>
-        </td>
-
-        <td width="83%">
-          <dl>
-            <dd>to check for tag mistakes in translations, triggered with
-            <code>Ctrl+T</code>, closed with <code>esc</code></dd>
-          </dl>
-        </td>
-      </tr>
-
-      <tr>
-        <td width="23%">
-          <dl>
-            <dt><strong>Help browser</strong></dt>
-          </dl>
-        </td>
-
-        <td width="83%">
-          <dl>
-            <dd>to read the user manual, closed with
-            <code><b>esc</b></code></dd>
-          </dl>
-        </td>
-      </tr>
-    </tbody>
-  </table>
-
-  <h3><a name="dialogs" id="dialogs"></a>Dialogs you'll use to change your
-  project settings</h3>
-
-  <p>You'll use the dialogs below to change OmegaT and project settings. All of
-  them are described in separate sections, below we just summarize what they
-  can be used for and how you may call them up:</p>
-
-  <p><br></p>
-
-  <table summary="just formatting" border="0" cellpadding="0" cellspacing="0"
-  width="100%">
-    <col width="43*">
-    <col width="213*">
-
-    <tbody>
-      <tr>
-        <td width="17%">
-          <dl>
-            <dt><strong>Project Properties</strong></dt>
-          </dl>
-        </td>
-
-        <td width="83%">
-          <dl>
-            <dd>to modify the project folders and languages , triggered with
-            <code>Ctrl+E</code> or with <strong>Project →
-            Properties...</strong>, closed with <code>esc</code></dd>
-          </dl>
-        </td>
-      </tr>
-
-      <tr>
-        <td width="17%">
-          <dl>
-            <dt><strong>Font</strong></dt>
-          </dl>
-        </td>
-
-        <td width="83%">
-          <dl>
-            <dd>to modify the font OmegaT uses for displaying source,
-            translation, matches and glossary terms, triggered with
-            <strong>Options → Font...</strong>, closed with
-            <code>esc</code></dd>
-          </dl>
-        </td>
-      </tr>
-
-      <tr>
-        <td width="17%">
-          <dl>
-            <dt><strong>File filters</strong></dt>
-          </dl>
-        </td>
-
-        <td width="83%">
-          <dl>
-            <dd>to adjust the handling of supported file formats, triggered
-            with <strong>Options → File Filters...</strong>, closed with
-            <code>esc</code></dd>
-          </dl>
-        </td>
-      </tr>
-
-      <tr>
-        <td width="17%">
-          <dl>
-            <dt><strong>Segmentation</strong></dt>
-          </dl>
-        </td>
-
-        <td width="83%">
-          <dl>
-            <dd>to change the way your text is segmented into sentences,
-            triggered with <strong>Options → Segmentation</strong>, closed with
-            <code>esc</code></dd>
-          </dl>
-        </td>
-      </tr>
-
-      <tr>
-        <td width="17%">
-          <dl>
-            <dt><strong>Editing Behaviour</strong></dt>
-          </dl>
-        </td>
-
-        <td width="83%">
-          <dl>
-            <dd>to change how OmegaT behaves when you iterate between the
-            segments, triggered with <strong>Options → Editing
-            Behaviour...</strong>, closed with <code>esc</code></dd>
-          </dl>
-        </td>
-      </tr>
-    </tbody>
-  </table>
-  <hr>
-  <a name="OmegaT_Main_Window" id="OmegaT_Main_Window"></a>
-
-  <h2>OmegaT main window</h2><img src="images/OmegaT_panes.png" name="grafika1"
-  alt="OmegaT panes" id="grafika1" border="0"><br clear="left">
-
-  <p><br>
-  <br></p>
-
-  <p>Main window consists of several panes, main menu and a status bar. You can
-  change the position of any pane or even undock it to a separate window by
-  dragging the pane by its name. Depending on the pane status, different signs
-  can appear at its top right corner:</p>
-
-  <p><img src="images/Minimize.gif" name="graphics1" alt="Minimize" id=
-  "graphics1" align="bottom" border="0" height="18" width="18"> reduces the
-  pane to show only its name at the bottom near the status bar.<br>
-  <img src="images/Maximize.gif" name="graphics2" alt="Maximize" id="graphics2"
-  align="bottom" border="0" height="18" width="18"> makes the pane take all the
-  available window space.<br>
-  <img src="images/Restore.gif" name="graphics3" alt="Restore" id="graphics3"
-  align="bottom" border="0" height="18" width="18"> puts the pane back where it
-  was before it was minimized or maximized.<br>
-  <img src="images/Undock.gif" name="graphics4" alt="Undock" id="graphics4"
-  align="bottom" border="0" height="18" width="18"> detaches the pane from the
-  main window to a separate window of its own.<br>
-  <img src="images/Dock.gif" name="graphics5" alt="Dock" id="graphics5" align=
-  "bottom" border="0" height="18" width="18"> puts the pane back within the
-  main window.</p>
-
-  <p>It is also possible to put the panes so that they overlap. In this case
-  the panes will display a tab at their top. Clicking on the tab will put the
-  pane on the foreground. The separators between the panes can be dragged to
-  resize panes.</p>
-
-  <p>The counters  in the lower right corner keep track of the progress of
-  the translation:</p>
-
-  <p><img alt="main menu counters" title="main menu counters" src=
-  "images/Main_pane_counters.png"></p>
-
-  <table summary="" border="0" cellpadding="2" cellspacing="2">
-    <tbody>
-      <tr>
-        <td>31/34</td>
-
-        <td>number of segments -  translated / total, for the current
-        file</td>
-      </tr>
-
-      <tr>
-        <td>2530/2605</td>
-
-        <td>number of unique segments - translated / total in the project</td>
-      </tr>
-
-      <tr>
-        <td>3196</td>
-
-        <td>total number of segments (including repeats) in the project</td>
-      </tr>
-
-      <tr>
-        <td>39/53</td>
-
-        <td>number of characters in the source and in the target segment </td>
-      </tr>
-    </tbody>
-  </table><br>
-
-  <h3><a name="Editor" id="Editor"></a>Editor pane</h3>
-
-  <p>Here you'll type and edit the translation. Editor pane displays the text
-  of the partially translated document: the text already translated is
-  displayed translated, and the text not yet translated is displayed in the
-  original language. The displayed text is split into segments, and you may
-  scroll through the document and double-click on any segment to edit it. In
-  the above case the already translated segments are not explicitely marked;
-  you may change however the setup to suit your preferences - for instance,
-  mark them in yellow (see menu <a href="menu.html">View).</a></p>
-
-  <p>One of the segments is the active segment. It is the only one that is
-  displayed in two parts: the upper part is in the original language, in bold
-  characters with a green background color, the lower part is the editing
-  field, delimited by two markers: the leftmost marker is
-  <strong><code><segment nnnn></code></strong> where
-  <strong><code>nnnn</code></strong> is a number of the segment in the project,
-  the rightmost marker is <strong><code><end segment></code></strong>.
-  You use the upper part as a reference and overwrite or modify the contents of
-  the editing field with your translation.</p>
-
-  <p>Depending on the <a href="translationEditing.html">Editing behaviour</a>
-  the editing field for the untranslated segment may be empty, contain the
-  source text or the translation of the string most similar to the one you are
-  going to translate. When you move to another segment, the translation is
-  validated and stored. If you want the segment to stay untranslated, simply
-  make the editing field empty by removing all the text (select all with
-  <code>Ctrl+A</code> and delete with <code>Del</code>). OmegaT may remember a
-  translation when it is identical to the source. It is useful for documents
-  that contain trade marks, names or other proper nouns, or parts in a third
-  language that does not require translation.</p>
-
-  <p>See <a href="translationEditing.html">Translation editing</a> for more
-  details.</p>
-
-  <h3><a name="Match" id="Match"></a>Match viewer</h3>Match viewer shows the
-  most similar segments from <a href="translationMemories.html">translation
-  memories</a>, both from project translation memory created while you
-  translate your project, and from legacy translation memories you import from
-  your earlier jobs, or you may receive from your client or translation
-  agency.<br>
-  <img src="images/MatchesPane.png" name="grafika2" alt="OmegaT Match pane" id=
-  "grafika2" align="left" border="0"><br clear="left">
-
-  <p><br></p>
-
-  <p>When you move to the next segment, the first fuzzy match (the one with the
-  best matching percentage) is automatically selected. The selected fuzzy match
-  will be highlighted in <strong>bold</strong>, words that are missing from the
-  segment you translate will be colored in <strong><font color=
-  "#0000FF">blue</font></strong> and word adjacent to missing parts in
-  <font color="#00FF00"><b>green</b></font>.  You may <a href=
-  "menu.html#shortcuts">select</a> a different match by pressing
-  <code>Ctrl+2</code>, <code>3</code>, <code>4</code>, or <code>5.</code> Of
-  course, pressing <code>Ctrl+5</code> will do nothing, if there is no match
-  #5. To use the <strong>selected</strong> match in your translation, use
-  <code><a href="menu.html#shortcuts">Ctrl+R</a></code> to replace the target
-  field with that match or use <code><a href=
-  "menu.html#shortcuts">Ctrl+I</a></code> to insert it at the cursor
-  position.</p>
-
-  <p>The matching percentage - i.e. the measure of the difference between the
-  source segment and matching candidates - is roughly equivalent to the number
-  of common words in the matched and the matching segment, divided by the
-  number of words in the longer of the two. In case the tokenizer plug-in is
-  used, the words in the two segments get first reduced to their stems.
-  Alternatively, the words are left as they are, and only the interpunction,
-  numbers and tags are ignored. Finally, differences in tags, numbers and in
-  the interpunction - which have been ignored in the first two cases - can be
-  included in the calculation. The Match Viewer eventually displays the three
-  metrics as follows:</p>        <<span style=
-  "font-style: italic;">% match, when tokenizer plugin is used / % for the
-  default OmegaT match / % match with tags, numbers, punctuation
-  included</span>> 
-
-  <p>In the example above, the first two metrics (46/46) are equal, as the
-  tokenizer has not been used. The third percentage (39) is lower because of
-  differences in the interpunction and tags used.</p>
-
-  <p>If there's no file name displayed, the source is the default project
-  translation memory. Orphan segments (the match #1) mark segments in the
-  default project translation memory without a corresponding text in the source
-  files. In the above case, the original sentence, translated already with
-  OmegaT, has been edited .<br></p>
-
-  <h3><a name="Glossary" id="Glossary"></a>Glossary</h3>
-
-  <p>Glossary pane allows you to access your private collection of expressions
-  and specialty terminologies, which you have accumulated in your <a href=
-  "glossaries.html">glossary files</a>. It shows translation of terms found in
-  the current segment, but it only shows it for reference purposes, and does
-  not allow to insert or replace the term with its translation.</p><img src=
-  "images/Glossary_pane.png" name="grafika3" alt="OmegaT Glossary pane" id=
-  "grafika3" align="left" border="0"><br clear="left">
-
-  <p><br></p>
-
-  <p>The source segment in the above example was “<i>In most translation jobs
-  it is considered important to have the translated document look similar to
-  the original.</i>”, and two words in it, document and translation were found
-  in the glossary file. OmegaT also supports multi-word terms, but in a very
-  basic manner: if both words of a term are found in the current segment, the
-  term will be displayed.</p><br>
-
-  <h3><a name="Dictionaries" id="Dictionaries"></a>Dictionaries</h3>
-
-  <p><a href="dictionaries.html">Dictionaries</a> are the electronic version of
-  printed MerriamWebsters, Duden, Larousse etc., you may keep on your
-  desk.</p><br>
-
-  <h3><a name="Google_Translate" id="Google_Translate"></a>Google
-  Translate</h3>
-
-  <p>If Google Translate is activated in Menu → Options, the <a href=
-  "GoogleTranslate.html">Google Translate</a> pane will provide the Google
-  Translate translation of the current segment, which you can insert in the
-  target part of the segment.</p><br>
-
-  <h3><a name="menu" id="menu"></a>Main menu</h3>
-
-  <p>Obviously, you can use main menu to access all OmegaT functions. See the
-  <a href="menu.html#menu">Main Menu</a> appendix for a full description of all
-  menu's and menu items. The most often used functions are accessible with
-  <a href="menu.html#shortcuts">keyboard shortcuts</a>, so once you get
-  accustomed to them, there will no longer be any need to browse through the
-  menus while translating.</p>
-
-  <h3><a name="bar" id="bar"></a>Status bar</h3>
-
-  <p>The status bar displays work flow related messages at the bottom of the
-  main window. This bar gives the user feedback messages about specific
-  operations that are in progress. It also displays the number of fuzzy and
-  glossary matches for the current segment.</p>
-  <hr>
-
-  <h2><a name="other_windows" id="other_windows"></a>Other windows</h2>
-
-  <h3><a name="files" id="files"></a>Project files</h3>
-
-  <p>Project Files window lists the project files and displays other project
-  information. It is displayed automatically when OmegaT loads a project. To
-  close it, use <code>esc</code>, to open it or call it to the front use
-  <code>Ctrl+L</code>.</p>
-
-  <h3><a name="proj_files" id="proj_files"></a>Project Files Window
-  features</h3>
-
-  <p>The following information is displayed.</p>
-
-  <ul>
-    <li>
-      <p>the list of all the translatable files in the project. These are the
-      files present in the source files folder, that <a href=
-      "filesToTranslate.html">OmegaT can handle</a>. Clicking on any file will
-      open it for translation</p>
-    </li>
-
-    <li>
-      <p>the file currently available in the Editor pane is highlighted with a
-      blue background</p>
-    </li>
-
-    <li>
-      <p>the number of segments in each file is shown next to file name.</p>
-    </li>
-
-    <li>
-      <p>the number of unique segments in the whole project.</p>
-    </li>
-
-    <li>
-      <p>the number of unique segments already translated. It is updated each
-      time you translate a segment.</p>
-    </li>
-  </ul>
-
-  <h3><a name="unique" id="unique"></a>Unique segments</h3>
-
-  <p>The set of <strong>Unique</strong> segments is computed by taking all the
-  segments and removing all the duplicate segments equal up to letter case
-  ("Run" and "run" are thought different).</p>
-
-  <p>The difference between "Number of segments" and "Number of unique
-  segments" gives you a rough idea of the number of repetitions in the text.
-  Note however, that the numbers do not say how relevant the repetitions are:
-  it could mean relatively long sentences repeated a number of times (very
-  lucky!) or it could describe a table of keywords (not as lucky...) The
-  <code>project_stats.txt</code> located in the <code>/omegat</code> folder of
-  your project contains more detailed segment information per file.</p>
-
-  <p>It is possible to modify the number of segments/unique segments by
-  modifying the segmentation rules. This, however, should be avoided at all
-  costs, once you have started translating the project. See the <a href=
-  "segmentation.html">Segmentation rules</a> for more information.</p>
-
-  <h3><a name="adding_files" id="adding_files"></a>Adding files to the
-  project</h3>
-
-  <p>You may add source files to the project by clicking on the "Import Source
-  Files..." button. It copies the selected files to the <code>/source</code>
-  folder and reloads the project to load the new files. You can also add source
-  files from internet pages, written in MediaWiki, by clicking on "Import from
-  MediaWiki" button and providing the corresponding URL.</p>
-
-  <h3><a name="search" id="search"></a>Search window</h3>
-
-  <p>You'll use search window to find specific segments in the project. There
-  can be several search windows open simultaneously. To open a new one, use
-  <code><a href="menu.html#shortcuts">Ctrl+F</a></code> in main window. The
-  search window consists of a text field for search string or keywords, flags
-  and radio buttons for setting up the search and a display area containing the
-  results of the search.</p>
-
-  <h3><a name="search_types" id="search_types"></a>Search types</h3>
-
-  <dl>
-    <dt>There are two <a href="searches.html#searchmethods">types</a> of search
-    available:</dt>
-
-    <dt><strong>exact searches -</strong> look for the specified query string
-    within the current project or in any folder or folder tree.</dt>
-
-    <dt><strong>keyword searches -</strong> examine the current project and
-    return all the segments containing all of the query strings, in any
-    order.</dt>
-  </dl>
-
-  <p>Searches are made on both the source and translation. You may also search
-  within any folder, but bear in mind that OmegaT can search only in <a href=
-  "filesToTranslate.html">files it supports</a>.</p>
-
-  <h3><a name="wildcards_regexp" id="wildcards_regexp"></a>Wild cards and
-  regular expressions</h3>
-
-  <p>Searches support the <a href="searches.html#usingwildcards">wild card
-  characters</a> * and ? as well as <a href=
-  "searches.html#usingregularexpressions">regular expressions</a>.</p>
-
-  <h3><a name="search_display" id="search_display"></a>Search results
-  display</h3>
-
-  <p>Pressing the search button after entering a string in the search field
-  will display all the segments in the project that include the searched
-  string.</p>
-
-  <p>As OmegaT handles all the identical segments as one entity, only the first
-  unique segment is shown. Check "Display all results" to display all the
-  instances of identical segments. The segments will appear in the order of
-  appearance in the project. Translated segments will be displayed with the
-  original text at the top and the translated text at the bottom, non
-  translated segments will be displayed in original text only.</p>
-
-  <p>You may click on a segment to bring it up in the Editor for modification.
-  Then you may switch back to Search window and go to the next found segment to
-  modify it too. Such a pattern is useful to do terminology updates.</p>
-
-  <h3><a name="tag_validation" id="tag_validation"></a>Tag validation</h3>
-
-  <p>The tag validation window detects the tag errors in the translation and
-  lists them. To open the window, use <code><a href=
-  "menu.html#shortcuts">Ctrl+T</a></code>. The window features a 3 column table
-  with a link to the segment and its source and target contents:</p>
-
-  <p><img src="images/TagValidator.png" name="grafika4" alt=
-  "OmegaT Tag Validator" id="grafika4" align="left" border="0"><br clear=
-  "left">
-  <br>
-  <br></p>
-
-  <p>The tags are highlighted in bold blue for easy comparison between the
-  original and the translated contents. Click on the link to jump to the
-  segment in the Editor pane. Correct the error if necessary and press
-  <code><a href="menu.html#shortcuts">Ctrl+T</a></code> to return to the tag
-  validation window to correct other errors. In the first and third case above
-  tags are paired incorrectly, and in the second case the starting tag is
-  missing the < sign.</p>
-
-  <p><a href="formattedText.html#intro">Tag</a> errors are <a href=
-  "formattedText.html#tag_operation">tag manipulations</a> in the translation
-  that do not reflect the number of  tags and their order in the original
-  segment. Some tag manipulations are necessary and are benign, some will cause
-  problems when the translated document is created. Tags generally represent
-  some kind of formatting in the original text. <strong>Simplifying the
-  original text formatting</strong> greatly contributes to reducing the number
-  of tags.</p>
-
-  <h3>Help browser</h3>
-
-  <p>The help browser (which displays this manual) can be called by pressing
-  <a href="menu.html#shortcuts">F1</a> or calling <strong>Help → User
-  Manual...</strong> in <a href="menu.html">main menu</a>.</p>
-
-  <h3><a name="manual" id="manual"></a>Help browser navigation</h3>
-
-  <p>In the window you'll see the manual and two buttons: <strong>Back</strong>
-  and <strong>Contents</strong>. The user manual is an HTML document with links
-  to different chapters. Clicking on a link as you would do in a web browser
-  brings the desired page to the front.</p>
-
-  <h3>User manual off line browsing</h3>
-
-  <p>The user manual is located in the <code>docs</code> subfolder under the
-  OmegaT installation folder, so you may view, for instance, English
-  documentation, by opening the <code>docs/en/index.html</code> file in your
-  browser. This way you will be able to follow external links too, as the
-  built-in help browser does not accept external Internet links.</p>
-  <hr>
-
-  <table summary="just formatting" style="width: 100%;" border="0" cellpadding=
-  "2" cellspacing="2">
-    <tbody>
-      <tr>
-        <td style="text-align: left;"><a href="legalNotices.html">Legal
-        notices</a></td>
-
-        <td style="text-align: center;"><a href="index.html">Home</a></td>
-
-        <td style="text-align: right;"><a href="xindex.html">Index of
-        contents</a></td>
-      </tr>
-    </tbody>
-  </table>
-</body>
-</html>
diff --git a/docs/en/version.properties b/docs/en/version.properties
index e3b91b1..5448579 100644
--- a/docs/en/version.properties
+++ b/docs/en/version.properties
@@ -1,2 +1,2 @@
 # NOI18N
-version=2.0.5
+version=2.3.0
diff --git a/docs/en/website.html b/docs/en/website.html
deleted file mode 100644
index 7e41854..0000000
--- a/docs/en/website.html
+++ /dev/null
@@ -1,92 +0,0 @@
-<html>
-<head>
-  <link rel="stylesheet" href="./OmegaT.css" type="text/css">
-  <meta http-equiv="content-type" content="text/html; charset=utf-8">
-  <meta http-equiv="content-language" content="en">
-  <title>OmegaT Project on the Web, Reporting Errors and Contributing - OmegaT
- 2.0 User Manual</title>
-</head>
-
-<body>
-  <h2>OmegaT on the web</h2>
-
-  <h3>OmegaT sites and OmegaT SourceForge project</h3>
-
-  <p>The <a href="http://www.omegat.org/">OmegaT web site</a> contains links to
-  various OmegaT resources, so you should probably start there. User support is
-  provided on a volunteer basis at the <a href=
-  "http://groups.yahoo.com/group/OmegaT/">OmegaT Yahoo User Group</a>. The
-  <a href=
-  "http://tech.groups.yahoo.com/group/OmegaT/database?method=reportRows&tbl=1">
-  FAQ</a> corner there may be a good start for your questions. OmegaT also has
-  an IRC (Internet Relay Chat) channel on FreeNode: #omegat. New versions of
-  OmegaT can be downloaded from <a href=
-  "http://sourceforge.net/projects/omegat/">OmegaT SourceForge.net Project</a>,
-  where you may also file <a href=
-  "http://sourceforge.net/tracker/?group_id=68187&atid=520347">bug
-  reports</a> and <a href=
-  "http://sourceforge.net/tracker/?group_id=68187&atid=520350">requests for
-  enhancements</a>.</p>
-
-  <h3>Bug reports</h3>
-
-  <p>Remember that every good bug report needs exactly three things:</p>
-
-  <ul>
-    <li>Steps to reproduce</li>
-
-    <li>What you expected to see</li>
-
-    <li>What you saw instead</li>
-  </ul>
-
-  <p>More in <a href=
-  "http://www.joelonsoftware.com/articles/fog0000000029.html">Painless Bug
-  Tracking</a> article by Joel Spolsky</p>
-
-  <p>You should add copies of files, portions of the log (see <em>OmegaT Files
-  and Directories > User files</em> location) , screen shots, anything that
-  you think will help the developers to find and fix your bug. Note that bug
-  reports and requests for enhancements are publicly visible, so you should not
-  add any sensitive files. If you want to keep track of what is happening to
-  the report you should register as a SourceForge user, login and file a bug
-  report being logged in, or simply click Monitor on top of the report.</p>
-
-  <h3>Contributing to OmegaT project</h3>
-
-  <p>To contribute to OmegaT, first join the <a href=
-  "http://groups.yahoo.com/group/OmegaT/">user group</a> (via web or by sending
-  an email to <a href=
-  "mailto:OmegaT-subscribe at yahoogroups.com">OmegaT-subscribe at yahoogroups.com</a>).
-  To get involved in the OmegaT development you can join <a href=
-  "https://lists.sourceforge.net/lists/listinfo/omegat-development">the
-  developer group</a>, via web or by sending an email to <a href=
-  "mailto:omegat-development-request at lists.sourceforge.net?subject=subscribe">omegat-development-request at lists.sourceforge.net</a>
-  with subject "subscribe".</p>
-
-  <p>To translate OmegaT's user interface, user manual or other related
-  documents, first read <a href=
-  "http://www.omegat.org/en/howtos/localizing_omegat.html">Localizing and
-  customizing OmegaT</a> guide, and join the <a href=
-  "https://lists.sourceforge.net/lists/listinfo/omegat-l10n">OmegaT
-  translators' group</a> (via web or by sending an email to <a href=
-  "mailto:omegat-development-request at lists.sourceforge.net?subject=subscribe">omegat-l10n-request at lists.sourceforge.net</a>
-  with subject "subscribe").</p>
-
-  <p>And get a feel of what is going on in the OmegaT world...</p>
-  <hr>
-  <table summary="just formatting"  style="width: 100%;" border="0" cellpadding="2" cellspacing="2">
-    <tbody>
-      <tr>
-        <td style="text-align: left;"><a href="legalNotices.html">Legal
-notices</a> </td>
-        <td style="text-align: center;"><a href="index.html">Home</a>
-        </td>
-        <td style="text-align: right;"><a href="xindex.html">Index of
-contents</a> </td>
-      </tr>
-    </tbody>
-  </table>
-
-</body>
-</html>
diff --git a/docs/en/xindex.html b/docs/en/xindex.html
deleted file mode 100644
index 1b2441f..0000000
--- a/docs/en/xindex.html
+++ /dev/null
@@ -1,908 +0,0 @@
-<html>
-<head>
-  <link rel="stylesheet" href="./OmegaT.css" type="text/css">
-  <meta http-equiv="CONTENT-TYPE" content="text/html; charset=utf-8">
-
-  <title>Index of contents - OmegaT 2.0 User Manual</title>
-</head>
-
-<body>
-  <h1>Index of contents</h1>
-
-  <h3>Editing</h3>
-
-  <table summary="just formatting" width="100%">
-    <tbody>
-      <tr>
-        <td width="20%"><a href="userInterface.html#Editor">Editor
-        pane</a></td>
-
-        <td width="20%"><a href="fileFilters.html#edit_dialog">Filter
-        dialog</a></td>
-
-        <td width="20%"><a href="translationEditing.html">Translation
-        editing</a></td>
-
-        <td width="20%"><a href="translationEditing.html#auto_insert">Automatic
-        match insertion</a></td>
-
-        <td width="20%"><a href="translationEditing.html">Editing
-        behaviour</a></td>
-      </tr>
-
-      <tr>
-        <td width="20%"><a href="projectProperties.html">Project
-        settings</a></td>
-
-        <td width="20%"><a href="menu.html#EditMenu">Menu</a></td>
-
-        <td width="20%"><a href="menu.html#EditMenu">Extracting
-        selection</a></td>
-      </tr>
-    </tbody>
-  </table>
-  <hr>
-  <br>
-
-  <h3>Encoding</h3>
-
-  <table summary="just formatting" width="100%">
-    <tbody>
-      <tr>
-        <td width="20%"><a href=
-        "plainText.html#Character_sets_and_encoding">Character sets and
-        encoding</a></td>
-
-        <td width="20%"><a href="plainText.html#Plain_Text_in_OmegaT">Default
-        encoding</a></td>
-
-        <td width="20%"><a href="fileFilters.html#encoding">Source and target
-        files encoding</a></td>
-
-        <td width="20%"><a href="plainText.html#Garbled_displays">Garbled
-        displays</a></td>
-
-        <td width="20%"><a href=
-        "plainText.html#Character_sets_and_encoding">8-bit vs Unicode Text
-        files</a></td>
-      </tr>
-    </tbody>
-  </table>
-  <hr>
-  <br>
-
-  <h3>File Filters</h3>
-
-  <table summary="just formatting" width="100%">
-    <tbody>
-      <tr>
-        <td width="20%"><a href="fileFilters.html">Associating</a></td>
-
-        <td width="20%"><a href=
-        "fileFilters.html#filter_options">Attributes</a></td>
-
-        <td width="20%"><a href=
-        "fileFilters.html#filter_dialog">Dialog</a></td>
-
-        <td width="20%"><a href=
-        "fileFilters.html#filter_options">Options</a></td>
-
-        <td width="20%"><a href="fileFilters.html#source_file_name">Source file
-        type, filename pattern</a></td>
-      </tr>
-
-      <tr>
-        <td width="20%"><a href="fileFilters.html#target_file_name">Target
-        filename</a></td>
-
-        <td width="20%"><a href="fileFilters.html#filter_options">Text
-        files</a></td>
-      </tr>
-    </tbody>
-  </table>
-  <hr>
-  <br>
-
-  <h3>Files</h3>
-
-  <table summary="just formatting" width="100%">
-    <tbody>
-      <tr>
-        <td width="20%"><a href="filesAndDirectories.html#user">User
-        files</a></td>
-
-        <td width="20%"><a href="filesToTranslate.html">Files to
-        translate</a></td>
-
-        <td width="20%"><a href="filesToTranslate.html#plaintext">Plain text
-        files</a></td>
-
-        <td width="20%"><a href="filesToTranslate.html#tagged">Formatted text
-        files</a></td>
-
-        <td width="20%"><a href="filesToTranslate.html#formats">File
-        formats</a></td>
-      </tr>
-
-      <tr>
-        <td width="20%"><a href="filesToTranslate.html">Files OmegaT can
-        handle</a></td>
-
-        <td width="20%"><a href="filesToTranslate.html">Source
-        documents</a></td>
-
-        <td width="20%"><a href=
-        "translationMemories.html#TMX_files_location_and_purpose">TMX files
-        location</a></td>
-
-        <td width="20%"><a href="filesAndDirectories.html">Directories</a></td>
-
-        <td width="20%"><a href=
-        "filesAndDirectories.html#application">Directories for application
-        files</a></td>
-      </tr>
-
-      <tr>
-        <td width="20%"><a href=
-        "translationMemories.html#importing_files">Importing files</a></td>
-
-        <td width="20%"><a href=
-        "translationMemories.html#imported_files_handling">Handling of imported
-        files</a></td>
-
-        <td width="20%"><a href="filesToTranslate.html#specifics">File formats
-        specifics</a></td>
-
-        <td width="20%"><a href="filesToTranslate.html#others">Other file
-        formats</a></td>
-
-        <td width="20%"><a href="preventingDataLoss.html">Preventing data
-        loss</a></td>
-      </tr>
-
-      <tr>
-        <td width="20%"><a href="plainText.html">Plain text methods</a></td>
-
-        <td width="20%"><a href="plainText.html">Working with plain
-        text</a></td>
-
-        <td width="20%"><a href="formattedText.html">Working with formatted
-        texts</a></td>
-
-        <td width="20%"><a href="filesToTranslate.html">Supported file
-        formats</a></td>
-
-        <td width="20%"><a href="glossaries.html#fileformat">Glossary file
-        format</a></td>
-      </tr>
-
-      <tr>
-        <td width="20%"><a href="filesToTranslate.html#RTL_mixing">Mixing LTR
-        and RTL strings</a></td>
-
-        <td width="20%"><a href="filesToTranslate.html#RTL_tags">OmegaT tags in
-        RTL segments</a></td>
-
-        <td width="20%"><a href="filesToTranslate.html#po4a">Po4a</a></td>
-      </tr>
-    </tbody>
-  </table>
-  <hr>
-  <br>
-
-  <h3>Getting started</h3>
-
-  <table summary="just formatting" width="100%">
-    <tbody>
-      <tr>
-        <td width="20%"><a href="aboutOmegaT.html">About OmegaT</a></td>
-
-        <td width="20%"><a href="instantStartGuide.html#example">An
-        example...</a></td>
-
-        <td width="20%"><a href="instantStartGuide.html#summary">Briefly, how
-        OmegaT works</a></td>
-
-        <td width="20%"><a href="filesToTranslate.html">Files OmegaT can
-        handle</a></td>
-
-        <td width="20%"><a href="instantStartGuide.html">Start using OmegaT in
-        5 minutes!</a></td>
-      </tr>
-
-      <tr>
-        <td width="20%"><a href="formattedText.html#intro">Tagged files and
-        tags</a></td>
-
-        <td width="20%"><a href="plainText.html#The_OmegaT_solution">The OmegaT
-        solution</a></td>
-
-        <td width="20%"><a href="instantStartGuide.html#segments">Translate the
-        segments one by one</a></td>
-
-        <td width="20%"><a href="instantStartGuide.html#searches">Use
-        searches</a></td>
-
-        <td width="20%"><a href="instantStartGuide.html#tm">Use TM and glossary
-        matches</a></td>
-      </tr>
-    </tbody>
-  </table>
-  <hr>
-  <br>
-
-  <h3>Glossaries and dictionaries</h3>
-
-  <table summary="just formatting" width="100%">
-    <tbody>
-      <tr>
-        <td width="20%"><a href="glossaries.html">Glossaries<br></a></td>
-
-        <td width="20%"><a href="userInterface.html#Glossary">Glossary viewer,~
-        entries</a></td>
-
-        <td width="20%"><a href="dictionaries.html">Dictionaries,
-        dowloading</a></td>
-
-        <td width="20%"><a href=
-        "dictionaries.html#Problems_with_dictionaries">Dictionaries - problems
-        with<br></a></td>
-
-        <td width="20%"><a href="glossaries.html">Glossary files</a></td>
-      </tr>
-
-      <tr>
-        <td width="20%"><a href="glossaries.html#howtocreate">How to create
-        glossaries</a></td>
-
-        <td width="20%"><a href="glossaries.html#usage">Usage</a></td>
-
-        <td width="20%"><a href="glossaries.html#multiterm">Using Trados
-        Multiterm</a></td>
-
-        <td width="20%"><a href="glossaries.html#commonglossaryproblems">Common
-        glossary problems</a></td>
-
-        <td width="20%"><a href="glossaries.html#fileformat">File
-        format</a></td>
-      </tr>
-    </tbody>
-  </table>
-  <hr>
-  <br>
-
-  <h3>Installing and Running</h3>
-
-  <table summary="just formatting" width="100%">
-    <tbody>
-      <tr>
-        <td width="20%"><a href="installingAndRunning.html#Linux_users">Linux
-        users</a></td>
-
-        <td width="20%"><a href=
-        "installingAndRunning.html#Windows_users">Windows users</a></td>
-
-        <td width="20%"><a href="installingAndRunning.html#MacOSX_users">MacOSX
-        users</a></td>
-
-        <td width="20%"><a href="installingAndRunning.html#Other_systems">Other
-        systems</a></td>
-
-        <td width="20%"><a href="installingAndRunning.html#build_which">Package
-        to download</a></td>
-      </tr>
-
-      <tr>
-        <td width="20%"><a href=
-        "installingAndRunning.html#source_build">Building OmegaT from
-        source</a></td>
-      </tr>
-    </tbody>
-  </table>
-  <hr>
-  <br>
-
-  <h3>Internet references</h3>
-
-  <table summary="just formatting" width="100%">
-    <tbody>
-      <tr>
-        <td width="20%"><a href="http://groups.yahoo.com/group/OmegaT/">OmegaT
-        User group</a></td>
-
-        <td width="20%"><a href=
-        "mailto:OmegaT-subscribe at yahoogroups.com">Subscribe to OmegaT
-        group</a></td>
-
-        <td width="20%"><a href=
-        "https://lists.sourceforge.net/lists/listinfo/OmegaT-development">The
-        OmegaT developer group</a></td>
-
-        <td width="20%"><a href=
-        "mailto:OmegaT-development-request at lists.sourceforge.net?subject=subscribe">
-        Subscribe to the dev. group</a></td>
-
-        <td width="20%"><a href="http://www.omegat.org/">OmegaT web
-        site</a></td>
-      </tr>
-
-      <tr>
-        <td width="20%"><a href=
-        "http://tech.groups.yahoo.com/group/OmegaT/database?method=reportRows&tbl=1">
-        OmegaT FAQs</a></td>
-
-        <td width="20%"><a href=
-        "http://sourceforge.net/projects/OmegaT/">OmegaT sourceforge.net
-        Project</a></td>
-
-        <td width="20%"><a href="website.html">Trouble report</a></td>
-
-        <td width="20%"><a href=
-        "http://sourceforge.net/tracker/?group_id=68187&atid=520347">Bug
-        reports</a></td>
-
-        <td width="20%"><a href="license.txt">Gnu general public
-        license</a></td>
-      </tr>
-
-      <tr>
-        <td width="20%"><a href=
-        "http://www.loc.gov/standards/iso639-2/langcodes.html">ISO639-2
-        Language codes</a></td>
-
-        <td width="20%"><a href="filesToTranslate.html#okapi">Okapi
-        framework</a></td>
-
-        <td width="20%"><a href=
-        "http://wiki.services.openoffice.org/wiki/Dictionaries">Openoffice.org
-        Dictionaries</a></td>
-
-        <td width="20%"><a href=
-        "http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/dictionaries/">
-        Openoffice.org/contrib/dict</a></td>
-
-        <td width="20%"><a href=
-        "http://www.joelonsoftware.com/articles/fog0000000029.html">Painless
-        bug tracking</a></td>
-      </tr>
-
-      <tr>
-        <td width="20%"><a href=
-        "http://java.sun.com/j2se/1.5/docs/api/java/util/regex/Pattern.html">Reg.
-        expressions reference</a></td>
-
-        <td width="20%"><a href=
-        "http://www.lisa.org/standards/srx/">Segmentation Rules (SRX)</a></td>
-
-        <td width="20%"><a href=
-        "http://www.regular-expressions.info/quickstart.html">Quick Start on
-        reg.expressions</a></td>
-
-        <td width="20%"><a href=
-        "http://translate.sourceforge.net/wiki/toolkit/index">Translate Toolkit
-        official page</a></td>
-
-        <td width="20%"><a href="http://po4a.alioth.debian.org/">Po4a official
-        page</a></td>
-      </tr>
-    </tbody>
-  </table>
-  <hr>
-
-  <h3>Languages</h3>
-
-  <table summary="just formatting" width="100%">
-    <tbody>
-      <tr>
-        <td width="20%"><a href="languages.html">Language codes</a></td>
-
-        <td width="20%"><a href="menu.html#shortcuts">Language
-        modifications</a></td>
-
-        <td width="20%"><a href="filesToTranslate.html#RTL_mixing">LTR &
-        RTL strings in segments</a></td>
-
-        <td width="20%"><a href="filesToTranslate.html#RTL_tags">OmegaT tags in
-        RTL segments</a></td>
-
-        <td width="20%"><a href="filesToTranslate.html#RTLbidi">Right to left
-        languages</a></td>
-      </tr>
-    </tbody>
-  </table>
-  <hr>
-
-  <h3>Legal notices</h3>
-
-  <table summary="just formatting" width="100%">
-    <tbody>
-      <tr>
-        <td width="20%"><a href="legalNotices.html">Legal notices</a></td>
-      </tr>
-    </tbody>
-  </table>
-  <hr>
-
-  <h3>Menu</h3>
-
-  <table summary="just formatting" width="100%">
-    <tbody>
-      <tr>
-        <td width="20%"><a href="menu.html">Main menu</a></td>
-
-        <td width="20%"><a href="menu.html#ProjectMenu">Submenu
-        Project</a></td>
-
-        <td width="20%"><a href="menu.html#EditMenu">Submenu Edit</a></td>
-
-        <td width="20%"><a href="menu.html#GotoMenu">Submenu Goto</a></td>
-
-        <td width="20%"><a href="menu.html#ViewMenu">Submenu View</a></td>
-      </tr>
-
-      <tr>
-        <td width="20%"><a href="menu.html#ToolsMenu">Submenu Tools</a></td>
-
-        <td width="20%"><a href="menu.html#OptionsMenu">Submenu
-        Options</a></td>
-
-        <td width="20%"><a href="menu.html#HelpMenu">Submenu Help</a></td>
-
-        <td width="20%"><a href="userInterface.html#Help_Browser">Help
-        browser</a></td>
-
-        <td width="20%"><a href="userInterface.html#manual">Help
-        manual</a></td>
-      </tr>
-
-      <tr>
-        <td width="20%"><a href="menu.html">Main menu and shortcuts</a></td>
-
-        <td width="20%"><a href="menu.html#shortcuts">Keyboard
-        shortcuts</a></td>
-
-        <td width="20%"><a href="menu.html#Moving_around">Moving
-        around</a></td>
-
-        <td width="20%"><a href="menu.html#Reference_windows">Reference
-        windows</a></td>
-      </tr>
-    </tbody>
-  </table>
-  <hr>
-
-  <h3>Project</h3>
-
-  <table summary="just formatting" width="100%">
-    <tbody>
-      <tr>
-        <td width="20%"><a href="menu.html#Project_management">Project
-        management</a></td>
-
-        <td width="20%"><a href="menu.html#ProjectMenu">Project menu</a></td>
-
-        <td width="20%"><a href="projectProperties.html">Project
-        properties</a></td>
-
-        <td width="20%"><a href="userInterface.html#files">Project
-        files</a></td>
-
-        <td width="20%"><a href="projectProperties.html#dialog">Project
-        Properties dialog</a></td>
-      </tr>
-
-      <tr>
-        <td width="20%"><a href="projectProperties.html">Edit the
-        project</a></td>
-
-        <td width="20%"><a href="projectProperties.html#folder">Folder
-        structure modifications</a></td>
-
-        <td width="20%"><a href="languages.html">Language codes</a>, <a href=
-        "projectProperties.html#language">Languages</a></td>
-
-        <td width="20%"><a href="projectProperties.html#warning">Modifying
-        during session</a></td>
-
-        <td width="20%"><a href="preventingDataLoss.html">Preventing data
-        loss</a></td>
-      </tr>
-
-      <tr>
-        <td width="20%"><a href="userInterface.html#Project_Files">Project
-        files window</a></td>
-
-        <td width="20%"><a href="filesAndDirectories.html#project">Translation
-        project files</a></td>
-      </tr>
-    </tbody>
-  </table>
-  <hr>
-
-  <h3>Regular Expressions</h3>
-
-  <table summary="just formatting" width="100%">
-    <tbody>
-      <tr>
-        <td width="20%"><a href="regexp.html">Regular expressions</a></td>
-
-        <td width="20%"><a href="searches.html#usingregularexpressions">Using
-        regular expressions</a></td>
-
-        <td width="20%"><a href="regexp.html">Constructs</a></td>
-
-        <td width="20%"> </td>
-
-        <td width="20%"> </td>
-      </tr>
-    </tbody>
-  </table>
-  <hr>
-
-  <h3>Search</h3>
-
-  <table summary="just formatting" width="100%">
-    <tbody>
-      <tr>
-        <td width="20%"><a href="searches.html">Introduction</a></td>
-
-        <td width="20%"><a href="searches.html#location">Search
-        location</a></td>
-
-        <td width="20%"><a href="searches.html#searchmethods">Search
-        methods</a></td>
-
-        <td width="20%"><a href="searches.html#display">Search results
-        display</a></td>
-
-        <td width="20%"><a href="userInterface.html#Search_Window">Search
-        window</a></td>
-      </tr>
-
-      <tr>
-        <td width="20%"><a href="userInterface.html#Fuzzy_Matches">Fuzzy
-        matches</a></td>
-
-        <td width="20%"><a href="searches.html#calling">Calling up a
-        search</a></td>
-
-        <td width="20%"><a href="searches.html#searchmethods">Search
-        types</a></td>
-
-        <td width="20%"><a href="searches.html#usingwildcards">Using wild
-        cards</a></td>
-
-        <td width="20%"><a href="searches.html#usingwildcards">Wild card
-        characters</a></td>
-      </tr>
-
-      <tr>
-        <td width="20%"><a href="GoogleTranslate.html">Google Translate</a></td>>
-
-        <td width="20%"><a href="glossaries.html">Glossary search</a></td>
-
-        <td width="20%"><a href="dictionaries.html">Dictionary search</a></td>
-      </tr>
-    </tbody>
-  </table>
-  <hr>
-  <br>
-
-  <h3>Segmentation</h3>
-
-  <table summary="just formatting" width="100%">
-    <tbody>
-      <tr>
-        <td width="20%"><a href="segmentation.html">Introduction</a></td>
-
-        <td width="20%"><a href="segmentation.html#about">About segmentation
-        rules</a></td>
-
-        <td width="20%"><a href="segmentation.html">Source
-        segmentation</a></td>
-
-        <td width="20%"><a href="segmentation.html#sentence">Sentence level
-        segmentation</a></td>
-
-        <td width="20%"><a href="segmentation.html#structure">Structure level
-        segmentation</a></td>
-      </tr>
-
-      <tr>
-        <td width="20%"><a href="segmentation.html">Segmentation rules</a></td>
-
-        <td width="20%"><a href="segmentation.html#priority">Rules -
-        priority</a></td>
-
-        <td width="20%"><a href="segmentation.html#creation">Rules -
-        creation</a></td>
-
-        <td width="20%"><a href="segmentation.html#setup">Rules setup</a></td>
-
-        <td width="20%"><a href="projectProperties.html#segments">Segmentation
-        modifications</a></td>
-      </tr>
-
-      <tr>
-        <td width="20%"><a href="formattedText.html#tag_segmenting">Tags and
-        sentence segmenting</a></td>
-
-        <td width="20%"><a href="translationEditing.html#validation">Segments
-        not to modify</a> </td>
-
-        <td width="20%"><a href=
-        "http://www.lisa.org/standards/srx/">Segmentation Rules exchange
-        (SRX)</a></td>
-      </tr>
-    </tbody>
-  </table>
-  <hr>
-
-  <h3>Spell checker</h3>
-
-  <table summary="just formatting" width="100%">
-    <tbody>
-      <tr>
-        <td width="20%"><a href="spellchecker.html">Introduction</a></td>
-
-        <td width="20%"><a href="spellchecker.html">Setup</a></td>
-
-        <td width="20%"><a href=
-        "spellchecker.html#edit_dialog">Options</a></td>
-
-        <td width="20%"><a href=
-        "http://hunspell.sourceforge.net/">Hunspell</a></td>
-
-        <td width="20%"><a href=
-        "http://wiki.services.openoffice.org/wiki/Dictionaries">Ooo Wiki
-        Dictionaries</a></td>
-      </tr>
-
-      <tr>
-        <td width="20%"><a href="spellchecker.html#Hints">Hints</a></td>
-
-        <td width="20%"><a href=
-        "http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/dictionaries/">
-        Openoffice.org/contrib/dict</a></td>
-      </tr>
-    </tbody>
-  </table>
-  <hr>
-
-  <h3>Formatted files</h3>
-
-  <table summary="just formatting" width="100%">
-    <tbody>
-      <tr>
-        <td width="20%"><a href="filesToTranslate.html#tagged">Formatted text
-        files</a></td>
-
-        <td width="20%"><a href="instantStartGuide.html#tags">How to handle
-        tagged text</a></td>
-
-        <td width="20%"><a href="instantStartGuide.html#translate">How to
-        translate with OmegaT</a></td>
-
-        <td width="20%"><a href="formattedText.html">Working with formatted
-        texts</a></td>
-
-        <td width="20%"><a href="formattedText.html#tag_segmenting">Tags and
-        sentence segmenting</a></td>
-      </tr>
-
-      <tr>
-        <td width="20%"><a href="formattedText.html#tag_hints">Hints for tags
-        management</a></td>
-
-        <td width="20%"><a href="formattedText.html#intro">Formatting
-        tags</a></td>
-
-        <td width="20%"><a href="formattedText.html#tag_operation">Tag
-        manipulations</a></td>
-
-        <td width="20%"><a href="formattedText.html#nesting">Tag group
-        nesting</a></td>
-
-        <td width="20%"><a href="formattedText.html#tag-overlapping">Tag group
-        overlapping</a></td>
-      </tr>
-
-      <tr>
-        <td width="20%"><a href="userInterface.html#Tag_Validation">Tag
-        validation</a></td>
-
-        <td width="20%"><a href="instantStartGuide.html#tag_verif">Tag
-        verification</a></td>
-
-        <td width="20%"><a href="formattedText.html#tag_validation">Validate
-        tags</a></td>
-
-        <td width="20%"><a href="formattedText.html#intro">Special
-        tags</a></td>
-
-        <td width="20%"><a href="formattedText.html#Tag_operations">Tag
-        operations</a></td>
-      </tr>
-
-      <tr>
-        <td width="20%"><a href="userInterface.html#tag_validation">Tag
-        errors</a></td>
-
-        <td width="20%"><a href="formattedText.html#tag_validation">Tag group
-        validation</a></td>
-
-        <td width="20%"><a href="formattedText.html">Tags</a></td>
-      </tr>
-    </tbody>
-  </table>
-  <hr>
-
-  <h3>Translation memory</h3>
-
-  <table summary="just formatting" width="100%">
-    <tbody>
-      <tr>
-        <td width="20%"><a href="translationMemories.html">Translation
-        memories</a></td>
-
-        <td width="20%"><a href=
-        "translationMemories.html#OmegaT_and_TMX_files">OmegaT and TMX
-        files</a></td>
-
-        <td width="20%"><a href=
-        "translationMemories.html#TMX_files_and_language">TMX -  and
-        Language</a></td>
-
-        <td width="20%"><a href=
-        "translationMemories.html#TMX_files_location_and_purpose">TMX - 
-        files location</a></td>
-
-        <td width="20%"><a href="translationMemories.html#TMX_backup">TMX -
-        backup</a></td>
-      </tr>
-
-      <tr>
-        <td width="20%"><a href="translationMemories.html#keeping_a_memory">How
-        OmegaT remembers<br>
-        your translation</a></td>
-
-        <td width="20%"><a href=
-        "translationMemories.html#Using_TMs_from_previous_projects">Using
-        translation memories<br>
-        from previous projects</a></td>
-
-        <td width="20%"><a href="translationMemories.html#using_memories">Using
-        TMs created<br>
-        by other translation tools</a></td>
-
-        <td width="20%"><a href=
-        "translationMemories.html#using_OmegaT_TM">Using OmegaT TMs<br>
-        in other CAT tools</a></td>
-
-        <td width="20%"><a href=
-        "translationMemories.html#using_memories"><br></a></td>
-      </tr>
-
-      <tr>
-        <td width="20%"><a href=
-        "translationMemories.html#imported_files_handling">Handling imported
-        files</a></td>
-
-        <td width="20%"><a href=
-        "translationMemories.html#importing_files">Importing files</a></td>
-
-        <td width="20%"><a href=
-        "translationMemories.html#upgrading_TM">Upgrading translation
-        memories</a></td>
-      </tr>
-    </tbody>
-  </table>
-  <hr>
-  <br>
-
-  <h3>User interface</h3>
-
-  <table summary="just formatting" width="100%">
-    <tbody>
-      <tr>
-        <td width="20%"><a href="userInterface.html#most">Windows you'll
-        use<br>
-        most of the time</a></td>
-
-        <td width="20%"><a href="userInterface.html#OmegaT_Main_Window">OmegaT
-        main window</a></td>
-
-        <td width="20%"><a href="userInterface.html">Main window panes</a></td>
-
-        <td width="20%"><a href="menu.html">Menu</a></td>
-
-        <td width="20%"><a href="menu.html#shortcuts">Shortcuts</a></td>
-      </tr>
-
-      <tr>
-        <td width="20%"><a href="userInterface.html#some">Windows you may
-        use<br>
-        now and then</a></td>
-
-        <td width="20%"><a href="userInterface.html#Match">Match
-        viewer</a></td>
-
-        <td width="20%"><a href="searches.html#searchwindow">Search
-        window</a></td>
-
-        <td width="20%"><a href="fileFilters.html#filter_dialog">File filters
-        dialog</a></td>
-
-        <td width="20%"><a href="userInterface.html#Tag_Validation">Tag
-        validation window</a></td>
-      </tr>
-
-      <tr>
-        <td width="20%"><a href="userInterface.html#Project_Files">Project
-        files window</a></td>
-
-        <td width="20%"><a href="userInterface.html#Fuzzy_Matches">Fuzzy
-        matches</a></td>
-
-        <td width="20%"><a href="menu.html#Reference_windows">Reference
-        windows</a></td>
-
-        <td width="20%"><a href="fileFilters.html#edit_dialog">Filter
-        dialog</a></td>
-
-        <td width="20%"><a href="userInterface.html">The user
-        interface</a></td>
-      </tr>
-
-      <tr>
-        <td width="20%"><a href="userInterface.html#dialogs">Project
-        settings</a></td>
-
-        <td width="20%"><a href="userInterface.html#proj_files">Project Files
-        Window features</a></td>
-
-        <td width="20%"><a href="userInterface.html#unique">Unique
-        segments</a></td>
-
-        <td width="20%"><a href="userInterface.html#item">User interface
-        items</a></td>
-
-        <td width="20%"><a href="fontSettings.html">Font settings</a></td>
-      </tr>
-
-      <tr>
-        <td width="20%"><a href=
-        "filesToTranslate.html#RTL_Changing_direction">RTL - changing the
-        direction</a></td>
-
-        <td width="20%"><a href="userInterface.html#search_display">Search
-        results display</a></td>
-
-        <td width="20%"><a href="userInterface.html#bar">Status bar</a></td>
-
-        <td width="20%"><a href="menu.html#shortcuts">Keyboard
-        shortcuts</a></td>
-
-        <td width="20%"><a href="userInterface.html#search_types">Search
-        types</a></td>
-      </tr>
-    </tbody>
-  </table>
-  <hr>
-
-  <table summary="just formatting" style="width: 100%;" border="0" cellpadding=
-  "2" cellspacing="2">
-    <tbody>
-      <tr>
-        <td style="text-align: left;"><a href="legalNotices.html">Legal
-        notices</a></td>
-
-        <td style="text-align: center;"><a href="index.html">Home</a></td>
-
-        <td style="text-align: right;"><a href="xindex.html">Index of
-        contents</a></td>
-      </tr>
-    </tbody>
-  </table>
-</body>
-</html>
diff --git a/docs/fr/images/MatchesPane.png b/docs/fr/images/MatchesPane.png
new file mode 100644
index 0000000..3bf219b
Binary files /dev/null and b/docs/fr/images/MatchesPane.png differ
diff --git a/docs/fr/instantStartGuideNoTOC.html b/docs/fr/instantStartGuideNoTOC.html
index 232da05..cba6fc3 100644
--- a/docs/fr/instantStartGuideNoTOC.html
+++ b/docs/fr/instantStartGuideNoTOC.html
@@ -1,176 +1,457 @@
 <html>
-<head>
-  <link rel="stylesheet" href="./OmegaT.css" type="text/css">
-  <meta http-equiv="content-type" content="text/html; charset=UTF-8">
-
-  <title>Tutoriel de prise en main – Manuel utilisateur OmegaT 2.0</title>
-</head>
-
-<body>
-  <h2>Pour utiliser OmegaT en 5 minutes ! – Tutoriel de prise en main</h2>
-
-  <p>Ce tutoriel ne décrit que les fonctions de base d'OmegaT. Pour avoir une idée de l'intégralité des fonctions offertes par OmegaT, consultez le manuel de l'utilisateur. Les raccourcis clavier décrits ici utilisent la notation « Ctrl+touche Â» que les utilisateurs de Mac doivent lire « Cmd+touche Â». Cette touche est étiquetée « cmd Â» ou « command Â», ou est indiquée avec une pomme sur les claviers Apple.</p>
-  <hr>
-  <a name="summary" id="summary"></a>
-
-  <h2>OmegaT en quelques mots</h2>
-
-  <p>L'écran d'OmegaT est un environnement d'édition composé de plusieurs volets distincts. La taille de ces volets peut être modifiée à l'aide de la souris. Le volet d'édition se trouve à gauche ; c'est ici que vous allez écrire votre traduction. Le volet Correspondances (à droite) affiche les traductions provenant de la mémoire de traduction et correspondant au segment en cours de traduction. Le volet Glossaires (également à droite) affiche les termes présents dans les glossaires et dans le segment en cours de traduction.</p>
-
-  <p>Dans le volet d'édition, OmegaT vous présente le texte source segmenté en phrases (ou en paragraphes). Ces segments sont à traduire un par un. Dès que vous passez d'un segment à l'autre, sa traduction est enregistrée dans la mémoire de traduction. Une fois tous les segments traduits (ou bien en cours de traduction, comme vous le souhaitez), OmegaT utilisera la mémoire de traduction pour créer les documents traduits dans le dossier « target ».</p>
-
-  <p>Une traduction dans OmegaT est organisée sous forme de « projet » de traduction. Pour chaque projet, OmegaT va créer un ensemble de dossiers. Ces dossiers sont utilisés pour stocker les documents à traduire, les glossaires que vous souhaitez utiliser ainsi que les mémoires de traduction dont vous souhaitez vous servir. OmegaT crée aussi un dossier « target » dans lequel il met lui-même les documents traduits.</p>
-  <hr>
-  <a name="translate" id="translate"></a>
-
-  <h2>Traduire avec OmegaT</h2><a name="create" id="create"></a>
-
-  <h3>Créer et ouvrir un projet</h3>
-
-  <p>À partir du menu, choisissez <strong>Projet → Nouveau...</strong></p>
-
-  <p>Choisissez un emplacement et un nom pour le projet que vous souhaitez créer. Le nom choisi pour le projet sera aussi le nom du dossier qui contiendra tous les sous-dossiers du projet.</p>
-
-  <p>OmegaT vous proposera dans une fenêtre similaire à celle ci-dessous une liste de sous-dossiers que vous pouvez soit modifier, soit accepter comme telle.</p>
-
-  <p align="center"><img src="images/NewProject.png" name="graphics1" alt=
-  "Fenêtre des paramètres du projet" id="graphics1" align="bottom" border="0"></p>
-
-  <p>Vous pouvez accepter l'emplacement des sous-dossiers, mais vous devez vous assurer que les codes de langue pour votre projet sont corrects. Pour ceci, sélectionnez les codes langue (2 lettres) ou les codes langue-et-région (2 + 2 lettres) appropriés en utilisant les listes déroulantes, ou encore saisissez-les au clavier (le code langue peut faire 2 ou 3 lettres). Mémorisez l'emplacement du sous-dossier « target Â» qui contiendra vos fichiers traduits. Si vous souhaitez qu'OmegaT utilise une segmentation par phrase plutôt que par paragraphe, n'hésitez pas à vérifier les règles de segmentation.</p>
-
-  <p>Une fois que vous avez cliqué sur « OK Â» pour confirmer les caractéristiques du projet, OmegaT vous propose de choisir les fichiers source à importer pour traduction. Il vous est possible d'importer un ou plusieurs fichiers ou même des dossiers entiers (avec éventuellement leurs sous-dossiers). Si vous avez fait une erreur, il vous suffit d'ouvrir manuellement le dossier « source Â» de votre projet et d'y ajouter ou d'en retirer des fichiers.</p>
-
-  <p>Pour inspecter la liste des fichiers à traduire, consultez la fenêtre <strong>Fichiers du projet</strong> (menu : <strong>Projet → Fichiers du projet...</strong>, si elle ne s'ouvre pas automatiquement). Si le contenu du dossier « source Â» a dû être modifié, n'oubliez pas de recharger le projet (menu : <strong>Projet → Recharger</strong>). OmegaT vous propose de traduire en premier le fichier figurant en tête de liste. N'oubliez pas qu'OmegaT ne peut traduire des fichiers aux formats ci-dessous que s'ils correspondent aux masques définis dans les filtres de fichiers. Tous les fichiers dans d'autres formats seront ignorés.</p>
-
-  <ul>
-    <li>OpenDocument/OpenOffice.org</li>
-
-    <li>Texte brut</li>
-
-    <li>Portable Object (.po)</li>
-
-    <li>Ensemble de ressources Java (Bundle.properties)</li>
-
-    <li>XHTML et HTML</li>
-
-    <li>HTML Help Compiler</li>
-
-    <li>INI (paires clé=valeur)</li>
-
-    <li>DocBook</li>
-
-    <li>Microsoft Open XML</li>
-
-    <li>XLIFF Okapi monolingue</li>
-
-    <li>CopyFlowGold pour QuarkXPress</li>
-
-    <li>Sous-titres (SRT)</li>
-
-    <li>ResX</li>
-
-    <li>Ressources Android</li>
-
-    <li>LaTeX</li>
-  </ul><a name="segments" id="segments"></a>
-
-  <h3>Traduction des segments un par un</h3>
-
-  <p>Une fois le projet et les fichiers à traduire définis, OmegaT ouvre le premier fichier source dans le volet d'édition. Le premier segment est surligné en vert et une copie du texte est affichée en dessous, dans la « ligne d'édition Â». Toutes les zones extérieures à cette ligne d'édition sont protégées et ne peuvent pas être modifiées. Vous allez maintenant remplacer le texte source par votre traduction, avant la balise <code><segment 000X></code>. Appuyez sur la touche « <strong>Entrée</strong> Â» pour passer au segment suivant. Note :</p>
-
-  <ul>
-    <li>Pour vous déplacer de part et d'autre du texte, double-cliquez sur la phrase ou le paragraphe que vous souhaitez ouvrir.</li>
-
-    <li>Si vous préférez qu'OmegaT n'insère pas automatiquement le contenu non-traduit dans la ligne d'édition, modifiez cette option via <strong>Options → Ligne d'édition...</strong>.</li>
-
-    <li>
-      <p>Vous pouvez modifier la configuration du volet d'édition (par exemple pour afficher ou non le texte source, pour mettre en évidence le texte traduit, etc.) dans l'entrée <span style="font-weight: bold;">Affichage</span> du menu principal.</p>
-    </li>
-  </ul>
-
-  <p>Lorsque vous appuyez sur « <strong>Entrée</strong> Â», plusieurs choses se passent : OmegaT ajoute la paire de segments (le segment source et sa traduction) à la mémoire de traduction, et traduit également automatiquement tous les autres segments identiques trouvés dans le projet. OmegaT va aussi chercher dans les mémoires de traduction et les glossaires des correspondances avec le segment suivant.</p><a name="tm" id="tm"></a>
-
-  <h3>Utilisation des correspondances des mémoires de traduction, des glossaires et des dictionnaires</h3><a name="tm_matches" id="tm_matches"></a>
-
-  <h3>Correspondances des mémoires de traduction</h3>
-
-  <p>OmegaT analyse les mémoires de traduction et affiche les correspondances (supérieures à 30 %) pour le segment à traduire dans le volet Correspondances.  La première correspondance affichée est présélectionnée.</p><img src=
-  "images/MatchesPane.png" name="graphics4" alt="Volet des correspondances" id="graphics4"
-  style="border: 0px solid ;"><br clear="left">
-
-  <p><br></p>
-
-  <p>Les raccourcis clavier suivants vous permettent d'insérer la première correspondance dans la ligne d'édition :</p>
-
-  <ul>
-    <li>Appuyez sur <code>Ctrl+I</code> pour l'insérer à la position du curseur.</li>
-
-    <li>Appuyez sur <code>Ctrl+R</code> pour l'insérer en remplaçant le contenu de la ligne d'édition.</li>
-  </ul>
-
-  <p>Si plusieurs correspondances sont présentes et que vous ne souhaitez pas utiliser la première :</p>
-
-  <ul>
-    <li>Sélectionnez celle que vous préférez avec les raccourcis <code>Ctrl+2</code> pour la seconde de la liste, <code>Ctrl+3</code> pour la troisième, etc.</li>
-
-    <li>Puis utilisez les raccourcis <code>Ctrl+I</code> ou <code>Ctrl+R</code> comme décrit ci-dessus.</li>
-  </ul>
-
-  <p>Il est possible de demander à OmegaT d'insérer automatiquement dans la ligne d'édition, dès que le segment se présente, la meilleure correspondance au-delà d'un seuil que vous déterminez. Cette option est accessible via <strong>Options → Ligne d'édition...</strong>.</p><a name="gloss_matches" id="gloss_matches"></a>
-
-  <h3>Correspondances des glossaires et des dictionnaires</h3>
-
-  <p>Si OmegaT trouve des correspondances dans les glossaires et les dictionnaires, celles-ci seront affichées pour référence dans les volets Glossaires et Dictionnaires.</p><a name="searches" id="searches"></a>
-
-  <h3>Utilisation des recherches</h3>
-
-  <p>OmegaT vous donne accès à de puissantes fonctions de recherche. Ouvrez la fenêtre de recherche avec <code>Ctrl+F</code>, et entrez le mot ou l'expression que vous souhaitez rechercher dans le champ « Rechercher Â». Vous pouvez également sélectionner un mot ou une phrase n'importe où dans le volet d'édition et appuyer sur <code>Ctrl+F</code>. La partie sélectionnée sera automatiquement affichée dans le champ de recherche.</p>
-
-  <h3>Fonction de traduction automatique</h3>
-
-  <p>OmegaT vous permet d'interroger différents moteurs de traduction automatique (<strong>Options → Traduction automatique...</strong>). Vous obtiendrez automatiquement une suggestion de traduction pour le segment actuel dans le volet Traduction automatique.  Si vous appuyez sur <code>Ctrl+M</code>, elle remplacera le contenu actuel du segment cible.<br></p>
-
-  <p><a name="create_trans" id="create_trans"></a></p>
-
-  <h3>Création des documents traduits</h3>
-
-  <p>Une fois tous les segments traduits (ou bien en cours de traduction, comme vous le souhaitez), OmegaT utilisera la mémoire de traduction pour créer les documents traduits dans le dossier « target Â». Pour ce faire, sélectionnez <strong>Projet → Créer les documents traduits</strong> à partir du menu. Quel que soit l'état d'avancement de la traduction, OmegaT va créer les versions traduites des fichiers du dossier « source Â» dans le dossier « target Â» du projet. Les fichiers traduits (entièrement ou partiellement) seront sauvegardés dans le dossier « target Â» spécifié dans les propriétés du projet. Pour finaliser la traduction, ouvrez les fichiers cible dans l'application qui leur est associée (navigateur, traitement de texte...) pour vérifier le contenu de la traduction ainsi que son formatage. Vous pouvez revenir à OmegaT pour y faire les corrections nécessaires sans oublier de créer les documents traduits pour tenir compte de ces modifications.</p>
-  <hr>
-  <a name="tags" id="tags"></a>
-
-  <h2>Travailler avec un texte balisé</h2>
-
-  <p>OmegaT conserve le formatage des documents originaux (caractères gras, italiques...) en utilisant des balises spéciales. Les balises d'OmegaT sont composées d'une ou plusieurs lettres, suivies d'un ou plusieurs chiffres et utilisent le caractère « / Â» pour la fermeture (par exemple : <f0>, </f0>, <br>, </s2>, etc.). Ces balises doivent être manipulées avec précaution et vous devez faire en sorte qu'elles soient incluses correctement dans le segment traduit de la ligne d'édition (voir <em>Validation des balises</em>).</p><a name="example" id="example"></a>
-
-  <h3>Par exemple :</h3>
-
-  <p>Cet exemple présente les balises mises en évidence pour les distinguer clairement du texte. Cela ne sera pas le cas dans OmegaT. Les balises HTML (en <font color="blue">bleu</font>) seront ignorées par OmegaT parce qu'elles entourent complètement le segment. Les balises en <font color=
-  "green">vert</font> doivent être gérées par OmegaT parce qu'elles sont à l'intérieur du segment. Exemple de segment de fichier HTML :</p>
-
-  <p><code><font color="blue"><p></font>Une police d'affichage différente peut être sélectionnée dans la boîte de dialogue <font color="green"><b></font>Police d'affichage<font color=
-  "green"></b></font>. Ouvrez-la via l'entrée de menu <font color=
-  "green"><i></font>Options<font color="green"></i></font> → <font color="green"><i></font>Police...<font color=
-  "green"></i></font>. Le type et la taille de police peuvent être modifiés dans la boîte de dialogue.<font color="blue"></p></font></code></p>
-
-  <p>Voici comment OmegaT va afficher ce segment, avec la traduction en afrikaans :</p><br>
-
-  <p><img src="images/tagged_segment.png" alt="" border="0"></p><br>
-
-  <p>Le texte HTML du document traduit créé par OmegaT sera comme ceci :</p>
-
-  <p><img src="images/tagged_segment_target.png" alt="" border="0"></p><a name=
-  "tag_verif" id="tag_verif"></a>
-
-  <h3>Validation des balises</h3>
-
-  <p>OmegaT ne détecte pas automatiquement les erreurs de balises dans un fichier traduit. Avant de livrer les documents traduits, vérifier que ceux-ci ne contiennent pas d'erreurs de balises.</p>
-
-  <p>Pour ceci, sélectionnez  <strong>Outils → Valider les balises</strong> à partir du menu. Vous obtenez une table contenant les segments où les balises source ne correspondent pas aux balises cible. Cliquez sur le numéro du segment. OmegaT vous renvoie automatiquement au segment en question dans le volet d'édition pour vous permettre de corriger les balises. Appuyez sur <code>Entrée</code> pour valider le segment corrigé et vérifiez la correction en appuyant à nouveau sur <code>Control-T</code>.</p>
-
-  <p>Des erreurs de balises peuvent empêcher que le fichier s'ouvre dans certains cas. Il est donc recommandé de s'assurer que les erreurs de balises sont corrigées avant de créer les fichiers traduits. Enfin, il est conseillé d'ouvrir le document traduit dans l'application associée pour en vérifier la mise en forme.</p>
-
-  <p>Dans certains langages de programmation (par ex. : PHP, C), des balises spéciales sont utilisées comme espaces réservés dans des chaînes utilisées en combinaison avec la fonction printf. OmegaT peut détecter et valider ces balises si vous l'y autorisez. Sélectionnez <strong>Options→ Validation des balises...</strong> à partir du menu. Vous pouvez choisir entre une validation simple ou complète. Dans la validation simple, seules les variantes simples des valeurs d'espaces réservés sont utilisées. Cela est utile lorsque le code source ne contient pas les espaces réservés les plus expressifs et les plus complexes et que vous obtenez beaucoup de faux positifs.</p>
-
-  <hr>
-</body>
-</html>
+   <head>
+      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+   
+      <title>Tutoriel de prise en main</title>
+      <link rel="stylesheet" href="OmegaT.css" type="text/css">
+      <meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+   </head>
+   <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+      <div class="chapter" title="Tutoriel de prise en main">
+         <div class="titlepage">
+            <div>
+               <div>
+                  <h2 class="title"><a name="chapter.instant.start.guide"></a>Tutoriel de prise en main
+                  </h2>
+               </div>
+            </div>
+         </div>
+         <div class="section" title="1. Pour utiliser OmegaT en 5 minutes !">
+            <div class="titlepage">
+               <div>
+                  <div>
+                     <h2 class="title" style="clear: both"><a name="d0e4"></a>1. Pour utiliser <span class="application">OmegaT</span> en 5 minutes !
+                     </h2>
+                  </div>
+               </div>
+            </div>
+            <p>Ce tutoriel ne décrit que les fonctions de base d'OmegaT. Pour avoir une idée de l'intégralité des fonctions offertes par
+               <span class="application">OmegaT</span>, consultez le manuel de l'utilisateur. Note à l'attention des utilisateurs de Mac OS X : les raccourcis clavier décrits ici
+               utilisent la notation « <span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>touche</strong></span> Â» que les utilisateurs de Mac doivent lire « <span class="keycap"><strong>Cmd</strong></span>+<span class="keycap"><strong>touche</strong></span> Â». Cette touche est étiquetée « <span class="keycap"><strong>cmd</strong></span> Â» ou « command Â», ou est indiquée avec une pomme sur les claviers Apple.
+            </p>
+            <p>L'écran d'<span class="application">OmegaT</span> est un environnement d'édition composé de plusieurs volets distincts<a class="indexterm" name="d0e35"></a>. La taille de ces volets peut être modifiée à l'aide de la souris. Le volet d'édition se trouve à gauche ; c'est ici que
+               vous écrivez votre traduction. Le volet Correspondances (à droite) affiche les traductions provenant de la mémoire de traduction
+               et correspondant au segment en cours de traduction. Le volet Glossaires (également à droite) affiche les termes présents dans
+               les glossaires et dans le segment en cours de traduction. Dans la partie inférieure de l'environnement d'édition, deux onglets
+               supplémentaires permettent d'ouvrir les volets Dictionnaires et Traduction automatique. Remarque : vous êtes libre d'organiser
+               les volets comme bon vous semble – la description ci-dessus correspond à l'agencement de l'environnement d'édition juste après
+               l'installation d'OmegaT.
+            </p>
+            <p>Dans le volet d'édition, OmegaT vous présente le texte source segmenté en phrases ou en paragraphes. Ces segments sont à traduire
+               un par un. Dès que vous passez d'un segment à l'autre, sa traduction est enregistrée dans la mémoire de traduction. Une fois
+               tous les segments traduits (ou bien en cours de traduction, comme vous le souhaitez), <span class="application">OmegaT</span> utilise la mémoire de traduction pour créer les documents traduits dans le dossier « target » du projet.
+            </p>
+            <p>Une traduction dans OmegaT est organisée sous forme de « projet » de traduction. Pour chaque projet, OmegaT crée un ensemble
+               de dossiers qui sont utilisés pour stocker les documents à traduire ainsi que les glossaires et les mémoires de traduction
+               que vous souhaitez utiliser. OmegaT crée aussi un dossier « target » dans lequel il place les documents traduits qu'il génère.
+            </p>
+         </div>
+         <div class="section" title="2. Traduire avec OmegaT">
+            <div class="titlepage">
+               <div>
+                  <div>
+                     <h2 class="title" style="clear: both"><a name="d0e46"></a>2. Traduire avec <span class="application">OmegaT</span></h2>
+                  </div>
+               </div>
+            </div>
+            <div class="section" title="2.1. Créer et ouvrir un projet">
+               <div class="titlepage">
+                  <div>
+                     <div>
+                        <h3 class="title"><a name="create.and.open.new.project"></a>2.1. Créer et ouvrir un projet<a class="indexterm" name="d0e54"></a></h3>
+                     </div>
+                  </div>
+               </div>
+               <p>À partir du menu, choisissez <span class="guimenu">Projet</span> → <span class="guimenuitem">Nouveau...</span><a class="indexterm" name="d0e66"></a></p>
+               <p>Choisissez un emplacement et un nom pour le projet que vous souhaitez créer. Le nom choisi pour le projet sera aussi le nom
+                  du dossier qui contiendra tous les sous-dossiers du projet.
+               </p>
+               <p><span class="application">OmegaT</span> vous propose dans une fenêtre similaire à celle ci-dessous une liste de sous-dossiers que vous pouvez soit modifier, soit
+                  accepter comme telle.
+               </p>
+               <div class="figure"><a name="New.project.dialog.window"></a><p class="title"><b>Figure 1. <a class="indexterm" name="d0e79"></a>Fenêtre des paramètres du projet</b></p>
+                  <div class="figure-contents">
+                     <div class="mediaobject"><img src="images/NewProject.png" alt="ProjetFenêtre des paramètres du projet – imageFenêtre des paramètres du projet"></div>
+                  </div>
+               </div><br class="figure-break"><p>Vous pouvez accepter l'emplacement par défaut des sous-dossiers – toutefois, assurez-vous au préalable que les codes de langue
+                  du projet sont corrects. Sélectionnez les codes langue (2 lettres) ou les codes langue-et-région (2 + 2 lettres) appropriés
+                  en utilisant les listes déroulantes, ou saisissez-les au clavier (le code langue peut faire 2 ou 3 lettres). Mémorisez l'emplacement
+                  du sous-dossier « target Â» qui contiendra vos fichiers traduits. Si vous souhaitez qu'OmegaT utilise une segmentation par
+                  phrase plutôt que par paragraphe, n'hésitez pas à vérifier les règles de segmentation<a class="indexterm" name="d0e90"></a>.
+               </p>
+               <p>Une fois que vous avez cliqué sur « OK Â» pour confirmer les caractéristiques du projet, OmegaT vous propose de choisir les
+                  fichiers source à importer pour traduction. Vous pouvez importer un ou plusieurs fichiers via <em class="firstterm">Projet > Importer des fichiers source</em>, ou copier manuellement des fichiers, voire des dossiers entiers (avec éventuellement leurs sous-dossiers), dans le dossier
+                  « source Â» du projet en utilisant le gestionnaire de fichiers de votre système. Si vous avez fait une erreur, il vous suffit
+                  de retirer les documents concernés de ce même dossier « source Â».
+               </p>
+               <p>Pour inspecter la liste des fichiers à traduire, consultez la fenêtre <span class="bold"><strong>Fichiers du projet</strong></span> <a class="indexterm" name="d0e106"></a> (menu : <span class="guimenu">Projet</span> → <span class="guimenuitem">Fichiers du projet...</span>,<a class="indexterm" name="d0e118"></a> si elle ne s'ouvre pas automatiquement). Si le contenu du dossier « source Â» a dû être modifié, n'oubliez pas de recharger
+                  le projet (menu : <span class="guimenu">Projet</span> → <span class="guimenuitem">Recharger</span> (<span class="shortcut"><strong><span class="keycap"><strong>F5</strong></span></strong></span>)). <span class="application">OmegaT</span> vous propose de traduire en premier le fichier figurant en tête de liste. N'oubliez pas qu'<span class="application">OmegaT</span> ne peut traduire les fichiers aux formats ci-dessous que s'ils correspondent aux masques définis dans les filtres de fichiers.
+                  Tous les autres fichiers seront ignorés.<a class="indexterm" name="d0e139"></a></p>
+               <div class="itemizedlist">
+                  <ul class="itemizedlist" type="disc">
+                     <li class="listitem">
+                        <p><span class="bold"><strong>Formats de fichier texte brut<a class="indexterm" name="d0e149"></a></strong></span></p>
+                        <div class="itemizedlist">
+                           <ul class="itemizedlist" type="circle">
+                              <li class="listitem">
+                                 <p>ASCII (.txt, etc.)</p>
+                              </li>
+                              <li class="listitem">
+                                 <p>Unicode UTF-8 (.utf8)</p>
+                              </li>
+                           </ul>
+                        </div>
+                        <div class="itemizedlist">
+                           <ul class="itemizedlist" type="circle">
+                              <li class="listitem">
+                                 <p>Paquets de ressources Java (.properties)</p>
+                              </li>
+                           </ul>
+                        </div>
+                        <div class="itemizedlist">
+                           <ul class="itemizedlist" type="circle">
+                              <li class="listitem">
+                                 <p>PO (Portable Object) (.po)</p>
+                              </li>
+                           </ul>
+                        </div>
+                        <div class="itemizedlist">
+                           <ul class="itemizedlist" type="circle">
+                              <li class="listitem">
+                                 <p>INI (clé=valeur) (.ini)</p>
+                              </li>
+                           </ul>
+                        </div>
+                        <div class="itemizedlist">
+                           <ul class="itemizedlist" type="circle">
+                              <li class="listitem">
+                                 <p>DTD (.dtd)</p>
+                              </li>
+                              <li class="listitem">
+                                 <p>DocuWiki (.txt)</p>
+                              </li>
+                           </ul>
+                        </div>
+                     </li>
+                  </ul>
+               </div>
+               <div class="itemizedlist">
+                  <ul class="itemizedlist" type="disc">
+                     <li class="listitem">
+                        <p><span class="bold"><strong>Formats de fichier texte balisé<a class="indexterm" name="d0e185"></a></strong></span></p>
+                        <div class="itemizedlist">
+                           <ul class="itemizedlist" type="circle">
+                              <li class="listitem">
+                                 <p>OpenOffice.org / OpenDocument (.odt, .ott, .ods, .ots, .odp, .otp)</p>
+                              </li>
+                           </ul>
+                        </div>
+                        <div class="itemizedlist">
+                           <ul class="itemizedlist" type="circle">
+                              <li class="listitem">
+                                 <p>Microsoft Open XML (.docx, .xlsx, .pptx)</p>
+                              </li>
+                           </ul>
+                        </div>
+                        <div class="itemizedlist">
+                           <ul class="itemizedlist" type="circle">
+                              <li class="listitem">
+                                 <p>(X)HTML (.html, .xhtml,.xht)</p>
+                              </li>
+                           </ul>
+                        </div>
+                        <div class="itemizedlist">
+                           <ul class="itemizedlist" type="circle">
+                              <li class="listitem">
+                                 <p>HTML Help Compiler (.hhc, .hhk)</p>
+                              </li>
+                           </ul>
+                        </div>
+                        <div class="itemizedlist">
+                           <ul class="itemizedlist" type="circle">
+                              <li class="listitem">
+                                 <p>DocBook (.xml)</p>
+                              </li>
+                           </ul>
+                        </div>
+                        <div class="itemizedlist">
+                           <ul class="itemizedlist" type="circle">
+                              <li class="listitem">
+                                 <p>XLIFF monolingue (.xlf, .xliff, .sdlxliff)</p>
+                              </li>
+                           </ul>
+                        </div>
+                        <div class="itemizedlist">
+                           <ul class="itemizedlist" type="circle">
+                              <li class="listitem">
+                                 <p>CopyFlowGold pour QuarkXPress (.tag, .xtg)</p>
+                              </li>
+                           </ul>
+                        </div>
+                        <div class="itemizedlist">
+                           <ul class="itemizedlist" type="circle">
+                              <li class="listitem">
+                                 <p>Sous-titres SubRip (.srt)</p>
+                              </li>
+                           </ul>
+                        </div>
+                        <div class="itemizedlist">
+                           <ul class="itemizedlist" type="circle">
+                              <li class="listitem">
+                                 <p>ResX (.resx)</p>
+                              </li>
+                           </ul>
+                        </div>
+                        <div class="itemizedlist">
+                           <ul class="itemizedlist" type="circle">
+                              <li class="listitem">
+                                 <p>Ressource Android (.xml)</p>
+                              </li>
+                           </ul>
+                        </div>
+                        <div class="itemizedlist">
+                           <ul class="itemizedlist" type="circle">
+                              <li class="listitem">
+                                 <p>LaTeX (.tex, .latex)</p>
+                              </li>
+                              <li class="listitem">
+                                 <p>Help & Manual (.xml), (.hmxp)</p>
+                              </li>
+                              <li class="listitem">
+                                 <p>Typo3 LocManager (.xml)</p>
+                              </li>
+                           </ul>
+                        </div>
+                        <div class="itemizedlist">
+                           <ul class="itemizedlist" type="circle">
+                              <li class="listitem">
+                                 <p>WiX Localization (.wxl)</p>
+                              </li>
+                              <li class="listitem">
+                                 <p>Iceni Infix (.xml)</p>
+                              </li>
+                              <li class="listitem">
+                                 <p>Exportation Flash XML (.xml)</p>
+                              </li>
+                           </ul>
+                        </div>
+                     </li>
+                  </ul>
+               </div>
+               <p>Les fichiers texte balisé sont des fichiers qui, en plus du texte, contiennent des informations de formatage (mise en forme,
+                  structure) ; celles -ci sont visibles sous forme de « balises Â» dans OmegaT. Le formatage ne fait pas partie du contenu à
+                  traduire, toutefois ces balises doivent être reprises dans la traduction. Si des balises ont été supprimées ou déplacées,
+                  la mise en forme du texte traduit ne correspondra pas à ce qui était prévu et nécessitera donc des corrections – voir chapitre
+                  « Validation des balises Â» ci-dessous.
+               </p>
+            </div>
+            <div class="section" title="2.2. Traduction des segments un par un">
+               <div class="titlepage">
+                  <div>
+                     <div>
+                        <h3 class="title"><a name="translate.the.segments.one.by.one"></a>2.2. Traduction des segments un par un
+                        </h3>
+                     </div>
+                  </div>
+               </div>
+               <p>Une fois le projet et les fichiers à traduire définis, <span class="application">OmegaT</span> ouvre le premier fichier source dans le volet d'édition.
+               </p>
+               <p>Le segment actif est surligné en vert et une copie du texte est affichée en dessous, dans la « ligne d'édition Â». Les zones
+                  extérieures à cette ligne d'édition sont protégées et ne peuvent pas être modifiées. Vous devez remplacer le texte source
+                  par votre traduction et taper votre texte avant la balise <code class="literal"><segment 0001></code>. OmegaT peut être paramétré pour copier automatiquement le texte source dans le texte cible (voir<span class="emphasis"><em> Options > Ligne d'édition...</em></span>), une fonction pouvant s'avérer pratique dans les situations où le texte source doit être conservé dans la traduction. Ces
+                  opérations remplacent le texte dans la ligne d'édition par la traduction. Appuyez sur la touche <span class="bold"><strong>« Entrée Â»</strong></span> pour passer au segment suivant. Remarques :
+               </p>
+               <div class="itemizedlist">
+                  <ul class="itemizedlist" type="disc">
+                     <li class="listitem">
+                        <p>Pour vous déplacer à un autre endroit du texte, double-cliquez sur la phrase ou le paragraphe que vous souhaitez ouvrir.</p>
+                     </li>
+                     <li class="listitem">
+                        <p>Si vous préférez qu'OmegaT n'insère pas automatiquement le contenu non-traduit dans la ligne d'édition, modifiez cette option
+                           via <span class="guimenu">Options</span> → <span class="guimenuitem">Ligne d'édition...<a class="indexterm" name="d0e283"></a></span></p>
+                     </li>
+                     <li class="listitem">
+                        <p>Vous pouvez modifier la configuration du volet d'édition (par exemple pour afficher ou non le texte source, pour mettre en
+                           évidence le texte traduit, etc.) dans l'entrée Affichage du menu principal.
+                        </p>
+                        <p>Lorsque vous appuyez sur <span class="bold"><strong>« Entrée Â»</strong></span>, plusieurs choses se passent : <span class="application">OmegaT</span> ajoute la paire de segments (le segment source et sa traduction) à la mémoire de traduction interne et traduit également
+                           automatiquement tous les autres segments identiques trouvés dans le projet. En outre, il va chercher dans les mémoires de
+                           traduction et les glossaires les correspondances avec le segment suivant.
+                        </p>
+                     </li>
+                  </ul>
+               </div>
+            </div>
+            <div class="section" title="2.3. Utilisation des correspondances des mémoires de traduction, des glossaires et des dictionnaires">
+               <div class="titlepage">
+                  <div>
+                     <div>
+                        <h3 class="title"><a name="use.matches.in.TMs.dictionaries.and.glossaries"></a>2.3. Utilisation des correspondances des mémoires de traduction, des glossaires et des dictionnaires
+                        </h3>
+                     </div>
+                  </div>
+               </div>
+               <div class="section" title="2.3.1. Correspondances des mémoires de traduction">
+                  <div class="titlepage">
+                     <div>
+                        <div>
+                           <h4 class="title"><a name="translation.memory.matches"></a>2.3.1. Correspondances des mémoires de traduction<a class="indexterm" name="d0e305"></a><a class="indexterm" name="d0e310"></a></h4>
+                        </div>
+                     </div>
+                  </div>
+                  <div class="figure"><a name="d0e315"></a><p class="title"><b>Figure 2. Volet des correspondances</b></p>
+                     <div class="figure-contents">
+                        <div class="mediaobject"><img src="images/MatchesPane.png" alt="Volet des correspondances"></div>
+                     </div>
+                  </div><br class="figure-break"><p><span class="application">OmegaT</span> analyse les mémoires de traduction et affiche les correspondances (supérieures à 30 %) pour le segment à traduire dans le
+                     volet Correspondances.  La première correspondance affichée est présélectionnée.
+                  </p>
+                  <div class="itemizedlist">
+                     <ul class="itemizedlist" type="disc">
+                        <li class="listitem">
+                           <p>Appuyez sur <span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>I</strong></span><a class="indexterm" name="d0e336"></a> pour insérer la correspondance présélectionnée à la position du curseur.
+                           </p>
+                        </li>
+                        <li class="listitem">
+                           <p>Appuyez sur <span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>R</strong></span><a class="indexterm" name="d0e350"></a><a class="indexterm" name="d0e355"></a> pour remplacer le contenu de la ligne d'édition par la correspondance présélectionnée.
+                           </p>
+                        </li>
+                     </ul>
+                  </div>
+                  <p>Si plusieurs correspondances sont présentes et que vous souhaitez utiliser une autre correspondance que celle qui est sélectionnée
+                     :
+                  </p>
+                  <div class="itemizedlist">
+                     <ul class="itemizedlist" type="disc">
+                        <li class="listitem">
+                           <p>Servez-vous des raccourcis <span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>2</strong></span> pour sélectionner la deuxième correspondance de la liste, <span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>3</strong></span> pour la troisième, etc.
+                           </p>
+                        </li>
+                        <li class="listitem">
+                           <p>Utilisez ensuite les raccourcis <span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>I</strong></span> ou <span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>R</strong></span> comme décrit ci-dessus.
+                           </p>
+                        </li>
+                     </ul>
+                  </div>
+                  <p>Il est possible de demander à OmegaT d'insérer automatiquement dans la ligne d'édition la meilleure correspondance au-delà
+                     d'un seuil que vous déterminez. Cette option est accessible via le menu <span class="guimenu">Options</span>.
+                  </p>
+               </div>
+               <div class="section" title="2.3.2. Correspondances des glossaires et des dictionnaires">
+                  <div class="titlepage">
+                     <div>
+                        <div>
+                           <h4 class="title"><a name="glossary.and.dictionary.matches"></a>2.3.2. Correspondances des glossaires et des dictionnaires<a class="indexterm" name="d0e401"></a></h4>
+                        </div>
+                     </div>
+                  </div>
+                  <p>Les volets Glossaires et Dictionnaires affichent pour référence les correspondances trouvées dans les glossaires et les dictionnaires
+                     du projet.
+                  </p>
+               </div>
+               <div class="section" title="2.3.3. Utilisation des recherches">
+                  <div class="titlepage">
+                     <div>
+                        <div>
+                           <h4 class="title"><a name="use.searches"></a>2.3.3. Utilisation des recherches
+                           </h4>
+                        </div>
+                     </div>
+                  </div>
+                  <p><span class="application">OmegaT</span> vous donne accès à de puissantes fonctions de recherche. Ouvrez la fenêtre de recherche avec <span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>F</strong></span>, et entrez le mot ou l'expression que vous souhaitez rechercher dans le champ « Rechercher Â». Vous pouvez également sélectionner
+                     un mot ou une phrase n'importe où dans le volet d'édition et appuyer sur <span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>F</strong></span> : le contenu de la sélection est automatiquement inséré dans le champ « Rechercher Â» de la fenêtre qui s'ouvre. 
+                  </p>
+               </div>
+               <div class="section" title="2.3.4. Utilisation des services de traduction automatique">
+                  <div class="titlepage">
+                     <div>
+                        <div>
+                           <h4 class="title"><a name="use.Google.Translate"></a>2.3.4. Utilisation des services de traduction automatique<a class="indexterm" name="d0e430"></a></h4>
+                        </div>
+                     </div>
+                  </div>
+                  <p>Vous obtiendrez automatiquement une suggestion de traduction pour le segment actuel dans le volet Traduction automatique à
+                     condition d'avoir activé l'un des services (voir <span class="emphasis"><em>Options > Traduction automatique</em></span>).  Appuyez sur <span class="emphasis"><em>Ctrl+M</em></span> pour remplacer le contenu de la ligne d'édition par la traduction suggérée.
+                  </p>
+               </div>
+            </div>
+            <div class="section" title="2.4. Création des documents traduits">
+               <div class="titlepage">
+                  <div>
+                     <div>
+                        <h3 class="title"><a name="create.translated.documents"></a>2.4. Création des documents traduits<a class="indexterm" name="d0e446"></a></h3>
+                     </div>
+                  </div>
+               </div>
+               <p>Une fois tous les segments traduits (ou bien en cours de traduction, comme vous le souhaitez), <span class="application">OmegaT</span> utilise la mémoire de traduction pour créer les documents traduits dans le dossier « target Â». Pour ce faire, sélectionnez
+                  <span class="guimenu">Projet</span> → <span class="guimenuitem">Créer les documents traduits</span> (<span class="shortcut"><strong><span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>D</strong></span></strong></span>)<a class="indexterm" name="d0e467"></a> <a class="indexterm" name="d0e473"></a>à partir du menu. Quel que soit l'état d'avancement de la traduction, <span class="application">OmegaT</span> crée les versions traduites des fichiers du dossier « source Â» du projet. Les fichiers traduits (entièrement ou partiellement)
+                  sont sauvegardés dans le dossier « target Â» spécifié dans les propriétés du projet. Pour finaliser la traduction, ouvrez les
+                  fichiers cible dans l'application qui leur est associée (navigateur, traitement de texte...) pour vérifier le contenu de la
+                  traduction ainsi que son formatage. Vous pouvez revenir à <span class="application">OmegaT</span> pour y faire les corrections nécessaires sans oublier de recréer les documents traduits pour tenir compte de ces modifications.
+               </p>
+            </div>
+         </div>
+         <div class="section" title="3. Gestion des textes balisés">
+            <div class="titlepage">
+               <div>
+                  <div>
+                     <h2 class="title" style="clear: both"><a name="how.to.handle.tagged.text"></a>3. Gestion des textes balisés<a class="indexterm" name="d0e488"></a></h2>
+                  </div>
+               </div>
+            </div>
+            <p><span class="application">OmegaT</span> conserve le formatage des documents originaux (caractères gras, italiques...) en utilisant des balises spéciales. Les balises
+               d'<span class="application">OmegaT</span> sont composées d'une ou plusieurs lettres, suivies d'un ou plusieurs chiffres et utilisent le caractère « / Â» pour la fermeture
+               (par exemple : <f0>, </f0>, <br>, </s2>). Ces balises doivent être manipulées avec précaution et vous devez veiller à les
+               insérer correctement dans le segment traduit de la ligne d'édition (voir Validation des balises).
+            </p>
+            <div class="section" title="3.1. Exemple">
+               <div class="titlepage">
+                  <div>
+                     <div>
+                        <h3 class="title"><a name="d0e498"></a>3.1. Exemple<a class="indexterm" name="d0e501"></a></h3>
+                     </div>
+                  </div>
+               </div>
+               <p>Cet exemple présente les balises mises en évidence pour les distinguer clairement du texte. Cela ne sera pas le cas dans OmegaT.
+                  Les balises HTML (en bleu) sont ignorées par <span class="application">OmegaT</span> parce qu'elles encadrent complètement le segment. Les balises en vert doivent être gérées par <span class="application">OmegaT</span> parce qu'elles se trouvent à l'intérieur du segment. Exemple de segment de fichier HTML :
+               </p>
+               <p><code class="literal"><p>Une autre police d'affichage peut être sélectionnée dans la boîte de dialogue <b>Police d'affichage</b>. Ouvrez-la via
+                     l'entrée de menu <i>Options</i> → <i>Police...</i> Le type et la taille de police peuvent être modifiés dans la boîte de dialogue.</p></code></p>
+               <p>Voici comment <span class="application">OmegaT</span> affiche ce segment, avec la traduction en afrikaans :
+               </p>
+               <div class="figure"><a name="fig.tagged.segment.source"></a><p class="title"><b>Figure 3. Segment HTML source <a class="indexterm" name="d0e525"></a></b></p>
+                  <div class="figure-contents">
+                     <div class="mediaobject"><img src="images/tagged_segment.png" alt="Segment HTML source Segment, source et cible – image"></div>
+                  </div>
+               </div><br class="figure-break"><p>Le texte HTML du document traduit créé par <span class="application">OmegaT</span> sera comme ceci :
+               </p>
+               <div class="figure"><a name="fig.tagged.segment.target"></a><p class="title"><b>Figure 4. Segment HTML cible</b></p>
+                  <div class="figure-contents">
+                     <div class="mediaobject"><img src="images/tagged_segment_target.png" alt="Segment HTML cible"></div>
+                  </div>
+               </div><br class="figure-break"></div>
+            <div class="section" title="3.2. Validation des balises">
+               <div class="titlepage">
+                  <div>
+                     <div>
+                        <h3 class="title"><a name="tag.verification"></a>3.2. Validation des balises<a class="indexterm" name="d0e549"></a><a class="indexterm" name="d0e554"></a></h3>
+                     </div>
+                  </div>
+               </div>
+               <p><span class="application">OmegaT</span> ne détecte pas automatiquement les erreurs de balises dans un fichier traduit. Avant de livrer les documents traduits, pensez
+                  à vérifier que ceux-ci ne contiennent pas d'erreurs de balises. Pour ceci, sélectionnez <span class="guimenu">Outils</span> → <span class="guimenuitem">Valider les balises</span> (<span class="shortcut"><strong><span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>T</strong></span></strong></span>) à partir du menu. Vous obtenez une table contenant les segments où les balises source ne correspondent pas aux balises cible.
+                  Cliquez sur le numéro du segment. OmegaT vous renvoie automatiquement au segment en question dans le volet d'édition pour
+                  vous permettre de corriger les balises. Après avoir effectué les corrections, appuyez de nouveau sur <span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>T<a class="indexterm" name="d0e578"></a></strong></span> pour une dernière vérification. Notez que le vérificateur de balises pourra indiquer une erreur dans les cas où les balises,
+                  certes correctement présentes dans la traduction, auront dû être déplacées pour des raisons grammaticales ou syntaxiques.
+                  Il s'agit ici d'une simple mesure de précaution.
+               </p>
+               <p>Des erreurs de balises peuvent empêcher que l'ouverture du fichier. Ceci ne signifie en aucun cas que votre travail est perdu
+                  ou que le projet est endommagé – il est simplement recommandé de s'assurer que les erreurs de balises sont corrigées avant
+                  de créer les fichiers traduits. Enfin, il est conseillé d'ouvrir le document traduit dans l'application associée pour en vérifier
+                  la mise en forme.
+               </p>
+            </div>
+         </div>
+      </div>
+   </body>
+</html>
\ No newline at end of file
diff --git a/docs/fr/omegat.css b/docs/fr/omegat.css
index acd59a1..1893c29 100644
--- a/docs/fr/omegat.css
+++ b/docs/fr/omegat.css
@@ -32,9 +32,9 @@ code, .code {
 }
 
 .note {
-	font-size: x-small;
-	color: red;
-	background: yellow;
+	font-size: small;
+	color: black;
+	background: silver;
 }
 
 .warning {
diff --git a/docs/hu/OmegaT.css b/docs/hu/OmegaT.css
index dde4bb2..1893c29 100644
--- a/docs/hu/OmegaT.css
+++ b/docs/hu/OmegaT.css
@@ -1,46 +1,78 @@
-table, h1, h2, h3, h4 
-    {
-    color: #036;
-    font-family: sans-serif;
-    }
-
-h1
-    {
-    font-size: 18;
-    }
-h2
-    {
-    font-size: 16;
-    }
-    
-h3
-    {
-    font-size: 14;
-    }
-h4
-    {
-    font-size: 13;
-    }
-
-p, dd, dt, li, body
-    {
-    margin: 5px 5px 5px 5px;
-    padding: 0px;
-    color: #000;
-    font-family: serif;
-    }
-    
-table
-    {
-    color: #000;
-    font-family: serif;
-    border: 0;
-    }
-    
-code
-    {
-    color: #000;
-    font-family: Courier New;
-    font-size: 12;
-    border: 0;
-    }
\ No newline at end of file
+body {
+	font-family: sans-serif;
+	margin: 1em;
+}
+
+h1, h2, table, dt {
+	color: navy;
+}
+
+h3, h4, ul a {
+	color: green;
+}
+
+code, .code {
+	color: black;
+	background: #ffffcc;
+	border-style: solid;
+	border-width: 1px;
+	border-color: #ffff66;
+	vertical-align: top;
+}
+
+.new {
+	font-size: x-small;
+	color: red;
+	background: yellow;
+}
+
+.updated {
+	font-size: x-small;
+	color: orange;
+}
+
+.note {
+	font-size: small;
+	color: black;
+	background: silver;
+}
+
+.warning {
+	color: red;
+	background: yellow;
+}
+
+.chapter {
+	color: black;
+}
+
+.navbar-top, .navbar-bottom {
+	margin-top: 1em;
+	margin-bottom: 1em;
+}
+
+.rel-p {
+	width: 9%;
+	align: left;
+	valign: center;
+	font-weight: bold;
+}
+
+.rel-n {
+	width: 6%;
+	align: left;
+	valign: center;
+	font-weight: bold;
+} 
+
+.nav-link {
+	width: 39%;
+	align: left;
+	valign: center;
+}
+
+.toc-link {
+	 width: 7%;
+	 align: left;
+	 valign: center;
+}
\ No newline at end of file
diff --git a/docs/hu/instantStartGuideNoTOC.html b/docs/hu/instantStartGuideNoTOC.html
index 289f06a..55b0e7e 100644
--- a/docs/hu/instantStartGuideNoTOC.html
+++ b/docs/hu/instantStartGuideNoTOC.html
@@ -1,176 +1,446 @@
 <html>
-<head>
-  <link rel="stylesheet" href="./OmegaT.css " type="text/css">
-  <meta http-equiv="content-type" content="text/html; charset=UTF-8">
-
-  <title>Útmutató az azonnali kezdéshez - OmegaT 2.0 felhasználói kézikönyv</title>
-</head>
-
-<body>
-  <h2>Vegye használatba az OmegaT-t 5 percen belül!<br> - Útmutató az azonnali kezdéshez</h2>
-
-  <p>Ez az azonnali kezdéshez való útmutató csak a legelemibb ismereteket tárgyalja. Minden felhasználónak elolvasásra ajánljuk, mert megtudhatja belőle mindazt, amit az OmegaT az ő számára tartogat. Az itt leírt gyorsbillentyűket a "ctrl+billentyű" kombinációval, Mac esetén a "cmd+billentyű" kombinációval használhatja. A "cmd" billentyű az "alma"-jel az Apple klaviatúráján.</p>
-  <hr>
-  <a name="summary" id="summary"></a>
-
-  <h2>Az OmegaT működéséről - röviden</h2>
-
-  <p>Az OmegaT képernyője három ablakra van felosztva. Ezek mindegyikét átméretezheti az egérrel. Balra található a szerkesztő, ahol begépeli a fordítást. Jobbra fent látható a Bizonytalan egyezések ablak, ahol a fordítási memóriában fellelt egyezések jelennek meg. Ez alatt található a Szójegyzék ablak, benne pedig a szójegyzékben fellelt egyezések.</p>
-
-  <p>A szerkesztőablakban az OmegaT a forrásszöveget jeleníti meg mondatokra (vagy bekezdésekre)  'darabolva'. Ezeket a szövegrészeket fogja egyiket a másik után fordítani. Ahogyan halad a szöveggel, fordításait a fordítási memória megjegyzi. Ha minden szövegrészt lefordított (vagy ha úgy kívánja, még ezt megelőzően) az OmegaT a fordítási memória segítségével a “target” [célnyelvi] mappában előállítja a lefordított dokumentumo(ka)t.</p>
-
-  <p>Az OmegaT a fordítási feladatot ún. fordítási projektbe szervezi. A program minden projekthez létrehoz egy sor mappát. Ezekben tárolja a lefordítandó forrásszövegeket, az esetleg használni kívánt szójegyzékeket és fordítási memóriákat. Az OmegaT létrehoz egy “target” [célnyelvi] mappát is, amelybe a végleges lefordított dokumentumok kerülnek.</p>
-  <hr>
-  <a name="translate" id="translate"></a>
-
-  <h2>Hogyan fordíthat az OmegaT-vel</h2><a name="create" id="create"></a>
-
-  <h3>Új projekt létrehozása és megnyitása</h3>
-
-  <p>A menüből válassza ki a <strong>Projekt → Új</strong> pontot.</p>
-
-  <p>Térjen át arra a mappára, amelybe a projekt állományait menteni kívánja, majd adjon meg egy nevet a fordítási projektnek. A projekt fő mappája ezt a nevet fogja használni: minden projektfájl ebbe a mappába vagy annak almappáiba kerül majd.</p>
-
-  <p>Az OmegaT a létrehozandó projektmappák megerősítésére vagy módosítására az alábbi párbeszédablakot használja:</p>
-
-  <p align="center"><img src="images/NewProject.png" name="graphics1" alt=
-  "Projektbeállítások ablaka" id="graphics1" align="bottom" border="0"></p>
-
-  <p>Elfogadhatja az almappák felkínált helyét, de előtte ellenőrizze, hogy a forrásnyelvi és a célnyelvi kódok helyesek-e. A lenyíló listából válassza ki a nyelvi kódot (2 betűs) vagy a nyelvi- és régiókódot (2 + 2 betűs), vagy írja be őket (a a nyelvi kód 2 vagy 3 betűs lehet). Jegyezze meg a 'target' almappa helyét (ahová a lefordított szövegek kerülnek majd). Ha "bekezdésenkénti" szövegdarabolás helyett mondatonkéntit szeretne használni, ellenőrizze a szövegdarabolási szabályokat.</p>
-
-  <p>Amikor a projekt beállításait a Rendben gombra kattintva jóváhagyja, az OmegaT felszólítja az importálandó forrásdokumentumok kiválasztására. Importálhat egyetlen állományt, de importálhat akár egész könyvtárakat (az alkönyvtáraikban lévő összes állománnyal együtt). Ha véletlenül rossz vagy túl sok dokumentumot importált, törölje őket a projekt 'source' [forrásnyelvi] mappájából (pl. egy fájlkezelővel).</p>
-
-  <p>A fordítandó állományok ellenőrzéséhez térjen át a <strong>Projektállományok</strong> ablakra (Menü: <strong>Projekt → Projektállományok...</strong>, ha a mappa nem nyílik ki automatikusan). Ha módosította a 'source' forrásmappa tartalmát, előbb ne feledje újból betölteni a projektet (Menü: <strong>Projekt → Újratöltés</strong>). Az OmegaT alaphelyzetben a projektben felsorolt állományok közül az elsőt nyitja meg. Az OmegaT csak az alábbi formátumú állományok fordítását támogatja, ha azok megfelelnek az állományszűrők között megadott mintáknak. Minden egyéb állományt figyelmen kívül hagy.</p>
-
-  <ul>
-    <li>OpenDocument/OpenOffice.org</li>
-
-    <li>Egyszerű szöveg</li>
-
-    <li>.po</li>
-
-    <li>Bundle.properties Java</li>
-
-    <li>XHTML, HTML</li>
-
-    <li>HTML Help Compiler állományok</li>
-
-    <li>INI ('kulcs=érték' forma)</li>
-
-    <li>DocBook</li>
-
-    <li>Microsoft Open XML</li>
-
-    <li>Okapi egynyelvű XLIFF</li>
-
-    <li>QuarkXPress CopyFlowGold</li>
-
-    <li>Feliratok (SRT)</li>
-
-    <li>ResX</li>
-
-    <li>Android forrásfájlok</li>
-
-    <li>LaTeX</li>
-  </ul><a name="segments" id="segments"></a>
-
-  <h3>Szövegrészek fordítása egyesével</h3>
-
-  <p>Ha meghatározta a projektet és a fordítandó állományokat, az OmegaT a szerkesztőben megnyitja az első forrásszöveget. Az első szövegegység zöld színnel kiemelve látható; alatta a célnyelvi mezőben megismétlődik a forrásszöveg. (Ekkor a célnyelvi mezőn kívüli összes szöveg zárolva van és nem módosítható.) A <code><0001. egység></code> és az <code><egység vége></code> címkék közé kell beírnia a fordítást a forrásszöveg felülírásával. A következő szövegegységre az "<strong>ENTER</strong>" lenyomásával térhet át. Megjegyzés:</p>
-
-  <ul>
-    <li>Bármely, akár feljebb, akár lejjebb lévő szövegrészre áttérhet, ha kétszer rákattint a megnyitni kívánt mondatra vagy bekezdésre.</li>
-
-    <li>Ha inkább üres célnyelvi mezőbe szeretné beírni a fordítást, módosítsa ennek megfelelően a <strong>Beállítások → Szerkesztési mód...</strong> beállítását.</li>
-
-    <li>
-      <p>A főmenü <span style="font-weight: bold;">Nézet</span> menüpontjából módosíthatja a szerkesztőablak beállításait (pl. azt, hogy látsszon-e a forrásnyelvi szöveg, hogyan jelenjen meg a lefordított szöveg stb.).</p>
-    </li>
-  </ul>
-
-  <p>Az "<strong>ENTER</strong>" megnyomásakor több dolog történik a háttérben: az OmegaT a szövegegységpárt (a forrást és annak fordítását) hozzáadja a fordítási memóriához és automatikusan lefordítja az összes ezzel egyező, de más projektfájlokban fellelt szöveget. Ezen túl végignézi a fordítási memóriát és a szójegyzéket, nincs-e bennük egyezés a következő lefordítatlan szövegegységgel.</p><a name="tm" id="tm"></a>
-
-  <h3>A fordítási memória, a szójegyzékek és a szótárak egyezéseinek felhasználása</h3><a name="tm_matches" id="tm_matches"></a>
-
-  <h3>Egyezések a fordítási memóriában</h3>
-
-  <p>Ha az OmegaT a fordítási memóriában  a következő szövegegységhez bizonytalan (30% vagy azt meghaladó mértékű) egyezést talál, akkor megjeleníti azokat a Bizonytalan egyezések ablakban. Alaphelyzetben a Bizonytalan egyezések ablakból az első egyezést választja ki.</p><img src=
-  "images/MatchesPane.png" name="graphics4" alt="Egyezések panel" id="graphics4"
-  style="border: 0px solid ;"><br clear="left">
-
-  <p><br></p>
-
-  <p>Ha egy egyezést a célnyelvi mezőbe kíván beszúrni, használhatja az alábbi gyorsbillentyűket:</p>
-
-  <ul>
-    <li>A <code>Ctrl+I</code> lenyomásával a kiválasztott egyezést beszúrja a kurzor helyére, illetve...</li>
-
-    <li>A <code>Ctrl+R</code> lenyomásával a kiválasztott egyezéssel felülírja a teljes szövegdarabot.</li>
-  </ul>
-
-  <p>Ha több egyezés is szerepel és Ön nem az előre kiválasztottat kívánja használni:</p>
-
-  <ul>
-    <li>Válassza ki a kívánt egyezést az Egyezések ablakból: <code>Ctrl+2</code> a második egyezés, <code>Ctrl+3</code> a harmadik egyezés kiválasztásához stb.</li>
-
-    <li>Ezután használhatja a <code>Ctrl+I</code> vagy a <code>Ctrl+R</code> gyorsbillentyűket a fent leírtak szerint.</li>
-  </ul>
-
-  <p>(Arra is utasíthatja az OmegaT-t, hogy bármely megadott százalék fölötti egyezést automatikusan szúrjon be a célnyelvi mezőbe, ha a szövegdarab megnyílik. Ezt a lehetőséget a <strong>Beállítások → Szerkesztési mód... pontban állíthatja be.</strong>)</p><a name="gloss_matches" id="gloss_matches"></a>
-
-  <h3>A szójegyzékek és a szótárak egyezései</h3>
-
-  <p>Tájékozódás céljából a projektbe felvett szójegyzékekben és szótárakban fellelhető egyezéseket a Szójegyzék és a Szótár panel jeleníti meg.</p><a name="searches" id="searches"></a>
-
-  <h3>Keresések</h3>
-
-  <p>Az OmegaT kiterjedt keresési lehetőségeket biztosít. A Keresés ablakot hívja elő a <code>Ctrl+F</code>-fel és a "Keresendő" mezőbe írja be a megkeresendő szót vagy kifejezést. Másik megoldásként jelölje ki a szerkesztőpanelen a keresendő szót vagy kifejezést, majd használja a <code>Ctrl+F</code> billentyűkombinációt. A kijelölt szó vagy kifejezés ekkor automatikusan belekerül a "Keresendő" mezőbe.</p>
-
-  <h3>A Google Translate használata</h3>
-
-  <p>A Google Translate ablakban automatikusan megjelenik egy fordítási javaslat az aktuális szövegegységre vonatkozóan. Nyomja le a <code>Ctrl+M</code> billentyűkombinációt, melynek eredményeként a fordítás bekerül a célnyelvi szövegegységbe.<br></p>
-
-  <p><a name="create_trans" id="create_trans"></a></p>
-
-  <h3>Lefordított állományok előállítása</h3>
-
-  <p>Ha minden szövegrészt lefordított (vagy akár már előtte), az  OmegaT frissíti a céldokumentumo(ka)t a fordítási memóriában tárolt fordítások alapján. Ehhez a menüsorról válassza ki a <strong>Projekt → Lefordított állományok előállítása</strong> pontot. Az OmegaT előállítja a projekt forrásmappájában lévő összes állomány fordítását, akár teljesen elkészültek, akár nem. A teljesen vagy részben kész állományokat a projekt célmappájába (target) menti. A fordítás befejezéséhez nyissa meg a célnyelvi szövegeket a velük használatos alkalmazásban (böngészőben, szövegszerkesztőben...), majd ellenőrizze a fordítás tartalmát és szerkesztését. Ezután visszatérhet az OmegaT-hez és elvégezheti a szükséges javításokat; ne feledkezzen el a lefordított szövegek végleges előállításáról.</p>
-  <hr>
-  <a name="tags" id="tags"></a>
-
-  <h2>Címkékkel tagolt szöveg kezelése</h2>
-
-  <p>Az OmegaT speciális jelölők használatával gondoskodik arról, hogy a forrásszövegek formázása (vastag, dőlt stb.) megőrződjék. Az OmegaT címkéi egy vagy több betűből és egy vagy több azt követő számjegyből, esetenként a "/" karakterből állnak (például: <f0>,  </f0> <br>, </s2>). Ezekre ügyelnie kell és a megfelelő helyre kell őket a célnyelvi szövegbe beszúrnia (lásd a <em>Címkeműveletek</em>) c. részt.</p><a name="example" id="example"></a>
-
-  <h3>Egy példa...</h3>
-
-  <p>Ezekben a példákban a címkék ki vannak emelve a könnyebbség kedvéért, az OmegaT-ben ezek nem kiemelten jelennek meg. A <font color="blue">kék</font> HTML-címkéket az OmegaT figyelmen kívül hagyja, mivel ezek teljesen körbeveszik az adott egységet.  Az alább <font color=
-  "green">zöld </font> színnel kiemelt címkéket az OmegaT-nek kezelnie kell, mert azok az egységen belül helyezkednek el. Íme egy példa egy HTML-állományban szereplő címkére:</p>
-
-  <p><code><font color="blue"><p></font>Egy másik megjelenítési betűtípust választhat a <font color="green"><b></font>Betű...<font color=
-  "green"></b></font>  párbeszédablakból. Megnyitása a <font color=
-  "green"><i></font>Beállítások <font color="green"></i></font> → <font color="green"><i></font>Betű...<font color=
-  "green"></i></font> menüpontból lehetséges. A párbeszédablakban beállíthatja a betű típusát és méretét.<font color="blue"></p></font></code></p>
-
-  <p>Ezt az OmegaT az alábbi módon jeleníti meg afrikaans fordítás esetén:</p><br>
-
-  <p><img src="images/tagged_segment.png" alt="" border="0"></p><br>
-
-  <p>Amikor az OmegaT előállította a fordítást, a HTML ekként néz ki:</p>
-
-  <p><img src="images/tagged_segment_target.png" alt="" border="0"></p><a name=
-  "tag_verif" id="tag_verif"></a>
-
-  <h3>Címkék utóellenőrzése</h3>
-
-  <p>Az OmegaT nem ellenőrzi automatikusan a lefordított dokumentumban lévő hibás címkéket. A szöveg leadása előtt Önnek kell ellenőriznie a címkék helyességét.</p>
-
-  <p>Válassza a menüből az <strong>Eszközök→ Jelölő-ellenőrzés </strong>  pontot. Ekkor egy táblázat jelenik meg, amelyben látható, hol nem egyeznek a forrásnyelvi és célnyelvi címkék. Kattintson a szövegegység számára. Ennek hatására automatikusan a szerkesztőben a hibás szövegegységhez kerül, ahol kijavíthatja a hibás címkét. A kijavított egység ellenőrzéséhez nyomja meg az <code>Enter</code> gombot, majd a <code>Control-T</code> megnyomásával ellenőrizze ismét.</p>
-
-  <p>Egyes esetekben címkehiba miatt nem lehet a dokumentumot megnyitni. Ezért mindig javítsa ki a hibás címkéket, mielőtt előállítja a lefordított állományokat. Végezetül nyissa meg a böngészőben vagy a szerkesztőben a lefordított szöveget és ellenőrizze a végső formázást.</p>
-
-  <p>Egyes programozási nyelvekben (pl. PHP, C) speciális címkéket használnak helyőrzőként a printf függvénnyel kombinálva. Ha bekapcsolja ezt a funkciót, az OmegaT felderíti és ellenőrzi a címkéket. A menüből válassza ki a <strong>Beállítások→ Címkeellenőrzés...</strong> pontot. Választhat egyszerű és átfogó ellenőrzés közül. Egyszerű ellenőrzés esetén a rendszer a lehetséges helyőrzők értékeinek csak az egyszerűbb  változatait használja. Ez akkor jön kapóra, amikor a forráskódban nincsenek bonyolultabb helyőrzők, az eredményben pedig sok a téves találat.</p>
-
-  <hr>
-</body>
-</html>
+   <head>
+      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+   
+      <title>Útmutató az azonnali kezdéshez</title>
+      <link rel="stylesheet" href="OmegaT.css" type="text/css">
+      <meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+   </head>
+   <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+      <div class="chapter" title="Útmutató az azonnali kezdéshez">
+         <div class="titlepage">
+            <div>
+               <div>
+                  <h2 class="title"><a name="chapter.instant.start.guide"></a>Útmutató az azonnali kezdéshez
+                  </h2>
+               </div>
+            </div>
+         </div>
+         <div class="section" title="1. Vegye használatba az OmegaT-t 5 percen belül!">
+            <div class="titlepage">
+               <div>
+                  <div>
+                     <h2 class="title" style="clear: both"><a name="d0e4"></a>1. Vegye használatba az <span class="application">OmegaT</span>-t 5 percen belül!
+                     </h2>
+                  </div>
+               </div>
+            </div>
+            <p>Ez az azonnali kezdéshez való útmutató csak az OmegaT alapjait ismerteti. Ideális esetben a felhasználóknak ajánlatos alaposan
+               megismerkedni a felhasználói kézikönyvvel, mert megtudhatják belőle mindazt, amit az <span class="application">OmegaT</span> számukra tartogat. Megjegyzés Mac-felhasználóknak: az itt leírt gyorsbillentyűk a "<span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>billentyű</strong></span>" kombinációval érhetők el, Mac esetén viszont a "<span class="keycap"><strong>Cmd</strong></span>+<span class="keycap"><strong>billentyű</strong></span>" használandó. A "<span class="keycap"><strong>Cmd</strong></span>" billentyűn az Apple billentyűzetén a "command" felirat vagy az "alma"-jel látható.
+            </p>
+            <p>Az <span class="application">OmegaT</span> képernyőjén megjelenő munkaterület öt ablakra van felosztva<a class="indexterm" name="d0e35"></a>. Ezek mindegyikét átméretezheti az egérrel. Balra található a szerkesztő, ahol begépeli a fordítást. Jobbra fent látható
+               a Bizonytalan egyezések ablak, ahol a fordítási memóriában fellelt részleges egyezések jelennek meg. Ez alatt található a
+               Szójegyzék ablak, benne pedig a szójegyzékben fellelt egyezések. Az ablak alján látható két gombbal a Szótár és a Gépi fordítás
+               ablak érhető el. (Megjegyzés: az ablakokat természetesen tetszése szerint átszabhatja. A fenti leírás az OmegaT telepítés
+               utáni megjelenésére vonatkozik).
+            </p>
+            <p>A Szerkesztő ablakban az OmegaT a forrásszöveget jeleníti meg mondatokra (vagy bekezdésekre)  'darabolva'.. Ezeket a szövegrészeket
+               fogja egymás után lefordítani. A szövegben előrehaladva a lefordított részek automatikusan egy fordítási memóriába kerülnek.
+               Ha minden szövegegységet lefordított (vagy ha úgy kívánja, akár munka közben) az <span class="application">OmegaT</span>  a fordítási memória segítségével a “target” [célnyelvi] mappában előállítja a lefordított dokumentumo(ka)t.
+            </p>
+            <p>Az OmegaT a fordításokat fordítási "projektekben" tárolja. Az OmegaT minden egyes projekthez létrehoz egy sor mappát és ezekben
+               tárolja a lefordítandó forrásszövegeket, valamint az esetleg használni kívánt szójegyzékeket és fordítási memóriákat. Az OmegaT
+               létrehoz egy “target” [célnyelvi] mappát is, ebbe kerülnek a végleges lefordított dokumentumok.
+            </p>
+         </div>
+         <div class="section" title="2. Fordítás az OmegaT segítségével">
+            <div class="titlepage">
+               <div>
+                  <div>
+                     <h2 class="title" style="clear: both"><a name="d0e46"></a>2. Fordítás az <span class="application">OmegaT</span> segítségével
+                     </h2>
+                  </div>
+               </div>
+            </div>
+            <div class="section" title="2.1. Ãšj projekt létrehozása és megnyitása">
+               <div class="titlepage">
+                  <div>
+                     <div>
+                        <h3 class="title"><a name="create.and.open.new.project"></a>2.1. Ãšj projekt létrehozása és megnyitása<a class="indexterm" name="d0e55"></a></h3>
+                     </div>
+                  </div>
+               </div>
+               <p>A menüből válassza ki a <span class="guimenu">Projekt</span> → <span class="guimenuitem">Új...</span><a class="indexterm" name="d0e67"></a> pontot.
+               </p>
+               <p>Térjen át arra a mappára, amelybe a projekt állományait menteni kívánja, majd adjon meg egy nevet a fordítási projektnek.
+                  A projekt fő mappája ezt a nevet fogja használni: minden projektfájl ebbe a mappába vagy annak almappáiba kerül majd.
+               </p>
+               <p>Az <span class="application">OmegaT</span> a létrehozandó projektmappák megerősítésére vagy módosítására az alábbi párbeszédablakot használja:
+               </p>
+               <div class="figure"><a name="New.project.dialog.window"></a><p class="title"><b>Figure 1. <a class="indexterm" name="d0e82"></a>új projekt párbeszédablaka</b></p>
+                  <div class="figure-contents">
+                     <div class="mediaobject"><img src="images/NewProject.png" alt="ProjektProjekt párbeszédablak - ábraúj projekt párbeszédablaka"></div>
+                  </div>
+               </div><br class="figure-break"><p>Elfogadhatja az almappák felkínált helyét, de előtte ellenőrizze, hogy a forrásnyelvi és a célnyelvi kódok helyesek-e. A lenyíló
+                  listából válassza ki a nyelvi kódot (2 betűs) vagy a nyelvi- és régiókódot (2 + 2 betűs), vagy írja be őket (a a nyelvi kód
+                  2 vagy 3 betűs lehet). Jegyezze meg a 'target' célmappa helyét (ahová a lefordított szövegek kerülnek majd). Ha "bekezdésenkénti"
+                  szövegdarabolás helyett mondatonkéntit szeretne használni, olvassa el a szövegdarabolási szabályokról szóló fejezetet.
+               </p>
+               <p>Amikor a projekt beállításait a Rendben gombra kattintva jóváhagyja, az OmegaT felszólítja az importálandó forrásdokumentumok
+                  kiválasztására. Importálhat akár egyetlen állományt, de importálhat egész könyvtárakat (az alkönyvtáraikban lévő összes állománnyal
+                  együtt). Erre a célra használhat egy fájlkezelő alkalmazást is. Ha véletlenül rossz vagy túl sok dokumentumot importált, törölje
+                  őket a projekt 'source' [forrásnyelvi] mappájából.
+               </p>
+               <p>A fordítandó állományok ellenőrzéséhez térjen át a <span class="bold"><strong>Projektállományok</strong></span>  <a class="indexterm" name="d0e100"></a>ablakra (Menü:  <span class="guimenu">Projekt </span> → <span class="guimenuitem"> Projektállományok...</span>,<a class="indexterm" name="d0e112"></a> ha a mappa nem nyílik ki automatikusan).. Ha módosította a 'source' forrásmappa tartalmát, előbb ne feledje újból betölteni
+                  a projektet (Menü: <span class="guimenu">Projekt </span> → <span class="guimenuitem"> Újratöltés</span> (<span class="shortcut"><strong><span class="keycap"><strong>F5</strong></span></strong></span>)). Az <span class="application">OmegaT</span> alaphelyzetben a projektben felsorolt állományok közül az elsőt nyitja meg. Az <span class="application">OmegaT</span> csak az alábbi formátumú állományok fordítását támogatja, amennyiben azok megfelelnek az állományszűrők között megadott mintáknak.
+                  Minden egyéb állományt figyelmen kívül hagy.<a class="indexterm" name="d0e133"></a></p>
+               <div class="itemizedlist">
+                  <ul class="itemizedlist" type="disc">
+                     <li class="listitem">
+                        <p><span class="bold"><strong>Egyszerű szöveges állományok<a class="indexterm" name="d0e143"></a></strong></span></p>
+                        <div class="itemizedlist">
+                           <ul class="itemizedlist" type="circle">
+                              <li class="listitem">
+                                 <p>ASCII-szöveg (.txt stb.)</p>
+                              </li>
+                              <li class="listitem">
+                                 <p>Kódolt szöveg (*.UTF8)</p>
+                              </li>
+                           </ul>
+                        </div>
+                        <div class="itemizedlist">
+                           <ul class="itemizedlist" type="circle">
+                              <li class="listitem">
+                                 <p>Java nyelvi forrásszövegek (*.properties)</p>
+                              </li>
+                           </ul>
+                        </div>
+                        <div class="itemizedlist">
+                           <ul class="itemizedlist" type="circle">
+                              <li class="listitem">
+                                 <p>PO-állományok (*.po)</p>
+                              </li>
+                           </ul>
+                        </div>
+                        <div class="itemizedlist">
+                           <ul class="itemizedlist" type="circle">
+                              <li class="listitem">
+                                 <p>INI (kulcs=érték) állományok (*.ini)</p>
+                              </li>
+                           </ul>
+                        </div>
+                        <div class="itemizedlist">
+                           <ul class="itemizedlist" type="circle">
+                              <li class="listitem">
+                                 <p>DTD-állományok (*.DTD)</p>
+                              </li>
+                              <li class="listitem">
+                                 <p>DocuWiki-állományok (*.txt)</p>
+                              </li>
+                           </ul>
+                        </div>
+                     </li>
+                  </ul>
+               </div>
+               <div class="itemizedlist">
+                  <ul class="itemizedlist" type="disc">
+                     <li class="listitem">
+                        <p><span class="bold"><strong>Címkékkel ellátott szöveges állományok<a class="indexterm" name="d0e179"></a></strong></span></p>
+                        <div class="itemizedlist">
+                           <ul class="itemizedlist" type="circle">
+                              <li class="listitem">
+                                 <p>OpenOffice.org / OpenDocument (*.odt, *.ott, *.ods, *.ots,
+                                    *.odp, *.otp)
+                                 </p>
+                              </li>
+                           </ul>
+                        </div>
+                        <div class="itemizedlist">
+                           <ul class="itemizedlist" type="circle">
+                              <li class="listitem">
+                                 <p>Microsoft Open XML (*.docx. *.xlsx, *.pptx)</p>
+                              </li>
+                           </ul>
+                        </div>
+                        <div class="itemizedlist">
+                           <ul class="itemizedlist" type="circle">
+                              <li class="listitem">
+                                 <p>(X)HTML (*.html, *.xhtml,*.xht)</p>
+                              </li>
+                           </ul>
+                        </div>
+                        <div class="itemizedlist">
+                           <ul class="itemizedlist" type="circle">
+                              <li class="listitem">
+                                 <p>HTML Help Compiler (*.hhc, *.hhk)</p>
+                              </li>
+                           </ul>
+                        </div>
+                        <div class="itemizedlist">
+                           <ul class="itemizedlist" type="circle">
+                              <li class="listitem">
+                                 <p>DocBook (*.xml)</p>
+                              </li>
+                           </ul>
+                        </div>
+                        <div class="itemizedlist">
+                           <ul class="itemizedlist" type="circle">
+                              <li class="listitem">
+                                 <p>egynyelvű XLIFF (*.xlf, *.xliff, *.sdlxliff)</p>
+                              </li>
+                           </ul>
+                        </div>
+                        <div class="itemizedlist">
+                           <ul class="itemizedlist" type="circle">
+                              <li class="listitem">
+                                 <p>QuarkXPress CopyFlowGold (*.tag, *.xtg)</p>
+                              </li>
+                           </ul>
+                        </div>
+                        <div class="itemizedlist">
+                           <ul class="itemizedlist" type="circle">
+                              <li class="listitem">
+                                 <p>SubRip feliratok (*.srt)</p>
+                              </li>
+                           </ul>
+                        </div>
+                        <div class="itemizedlist">
+                           <ul class="itemizedlist" type="circle">
+                              <li class="listitem">
+                                 <p>ResX-állományok (*.resx)</p>
+                              </li>
+                           </ul>
+                        </div>
+                        <div class="itemizedlist">
+                           <ul class="itemizedlist" type="circle">
+                              <li class="listitem">
+                                 <p>Android forrásfájlok (*.xml)</p>
+                              </li>
+                           </ul>
+                        </div>
+                        <div class="itemizedlist">
+                           <ul class="itemizedlist" type="circle">
+                              <li class="listitem">
+                                 <p>LaTex (*.tex, *.latex)</p>
+                              </li>
+                              <li class="listitem">
+                                 <p>Súgóállományok (*.xml) és kézikönyvek (*.hmxp)</p>
+                              </li>
+                              <li class="listitem">
+                                 <p>Typo3 LocManager (*.xml)</p>
+                              </li>
+                           </ul>
+                        </div>
+                        <div class="itemizedlist">
+                           <ul class="itemizedlist" type="circle">
+                              <li class="listitem">
+                                 <p>WiX honosítási állományok (*.wxl)</p>
+                              </li>
+                              <li class="listitem">
+                                 <p>Iceni Infix (*.xml)</p>
+                              </li>
+                              <li class="listitem">
+                                 <p>Flash XML export (*.xml)</p>
+                              </li>
+                           </ul>
+                        </div>
+                     </li>
+                  </ul>
+               </div>
+               <p>A lefordítandó szövegen túl a címkékkel ellátott szöveges állományok formázási információkat tartalmaznak, melyeket az OmegaT
+                  “címkék” formájában rejt el. A címkéknek a célnyelvi szövegben is szerepelni kell, még akkor is, ha a formázás nem “fordítandó”.
+                  Hiányzó vagy rossz helyre kerülő címkék esetén a a fordítást utólag javítani kell - lásd alább: "Címkék ellenőrzése".
+               </p>
+            </div>
+            <div class="section" title="2.2. Szövegegységek fordítása egyesével">
+               <div class="titlepage">
+                  <div>
+                     <div>
+                        <h3 class="title"><a name="translate.the.segments.one.by.one"></a>2.2. Szövegegységek fordítása egyesével
+                        </h3>
+                     </div>
+                  </div>
+               </div>
+               <p>Ha meghatározta a projektet és a fordítandó állományokat, az <span class="application">OmegaT</span> a szerkesztőben megnyitja az első forrásszöveget.
+               </p>
+               <p>Az aktuális szövegegység zöld színnel kiemelve látható; alatta a célnyelvi mezőben megismétlődik a forrásszöveg. (Ekkor a
+                  célnyelvi mezőn kívüli összes szöveg zárolva van és nem módosítható.) A fordítást a forrásszöveg felülírásával az <<code class="literal">0001. egység></code> elé kell beírnia. Az OmegaT-t beállíthatja úgy, hogy a forrásszöveg automatikusan a célnyelvi szövegbe kerüljön (lásd: <span class="emphasis"><em>Beállítások > Szerkesztési mód...</em></span>), ami hasznos lehet, ha a forrásszöveg egyes részei változatlanul megmaradnak. Ilyen esetekben a feladat a forrásszöveg felülírása.
+                  A következő szövegegységre az "<span class="bold"><strong>ENTER</strong></span>" lenyomásával térhet át. Megjegyzés:
+               </p>
+               <div class="itemizedlist">
+                  <ul class="itemizedlist" type="disc">
+                     <li class="listitem">
+                        <p>Bármely, akár feljebb, akár lejjebb lévő szövegrészre áttérhet, ha kétszer rákattint a megnyitni kívánt mondatra vagy bekezdésre.</p>
+                     </li>
+                     <li class="listitem">
+                        <p>Ha inkább üres célnyelvi mezőbe szeretné beírni a fordítást, módosítsa ennek megfelelően a <span class="guimenu">Beállítások </span> → <span class="guimenuitem">Szerkesztési mód...<a class="indexterm" name="d0e277"></a></span> menüpontot.
+                        </p>
+                     </li>
+                     <li class="listitem">
+                        <p>A főmenü Nézet menüpontjából módosíthatja a szerkesztőablak beállításait (pl. azt, hogy látsszon-e a forrásnyelvi szöveg,
+                           kiemeleten jelenjen-e meg a lefordított szöveg stb.).
+                        </p>
+                        <p>Az <span class="bold"><strong>ENTER</strong></span> megnyomásakor több dolog történik a háttérben: az <span class="application">OmegaT</span> a szövegegységpárt (a forrást és annak fordítását) hozzáadja a belső fordítási memóriához. Emellett automatikusan lefordítja
+                           az összes ezzel egyező, de más projektfájlokban fellelt szöveget is. Továbbmenve, végignézi a fordítási memóriát és a szójegyzéket,
+                           nincs-e bennük egyezés a következő lefordítatlan szövegegységgel, melyet azután meg is nyit.
+                        </p>
+                     </li>
+                  </ul>
+               </div>
+            </div>
+            <div class="section" title="2.3. A fordítási memória, a szójegyzékek és a szótárak egyezéseinek felhasználása">
+               <div class="titlepage">
+                  <div>
+                     <div>
+                        <h3 class="title"><a name="use.matches.in.TMs.dictionaries.and.glossaries"></a>2.3. A fordítási memória, a szójegyzékek és a szótárak egyezéseinek felhasználása
+                        </h3>
+                     </div>
+                  </div>
+               </div>
+               <div class="section" title="2.3.1. Egyezések a fordítási memóriában">
+                  <div class="titlepage">
+                     <div>
+                        <div>
+                           <h4 class="title"><a name="translation.memory.matches"></a>2.3.1. Egyezések a fordítási memóriában<a class="indexterm" name="d0e300"></a><a class="indexterm" name="d0e305"></a></h4>
+                        </div>
+                     </div>
+                  </div>
+                  <div class="figure"><a name="d0e310"></a><p class="title"><b>Figure 2. Az egyezések panelje</b></p>
+                     <div class="figure-contents">
+                        <div class="mediaobject"><img src="images/MatchesPane.png" alt="Az egyezések panelje"></div>
+                     </div>
+                  </div><br class="figure-break"><p>Ha az <span class="application">OmegaT</span> a fordítási memóriában  a következő szövegegységhez bizonytalan (30% vagy azt meghaladó mértékű) egyezéseket talál, akkor
+                     megjeleníti azokat a Bizonytalan egyezések ablakban. Alaphelyzetben a Bizonytalan egyezések ablakból az első egyezést választja
+                     ki.
+                  </p>
+                  <div class="itemizedlist">
+                     <ul class="itemizedlist" type="disc">
+                        <li class="listitem">
+                           <p>A <span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>I</strong></span><a class="indexterm" name="d0e332"></a> lenyomásával a kiválasztott egyezést beszúrja a kurzor helyére, illetve...
+                           </p>
+                        </li>
+                        <li class="listitem">
+                           <p>A <span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>R</strong></span> <a class="indexterm" name="d0e347"></a><a class="indexterm" name="d0e352"></a> lenyomásával a kiválasztott egyezéssel felülírja a teljes szövegegységet..
+                           </p>
+                        </li>
+                     </ul>
+                  </div>
+                  <p>Ha több egyezés is előfordul, de nem az előre kiválasztottat kívánja használni:</p>
+                  <div class="itemizedlist">
+                     <ul class="itemizedlist" type="disc">
+                        <li class="listitem">
+                           <p>Válassza ki a kívánt egyezést a Bizonytalan egyezések ablakból: <span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>2</strong></span> a másodikként megjelenített egyezés, <span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>3</strong></span> a harmadik egyezés kiválasztásához stb.
+                           </p>
+                        </li>
+                        <li class="listitem">
+                           <p>Ezután használhatja a <span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>I</strong></span> vagy a <span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>R</strong></span> billentyűparancsot a fent leírtak szerint..
+                           </p>
+                        </li>
+                     </ul>
+                  </div>
+                  <p>Arra is utasíthatja az OmegaT-t, hogy bármely megadott százalék fölötti egyezést automatikusan szúrjon be a célnyelvi mezőbe.
+                     Ezt a lehetőséget a <span class="guimenu">Beállítások</span> menüben állíthatja be.
+                  </p>
+               </div>
+               <div class="section" title="2.3.2. A szójegyzékben a szótárban elÅ‘forduló egyezések">
+                  <div class="titlepage">
+                     <div>
+                        <div>
+                           <h4 class="title"><a name="glossary.and.dictionary.matches"></a>2.3.2. A szójegyzékben a szótárban elÅ‘forduló egyezések<a class="indexterm" name="d0e398"></a></h4>
+                        </div>
+                     </div>
+                  </div>
+                  <p>A projektbe felvett szójegyzékekben és szótárakban fellelhető egyezéseket tájékozódás céljából a Szójegyzék és a Szótár ablak
+                     jeleníti meg..
+                  </p>
+               </div>
+               <div class="section" title="2.3.3. Keresések">
+                  <div class="titlepage">
+                     <div>
+                        <div>
+                           <h4 class="title"><a name="use.searches"></a>2.3.3. Keresések
+                           </h4>
+                        </div>
+                     </div>
+                  </div>
+                  <p>Az <span class="application">OmegaT</span> kiterjedt keresési lehetőségeket biztosít. Hívja elő a Szöveg keresése ablakot a <span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>F</strong></span> -fel és a Keresendő: mezőbe írja be a kikeresendő szót vagy kifejezést. Másik megoldásként kijelölheti a Szerkesztő ablakban
+                     a keresendő szót vagy kifejezést, majd használja a <span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>F</strong></span> billentyűparancsot.
+                  </p>
+               </div>
+               <div class="section" title="2.3.4. Gépi fordítás használata">
+                  <div class="titlepage">
+                     <div>
+                        <div>
+                           <h4 class="title"><a name="use.Google.Translate"></a>2.3.4. Gépi fordítás használata<a class="indexterm" name="d0e428"></a></h4>
+                        </div>
+                     </div>
+                  </div>
+                  <p>Bekapcsolt szolgáltatás esetén (lásd: <span class="emphasis"><em>Beállítások> Gépi fordítás</em></span>) a Gépi fordítás ablakban automatikusan megjelennek az adott szövegegység lefordításához kapcsolódó javaslatok. A <span class="emphasis"><em>Ctrl+M </em></span> lenyomásakor a javasolt egyezéssel felülírja a célnyelvi szövegegységet.
+                  </p>
+               </div>
+            </div>
+            <div class="section" title="2.4. Lefordított állományok előállítása">
+               <div class="titlepage">
+                  <div>
+                     <div>
+                        <h3 class="title"><a name="create.translated.documents"></a>2.4. Lefordított állományok előállítása<a class="indexterm" name="d0e444"></a></h3>
+                     </div>
+                  </div>
+               </div>
+               <p>Ha minden szövegegységet lefordított (vagy akár már előtte), az <span class="application">OmegaT</span> a fordítási memóriában tárolt fordítások alapján frissíti a célnyelvi dokumentumo(ka)t. Ehhez a menüből válassza ki a  <span class="guimenu">Projekt</span> → <span class="guimenuitem">Lefordított állományok előállítása</span> (<span class="shortcut"><strong><span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>D</strong></span></strong></span>)<a class="indexterm" name="d0e465"></a> <a class="indexterm" name="d0e471"></a> pontot. Az <span class="application">OmegaT</span> előállítja a projekt forrásmappájában lévő összes állomány fordítását, akár teljesen elkészültek, akár nem. A teljesen vagy
+                  részben kész állományokat a projekt célmappájába (target) menti. A fordítás befejezéséhez nyissa meg a célnyelvi szövegeket
+                  a velük használatos alkalmazásban (böngészőben, szövegszerkesztőben...), majd ellenőrizze a fordítás tartalmát és szerkesztését.
+                  Ezután visszatérhet az <span class="application">OmegaT</span>-hez és elvégezheti a szükséges javításokat; ne feledkezzen meg a lefordított szövegek újbóli előállításáról.
+               </p>
+            </div>
+         </div>
+         <div class="section" title="3. Címkét tartalmazó szöveg kezelése">
+            <div class="titlepage">
+               <div>
+                  <div>
+                     <h2 class="title" style="clear: both"><a name="how.to.handle.tagged.text"></a>3. Címkét tartalmazó szöveg kezelése<a class="indexterm" name="d0e486"></a></h2>
+                  </div>
+               </div>
+            </div>
+            <p>Az <span class="application">OmegaT</span> speciális címkék használatával gondoskodik arról, hogy a forrásszövegek formázása (vastag, dőlt stb.) megőrződjék. Az <span class="application">OmegaT</span> címkéi egy vagy több betűből és egy vagy több azt követő számjegyből, valamint a címkét lezáró "/" karakterből állnak (például:
+               <f0>,  </f0> <br>, </s2>). Ezekre ügyelnie kell és a célnyelvi szövegbe a megfelelő helyre kell őket beszúrnia (lásd a címkeműveletekről
+               szóló részt).
+            </p>
+            <div class="section" title="3.1. Egy példa...">
+               <div class="titlepage">
+                  <div>
+                     <div>
+                        <h3 class="title"><a name="d0e497"></a>3.1. Egy példa...<a class="indexterm" name="d0e500"></a></h3>
+                     </div>
+                  </div>
+               </div>
+               <p>Ezekben a példákban a címkék ki vannak emelve a könnyebbség kedvéért, de az <span class="application">OmegaT</span>-ben nem kiemelten jelennek meg. A kék HTML-címkéket az <span class="application">OmegaT</span> figyelmen kívül hagyja, mivel ezek teljesen körbeveszik az adott egységet..  Az alább zöld színnel kiemelt címkéket az <span class="application">OmegaT</span>-nek kezelnie kell, mert azok az egységen belül helyezkednek el. Íme egy példa egy HTML-állományban szereplő címkére:
+               </p>
+               <p><code class="literal"><p>Egy másik megjelenítési betűtípust választhat a <b>Betű...</b> párbeszédablakból. Megnyitása a<i>Beállítások  → Betű...</i>
+                     menüpontból történik. A párbeszédablakban beállíthatja a betű típusát és méretét.</p></code></p>
+               <p>Ezt az <span class="application">OmegaT</span> az alábbi módon jeleníti meg afrikaans fordítás esetén:
+               </p>
+               <div class="figure"><a name="fig.tagged.segment.source"></a><p class="title"><b>Figure 3. Forrásnyelvi szövegegység <a class="indexterm" name="d0e527"></a>HTML-ben</b></p>
+                  <div class="figure-contents">
+                     <div class="mediaobject"><img src="images/tagged_segment.png" alt="Forrásnyelvi szövegegység Szövegegység, forrásnyelvi és célnyelvi - ábraHTML-ben"></div>
+                  </div>
+               </div><br class="figure-break"><p>Amikor az <span class="application">OmegaT</span> előállítja a fordítást, a HTML ekként néz ki:
+               </p>
+               <div class="figure"><a name="fig.tagged.segment.target"></a><p class="title"><b>Figure 4. Célnyelvi szövegegység HTML-ben</b></p>
+                  <div class="figure-contents">
+                     <div class="mediaobject"><img src="images/tagged_segment_target.png" alt="Célnyelvi szövegegység HTML-ben"></div>
+                  </div>
+               </div><br class="figure-break"></div>
+            <div class="section" title="3.2. Címkék ellenÅ‘rzése">
+               <div class="titlepage">
+                  <div>
+                     <div>
+                        <h3 class="title"><a name="tag.verification"></a>3.2. Címkék ellenÅ‘rzése<a class="indexterm" name="d0e552"></a><a class="indexterm" name="d0e557"></a></h3>
+                     </div>
+                  </div>
+               </div>
+               <p>Az <span class="application">OmegaT</span> automatikusan nem szűri ki a lefordított dokumentumban lévő hibás címkéket. Ezért a szöveg leadása előtt a fordítónak kell
+                  ellenőrizni a címkék helyességét. Válassza ki a menüből az <span class="guimenu">Eszközök</span> → <span class="guimenuitem">Címkék ellenőrzése...</span> (<span class="shortcut"><strong><span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>T</strong></span></strong></span>) pontot. Ekkor egy táblázat jelenik meg, amelyben látható, hol nem egyeznek a forrásnyelvi és a célnyelvi címkék. Kattintson
+                  a szövegegység számára. Ennek hatására automatikusan a szerkesztőben a hibás szövegegységhez kerül, ahol kijavíthatja a hibás
+                  címkét. A javítások elvégzése után ellenőrizze ismét a <span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>T<a class="indexterm" name="d0e582"></a></strong></span> lenyomásával. Ne feledje, hogy a címkeellenőrző hibát találhat helyes címkék esetén is - például amikor a nyelvtani alak
+                  helyessége érdekében a címkék sorrendje megváltozik. Ez esetben a hibát vegye óvatosságból kiadott figyelmeztetésnek.
+               </p>
+               <p>Egyes esetekben címkehiba miatt nem lehet a dokumentumot megnyitni. Aggodalomra semmi ok: a forrásszöveg és a célnyelvi szöveg
+                  nem veszett el. Javítsa ki a hibás címkéket, mielőtt előállítja a lefordított állományokat. Végezetül nyissa meg a böngészőben
+                  vagy a szerkesztőben a lefordított szöveget és ellenőrizze a végső formázást.
+               </p>
+            </div>
+         </div>
+      </div>
+   </body>
+</html>
\ No newline at end of file
diff --git a/docs/index.html b/docs/index.html
index 795cce8..8edab8c 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -12,7 +12,7 @@
 <tr><td><a href="ca/index.html#__sethome">català</a></td><td>(<font color="red">2.0.5</font>)</td></tr>
 <tr><td><a href="cs/index.html#__sethome">čeština</a></td><td>(<font color="red">2.0.5</font>)</td></tr>
 <tr><td><a href="de/index.html#__sethome">Deutsch</a></td><td>(<font color="red">1.8.1</font>)</td></tr>
-<tr><td><a href="en/index.html#__sethome">English</a></td><td>(<font color="red">2.0.5</font>)</td></tr>
+<tr><td><a href="en/index.html#__sethome">English</a></td><td>(<font color="green"><strong>2.3.0</strong></font>)</td></tr>
 <tr><td><a href="eo/index.html#__sethome">Esperanto</a></td><td>(<font color="red">1.4.4</font>)</td></tr>
 <tr><td><a href="es/index.html#__sethome">español</a></td><td>(<font color="red">2.0.5</font>)</td></tr>
 <tr><td><a href="eu/index.html#__sethome">Euskara</a></td><td>(<font color="red">2.0.5</font>)</td></tr>
diff --git a/docs/it/OmegaT.css b/docs/it/OmegaT.css
index dde4bb2..1893c29 100644
--- a/docs/it/OmegaT.css
+++ b/docs/it/OmegaT.css
@@ -1,46 +1,78 @@
-table, h1, h2, h3, h4 
-    {
-    color: #036;
-    font-family: sans-serif;
-    }
-
-h1
-    {
-    font-size: 18;
-    }
-h2
-    {
-    font-size: 16;
-    }
-    
-h3
-    {
-    font-size: 14;
-    }
-h4
-    {
-    font-size: 13;
-    }
-
-p, dd, dt, li, body
-    {
-    margin: 5px 5px 5px 5px;
-    padding: 0px;
-    color: #000;
-    font-family: serif;
-    }
-    
-table
-    {
-    color: #000;
-    font-family: serif;
-    border: 0;
-    }
-    
-code
-    {
-    color: #000;
-    font-family: Courier New;
-    font-size: 12;
-    border: 0;
-    }
\ No newline at end of file
+body {
+	font-family: sans-serif;
+	margin: 1em;
+}
+
+h1, h2, table, dt {
+	color: navy;
+}
+
+h3, h4, ul a {
+	color: green;
+}
+
+code, .code {
+	color: black;
+	background: #ffffcc;
+	border-style: solid;
+	border-width: 1px;
+	border-color: #ffff66;
+	vertical-align: top;
+}
+
+.new {
+	font-size: x-small;
+	color: red;
+	background: yellow;
+}
+
+.updated {
+	font-size: x-small;
+	color: orange;
+}
+
+.note {
+	font-size: small;
+	color: black;
+	background: silver;
+}
+
+.warning {
+	color: red;
+	background: yellow;
+}
+
+.chapter {
+	color: black;
+}
+
+.navbar-top, .navbar-bottom {
+	margin-top: 1em;
+	margin-bottom: 1em;
+}
+
+.rel-p {
+	width: 9%;
+	align: left;
+	valign: center;
+	font-weight: bold;
+}
+
+.rel-n {
+	width: 6%;
+	align: left;
+	valign: center;
+	font-weight: bold;
+} 
+
+.nav-link {
+	width: 39%;
+	align: left;
+	valign: center;
+}
+
+.toc-link {
+	 width: 7%;
+	 align: left;
+	 valign: center;
+}
\ No newline at end of file
diff --git a/docs/it/instantStartGuideNoTOC.html b/docs/it/instantStartGuideNoTOC.html
index 3158697..fe23967 100644
--- a/docs/it/instantStartGuideNoTOC.html
+++ b/docs/it/instantStartGuideNoTOC.html
@@ -1,176 +1,465 @@
 <html>
-<head>
-  <link rel="stylesheet" href="./OmegaT.css" type="text/css">
-  <meta http-equiv="content-type" content="text/html; charset=UTF-8">
-
-  <title>Guida di avvio rapido - Manuale per l'Utente di OmegaT 2.0</title>
-</head>
-
-<body>
-  <h2>Iniziare a usare OmegaT in cinque minuti!<br> - Guida di avvio rapido</h2>
-
-  <p>Questa Guida di avvio rapido si occupa solo delle funzioni basilari principali. Per familiarizzare in modo completo con tutte le funzioni messe a disposizione da OmegaT, si consiglia di leggere il Manuale per l'Utente di OmegaT completo. Le scorciatoie qui descritte usano la convenzione "ctrl+tasto", mentre gli utenti di Mac dovrebbero invece leggere "cmd+tasto". Nelle tastiere Apple, il tasto "cmd" presenta la dicitura "comando" o la figura di una mela.</p>
-  <hr>
-  <a name="summary" id="summary"></a>
-
-  <h2>In breve: come funziona OmegaT</h2>
-
-  <p>La schermata di lavoro di OmegaT è composta da uno spazio con tre finestre distinte. Ogni finestra può essere ridimensionata servendosi del mouse. La parte sinistra della schermata principale è la "finestra dell'Editor", nella quale si eseguirà la traduzione. A destra, in alto, è presente la finestra delle “Corrispondenze parziali (fuzzy)”, in cui vengono visualizzate le corrispondenze con la memoria di traduzione (TM). Immediatamente sotto si trova la finestra “Glossario”, nella quale vengono visualizzate le corrispondenze con il glossario.</p>
-
-  <p>Nella finestra dell'Editor OmegaT presenta il testo di partenza, “segmentato” in frasi (o paragrafi). I segmenti verranno tradotti singolarmente. Quando si passa da un segmento all'altro, ogni frase precedentemente tradotta verrà memorizzata nella memoria di traduzione. Al termine della traduzione di tutti i segmenti (o prima, quando necessario), OmegaT utilizzerà la memoria di traduzione per creare, nella cartella “Target”, i documenti tradotti.</p>
-
-  <p>OmegaT organizza il lavoro di traduzione in “Progetti di traduzione”. Per ogni progetto, OmegaT creerà una serie di cartelle. Queste cartelle verranno utilizzate per memorizzare i documenti di partenza che dovranno essere tradotti, i glossari che si desiderano utilizzare e ogni memoria di traduzione che si vorrà adottare. OmegaT crea anche una cartella “Target” nella quale verranno memorizzati i documenti finali tradotti.</p>
-  <hr>
-  <a name="translate" id="translate"></a>
-
-  <h2>Come tradurre con OmegaT</h2><a name="create" id="create"></a>
-
-  <h3>Creazione e apertura di un nuovo progetto</h3>
-
-  <p>Dalla barra dei menu, selezionare <strong>Progetto → Nuovo...</strong>.</p>
-
-  <p>Accedere alla cartella nella quale si desidera salvare i file progetto e inserire un nome da assegnare al progetto di traduzione. Il nome immesso verrà assegnato alla cartella del progetto, e tutti i file che fanno parte del progetto verranno memorizzati in questa cartella, oppure nelle sottocartelle dalla stessa dipendenti.</p>
-
-  <p>OmegaT richiederà di confermare, o di modificare, le cartelle del progetto che dovranno essere create, visualizzando la seguente finestra di dialogo:</p>
-
-  <p align="center"><img src="images/NewProject.png" name="graphics1" alt=
-  "Finestra delle impostazioni del progetto" id="graphics1" align="bottom" border="0"></p>
-
-  <p>A questo punto si potrà semplicemente accettare il percorso di memorizzazione suggerito per le sottocartelle, accertandosi, però, che i codici della lingua di partenza e di quella di arrivo siano corretti. Selezionare il codice della lingua (2 lettere) o della lingua e della regione (2 + 2 lettere) dall'elenco a discesa, oppure digitarli manualmente (il codice della lingua può essere di 2 o 3 lettere). Tenere a mente il percorso di memorizzazione della sottocartella “Target” (nella quale verranno memorizzati i documenti tradotti). Se si desidera che OmegaT segmenti il documento per “frasi” invece che per “paragrafi”, si deve accedere alla finestra di dialogo “Regole di segmentazione”.</p>
-
-  <p>Quando si farà clic su OK per accettare l'impostazione del progetto, OmegaT richiederà di selezionare la serie di documenti da importare nel progetto. Si ha la possibilità di importare singoli file oppure, in alternativa, un'intera struttura di cartelle (con tutti i file contenuti nelle sottocartelle dipendenti). Se si sono erroneamente importati documenti non corretti, oppure un numero maggiore di documenti rispetto a quello necessario, i file in eccesso potranno essere semplicemente rimossi dalla cartella sorgente del progetto OmegaT (servendosi, per esempio, del gestore dei file del sistema in uso).</p>
-
-  <p>Per verificare l'elenco dei file da tradurre, accedere alla finestra <strong>File del progetto</strong> (se la finestra non viene visualizzata automaticamente avviare, dalla barra dei menu, il comando: <strong>Progetto → File del progetto...</strong>). Se è necessario modificare il contenuto della cartella sorgente, ricordare di ricaricare prima il progetto (dalla barra dei menu, selezionare il comando <strong>Progetto → Ricarica</strong>). Per default, OmegaT apre il primo file dell'elenco del progetto. Ricordare che OmegaT è in grado di tradurre i file dei formati qui sotto indicati, se coincidono con i modelli definiti nei Filtri dei file. Qualsiasi altro tipo di file verrà ignorato.</p>
-
-  <ul>
-    <li>OpenDocument/OpenOffice.org</li>
-
-    <li>File di solo testo</li>
-
-    <li>.po</li>
-
-    <li>Bundle.properties Java</li>
-
-    <li>XHTML, HTML</li>
-
-    <li>Compilatore Help HTML (HCC)</li>
-
-    <li>INI (formato 'key=value')</li>
-
-    <li>DocBook</li>
-
-    <li>Microsoft Open XML</li>
-
-    <li>Okapi monolingua XLIFF</li>
-
-    <li>QuarkXPress CopyFlowGold</li>
-
-    <li>File di sottotitoli (SRT)</li>
-
-    <li>ResX</li>
-
-    <li>Risorsa Android</li>
-
-    <li>LaTeX</li>
-  </ul><a name="segments" id="segments"></a>
-
-  <h3>Traduzione dei singoli segmenti</h3>
-
-  <p>Al termine della definizione del progetto, e dopo aver deciso quali file devono essere tradotti, OmegaT aprirà, nella finestra dell'Editor, il primo file di partenza dell'elenco del progetto. Il primo segmento da tradurre verrà evidenziato in verde; subito sotto compare una copia del testo di partenza, inserito nel “campo di arrivo”. (A questo punto tutto il testo che si trova all'esterno del campo di destinazione non potrà essere in alcun modo modificato). Il testo sul quale intervenire è quello racchiuso tra i tag <code><segmento 0001></code> e <code><fine segmento></code> e quanto viene digitato dovrà sovrascrivere il testo di partenza inserito nel “campo di arrivo”. Per passare alla traduzione del segmento successivo, premere semplicemente "<strong>INVIO</strong>". Nota:</p>
-
-  <ul>
-    <li>per trasferirsi a un qualsiasi altro segmento all'interno del documento, sia esso precedente o successivo quello attivo, fare doppio clic sulla frase o sul paragrafo da aprire.</li>
-
-    <li>– Se si preferisce inserire la traduzione in un campo di destinazione vuoto, impostare tale opzione utilizzando il comando <strong>Opzioni → Campo di modifica...</strong>.</li>
-
-    <li>
-      <p>Nella voce di menu principale <span style="font-weight: bold;">Vista.</span>, è possibile modificare l'impostazione della finestra dell'Editor (affinché mostri o no, ad esempio, il testo di partenza, evidenzi il testo tradotto, ecc.).</p>
-    </li>
-  </ul>
-
-  <p>Quando si preme il tasto "<strong>INVIO</strong>", accadono alcune cose in modo invisibile: OmegaT aggiunge la coppia di segmenti (il segmento di partenza e quello della traduzione) alla memoria di traduzione e avvia automaticamente la traduzione di tutti gli altri segmenti identici che vengono rilevati negli altri file del progetto. Viene eseguita anche una scansione della memoria di traduzione e del glossario, alla ricerca di concordanze per i segmenti successivi non ancora tradotti.</p><a name="tm" id="tm"></a>
-
-  <h3>Uso delle corrispondenze delle memorie di traduzione (TM), del glossario e dei dizionari</h3><a name="tm_matches" id="tm_matches"></a>
-
-  <h3>Corrispondenze della memoria di traduzione (TM)</h3>
-
-  <p>Se OmegaT rileva, per il segmento successivo, la presenza nella memoria di traduzione di una concordanza parziale (fuzzy match) (pari o superiore al 30%), essa viene riportata all'interno della finestra “Corrispondenze parziali (fuzzy)”. Per impostazione predefinita, nella finestra “Corrispondenze parziali (fuzzy)” viene selezionata la prima concordanza rilevata.</p><img src=
-  "images/MatchesPane.png" name="graphics4" alt="pannello delle concordanze" id="graphics4"
-  style="border: 0px solid ;"><br clear="left">
-
-  <p><br></p>
-
-  <p>Per inserire nel campo di arrivo la corrispondenza della memoria di traduzione, prelevandola dalla finestra “Corrispondenze parziali (fuzzy)”, si può utilizzare uno dei sistemi rapidi da tastiera:</p>
-
-  <ul>
-    <li>Premere <code>Ctrl+I</code> per inserire, alla posizione del cursore, la concordanza preselezionata, oppure...</li>
-
-    <li>premere <code>Ctrl+R</code> per sovrascrivere l'intero segmento con il contenuto della corrispondenza preselezionata.</li>
-  </ul>
-
-  <p>Se sono state rilevate più concordanze, e si preferisce non utilizzare quella preselezionata:</p>
-
-  <ul>
-    <li>selezionare la concordanza più appropriata all'interno della finestra “Corrispondenze parziali (fuzzy)”; premere <code>Ctrl+2</code> per la seconda concordanza proposta, <code>Ctrl+3</code> per la terza, e così via.</li>
-
-    <li>Quindi premere <code>Ctrl+I</code>, oppure <code>Ctrl+R</code> come sopra indicato.</li>
-  </ul>
-
-  <p>(Si può indicare a OmegaT di inserire automaticamente, all'interno del campo di arrivo e quando il segmento viene aperto, una qualsiasi delle prime concordanze che abbiano una corrispondenza parziale (fuzzy) superiore a un valore percentuale specificato. Questa opzione viene definita con il comando <strong>Opzioni → Campo di modifica...</strong>)</p><a name="gloss_matches" id="gloss_matches"></a>
-
-  <h3>Corrispondenze del glossario e del dizionario</h3>
-
-  <p>La corrispondenza di termini nei glossari e nei dizionari, inclusi nel progetto, saranno visualizzati come riferimento nelle rispettive finestre.</p><a name="searches" id="searches"></a>
-
-  <h3>Uso della funzione di ricerca</h3>
-
-  <p>OmegaT mette a disposizione un'ampia gamma di funzioni di ricerca. Richiamare la finestra “Cerca” tramite la combinazione da tastiera <code>Ctrl+F</code> e inserire nel campo “Cerca” la parola o la frase che si desidera reperire. In alternativa, selezionare una parola o una frase in un punto qualsiasi nella finestra dell'Editor e premere <code>Ctrl+F </code>. La parola o la frase selezionata viene automaticamente immessa all'interno del campo “Cerca”.</p>
-
-  <h3>Uso di Google Translate</h3>
-
-  <p>Nella finestra di Google Translate si può ottenere un suggerimento automatico per la traduzione del segmento attivo. Premere <code>Ctrl+M</code> per sostituire l'attuale contenuto del segmento di arrivo.<br></p>
-
-  <p><a name="create_trans" id="create_trans"></a></p>
-
-  <h3>Crea i documenti di arrivo</h3>
-
-  <p>Quando si è conclusa la traduzione di tutti i segmenti (o anche prima, se necessario), OmegaT aggiornerà il/i documento/i di arrivo utilizzando le traduzioni memorizzate all'interno della memoria di traduzione. Per avviare questa operazione, dalla barra dei menu avviare il comando <strong>Progetto → Crea i documenti di arrivo</strong>. OmegaT genererà una versione tradotta di tutti i documenti traducibili contenuti nella cartella “Source” del progetto, sia che siano stati completamente o parzialmente tradotti. I documenti completamente, o parzialmente, tradotti verranno memorizzati nella cartella “Target” del progetto. Per concludere l'operazione di traduzione, aprire i documenti di arrivo con l'applicazione corrispondente (navigatore, elaboratore di testi ecc.) per verificare il contenuto e la corretta formattazione del documento finale. A questo punto si potrà tornare a OmegaT per apportare tutte le modifiche e le correzioni necessarie, alla fine delle quali non si deve dimenticare di creare di nuovo i documenti di arrivo tradotti.</p>
-  <hr>
-  <a name="tags" id="tags"></a>
-
-  <h2>Come gestire il testo con tag</h2>
-
-  <p>OmegaT assicura che la formattazione presente nei documenti di partenza (neretti, corsivi ecc.) venga conservata anche nel documento finale, utilizzando, a questo scopo, speciali tag. I tag di OmegaT sono composti da una o più lettere seguite da una o più cifre, e utilizzando come carattere di chiusura "/" (la barra inclinata; per esempio: <f0>, </f0> <br>, </s2>, ecc.). È necessario gestire questi tag con attenzione e accertarsi che compaiano nella giusta posizione anche all'interno dei segmenti di arrivo (si veda <em>operazioni sui tag</em>).</p><a name="example" id="example"></a>
-
-  <h3>Un esempio...</h3>
-
-  <p>Negli esempi seguenti i tag sono stati evidenziati per renderli più immediatamente visibili, anche se OmegaT, in effetti, non li segnala nello stesso modo. I tag HTML, evidenziati in <font color="blue">blu</font>, saranno ignorati da OmegaT, poiché racchiudono completamente il segmento. I tag, qui sotto evidenziati in <font color=
-  "green">verde</font> devono essere gestiti da OmegaT, dato che si trovano all'interno del segmento. Qui di seguito viene fornito un esempio di un segmento di un file HTML:</p>
-
-  <p><code><font color="blue"><p></font>Tramite la finestra di dialogo <font color="green"><b></font>Anteprima caratteri<font color=
-  "green"></b></font> può essere selezionata una diversa dimensione del carattere. Aprire la finestra avviando, dalla barra dei menu, il comando <font color=
-  "green"><i></font>Opzioni<font color="green"></i></font> → <font color="green"><i></font>Caratteri...<font color=
-  "green"></i></font>. Da questa finestra di dialogo si potrà modificare sia il tipo sia la dimensione del carattere.<font color="blue"></p></font></code></p>
-
-  <p>Qui viene mostrato come OmegaT visualizzerà il segmento, nella traduzione in Afrikaans:</p><br>
-
-  <p><img src="images/tagged_segment.png" alt="" border="0"></p><br>
-
-  <p>Una volta che OmegaT ha creato il documento tradotto, il file HTML apparirà come quello qui riportato:</p>
-
-  <p><img src="images/tagged_segment_target.png" alt="" border="0"></p><a name=
-  "tag_verif" id="tag_verif"></a>
-
-  <h3>Verifica dei tag</h3>
-
-  <p>OmegaT non rileva automaticamente i tag errati all'interno del documento tradotto. Prima di inviare il documento finale al vostro cliente, sarebbe quindi opportuno verificare la possibile presenza di errori all'interno del documento.</p>
-
-  <p>Dalla barra dei menu selezionare il comando <strong>Strumenti → Convalida i tag</strong>. Viene aperta una tabella nella quale sono riportati i segmenti nei quali non vi è corrispondenza dei tag tra i segmenti di partenza e quelli di arrivo. Fare clic sul numero del segmento. Si verrà automaticamente riportati al segmento dubbio all'interno della finestra dell'Editor, dove si potrà correggere l'errore. Per convalidare il segmento corretto premere <code>Invio</code>, poi verificare la correzione premendo di nuovo <code>Ctrl-T</code>.</p>
-
-  <p>In alcuni casi, gli errori dei tag possono anche determinare la mancata apertura del documento finale. Prima di creare il documento finale, sarebbe quindi opportuno verificare di aver appropriatamente corretto ogni possibile errore dei tag. Infine, si dovrebbe sempre effettuare una verifica finale della formattazione aprendo il documento tradotto con l'applicazione di visualizzazione o di modifica adatta.</p>
-
-  <p>In alcuni linguaggi di programmazione (es., PHP, C) vengono usati speciali tag come segnaposto in stringhe utilizzate in combinazione con la funzione printf. OmegaT può individuare e convalidare questi tag, se l'opzione è abilitata. Selezionare <strong>Opzioni → Convalida dei tag...</strong> dal menu. Si ha la possibilità di attivare la convalida semplice o completa. Nella convalida semplice vengono usate solo varianti semplici dei possibili valori dei segnaposto. Ciò è utile quando il codice sorgente non contiene segnaposto più complessi ed espressivi e si ottengono molti falsi positivi.</p>
-
-  <hr>
-</body>
-</html>
+   <head>
+      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+   
+      <title>Guida di avvio rapido</title>
+      <link rel="stylesheet" href="OmegaT.css" type="text/css">
+      <meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+   </head>
+   <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+      <div class="chapter" title="Guida di avvio rapido">
+         <div class="titlepage">
+            <div>
+               <div>
+                  <h2 class="title"><a name="chapter.instant.start.guide"></a>Guida di avvio rapido
+                  </h2>
+               </div>
+            </div>
+         </div>
+         <div class="section" title="1. Iniziare a usare OmegaT in cinque minuti!">
+            <div class="titlepage">
+               <div>
+                  <div>
+                     <h2 class="title" style="clear: both"><a name="d0e4"></a>1. Iniziare a usare <span class="application">OmegaT</span> in cinque minuti!
+                     </h2>
+                  </div>
+               </div>
+            </div>
+            <p>Questa Guida di avvio rapido si occupa solo delle funzioni basilari principali di OmegaT. Per familiarizzare in modo completo
+               con tutte le funzioni messe a disposizione da <span class="application">OmegaT</span>, si consiglia di leggere il Manuale per l'Utente. Nota per gli utenti Mac: le scorciatoie qui descritte usano la combinazione
+               "<span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>tasto</strong></span>" ma gli utenti di Mac dovrebbero leggere invece "<span class="keycap"><strong>Cmd</strong></span>+<span class="keycap"><strong>key</strong></span>". Nelle tastiere Apple, il tasto "<span class="keycap"><strong>Cmd</strong></span>" presenta la dicitura "comando" o la figura di una mela.
+            </p>
+            <p>La schermata di <span class="application">OmegaT</span> è composta da un'area di lavoro con cinque pannelli distinti.<a class="indexterm" name="d0e37"></a>. Ogni pannello può essere ridimensionato servendosi del mouse. Alla sinistra si trova l'Editor, in cui si eseguirà la traduzione.
+               In alto a destra è presente il pannello delle “Concordanze parziali (fuzzy)”, in cui vengono visualizzate le concordanze con
+               la memoria di traduzione. Immediatamente sotto si trova il pannello “Glossario”, nel quale vengono visualizzate le concordanze
+               con il glossario. Due linguette nella parte inferiore della finestra aprono rispettivamente i pannelli del "Dizionario" e
+               della "Traduzione automatica". (Nota: è possibile riordinare i pannelli a proprio piacimento - la descrizione precedente si
+               riferisce all'aspetto di OmegaT subito dopo l'installazione)
+            </p>
+            <p>Nel pannello dell'Editor, OmegaT presenta il testo di partenza “segmentato” in frasi o paragrafi. Questi vengono poi tradotti,
+               uno alla volta. Quando si avanza da un segmento all'altro, le proprie traduzioni sono registrate automaticamente in una memoria
+               di traduzione. Al termine della traduzione di tutti i segmenti (o prima, quando necessario), <span class="application">OmegaT</span> usa la memoria di traduzione per creare, nella cartella “Target”, i documenti tradotti.
+            </p>
+            <p>OmegaT organizza il lavoro di traduzione in “progetti" di traduzione. Per ciascun progetto OmegaT crea un gruppo di cartelle
+               che verranno utilizzate, a turno, per memorizzare i documenti di partenza da tradurre e i glossari e le memorie di traduzione
+               che si desidera adottare. OmegaT crea anche una cartella “Target” nella quale vengono memorizzati i documenti finali tradotti.
+            </p>
+         </div>
+         <div class="section" title="2. Tradurre con OmegaT">
+            <div class="titlepage">
+               <div>
+                  <div>
+                     <h2 class="title" style="clear: both"><a name="d0e48"></a>2. Tradurre con <span class="application">OmegaT</span></h2>
+                  </div>
+               </div>
+            </div>
+            <div class="section" title="2.1. Creazione e apertura di un nuovo progetto">
+               <div class="titlepage">
+                  <div>
+                     <div>
+                        <h3 class="title"><a name="create.and.open.new.project"></a>2.1. Creazione e apertura di un nuovo progetto<a class="indexterm" name="d0e56"></a></h3>
+                     </div>
+                  </div>
+               </div>
+               <p>Dalla barra dei menu, selezionare <span class="guimenu">Progetto</span> → <span class="guimenuitem">Nuovo...</span><a class="indexterm" name="d0e68"></a>.
+               </p>
+               <p>Accedere alla cartella nella quale si desidera salvare i file progetto e inserire un nome da assegnare al progetto di traduzione.
+                  Il nome immesso verrà assegnato alla cartella del progetto, e tutti i file che fanno parte del progetto verranno memorizzati
+                  in questa cartella, oppure nelle sottocartelle dalla stessa dipendenti.
+               </p>
+               <p><span class="application">OmegaT</span> richiederà di confermare, o di modificare, le cartelle del progetto che dovranno essere create, visualizzando la seguente
+                  finestra di dialogo:
+               </p>
+               <div class="figure"><a name="New.project.dialog.window"></a><p class="title"><b>Figure 1. <a class="indexterm" name="d0e82"></a>Nuovo progetto - finestra di dialogo</b></p>
+                  <div class="figure-contents">
+                     <div class="mediaobject"><img src="images/NewProject.png" alt="ProgettoFinestra di dialogo del progetto - figuraNuovo progetto - finestra di dialogo"></div>
+                  </div>
+               </div><br class="figure-break"><p>A questo punto basta accettare i percorsi di memorizzazione suggeriti per le sottocartelle, accertandosi, però, che i codici
+                  della lingua di partenza e di arrivo siano corretti. Selezionare il codice della lingua (2 lettere), o della lingua e della
+                  regione (2 + 2 lettere), dall'elenco a discesa, oppure digitarli manualmente (il codice della lingua può essere di 2 o 3 lettere).
+                  Tenere a mente il percorso di memorizzazione della sottocartella “Target” (in cui vengono memorizzati i documenti tradotti).
+                  Se si preferisce che OmegaT segmenti il documento per “frasi” invece che per “paragrafi”, si deve leggere il capitolo sulle
+                  “Regole di segmentazione”.
+               </p>
+               <p>Quando si fa clic su OK per accettare l'impostazione del progetto, OmegaT richiede di selezionare la serie di documenti da
+                  importare nel progetto. È possibile importare singoli file tramite dal menu <em class="firstterm"> Progetto > Importa i file di partenza</em>, oppure copiare manualmente più file o, in alternativa, intere strutture di cartelle (con tutti i file contenuti nelle sottocartelle
+                  dipendenti) all'interno della cartella Source del proprio progetto OmegaT (utilizzando, ad esempio, il file manager del proprio
+                  sistema). Se si sono erroneamente importati documenti non corretti, oppure un numero maggiore di documenti rispetto a quello
+                  necessario, i file in eccesso potranno essere semplicemente rimossi dalla cartella Source.
+               </p>
+               <p>Per verificare l'elenco dei file da tradurre, accedere alla finestra <span class="bold"><strong>File del progetto</strong></span> <a class="indexterm" name="d0e103"></a>(se la finestra non si apre automaticamente avviare, dalla barra dei menu, il comando: <span class="guimenu">Progetto</span> → <span class="guimenuitem">File del progetto...</span>,<a class="indexterm" name="d0e115"></a>). Se si è dovuto modificare il contenuto della cartella sorgente, ricordare di ricaricare prima il progetto (dalla barra
+                  dei menu, selezionare il comando <span class="guimenu">Progetto</span> → <span class="guimenuitem">Ricarica</span> (<span class="shortcut"><strong><span class="keycap"><strong>F5</strong></span></strong></span>)). Per impostazione predefinita, <span class="application">OmegaT</span> apre il primo file dell'elenco del progetto. Tenere presente che <span class="application">OmegaT</span> è in grado di tradurre i file dei formati qui sotto indicati, se coincidono con i modelli definiti nei filtri dei file. Qualsiasi
+                  altro tipo di file verrà ignorato.<a class="indexterm" name="d0e136"></a></p>
+               <div class="itemizedlist">
+                  <ul class="itemizedlist" type="disc">
+                     <li class="listitem">
+                        <p><span class="bold"><strong>Formati di file di solo testo<a class="indexterm" name="d0e146"></a></strong></span></p>
+                        <div class="itemizedlist">
+                           <ul class="itemizedlist" type="circle">
+                              <li class="listitem">
+                                 <p>File di testo ASCII (.txt, ecc.)</p>
+                              </li>
+                              <li class="listitem">
+                                 <p>Testo codificato (*.UTF8)</p>
+                              </li>
+                           </ul>
+                        </div>
+                        <div class="itemizedlist">
+                           <ul class="itemizedlist" type="circle">
+                              <li class="listitem">
+                                 <p>Java resource bundles (*.properties)</p>
+                              </li>
+                           </ul>
+                        </div>
+                        <div class="itemizedlist">
+                           <ul class="itemizedlist" type="circle">
+                              <li class="listitem">
+                                 <p>file PO (*.po)</p>
+                              </li>
+                           </ul>
+                        </div>
+                        <div class="itemizedlist">
+                           <ul class="itemizedlist" type="circle">
+                              <li class="listitem">
+                                 <p>INI (codice=valore) files (*.ini)</p>
+                              </li>
+                           </ul>
+                        </div>
+                        <div class="itemizedlist">
+                           <ul class="itemizedlist" type="circle">
+                              <li class="listitem">
+                                 <p>file DTD (*.DTD)</p>
+                              </li>
+                              <li class="listitem">
+                                 <p>file DocuWiki (*.txt)</p>
+                              </li>
+                           </ul>
+                        </div>
+                     </li>
+                  </ul>
+               </div>
+               <div class="itemizedlist">
+                  <ul class="itemizedlist" type="disc">
+                     <li class="listitem">
+                        <p><span class="bold"><strong>Formati di file di testo con tag<a class="indexterm" name="d0e182"></a></strong></span></p>
+                        <div class="itemizedlist">
+                           <ul class="itemizedlist" type="circle">
+                              <li class="listitem">
+                                 <p>OpenOffice.org / OpenDocument (*.odt, *.ott, *.ods, *.ots,
+                                    *.odp, *.otp)
+                                 </p>
+                              </li>
+                           </ul>
+                        </div>
+                        <div class="itemizedlist">
+                           <ul class="itemizedlist" type="circle">
+                              <li class="listitem">
+                                 <p>Microsoft Open XML (*.docx. *.xlsx, *.pptx)</p>
+                              </li>
+                           </ul>
+                        </div>
+                        <div class="itemizedlist">
+                           <ul class="itemizedlist" type="circle">
+                              <li class="listitem">
+                                 <p>(X)HTML (*.html, *.xhtml,*.xht)</p>
+                              </li>
+                           </ul>
+                        </div>
+                        <div class="itemizedlist">
+                           <ul class="itemizedlist" type="circle">
+                              <li class="listitem">
+                                 <p>HTML Help Compiler (*.hhc, *.hhk)</p>
+                              </li>
+                           </ul>
+                        </div>
+                        <div class="itemizedlist">
+                           <ul class="itemizedlist" type="circle">
+                              <li class="listitem">
+                                 <p>DocBook (*.xml)</p>
+                              </li>
+                           </ul>
+                        </div>
+                        <div class="itemizedlist">
+                           <ul class="itemizedlist" type="circle">
+                              <li class="listitem">
+                                 <p>XLIFF monolingua (*.xlf, *.xliff, *.sdlxliff)</p>
+                              </li>
+                           </ul>
+                        </div>
+                        <div class="itemizedlist">
+                           <ul class="itemizedlist" type="circle">
+                              <li class="listitem">
+                                 <p>QuarkXPress CopyFlowGold (*.tag, *.xtg)</p>
+                              </li>
+                           </ul>
+                        </div>
+                        <div class="itemizedlist">
+                           <ul class="itemizedlist" type="circle">
+                              <li class="listitem">
+                                 <p>file di titoli SubRip (*.srt)</p>
+                              </li>
+                           </ul>
+                        </div>
+                        <div class="itemizedlist">
+                           <ul class="itemizedlist" type="circle">
+                              <li class="listitem">
+                                 <p>file ResX (*.resx)</p>
+                              </li>
+                           </ul>
+                        </div>
+                        <div class="itemizedlist">
+                           <ul class="itemizedlist" type="circle">
+                              <li class="listitem">
+                                 <p>risorsa Android (*.xml)</p>
+                              </li>
+                           </ul>
+                        </div>
+                        <div class="itemizedlist">
+                           <ul class="itemizedlist" type="circle">
+                              <li class="listitem">
+                                 <p>LaTex (*.tex, *.latex)</p>
+                              </li>
+                              <li class="listitem">
+                                 <p>file di Guide (*.xml) e Manuali (*.hmxp) files</p>
+                              </li>
+                              <li class="listitem">
+                                 <p>Typo3 LocManager (*.xml)</p>
+                              </li>
+                           </ul>
+                        </div>
+                        <div class="itemizedlist">
+                           <ul class="itemizedlist" type="circle">
+                              <li class="listitem">
+                                 <p>localizzazione WiX (*.wxl)</p>
+                              </li>
+                              <li class="listitem">
+                                 <p>Iceni Infix (*.xml)</p>
+                              </li>
+                              <li class="listitem">
+                                 <p>esportazione Flash XML (*.xml)</p>
+                              </li>
+                           </ul>
+                        </div>
+                     </li>
+                  </ul>
+               </div>
+               <p>In aggiunta al testo da tradurre, i file di testo formattato contengono informazioni di formattazione che OmegaT rende visibili
+                  sotto forma di “tag” (etichette). I tag devono essere presenti anche nel testo tradotto, anche se la formattazione non necessita
+                  di “traduzione”. Se si dovessero eliminare o spostare accidentalmente i tag, il testo potrebbe non venire visualizzato come
+                  ci si aspetta e si dovrà intervenire sulla traduzione - consultare il capitolo successivo "Verifica dei tag".
+               </p>
+            </div>
+            <div class="section" title="2.2. Traduzione dei singoli segmenti">
+               <div class="titlepage">
+                  <div>
+                     <div>
+                        <h3 class="title"><a name="translate.the.segments.one.by.one"></a>2.2. Traduzione dei singoli segmenti
+                        </h3>
+                     </div>
+                  </div>
+               </div>
+               <p>Al termine della definizione del progetto, e dopo aver deciso quali file devono essere tradotti, <span class="application">OmegaT</span> apre nell'Editor il primo file di partenza dell'elenco.
+               </p>
+               <p>Il segmento attivo da tradurre è evidenziato in verde; subito sotto compare una copia del testo di partenza, inserito nel
+                  “campo di arrivo”. (A questo punto tutto il testo che si trova all'esterno del campo di arrivo non potrà essere in alcun modo
+                  modificato). La traduzione va inserita prima del tag <<code class="literal">segmento 0001></code>. È possibile impostare OmegaT per copiare automaticamente il testo di partenza all'interno di quello di arrivo (consultare
+                  <span class="emphasis"><em>Opzioni > Comportamento di modifica...</em></span>), opzione utile quando alcune parti del testo non devono essere alterate. In tali casi si dovrà sovrascrivere il testo di
+                  partenza. Per passare alla traduzione del segmento successivo, premere <span class="bold"><strong>"INVIO"</strong></span>. Nota:
+               </p>
+               <div class="itemizedlist">
+                  <ul class="itemizedlist" type="disc">
+                     <li class="listitem">
+                        <p>per trasferirsi a un qualsiasi altro segmento all'interno del documento, sia esso precedente o successivo quello attivo, fare
+                           doppio clic sulla frase o sul paragrafo da aprire.
+                        </p>
+                     </li>
+                     <li class="listitem">
+                        <p>Se si preferisce inserire la traduzione in un campo di destinazione vuoto, impostare tale opzione utilizzando il comando <span class="guimenu">Opzioni</span> → <span class="guimenuitem">Comportamento di modifica...<a class="indexterm" name="d0e280"></a></span></p>
+                     </li>
+                     <li class="listitem">
+                        <p>Nella voce di menu principale Vista è possibile modificare l'impostazione del pannello dell'Editor (affinché mostri o no,
+                           ad esempio, il testo di partenza, evidenzi il testo tradotto, ecc.).
+                        </p>
+                        <p>Quando si preme il tasto <span class="bold"><strong>"INVIO"</strong></span>, accadono alcune cose in modo invisibile: <span class="application">OmegaT</span> aggiunge la coppia di segmenti (il segmento di partenza e la sua traduzione) alla memoria di traduzione interna. Traduce
+                           automaticamente tutti gli altri segmenti identici che vengono rilevati. Viene eseguita anche una scansione della memoria di
+                           traduzione e del glossario, alla ricerca di concordanze per il segmento successivo non ancora tradotto, che viene poi aperto.
+                        </p>
+                     </li>
+                  </ul>
+               </div>
+            </div>
+            <div class="section" title="2.3. Uso delle concordanze delle memorie di traduzione, dei dizionari e dei glossari">
+               <div class="titlepage">
+                  <div>
+                     <div>
+                        <h3 class="title"><a name="use.matches.in.TMs.dictionaries.and.glossaries"></a>2.3. Uso delle concordanze delle memorie di traduzione, dei dizionari e dei glossari
+                        </h3>
+                     </div>
+                  </div>
+               </div>
+               <div class="section" title="2.3.1. Concordanze della memoria di traduzione (TM)">
+                  <div class="titlepage">
+                     <div>
+                        <div>
+                           <h4 class="title"><a name="translation.memory.matches"></a>2.3.1. Concordanze della memoria di traduzione (TM)<a class="indexterm" name="d0e302"></a><a class="indexterm" name="d0e307"></a></h4>
+                        </div>
+                     </div>
+                  </div>
+                  <div class="figure"><a name="d0e312"></a><p class="title"><b>Figure 2. Pannello delle concordanze</b></p>
+                     <div class="figure-contents">
+                        <div class="mediaobject"><img src="images/MatchesPane.png" alt="Pannello delle concordanze"></div>
+                     </div>
+                  </div><br class="figure-break"><p>Se <span class="application">OmegaT</span> rileva, per il segmento successivo, la presenza nelle memorie di traduzione di una concordanza parziale (fuzzy match) (pari
+                     o superiore al 30%), essa viene riportata all'interno della finestra “Concordanze parziali (fuzzy)”. Per impostazione predefinita,
+                     nella finestra “Concordanze parziali (fuzzy)” viene selezionata la prima concordanza rilevata.
+                  </p>
+                  <div class="itemizedlist">
+                     <ul class="itemizedlist" type="disc">
+                        <li class="listitem">
+                           <p>Premere <span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>I</strong></span><a class="indexterm" name="d0e334"></a> per inserire, alla posizione del cursore, la concordanza preselezionata, oppure...
+                           </p>
+                        </li>
+                        <li class="listitem">
+                           <p>Premere <span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>R</strong></span> <a class="indexterm" name="d0e349"></a><a class="indexterm" name="d0e354"></a> per sovrascrivere l'intero segmento con il contenuto della corrispondenza preselezionata.
+                           </p>
+                        </li>
+                     </ul>
+                  </div>
+                  <p>Se sono state rilevate più concordanze, e si preferisce utilizzarne una diversa da quella preselezionata</p>
+                  <div class="itemizedlist">
+                     <ul class="itemizedlist" type="disc">
+                        <li class="listitem">
+                           <p>selezionare la concordanza più appropriata all'interno della finestra “Corrispondenze parziali (fuzzy)”; premere <span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>2</strong></span> per la seconda concordanza proposta, <span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>3</strong></span> per la terza, e così via.
+                           </p>
+                        </li>
+                        <li class="listitem">
+                           <p>Quindi premere <span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>I</strong></span> oppure <span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>R</strong></span> come sopra indicato.
+                           </p>
+                        </li>
+                     </ul>
+                  </div>
+                  <p>Si può indicare a OmegaT di inserire automaticamente, all'interno del campo di arrivo, tutte le prime concordanze superiori
+                     a un valore percentuale specificato. Questa opzione viene definita con il comando <span class="guimenu">Opzioni</span></p>
+               </div>
+               <div class="section" title="2.3.2. Concordanze del glossario e del dizionario">
+                  <div class="titlepage">
+                     <div>
+                        <div>
+                           <h4 class="title"><a name="glossary.and.dictionary.matches"></a>2.3.2. Concordanze del glossario e del dizionario<a class="indexterm" name="d0e399"></a></h4>
+                        </div>
+                     </div>
+                  </div>
+                  <p>Tutte le corrispondenze di termini nei glossari e nei dizionari, inclusi nel progetto, saranno visualizzati come riferimento
+                     nei rispettivi pannelli.
+                  </p>
+               </div>
+               <div class="section" title="2.3.3. Uso della funzione di ricerca">
+                  <div class="titlepage">
+                     <div>
+                        <div>
+                           <h4 class="title"><a name="use.searches"></a>2.3.3. Uso della funzione di ricerca
+                           </h4>
+                        </div>
+                     </div>
+                  </div>
+                  <p><span class="application">OmegaT</span> mette a disposizione un'ampia gamma di funzioni di ricerca. Richiamare la finestra “Ricerca testo” tramite la combinazione
+                     da tastiera <span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>F</strong></span> e inserire nel campo “Cerca” la parola o la frase che si desidera reperire. In alternativa, selezionare una parola o una
+                     frase in un punto qualsiasi nel pannello dell'Editor <span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>F</strong></span>: si aprirà la finestra di ricerca testo e la parola o la frase selezionata sarà inserita automaticamente nel campo "Cerca".
+                  </p>
+               </div>
+               <div class="section" title="2.3.4. Uso dei servizi di traduzione automatica">
+                  <div class="titlepage">
+                     <div>
+                        <div>
+                           <h4 class="title"><a name="use.Google.Translate"></a>2.3.4. Uso dei servizi di traduzione automatica<a class="indexterm" name="d0e428"></a></h4>
+                        </div>
+                     </div>
+                  </div>
+                  <p>Nel pannello della Traduzione automatica, se è  stato attivato uno dei servizi (vedere <span class="emphasis"><em>Opzioni > Traduzione automatica</em></span>), si può ottenere un suggerimento automatico per la traduzione del segmento attivo. Premere <span class="emphasis"><em>Ctrl+M </em></span> per sostituire il segmento di arrivo con il suggerimento.
+                  </p>
+               </div>
+            </div>
+            <div class="section" title="2.4. Creazione dei documenti di arrivo">
+               <div class="titlepage">
+                  <div>
+                     <div>
+                        <h3 class="title"><a name="create.translated.documents"></a>2.4. Creazione dei documenti di arrivo<a class="indexterm" name="d0e444"></a></h3>
+                     </div>
+                  </div>
+               </div>
+               <p>Quando si è conclusa la traduzione di tutti i segmenti (o anche prima, se si desidera), <span class="application">OmegaT</span> creerà il documento, o i documenti, di arrivo utilizzando le traduzioni memorizzate all'interno della memoria di traduzione.
+                  Per avviare questa operazione, dalla barra dei menu avviare il comando <span class="guimenu">Progetto</span> → <span class="guimenuitem">Crea i documenti di arrivo</span> (<span class="shortcut"><strong><span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>D</strong></span></strong></span>)<a class="indexterm" name="d0e465"></a> <a class="indexterm" name="d0e471"></a>. <span class="application">OmegaT</span> genererà una versione tradotta di tutti i documenti traducibili contenuti nella cartella “Source” del progetto, sia che siano
+                  stati completamente o parzialmente tradotti. I documenti completamente, o parzialmente, tradotti verranno memorizzati nella
+                  cartella “Target” del progetto. Per concludere l'operazione di traduzione, aprire i documenti di arrivo con l'applicazione
+                  corrispondente (navigatore, elaboratore di testi ecc.) per verificare il contenuto e la corretta formattazione del documento
+                  finale. A questo punto si potrà tornare a <span class="application">OmegaT</span> per apportare tutte le modifiche e le correzioni necessarie, alla fine delle quali non si deve dimenticare di creare di nuovo
+                  i documenti di arrivo tradotti.
+               </p>
+            </div>
+         </div>
+         <div class="section" title="3. Gestire il testo con tag">
+            <div class="titlepage">
+               <div>
+                  <div>
+                     <h2 class="title" style="clear: both"><a name="how.to.handle.tagged.text"></a>3. Gestire il testo con tag<a class="indexterm" name="d0e486"></a></h2>
+                  </div>
+               </div>
+            </div>
+            <p><span class="application">OmegaT</span> assicura che la formattazione presente nei documenti di partenza (neretti, corsivi ecc.) venga conservata anche nel documento
+               finale, utilizzando, a questo scopo, speciali tag. I tag di <span class="application">OmegaT</span> sono composti da una o più lettere seguite da una o più cifre, e utilizzando come carattere di chiusura "/" (la barra inclinata;
+               per esempio: <f0>, </f0> <br>, </s2> ecc.). È necessario gestire questi tag con attenzione e accertarsi che compaiano nella
+               giusta posizione anche all'interno dei segmenti di arrivo (si vedano le operazioni sui tag).
+            </p>
+            <div class="section" title="3.1. Un esempio...">
+               <div class="titlepage">
+                  <div>
+                     <div>
+                        <h3 class="title"><a name="d0e496"></a>3.1. Un esempio...<a class="indexterm" name="d0e499"></a></h3>
+                     </div>
+                  </div>
+               </div>
+               <p>Negli esempi seguenti i tag sono stati evidenziati per renderli più immediatamente visibili, anche se <span class="application">OmegaT</span>, in effetti, non li segnala nello stesso modo. I tag HTML, evidenziati in blu, saranno ignorati da <span class="application">OmegaT</span>, poiché racchiudono completamente il segmento. I tag, qui sotto evidenziati in verde devono essere gestiti da <span class="application">OmegaT</span>, dato che si trovano all'interno del segmento. Qui di seguito viene fornito un esempio di un segmento di un file HTML:
+               </p>
+               <p><code class="literal"><p>Tramite la finestra di dialogo <b>Anteprima caratteri</b> può essere selezionato un diverso carattere per la visualizzazione.
+                     Aprire la finestra avviando, dalla barra dei menu, il comando <i>Opzioni</i> →<i>Tipo di carattere...</i>. Da questa finestra
+                     si potrà modificare sia il tipo sia la dimensione del carattere.</p></code></p>
+               <p>Qui viene mostrato come <span class="application">OmegaT</span> visualizzerà il segmento, nella traduzione in Afrikaans:
+               </p>
+               <div class="figure"><a name="fig.tagged.segment.source"></a><p class="title"><b>Figure 3. <a class="indexterm" name="d0e525"></a>Segmento HTML di partenza</b></p>
+                  <div class="figure-contents">
+                     <div class="mediaobject"><img src="images/tagged_segment.png" alt="Segmento, Partenza e arrivo - figuraSegmento HTML di partenza"></div>
+                  </div>
+               </div><br class="figure-break"><p>Una volta che <span class="application">OmegaT</span> ha creato il documento tradotto, il file HTML apparirà come quello qui riportato:
+               </p>
+               <div class="figure"><a name="fig.tagged.segment.target"></a><p class="title"><b>Figure 4. Segmento HTML di arrivo</b></p>
+                  <div class="figure-contents">
+                     <div class="mediaobject"><img src="images/tagged_segment_target.png" alt="Segmento HTML di arrivo"></div>
+                  </div>
+               </div><br class="figure-break"></div>
+            <div class="section" title="3.2. Verifica dei tag">
+               <div class="titlepage">
+                  <div>
+                     <div>
+                        <h3 class="title"><a name="tag.verification"></a>3.2. Verifica dei tag<a class="indexterm" name="d0e550"></a><a class="indexterm" name="d0e555"></a></h3>
+                     </div>
+                  </div>
+               </div>
+               <p><span class="application">OmegaT</span> non rileva automaticamente i tag errati all'interno del documento tradotto. Prima di inviare il documento finale al proprio
+                  cliente, dunque, si dovrebbe sempre verificare la possibile presenza di errori all'interno del documento. Dalla barra dei
+                  menu selezionare il comando <span class="guimenu">Strumenti</span> → <span class="guimenuitem">Convalida dei tag...</span> (<span class="shortcut"><strong><span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>T</strong></span></strong></span>). Viene aperta una tabella nella quale sono riportati i segmenti nei quali non vi è corrispondenza dei tag tra i segmenti
+                  di partenza e quelli di arrivo. Fare clic sul numero del segmento. Si verrà automaticamente riportati al segmento dubbio all'interno
+                  della finestra dell'Editor, dove si potrà correggere l'errore. Una volta eseguite le correzioni, verificarle premendo di nuovo
+                  <span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>T<a class="indexterm" name="d0e579"></a></strong></span>. Si noti che l'analizzatore di tag potrebbe rilevare un errore in casi in cui i tag sono corretti - ad esempio, quando si
+                  è dovuto cambiare l'ordine dei tag per una corretta costruzione grammaticale della traduzione. È bene considerare questo fatto
+                  come segno di cautela da parte dell'analizzatore.
+               </p>
+               <p>In alcuni casi, gli errori dei tag possono anche determinare la mancata apertura del documento finale. Non vi è motivo di
+                  entrare nel panico - si ha ancora a disposizione del file di partenza e della traduzione e, prima di creare i file di arrivo,
+                  basta soltanto correggere appropriatamente ogni possibile errore dei tag. Infine, si dovrebbe sempre effettuare una verifica
+                  finale della formattazione aprendo il documento tradotto con l'applicazione di visualizzazione o di modifica adatta.
+               </p>
+            </div>
+         </div>
+      </div>
+   </body>
+</html>
\ No newline at end of file
diff --git a/docs/pt_BR/aboutOmegaT.html b/docs/pt_BR/aboutOmegaT.html
index 3bcbe4c..9d6c6fc 100644
--- a/docs/pt_BR/aboutOmegaT.html
+++ b/docs/pt_BR/aboutOmegaT.html
@@ -1,36 +1,44 @@
 <html>
 <head>
-   <meta http-equiv="content-type" content="text/html; charset=UTF-8">
-   <title>Sobre OmegaT - OmegaT 1.6.1 Manual do Usário</title>
+  <link type="text/css" href="./OmegaT.css" rel="stylesheet">
+  <meta http-equiv="content-type" content="text/html; charset=UTF-8">
+  <title>Sobre o OmegaT - Manual do Usuário, OmegaT 2.0 </title>
 </head>
 <body>
-
-<h1>Sobre o OmegaT</h1>
-
-<p>OmegaT é uma ferramenta de tradução assistida por computador, gratuita e que funciona em diversas plataformas.</p>
-
-<h2>Memória de tradução</h2>
-
-<p>OmegaT mantém uma memória da forma como você traduz o texto e pode usar memórias de traduções anteriores para referência.</p>
-
-<p>As memórias de tradução podem ser úteis para uma tradução com um número de repetições ou partes similares em quantidade razoável. OmegaT usa memórias de tradução, portanto lembra como você traduziu segmentos anteriores para oferecer os que mais se assemelham ao segmento atual.</p>
-
-<p>Elas também podem ser muito úteis quando um documento já traduzido necessita ser atualizado. As frases que não foram modificadas permanecerão conforme foram traduzidas e as frases atualizadas serão exibidas com a versão anterior como sendo a tradução mais provável. As modificações do documento original serão dessa forma processadas com maior facilidade.</p>
-
-<p>Se você estiver usando memórias de tradução criadas anteriormente, por exemplo fornecidas por uma agência de tradução ou um cliente, o OmegaT usará tais arquivos como memórias de referência.</p>
-
-<h2>Controle de terminologia</h2>
-
-<p>O controle de terminologia é importante para a consistência da tradução. OmegaT usa glossários que contenham traduções de palavras únicas ou expressões, uma forma de dicionário bilingüe simplificado para um assunto específico. OmegaT exibe para sua referência a tradução dessas palavras, caso estejam presentes no segmento atual.</p>
-
-<h2>Processo de tradução</h2>
-
-<p>Imagine que você tenha para traduzir desde um arquivo único até um diretório repleto de arquivos organizados em subdiretórios. Os arquivos estão em uma variedade de formatos. Quando você indica ao OmegaT quais arquivos quer traduzir, ele procurará pelos <a href="fileFormats.html" title="Formatos de arquivos compatíveis">arquivos compatíveis</a> incluídos, de acordo com as <a href="fileFilters.html" title="Filtros de arquivos">regras de filtragem de arquivo</a>, reconhecerá as partes do texto nelas, dividirá os grupos de texto maiores de acordo com as <a href="segmentation.html" title="Segmentação do texto fonte">regras de segmentação</a>, e exibirá os segmentos um a um para que você inicie a tradução.</p>
-
-<p>Se quiser ver como os arquivos ficarão após a tradução, você pode <a href="userInterface.html" title="A interface do usuário">criar os arquivos traduzidos</a>, abri-los no aplicativo apropriado e ver como ficará a tradução.</p>
-
+<table border="0"  cellpadding="4" cellspacing="0" summary="just formatting"
+ frame="below" rules="none" width="100%">
+  <col width="128*"> <col width="128*"> <tbody>
+    <tr valign="top">
+    <td align="left"> 
+      <img src="images/OmegaT_icon.png" name="grafika1" alt="OmegaT logo">
+      </td>
+      <td align="left">
+      <h1>Sobre o OmegaT</h1>
+      </td>
+    </tr>
+  </tbody>
+</table>
+<p>
+OmegaT é uma ferramenta de tradução assistida por computador, gratuita e que funciona em diversas plataformas, com as seguintes funções principais.
+</p>
+<h3><a name="tm"></a>Memória de tradução</h3>
+<p>OmegaT memoriza suas traduções em uma memória de tradução. Ao mesmo tempo, ele pode usar memórias de traduções anteriores para referência. As memórias de tradução podem ser úteis para uma tradução que tenha repetições ou segmentos similares de texto em quantidade razoável. O OmegaT usa as memórias de tradução para lembrar suas traduções anteriores e sugerir as traduções mais prováveis para o texto no qual você está trabalhando.</p>
+<p>As memórias de tradução podem ser muito úteis quando um documento já traduzido necessita ser atualizado. As frases que não foram modificadas permanecerão conforme foram traduzidas e as frases atualizadas serão exibidas com a versão anterior como sendo a tradução mais provável. Assim ficará muito mais fácil traduzir as modificações feitas no documento original. Se você estiver usando memórias de tradução criadas anteriormente, por exemplo fornecidas por uma agência de tradução ou um cliente, o OmegaT usará tais arquivos como memórias de referência.</p>
+<p>O OmegaT usa o formato de arquivo TMX padrão para armazenar e acessar as memórias de tradução; assim o material da sua tradução pode ser usado por outros programas CAT que trabalham com este formato.</p>
+<h3><a name="glossary"></a>Controle de terminologia</h3>
+<p>O controle de terminologia é importante para a consistência da tradução. O OmegaT usa glossários que contenham traduções de palavras únicas ou expressões, uma forma de dicionário bilíngue simplificado para um assunto específico. Caso essas palavras estejam presentes no segmento aberto, ele exibe a tradução dessas palavras para sua consulta.</p>
+<h3><a name="process"></a>Processo de tradução</h3>
+<p>Imagine que você tenha para traduzir desde um arquivo único até uma pasta com subpastas repletas de arquivos em diversos formatos. Quando você indica quais arquivos quer traduzir, o OmegaT procurará pelos formatos compatíveis de acordo com as regras de filtragem de arquivo, reconhecerá neles as partes de texto, dividirá os grupos de texto maiores de acordo com as regras de segmentação, e exibirá os segmentos um a um para que você inicie a tradução. O OmegaT memorizará suas traduções e apresentará segmentos similares na memória como sugestão de tradução. Se quiser ver como os arquivos ficarão após a tradução, crie os arquivos traduzidos para depois abri-los no aplicativo apropriado e ver o resultado.</p>
 <hr>
-<p><a href="legalNotices.html" title="Avisos legais">Avisos legais</a></p>
-
+<table style="width: 100%;" border="0" cellpadding="2" cellspacing="2" summary="just formatting">
+  <tbody>
+    <tr>
+      <td style="text-align: left;"><a href="legalNotices.html">Avisos legais</a> </td>
+      <td style="text-align: center;"><a href="index.html">Home</a>
+      </td>
+      <td style="text-align: right;"><a href="xindex.html">Índice</a> </td>
+    </tr>
+  </tbody>
+</table>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/docs/pt_BR/fileFilters.html b/docs/pt_BR/fileFilters.html
index 345b212..02e0dd8 100644
--- a/docs/pt_BR/fileFilters.html
+++ b/docs/pt_BR/fileFilters.html
@@ -1,121 +1,207 @@
 <html>
 <head>
-   <meta http-equiv="content-type" content="text/html; charset=UTF-8">
-   <title>Filtros de arquivos - OmegaT 1.6.1 Manual do Usuário</title>
+  <link rel="stylesheet" href="./OmegaT.css" type="text/css">
+  <meta http-equiv="content-type" content="text/html; charset=UTF-8">
+  <title>Filtros de arquivos - Manual do Usuário, OmegaT 2.0</title>
 </head>
+
 <body>
+  <h1>Filtros de arquivos</h1>
+  <hr>
 
-<h1>Filtros de arquivos</h1>
+  <ul>
+    <li>
+      <p><a href="#filter_dialog">Caixa de diálogo 'Filtros de arquivos'</a></p>
 
-<h2>Índice</h2></div>
+      <ul>
+        <li>
+          <p><a href="#filter_options">Opções de filtros</a></p>
+        </li>
+      </ul>
+    </li>
 
-<ul type="none">
-   <li>1. <a href="#Introdução">Introdução</a>
+    <li>
+      <p><a href="#edit_dialog">Caixa de diálogo 'Editar filtro'</a></p>
 
-      <ul type="none">
-         <li>1.1. <a href="#File_types">Tipos de arquivos</a></li>
-         <li>1.2. <a href="#File_encodings">Codificações de arquivos</a></li>
-         <li>1.3. <a href="#Renaming_Translated_Files">Renomear arquivos traduzidos</a></li>
-      </ul>
-   </li>
+      <ul>
+        <li>
+          <p><a href="#source_file_name">Tipo de arquivo fonte, padrão do nome de arquivo</a>.</p>
+        </li>
 
-   <li>2. <a href="#File_Filters_Setup">Definir filtros de arquivos</a>
+        <li>
+          <p><a href="#encoding">Codificação dos arquivos fonte e traduzido</a></p>
+        </li>
 
-      <ul type="none">
-         <li><a href="#File_Filters_Dialog">Caixa de diálogo 'Filtros de arquivos'</a></li>
-         <li><a href="#Edit_Filter_Dialog">Caixa de diálogo 'Editar filtro'</a></li>
-         <li><a href="#Add.2FEdit_Pattern_Dialog">Caixa de diálogo 'Adicionar/editar padrão'</a></li>
+        <li>
+          <p><a href="#target_file_name">Nome de arquivo traduzido</a></p>
+        </li>
       </ul>
-   </li>
-</ul>
+    </li>
+  </ul>
+
+  <p>OmegaT apresenta filtros com grandes recursos de customização, assim você pode configurar a maioria dos detalhes do seu funcionamento. Os filtros de arquivos são partes do código e podem:</p>
+
+  <ul>
+    <li>
+      <p>Ler o documento em alguns formatos específicos de arquivo. Por exemplo, arquivos de texto simples.</p>
+    </li>
+
+    <li>
+      <p>Extrair o conteúdo a ser traduzido do arquivo.</p>
+    </li>
+
+    <li>
+      <p>Automatizar modificações dos nomes dos arquivos traduzidos substituindo os conteúdos traduzíveis com sua respectiva tradução.</p>
+    </li>
+  </ul>
+
+  <p>A maioria dos usuários parece satisfeita com as opções padrão de filtros de arquivos. Se você não estiver, selecione o menu <strong>Opções -> Filtros de arquivos...</strong> para abrir a caixa de diálogo principal. <strong>Alerta!</strong> Mudar as opções de filtros com um projeto aberto pode resultar na perda de dados. Se você modificar as opções de filtros com um projeto aberto, terá que recarregar o projeto para que as modificações sejam efetivadas.</p>
+
+  <h3><a name="filter_dialog" id="filter_dialog"></a>Caixa de diálogo 'Filtros de arquivos'</h3>
+
+  <p>Esta caixa relaciona todos os filtros de arquivos disponíveis. Se não quiser usar o OmegaT para traduzir arquivos de determinado tipo, desative o filtro retirando a marca de seleção que está perto do tipo de arquivo. O OmegaT então omitirá tais arquivos ao carregar os projetos e irá apenas copiá-los, sem nenhuma intervenção, quando criar os documentos traduzidos. Depois, se quiser usar o filtro de novo, basta marcar a caixa de seleção correspondente. Clique em <strong>Restaurar predefinições</strong> para restaurar os filtros às configurações predefinidas. Para editar os arquivos e a codificação que o filtro processará, selecione o filtro na lista e clique em <strong>Editar</strong>.</p>
+
+  <h3><a name="filter_options" id="filter_options"></a>Opções de filtros</h3>
+
+  <p>Cinco filtros (Arquivos de texto, arquivos XHTML, arquivos HTML e XHTML, arquivos OpenDocument/OpenOffice.org e arquivos Microsoft Open XML) possuem uma ou mais opções específicas. Para modificar as opções, selecione o filtro na lista e clique em <strong>Opções</strong>. As opções disponíveis são:</p>
+
+  <h4>Arquivos de texto</h4>
+
+  <ul>
+    <li>
+      <p><i>Segmentação de parágrafos por quebras de linha, linhas vazias ou nunca:</i> se as regras de segmentação por frases estiverem ativadas, o texto será segmentado de acordo com as regras disponíveis.</p>
+    </li>
+  </ul>
+
+  <h4>Arquivos HTML e arquivos HTML e XHTML</h4>
+
+  <ul>
+    <li>
+      <p><i>Acrescentar ou regravar a declaração de codificação:</i> o OmegaT pode acrescentar ou regravar o enunciado de codificação do arquivo com base na codificação selecionada do arquivo destino.</p>
+    </li>
+
+    <li>
+      <p><i>Tradução dos atributos:</i> os atributos selecionados aparecerão como segmentos na janela Editor.</p>
+    </li>
+
+    <li>
+      <p><i>Iniciar um novo parágrafo:</i> a tag <br> do HTML criará um parágrafo para fins de segmentação.</p>
+    </li>
+
+    <li>
+      <p><i>Pular texto que corresponde à expressão regular:</i> o texto correspondendo à expressão regular será pulado.</p>
+    </li>
+  </ul>
+
+  <h4>Arquivos OpenDocument/OpenOffice.org</h4>
+
+  <p>Os seguintes elementos podem ou não ser traduzidos. Se traduzidos, eles aparecerão como segmentos separados.</p>
+
+  <ul>
+    <li><i>Entradas de índice</i></li>
+
+    <li><i>Marcadores</i></li>
+
+    <li><i>Referências de marcadores</i></li>
 
-<a name="Introduction"></a>
-<h2>Introdução</h2>
+    <li><i>Notas</i></li>
 
-<p>OmegaT apresenta filtros com grandes recursos de customização, assim você pode configurar a maioria dos detalhes do seu funcionamento.</p>
+    <li><i>Comentários</i></li>
+  </ul>
 
-<p>Os filtros de arquivos são partes do código e podem:</p>
+  <h4>Arquivos Microsoft Open XML</h4>
 
-<ul>
-   <li>Ler o documento em alguns formatos específicos de arquivo. Por exemplo, arquivos de texto simples.</li>
-   <li>Extrair o conteúdo a ser traduzido do arquivo.</li>
-   <li>Automatizar modificações dos nomes dos arquivos traduzidos substituindo os conteúdos traduzíveis com sua respectiva tradução.</li>
-</ul>
+  <p>Os seguintes elementos podem ou não ser traduzidos. Se traduzidos, eles aparecerão como segmentos separados.</p>
 
-<a name="File_types"></a>
-<h3>Tipos de arquivos</h3>
+  <ul>
+    <li><i>Texto oculto (Word)</i></li>
 
-<p>Quando o OmegaT encontra um arquivo no seu diretório fonte, ele tenta selecionar o filtro usando a extensão do arquivo. Mais precisamente, o OmegaT tenta corresponder os padrões do nome do arquivo fonte de cada filtro com o nome do arquivo. For example, o padrão <code>*.xhtml</code> será comparado a qualquer arquivo com a extensão <code>.xhtml</code>. Se for encontrado o filtro apropriado, ele é fornecido ao arquivo para processamento. Por exemplo, por predefinição o filtro XHTML será usado para processar arquivos com a extensão <code>.xhtml</code>. O usuário pode alterar ou acrescentar padrões de nome de arquivo para cada arquivo que o filtro processará.</p>
+    <li><i>Comentários (Word, Excel)</i></li>
 
-<a name="File_encodings"></a>
-<h3>Codificações de arquivos</h3>
+    <li><i>Notas de rodapé (Word)</i></li>
 
-<p>Os arquivos de texto simples e HTML podem ser armazenados em diversas formas de codificação. Embora os arquivos HTML possam conter uma diretiva meta de codificação que o OmegaT usará para ler o arquivo, não há uma forma definida para fazer tal especificação nos arquivos de texto. Para os arquivos de texto e HTML que não tenham uma declaração de codificação, o OmegaT usará a codificação que o usuário definir para uma determinada extensão. Por exemplo, por predefinição os arquivos <code>.txt</code> serão carregados usando a codificação padrão do sistema operacional. A codificação fonte pode ser modificada para cada padrão de nome de arquivo fonte diferente.</p>
+    <li><i>Notas de fim (Word)</i></li>
 
-<p>Os aquivos HTML e de texto simples podem também ser processados sem nenhuma codificação. Por exemplo, se você traduz do francês para o japonês, pode definir um filtro para usar uma das codificações destino de japonês, ou usar a codificação UTF-8, UTF-16 ou UTF-32 Unicode. Está predefinido que a codificação do arquivo é gravada na mesma codificação usada ao carregar os arquivos de texto, e UTF-8 para arquivos HTML. Observe que o filtro HTML acrescenta uma declaração de codificação ao arquivo destino, portanto o navegador exibirá a declaração e não exibirá nenhum caractere difícil de manusear.</p>
+    <li><i>Cabeçalho (Word)</i></li>
 
-<a name="Renaming_Translated_Files"></a>
-<h3>Renomear arquivos traduzidos</h3>
+    <li><i>Rodapé (Word)</i></li>
 
-<p>Se você quiser, poderá renomear automaticamente os arquivos que traduz, por exemplo, acrescentando o código de idioma após o nome do arquivo. Isto também pode ser feito em uma caixa de diálogo de filtros de arquivos usando o padrão de nome de arquivo destino.</p>
+    <li><i>Comentários em slide (PowerPoint)</i></li>
 
-<a name="File_Filters_Setup"></a>
-<h2>Definir filtros de arquivos</h2>
+    <li><i>Slide mestre (PowerPoint)</i></li>
+  </ul>
 
-<p>A maioria dos usuários parece satisfeita com as opções padrão de filtros de arquivos. Se você não estiver, selecione o menu  <strong>Opções -> Filtros de arquivos...</strong> para abrir a caixa de diálogo principal. Observe que as opções de filtros somente devem ser modificadas quando não houver um projeto aberto, pois elas afetam a maneira como os arquivos traduzidos são criados.</p>
+  <h3><a name="edit_dialog" id="edit_dialog"></a>Caixa de diálogo 'Editar filtro'</h3>
 
-<a name="File_Filters_Dialog"></a>
-<h3>Caixa de diálogo 'Filtros de arquivos'</h3>
+  <p>Na caixa de diálogo o usuário pode definir os tipos de arquivos fontes que o filtro processará, personalizar os nomes dos arquivos traduzidos e selecionar a codificação a ser usada para carregar o arquivo e gravar sua versão traduzida. Para modificar um padrão de filtro de arquivo, modifique os campos diretamente ou clique em <strong>Editar</strong>. Para acrescentar um novo padrão de filtro de arquivo, clique em <strong>Adicionar</strong>. A mesma caixa de diálogo é usada para acrescentar um padrão ou editar um padrão específico. A caixa é útil porque inclui um editor especial de tipo de arquivo destino onde dá para personalizar os nomes dos arquivos de saída.</p>
 
-<p>Esta caixa relaciona todos os filtros de arquivos disponíveis.</p>
+  <h3><a name="source_file_name" id="source_file_name"></a>Tipo de arquivo fonte, padrão do nome de arquivo</h3>
 
-<p>Se não quiser usar o OmegaT para traduzir arquivos de determinado tipo, desative o filtro retirando a marca de seleção que está perto do tipo de arquivo. O OmegaT então omitirá tais arquivos ao carregar os projetos e irá apenas copiá-los, sem nenhuma intervenção, quando criar os documentos destino. Depois, se quiser usar o filtro de novo, basta marcar a caixa de seleção correspondente.</p>
+  <p>Quando o OmegaT encontra um arquivo na sua pasta 'source, ele tenta selecionar o filtro usando a extensão do arquivo. Mais precisamente, o OmegaT tenta corresponder os tipos de arquivo fonte de cada filtro com o nome do arquivo. Por exemplo, o padrão<code>*.xhtml</code> será comparado a qualquer arquivo com a extensão <code>.xhtml</code>. Se for encontrado o filtro apropriado, ele é fornecido ao arquivo para processamento. Por exemplo, por predefinição o filtro XHTML será usado para processar arquivos com a extensão <code>.xhtml</code>. O usuário pode alterar ou acrescentar tipos de arquivo para cada arquivo que o filtro processará. Os tipos de arquivo fonte usam curingas iguais aos usados nas <strong>Buscas</strong>. O caractere '<strong>*</strong>' corresponde a zero ou mais caracteres. O caractere '<strong>?</strong>' corresponde exatamente a um caractere. Todos os outros caracteres correspondem a eles mesmos. Por exemplo, se quiser que o filtro de texto processe os arquivos leiame (<code>leiame</code>, <code>leia.me</code> e <code>leiame.txt</code>) use o padrão <code>leia*</code>.</p>
 
-<p>Se cometer algum erro na configuração, clique em <strong>Padrões</strong> para reverter a configuração dos filtros de arquivos ao padrão que estava funcionando antes.</p>
+  <h3><a name="encoding" id="encoding"></a>Codificação dos arquivos fonte e traduzido</h3>
 
-<p>Para editar os arquivos e a codificação que o filtro processará, selecione o filtro na lista e clique em <strong>Editar</strong>.</p>
+  <p>Apenas uma quantidade limitada de formatos de arquivos requer codificação obrigatória. Os formatos de arquivos que não especificam sua própria codificação usarão aquela que for definida para a extensão correspondente aos seus nomes. Por exemplo, por predefinição os arquivos <code>.txt</code> serão carregados usando a codificação padrão do sistema operacional. A codificação fonte pode ser modificada para cada tipo de arquivo fonte diferente. Tais arquivos podem também ser processados sem nenhuma codificação. Está predefinido que a codificação do arquivo traduzido é a mesma que a do arquivo fonte. Os campos de codificação fonte e destino usam caixas combinadas com todas as combinações suportadas incluídas. <strong><auto></strong> deixa a opção de codificação para o OmegaT. Aqui está como ele faz isto:</p>
 
-<a name="Edit_Filter_Dialog"></a>
-<h3>Caixa de diálogo 'Editar filtro'</h3>
+  <ul>
+    <li>
+      <p style="margin-bottom: 0cm;">OmegaT encontra a codificação do arquivo fonte usando sua declaração de codificação, se houver (arquivos HTML, arquivos baseados em XML).</p>
+    </li>
 
-<p>Na caixa de diálogo o usuário pode definir os padrões de nome de arquivos que o filtro processará, personalizar os nomes dos arquivos traduzidos e selecionar a codificação a ser usada para carregar o arquivo e gravar sua versão traduzida.</p>
+    <li>
+      <p style="margin-bottom: 0cm;">O OmegaT está configurado para usar uma codificação obrigatória para alguns formatos de arquivo (propriedades Java, etc.)</p>
+    </li>
 
-<p>Os padrões de nome de arquivos fonte usam as regras de máscara de arquivo do DOS. O símbolo <code>*</code> pode substituir qualquer quantidade de quaisquer símbolos, <code>?</code> substitui qualquer símbolo único e os demais símbolos têm seus significados originais. Por exemplo, se quiser que o filtro de texto processe os arquivos leiame  (<code>leiame</code>, <code>leia.me</code> e <code>leiame.txt</code>) use o padrão <code>leia*</code>.</p>
+    <li>
+      <p>E usa a codificação padrão do sistema operacional para os arquivos de texto.</p>
+    </li>
+  </ul>
 
-<p>Os campos de codificação fonte e destino usam caixas combinadas com todas as combinações suportadas incluídas. Observe que nem todos os filtros permitem a seleção de codificação porque eles trabalham em um formato de arquivo com apenas uma codificação possível. Definir a codificação para  "<auto>" para aqueles formatos de arquivo que lhe permitem escolher a codificação significa que o OmegaT tomará esta decisão. Aqui está como ele fará isto:</p>
+  <h3><a name="target_file_name" id="target_file_name"></a>Nome de arquivo traduzido</h3>
 
-<ul>
-   <li>O OmegaT tenta adivinhar a codificação de arquivo fonte dos arquivos HTML/XHTML.</li>
-   <li>E usará a codificação padrão do sistema operacional para os arquivos de texto.</li>
-</ul>
+  <p>Se você quiser, poderá renomear automaticamente os arquivos que traduz, por exemplo, acrescentando o código de idioma após o nome do arquivo. O tipo de arquivo traduzido usa uma sintaxe especial, portanto se quiser editar este campo, clique em <strong>Editar...</strong> para acessar a caixa de diálogo 'Editar padrão'. Se quiser voltar à configuração padrão do filtro, clique em <strong>Restaurar predefinições</strong>. Também é possível modificar o nome diretamente no campo de tipo de arquivo traduzido, na caixa de diálogo dos filtros de arquivos. A caixa 'Editar padrão' contém as seguintes opções:</p>
 
-<p>O padrão de nome de arquivo destino usa uma sintaxe especial, portanto se você quiser editar este campo, será melhor clicar em <strong>Editar...</strong> para acessar a caixa de diálogo 'Editar padrão'.</p>
+  <ul>
+    <li>
+      <p>Padrão é <code>${filename}</code> -- nome completo do arquivo fonte com extensão, portanto o nome do arquivo traduzido é o mesmo que o nome do arquivo fonte.</p>
+    </li>
 
-<p>Se quiser que o filtro processe arquivos que correspondam a mais um padrão de nome de arquivo fonte, clique em <strong>Adicionar...</strong> para acessar a caixa de diálogo 'Adicionar padrão'.</p>
+    <li>
+      <p><code>${nomeOnly}</code> permite-lhe inserir apenas o nome do arquivo fonte sem extensão.</p>
+    </li>
 
-<p>Se quiser voltar à configuração padrão do filtro, clique em  <strong>Padrões</strong>.</p>
+    <li>
+      <p><code>${extension}</code> -- a extensão do arquivo fonte.</p>
+    </li>
 
-<a name="Add.2FEdit_Pattern_Dialog"></a>
-<h3>Caixa de diálogo 'Adicionar/editar padrão'</h3>
+    <li>
+      <p><code>${targetLocale}</code> - o código do local destino (em forma de  "xx_YY").</p>
+    </li>
 
-<p>A mesma caixa de diálogo aparece quer você queira adicionar ou editar um padrão específico. A única novidade aqui é um editor de padrão especial de nome de arquivo destino; todos os outros campos foram descritos acima.</p>
+    <li>
+      <p><code>${targetLanguage}</code> - o idioma destino e o código de país juntos (em forma de "XX-YY").</p>
+    </li>
 
-<p>A seção do padrão de nome de arquivo destino permite-lhe compor o nome do arquivo traduzido de diferentes partes.</p>
+    <li>
+      <p><code>${targetLanguageCode}</code> - apenas o idioma destino ("XX").</p>
+    </li>
 
-<ul>
-   <li>Padrão é <code>${nomedearquivo}</code> -- nome completo do arquivo fonte com extensão, portanto o nome do arquivo traduzido é o mesmo que o nome do arquivo fonte.</li>
-   <li><code>${nomeApenas}</code> permite-lhe inserir apenas o nome do arquivo fonte sem a extensão.</li>
-   <li><code>${extensão}</code> -- a extensão do arquivo fonte.</li>
-   <li><code>${destinoLocal}</code> - o código do local destino (em forma de  "xx_YY").</li>
-   <li><code>${destinoIdioma}</code> - o idioma destino e o código de país juntos (em forma de "XX-YY").</li>
-   <li><code>${destinoCódigoIdioma}</code> - apenas o idioma destino ("XX").</li>
-   <li><code>${destinoCódigoPaís}</code> - apenas o código do país destino ("YY").</li>
-</ul>
+    <li>
+      <p><code>${targetCountryCode}</code> - apenas o código do país destino ("YY").</p>
+    </li>
+  </ul>
+  <hr>
 
-<p>Podemos facilmente acrescentar mais variáveis se você solicitar e informar qual é sua variável preferida. Basta vir para o <a href="http://groups.yahoo.com/group/OmegaT/">nosso grupo de usuários</a>.</p>
+  <table style="width: 100%;" border="0" cellpadding="2" cellspacing="2" summary="just formatting">
+    <tbody>
+      <tr>
+        <td style="text-align: left;"><a href="legalNotices.html">Avisos legais</a></td>
 
-<hr>
-<p><a href="legalNotices.html" title="Avisos legais">Avisos legais</a></p>
+        <td style="text-align: center;"><a href="index.html">Home</a></td>
 
+        <td style="text-align: right;"><a href="xindex.html">Índice</a></td>
+      </tr>
+    </tbody>
+  </table>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/docs/pt_BR/filesToTranslate.html b/docs/pt_BR/filesToTranslate.html
index 10c729c..89a7060 100644
--- a/docs/pt_BR/filesToTranslate.html
+++ b/docs/pt_BR/filesToTranslate.html
@@ -1,83 +1,282 @@
 <html>
 <head>
-   <meta http-equiv="content-type" content="text/html; charset=UTF-8">
-   <title>Arquivos para traduzir - OmegaT 1.6.1 Manual do Usuário</title>
+  <link rel="stylesheet" href="./OmegaT.css" type="text/css">
+  <meta http-equiv="content-type" content="text/html; charset=UTF-8">
+
+  <title>Arquivos para traduzir - Manual do Usuário, OmegaT 2.0 </title>
 </head>
+
 <body>
+  <h1>Arquivos para traduzir</h1>
+
+  <p><a href="#RTLbidi">Línguas da direita para esquerda</a></p>
+
+  <ul>
+    <li>
+      <p><a href="#RTL_Changing_direction">Modificar a direção do texto de entrada/exibição</a></p>
+    </li>
+
+    <li>
+      <p><a href="#RTL_mixing">Combinação de sequências de texto EPD (esquerda para direita) e DPE (direita para esquerda) nos segmentos</a></p>
+    </li>
+
+    <li>
+      <p><a href="#RTL_tags">Tags do OmegaT nos segmentos DPE</a></p>
+    </li>
+
+    <li>
+      <p><a href="#RTL_CreatingTranslatedDocuments">Criação de documentos DPE</a></p>
+    </li>
+  </ul>
+
+  <p><a href="#formats">Formatos de arquivos</a></p>
+
+  <ul>
+    <li>
+      <p><a href="#plaintext">Arquivos de texto simples</a></p>
+    </li>
+
+    <li>
+      <p><a href="#tagged">Arquivos de texto formatado</a></p>
+    </li>
+
+    <li>
+      <p><a href="#specifics">Especificações de formatos de arquivos</a></p>
+    </li>
+
+    <li>
+      <p><a href="#others">Outros formatos de arquivos</a></p>
+
+      <ul>
+        <li>
+          <p><a href="#ooo">OpenOffice.org</a></p>
+        </li>
+
+        <li>
+          <p><a href="#okapi">Okapi framework</a></p>
+        </li>
+
+        <li>
+          <p><a href="#tt">Translate Toolkit</a></p>
+        </li>
+
+        <li>
+          <p><a href="#po4a">po4a</a></p>
+        </li>
+      </ul>
+    </li>
+  </ul>
+  <hr>
+
+  <h2><a name="RTLbidi" id="RTLbidi"></a>Línguas da Direita para Esquerda (DPE)</h2>A justificação dos segmentos fonte e destino depende das línguas do projeto. Por predefinição, o texto de línguas EPD é justificado à esquerda e o das línguas DPE à direita. <a name="RTL_Changing_direction" id="RTL_Changing_direction"></a>Para alternar entre os modos de exibição diferentes, pressione Ctrl+Shift+O (esta é a letra "O" e não o número 0). O Shift+Ctrl+O tem três modos:
+
+  <ul>
+    <li>justificação padrão (i.e. língua)</li>
+
+    <li>justificação à esquerda</li>
+
+    <li>justificação à direita</li>
+  </ul>O modo DPE no OmegaT não tem nenhuma influência no modo de exibição dos documentos traduzidos criados no OmegaT. O modo de exibição dos documentos traduzidos deve ser modificado nos programas que você usará para exibir ou modificar os documentos (consulte o manual desses programas para detalhes). No OmegaT, o Ctrl+Shift+O faz com que a entrada de texto e sua exibição seja da DPE. Esta função pode ser usada separadamente para os três painéis (Editor, Correspondências parciais e Glossário); basta clicar no painel e alternar o modo de exibição. Também pode ser usada em todos os campos de entrada no OmegaT (janela de busca, regras de segmentação, etc.) <b>Obs.:</b> o Mac OSX usa o mesmo atalho (e não  Cmd+Shift+O) .
+
+  <h3><a name="RTL_mixing" id="RTL_mixing"></a>Combinação de sequências de texto EPD (esquerda para direita) e DPE (direita para esquerda) nos segmentos</h3>Quando o texto é escrito da direita para a esquerda, o modo de visualização padrão (esquerda para direita) pode ser usado. Em muitos casos, entretanto, é necessário incluir texto EPD em textos DPE. Por exemplo, nas tags do OmegaT, os nomes dos produtos que devem permanecer na língua fonte, espaços reservados em arquivos de localização e números em texto. Em casos como esses é necessário alternar para o modo DPE para que o texto (na verdade bidirecional) seja exibido da direita para a esquerda. Note que quando o OmegaT está no modo DPE, tanto o texto fonte como o texto destino são exibidos neste modo. Isto significa que se a língua fonte é da EPD e a língua destino é da DPE, ou vice-versa, pode ser necessário alternar entre esses dois modos para visualizar o texto nos seus respectivos modos de escrita.
+
+  <h3><a name="RTL_tags" id="RTL_tags"></a>Tags do OmegaT nos segmentos DPE</h3>
+
+  <p>Conforme mencionado acima, as tags do OmegaT são sequências da esquerda para a direita. Quando o tradutor trabalhar com línguas da DPE e EPD, para ler as tags do segmento fonte e digitá-las corretamente no segmento destino, será necessário alternar entre os modos EPD e DPE várias vezes.</p>
+
+  <p>Se o documento permitir, é recomendado que o tradutor retire as informações de estilo do documento original, dessa forma aparecerá apenas algumas tags na interface do OmegaT. Siga as dicas para lidar com as tags. Verifique as tags (ver <a href=
+  "userInterface.html#tag_validation">Verificação de tags)</a> e gere documentos traduzidos (ver acima e <a href="menu.html">Menu</a>) em intervalos regulares para facilitar a identificação de algum problema que surja. É possível traduzir uma versão de texto simples e depois acrescentar o estilo necessário usando o programa relevante.</p>
+
+  <h3><a name="RTL_CreatingTranslatedDocuments" id=
+  "RTL_CreatingTranslatedDocuments"></a>Criação de documentos DPE</h3>
+
+  <p>Quando o documento traduzido for criado, ele exibirá a mesma direção do texto que o documento original. Se o texto é da esquerda para a direita, o documento traduzido deve ser modificado manualmente no programa onde será visualizado para ter o texto da direita para a esquerda. Cada formato de saída tem maneiras específicas de lidar com exibição da direita para a esquerda; consulte o manual dos programas.</p>
+
+  <p>Para evitar modificar os parâmetros de exibição dos arquivos destino cada vez que os arquivos são abertos, é possível modificar os parâmetros de exibição do arquivo fonte para que eles sejam usados pelos arquivos destinos. Tais modificações podem ser feitas em arquivos do OpenOffice.org, por exemplo.</p>
+  <hr>
+
+  <h2><a name="formats" id="formats"></a>Formatos de arquivos</h2>
+
+  <p>Com o OmegaT você pode traduzir diversos formatos de arquivo. Basicamente há dois tipos de formatos, o <strong>texto simples</strong> e o <strong>texto formatado</strong>.</p>
+
+  <h3><a name="plaintext" id="plaintext"></a>Arquivos de texto simples</h3>
+
+  <p>Os arquivos de texto simples contêm apenas texto, portanto sua tradução é um processo simples de inserção do texto. Há diversos <a href="plainText.html">métodos</a> para codificar os arquivos de forma que seus conteúdos não apareçam truncados quando abertos no OmegaT. Tais arquivos não contêm nenhuma informação de formatação além do "espaço em branco" usado para alinhar texto, indicar parágrafos ou inserir quebra de páginas. Eles não podem conter / reter informações sobre a cor, tipo de fonte, etc. do texto. Atualmente, o OmegaT é compatível com os seguintes formatos de texto simples:</p>
+
+  <ul>
+    <li>
+      <p>ASCII text (.txt, etc.)</p>
+    </li>
+
+    <li>
+      <p>Texto codificado</p>
+    </li>
+
+    <li>
+      <p>Pacotes de recursos Java (.properties)</p>
+    </li>
+
+    <li>
+      <p>Arquivos PO (.po)</p>
+    </li>
+
+    <li>
+      <p>Arquivos INI (key=value) (.ini)</p>
+    </li>
+  </ul>
+
+  <p>Outros tipos de arquivos de texto simples podem ser processados pelo OmegaT <a href=
+  "fileFilters.html">associando</a> sua extensão de arquivo com um tipo de arquivo compatível (por exemplo, os arquivos <code>.pod</code> podem ser associados ao filtro de texto ASCII) e serem pré-processados com regras de <a href=
+  "segmentation.html">segmentação</a> específica.</p>
+
+  <h3><a name="tagged" id="tagged"></a>Arquivos de texto formatado</h3>
+
+  <p>Os arquivos de texto formatado contêm texto bem como informações do tipo de fonte, tamanho, cor, etc. Eles são geralmente criados em processadores de texto ou editores de texto html. Tais formatos de arquivos são criados de forma que mantenham as informações de formatação. Tais informações de formatação podem ser simples como <strong>isto está em negrito</strong> ou tão complexas como dados em tabelas com diferentes tamanho de fontes, cor, posições, etc. Na maioria dos trabalhos de tradução é considerado importante que o documento traduzido pareça similar ao original. O OmegaT permite-lhe fazer isso através da marcação dos caracteres/palavras que tenham uma formatação especial com <a href="formattedText.html">tags</a> fáceis de serem manipuladas. Simplificar a formatação do texto original reduz bastante a quantidade de tags. Se possível, deve-se procurar unificar as fontes usadas, os tamanhos e cores, etc., para simplificar a tradução e reduzir a possibilidade de criar <a href=
+  "userInterface.html#tag_validation">erros de tags</a>. <a name="specifics" id="specifics"></a> Cada tipo de arquivo é tratado de forma diferente no OmegaT. Para especificar um funcionamento específico do OmegaT, use <a href="fileFilters.html">filtros de arquivo</a>. Atualmente, o OmegaT é compatível com os seguintes formatos de texto formatado:</p>
+
+  <ul>
+    <li>
+      <p>OpenOffice.org</p>
+    </li>
+
+    <li>
+      <p>OpenDocument</p>
+    </li>
+
+    <li>
+      <p>Microsoft Open XML</p>
+    </li>
+
+    <li>
+      <p>(X)HTML</p>
+    </li>
+
+    <li>
+      <p>Compilador de Ajuda HTML</p>
+    </li>
+
+    <li>
+      <p>DocBook</p>
+    </li>
+
+    <li>
+      <p>Arquivos XLIFF monolíngue do Okapi</p>
+    </li>
+
+    <li>
+      <p>CopyFlow Gold para QuarkXPress</p>
+    </li>
 
-<h1>Arquivos para traduzir</h1>
+    <li>
+      <p>Arquivos legendas (SRT)</p>
+    </li>
 
-<p>Com o OmegaT você pode traduzir diretamente diversos formatos de arquivo. Existem basicamente dois tipos de formato de arquivo. Os formatos de <strong>texto simples</strong> e os formatos de <strong>texto formatado</strong>.</p>
+    <li>
+      <p>ResX</p>
+    </li>
 
-<h2>Índice</h2>
+    <li>
+      <p>Recursos Android</p>
+    </li>
 
-<ul type="none">
-   <li>1. <a href="#Plain_text_files">Arquivos de texto simples</a></li>
-   <li>2. <a href="#Formatted_text_files">Arquivos de texto formatado</a></li>
-   <li>3. <a href="#File_formats_specifics">Especificações de formatos de arquivos</a></li>
-   <li>4. <a href="#Other_file_formats">Outros formatos de arquivos</a></li>
-</ul>
+    <li>
+      <p>LaTeX</p>
+    </li>
 
-<a name="Plain_text_files"></a>
-<h3>Arquivos de texto simples</h3>
+    <li>
+      <p>Typo3 LocManager</p>
+    </li>
 
-<p>Os arquivos de texto simples contêm apenas texto, portanto sua tradução é um processo simples de inserção do texto no idioma destino.</p>
+    <li>
+      <p>Help & Manual</p>
+    </li>
 
-<p>Atualmente, o OmegaT é compatível com os seguintes formatos de texto simples:</p>
+    <li>
+      <p>Windows Resources (RC)</p>
+    </li>
 
-<ul>
-   <li>Texto em ASCII (.txt, etc.)</li>
-   <li>Texto codificado</li>
-   <li>Pacotes de recursos Java (.properties)</li>
-   <li>Arquivos PO (.po)</li>
-   <li>Arquivos INI (key=value) (.ini)</li>
-</ul>
+    <li>
+      <p>Arquivos Mozilla DTD</p>
+    </li>
 
-<p>Tais arquivos não são considerados como contendo mais formato do que "espaço em branco" para fins de alinhamento/tabulação.</p>
+  </ul>
 
-<p>Eles são via de regra modidficados em editores de texto e geralmente não é possível de manter as informações de formato como fonte/cor/margem, etc.</p>
+  <p>Outros tipos de arquivos de texto simples podem ser processados pelo OmegaT <a href=
+  "fileFilters.html">associando</a> sua extensão de arquivo com um tipo de arquivo compatível e serem pré-processados com regras de <a href=
+  "segmentation.html">segmentação</a> específica.</p>
 
-<a name="Formatted_text_files"></a>
-<h3>Arquivos de texto formatado</h3>
+  <h3><a name="others" id="others"></a>Outros formatos de arquivos</h3>
 
-<p>Os arquivos de texto formatado contêm texto bem como informações de tipo de fonte, tamanho, cor, etc. Eles são geralmente criados em processadores de texto ou editores de home page.</p>
+  <p>Outros formatos de texto simples ou formatado também podem ser processados no OmegaT</p>
 
-<p>Atualmente, o OmegaT é compatível com os seguintes formatos de texto formatado:</p>
+  <p>Podem ser usadas ferramentas externas para fazer a conversão dos arquivos para os formatos compatíveis. Lembre-se de que os arquivos traduzidos precisarão ser convertidos de novo ao formato original. Dessa forma, diversos formatos de texto simples (inclusive LaTex, etc.) podem ser traduzidos no OmegaT fazendo a conversão para o formato PO. Igualmente, diversos formatos de texto formatado (inclusive arquivos do Microsoft Office) podem ser traduzidos no OmegaT através de conversão para o formato Open Document.</p>
 
-<ul>
-   <li>Arquivos OpenOffice.org</li>
-   <li>Arquivos OpenDocument</li>
-   <li>Arquivos (X)HTML</li>
-   <li>Arquivos Compilador de Ajuda HTML (HCC)</li>
-   <li>Arquivos DocBook</li>
-</ul>
+  <p>A qualidade do arquivo traduzido dependerá da qualidade da conversão. Faça um teste de todas as opções antes de proceder com as conversões. As ferramentas gratuitas para conversão incluem:</p>
 
-<p>Tais formatos de arquivos são criados de forma que mantenham as informações de formatação. Tais informações de formatação podem ser simples como <strong>isto está em negrito</strong> ou tão complexo como dados em tabelas com diferentes tamanho de fontes, cor, posições, etc.</p>
+  <p><br></p>
 
-<p>Na maioria dos trabalhos de tradução é considerado importante que o documento traduzido pareça similar ao original. O OmegaT permite-lhe fazer isso através da marcação dos caracteres/palavras que tenham uma formatação especial com tags fáceis de serem manipuladas.</p>
+  <table width="100%" border="0" cellpadding="4" cellspacing="0" summary=
+  "just formatting">
+    <col width="50*">
+    <col width="206*">
 
-<p>Simplificar a formatação do texto original reduz bastante a quantidade de tags. Se possível, deve-se levar em conta unificar as fontes usadas, os tamanhos e cores, etc., para simplificar a tradução e reduzir o número de possíveis erros de tags.</p>
+    <tr valign="top">
+      <td width="19%">
+        <p><a name="ooo" id="ooo"></a>OpenOffice.org<a href=
+        "http://www.openoffice.org/"><br> Página oficial do OpenOffice.org</a></p>
+      </td>
 
-<a name="File_formats_specifics"></a>
-<h3>Especificações de formatos de arquivos</h3>
+      <td width="81%">
+        <p>O OmegaT não é compatível diretamente com os formatos do Microsoft Office, ou seja, Word, Excel e Power Point. Entretanto, o OpenOffice.org (e variantes) pode ser usado para converter tais formados para OpenDocument, que são compatíveis com o OmegaT.</p>
+      </td>
+    </tr>
 
-<p>A maioria dos formatos de arquivos acima está sujeita a processamentos específicos.</p>
+    <tr valign="top">
+      <td width="19%">
+        <p><a name="okapi" id="okapi"></a>Okapi framework<a href=
+        "http://okapi.sourceforge.net/Release/Tikal/ReadMe_ForMono.htm"><br> Okapi for Mono</a>, <a href=
+        "http://okapi.sourceforge.net/Release/Shared/Help/tutorial_02.htm">tutorial</a></p>
+      </td>
 
-<p>Consulte <a href="fileFormats.html" title="Formatos de arquivos compatíveis">Formato de arquivos compatíveis</a> e <a href="fileFilters.html" title="Filtros de arquivos">Filtros de arquivos</a> para informações específicas relacionadas ao processamento de todos os formatos acima citados.</p>
+      <td width="81%">
+        <p>O utilitário de extração de texto do Okapi Framework tem uma opção para criar uma árvore de pastas para iniciar um projeto no OmegaT. É possível também criar um arquivo XLIFF específico para o OmegaT. A implementação Java do Okapi Framework está disponível em <a href="http://okapi.opentag.com/">Okapi.opentag.com</a>.<br>
+        </p>
+      </td>
+    </tr>
 
-<a name="Other_file_formats"></a>
-<h3>Outros formatos de arquivos</h3>
+    <tr valign="top">
+      <td width="19%">
+        <p><a name="tt" id="tt"></a>Translate Toolkit<br> <a href="http://translate.sourceforge.net/wiki/toolkit/index">Página oficial do Translate Toolkit</a></p>
+      </td>
 
-<p>Outros formatos de texto simples ou formatado podem ser processados no OmegaT</p>
+      <td width="81%">
+        <p>O Translate Toolkit, um conjunto de ferramentas em python, oferece aos usuários diversos conversores para e de Portable Object, inclusive arquivos Mozilla .properties e dtd, arquivos CSV, arquivos Qt .ts, arquivos XLIFF. O kit inclui diversas ferramentas para processar tais arquivos antes e depois de serem traduzidos no OmegaT.</p>
+      </td>
+    </tr>
 
-<p>Em termos gerais, diversos formatos de texto simples (inclusive LaTeX, etc.) podem ser traduzidos no OmegaT através da conversão para o formato PO.</p>
+    <tr valign="top">
+      <td width="19%">
+        <p><a name="po4a" id="po4a"></a>po4a<br> <a href="http://po4a.alioth.debian.org/">Página oficial do po4a</a></p>
+      </td>
 
-<p>Igualmente, diversos formatos de texto formatado (inclusive arquivos do Microsoft Office) podem ser traduzidos no OmegaT através de conversão para o formato Open Document.</p>
+      <td width="81%">
+        <p>po4a é uma ferramenta perl do Debian. Pode converter formatos de arquivos tais como LaTeX, TeX, POD, etc. de e para Portable Object.</p>
+      </td>
+    </tr>
+  </table>
+  <hr>
 
-<p>Para obter mais informações, consulte <a href="fileFormats.html" title="Formatos de arquivos compatíveis">Formatos de arquivos compatíveis</a>.</p>
+  <table style="width: 100%;" border="0" cellpadding="2" cellspacing="2"
+  summary="just formatting">
+    <tbody>
+      <tr>
+        <td style="text-align: left;"><a href="legalNotices.html">Avisos legais</a></td>
 
-<hr>
-<p><a href="legalNotices.html" title="Avisos legais">Avisos legais</a></p>
+        <td style="text-align: center;"><a href="index.html">Home</a></td>
 
+        <td style="text-align: right;"><a href="xindex.html">Índice</a></td>
+      </tr>
+    </tbody>
+  </table>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/docs/pt_BR/fontSettings.html b/docs/pt_BR/fontSettings.html
index ac91050..3a6b91d 100644
--- a/docs/pt_BR/fontSettings.html
+++ b/docs/pt_BR/fontSettings.html
@@ -1,26 +1,59 @@
 <html>
 <head>
-   <meta http-equiv="content-type" content="text/html; charset=UTF-8">
-   <title>Definições de fontes - OmegaT 1.6.1 Manual do Usuário</title>
+  <link rel="stylesheet" href="./OmegaT.css" type="text/css">
+  <meta http-equiv="content-type" content="text/html; charset=UTF-8">
+  <title>Definições de fontes - Manual do Usuário, OmegaT 2.0 </title>
 </head>
+
 <body>
+  <h2>Definições de fontes</h2>
+
+  <p>Nesta caixa de diálogo você pode modificar a fonte usada pelo OmegaT nas seguintes janelas:</p>
+
+  <ul>
+    <li>
+      <p>Janela principal do OmegaT (Editor, Visualizador de correspondências e Visualizador de glossário)</p>
+    </li>
+
+    <li>
+      <p>Janela Busca</p>
+    </li>
+
+    <li>
+      <p>Janela Verificação de tags</p>
+    </li>
+  </ul>
 
-<h1>Definições de fontes</h1>
+  <p>A caixa de diálogo pode ser acessada via <strong>Opções → Fonte...</strong> no  <a href="menu.html">menu principal</a>.</p>
 
-<p>Nesta caixa o usuário pode modificar a fonte que o OmegaT usa para exibir o texto fonte, a tradução, as correspondências e os termos do glossário. Para isto, basta clicar em <strong>Opções -> Fonte...</strong> <a href="menu.html" title="Menu principal">no menu principal</a>.</p>
+  <p>Nesta caixa de diálogo você pode modificar as configurações da fonte:</p>
 
-<p>A caixa contém:</p>
+  <ul>
+    <li>
+      <p>Use a caixa suspensa para selecionar entre as fontes disponíveis</p>
+    </li>
 
-<ul>
-   <li>Um menu suspenso com opções de fontes disponíveis no seu computador.</li>
-   <li>Setas para editar o tamanho da fonte.</li>
-   <li>Uma área com o mesmo texto para visualizar imediatamente a fonte selecionada.</li>
-</ul>
+    <li>
+      <p>Use a caixa de rotação para ajustar o tamanho da fonte selecionada</p>
+    </li>
 
-<p>Aviso! Pode demorar para que o OmegaT atualize a exibição após você ter modificado a definição da fonte, especialmente quando um arquivo grande com muitos segmentos estiver aberto no editor. Alguma fontes também funcionam melhor com alguns pares de idiomas do que com outros. De modo geral, é melhor modificar a fonte antes de abrir um projeto. O processo pode ser muito mais difícil para a combinação G4 + Mac OS X + Japonês.</p>
+    <li>
+      <p>O texto de exemplo no quadro de visualização é exibido na fonte selecionada, assim você pode verificá-la imediatamente</p>
+    </li>
+  </ul>
 
-<hr>
-<p><a href="legalNotices.html" title="Avisos legais">Avisos legais</a></p>
+  <p><strong>Aviso!</strong> Em alguns casos o OmegaT pode demorar para atualizar a exibição após você modificar as configurações de fonte, especialmente se o arquivo aberto for grande. Observe também que alguma fontes funcionam melhor com alguns pares de línguas do que com outros.</p>
+  <hr>
+  <table style="width: 100%;" border="0" cellpadding="2" cellspacing="2" summary="just formatting">
+    <tbody>
+      <tr>
+        <td style="text-align: left;"><a href="legalNotices.html">Avisos legais</a> </td>
+        <td style="text-align: center;"><a href="index.html">Home</a>
+        </td>
+        <td style="text-align: right;"><a href="xindex.html">Índice</a> </td>
+      </tr>
+    </tbody>
+  </table>
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/docs/pt_BR/formattedText.html b/docs/pt_BR/formattedText.html
index fd351c6..ae2afc1 100644
--- a/docs/pt_BR/formattedText.html
+++ b/docs/pt_BR/formattedText.html
@@ -1,214 +1,270 @@
 <html>
 <head>
-   <meta http-equiv="content-type" content="text/html; charset=UTF-8">
-   <title>Trabalhar com texto formatado - OmegaT 1.6.1 Manual do Usuário</title>
-</head>
-<body>
-
-<h1>Trabalhar com texto formatado</h1>
-
-<h2>Índice</h2>
-
-<ul type="none">
-   <li>1. <a href="#Formatted_Text_in_OmegaT">Texto formatado no OmegaT</a>
-
-      <ul type="none">
-         <li>1.1. <a href="#Tag_naming">Nomes das tags</a></li>
-         <li>1.2. <a href="#Tag_numbering">Numeração das tags</a></li>
-         <li>1.3. <a href="#Pairs_and_singletons">Pares e singletons</a></li>
-         <li>1.4. <a href="#Tags_and_sentence_segmenting">Tags e segmentação por sentença</a></li>
-
-         <li>1.5. <a href="#Tag_operations">Trabalhar com tags</a>
-
-            <ul type="none">
-               <li>1.5.1. <a href="#Tag_group_duplication">Duplicação de grupos de tags</a></li>
-               <li>1.5.2. <a href="#Tag_group_deletion">Exclusão de grupos de tags</a></li>
-               <li>1.5.3. <a href="#Tag_group_order_modification">Modificação da ordem de grupos de tags</a></li>
-               <li>1.5.4. <a href="#Tag_group_nesting">Aninhamento de grupos de tags</a></li>
-            </ul>
-         </li>
-
-         <li>1.6. <a href="#Tag_group_overlapping">Sobreposição de grupos de tags</a></li>
-         <li>1.7. <a href="#Tag_group_validation">Validação de grupos de tags</a></li>
-         <li>1.8. <a href="#Hints_for_tags_management">Dicas para controle de tags</a></li>
-         <li>1.9. <a href="#Important">Importante</a></li>
-      </ul>
-   </li>
-</ul>
-
-<a name="Formatted_Text_in_OmegaT"></a>
-<h2>Texto formatado no OmegaT</h2>
-
-<p>As informações de formatação presentes no arquivo fonte geralmente precisam ser reproduzidas no arquivo destino. O OmegaT exibe as informações de formatação in-line dos formatos que suporta (no momento  DocBook, HTML, XHTML, Open Document e OpenOffice.org) como tags, ou etiquetas com códigos de formatação. As tags geralmente não são consideradas na comparação entre as seqüências de caracteres para fins de correspondência. As tags que você reproduziu no segmento traduzido estarão presentes no documento traduzido.</p>
-
-<a name="Tag_naming"></a>
-<h3>Nomes das tags</h3>
-
-<p>As tags consistem de um a três caracteres e um número. Um número exclusivo permite agrupar aquelas tags que se correspondem e diferenciar as tags que possam ter o mesmo caractere de atalho, mas na verdade são diferentes.</p>
-
-<p>Os caracteres podem ou não refletir o valor da formatação que a tag representa (por exemplo negrito, itálico, etc.)</p>
-
-<a name="Tag_numbering"></a>
-<h3>Numeração das tags</h3>
-
-<p>As tags são numeradas de forma seqüencial e crescente por <strong>grupo de tags</strong>.</p>
-
-<p>O que nós chamamos de "grupos de tags" pode ser uma única tag (como <code><br1></code>), sozinha, ou 2 tags formando um par (como <code><f3></code> e <code></f3></code>).</p>
-
-<p>Dentro de um segmento, o primeiro grupo (par ou singleton) recebe o número <strong>0</strong>, o segundo o número <strong>1</strong>, etc.</p>
-
-<p>O primeiro exemplo acima tem 3 grupos de tags (um par, um singleton e depois, um outro par), o segundo exemplo tem apenas um grupo (um par).</p>
-
-<a name="Pairs_and_singletons"></a>
-<h3>Pares e singletons</h3>
-
-<p>As tags sempre são apresentadas em singletons ou em pares.</p>
-
-<p>
-<strong>Tags únicas</strong> indicam informações de formatação que não interferem no texto (espaço extra ou quebra de linha, por exemplo).</p>
-
-<pre>   <strong><segment 2132></strong><b0><Ctr+N></b0>, <br1><b2><Enter></b2><strong><end segment></strong></pre>
-
-<p>
-<code><strong><br1></strong></code> é uma tag única e não interfere no texto.</p>
-
-<p>
-<strong>Tags em pares</strong> geralmente indicam informações de estilo que se aplica ao texto entre a tag de início e a tag de fim de um par. Sejam quais forem os códigos de um par, a tag de início deve sempre vir antes da tag de fim.</p>
-
-<pre>   <strong><segment 3167></strong>Arquivo de registro (<f1>log.txt</f1>) para acompanhar as operações e erros.<strong><end segment></strong></pre>
-
-<p>
-<code><strong><f1></strong></code> e <code><strong></f1></strong></code> estão em par e influenciam o <code><strong>log.txt</strong></code>.</p>
-
-<a name="Tags_and_sentence_segmenting"></a>
-<h3>Tags e segmentação por sentença</h3>
-
-<p>OmegaT cria suas tags antes de aplicar a segmentação de sentenças. Dependendo das regras de segmentação, pode ser que as tags pareçam desrespeitar as regras acima de numeração e grupos.</p>
-
-<pre>   <strong><segment 1554></strong> <c0>Antes: \. Depois: \s</c0><br> <b2>Observação:</b2><br>
-"\." significa o caractere "."<br3> "\s" significa qualquer caractere de espaço em branco <strong><end segment></strong></pre>
-
-<p>Parece que não há problemas aqui. Agora, se aplicarmos as regras de segmentação padrão neste segmento (o funcionamento padrão do OmegaT), iremos ter o seguinte resultado:</p>
-
-<pre>   <strong><segment 1990></strong> <c0>Antes: \. <strong><end segment></strong>
-
-   <strong><segment 1991></strong> Depois: \s</c0><br1> <strong><end segment></strong>
-
-   <strong><segment 1992></strong> <b2>Observação:</b2> "\." significa o caractere "."<br3><strong><end segment></strong>
-
-   <strong><segment 1993></strong> "\s" significa qualquer caractere de espaço em branco <strong><end segment></strong></pre>
-
-<p>(As regras de segmentação que se aplicam são: <i>segmentar após um ponto seguido por um espaço</i> e <i>segmentar após uma tag de quebra de linha</i>.)</p>
-
-<p>Aqui, vemos que os segmentos considerados um a um não respeitam as regras de pares e numeração: <code><c0></code> e <code></c0></code> deveriam estar em par no mesmo segmento, mas estão separados pelas regras de segmentação</p>
-
-<p>Em alguns casos isso pode causar problemas na tradução, quando as tags devem ser exibidas no idioma destino para refletir a ordem das palavras naquele idioma (veja <a href="#Tag_operations" title="Trabalhar com texto formatado">Trabalhar com tags</a> abaixo).</p>
-
-<a name="Tag_operations"></a>
-<h3>Trabalhar com tags</h3>
-
-<p>Deve-se prestar muita atenção ao trabalhar com tags. Se elas forem modificadas por engano, a formatação final do arquivo pode ficar corrompida. Na pior das hipóteses, um arquivo poderá não abrir; isto poderá ocorrer principalmente com arquivos OpenOffice.org.</p>
-
-<a name="Tag_group_duplication"></a>
-<h4>Duplicação de grupos de tags</h4>
-
-<p>Para duplicar grupos de tags, basta copiá-los na nova posição desejada. Lembre-se de que em um grupo de pares a tag de início deve vir antes da tag de fim.</p>
-
-<p>A formatação representada pelo grupo que você duplicou será aplicada à seção onde foi inserida.</p>
-
-<p>Exemplo:</p>
+  <link rel="stylesheet" href="./OmegaT.css" type="text/css">
+  <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 
-<pre>   <strong><segment 0001></strong><f0>Esta formatação</f0> vai ser duplicada aqui.<strong><end segment></strong></pre>
-
-<p>Após a duplicação:</p>
-
-<pre>   <strong><segment 0001></strong><f0>Ce format</f0> a été <f0>copié ici</f0>.<strong><end segment></strong></pre>
-
-<a name="Tag_group_deletion"></a>
-<h4>Exclusão de grupo de tags</h4>
-
-<p>Para excluir grupos de tags, basta apagá-los do segmento. Lembre-se de que um grupo de pares deve ter sua tag de início bem como de fim excluídas para garantir que todos os vestígios de formatação foram apagados; caso contrário, o arquivo traduzido pode se corromper e não abrir.</p>
-
-<p>Ao apagar um grupo de tags você exclui toda a formatação a elas relacionadas de um arquivo traduzido.</p>
-
-<p>Exemplo:</p>
-
-<pre>   <strong><segment 0001></strong><f0>Esta formatação</f0> será excluída.<strong><end segment></strong></pre>
-
-<p>Após a exclusão:</p>
-
-<pre>   <strong><segment 0001></strong>Ce format a été effacé.<strong><end segment></strong></pre>
-
-<a name="Tag_group_order_modification"></a>
-<h4>Modificação da ordem de grupos de tags</h4>
-
-<p>Para modificar a seqüência de um grupo de tags para refletir a estrutura diferente usada na tradução, basta colocar o grupo de tags no local correspondente na tradução.</p>
-
-<p>A formatação será aplicada na parte onde foi inserida.</p>
-
-<p>Exemplo:</p>
-
-<pre>   <strong><segment 0001></strong><f0>A formatação daqui</f0> e <f1>e a formatação daqui</f1> será modificada.<strong><end segment></strong></pre>
-
-<p>Após a modificação da ordem:</p>
-
-<pre>   <strong><segment 0001></strong><f1>Ce format</f1> et <f0>ce format</f0> ont été inversés.<strong><end segment></strong></pre>
-
-<a name="Tag_group_nesting"></a>
-<h4>Aninhamento de grupos de tags</h4>
-
-<p>Modificar a ordem de um grupo de tags pode resultar no aninhamento deste grupo em um outro grupo de tags. Isto não representa nenhum problema, desde que o grupo esteja totalmente aninhado dentro do outro. É necessário ter cautela com o aninhamento, especialmente se os pares de tags não forem movidos totalmente para dentro do outro grupo, pois o arquivo traduzido pode se corromper e não abrir.</p>
-
-<p>A parte aninhada terá ambas as formatações aplicadas.</p>
-
-<p>Exemplo:</p>
-
-<pre>   <strong><segment 0001></strong><f0>A formatação</f0> <f1>daqui</f1> vai ser aninhada.<strong><end segment></strong></pre>
-
-<p>Após o aninhamento:</p>
-
-<pre>   <strong><segment 0001></strong><f0>Le format <f1>ici</f1></f0> a été emboité dans le premier format.<strong><end segment></strong></pre>
-
-<a name="Tag_group_overlapping"></a>
-<h3>Sobreposição de grupos de tags</h3>
-
-<p>A sobreposição é o resultado da manipulação incorreta de pares de tags e certamente resultará em problemas de formatação e pode acontecer do arquivo traduzido não abrir.</p>
-
-<p>Exemplo:</p>
-
-<pre>   <strong><segment 0001></strong><f0>a formatação</f0> <f1>daqui</f1> vai ser bagunçada.<strong><end segment></strong></pre>
-
-<p>Após a manipulação incorreta:</p>
-
-<pre>   <strong><segment 0001></strong><f0>a formatação <f1>daqui</f0> </f1>está muito bagunçada agora.<strong><end segment></strong></pre>
-
-<a name="Tag_group_validation"></a>
-<h3>Validação de grupos de tags</h3>
-
-<p>A função de validação de tags ( <a href="userInterface.html#Tag_Validation" title="A interface do usuário">Validação de tags</a>) detecta as tags modificadas (deliberadamente ou por engano) e indica os segmentos afetados. O uso desta função abrirá uma caixa de diálogo com as tags danificadas ou suspeitas de estarem incorretas em um documento.</p>
-
-<p>Esta função pode ser útil para controle de erros (bugs) em um texto traduzido com tags. Isto geralmente é um problema com arquivos OpenDocument ou OpenOffice.org que não abrirão devido a problemas de tags criadas no processo de tradução. Geralmente reparar as tags e recriar os documentos destino pode solucionar o problema.</p>
-
-<a name="Hints_for_tags_management"></a>
-<h3>Dicas para controle de tags</h3>
-
-<p>As tags geralmente representam algum tipo de formatação no texto original. <strong>Simplificar a formatação do texto original </strong> ajuda bastante na redução do número de tags. Se possível, deve-se levar em conta unificar as fontes usadas, os tamanhos e cores, etc., para simplificar a tradução e reduzir o número de possíveis erros de tags.</p>
-
-<p>Dê uma olhada na seção <a href="#Tag_operations" title="Trabalhar com texto formatado">Trabalhar com tags</a> para ver o que pode ser feito com tags.</p>
-
-<p>Lembre-se de que se as tags dificultarem seu trabalho e a formatação não for extremamente importante para o trabalho a ser traduzido, remover a formatação do documento fonte facilitará bastante a tradução.</p>
-
-<p>Se precisar ver as tags no OmegaT, mas não precisar reter a maioria do formato no documento traduzido, você pode optar por não acrescentar as tags na tradução. Neste caso <strong>preste atenção aos pares de tags</strong> pois se esquecer de apagar uma parte do par resultará em problemas na formatação do documento; isto corromperá um documento OpenOffice.org traduzido e ele não abrirá.</p>
-
-<p>Já que há tags inseridas no próprio documento, é possível usar as <a href="segmentation.html" title="Segmentação do texto fonte">regras de segmentação</a> para criar segmentos que incluam menos tags. Esta é uma função avançada e não deve ser usada por usuários iniciantes.</p>
-
-<a name="Important"></a>
-<h3>Importante</h3>
-
-<p>O OmegaT ainda não faz a detecção total e automática de erros na formatação; portanto, não o alertará se você cometer erros ou mudar a formatação para melhor adaptá-la ao idioma destino. Algumas vezes, porém, o arquivo traduzido pode parecer distorcido e no caso do OpenDocument / OpenOffice.org os arquivos podem até não abrir.</p>
-
-<hr>
-<p><a href="legalNotices.html" title="Avisos legais">Avisos legais</a></p>
+  <title>Trabalhar com texto formatado - Manual do Usuário, OmegaT 2.0 </title>
+</head>
 
+<body>
+  <h2>Trabalhar com texto formatado</h2>
+
+  <ul>
+    <li>
+      <p><a href="#intro">Tags de formatação</a></p>
+    </li>
+
+    <li>
+      <p><a href="#tag_segmenting">Tags e segmentação por sentença</a></p>
+    </li>
+
+    <li>
+      <p><a href="#tag_operation">Trabalhar com tags</a></p>
+    </li>
+
+    <li>
+      <p><a href="#nesting">Aninhamento de grupos de tags</a></p>
+    </li>
+
+    <li>
+      <p><a href="#tag-overlapping">Sobreposição de grupos de tags</a></p>
+    </li>
+
+    <li>
+      <p><a href="#tag_validation">Verificação de grupos de tags</a></p>
+    </li>
+
+    <li>
+      <p><a href="#tag_hints">Dicas para controle de tags</a></p>
+    </li>
+
+    <li>
+      <p><A href="#printf">printf-placeholders</A></p>
+    </li>
+  </ul>
+
+  <p>As informações de formatação presentes no arquivo fonte geralmente precisam ser reproduzidas no arquivo traduzido. O OmegaT mostra informações de formatação in-line dos formatos que suporta (no momento DocBook, HTML, XHTML, Open Document e OpenOffice.org) como tags, ou etiquetas com códigos de formatação. As tags geralmente não são consideradas na comparação entre textos diferentes  para fins de correspondência. As tags reproduzidas no segmento traduzido estarão presentes no documento traduzido.</p>
+  <hr>
+
+  <h3><a name="intro" id="intro"></a>Tags de formatação</h3>
+
+  <p><a name="naming" id="naming"></a><b>Composição das tags:</b> as tags são formadas de um a três caracteres e um número. Um número exclusivo permite agrupar aquelas tags que se correspondem e diferenciar as tags que possam ter o mesmo caractere de atalho, mas na verdade são diferentes. Os caracteres podem ou não refletir o valor da formatação que a tag representa (por exemplo, negrito, itálico, etc.)</p>
+
+  <p><a name="numbering" id="numbering"></a><b>Numeração das tags:</b> as tags são numeradas de forma sequencial e crescente por <strong>grupo de tags</strong>. O que nós chamamos de "grupos de tags" pode ser uma única tag (como <code><font color=
+  "#FB0000"><br1></font></code>), sozinha, ou 2 tags formando um par (como <code><font color="#FB0000"><i0></font></code> e <code><font color="#FB0000"></i0></font></code>). Dentro de um segmento, o primeiro grupo (par ou singleton) recebe o número <strong>0</strong>, o segundo o número <strong>1</strong>, etc. O primeiro exemplo abaixo tem 3 grupos de tags (um par, um singleton e depois, um outro par), o segundo exemplo tem apenas um grupo (um par).</p>
+
+  <p><a name="pairs" id="pairs"></a><b>Pares e singletons:</b> as tags sempre são apresentadas em singletons ou em pares. <strong>Tags únicas</strong> indicam informações de formatação que não interferem no texto (espaço extra ou quebra de linha, por exemplo).</p>
+  <pre>
+ <strong><segment 2132></strong><font color=
+"#FB0000"><b0></font><Ctr+N><font color=
+"#FB0000"></b0></font>, <font color=
+"#FB0000"><br1><b2></font><Enter><font color=
+"#FB0000"></b2></font><strong><end segment></strong>
+</pre>
+
+  <p><code><strong><font color="#FB0000"><br1></font></strong></code> é uma tag única e não interfere no texto. <strong>Tags em pares</strong> geralmente indicam informações de estilo que se aplicam ao texto entre a tag de início e a tag de fim de um par. Sejam quais forem os códigos de um par, a tag de início deve sempre vir antes da tag de fim:</p>
+  <pre>
+ <strong><segmento 3167></strong>Arquivos de registro (<font color=
+"#FB0000"><b0></font>log.txt<font color=
+"#FB0000"></b0></font>) para acompanhar as operações e erros.<strong><fim do segmento></strong>
+</pre>
+
+  <p><code><strong><font color="#FB0000"><b0></font></strong></code> <font size="3">e</font> <code><strong><font color=
+  "#FB0000"></b0></font></strong></code> estão em par e influenciam o texto <code><strong>log.txt</strong></code>.</p>
+  <hr>
+
+  <h3><a name="tag_segmenting" id="tag_segmenting"></a>Tags e segmentação por sentença</h3>
+
+  <p>OmegaT cria suas tags antes de aplicar a segmentação de sentenças. Dependendo das regras de segmentação, pode ser que as tags pareçam desrespeitar as regras acima de numeração e grupos. Veja o texto a seguir: "<em>Antes: \. Depois: \s"</em><font color="#FB0000">.</font> <font color="#000000">A segmentação esperada seria (<b0> e </b0> indica o início e o fim do itálico):</font></p>
+  <pre>
+ <strong><segmento ....></strong> <font color=
+"#FB0000"><b0></font> Antes: \. Depois: \s<font color=
+"#FB0000"></b0></font><strong><fim do segmento></strong>
+</pre>
+
+  <p>Entretanto, se aplicarmos as regras de segmentação padrão neste segmento, o resultado final será o seguinte:</p>
+  <pre>
+ <strong><segmento 1990></strong> <font color=
+"#FB0000"><b0></font> Antes: \. <strong><final segmento></strong><br>
+<strong><segmento 1991></strong> Depois: \s<font color=
+"#FB0000"></b0></font><strong><fim do segmento></strong> <br> 
+</pre>
+
+  <p>Aplicar a regra <i>segmentar depois de um ponto seguido por um espaço</i> divide o texto original em dois segmentos, mesmo se as duas tags <code><font color="#FB0000"><b0></font></code> e <code><font color=
+  "#FB0000"></b0></font></code>devam ser mantidas juntas no mesmo segmento. Em alguns casos isso pode causar problemas na tradução, quando as tags devem ser colocadas em local diferente na frase para refletir a ordem das palavras na língua destino (veja <a href="#tag_operation">Trabalhar com tags</a> abaixo).</p>
+  <hr>
+
+  <h3><a name="tag_operation" id="tag_operation"></a>Trabalhar com tags</h3>
+
+  <p>Deve-se prestar muita atenção ao trabalhar com tags. Se elas forem modificadas por engano, a formatação final do arquivo pode ficar corrompida. O recomendado é "Se está funcionando, não mexa". Entretanto, é sempre bom saber o que é possível fazer e como fazer.</p>
+
+  <p><a name="duplication" id="duplication"></a><b>Duplicação de grupos de tags:</b> para duplicar grupos de tags, basta copiá-los na nova posição desejada. Lembre-se de que em um grupo de pares a tag de início deve vir antes da tag de fim. A formatação representada pelo grupo que você duplicou será aplicada à seção onde a duplicação foi inserida.</p>
+
+  <p>Exemplo:</p>
+  <pre>
+ <strong><segmento 0001></strong><font color=
+"#FB0000"><b0></font>Esta formatação<font color=
+"#FB0000"></b0></font> vai ser duplicada aqui.<strong><fim do segmento></strong>
+</pre>
+
+  <p>Após a duplicação:</p>
+  <pre>
+ <strong><segmento 0001></strong><font color=
+"#FB0000"><b0></font>Esta formatação<font color=
+"#FB0000"></b0></font> foi <font color=
+"#FB0000"><b0></font>duplicada aqui<font color=
+"#FB0000"></b0></font>.<strong><fim do segmento></strong>
+</pre>
+
+  <p><a name="deletion" id="deletion"></a><b>Exclusão de grupos de tags:</b> para excluir grupos de tags, basta apagá-los do segmento. Lembre-se de que um grupo de pares deve ter sua tag de início bem como de fim excluídas para garantir que todos os vestígios de formatação foram apagados; caso contrário, o arquivo traduzido pode ficar corrompido. Ao apagar um grupo de tags você exclui toda a formatação a elas relacionada de um arquivo traduzido.</p>
+
+  <p>Exemplo:</p>
+  <pre>
+ <strong><segmento 0001></strong><font color=
+"#FB0000"><b0></font>Esta formatação<font color=
+"#FB0000"></b0></font> será excluída.<strong><fim do segmento></strong>
+</pre>
+
+  <p>Após a exclusão:</p>
+  <pre>
+ <strong><segmento 0001></strong>Esta formatação foi excluída.<strong><fim do segmento></strong>
+</pre>
+
+  <p><b>Modificação da sequência de grupos de tags:</b> para modificar a sequência de um grupo de tags para refletir a estrutura diferente usada na tradução, basta colocar o grupo de tags no local correspondente na tradução. A formatação será aplicada na parte onde foi inserida.</p>
+
+  <p>Exemplo:</p>
+  <pre>
+ <strong><segmento 0001></strong><font color=
+"#FB0000"><b0></font>Formatação zero<font color=
+"#FB0000"></b0></font> e <font color=
+"#FB0000"><b1></font>formatação um <font color=
+"#FB0000"></b1></font>serão invertidas.<strong><fim do segmento></strong>
+</pre>
+
+  <p>Após a modificação da sequência:</p>
+  <pre>
+ <strong><segmento 0001></strong><font color=
+"#FB0000"><b1></font>Formatação um<font color=
+"#FB0000"></b1></font> e <font color=
+"#FB0000"><b0></font>formatação zero<font color=
+"#FB0000"></b0></font> foram invertidas.<strong><fim do segmento></strong>
+</pre>
+
+  <h3><a name="nesting" id="nesting"></a>Aninhamento de grupos de tags</h3>
+
+  <p>Modificar a sequência de um grupo de tags pode resultar no aninhamento deste grupo em um outro grupo de tags. Isto não representa nenhum problema, desde que o grupo esteja totalmente aninhado dentro do outro. Em outras palavras, ao mover as tags em par assegure-se de que as tags de início e de fim foram movidas; caso contrário, o arquivo traduzido pode ficar corrompido e não abrir. A parte aninhada terá ambas as formatações aplicadas.</p>
+
+  <p>Exemplo:</p>
+  <pre>
+ <strong><segmento 0001></strong><font color=
+"#FB0000"><b0></font>Formatação<font color=
+"#FB0000"></b0></font> <font color=
+"#FB0000"><b1></font>um<font color=
+"#FB0000"></b1></font> vai ser aninhada na formatação zero.<strong><fim do segmento></strong>
+</pre>
+
+  <p>Após o aninhamento:</p>
+  <pre>
+ <strong><segmento 0001></strong><font color=
+"#FB0000"><b0></font>Formatação <font color=
+"#FB0000"><b1></font>um<font color=
+"#FB0000"></b1></b0></font> foi aninhada na formação zero.<strong><fim do segmento</strong>
+</pre>
+  <hr>
+
+  <h3><a name="tag-overlapping" id="tag-overlapping"></a>Sobreposição de grupos de tags</h3>
+
+  <p>A sobreposição é o resultado da manipulação incorreta de pares de tags e certamente resultará em problemas de formatação e o arquivo traduzido pode não abrir. Exemplo:</p>
+  <pre>
+ <strong><segment 0001></strong><font color=
+"#FB0000"><b0></font>Formatação<font color=
+"#FB0000"></b0></font> <font color=
+"#FB0000"><b1></font>um<font color=
+"#FB0000"></b1></font> vai ser bagunçada.<strong><end segment></strong>
+</pre>
+
+  <p>Após a manipulação incorreta:</p>
+  <pre>
+ <strong><segment 0001></strong><font color=
+"#FB0000"><b0></font>Formatação <font color=
+"#FB0000"><b1></font>um<font color=
+"#FB0000"></b0></font> <font color=
+"#FB0000"></b1></font>está muito bagunçada agora.<strong><end segment></strong>
+</pre>
+  <hr>
+
+  <h3><a name="tag_validation" id="tag_validation"></a>Verificação de grupos de tags</h3>
+
+  <p>A função de verificação de tags detecta as tags modificadas (deliberadamente ou por engano) e indica os segmentos afetados. Para usar esta função pressione Ctrl+T - uma janela abrirá com todos os segmentos de um arquivo onde há tags incorretas ou danificadas na tradução. Os problemas de tags, criados no processo de tradução, são geralmente um problema para os arquivos no OpenDocument ou OpenOffice.org, pois eles podem não abrir. É fácil consertar as tags e recriar os documentos traduzidos com a função verificar tags. A janela, que abre com o comando Ctrl+T, tem a forma de tabela de 3 colunas com um link para o segmento, o segmento original e o segmento destino:</p><br>
+
+  <table align="center" border="1" width="80%" summary="">
+    <tbody>
+      <tr>
+        <td>1</td>
+
+        <td>Para selecionar uma fonte de visualização diferente, clique na caixa de diálogo <strong><font color="blue"><b0></font></strong>Fonte de visualização<strong><font color="blue"></b0></font></strong>. Para abrir esta caixa clique em <strong><font color=
+        "blue"><i1></font></strong>Configurações<strong><font color=
+        "blue"></i1></font></strong> >e depois <strong><font color=
+        "blue"><i2></font></strong>Fonte de visualização...<strong><font color=
+        "blue"></i2></font></strong>. O tipo e tamanho da fonte podem ser modificados nessa caixa.</td>
+
+        <td>'n Mens kan 'n ander vertoonfont kies met die <strong><font color=
+        "blue"><b0></font></strong>Vertoonfont<strong><font color=
+        "blue"></b0></font></strong>-dialoogkassie. Kies
+        <strong><font color=
+        "blue"><i1></font></strong>Opstelling<strong><font color=
+        "blue"></i1></font></strong> > Vertoonfont... op die kieslys.
+        Die lettertipe én die lettergrootte kan met dié dialoogkassie verander
+        word.</td>
+      </tr>
+    </tbody>
+  </table>
+
+  <p>As tags estão destacadas em azul escuro para facilitar a comparação entre o original e o conteúdo traduzido. Clique no link para abrir o segmento no Editor. Corrija o erro, se necessário, e pressione <code><a href="menu.html#shortcuts">Ctrl+T</a></code> para voltar à janela de verificação de tags para ver se há outros erros. Os erros de <a href="#intro">tags</a> são <a href="#tag_operation">manipulações de tags</a> na tradução que não reproduzem a mesma sequência e números das tags do segmento original. Algumas manipulações de tags são necessárias e não causam erros; algumas causarão problemas quando for criado o documento traduzido.</p>
+  <hr>
+
+  <h3><a name="tag_hints" id="tag_hints"></a>Dicas para controle de tags</h3>
+
+  <p>As tags geralmente representam algum tipo de formação do texto original. <strong>Simplificar a formatação do texto original</strong> reduz bastante a quantidade de tags. Se possível, deve-se procurar unificar as fontes usadas, os tamanhos e cores, etc., para simplificar a tradução e reduzir a possibilidade de criar erros de tags. Dê uma olhada na seção <a href=
+  "#tag_operation">Trabalhar com tags</a> para ver o que pode ser feito com tags. Lembre-se de que se as tags dificultarem seu trabalho e a formatação não for extremamente importante à tradução, remover as tags evitará problemas.</p>
+
+  <p>Se precisar ver as tags no OmegaT, mas não precisar reter a maioria do formato no documento traduzido, você pode optar por não acrescentar as tags na tradução. Neste caso <strong>preste atenção aos pares de tags</strong> pois se esquecer de apagar uma parte do par a formatação do documento ficará corrompida. Já que há tags inseridas no próprio documento, é possível usar as <a href=
+  "segmentation.html">regras de segmentação</a> para criar segmentos com menos tags. Esta é uma função avançada e requer alguma experiência do usuário.</p>
+
+  <p><strong>Importante:</strong> o OmegaT ainda não faz a detecção total e automática de erros na formatação; portanto, não o alertará se você cometer erros ou mudar a formatação para melhor adaptá-la à língua destino. Algumas vezes, porém, o arquivo traduzido pode parecer distorcido e no caso do OpenDocument / OpenOffice.org os arquivos podem até não abrir.</p>
+
+  <hr>
+
+  <h3><a name="printf"></a>printf-placeholders</h3>
+
+  <p>Em algumas linguages de programação (p.ex. PHP, C) são usadas tags especiais como placeholders (marcadores) em sequências de caracteres (strings) utilizadas em conjunto com a função printf. E.g.:
+  </p>
+  <pre>$var =_("cool");
+echo printf(_("OmegaT is very %s"),$var);</pre>
+
+  <p>Se as sequências de caracteres são extraídas deste código fonte (p.ex. via filtro-PO), o OmegaT não substituirá essas variáveis com tags porque não saberá ao certo se, por exemplo,  <code>%s</code> é realmente um  placeholder ou apenas parte do texto. No entanto, você pode ativar a validação destes placeholders. Selecione no menu <strong>Opções→ Verificação de tags...</strong>. Escolha entre a verificação simples ou completa.</p>
+
+  <p>A sintaxe oficial para printf variáveis ​​é</p>
+  <pre>"%" [ARGUMENTSWAPSPECIFIER] [SIGNSPECIFIER] [PADDINGSPECIFIER] [ALIGNMENTSPECIFIER] [WIDTHSPECIFIER] [PRECISIONSPECIFIER] TYPESPECIFIER</pre>
+
+  <p>A verificação completa é compatível com este formato, exceto o <code>WIDTHSPECIFIER</code>. Na verificação simples a seguinte sintaxe é verificada:</p>
+  <pre>"%" [ARGUMENTSWAPSPECIFIER] [PRECISIONSPECIFIER] TYPESPECIFIER</pre>
+
+  <p>É possível alterar a ordem dos placeholders, mas neste caso é necessário acrescentar o  ARGUMENTSWAPSPECIFIER se ainda não estiver lá. Isto significa acrescentar um número de seqüência e um cifrão após o <code>%</code>. Por exemplo <code>"% S% s é um aplicativo"</code> é igual a <code>"% 1 $ s% 2 é um aplicativo $ s"</code> que você pode traduzir com <code>"A aplicação de 2% $ s é% 1 $ s"</code>.
+  </p>
+  <hr>
+
+  <table style="width: 100%;" summary="just formatting" border="0" cellpadding=
+  "2" cellspacing="2">
+    <tbody>
+      <tr>
+        <td style="text-align: left;"><a href="legalNotices.html">Avisos legais</a></td>
+
+        <td style="text-align: center;"><a href="index.html">Home</a></td>
+
+        <td style="text-align: right;"><a href="xindex.html">Índice</a></td>
+      </tr>
+    </tbody>
+  </table>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/docs/pt_BR/glossaries.html b/docs/pt_BR/glossaries.html
index c826c2d..7506934 100644
--- a/docs/pt_BR/glossaries.html
+++ b/docs/pt_BR/glossaries.html
@@ -1,29 +1,92 @@
 <html>
 <head>
-   <meta http-equiv="content-type" content="text/html; charset=UTF-8">
-   <title>Glossários - OmegaT 1.6.1 Manual do Usuário</title>
+  <link rel="stylesheet" href="./OmegaT.css" type="text/css">
+  <meta http-equiv="content-type" content="text/html; charset=UTF-8">
+  <title>Glossários - Manual do Usuário, OmegaT 2.0</title>
 </head>
 <body>
-
-<h1>Glossários</h1>
-
-<p>A função do glossário é automática. Par usar um glossário existente, basta colocá-lo no diretório <code>/glossário</code> após criar o projeto. Quando um projeto for aberto, o OmegaT detecta automaticamente os arquivos de glossário neste diretório. Os termos no segmento aberto que o OmegaT encontrar no(s) arquivo(s) de glossário serão exibidos na janela Glossário.</p>
-
-<p>A função de glossário somente encontra as correspondências exatas com a entrada constante do glossário (isto é, as formas não flexionadas, etc.).</p>
-
-<p>Durante a tradução, pode-se adicionar manualmente novos termos no(s) arquivo(s) de glossário (por exemplo, com um editor de texto), mas os termos recém-adicionados não serão reconhecidos até que o projeto seja recarregado.</p>
-
-<a name="File_Format"></a>
-<h2>Formato de arquivo</h2>
-
-<p>Os arquivos de glossário são apenas arquivos de texto simples contendo três colunas delimitadas por tabulação; elas relacionam os termos fonte e destino na primeira e segunda coluna, respectivamente. A terceira coluna pode ser usada para informações extras.</p>
-
-<p>Os arquivos de glossário podem ser usados na codificação padrão do sistema (neste caso, os arquivos devem ter a extensão <code>.tab</code>) ou em UTF-8 (neste caso, devem ter a extensão <code>.utf8</code>).</p>
-
-<p>Por exemplo, os glossários criados com a função de exportar texto do Trados Multiterm podem ser usados como glossários no OmegaT sem nenhuma modificação, desde que tenham a extensão de arquivo <code>.tab</code> e os campos dos termos fonte e destino sejam os dois primeiros campos, respectivamente.</p>
-
+<h2>Glossários</h2>
+<ul>
+  <li>
+    <p><a href="#usage">Uso</a></p>
+  </li>
+  <li>
+    <p><a href="#fileformat">Formato de arquivo</a></p>
+  </li>
+  <li>
+    <p><a href="#howtocreate">Como criar glossários</a></p>
+  </li>
+  <li>
+    <p><a href="#multiterm">Usando Trados Multiterm</a></p>
+  </li>
+  <li>
+    <p><a href="#commonglossaryproblems">Problemas comuns com glossário</a></p>
+  </li>
+</ul>
+<p>Os glossários são arquivos que são criados e atualizados manualmente para uso no OmegaT.</p>
+<p>Se um projeto OmegaT contém um ou mais glossários, quaisquer termos do glossário que também sejam encontrados no segmento ativo serão automaticamente exibidos no <a href="userInterface.html#Glossary">visualizador de glossário</a>.</p>
+<hr>
+<h2><a name="usage" id="usage"></a>Uso</h2>
+<p>Para usar um glossário existente, basta colocá-lo na pasta <span style="font-style: italic;">/glossary</span> após a criação do projeto. Quando um projeto for aberto, o OmegaT detecta automaticamente arquivos de glossário nesta pasta. Os termos no segmento aberto que o OmegaT encontrar no(s) arquivo(s) de glossário serão exibidos no painel Glossário.</p>
+<p><img src="images/Glossary_pane.png" name="graphics1"
+ alt="Painel Glossário" id="graphics1"
+ style="border: 0px"><br>
+</p>
+<br>
+A palavra antes do sinal = é o termo fonte, e sua tradução é (ou são) as palavras após o sinal =. Pode-se acrescentar um comentário em um termo digitado no glossário (ver "verbo transitivo" para o segundo item). A função do glossário é encontrar apenas correspondências exatas com os termos do glossário (por exemplo, não encontra formas flexionadas, etc.) Durante a tradução, pode-se adicionar manualmente novos termos no(s) arquivo(s) de glossário (por exemplo, com um editor de texto), mas os termos recém-adicionados não serão reconhecidos até que o projeto seja recarregado.
+<hr>
+<h2><a name="fileformat" id="fileformat"></a>Formato de arquivo</h2>
+<p>Os arquivos de glossário são apenas arquivos de texto simples contendo três colunas delimitadas por tabulação; elas relacionam os termos fonte e destino na primeira e segunda coluna, respectivamente. A terceira coluna pode ser usada para informações extras. Os arquivos de glossário podem estar na codificação padrão do sistema (e indicados pela extensão <code>.tab</code>) ou no formato UTF-8 (a extensão <code>.utf8</code>). A codificação Unicode (UTF8) é a preferida por razões óbvias.</p>
+<hr>
+<h2><a name="howtocreate" id="howtocreate"></a>Como criar glossários</h2>
+O método aqui é infalível, quando seguido com atenção. Para isso, você precisa do Writer do OpenOffice.org, portanto, se ainda não o baixou - agora é hora de baixar e instalar o OpenOffice.org. Rode o OpenOffice.org e abra um novo documento de texto ou abra o Writer diretamente.<br> <br> No documento em branco, digite seu glossário da seguinte forma: um termo da língua fonte, um espaço com o tabulador, um termo da língua destino, um espaço com o tabulador, um comentário ou explicação para o item e um retorno (tecla Enter). A tecla de tabulação está no lado esquerdo do teclado. Se você não quiser adicionar comentários, pode omitir o segundo espaço com a tecla Tab. Um "termo" pode ser uma única palavra ou uma frase inteira. Na segunda linha, insira o segundo termo e a sua tradução.<br>  <br> Quando terminar de digitar os termos, você terá duas "colunas" de termos, uma na língua fonte à esquerda e outra na língua destino à direita, e possivelmente uma terceira coluna, contendo seus comentários e explicações. Os caracteres do espaço de tabulação ( → no exemplo abaixo) e do Enter (¶) podem ser visualizados com um clique no ícone ¶ na barra padrão do Writer. Aqui estão algumas linhas de um glossário de Português-Alemão:<br> 
+<br>
+<div style="font-family: Courier New,Courier,monospace;">    palavra→Wort→das (-/e/s, Wörter/-e)¶</div>
+<div style="font-family: Courier New,Courier,monospace;">    casa pequena→Häuschen→das, (pl Häuschen)¶</div>
+<div style="font-family: Courier New,Courier,monospace;">    cão→Hund→m, f Hündin Â¶</div>
+<div style="font-family: Courier New,Courier,monospace;">    cavalo→Pferd→n, m Hengst f Stute n Fohlen¶</div>
+<br>
+NÃO use a função "colunas" do OpenOffice.org para criar colunas: basta separar cada par de termos (fonte e destino) com um espaço de tabulação.<br> <br> Quando terminar de inserir os termos, clique em <span
+ style="font-style: italic;">Arquivo > Salvar como</span>. Na caixa "Local do arquivo" digite um nome para o glossário, seguido pela extensão  "<span style="font-weight: bold;">.utf8</span>" (p.ex. "<span style="font-style: italic;">MeuGlossario.utf8</span>"). No campo "<span style="font-style: italic;">Filtro</span>", selecione "<span style="font-style: italic;">Text Encoded (.txt.)</span>".  Desmarque a caixa "<span style="font-style: italic;">Extensão automática do nome de arquivo</span>" e marque "<span style="font-style: italic;">Editar as configurações do filtro</span>":<br> <br> <img alt="caixa de diálogo 'gravar arquivo' para o glossário"
+ src="images/saveglossary.png"><br> <br> Clique em OK para confirmar. Uma caixa de diálogo aparece com duas opções:  "<span
+ style="font-style: italic;">Manter o formato atual</span> e  "<span style="font-style: italic;">Salvar em formato ODF</span>". Selecione "<span style="font-style: italic;">Manter o formato atual</span>" para gravar no formato de arquivo de texto codificado. Na caixa de diálogo Opções de Filtro ASCII (ver abaixo), selecione "<span style="font-style: italic;">Unicode (UTF-8)</span>" no conjunto de caracteres.<br> <br> <img alt="opções de filtro de arquivo ascii para glossário"
+ src="./images/AsciiFilteroptions.png"><br> <br> Clique em OK para confirmar.<br> <br> Depois de criar um projeto OmegaT, copie ou mova este arquivo para a pasta <span style="font-style: italic;">\glossary</span>  do projeto. Se o projeto já estiver aberto, é preciso recarregá-lo após copiar o arquivo de glossário. Se quiser, você pode fazer alterações em um arquivo de glossário enquanto ele está sendo usado no projeto. As mudanças no glossário são detectadas aproximadamente uma vez a cada segundo e as modificações são carregadas de forma transparente no background; portanto, não há necessidade de recarregar o projeto após gravar um novo arquivo de glossário.<br> <br> Quando um segmento fonte é aberto, se o glossário tiver termos que correspondam aos do segmento aberto, o painel do glossário mostrará tais entradas (você pode ter mais de um glossário disponível, e eles podem ser armazenados em subpastas do <i>glossary</i>).
+<h3><a name="multiterm" id="multiterm"></a>Usando Trados Multiterm</h3>
+<p>Os glossários criados com a função de exportação do Trados Multiterm, por exemplo, podem ser usados como glossários no OmegaT sem modificação adicional, desde que tenham a extensão de arquivo <code>.tab</code>  e os campos dos termos de origem e destino sejam os dois primeiros campos, respectivamente. Se você exportar utilizando a opção "Tab-delimited export", terá que apagar as 5 primeiras colunas (Seq. Nr, Date created, etc.) antes dos dois itens que interessam.</p>
 <hr>
-<p><a href="legalNotices.html" title="Avisos legais">Avisos legais</a></p>
+<h2><a name="commonglossaryproblems" id="commonglossaryproblems"></a>Problemas comuns com glossário</h2>
+<dl>
+  <dt><span style="font-weight: bold;">Problema:</span> os termos do glossário não são mostrados.</dt>
+  <dd>Possíveis causas:</dd>
+</dl>
+<ul>
+  <li>não há nenhum arquivo na pasta "glossary"</li>
+  <li>o arquivo de glossário está vazio</li>
+  <li>os itens não são separados por um caractere TAB</li>
+  <li>o arquivo de glossário não tem a extensão correta (.tab ou. utf8)</li>
+  <li>Não há uma correspondência EXATA entre a entrada do glossário e o texto fonte do seu documento - por exemplo, quando a palavra está no plural</li>
+  <li>o arquivo de glossário não tem a codificação correta</li>
+  <li>não há termos no segmento ativo que combinem com qualquer dos termos do glossário</li>
+  <li>um ou mais dos problemas acima podem ter sido corrigidos, mas o projeto não foi recarregado.</li>
+</ul>
+<dl>
+  <dt><span style="font-weight: bold;">Problema:</span> no painel de glossário, alguns caracteres não são mostrados corretamente (mas os mesmos caracteres são exibidos corretamente no painel de edição).</dt>
+  <dd>Possíveis causas:</dd>
+</dl>
+<ul>
+  <li>a extensão e a codificação do arquivo não correspondem.</li>
+</ul>
+  <hr>
+  <table style="width: 100%;" border="0" cellpadding="2" cellspacing="2" summary="just formatting">
+    <tbody>
+      <tr>
+        <td style="text-align: left;"><a href="legalNotices.html">Avisos legais</a> </td>
+        <td style="text-align: center;"><a href="index.html">Home</a>
+        </td>
+        <td style="text-align: right;"><a href="xindex.html">Índice</a> </td>
+      </tr>
+    </tbody>
+  </table>
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/docs/pt_BR/index.html b/docs/pt_BR/index.html
index e54e803..3c62cec 100644
--- a/docs/pt_BR/index.html
+++ b/docs/pt_BR/index.html
@@ -1,57 +1,157 @@
 <html>
 <head>
-   <meta http-equiv="content-type" content="text/html; charset=UTF-8">
-   <title>Índice - OmegaT 1.6.1 Manual do Usuário</title>
+  <link rel="stylesheet" href="./OmegaT.css" type="text/css">
+  <meta http-equiv="content-type" content="text/html; charset=UTF-8">
+
+  <title>OmegaT 2.0 - Índice</title>
 </head>
+
 <body>
+  <h2> Manual do Usuário, OmegaT 2.0 - Índice</h2>
+  <hr>
+
+  <h3><a href="./aboutOmegaT.html">Sobre o OmegaT</a><br></h3>
+
+  <h3><a href="./installingAndRunning.html">Como instalar e usar o OmegaT</a></h3>
+
+  <table border="0" width="100%" summary="just formatting">
+    <tr>
+      <td valign="top">
+        <h3>Básico</h3>
+
+        <dl>
+          <dt><a href="./instantStartGuide.html">Comece a usar o OmegaT em 5 minutos!</a></dt>
+
+          <dd>→ um tutorial com links para todas as partes do manual</dd>
+
+          <dt><a href="./userInterface.html">A interface do usuário</a></dt>
+
+          <dd>→ todas as janelas e caixas de diálogos</dd>
+
+          <dt><a href="./menu.html">Menu principal e atalhos</a></dt>
+
+          <dd>→ todas as funções disponíveis do menu principal e seus atalhos</dd>
+
+          <dt><a href="./filesToTranslate.html">Arquivos para traduzir</a></dt>
+
+          <dd>→ arquivos compatíveis, conversores, questões com línguas que vão da direita para a esquerda</dd>
+
+          <dt><a href="./plainText.html">Trabalhar com texto simples</a></dt>
+
+          <dd>→ questões com codificação específica de arquivos de texto simples</dd>
+
+          <dt><a href="./formattedText.html">Trabalhar com texto formatado</a></dt>
+
+          <dd>→ tags, operações e verificação das tags</dd>
+
+          <dt><a href="./translationMemories.html">Memórias de tradução</a></dt>
+
+          <dd>→ memórias de tradução de projetos, memórias externas, intercâmbio de memórias</dd>
+
+          <dt><a href="./glossaries.html">Glossários</a>, <a href=
+          "./dictionaries.html">Dicionários</a></dt>
+
+          <dd>→ Criar e usar glossários e vocabulários</dd>
+
+          <dt><a href="./GoogleTranslate.html">Tradução automática</a></dt>
+
+          <dd>→ obter segmentos traduzidos automaticamente pelo Google Tradutor</dd>
+
+          <dt><a href="./searches.html">Buscas</a></dt>
+
+          <dd>→ parâmetros de busca e uso de caracteres curinga</dd>
+
+          <dt><a href="spellchecker.html">Verificador ortográfico</a></dt>
+
+          <dd>→ verificação ortográfica durante a tradução</dd>
+
+          <dt><a href="preventingDataLoss.html">Evitar perda de dados</a></dt>
+
+          <dd>→ backups e restauração de dados</dd>
+        </dl>
+      </td>
+
+      <td valign="top">
+        <h3>Customizar o OmegaT</h3>
+
+        <dl>
+          <dt><a href="./projectProperties.html">Propriedades do projeto</a></dt>
+
+          <dd>→ organização de pastas, configurações de línguas</dd>
+
+          <dt><a href="./fontSettings.html">Definições de fontes</a></dt>
+
+          <dd>→ fonte para visualização das janelas principais</dd>
+
+          <dt><a href="./fileFilters.html">Filtros de arquivos</a></dt>
+
+          <dd>→ manuseio de arquivos fonte e destino</dd>
+
+          <dt><a href="./segmentation.html">Segmentação do texto fonte</a></dt>
+
+          <dd>→ por língua fonte, segmentação genérica</dd>
+
+          <dt><a href="./translationEditing.html">Editar o modo de trabalho</a></dt>
+
+          <dd>→ inserção automática no campo destino</dd>
+
+          <dd><a href="translationEditing.html"></a></dd>
+        </dl>
+
+        <h3>Anexos</h3>
+
+        <dl>
+          <dt><a href="filesAndDirectories.html">Arquivos e diretórios</a></dt>
+
+          <dd>→ todos os arquivos e diretórios usados pelo OmegaT</dd>
+
+          <dt><a href="./languages.html">Línguas e códigos de línguas</a></dt>
+
+          <dd>→ para as propriedades de línguas do projeto, bem como regras de segmentação</dd>
+
+          <dt><a href="./regexp.html">Expressões regulares</a></dt>
+
+          <dd>→ para pesquisas, bem como regras de segmentação</dd>
+
+          <dt><a href="./commandlineArguments.html">Argumentos da linha de comando</a></dt>
+
+          <dd>→ iniciar o OmegaT com configurações e ações diferentes</dd>
+
+          <dt><a href="./consoleMode.html">Modo Console</a></dt>
+
+          <dd>→ para traduzir usando OmegaT em scripts (sem a GUI)</dd>
+
+          <dt><a href="./website.html">OmegaT na Web</a></dt>
+
+          <dd>→ suporte ao usuário, desenvolvimento, contribuições</dd>
+        </dl>
+      </td>
+    </tr>
+  </table>
+  <hr>
+
+  <h3>Créditos</h3>
+
+  <p>Este manual do usuário é um trabalho conjunto de Jean-Christophe Helary, Samuel Murray, Maxym Mykhalchuk, Henry Pijffers e Vito Smolej.</p>
+
+  <p>Não teria sido possível elaborar tal manual começando da 'estaca zero' sem a documentação original que Marc Prior criou e manteve até o OmegaT versão 1.4.2, atualizada por Dmitri Gabinski para o OmegaT version 1.4.4, e sem as sugestões da lista de usuários e o apoio de diversas pessoas que participaram no desenvolvimento do OmegaT. Queremos agradecer a todas as pessoas da comunidade OmegaT pela sua energia e inspiração.</p>
+
+  <h3>Contato</h3>
+
+  <p>Este manual não é perfeito e será modificado no decorrer do tempo, acompanhando a evolução do OmegaT. Se observar discrepâncias entre o que foi descrito aqui e o funcionamento do OmegaT, por gentileza comunique-se com Vito Smolej no e-mail vitosmolej(arroba)users(ponto)sourceforge(ponto)net.</p>
+  <hr>
+
+  <table style="width: 100%;" border="0" cellpadding="2" cellspacing="2"
+  summary="just formatting">
+    <tbody>
+      <tr>
+        <td style="text-align: left;"><a href="legalNotices.html">Avisos legais</a></td>
 
-<h1>OmegaT 1.6.1 Manual do Usuário</h1>
-<h3>Índice</h3>
-
-<p>
-<ol>
-   <li><a href="aboutOmegaT.html" title="Sobre o OmegaT">Sobre o OmegaT</a></li>
-
-   <li>Introdução ao OmegaT<ul>
-         <li><a href="instantStartGuide.html" title="Guia de Início Rápido">Guia de Início Rápido</a></li>
-         <li><a href="userInterface.html" title="A interface do usuário">A interface do usuário</a></li>
-         <li><a href="filesToTranslate.html" title="Arquivos para traduzir">Arquivos para traduzir</a></li>
-         <li><a href="plainText.html" title="Trabalhar com texto simples">Trabalhar com texto simples</a></li>
-         <li><a href="formattedText.html" title="Trabalhar com texto formatado">Trabalhar com texto formatado</a></li>
-         <li><a href="translationMemories.html" title="Memórias de tradução">Memórias de tradução</a></li>
-         <li><a href="glossaries.html" title="Glossários">Glossários</a></li>
-         <li><a href="searches.html" title="Buscas">Buscas</a></li>
-         <li><a href="preventingDataLoss.html" title="Evitar perda de dados">Evitar perda de dados</a></li>
-      </ul>
-   </li>
-
-   <li>Customizar o OmegaT<ul>
-         <li><a href="projectProperties.html" title="Propriedades do projeto">Propriedades do projeto</a></li>
-         <li><a href="fontSettings.html" title="Definições de fontes">Definições de fontes</a></li>
-         <li><a href="fileFilters.html" title="Filtros de arquivos">Filtros de arquivos</a></li>
-         <li><a href="segmentation.html" title="Segmentação do texto fonte">Segmentação do texto fonte</a></li>
-         <li><a href="translationEditing.html" title="Tradução e edição">Tradução e edição</a></li>
-      </ul>
-   </li>
-
-   <li>Anexos<ul>
-         <li><a href="fileFormats.html" title="Formatos de arquivos compatíveis">Formatos de arquivos compatíveis</a></li>
-         <li><a href="menu.html" title="Menu principal">Menu principal</a></li>
-         <li><a href="keyboardShortcuts.html" title="Atalhos de teclado do OmegaT">Atalhos de teclado do OmegaT</a></li>
-         <li><a href="website.html" title="O projeto OmegaT na Web, relato de erros e contribuição">O projeto OmegaT na Web, relato de erros e contribuição</a></li>
-      </ul>
-   </li>
-</ol>
-</p>
-
-<p>Este manual do usuário é um trabalho conjunto de Jean-Christophe Helary, Samuel Murray, Maxym Mykhalchuk e Henry Pijffers.</p>
-
-<p>Não teria sido possível elaborar tal manual começando da 'estaca zero' sem a documentação original que Marc Prior criou e manteve até o OmegaT versão 1.4.2, atualizada por Dmitri Gabinski para o OmegaT version 1.4.4, e sem as sugestões da lista de usuários e o apoio de diversas pessoas que participaram no desenvolvimento do OmegaT. Queremos agradecer a todas as pessoas da comunidade OmegaT pela sua energia e inspiração.</p>
-
-<p>Este manual não é perfeito e será modificado no decorrer do tempo, acompanhando a evolução do OmegaT. Se observar discrepâncias entre o que foi descrito aqui e o funcionamento do OmegaT, por gentileza entre em contato com Jean-Christophe Helary, no endereço de e-mail brandelune ARROBA users PONTO sourceforge PONTO net.</p>
-
-<hr>
-<p><a href="legalNotices.html">Avisos legais</a></p>
+        <td style="text-align: center;"><a href="index.html">Home</a></td>
 
+        <td style="text-align: right;"><a href="xindex.html">Índice</a></td>
+      </tr>
+    </tbody>
+  </table>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/docs/pt_BR/instantStartGuide.html b/docs/pt_BR/instantStartGuide.html
index 8244a0c..12ba12e 100644
--- a/docs/pt_BR/instantStartGuide.html
+++ b/docs/pt_BR/instantStartGuide.html
@@ -1,205 +1,288 @@
 <html>
 <head>
-   <meta http-equiv="content-type" content="text/html; charset=UTF-8">
-   <title>Guia de Início Rápido - OmegaT 1.6.1 Manual do Usuário</title>
+  <link rel="stylesheet" href="./OmegaT.css" type="text/css">
+  <meta http-equiv="content-type" content="text/html; charset=UTF-8">
+
+  <title>Guia de Início Rápido - Manual do Usuário, OmegaT 2.0 </title>
 </head>
+
 <body>
+  <h2>Comece a usar o OmegaT em 5 minutos!<br> - Guia de Início Rápido</h2>
+
+  <ul>
+    <li>
+      <p><a href="#summary">Em resumo, como o OmegaT funciona</a></p>
+    </li>
+
+    <li>
+      <p><a href="#translate">Como traduzir usando o OmegaT</a></p>
+
+      <ul>
+        <li>
+          <p><a href="#create">Criar e abrir um novo projeto</a></p>
+        </li>
+      </ul>
+    </li>
+
+    <li>
+      <p><a href="#segmentos">Traduzir os segmentos um por um</a></p>
+    </li>
+
+    <li>
+      <p><a href="#tm">Usar as correspondências da memória de tradução, do glossário e dicionários</a></p>
+    </li>
+
+    <li>
+      <p><a href="#searches">Usar as buscas e o Google Tradutor</a></p>
+    </li>
+
+    <li>
+      <p><a href="#create_trans">Criar documentos traduzidos</a></p>
+    </li>
+
+    <li>
+      <p><a href="#tags">Como trabalhar com texto com tags</a></p>
+
+      <ul>
+        <li>
+          <p><a href="#example">Um exemplo...</a></p>
+        </li>
+      </ul>
+    </li>
+
+    <li>
+      <p><a href="#tag_verif">Verificar e corrigir tags</a></p>
+    </li>
+  </ul>
+
+  <p>Este guia de início rápido aborda apenas os pontos básicos. O ideal é que os usuários leiam o Manual do Usuário do OmegaT para se familiarizarem com todos os recursos que o programa oferece. Os atalhos descritos aqui usam as teclas "ctrl+tecla", mas os usuários do Mac devem usar "cmd+tecla" . A tecla "cmd" está identificada como "comando" ou a marca da maçã nos teclados Apple.</p>
+  <hr>
+
+  <h2><a name="summary" id="summary"></a>Em resumo, como o OmegaT funciona</h2>
+
+  <p>A tela do OmegaT consiste de <a href="userInterface.html">três janelas distintas</a>. Cada uma delas pode ser redimensionada usando o mouse. Na esquerda está o Editor onde você digita sua tradução. Na direita, na parte superior, está o 'Visualizador de correspondências', onde as correspondências da memória de tradução serão mostradas. Abaixo está o 'Visualizador de glossário', onde as correspondências do glossário serão mostradas.</p>
+
+  <p>Na janela Editor, o OmegaT apresenta o texto fonte '<a href=
+  "segmentation.html">segmentado</a>' em sentenças (ou parágrafos). Os segmentos são traduzidos um por um. À medida que você passar de um segmento a outro, a tradução é gravada na <a href="translationMemories.html">memória de tradução</a>. Após todos os segmentos terem sido traduzidos (ou antes, se você quiser), o OmegaT usará a memória de tradução para gerar o(s) documento(s) traduzido(s) na pasta 'target'.</p>
+
+  <p>O OmegaT organiza seu trabalho de tradução em projetos de tradução. Para cada projeto, o OmegaT criará um conjunto de pastas. Elas são usadas para guardar os <a href="filesToTranslate.html">documentos fonte</a> a serem traduzidos, os <a href="glossaries.html">glossários</a> e quaisquer <a href="translationMemories.html">memórias de tradução</a> que você queira usar. O OmegaT também cria uma pasta 'target' que conterá os documentos traduzidos.</p>
+  <hr>
+
+  <h2><a name="translate" id="translate"></a>Como traduzir usando o OmegaT</h2>
+
+  <h3><a name="create" id="create"></a>Criar e abrir um novo projeto</h3>
+
+  <p>Selecione <strong>Projeto → Novo...</strong> no menu.</p>
+
+  <p>Acesse a pasta onde quer gravar os arquivos do projeto e digite um nome para o projeto de tradução. Este nome será usado para a pasta principal do projeto; todos os arquivos do projeto serão gravados nesta pasta ou em suas subpastas.</p>
+
+  <p>O OmegaT solicitará sua confirmação ou alteração para as pastas do projeto a ser criado usando a caixa de diálogo abaixo:</p>
+
+  <p align="center"><a name="graphics2" id="graphics2"></a></p>
+
+  <p><img alt="new project dialogue"
+  title="new project dialogue" src="images/NewProject.png"></p>
+
+  <p>Você pode simplesmente aceitar a localização sugerida das subpastas, mas deverá verificar se os <a href="languages.html">códigos da língua</a> fonte e língua da tradução estão corretos. Selecione o código da língua (2 letras) ou o código da língua e do país (2 + 2 letras) na lista, ou então digite-os manualmente (o código da língua pode ter 2 ou 3 letras). Observe onde está localizada a subpasta 'target' (para seus documentos traduzidos). Se quiser que o OmegaT faça a segmentação por sentença em vez de por "parágrafo", recomendamos verificar novamente as <a href="segmentation.html">Regras de Segmentação</a>.</p>
+
+  <p>Após clicar em OK para aceitar a configuração do projeto, o OmegaT exibirá uma mensagem para você selecionar os documentos fonte para importar. É possível importar arquivos individuais ou então importar toda uma árvore de pastas (com todos os arquivos em todas as subpastas). Se importar por engano arquivos errados ou arquivos em excesso, basta retirá-los da pasta 'source' do seu projeto OmegaT (usando o gerenciador de arquivos, por exemplo).</p>
 
-<h1>Guia de Início Rápido</h1>
-<p><small>ou comece a usar o OmegaT em 5 minutos</small></p>
+  <p>Para verificar a lista de arquivos a serem traduzidos, consulte a janela <strong>Arquivos do projeto</strong> (Menu: <strong>Projeto → Arquivos do projeto...</strong>, se ela não abrir automaticamente). Se tiver que modificar o conteúdo da pasta 'source', lembre-se de recarregar o projeto primeiro (Menu: <strong>Projeto → Recarregar</strong>). O OmegaT abre sempre o primeiro arquivo na lista do projeto. Lembre-se, o OmegaT somente aceita para tradução os arquivos nos <a href="filesToTranslate.html">formatos</a> abaixo se eles corresponderem aos padrões definidos nos <a href="fileFilters.html">filtros de arquivos</a>. Qualquer outro arquivo será ignorado.</p>
 
-<p><strong>Este guia de início rápido aborda apenas os pontos básicos. O ideal é que os usuários leiam o Manual do Usuário do OmegaT para se familiarizarem com todos os recursos que o programa oferece.</strong></p>
+  <ul>
+    <li>
+      <p>OpenDocument/OpenOffice.org</p>
+    </li>
 
-<h2>Índice</h2>
+    <li>
+      <p>Texto simples</p>
+    </li>
 
-<ol type="I">
-   <li><a href="#Briefly.2C_how_OmegaT_works">Em resumo, como o OmegaT funciona</a></li>
-   <li><a href="#How_to_translate_using_OmegaT">Como traduzir usando o OmegaT</a>
-      <ol type="a">
-         <li><a href="#Create_and_open_a_new_project">Criar e abrir um novo projeto</a></li>
-         <li><a href="#Translate_the_segments_one_by_one">Traduzir os segmentos um por um</a></li>
-         <li><a href="#Use_TM_and_glossary_matches">Usar as correspondências da memória de tradução e do glossário</a></li>
-         	<ol type="1">
-         		<li><a href="#TM_matches">Correspondências da memória de tradução</a></li>
-         		<li><a href="#Glossary_matches">Correspondências do glossário</a></li>
-         	</ol>
-         <li><a href="#Create_the_translated_documents">Criar documentos traduzidos</span></a></li>
-      </ol>
-   </li>
-   <li><a href="#Dealing_with_tagged_text">Trabalhar com texto com tags</a>
-      <ol type="a">
-         <li><a href="#An_example...">Um exemplo...</a></li>
-         <li><a href="#Tag_verification">Verificação de tags</a></li>
-      </ol>
-   </li>
-</ol>
+    <li>
+      <p>.po</p>
+    </li>
 
-<a name="Briefly.2C_how_OmegaT_works"></a>
-<h2>I. Em resumo, como o OmegaT funciona</h2>
+    <li>
+      <p>Bundle.properties Java</p>
+    </li>
 
-<p>A tela do OmegaT consiste de três janelas distintas. Cada uma delas pode ser redimencionada usando o mouse. Na esquerda está o Editor onde você digita sua tradução. Na direita, na parte superior, o 'Visualizador de correspondências', onde as correspondências da memória de tradução serão mostradas. Abaixo está o 'Visualizador de glossário', onde as correspondências do glossário serão mostradas.</p>
+    <li>
+      <p>XHTML, HTML</p>
+    </li>
 
-<p>Na janela Editor, o OmegaT apresenta o texto fonte 'segmentado' em sentenças (ou parágrafos - veja o Manual). Os segmentos são traduzidos um por um. À medida que passar de um segmento a outro, a tradução é gravada na memória de tradução. Após todos os segmentos terem sido traduzidos (ou antes, se você quiser), o OmegaT usará a memória de tradução para gerar o(s) documento(s) traduzido(s) na pasta "Target".</p>
+    <li>
+      <p>Compilador de Ajuda HTML</p>
+    </li>
 
-<p>OmegaT organiza seu trabalho de tradução em projetos de tradução. Para cada projeto, o OmegaT criará um conjunto de pastas. Elas são usadas para guardar os documentos fonte a serem traduzidos, os glossários e quaisquer memórias de tradução que você queira usar. OmegaT também cria uma pasta "Target" que conterá os documentos traduzidos.</p>
+    <li>
+      <p>INI (formato 'key=value')</p>
+    </li>
 
-<a name="How_to_translate_using_OmegaT"></a>
-<h2>II. Como traduzir usando o OmegaT</h2>
+    <li>
+      <p>DocBook</p>
+    </li>
 
-<a name="Create_and_open_a_new_project"></a>
-<h3>a. Criar e abrir um novo projeto</h3>
+    <li>
+      <p>Microsoft Open XML</p>
+    </li>
 
-<p>Selecione <strong>Projeto -> Novo...</strong> no menu.</p>
+    <li>
+      <p>Arquivos XLIFF monolíngue do Okapi</p>
+    </li>
 
-<p>Acesse a pasta onde quer gravar os arquivos do projeto e digite um nome para o projeto de tradução. Este nome será usado para a pasta principal do projeto; todos os arquivos do projeto serão gravados nesta pasta ou em suas subpastas.</p>
+    <li>
+      <p>QuarkXPress CopyFlowGold</p>
+    </li>
 
-<p>O OmegaT solicitará sua confirmação ou alteração para as pastas do projeto a ser criado usando a caixa de diálogo abaixo:</p>
+    <li>
+      <p>Arquivos legendas (SRT)</p>
+    </li>
 
-<center><img src="images/NewProject.png" alt="Image:NewProject.png" width="398" height="428" /></center>
+    <li>
+      <p>ResX</p>
+    </li>
 
-<p>Você pode simplesmente aceitar a localização sugerida das subpastas, mas deverá verificar se os códigos do idioma fonte e idioma da tradução estão corretos. Selecione o código do idioma (2 letras) ou o código do idioma e país (2 + 2 letras) na lista, ou então digite-os manualmente (mantendo o padrão de 2 letras). Observe onde está localizada a subpasta "Target" (para seus documentos traduzidos).</p>
+    <li>
+      <p>Recursos Android</p>
+    </li>
 
-<p>Se quiser que o OmegaT faça a segmentação por sentença em vez de por "parágrafo", recomendamos verificar novamente as Regras de Segmentação.</p>
+    <li>
+      <p>LaTeX</p>
+    </li>
+  </ul>
 
-<p>Após clicar em OK para aceitar a configuração do projeto, o OmegaT exibirá uma mensagem para você selecionar os documentos fonte para importar. É possível importar arquivos individuais ou então importar toda uma árvore de diretórios (com todos os arquivos em todas as subpastas). Se importar por engano arquivos errados ou arquivos em excesso, basta retirá-los da pasta "fonte" do seu projeto OmegaT (usando o gerenciador de arquivos, por exemplo).</p>
+  <h3><a name="segments" id="segments"></a>Traduzir os segmentos um por um</h3>
 
-<p>Para verificar a lista de arquivos a serem traduzidos, veja a janela Arquivos do Projeto (Menu: Exibir -> Arquivos do projeto, se ela não abrir automaticamente). Se tiver mudado o conteúdo da pasta Source, lembre-se de recarregar o projeto primeiro (Menu: Projeto -> Recarregar). O OmegaT está ajustado para abrir o primeiro arquivo na lista do projeto.</p>
+  <p>Após definir o projeto e os arquivos a serem traduzidos, o OmegaT abrirá o primeiro arquivo fonte no Editor.</p>
 
-<p>Lembre-se, o OmegaT somente aceita para tradução os arquivos nos formatos abaixo. Qualquer outro arquivo será ignorado.<ul>
-<li>Formato Open Document</li>
-<li>OpenOffice.org </li>
-<li>(X)HTML </li>
-<li>Compilador de Ajuda HTML (HCC)</li>
-<li>DocBook </li>
-<li>Texto simples</li>
-<li>bundle.properties Java </li>
-<li>monolingual .po </li>
-<li>INI (formato 'key=value')</li>
-</ul>
-</p>
+  <p>O segmento aberto é destacado em verde; uma cópia do texto fonte é exibida abaixo, no 'campo destino'. (Neste ponto, todo o texto que estiver fora do campo destino está protegido e não pode ser modificado.) A tradução deve ser digitada entre as tags <code><segmento 0001></code> e <code><fim do segmento></code>, sobre o texto fonte. Pressione '<strong>ENTER</strong>' para seguir ao próximo segmento. Observação:</p>
 
-<a name="Translate_the_segments_one_by_one"></a>
-<h3>b. Traduzir os segmentos um por um</h3>
+  <ul>
+    <li>
+      <p>Para passar para qualquer parte do texto, seja para cima ou para baixo, clique duas vezes na sentença ou no parágrafo que quiser abrir.</p>
+    </li>
 
-<p>Após definir o projeto e os arquivos a serem traduzidos, o OmegaT abrirá o primeiro arquivo fonte no Editor. O primeiro segmento é destacado em verde; uma cópia do texto fonte é exibida abaixo, no "campo destino”. (Neste ponto, todo o texto que estiver fora do campo destino está protegido e não pode ser modificado.) A tradução deve ser digitada entre as tags <segmento 0001> e <fim do segmento>, em sobreposição ao texto fonte.</p>
+    <li>
+      <p>Se preferir traduzir com o campo destino vazio, defina esta opção em <strong>Opções → <a href="translationEditing.html">Modo de trabalho...</a></strong>.</p>
+    </li>
 
-<p>Pressione "ENTER" para seguir ao próximo segmento.</p>
+    <li>
+      <p>Para modificar a configuração do painel Editor (por exemplo, para mostrar ou não o texto fonte, realçar o texto traduzido, etc.), acesse o menu <a href="menu.html"><b>Exibir</b></a></p>
+    </li>
+  </ul>
 
-<p>Observação:<br/> - Para mover para qualquer parte do texto, seja para cima ou para baixo, clique duas vezes na sentença ou parágrafo que quiser abrir. <br/> - Se preferir traduzir com o campo destino vazio, defina esta opção em Opções -> Modo de trabalho.</p>
+  <p>Quando o usuário pressiona '<strong>ENTER</strong>', várias coisas ocorrem de forma invisível: o OmegaT acrescenta o par de segmentos (o texto original e a tradução) na memória de tradução e também traduz automaticamente qualquer outro segmento idêntico que detectar nos arquivos do projeto. Também faz a busca na memória de tradução e no glossário para localizar correspondências para o próximo segmento não traduzido.</p>
 
-<p>Ao pressionar "ENTER", o OmegaT processa diversas ações que não são visíveis ao usuário: <br/> Acrescenta o par de segmentos (original e a tradução) na memória de tradução e também traduz automaticamente qualquer outro segmento idêntico que identifique em outros arquivos do projeto. Faz a busca na memória de tradução e no glossário para localizar correspondências para o próximo segmento não traduzido.</p>
+  <h3><a name="tm" id="tm"></a>Usar as correspondências da memória de tradução, dos glossários e dicionários</h3>
 
-<a name="Use_TM_and_glossary_matches"></a>
-<h3>c. Usar as correspondências da memória de tradução e do glossário</h3>
+  <h3><a name="tm_matches" id="tm_matches"></a>Correspondências da memória de tradução</h3>
 
-<a name="TM_matches"></a>
-<h4>1. Correspondências da memória de tradução</h4>
+  <p>Se o OmegaT localizar nas memórias de tradução correspondências parciais (30% ou mais) para o próximo segmento, elas serão exibidas no visualizador de correspondências. Por predefinição, o visualizador de correspondências destaca a primeira correspondência da lista.</p>
 
-<p>Se o OmegaT localizar na memória de tradução correspondências imperfeitas (30% ou acima – veja o Manual) para o próximo segmento, elas serão exibidas no visualizador de correspondências. Por predefinição, o visualizador de correspondências destaca a primeira correspondência da lista.</p>
-<p>Para inserir no campo destino uma das correspondências da memória mostradas no visualizador basta usar os seguintes atalhos do teclado:<br/>
-<ul>
-   <li>Pressione <code>Ctrl+I</code> para inserir a correspondência destacada na posição onde está o cursor, ou...</li>
-   <li>Pressione <code>Ctrl+R</code> para sobrescrever todo o segmento aberto com o texto da correspondência destacada.</li>
-</ul>
-</p>
+  <p><br>
+  <br></p><img src="images/MatchesPane.png" name="graphics4" alt="painel de correspondências"
+  id="graphics4" align="left" border="0"><br clear=
+  "left">
 
-<p>Se forem localizadas diversas correspondências e você preferir não usar a primeira que está destacada:<br/>
-<ul>
-	<li>Selecione a correspondência que preferir no visualizador: <code>Ctrl+2</code> para a segunda correspondência exibida na lista, <code>Ctrl+3</code> para a terceira e assim por diante.</li>
-	<li>Depois, use os comandos <code>Ctrl+I</code> ou <code>Ctrl+R</code>, conforme descrito acima.</li>
-</ul>
-</p>
+  <p><br>
+  <br></p>
 
-<p>(Você pode indicar para que o OmegaT insira automaticamente no campo destino, sempre que um segmento for aberto, a primeira correspondência acima de uma determinada porcentagem. Defina esta opção usando <strong>Opções -> Modo de trabalho...</strong>)</p>
+  <p>Para inserir no campo destino uma das correspondências da memória mostradas no visualizador, basta usar os seguintes <a href="menu.html#shortcuts">atalhos do teclado</a>:</p>
 
-<a name="Glossary_matches"></a>
-<h4>2. Correspondências do glossário</h4>
+  <ul>
+    <li>
+      <p>Pressione <code>Ctrl+I</code> para inserir a correspondência selecionada na posição onde está o cursor, ou...</p>
+    </li>
 
-<p>Se o OmegaT encontrar no glossário termos de correspondência perfeita, ou seja, com 100%, eles serão exibidos para consulta no visualizador de glossário. Tais termos não podem ser transferidos com o uso de atalhos de teclado.</p>
+    <li>
+      <p>Pressione <code>Ctrl+R</code> para sobrescrever todo o segmento aberto com o texto da correspondência selecionada.</p>
+    </li>
+  </ul>
 
-<a name="Create_the_translated_documents"></a>
-<h3>d. Criar documentos traduzidos</h3>
+  <p>Se houver diversas correspondências e você preferir não usar a primeira que está destacada:</p>
 
-<p>Quando todos os documentos estiverem traduzidos (ou antes, se você quiser), o OmegaT atualizará o(s) documento(s) destino usando as traduções guardadas na memória.</p>
+  <ul>
+    <li>
+      <p>Selecione a correspondência que preferir no visualizador: <code>Ctrl+2</code> para a segunda correspondência exibida na lista, <code>Ctrl+3</code> para a terceira e assim por diante.</p>
+    </li>
 
-<p>Para isso, selecione o menu <strong>Projeto -> Criar documentos traduzidos</strong>.</p>
+    <li>
+      <p>Depois, use os comandos <code>Ctrl+I</code> ou <code>Ctrl+R</code>, conforme descrito acima.</p>
+    </li>
+  </ul>
 
-<p>O OmegaT criará versões traduzidas de todos os documentos válidos para tradução na pasta 'fonte' do projeto, não importando se eles estejam ou não totalmente traduzidos. Os arquivos traduzidos, no todo ou em parte, serão gravados na pasta "Target" do projeto.</p>
+  <p>(Você pode indicar para o OmegaT inserir automaticamente no campo destino de um segmento aberto, a primeira correspondência que ficar acima de uma determinada porcentagem. Defina esta opção usando <strong>Opções → <a href=
+  "translationEditing.html">Modo de trabalho...</a></strong>)</p>
 
-<p>Para finalizar sua tradução, abra os arquivos destino nas suas respectivas aplicações (navegador, processador de texto, etc.) para verificar o conteúdo e a formatação da sua tradução. Depois, volte ao OmegaT para fazer as correções, se necessárias; não esqueça de recriar os documentos traduzidos.</p>
+  <h3><a name="gloss_matches" id="gloss_matches"></a>Correspondências do glossário e do dicionário</h3>
 
+  <p>Os termos de correspondência nos <a href="glossaries.html">glossários</a> e dicionários que você incluiu no projeto serão exibidos para consulta nos painéis de glossário e dicionário. </p>
 
-<a name="Dealing_with_tagged_text"></a>
-<h2>III. Trabalhar com texto com tags</h2>
+  <h3><a name="searches" id="searches"></a>Usar as buscas</h3>
 
-<p>OmegaT garante que a formatação dos documentos originais (negrito, itálico, etc.) não será perdida e para isso usa tags especiais que serão visíveis no campo destino.</p>
+  <p>O OmegaT oferece um grande leque de funções avançadas de <a href="searches.html">busca</a>. Para acessar a janela de busca, pressione <code>Ctrl+F</code> e digite a palavra ou frase que quer localizar na caixa de texto 'Buscar por'. Uma outra forma é selecionar uma palavra ou frase no campo de edição e pressionar <code>Ctrl+F</code>. Neste caso, a palavra ou frase é inserida automaticamente na caixa 'Buscar por'.</p>
 
-<p>Essas tags, com códigos de formatação, devem ser manipuladas com atenção e cuidado para que sejam incluídas corretamente nos segmentos destino. (Consulte o Manual do Usuário do OmegaT para ver informações de edição avançada de texto com tags.)</p>
+  <h3>Usar o Google Tradutor</h3>No painel <a href="GoogleTranslate.html">Google Tradutor</a>, se ativado, será exibida automaticamente uma sugestão para a tradução do segmento atual. Pressione <code>Ctrl+M</code> para inserir a sugestão no segmento destino aberto.
 
-<a name="An_example..."></a>
-<h3>a. Um exemplo...</h3>
+  <h3><a name="create_trans" id="create_trans"></a>Criar documentos traduzidos</h3>
 
-<p>Nestes exemplos destacamos as tags em <font color="#ff0000">vermelho</font> para facilitar a visualização, mas no OmegaT elas não estarão destacadas.</p>
+  <p>Quando todos os documentos estiverem traduzidos (ou antes, se você quiser), o OmegaT atualizará o(s) documento(s) destino usando as traduções guardadas na memória. Para isso, selecione <strong>Projeto →  Criar documentos traduzidos</strong> no menu. O OmegaT criará versões traduzidas de todos os documentos válidos para tradução na pasta 'source' do projeto, não importando se eles estejam ou não totalmente traduzidos. Os arquivos traduzidos, no todo ou em parte, serão gravados na pasta 'target' do projeto. Para finalizar sua tradução, abra os arquivos destino nas suas respectivas aplicações (navegador, processador de texto...) para verificar o conteúdo e a formatação da sua tradução. Depois, volte ao OmegaT para fazer as correções, se necessário; não esqueça de recriar os documentos traduzidos.</p>
+  <hr>
 
-<p>
-<strong>Aqui está um exemplo de um segmento em HTML:</strong>
-</p>
+  <h2><a name="tags" id="tags"></a>Como trabalhar com texto com tags</h2>
 
-<p>
-<code><font color="#ff0000"><p></font>Para selecionar uma fonte de visualização diferente, clique na caixa de diálogo <font color="#ff0000"><b></font>Fonte de visualização<font color="#ff0000"></b></font>. Para abrir esta caixa, clique no menu <font color="#ff0000"><i></font>Opções<font color="#ff0000"></i></font> &gt; <font color="#ff0000"><i></font>Fonte de visualização...<font color="#ff0000"></i></font>. O tipo e tamanho da fonte podem ser modificados nessa caixa.<font color="#ff0000"></p></font></code>
-</p>
+  <p>O OmegaT garante que a formatação dos documentos originais (negrito, itálico, etc.) não será perdida e para isso usa <a href=
+  "formattedText.html#intro">tags especiais</a>. As tags do OmegaT são compostas por uma ou mais letras seguidas por um ou mais dígitos e usam a barra "/" para o fechamento (por exemplo: <f0>, </f0> <br>, </s2>, etc.). Essas tags, com códigos de formatação, devem ser manipuladas com atenção; verifique se estão incluídas corretamente nos segmentos destino (ver <a href=
+  "formattedText.html#Tag_operations">trabalhar com tags</a>).</p>
 
-<p>
-<strong>Aqui está como ele será exibido no OmegaT, destacado em vermelho:</strong>
-</p>
+  <h3><a name="example" id="example"></a>Um exemplo...</h3>
 
-<p>
-<code>Para selecionar uma fonte de visualização diferente, clique na caixa de diálogo <font color="#ff0000"><b0></font>Fonte de visualização<font color="#ff0000"></b0></font>. Para abrir esta caixa, clique no menu <font color="#ff0000"><i1></font>Opções<font color="#ff0000"></i1></font> > <font color="#ff0000"><i2></font>Fonte de visualização...<font color="#ff0000"></i2></font>. O tipo e tamanho da fonte podem ser modificados nessa caixa.</code>
-</p>
+  <p>Nestes exemplos destacamos as tags para facilitar a visualização, mas no OmegaT elas não estarão destacadas. As tags de HTML tags, destacadas em <font color="#0000FF">azul</font>, serão ignoradas pelo OmegaT porque estão fora, envolvendo o segmento. As tags destacadas em <font color=
+  "#008000">verde</font> serão processadas pelo OmegaT porque estão dentro do segmento. Aqui está um exemplo de um segmento em HTML:</p>
 
-<p>
-<strong>Aqui está como você traduziria o texto (o exemplo está em africâner):</strong>
-</p>
+  <p><code><font color="#0000FF"><p></font>Para selecionar uma fonte diferente para visualizar, use a caixa de diálogo <font color="#008000"><b></font>Fonte de visualização<font color="#008000"></b></font>. Para abrir a caixa, clique no menu <font color="#008000"><i></font>Configurações<font color=
+  "#008000"></i></font> →<font color="#008000"><i></font>Fonte de visualização...<font color="#008000"></i></font>. O tipo e tamanho da fonte podem ser modificados nessa caixa.<font color=
+  "#0000FF"></p></font></code></p>
 
-<p>
-<code>'n Mens kan 'n ander vertoonfont kies met die 
-<font color="#ff0000"><b0></font>Vertoonfont<font color="#ff0000"></b0></font>-dialoogkassie. 
-Kies <font color="#ff0000"><i1></font>Opstelling<font color="#ff0000"></i1></font> 
+  <p><br></p>
 
-> <font color="#ff0000"><i2></font>Vertoonfont...<font color="#ff0000"></i2></font> 
-op die kieslys. Die lettertipe én die lettergrootte kan met dié 
-dialoogkassie verander word.</code>
-</p>
+  <p>Aqui está como ele será exibido no OmegaT, com a tradução em africâner:</p>
 
-<p>
-<strong>Quando o OmegaT cria o documento traduzido, o texto em HTML terá a seguinte marcação:</strong>
-</p>
+  <p><br>
+  <br></p>
 
-<p>
-<code><font color="#ff0000"><p></font>'n Mens kan 'n ander vertoonfont kies 
-met die <font color="#ff0000"><b></font>Vertoonfont<font color="#ff0000"></b></font>-dialoogkassie. 
-Kies <font color="#ff0000"><i></font>Opstelling<font color="#ff0000"></i></font> 
+  <p><img src="images/tagged_segment.png" name="graphics6" alt="tagged segment"
+  id="graphics6" align="bottom" border="0"></p>
 
-&gt; <font color="#ff0000"><i></font>Vertoonfont...<font color="#ff0000"></i></font> 
-op die kieslys. Die lettertipe én die lettergrootte kan met dié 
-dialoogkassie verander word.<font color="#ff0000"></p></font></code>
-</p>
+  <p><br>
+  <br></p>
 
-<a name="Tag_verification"></a>
-<h3>b. Verificação de tags</h3>
+  <p>Quando o OmegaT cria o documento traduzido, o texto em HTML terá a seguinte marcação:</p>
 
-<p>O OmegaT não detecta automaticamente os erros de tags em um documento traduzido. Antes de entregar o documento final para seu cliente, verifique se há erros de tags.</p>
+  <p><img src="images/tagged_segment_target.png" name="graphics5" alt=
+  "tagged segment - target" id="graphics5" align="bottom" border="0"></p>
 
-<p>Selecione <strong>Ferramentas -> Validar tags...</strong> no menu. Uma tabela será exibida mostrando os segmentos onde as tags fonte e destino não correspondem. Clique no número do segmento.</p>
+  <h3><a name="tag_verif" id="tag_verif"></a>Verificar e corrigir tags</h3>
 
-<p>O segmento com problema será aberto automaticamente no Editor onde você poderá corrigir os códigos.</p>
+  <p>O OmegaT não detecta automaticamente os erros de tags em um documento traduzido. Antes de entregar o documento final para seu cliente, verifique se há erros de tags. Selecione o menu <strong>Ferramentas→ <a href=
+  "formattedText.html#tag_validation">Verificar tags</a></strong>. Uma tabela será exibida mostrando os segmentos onde as tags fonte e destino não correspondem. Clique no número do segmento. O segmento com problema será aberto automaticamente no Editor onde você poderá corrigir os códigos das tags. Pressione <code>Enter</code> para validar o segmento corrigido e pressione <code>Ctrl-T</code> para verificar a correção.</p>
 
-<p>Em alguns casos, os erros com tags podem até impedir o documento de abrir. Portanto, assegure-se de corrigir quaisquer erros de tags antes de criar os arquivos traduzidos.</p>
+  <p>Em alguns casos, os erros com tags podem impedir o documento de abrir. Portanto, assegure-se de corrigir quaisquer erros de tags antes de criar os arquivos traduzidos. Finalmente, recomenda-se que você abra o documento traduzido no visualizador ou editor onde foi gerado para verificação final da formatação.</p>
+  
+  <p>Em algumas linguages de programação (p.ex. PHP, C) são usadas tags especiais como placeholders (marcadores) em sequências de caracteres (strings) utilizadas em conjunto com a função printf. O OmegaT pode detectar e validar essas tags, se você habilitá-lo para isso. Selecione no menu <strong>Opções→ <a href="formattedText.html#printf">Verificação de tags...</a></strong>. Escolha entre a verificação simples ou completa. Na verificação simples são usadas apenas variantes simples de possíveis valores de placeholders. Isto é útil quando o código fonte não contém placeholders mais complexos e expressivos e você obterá muitos falsos positivos.</p>
+  <hr>
 
-<p>Finalmente, recomenda-se que você abra o documento traduzido no visualizador ou editor onde foi gerado para verificação final da formatação.</p>
+  <table style="width: 100%;" summary="just formatting" border="0" cellpadding=
+  "2" cellspacing="2">
+    <tbody>
+      <tr>
+        <td style="text-align: left;"><a href="legalNotices.html">Avisos legais</a></td>
 
-<hr>
-<p><a href="legalNotices.html" title="Avisos legais">Avisos legais</a></p>
+        <td style="text-align: center;"><a href="index.html">Home</a></td>
 
+        <td style="text-align: right;"><a href="xindex.html">Índice</a></td>
+      </tr>
+    </tbody>
+  </table>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/docs/pt_BR/instantStartGuideNoTOC.html b/docs/pt_BR/instantStartGuideNoTOC.html
index 1a4eb78..fae8149 100644
--- a/docs/pt_BR/instantStartGuideNoTOC.html
+++ b/docs/pt_BR/instantStartGuideNoTOC.html
@@ -3,7 +3,7 @@
   <link rel="stylesheet" href="./OmegaT.css" type="text/css">
   <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 
-  <title>Guia de Início Rápido - OmegaT 2.0 Manual do Usuário</title>
+  <title>Guia de Início Rápido - Manual do Usuário, OmegaT 2.0 </title>
 </head>
 
 <body>
@@ -36,9 +36,9 @@
   <p align="center"><img src="images/NewProject.png" name="graphics1" alt=
   "Janela 'Definições do projeto'" id="graphics1" align="bottom" border="0"></p>
 
-  <p>Você pode simplesmente aceitar a localização sugerida das subpastas, mas deverá verificar se os códigos da língua fonte e da língua da tradução estão corretos. Selecione o código da língua (2 letras) ou o código da língua e do país (2 + 2 letras) na lista, ou então digite-os manualmente (o código da língua pode ter 2 ou 3 letras). Observe onde está localizada a subpasta 'target' (para seus documentos traduzidos). Se quiser que o OmegaT faça a segmentação por sentença em vez de por "parágrafo", recomendamos verificar novamente as Regras de Segmentação.</p>
+  <p>Você pode simplesmente aceitar a localização sugerida das subpastas, mas deverá verificar se os códigos da língua fonte e língua da tradução estão corretos. Selecione o código da língua (2 letras) ou o código da língua e do país (2 + 2 letras) na lista, ou então digite-os manualmente (o código da língua pode ter 2 ou 3 letras). Observe onde está localizada a subpasta 'target' (para seus documentos traduzidos). Se quiser que o OmegaT faça a segmentação por sentença em vez de por "parágrafo", recomendamos verificar novamente as Regras de Segmentação.</p>
 
-  <p>Após clicar em OK para aceitar a configuração do projeto, o OmegaT exibirá uma mensagem para você selecionar os documentos fonte para importar. É possível importar arquivos individuais ou então importar toda uma árvore de pastas (com todos os arquivos em todas as subpastas). Se importar por engano arquivos errados ou arquivos em excesso, basta retirá-los da pasta 'Source' do seu projeto OmegaT (usando o gerenciador de arquivos, por exemplo).</p>
+  <p>Após clicar em OK para aceitar a configuração do projeto, o OmegaT exibirá uma mensagem para você selecionar os documentos fonte para importar. É possível importar arquivos individuais ou então importar toda uma árvore de pastas (com todos os arquivos em todas as subpastas). Se importar por engano arquivos errados ou arquivos em excesso, basta retirá-los da pasta 'source' do seu projeto OmegaT (usando o gerenciador de arquivos, por exemplo).</p>
 
   <p>Para verificar a lista de arquivos a serem traduzidos, consulte a janela <strong>Arquivos do projeto</strong> (Menu: <strong>Projeto → Arquivos do projeto...</strong>, se ela não abrir automaticamente). Se tiver que modificar o conteúdo da pasta 'source', lembre-se de recarregar o projeto primeiro (Menu: <strong>Projeto → Recarregar</strong>). O OmegaT abre sempre o primeiro arquivo na lista do projeto. Lembre-se, o OmegaT somente aceita para tradução os arquivos nos formatos abaixo se eles corresponderem aos padrões definidos nos filtros de arquivos. Qualquer outro arquivo será ignorado.</p>
 
@@ -61,7 +61,7 @@
 
     <li>Microsoft Open XML</li>
 
-    <li>Arquivos XLIFF monolingue do Okapi</li>
+    <li>Arquivos XLIFF monolíngue do Okapi</li>
 
     <li>QuarkXPress CopyFlowGold</li>
 
@@ -81,7 +81,7 @@
   <ul>
     <li>Para passar para qualquer parte do texto, seja para cima ou para baixo, clique duas vezes na sentença ou no parágrafo que quiser abrir.</li>
 
-    <li>Se preferir traduzir com o campo destino vazio, defina esta opção em <strong>Opções → Editar modo de trabalho...</strong>.</li>
+    <li>Se preferir traduzir com o campo destino vazio, defina esta opção em <strong>Opções → Modo de trabalho...</strong>.</li>
 
     <li>
       <p>Para modificar a configuração do painel Editor (por exemplo, para mostrar ou não o texto fonte, realçar o texto traduzido, etc.), acesse o menu <span style="font-weight: bold;">Exibir</span></p>
@@ -95,7 +95,7 @@
   <h3>Correspondências da memória de tradução</h3>
 
   <p>Se o OmegaT localizar na memória de tradução correspondências parciais (30% ou mais) para o próximo segmento, elas serão exibidas no visualizador de correspondências. Por predefinição, o visualizador de correspondências destaca a primeira correspondência da lista.</p><img src=
-  "[fuzzy]images/MatchesPane.png" name="graphics4" alt="painel de correspondências" id="graphics4"
+  "images/MatchesPane.png" name="graphics4" alt="painel de correspondências" id="graphics4"
   style="border: 0px solid ;"><br clear="left">
 
   <p><br></p>
@@ -116,7 +116,7 @@
     <li>Depois, use os comandos <code>Ctrl+I</code> ou <code>Ctrl+R</code>, conforme descrito acima.</li>
   </ul>
 
-  <p>(Você pode indicar para o OmegaT inserir automaticamente no campo destino de um segmento aberto, a primeira correspondência que ficar acima de uma determinada porcentagem. Defina esta opção usando <strong>Opções → Editar modo de trabalho...</strong>)</p><a name="gloss_matches" id="gloss_matches"></a>
+  <p>(Você pode indicar para o OmegaT inserir automaticamente no campo destino de um segmento aberto, a primeira correspondência que ficar acima de uma determinada porcentagem. Defina esta opção usando <strong>Opções → Modo de trabalho...</strong>)</p><a name="gloss_matches" id="gloss_matches"></a>
 
   <h3>Correspondências do glossário e do dicionário</h3>
 
@@ -128,7 +128,7 @@
 
   <h3>Usar o Google Tradutor</h3>
 
-  <p>No painel Google Tradutor, se ativado, será exibida automaticamente uma sugestão para a tradução do segmento atual. Pressione <code>Ctrl+M</code> irá inserir a sugestão no segmento destino aberto.<br></p>
+  <p>No painel Google Tradutor, se ativado, será exibida automaticamente uma sugestão para a tradução do segmento atual. Pressione <code>Ctrl+M</code> para inserir a sugestão no segmento destino aberto.<br></p>
 
   <p><a name="create_trans" id="create_trans"></a></p>
 
@@ -140,16 +140,16 @@
 
   <h2>Como trabalhar com texto com tags</h2>
 
-  <p>O OmegaT garante que a formatação dos documentos originais (negrito, itálico, etc.) não será perdida e para isso usa tags especiais. As tags do OmegaT são compostas por uma ou mais letras seguidas por um ou mais dígitos e usam a barra "/" para o fechamento (por exemplo: <f0>, </f0><br>, </s2>, etc.). Essas tags, com códigos de formatação, devem ser manipuladas com atenção; verifique se estão incluídas corretamente nos segmentos destino (ver <em>trabalhar com tags</em>.</p><a name="example" id="example"></a>
+  <p>O OmegaT garante que a formatação dos documentos originais (negrito, itálico, etc.) não será perdida e para isso usa tags especiais. As tags do OmegaT são compostas por uma ou mais letras seguidas por um ou mais dígitos e usam a barra "/" para o fechamento (por exemplo: <f0>, </f0> <br>, </s2>, etc.). Essas tags, com códigos de formatação, devem ser manipuladas com atenção; verifique se estão incluídas corretamente nos segmentos destino (ver <em>trabalhar com tags</em>).</p><a name="example" id="example"></a>
 
   <h3>Um exemplo...</h3>
 
-  <p>Nestes exemplos destacamos as tags para facilitar a visualização, mas no OmegaT elas não estarão destacadas. As tags de HTML tags, destacadas em <font color="blue">azul,</font> serão ignoradas pelo OmegaT porque estão fora, envolvendo o segmento. As tags destacadas em <font color=
+  <p>Nestes exemplos destacamos as tags para facilitar a visualização, mas no OmegaT elas não estarão destacadas. As tags de HTML tags, destacadas em <font color="blue">azul</font>, serão ignoradas pelo OmegaT porque estão fora, envolvendo o segmento. As tags destacadas em <font color=
   "green">verde</font> serão processadas pelo OmegaT porque estão dentro do segmento. Aqui está um exemplo de um segmento em HTML:</p>
 
-  <p><code><font color="blue"><p></font>Para selecionar uma fonte de visualização diferente, clique na caixa de diálogo <font color="green"><b></font>Fonte de visualização<font color=
-  "green"></b></font>. Para abrir esta caixa, clique no menu <font color=
-  "green"><i></font>Opções<font color="green"></i></font> →<font color="green"><i></font>Fonte...<font color=
+  <p><code><font color="blue"><p></font>Para selecionar uma fonte diferente para visualizar, use a caixa de diálogo <font color="green"><b></font>Fonte de visualização<font color=
+  "green"></b></font>. Para abrir a caixa, clique no menu <font color=
+  "green"><i></font>Configurações<font color="green"></i></font> →<font color="green"><i></font>Fonte de visualização...<font color=
   "green"></i></font>. O tipo e tamanho da fonte podem ser modificados nessa caixa.<font color="blue"></p></font></code></p>
 
   <p>Aqui está como ele será exibido no OmegaT, com a tradução em africâner:</p><br>
@@ -161,7 +161,7 @@
   <p><img src="images/tagged_segment_target.png" alt="" border="0"></p><a name=
   "tag_verif" id="tag_verif"></a>
 
-  <h3>Verificação de tags</h3>
+  <h3>Verificar e corrigir tags</h3>
 
   <p>O OmegaT não detecta automaticamente os erros de tags em um documento traduzido. Antes de entregar o documento final para seu cliente, verifique se há erros de tags.</p>
 
@@ -169,7 +169,7 @@
 
   <p>Em alguns casos, os erros com tags podem impedir o documento de abrir. Portanto, assegure-se de corrigir quaisquer erros de tags antes de criar os arquivos traduzidos. Finalmente, recomenda-se que você abra o documento traduzido no visualizador ou editor onde foi gerado para verificação final da formatação.</p>
 
-  <p>Em algumas linguagens de programação (p.ex. PHP, C) são usadas tags especiais como placeholders (marcadores) em sequênciais de caracteres (strings) utilizadas em conjunto com a função printf. O OmegaT pode detectar e verificar essas tags, se você habilitá-lo para isso. Selecione no menu <strong>Opções→ Validação de tags...</strong>. Escolha entre a validação simples ou completa. Na validação simples são usadas apenas variantes simples de possíveis valores de placeholders. Isto é útil quando o código fonte não contém placeholders mais complexos e expressivos e você obterá muitos falsos positivos.</p>
+  <p>Em algumas linguages de programação (p.ex. PHP, C) são usadas tags especiais como placeholders (marcadores) em sequências de caracteres (strings) utilizadas em conjunto com a função printf. O OmegaT pode detectar e validar essas tags, se você habilitá-lo para isso. Selecione no menu <strong>Opções→ Verificação de tags...</strong>. Escolha entre a verificação simples ou completa. Na verificação simples são usadas apenas variantes simples de possíveis valores de placeholders. Isto é útil quando o código fonte não contém placeholders mais complexos e expressivos e você obterá muitos falsos positivos.</p>
 
   <hr>
 </body>
diff --git a/docs/pt_BR/legalNotices.html b/docs/pt_BR/legalNotices.html
index 9d3538d..4679d1c 100644
--- a/docs/pt_BR/legalNotices.html
+++ b/docs/pt_BR/legalNotices.html
@@ -1,44 +1,58 @@
 <html>
 <head>
-   <meta http-equiv="content-type" content="text/html; charset=UTF-8">
-   <title>Avisos legais - OmegaT 1.6.1 Manual do Usuário</title>
+  <link rel="stylesheet" href="./OmegaT.css" type="text/css">
+  <meta http-equiv="content-type" content="text/html; charset=UTF-8">
+
+  <title>Avisos legais - Manual do Usuário, OmegaT 2.0 </title>
 </head>
+
 <body>
+  <h2>Avisos legais</h2>
+  <hr>
+
+  <h3>Para a documentação</h3>
+
+  <h3>Copyright</h3>
 
-<h1>Avisos legais</h1>
+  <p>A documentação distribuída com o  <strong>OmegaT 2.0</strong>  inclui o Manual do Usuário e o documento readme.txt. A documentação, exceto o capítulo <strong>Guia de Início Rápido</strong>, é protegido por Copyright ©2009 de Vito Smolej. O capítulo <strong>Guia de Início Rápido</strong> é protegido por Copyright ©2005-2009 de Samuel Murray.</p>
 
-<h2>Para o Manual</h2>
+  <h3>Distribuição e modificações</h3>
 
-<p>OmegaT 1.6.1 Manual do Usuáriol (O Manual) está protegido por Copyright:</p>
+  <p><strong>A documentação</strong> é um documento livre; você pode redistribuir ou modificá-lo segundo os termos da Licença Pública Geral (GNU General Public License)  conforme publicado pela Free Software Foundation, seja a versão 2 da Licença, ou (à sua escolha) qualquer versão posterior.</p>
 
-<ul>
-   <li>
-      <a href="aboutOmegaT" title="Sobre o OmegaT">Sobre OmegaT</a>, <a href="translationMemories.html" title="Memórias de tradução">Memórias de Tradução</a>, <a href="glossaries.html" title="Glossários">Glossários</a> e <a href="preventingDataLoss.html" title="Evitar perda de dados">Evitar Perda de Dados</a> são protegidos por Copyright(©) 2003-2006 Marc Prior, Dmitri Gabinski, Jean-Christophe Helary e Maxym Mykhalchuk.</li>
+  <h3>Garantia</h3>
 
-   <li>
-      <a href="instantStartGuide.html" title="Guia de Início Rápido">Guia de Início Rápido</a> é protegido por Copyright(©) 2005-2006 Samuel Murray.</li>
+  <p><strong>A documentação</strong>  é distribuída na expectativa de que possa ser útil, mas SEM NENHUMA GARANTIA, sem mesmo a garantia implícita de COMERCIALIZAÇÃO ou ADEQUAÇÃO PARA UM PROPÓSITO PARTICULAR. Veja a <a href=
+  "license.txt">Licença Pública Geral - GNU</a> para obter mais detalhes.</p>
+  <hr>
 
-   <li>
-      <a href="formattedText.html" title="Trabalhar com texto formatado">Trabalhar com Texto Formatado</a>, <a href="fileFilters.html" title="Filtros de arquivos">Filtros de Arquivo</a>, <a href="segmentation.html" title="Segmentação do texto fonte">Segmentação do Texto Fonte</a>, <a href="translationEditing.html" title="Tradução e edição">Tradução e Revisão</a> e <a href="fileFormats.html" title="Formatos de arquivos compatíveis">Formatos de Arquivos Compatíveis</a> são protegidos por Copyright(©) 2005-2006 Maxym Mykhalchuk.</li>
+  <h3>Para o Aplicativo</h3>
 
-   <li>
-      <a href="keyboardShortcuts.html" title="Atalhos de teclado do OmegaT">Atalhos de Teclado do OmegaT</a> e <a href="website.html" title="O projeto OmegaT na Web, relato de erros e contribuição">Projeto OmegaT na Web, Relato de Erros e Contribuição</a> estão protegidos por Copyright(©) 2006 Jean-Christophe Helary.</li>
+  <h3>Copyright</h3>
 
-   <li>
-      <a href="userInterface.html" title="A interface do usuário">A Interface do Usuário</a>, <a href="projectProperties.html" title="Propriedades do projeto">Propriedades do Projeto</a>, <a href="fontSettings.html" title="Definições de fontes">Definições de Fontes</a> e <a href="menu.html" title="Menu principal">Menu Principal</a> estão protegidos por Copyright(©) 2006 Jean-Christophe Helary e Maxym Mykhalchuk.</li>
-</ul>
+  <p><strong>OmegaT 2.0</strong> é protegido por Copyright  Â© 2000-2009 de Keith Godfrey, Maxym Mykhalchuk, Zoltan Bartko, Didier Briel, Kim Bruning, Alex Buloichik, Sandra Jean Chua, Martin Fleurke, Thomas Huriaux, Fabián Mandelbaum, Arno Peters, Henry Pijffers, Tiago Saboga, Andrzej SawuÅ‚a, Benjamin Siband and Martin Wunderlich.</p>
 
-<p>O Manual é um documento livre; você pode redistribuir e/ou modificá-lo conforme os termos da Licença Pública Geral (GNU General Public License), conforme publicado pela Free Software Foundation; tanto a versão 2 da Licença ou (à sua escolha) qualquer versão posterior.</p>
+  <h3>Distribuição e modificações</h3>
 
-<p>O Manual é distribuído na expectativa de que possa ser útil, mas SEM NENHUMA GARANTIA; sem mesmo a garantia implícita de COMERCIALIZAÇÃO ou ADEQUAÇÃO PARA UM PROPÓSITO PARTICULAR. Veja a <a href="license.txt" title="Licença Pública Geral (GNU)">Licença Pública Geral - GNU</a> para obter mais detalhes.</p>
+  <p>O <strong>OmegaT 2.0</strong> é software livre; você pode redistribuir e/ou modificá-lo segundo os termos da Licença Pública Geral (GNU General Public License), conforme publicado pela Free Software Foundation, seja a versão 2 da Licença ou (à sua escolha) qualquer versão posterior.</p>
 
-<h2>Para o Aplicativo</h2>
+  <h3>Garantia</h3>
 
-<p>OmegaT 1.6.1 Copyright(©) 2000-2006 Keith Godfrey, Maxym Mykhalchuk, Henry Pijffers, Benjamin Siband, Sandra Jean Chua, Kim Bruning e Martin Wunderlich.</p>
+  <p>O <strong>OmegaT 2.0</strong> é distribuído na expectativa de que possa ser útil, mas SEM NENHUMA GARANTIA, sem mesmo a garantia implícita de COMERCIALIZAÇÃO ou ADEQUAÇÃO PARA UM PROPÓSITO PARTICULAR. Veja a <a href=
+  "license.txt">Licença Pública Geral - GNU</a> para obter mais detalhes.</p>
+  <hr>
 
-<p>O OmegaT 1.6.1 é software livre; você pode redistribuir e/ou modificá-lo conforme os termos da Licença Pública Geral (GNU General Public License), conforme publicado pela Free Software Foundation; tanto a versão 2 da Licença ou (à sua escolha) qualquer versão posterior.</p>
+  <table style="width: 100%;" summary="just formatting" border="0" cellpadding=
+  "2" cellspacing="2">
+    <tbody>
+      <tr>
+        <td style="text-align: left;"><a href="legalNotices.html">Avisos legais</a></td>
 
-<p>O OmegaT 1.6.1 é distribuído na expectativa de que possa ser útil, mas SEM NENHUMA GARANTIA; sem mesmo a garantia implícita de COMERCIALIZAÇÃO ou ADEQUAÇÃO PARA UM PROPÓSITO PARTICULAR. Veja a <a href="license.txt" title="Licença Pública Geral (GNU)">Licença Pública Geral - GNU</a> para obter mais detalhes.</p>
+        <td style="text-align: center;"><a href="index.html">Home</a></td>
 
+        <td style="text-align: right;"><a href="xindex.html">Índice</a></td>
+      </tr>
+    </tbody>
+  </table>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/docs/pt_BR/license.txt b/docs/pt_BR/license.txt
index 13a56b1..b1d3471 100644
--- a/docs/pt_BR/license.txt
+++ b/docs/pt_BR/license.txt
@@ -1,5 +1,4 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
+		    LICENÇA PÚBLICA GERAL (GNU GENERAL PUBLIC LICENSE)		       Versão 2, Junho de 1991
 
  Copyright (C) 1989, 1991 Free Software Foundation, Inc.
                        59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
diff --git a/docs/pt_BR/menu.html b/docs/pt_BR/menu.html
index 92e8362..0184e45 100644
--- a/docs/pt_BR/menu.html
+++ b/docs/pt_BR/menu.html
@@ -1,179 +1,1165 @@
 <html>
 <head>
-   <meta http-equiv="content-type" content="text/html; charset=UTF-8">
-   <title>Menu principal - OmegaT 1.6.1 Manual do Usuário</title>
+  <link rel="stylesheet" href="./OmegaT.css" type="text/css">
+  <meta http-equiv="content-type" content="text/html; charset=UTF-8">
+
+  <title>Menus e atalhos de teclado para o OmegaT  - Manual do Usuário, OmegaT 2.0 </title>
 </head>
+
 <body>
+  <h2>Menu principal e atalhos de teclado</h2>
+
+  <h3><a href="#menu">Menu principal</a></h3>
+
+  <h3><a href="#shortcuts">Atalhos de teclado</a></h3>
+
+  <ul>
+    <li>
+      <p><a href="#Project_management">Gerência do projeto</a></p>
+    </li>
+
+    <li>
+      <p><a href="#Editing">Edição</a></p>
+    </li>
+
+    <li>
+      <p><a href="#Moving_around">Movimentação</a></p>
+    </li>
+
+    <li>
+      <p><a href="#Reference_windows">Janelas de referência</a></p>
+    </li>
+
+    <li>
+      <p><a href="#Other">Outro</a></p>
+    </li>
+  </ul>
+  <hr>
+
+  <h2><a name="menu" id="menu"></a>Menu principal</h2>
+
+  <p>Todas as funções do OmegaT estão disponíveis na barra de menus na parte superior da janela Editor. Muitas funções também estão disponíveis via <a href=
+  "#shortcuts">atalhos de teclado</a>. Para ativar os atalhos, pressione <strong>Ctrl</strong> e uma letra. Alguns atalhos requerem o uso de outras teclas. Para facilitar a leitura, as letras são escritas aqui em maiúsculas. <strong>Ctrl</strong> é usado no Windows, UNIX e sistemas operacionais semelhantes ao UNIX com os teclados que tenham uma tecla <strong>Ctrl</strong> / <strong>Control</strong>. Para os usuários do Mac, o comando é <strong>cmd+tecla</strong>. A tecla <strong>cmd</strong> está identificada como <strong>comando</strong> ou a marca da <strong>maçã</strong> nos teclados Apple.</p>
+
+  <table summary="just formatting" border="1" cellpadding="3" cellspacing="0"
+  width="500">
+    <tbody>
+      <tr bgcolor="#DDDDDD">
+        <td>
+          <p align="center"><a href="#ProjectMenu">Projeto</a></p>
+        </td>
+
+        <td>
+          <p align="center"><a href="#EditMenu">Editar</a></p>
+        </td>
+
+        <td>
+          <p align="center"><a href="#GoToMenu">Ir para</a></p>
+        </td>
+
+        <td>
+          <p align="center"><a href="#ViewMenu">Exibir</a></p>
+        </td>
+
+        <td>
+          <p align="center"><a href="#ToolsMenu">Ferramentas</a></p>
+        </td>
+
+        <td>
+          <p align="center"><a href="#OptionsMenu">Opções</a></p>
+        </td>
+
+        <td>
+          <p align="center"><a href="#HelpMenu">Ajuda</a></p>
+        </td>
+      </tr>
+    </tbody>
+  </table>
+
+  <table summary="just formatting" border="0" cellpadding="5" cellspacing="0">
+    <tbody>
+      <tr bgcolor="#FFFFFF">
+        <td colspan="3">
+          <hr>
+
+          <h3><a name="ProjectMenu" id="ProjectMenu"></a>Projeto</h3>
+        </td>
+      </tr>
+
+      <tr bgcolor="#DDDDDD">
+        <td width="23%">
+          <p><code>Novo</code></p>
+        </td>
+
+        <td width="17%"></td>
+
+        <td>
+          <p>Cria e abre um projeto novo. A caixa de diálogo para criar um projeto é a mesma que para <a href="projectProperties.html">editar o projeto</a>.</p>
+        </td>
+      </tr>
+
+      <tr bgcolor="#FFFFFF">
+        <td width="23%">
+          <p><code>Abrir</code></p>
+        </td>
+
+        <td width="17%">
+          <p><code>Ctrl+O</code></p>
+        </td>
+
+        <td>
+          <p>Abre um projeto anteriormente criado.</p>
+        </td>
+      </tr>
+
+      <tr bgcolor="#DDDDDD">
+        <td width="23%">
+          <p><code>Importar arquivos fonte...</code></p>
+        </td>
+
+        <td width="17%"></td>
+
+        <td>
+          <p>Copia os arquivos selecionados para o diretório <code>/source</code> e recarrega o projeto com os novos arquivos.</p>
+        </td>
+      </tr>
+
+      <tr bgcolor="#FFFFFF">
+        <td width="23%">
+          <p><code>Importar do MediaWiki...</code></p>
+        </td>
+
+        <td width="17%"></td>
+
+        <td>
+          <p>Importa unidades das páginas do MediaWiki, com base no URL digitado</p>
+        </td>
+      </tr>
+
+      <tr bgcolor="#DDDDDD">
+        <td width="23%">
+          <p><code>Recarregar</code></p>
+        </td>
+
+        <td width="17%"><code>F5</code></td>
+
+        <td>
+          <p>Recarrega o projeto para aceitar modificações externas nos arquivos fonte, nas memórias de tradução existentes e nos glossários.</p>
+        </td>
+      </tr>
+
+      <tr bgcolor="#FFFFFF">
+        <td width="23%">
+          <p><code>Fechar</code></p>
+        </td>
+
+        <td width="17%"><code>Ctrl+Shift+W</code></td>
+
+        <td>
+          <p>Grava a tradução e fecha o projeto.</p>
+        </td>
+      </tr>
+
+      <tr bgcolor="#DDDDDD">
+        <td width="23%">
+          <p><code>Salvar</code></p>
+        </td>
+
+        <td width="17%">
+          <p><code>Ctrl+S</code></p>
+        </td>
+
+        <td>
+          <p>Grava a tradução na memória do projeto. O OmegaT grava automaticamente a tradução a cada 10 minutos ou quando você fechar o projeto ou sair do programa.</p>
+        </td>
+      </tr>
+
+      <tr bgcolor="#FFFFFF">
+        <td width="23%">
+          <p><code>Criar documentos traduzidos</code></p>
+        </td>
+
+        <td width="17%"><code>Ctrl+D</code></td>
+
+        <td>
+          <p>Cria os documentos destino com base no texto que você traduziu. Os documentos serão criados na pasta <code>/target</code>.</p>
+        </td>
+      </tr>
+
+      <tr bgcolor="#DDDDDD">
+        <td width="23%">
+          <p><code>Propriedades</code></p>
+        </td>
+
+        <td width="17%">
+          <p><code>Ctrl+E</code></p>
+        </td>
+
+        <td>
+          <p>Exibe a caixa de diálogo <a href="projectProperties.html">Propriedades do projeto</a> para modificar as línguas do projeto e o local das pastas.</p>
+        </td>
+      </tr>
+
+      <tr bgcolor="#FFFFFF">
+        <td width="23%">
+          <p><code>Arquivos do projeto...</code></p>
+        </td>
+
+        <td width="17%">
+          <p><code>Ctrl+L</code></p>
+        </td>
+
+        <td>
+          <p>Fecha e abre a <a href="userInterface.html#Project_Files">janela Arquivos do projeto</a> (dependendo se ela estiver aberta ou fechada).</p>
+        </td>
+      </tr>
+
+      <tr bgcolor="#DDDDDD">
+        <td width="23%">
+          <p><code>Sair</code></p>
+        </td>
+
+        <td width="17%">
+          <p><code>Ctrl+Q</code></p>
+        </td>
+
+        <td>
+          <p>Grava o projeto e sai do OmegaT. Se você ainda não gravou o projeto manualmente, confirma se você quer realmente sair.</p>
+        </td>
+      </tr>
+
+      <tr bgcolor="#FFFFFF">
+        <td colspan="3">
+          <hr>
+
+          <h3><a name="EditMenu" id="EditMenu"></a>Editar</h3>
+        </td>
+      </tr>
+
+      <tr bgcolor="#FFFFFF">
+        <td colspan="3">
+          <p>Nota: os itens geralmente encontrados na maioria dos aplicativos (copiar/recortar/colar) não são exibidos neste menu, mas estão disponíveis com os atalhos do seu sistema. Por exemplo:</p>
+        </td>
+      </tr>
+
+      <tr bgcolor="#DDDDDD">
+        <td width="23%">
+          <p><code>Copiar</code></p>
+        </td>
+
+        <td width="17%">
+          <p><code>Ctrl+C</code></p>
+        </td>
+
+        <td>
+          <p>Copia o texto selecionado para a área de transferência.</p>
+        </td>
+      </tr>
+
+      <tr bgcolor="#FFFFFF">
+        <td width="23%">
+          <p><code>Recortar</code></p>
+        </td>
+
+        <td width="17%">
+          <p><code>Ctrl+X</code></p>
+        </td>
+
+        <td>
+          <p>Copia o texto selecionado para a área de transferência e apaga o texto selecionado.</p>
+        </td>
+      </tr>
+
+      <tr bgcolor="#DDDDDD">
+        <td width="23%">
+          <p><code>Colar</code></p>
+        </td>
+
+        <td width="17%">
+          <p><code>Ctrl+V</code></p>
+        </td>
+
+        <td>
+          <p>Passa o texto da área de transferência para a posição onde está o cursor.</p>
+        </td>
+      </tr>
+
+      <tr bgcolor="#FFFFFF">
+        <td colspan="3">
+          <p>O menu <strong>Editar</strong> contém as seguintes opções:</p>
+
+      </td></tr><tr bgcolor="#DDDDDD">
+        <td>
+          <p>Desfazer última ação</p>
+        </td>
+
+        <td>
+          <p><code>Ctrl+Z</code></p>
+        </td>
+
+        <td>
+          <p>Desfaz as últimas ações de edição no segmento destino aberto</p>
+        </td>
+      </tr>
+
+      <tr bgcolor="#FFFFFF">
+        <td>
+          <p>Refazer última ação</p>
+        </td>
+
+        <td>
+          <p><code>Ctrl+Y</code></p>
+        </td>
+
+        <td>
+          <p>Refaz as ações de edição que acabaram de ser desfeitas no segmento destino aberto</p>
+        </td>
+      </tr>
+
+      <tr bgcolor="#DDDDDD">
+        <td>
+          <p>Selecionar correspondência No.</p>
+        </td>
+
+        <td>
+          <p><code>Ctrl+No.</code></p>
+        </td>
+
+        <td>
+          <p>No. é um dígito de 1 a 5. O atalho seleciona a correspondência N<sup>o</sup> mostrada na janela de correspondências (por predefinição, a primeira está selecionada)</p>
+        </td>
+      </tr>
+
+      <tr bgcolor="#FFFFFF">
+        <td>
+          <p>Substituir com correspondência</p>
+        </td>
+
+        <td>
+          <p><code>Ctrl+R</code></p>
+        </td>
+
+        <td>
+          <p>Substitui o conteúdo do segmento destino aberto com a correspondência selecionada (por predefinição, a primeira está selecionada)</p>
+        </td>
+      </tr>
+
+      <tr bgcolor="#DDDDDD">
+        <td>
+          <p>Inserir correspondência</p>
+        </td>
+
+        <td>
+          <p><code>Ctrl+I</code></p>
+        </td>
+
+        <td>
+          <p>Insere no segmento aberto e na posição onde está o cursor a correspondência selecionada (a primeira está selecionada por predefinição)</p>
+        </td>
+      </tr>
+
+      <tr bgcolor="#FFFFFF">
+        <td>
+          <p>Substituir com texto fonte</p>
+        </td>
+
+        <td>
+          <p><code>Ctrl+Shift+R</code></p>
+        </td>
+
+        <td>
+          <p>Substitui o conteúdo do segmento destino aberto com o texto fonte</p>
+        </td>
+      </tr>
+
+      <tr bgcolor="#DDDDDD">
+        <td>
+          <p>Inserir texto fonte</p>
+        </td>
+
+        <td>
+          <p><code>Ctrl+Shift+I</code></p>
+        </td>
+
+        <td>
+          <p>Insere o texto fonte no segmento destino aberto, na posição onde está o cursor</p>
+        </td>
+      </tr>
+
+      <tr bgcolor="#FFFFFF">
+        <td>
+          <p>Buscar no projeto</p>
+        </td>
+
+        <td>
+          <p><code>Ctrl+F</code></p>
+        </td>
+
+        <td>
+          <p>Exibe uma caixa de diálogo para fazer pesquisas no projeto</p>
+        </td>
+      </tr>
+
+      <tr bgcolor="#DDDDDD">
+        <td width="23%">
+          <p>Substituir com tradução automática</p>
+        </td>
+
+        <td width="17%">
+          <p><code>Ctrl+M</code></p>
+        </td>
+
+        <td>
+          <p>Substitui o conteúdo do segmento destino com o texto do Google Tradutor Para isso acontecer, o Google Tradutor deve estar ativado (ver Menu > Opções >Google Tradutor).</p>
+        </td>
+      </tr>
+
+      <tr bgcolor="#FFFFFF">
+        <td colspan="3">
+          <hr>
+
+          <h3><a name="GoToMenu" id="GoToMenu"></a>Ir para</h3>
+        </td>
+      </tr>
+
+      <tr bgcolor="#DDDDDD">
+        <td width="23%">
+          <p><code>Próximo segmento não traduzido</code></p>
+        </td>
+
+        <td width="17%">
+          <p><code>Ctrl+U</code></p>
+        </td>
+
+        <td>
+          <p>Avança para o próximo segmento que não tem equivalente na memória da tradução.</p>
+        </td>
+      </tr>
+
+      <tr bgcolor="#FFFFFF">
+        <td width="23%">
+          <p><code>Próximo segmento</code></p>
+        </td>
+
+        <td width="17%">
+          <p><code>Ctrl+N</code> ou <code>Enter</code> ou <code>Tab</code></p>
+        </td>
+
+        <td>
+          <p>Avança para o próximo segmento. Se o segmento aberto for o último em um arquivo, avança para o primeiro segmento do próximo arquivo do projeto.</p>
+        </td>
+      </tr>
+
+      <tr bgcolor="#DDDDDD">
+        <td width="23%">
+          <p><code>Segmento anterior</code></p>
+        </td>
+
+        <td width="17%">
+          <p><code>Ctrl+P</code> ou <code>Ctrl+Enter</code> ou <code>Ctrl+Tab</code></p>
+        </td>
+
+        <td>
+          <p>Volta para o segmento anterior. Volta para o último segmento do arquivo anterior, se o segmento aberto for o último em um arquivo.</p>
+        </td>
+      </tr>
+
+      <tr bgcolor="#FFFFFF">
+        <td width="23%">
+          <p><code>Segmento número...</code></p>
+        </td>
+
+        <td width="17%">
+          <p><code>Ctrl+J</code></p>
+        </td>
+
+        <td>
+          <p>O segmento abre ao se digitar seu número</p>
+        </td>
+      </tr>
+
+      <tr bgcolor="#DDDDDD">
+        <td width="23%">
+          <p><code>Avançar pelos segmentos...</code></p>
+        </td>
+
+        <td width="17%">
+          <p><code>Ctrl+Shift+N</code></p>
+        </td>
+
+        <td>
+          <p>OmegaT lembra os segmentos executados. Com este comando você pode avançar pelos segmentos anteriormente marcados no comando "voltar pelos segmentos". </p>
+        </td>
+      </tr>
+
+      <tr bgcolor="#FFFFFF">
+        <td width="23%">
+          <p><code>Voltar pelos segmentos...</code></p>
+        </td>
+
+        <td width="17%">
+          <p><code>Ctrl+Shift+P</code></p>
+        </td>
+
+        <td>
+          <p>Com este comando você pode retroceder para um ou vários segmentos no tempo, para voltar mais tarde para o segmento atual.</p>
+        </td>
+      </tr>
+
+      <tr bgcolor="#FFFFFF">
+        <td colspan="3">
+          <hr>
+
+          <h3><a name="ViewMenu" id="ViewMenu"></a>Exibir</h3>
+        </td>
+      </tr>
+
+      <tr bgcolor="#DDDDDD">
+        <td width="23%">
+          <p><code>Marcar segmentos traduzidos</code></p>
+        </td>
+
+        <td width="17%"></td>
+
+        <td>
+          <p>Se selecionada, esta opção marcará com amarelo os segmentos traduzidos.</p>
+        </td>
+      </tr>
+
+      <tr bgcolor="#FFFFFF">
+        <td width="23%">
+          <p><code>Marcar segmentos não traduzidos</code></p>
+        </td>
+
+        <td width="17%"></td>
+
+        <td>
+          <p>Se selecionada, os segmentos não traduzidos serão marcados em violeta.</p>
+        </td>
+      </tr>
+
+      <tr bgcolor="#DDDDDD">
+        <td width="23%">
+          <p><code>Mostrar segmentos fonte</code></p>
+        </td>
+
+        <td width="17%"></td>
+
+        <td>
+          <p>Se selecionada, os segmentos fonte serão mostrados e marcados em verde. Se não for selecionada, os segmentos fonte não serão mostrados.</p>
+        </td>
+      </tr>
+
+      <tr bgcolor="#FFFFFF">
+        <td colspan="3">
+          <hr>
+
+          <h3><a name="ToolsMenu" id="ToolsMenu"></a>Ferramentas</h3>
+        </td>
+      </tr>
+
+      <tr bgcolor="#DDDDDD">
+        <td width="23%">
+          <p><code>Verificar tags</code></p>
+        </td>
+
+        <td width="17%">
+          <p><code>Ctrl+T</code></p>
+        </td>
+
+        <td>
+          <p>Verifica se faltam tags ou se elas estão posicionadas erradas nos arquivos formatados. Exibirá uma lista de segmentos com problemas de tags. A  janela <a href=
+          "userInterface.html#tag_Validation">Verificação de tags</a> relaciona o que você verá lá e  <a href="formattedText.html">Trabalhar com textos formatados</a> explica porque.</p>
+        </td>
+      </tr>
+
+      <tr bgcolor="#FFFFFF">
+        <td colspan="3">
+          <hr>
+
+          <h3><a name="OptionsMenu" id="OptionsMenu"></a>Opções</h3>
+        </td>
+      </tr>
+
+      <tr bgcolor="#DDDDDD">
+        <td width="23%">
+          <p><code>Usar TAB para avançar</code></p>
+        </td>
+
+        <td width="17%"></td>
+
+        <td>
+          <p>Define a tecla de validação de segmentos para <code>Tab</code> em vez da tecla predefinida <code>Enter</code>. Esta opção é útil para alguns sistemas de entrada de caracteres chineses, japoneses e coreanos.</p>
+        </td>
+      </tr>
+
+      <tr bgcolor="#FFFFFF">
+        <td width="23%">
+          <p><code>Sempre confirmar saída</code></p>
+        </td>
+
+        <td width="17%"></td>
+
+        <td>
+          <p>Antes de encerrar, o programa sempre confirmará com o usuário.</p>
+        </td>
+      </tr>
+
+      <tr bgcolor="#DDDDDD">
+        <td><code>Google Tradutor</code></td>
+
+        <td></td>
+
+        <td>
+          <p><a href="GoogleTranslate.html">Google Tradutor</a> ativado/não ativado. Quando ativado, o controle <code>Ctrl+M</code> irá inserir a sugestão do Google Tadutor no segmento destino aberto. A sugestão, mostrada no painel Google Tradutor, pode ser revisada antes da inserção</p>
+        </td>
+      </tr>
+
+      <tr bgcolor="#FFFFFF">
+        <td width="23%">
+          <p><code>Fonte...</code></p>
+        </td>
+
+        <td width="17%"></td>
+
+        <td>
+          <p>Exibe a caixa de diálogo <a href="fontSettings.html">Definições de fontes</a> para modificar a fonte de visualização do texto. Recomenda-se aos usuários de computadores antigos, com redimensionamento lento da janela, que mudem a fonte.</p>
+        </td>
+      </tr>
+
+      <tr bgcolor="#DDDDDD">
+        <td width="23%">
+          <p><code>Filtros de arquivos...</code></p>
+        </td>
+
+        <td width="17%"></td>
+
+        <td>
+          <p>Exibe a caixa de diálogo <a href="fileFilters.html">Filtros de arquivos</a> para configurar o processamento e análise de arquivos.</p>
+        </td>
+      </tr>
+
+      <tr bgcolor="#FFFFFF">
+        <td width="23%">
+          <p><code>Segmentação...</code></p>
+        </td>
+
+        <td width="17%"></td>
+
+        <td>
+          <p>Abre a caixa de diálogo <a href="segmentation.html">Segmentação do texto fonte</a> para configurar a segmentação do texto.</p>
+        </td>
+      </tr>
+
+      <tr bgcolor="#DDDDDD">
+        <td width="23%">
+          <p><code>Verificador ortográfico...</code></p>
+        </td>
+
+        <td width="17%"></td>
+
+        <td>
+          <p>Abre a janela <a href="spellchecker.html">Configuração do verificador ortográfico</a> para instalar, configurar e ativar o verificador.</p>
+        </td>
+      </tr>
+
+      <tr bgcolor="#FFFFFF">
+        <td width="23%">
+          <p><code>Modo de trabalho...</code></p>
+        </td>
+
+        <td width="17%"></td>
+
+        <td>
+          <p>Mostra a caixa de diálogo <a href="translationEditing.html">Editar modo de trabalho</a> com as configurações para o campo destino</p>
+        </td>
+      </tr>
+
+      <tr bgcolor="#DDDDDD">
+        <td width="23%">
+          <p><code>Restaurar janela principal</code></p>
+        </td>
+
+        <td width="17%"></td>
+
+        <td>
+          <p>Restaura os componentes (editor, visualizador de correspondência, de glossário e dicionário e o painel do Google Tradutor) da janela principal do OmegaT à configuração padrão. Use este recurso caso tenha desencaixado, movido ou ocultado um ou mais componentes e não pode recuperá-los de outra forma. Use-o também se você tiver mudado de versão do OmegaT e tiver problemas com janelas não aparecem mais.</p>
+        </td>
+      </tr>
+
+      <tr bgcolor="#FFFFFF">
+        <td colspan="3">
+          <hr>
+
+          <h3><a name="HelpMenu" id="HelpMenu"></a>Ajuda</h3>
+        </td>
+      </tr>
+
+      <tr bgcolor="#DDDDDD">
+        <td width="23%">
+          <p><code>Manual do Usuário... </code></p>
+        </td>
+
+        <td width="17%">
+          <p><code>F1</code></p>
+        </td>
+
+        <td>
+          <p>Abre o <a href="userInterface.html#Help_Browser">navegador da Ajuda</a> com este manual em uma janela separada.</p>
+        </td>
+      </tr>
+
+      <tr bgcolor="#FFFFFF">
+        <td width="23%">
+          <p><code>Sobre...</code></p>
+        </td>
+
+        <td width="17%"></td>
+
+        <td>
+          <p>Exibe as informações sobre copyright, créditos e licença.</p>
+        </td>
+      </tr>
+    </tbody>
+  </table>
+  <hr>
+
+  <h2><a name="shortcuts" id="shortcuts"></a>Atalhos de teclado</h2>
+
+  <p>Os seguintes atalhos estão disponíveis na janela principal. Quando uma outra janela estiver na frente, clique na janela principal para colocá-la em primeiro plano ou pressione <code><strong>Esc</strong></code> para fechar aquela janela.</p>
+
+  <p>Para ativar os atalhos, pressione <code><strong>Ctrl</strong></code> e uma letra. Alguns atalhos requerem o uso de outras teclas. Para facilitar a leitura, as letras são escritas aqui em maiúsculas.</p>
+
+  <p><strong><code>Ctrl</code></strong> é usado no Windows, UNIX e sistemas operacionais semelhantes ao UNIX com os teclados que tenham uma tecla <strong><code>Ctrl</code></strong> / <code><strong>Control</strong></code>. Para os usuários do Mac, o comando é <code><strong>cmd+tecla</strong></code>. A tecla <code><strong>cmd</strong></code> está identificada como <code><strong>comando</strong></code> ou a marca da <strong>maçã</strong> nos teclados Apple.</p>
+
+  <ul>
+    <li>
+      <p><a href="#Project_management">Gerência do projeto</a></p>
+    </li>
+
+    <li>
+      <p><a href="#Editing">Edição</a></p>
+    </li>
+
+    <li>
+      <p><a href="#Moving_around">Movimentação</a></p>
+    </li>
+
+    <li>
+      <p><a href="#Reference_windows">Janelas de referência</a></p>
+    </li>
+
+    <li>
+      <p><a href="#Other">Outro</a></p>
+    </li>
+  </ul>
+
+  <table summary="just formatting" border="0" cellpadding="3" cellspacing="0">
+    <tbody>
+      <tr bgcolor="#FFFFFF">
+        <td colspan="3">
+          <hr>
+
+          <h3><a name="Project_management" id="Project_management"></a>Gerência do projeto</h3>
+        </td>
+      </tr>
+
+      <tr bgcolor="#DDDDDD">
+        <td>
+          <p>Abrir projeto</p>
+        </td>
+
+        <td>
+          <p><code>Ctrl+O</code></p>
+        </td>
+
+        <td>
+          <p>Exibe uma caixa de diálogo para localizar um projeto existente</p>
+        </td>
+      </tr>
+
+      <tr bgcolor="#FFFFFF">
+        <td>
+          <p>Salvar</p>
+        </td>
+
+        <td>
+          <p><code>Ctrl+S</code></p>
+        </td>
+
+        <td>
+          <p>Grava o trabalho atual no arquivo project_save.tmx localizado na pasta /omegat/ do projeto</p>
+        </td>
+      </tr>
+
+      <tr bgcolor="#DDDDDD">
+        <td>
+          <p>Fechar projeto</p>
+        </td>
+
+        <td>
+          <p><code>Shift+Ctrl+W</code></p>
+        </td>
+
+        <td>
+          <p>Fecha o projeto atual</p>
+        </td>
+      </tr>
+
+      <tr bgcolor="#FFFFFF">
+        <td>
+          <p>Criar documentos traduzidos</p>
+        </td>
+
+        <td>
+          <p><code>Ctrl+D</code></p>
+        </td>
+
+        <td>
+          <p>Cria os documentos traduzidos na pasta 'target' do projeto</p>
+        </td>
+      </tr>
+
+      <tr bgcolor="#DDDDDD">
+        <td>
+          <p>Propriedades do projeto</p>
+        </td>
+
+        <td>
+          <p><code>Ctrl+E</code></p>
+        </td>
+
+        <td>
+          <p>Exibe as definições do projeto para modificação eventual</p>
+        </td>
+      </tr>
+
+      <tr bgcolor="#FFFFFF">
+        <td colspan="3">
+          <hr>
+
+          <h3><a name="Editing" id="Editing"></a>Edição</h3>
+        </td>
+      </tr>
+
+      <tr bgcolor="#DDDDDD">
+        <td>
+          <p>Desfazer última ação</p>
+        </td>
+
+        <td>
+          <p><code>Ctrl+Z</code></p>
+        </td>
+
+        <td>
+          <p>Desfaz as últimas ações de edição no segmento destino aberto</p>
+        </td>
+      </tr>
+
+      <tr bgcolor="#FFFFFF">
+        <td>
+          <p>Refazer última ação</p>
+        </td>
+
+        <td>
+          <p><code>Ctrl+Y</code></p>
+        </td>
+
+        <td>
+          <p>Refaz as ações de edição que acabaram de ser desfeitas no segmento destino aberto</p>
+        </td>
+      </tr>
+
+      <tr bgcolor="#DDDDDD">
+        <td>
+          <p>Selecionar correspondência No.</p>
+        </td>
+
+        <td>
+          <p><code>Ctrl+No.</code></p>
+        </td>
+
+        <td>
+          <p>No. é um dígito de 1 a 5. O atalho seleciona a correspondência N<sup>o</sup> mostrada na janela de correspondências (por predefinição, a primeira está selecionada)</p>
+        </td>
+      </tr>
+
+      <tr bgcolor="#FFFFFF">
+        <td>
+          <p>Substituir com correspondência</p>
+        </td>
+
+        <td>
+          <p><code>Ctrl+R</code></p>
+        </td>
+
+        <td>
+          <p>Substitui o conteúdo do segmento destino aberto com a correspondência selecionada (por predefinição, a primeira está selecionada)</p>
+        </td>
+      </tr>
+
+      <tr bgcolor="#DDDDDD">
+        <td>
+          <p>Inserir correspondência</p>
+        </td>
+
+        <td>
+          <p><code>Ctrl+I</code></p>
+        </td>
+
+        <td>
+          <p>Insere no segmento aberto e na posição onde está o cursor a correspondência selecionada (a primeira está selecionada por predefinição)</p>
+        </td>
+      </tr>
+
+      <tr bgcolor="#FFFFFF">
+        <td>
+          <p>Substituir com texto fonte</p>
+        </td>
+
+        <td>
+          <p><code>Ctrl+Shift+R</code></p>
+        </td>
+
+        <td>
+          <p>Substitui o conteúdo do segmento destino aberto com o texto fonte</p>
+        </td>
+      </tr>
+
+      <tr bgcolor="#DDDDDD">
+        <td>
+          <p>Inserir texto fonte</p>
+        </td>
+
+        <td>
+          <p><code>Ctrl+Shift+I</code></p>
+        </td>
+
+        <td>
+          <p>Insere o texto fonte no segmento destino aberto, na posição onde está o cursor</p>
+        </td>
+      </tr>
+
+      <tr bgcolor="#FFFFFF">
+        <td>
+          <p>Buscar no projeto</p>
+        </td>
 
-<h1>Menu principal</h1>
+        <td>
+          <p><code>Ctrl+F</code></p>
+        </td>
 
-<p>Todas as funções do OmegaT estão disponíveis na barra de menus na parte superior da janela Editor. Muitas funções também estão disponíveis via <a href="keyboardShortcuts.html">atalhos de teclado</a>.</p>
+        <td>
+          <p>Exibe uma caixa de diálogo para fazer pesquisas no projeto</p>
+        </td>
+      </tr>
 
-<p>Os atalhos com <strong><code>Ctrl</code></strong> relacionados são para Windows, UNIX e sistemas operacionais semelhantes ao UNIX com telcados que tenham uma tecla <strong><code>Ctrl</code></strong> ou <strong><code>Control</code></strong>. Os usuários de Mac OS X devem usar a tecla Apple <i9> .</p>
+      <tr bgcolor="#DDDDDD">
+        <td width="23%">
+          <p>Substituir com tradução automática</p>
+        </td>
 
-<h2>Índice</h2>
-<ul type="none">
-   <li>1. <a href="#Project_Menu">Menu Projeto</a></li>
-   <li>2. <a href="#Edit_Menu">Menu Editar</a></li>
-   <li>3. <a href="#Go_to_Menu">Menu Ir para</a></li>
-   <li>4. <a href="#Tools_Menu">Menu Ferramentas</a></li>
-   <li>5. <a href="#Options_Menu">Menu Opções</a></li>
-   <li>6. <a href="#Help_Menu">Menu Ajuda</a></li>
-</ul>
+        <td width="17%">
+          <p><code>Ctrl+M</code></p>
+        </td>
 
-<a name="Project_Menu"></a>
-<h4>Menu Projeto</h4>
+        <td>
+          <p>Substitui o conteúdo do segmento destino com o texto do Google Tradutor Para isso acontecer, o Google Tradutor deve estar ativado (ver Menu > Opções >Google Tradutor).</p>
+        </td>
+      </tr>
 
-<p>
-<dl>
-   <dt>Novo</dt>
-   <dd>Cria e abre um projeto novo. A caixa de diálogo para criar um projeto é a mesma que para <a href="projectProperties.html">editar o projeto</a>.</dd>
+      <tr bgcolor="#FFFFFF">
+        <td colspan="3">
+          <hr>
 
-   <dt>Abrir <code><Ctrl+O></code></dt>
-   <dd>Abre um projeto anteriormente criado.</dd>
+          <h3><a name="Moving_around" id="Moving_around"></a>Movimentação</h3>
+        </td>
+      </tr>
 
-   <dt>Importar arquivos fonte...</dt>
-   <dd>Copia os arquivos selecionados para o diretório <code>/source</code> e recarrega o projeto com os novos arquivos.</dd>
+      <tr bgcolor="#DDDDDD">
+        <td>
+          <p>Próximo segmento não traduzido</p>
+        </td>
 
-   <dt>Recarregar</dt>
-   <dd>Recarrega o projeto para aceitar modificações externas nos arquivos fonte, nas memórias de tradução existentes e glossários.</dd>
+        <td>
+          <p><code>Ctrl+U</code></p>
+        </td>
 
-   <dt>Fechar</dt>
-   <dd>Grava a tradução e fecha o projeto.</dd>
+        <td>
+          <p>Move o campo de edição para o próximo segmento que não está registrado na memória de tradução do projeto</p>
+        </td>
+      </tr>
 
-   <dt>Salvar <code><Ctrl+S></code></dt>
-   <dd>Grava a tradução na memória do projeto. O OmegaT grava automaticamente a tradução a cada 10 minutos ou quando você fechar o projeto ou sair do programa.</dd>
+      <tr bgcolor="#FFFFFF">
+        <td>
+          <p>Próximo segmento</p>
+        </td>
 
-   <dt>Criar documentos traduzidos</dt>
-   <dd>Cria os documentos destino com base no texto que você traduziu. Os documentos serão criados no diretório <code>/target</code>.</dd>
+        <td>
+          <p><code>Ctrl+N<br> Enter ou Return </code></p>
+        </td>
 
-   <dt>Propriedades <code><Ctrl+E></code></dt>
-   <dd>Exibe a caixa de diálogo <a href="projectProperties.html">Propriedades do projeto</a> para editar idiomas do projeto e localização das pastas.</dd>
+        <td>
+          <p>Move o campo de edição para o próximo segmento</p>
+        </td>
+      </tr>
 
-   <dt>Arquivos do projeto... <code><Ctrl+L></code></dt>
-   <dd>Fecha e abre a <a href="userInterface.html#Project_Files">janela Arquivos do projeto</a> (dependendo se ela estiver aberta ou fechada).</dd>
+      <tr bgcolor="#DDDDDD">
+        <td>
+          <p>Segmento anterior</p>
+        </td>
 
-   <dt>Sair <code><Ctrl+Q></code></dt>
-   <dd>Grava o projeto e sai do OmegaT. Se você ainda não gravou o projeto manualmente, confirma se você quer realmente sair.</dd>
-</dl>
-</p>
+        <td>
+          <p><code>Ctrl+P</code></p>
+        </td>
 
-<a name="Edit_Menu"></a>
-<h4>Menu Editar</h4>
+        <td>
+          <p>Moves o campo de edição para o segmento anterior</p>
+        </td>
+      </tr>
 
-<p>Os itens geralmente encontrados na maioria dos aplicativos (copiar/recortar/colar) não são exibidos neste menu, mas estão disponíveis com os atalhos do seu sistema. Por exemplo, no Windows:</p>
+      <tr bgcolor="#FFFFFF">
+        <td>
+          <p>Segmento número...</p>
+        </td>
 
-<p>
-<dl>
-   <dt>Copiar <code><Ctrl+C></code></dt>
-   <dd>Copia o texto selecionado para a área de transferência.</dd>
+        <td>
+          <p><code>Ctrl+J</code></p>
+        </td>
 
-   <dt>Recortar <code><Ctrl+X></code></dt>
-   <dd>Copia o texto selecionado para a área de transferência e apaga o texto selecionado.</dd>
+        <td>
+          <p>Move o cursor para o número do segmento fornecido</p>
+        </td>
+      </tr>
 
-   <dt>Colar <code><Ctrl+V></code></dt>
-   <dd>Passa o texto da área de transferência para a posição onde está o cursor.</dd>
-</dl>
-</p>
+      <tr bgcolor="#DDDDDD">
+        <td>
+          <p>Voltar pelos segmentos...</p>
+        </td>
 
-<p>O menu contém as seguintes opções:</p>
+        <td width="17%">
+          <p><code>Ctrl+Shift+P</code></p>
+        </td>
 
-<p>
-<dl>
-   <dt>Desfazer última ação <code><Ctrl+Z></code></dt>
-   <dd>Retorna ao estado antes da última ação de edição. Não funciona se o segmento modificado foi validado.</dd>
+        <td>
+          <p>Volta um segmento no histórico dos segmentos.</p>
+        </td>
+      </tr>
 
-   <dt>Refazer última ação <code><Ctrl+Y></code></dt>
-   <dd>Retorna ao estado antes da última ação de edição ter sido cancelada. Não funciona se o segmento modificado foi validado.</dd>
+      <tr bgcolor="#FFFFFF">
+        <td>
+          <p>Avançar pelos segmentos...</p>
+        </td>
 
-   <dt>Sobrescrever tradução <code><Ctrl+R></code></dt>
-   <dd>Substitui todo o segmento destino com a correspondência imperfeita selecionada (a primeira está selecionada por predefinição).</dd>
+        <td width="17%">
+          <p><code>Ctrl+Shift+N</code></p>
+        </td>
 
-   <dt>Inserir tradução <code><Ctrl+I></code></dt>
-   <dd>Insere na posição onde está o cursor a correspondência imperfeita selecionada. Esta função nunca sobrescreverá uma parte do segmento destino, mesmo se ela estiver selecionada.</dd>
+        <td>
+          <p>Avança um segmento no histórico dos segmentos.</p>
+        </td>
+      </tr>
 
-   <dt>Sobrescrever texto fonte <code><Shift+Ctrl+R></code></dt>
-   <dd>Substitui todo o segmento destino com o texto fonte.</dd>
+      <tr bgcolor="#FFFFFF">
+        <td colspan="3">
+          <hr>
 
-   <dt>Inserir texto fonte <code><Shift+Ctrl+I></code></dt>
-   <dd>Insere o texto fonte na posição onde está o cursor.</dd>
+          <h3><a name="Reference_windows" id="Reference_windows"></a>Janelas de referência</h3>
+        </td>
+      </tr>
 
-   <dt>Buscar no projeto... <code><Ctrl+F></code></dt>
-   <dd>Abre uma nova <a href="userInterface.html#Search_Window">janela de busca</a>.</dd>
+      <tr bgcolor="#DDDDDD">
+        <td>
+          <p>Relação de arquivos do projeto</p>
+        </td>
 
-   <dt>Selecionar correspondência imperfeita #N <code><Ctrl+N></code> (N é de 1 a 5)</dt>
-   <dd>Seleciona o número da correspondência imperfeita exibida no visualizador de correspondências para substituir ou inserir no segmento. A seção <a href="userInterface.html#Fuzzy_Matches">Correspondências imperfeitas</a> descreve em detalhes a codificação por cores.</dd>
-</dl>
-</p>
+        <td>
+          <p><code>Ctrl+L</code></p>
+        </td>
 
-<a name="Go_to_Menu"></a>
-<h4>Menu Ir para</h4>
+        <td>
+          <p>Exibe a relação dos arquivos do projeto</p>
+        </td>
+      </tr>
 
-<p>
-<dl>
-   <dt>Próximo segmento não traduzido <code><Ctrl+U></code></dt>
-   <dd>Avança para o próximo segmento que não tem equivalente na memória da tradução.</dd>
+      <tr bgcolor="#FFFFFF">
+        <td colspan="3">
+          <hr>
 
-   <dt>Próximo segmento <code><Ctrl+N></code>, <code><Enter></code> / <code><Tab></code>
-   </dt>
-   <dd>Avança para o próximo segmento. Se o segmento aberto for o último em um arquivo, avança para o primeiro segmento do próximo arquivo do projeto.</dd>
+          <h3><a name="Other" id="Other"></a>Outro</h3>
+        </td>
+      </tr>
 
-   <dt>Segmento anterior <code><Ctrl+P></code>, <code><Ctrl+Enter></code> / <code><Ctrl+Tab></code>
-   </dt>
-   <dd>Volta para o segmento anterior. Volta para o último segmento do arquivo anterior, se o segmento aberto for o último em um arquivo.</dd>
-</dl>
-</p>
+      <tr bgcolor="#DDDDDD">
+        <td>
+          <p>Verificar tags</p>
+        </td>
 
-<a name="Tools_Menu"></a>
-<h4>Menu Ferramentas</h4>
+        <td>
+          <p><code>Ctrl+T</code></p>
+        </td>
 
-<p>
-<dl>
-   <dt>Validar tags <code><Ctrl+T></code></dt>
-   <dd>Verifica se faltam tags ou se elas estão posicionadas erradas nos arquivos formatados. Exibirá uma lista de segmentos com problemas de tags. A seção sobre a <a href="userInterface.html#Tag_Validation">janela Validar tag</a> relaciona o que você vê lá e <a href="formattedText.html">Trabalhar com texto formatado</a> explica porque.</dd>
-</dl>
-</p>
+        <td>
+          <p>Abre a janela <a href="userInterface.html#tag_Validation">Verificação de tags</a></p>
+        </td>
+      </tr>
 
-<a name="Options_Menu"></a>
-<h4>Menu Opções</h4>
+      <tr bgcolor="#FFFFFF">
+        <td>
+          <p>Exportar seleção</p>
+        </td>
 
-<p>
-<dl>
-   <dt>Usar TAB para avançar</dt>
-   <dd>Define a tecla de validação de segmentos para <code><Tab></code> em vez da tecla predefinida <code><Enter></code>. Esta opção é útil para alguns sistemas de entrada de caracteres chineses, japoneses e coreanos.</dd>
+        <td>
+          <p><code>Shift+</code><code>Ctrl+C</code></p>
+        </td>
 
-   <dt>Fonte...</dt>
-   <dd>Exibe a caixa de diálogo <a href="fontSettings.html">Definições de fontes</a> para modificar a fonte de visualização do texto. Os usuários de computadores antigos devem modificar a fonte antes de abrir um projeto ou serão prejudicados com baixo desempenho. O processo pode ser muito mais difícil para a combinação G4 + Mac OS X + Japonês.</dd>
+        <td>
+          <p>Exporta a seleção atual ou o texto fonte atual, se não houver nada selecionado.</p>
+        </td>
+      </tr>
 
-   <dt>Filtros de arquivos...</dt>
-   <dd>Exibe a caixa de diálogo <a href="fileFilters.html">Filtros de arquivos</a> para confirgurar o processamento e análise de arquivos.</dd>
+      <tr bgcolor="#DDDDDD">
+        <td>
+          <p>Buscar no projeto    </p>
+        </td>
 
-   <dt>Segmentação...</dt>
-   <dd>Abre a caixa de diálogo <a href="segmentation.html">Segmentação do texto fonte</a> para configurar a segmentação do texto.</dd>
+        <td>
+          <p><code>Ctrl+F    </code></p>
+        </td>
 
-   <dt>Modo de trabalho...</dt>
-   <dd>Exibe a caixa de diálogo <a href="translationEditing.html">Tradução e revisão</a> para configurar o conteúdo do campo destino para os segmentos ainda não traduzidos.</dd>
+        <td>
+          <p>Abre uma nova janela de busca.</p>
+        </td>
+      </tr>
 
-   <dt>Restaurar janela principal</dt>
-   <dd>Restaura os componentes (editor, visualizador de correspondência e de glossário) da janela principal do OmegaT à configuração padrão. Use este recurso caso tenha desencaixado, movido ou ocultado um ou mais componentes e não pode recuperá-los de outra forma.</dd>
-</dl>
-</p>
+      <tr bgcolor="#FFFFFF">
+        <td>
+          <p>Arquivos de Ajuda</p>
+        </td>
 
-<a name="Help_Menu"></a>
-<h4>Menu Ajuda</h4>
+        <td>
+          <p><code>F1</code></p>
+        </td>
 
-<p>
-<dl>
-   <dt>Manual do Usuário... <code><F1></code></dt>
-   <dd>Abre o <a href="userInterface.html#Help_Browser">navegador da Ajuda</a> com este manual em uma janela separada.</dd>
+        <td>
+          <p>Exibe os arquivos de ajuda do OmegaT em uma janela separada</p>
+        </td>
+      </tr>
+    </tbody>
+  </table>
+  <hr>
 
-   <dt>Sobre...</dt>
-   <dd>Exibe as informações sobre copyright, créditos e licença.</dd>
-</dl>
-</p>
+  <table style="width: 100%;" summary="just formatting" border="0" cellpadding=
+  "2" cellspacing="2">
+    <tbody>
+      <tr>
+        <td style="text-align: left;"><a href="legalNotices.html">Avisos legais</a></td>
 
-<hr>
-<p><a href="legalNotices.html" title="Avisos legais">Avisos legais</a></p>
+        <td style="text-align: center;"><a href="index.html">Home</a></td>
 
+        <td style="text-align: right;"><a href="xindex.html">Índice</a></td>
+      </tr>
+    </tbody>
+  </table>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/docs/pt_BR/plainText.html b/docs/pt_BR/plainText.html
index ba5681a..febc793 100644
--- a/docs/pt_BR/plainText.html
+++ b/docs/pt_BR/plainText.html
@@ -1,113 +1,99 @@
 <html>
 <head>
-   <meta http-equiv="content-type" content="text/html; charset=UTF-8">
-   <title>Trabalhar com texto simples - OmegaT 1.6.1 Manual do Usuário</title>
-</head>
-<body>
-
-<h1>Trabalhar com texto simples</h1>
-
-<h2>Índice</h2>
-
-<ul type="none">
-   <li>1. <a href="#Plain_Text_in_OmegaT">Texto simples no OmegaT</a></li>
+  <link rel="stylesheet" href="./OmegaT.css" type="text/css">
+  <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 
-   <li>2. <a href="#Garbled_displays_.3F">Texto exibido truncado?</a>
-
-      <ul type="none">
-         <li>2.1. <a href="#Character_sets_and_encodings">Conjuntos de caracteres e codificações</a></li>
-         <li>2.2. <a href="#The_OmegaT_solution">A solução OmegaT</a></li>
-      </ul>
-   </li>
-</ul>
-
-<a name="Plain_Text_in_OmegaT"></a>
-<h2>Texto simples no OmegaT</h2>
+  <title>Trabalhar com texto simples - Manual do Usuári, OmegaT 2.0 o</title>
+</head>
 
-<p>Os arquivos de texto simples contêm exclusivamente informações em texto. Os arquivos de texto simples não têm forma definida de informar o computador que linguagem eles contêm. Falando por cima, isto significa que o computador considera por predefinição que o conteúdo do arquivo está na mesma linguagem do computador.</p>
+<body>
+  <h2>Trabalhar com texto simples</h2>
 
-<p>Um arquivo de texto simples é, na maioria dos casos, um arquivo com a extensão <strong>.txt</strong>.</p>
+  <ul>
+    <li><a href="#Plain_Text_in_OmegaT">Codificação predefinida</a></li>
 
-<a name="Garbled_displays_.3F"></a>
-<h2>Texto exibido truncado?</h2>
+    <li><a href="#Garbled_displays_3F">Texto exibido truncado</a></li>
 
-<p>Se você é russo, é provável que seu computador funcione em russo também; os menus estão em russo, os arquivos que você abre estarão em russo, etc. Na maioria dos casos, o computador deduz corretamente sobre o conteúdo dos arquivos em geral: eles todos contêm russo e não mostram nada além dos caracteres russos.</p>
+    <li><a href="#Character_sets_and_encoding">Conjuntos de caracteres e codificação</a></li>
 
-<p>Agora, se você for um tradutor russo que traduz do japonês, os arquivos em japonês que receberá, se forem <strong>texto simples</strong> provavelmente serão considerados pelo computador como arquivos contendo russo. Isto porque não há informações nos próprios arquivos para indicar ao computador na qual língua eles foram escritos.</p>
+    <li><a href="#The_OmegaT_solution">A solução OmegaT</a></li>
+  </ul>
+  <hr>
+  <a name="Plain_Text_in_OmegaT" id="Plain_Text_in_OmegaT"></a>
 
-<p>O conteúdo dos arquivos em japonês pode ser:</p>
+  <h2>Codificação predefinida</h2>
 
-<pre>   OmegaTとは、コンピュータを利用した翻訳ツールです。</pre>
+  <p>Arquivos de texto simples - na maioria dos casos com a extensão <code>.txt</code> - contêm exclusivamente informações em texto. Não há nenhuma maneira claramente definida para informar ao computador qual a língua que eles contêm. Simplificando, isto significa que o computador considera por predefinição que o conteúdo do arquivo está na mesma linguagem do computador.</p>
+  <hr>
+  <a name="Garbled_displays_3F" id="Garbled_displays_3F"></a>
 
-<p>Mas seu editor de texto poderia muito bem exibir o texto assim:</p>
+  <h2>Texto exibido truncado</h2>
 
-<pre>   OmegaTВ∆ВЌБAГRГУГsГЕБ[Г^ВрЧШЧpµšЦ|ЦуГcБ[ГЛВ≈ВЈБB</pre>
+  <p>Se você é russo, é provável que seu computador funcione em russo também; os menus estão em russo, os arquivos que você abre estarão em russo, etc. Na maioria dos casos, o computador deduz corretamente sobre o conteúdo dos arquivos em geral: eles todos contêm russo e não mostram nada além dos caracteres russos.</p>
 
-<p>Porque espera que o conteúdo seja russo... Mas não é russo. São caracteres japoneses exibidos de forma errada como caracteres russos.</p>
+  <p>Agora, se você for um tradutor russo que traduz do japonês, os arquivos em japonês que receber, se forem <strong>texto simples</strong> provavelmente serão considerados pelo computador como arquivos contendo russo. Isto porque não há informações nos próprios arquivos para indicar ao computador na qual língua eles foram escritos. O conteúdo dos arquivos em japonês pode ser:</p>
 
-<p>O OmegaT não é diferente. Ele considera que os arquivos de <strong>texto simples</strong> contêm texto que podem ser exibidos automaticamente usando as configurações padrões do computador. Isto funciona quando o computador opera em francês e você recebe arquivos em inglês, ou quando o computador é alemão e você recebe arquivos em italiano.</p>
+  <p>OmegaTとは、コンピュータを利用した翻訳ツールです。</p><br>
 
-<a name="Character_sets_and_encodings"></a>
-<h3>Conjuntos de caracteres e codificações</h3>
+  <p>Porque seu editor de texto espera um texto em russo, poderá mostrar o seguinte:</p>
 
-<p>Por que então funciona com inglês e francês, mas não com russo e japonês? Porque inglês e francês compartilham o mesmo <strong>conjunto de caracteres</strong>. Especificamente, o <strong>Latin-1</strong>, ou uma variação.</p>
+  <p>OmegaTВ∆ВЌБAГRГУГsГЕБ[Г^ВрЧШЧpµšЦ|ЦуГcБ[ГЛВ≈ВЈБB</p><br>
 
-<p>Até recentemente, o russo e o japonês não compartilhavam nenhum conjunto de caracteres. Os conjuntos mais recentes de caracteres russos não cobrem os japonês e vice-versa. O resultado é o mostrado acima.</p>
+  <p>Porém, isso são caracteres japoneses exibidos de forma errada como caracteres russos.</p>
 
-<p>O cliente japonês trabalha com um computador japonês e cria arquivos de texto contendo caracteres japoneses. O conjunto de caracteres selecionado pelo computador do cliente dependerá do sistema operacional e de outras configurações, mas será difícil que o conjunto escolhido (japonês) seja interpretado corretamente por um computador russo.</p>
+  <p>Como qualquer outro aplicativo, o OmegaT está sujeito a esse problema também. Ele processa que, por predefinição, os arquivos de  <strong>texto simples</strong> serão exibidos usando as configurações definidas do sistema. Isto funciona quando o computador opera em francês e você recebe arquivos em inglês, ou quando o computador é alemão e você recebe arquivos em italiano.</p>
+  <hr>
+  <a name="Character_sets_and_encoding" id="Character_sets_and_encoding"></a>
 
-<p>Agora, como as informações de texto em um conjunto de caracteres específico são transmitidas fisicamente (isto é, como são <strong>escritas</strong> no arquivo para o computador interpretar e exibir) depende de uma <strong>codificação</strong>. Quando o computador lê o arquivo, ele "decodifica" as informações de acordo com a codificação; depois, elas são exibidas de acordo com o conjunto de caracteres. Em termos gerais, uma codificação corresponde a um conjunto de caracteres...</p>
+  <h2>Conjuntos de caracteres e codificação</h2>
 
-<a name="The_OmegaT_solution"></a>
-<h3>A solução OmegaT</h3>
+  <p>Por que então funciona com inglês e francês, mas não com russo e japonês? Porque inglês e francês compartilham o mesmo <strong>conjunto de caracteres</strong>. Ou seja, <strong>Latin-1</strong>, ou uma variação dele. Até recentemente, o russo e o japonês não compartilhavam nenhum conjunto de caracteres. Os conjuntos mais recentes de caracteres russos não cobrem os japonês e vice-versa. O resultado é o mostrado acima.</p>
 
-<p>Existem basicamente 3 maneiras de fazer isso funcionar no OmegaT.</p>
+  <p>O cliente japonês trabalha com um computador japonês e cria arquivos de texto contendo caracteres japoneses. O conjunto de caracteres selecionado pelo computador do cliente dependerá do sistema operacional e de outras configurações, mas será difícil que o conjunto escolhido (japonês) seja interpretado corretamente por um computador russo.</p>
 
-<ol>
-   <li>A maneira drástica:<ul>
-         <li>Dizer ao OmegaT que seus arquivos de <strong>texto simples</strong> com extensão <strong>.txt</strong> devem ser interpretados conforme a codificação que você especificar.</li>
-      </ul>
-   </li>
+  <p>Como as informações de texto em um conjunto de caracteres específico são transmitidas fisicamente (isto é, quais são os códigos numéricos que o computador usa para interpretar e exibir o texto) depende da <strong>codificação</strong>. Quando o computador lê o arquivo, ele "decodifica" as informações de acordo com a codificação; depois, elas são exibidas de acordo com o conjunto de caracteres. Em termos gerais, uma codificação corresponde a um conjunto de caracteres...</p>
+  <hr>
+  <a name="The_OmegaT_solution" id="The_OmegaT_solution"></a>
 
-   <li>A maneira seletiva:<ul>
-         <li>Mudar os nomes do arquivo "estrangeiro" de texto simples para algo que você gosta (algo.japonês, por exemplo);</li>
+  <h2>A solução OmegaT</h2>
 
-         <li>Dizer para o  OmegaT que os arquivos com a extensão "japonês" devem ser interpretados conforme a codificação que você especificar.</li>
-      </ul>
-   </li>
+  <p>Existem basicamente 3 maneiras de fazer isso funcionar no OmegaT. Todas requerem o uso de <a href="fileFilters.html">filtros de arquivos</a> exibidos no menu <strong>Opções</strong>.</p>
 
-   <li>A maneira "Unicode":<ul>
-         <li>Abrir o arquivo "estrangeiro" em um editor de texto que interpreta corretamente sua codificação (ou continuar com tentativa e erro); </li>
+  <ol>
+    <li>Especifique a codificação para seus arquivos <strong>texto simples</strong>, ou seja, arquivos com a extensão <code>.txt</code>: na seção <strong>Arquivos de texto</strong> da caixa de diálogo <a href="fileFilters.html">Filtros de arquivos</a>, altere a <strong>Codificação de arquivo fonte</strong> de <strong><auto></strong> para a codificação que corresponde ao seu arquivo fonte <code>.txt</code>.</li>
 
-         <li>Gravar o arquivo na codificação "UTF-8";</li>
+    <li>Altere as extensões dos seus arquivos fonte de texto simples (de <code>.txt</code> para <code>.jp</code> usado para o japonês, por exemplo): na seção <strong>Arquivos de texto</strong> da caixa de diálogo <a href=
+    "fileFilters.html">Filtros de arquivos</a> adicione um novo padrão no <strong>Tipo de arquivo fonte</strong> (p.ex. <code>*.jp)</code> e selecione os parâmetros apropriados para a codificação do arquivo fonte e do traduzido.</li>
 
-         <li>Mudar o nome do arquivo de <strong>algo.txt</strong> para <strong>algo.utf8</strong>. O OmegaT interpretará o arquivo como sendo em UTF-8.</li>
-      </ul>
-   </li>
-</ol>
+    <li>Altere a codificação de seus arquivos para Unicode: abra o arquivo fonte em um editor de texto que interpreta corretamente sua codifição e grave o arquivo como "UTF-8". Altere a extensão do arquivo de <code>.txt</code> para <code>.utf8</code>. O OmegaT irá interpretar automaticamente o arquivo como UTF-8.</li>
+  </ol>
 
-<p>Atualmente, o OmegaT está ajustado para entender arquivos de texto simples da seguinte maneira: (você pode verificar isso selecionando o item <strong>Filtros de arquivos</strong> no menu <strong>Opções</strong>. Clique na linha <strong>Arquivos de texto</strong> e depois no botão <strong>Editar</strong>.)</p>
+  <p>O OmegaT tem uma lista pequena que poderá facilitar seu trabalho ao lidar com alguns arquivos de texto simples:</p>
 
-<ul>
-   <li>
-      Os arquivos <strong>.txt</strong> são automaticamente (<strong>auto</strong>) interpretados pelo OmegaT como sendo codificados na codificação padrão do computador.</li>
+  <ul>
+    <li><code>.txt</code> os arquivos são automaticamente (<strong><auto></strong>) interpretados pelo OmegaT como tendo a codificação padrão do computador.</li>
 
-   <li>
-      Os arquivos <strong>.txt1</strong> são interpretados pelo OmegaT como sendo codificados no ISO-8859 (uma codificação que abrange mais as línguas da <strong>da Europa Ocidental</strong> ).</li>
+    <li><code>.txt1</code> os arquivos serão codificados como ISO-8859-1, que abrange a maioria das línguas da <strong>Europa Ocidental</strong>.</li>
 
-   <li>
-      Os arquivos <strong>.txt2</strong> são interpretados pelo OmegaT como sendo codificados pelo ISO-8859-2 (uma codificação que abrange mais as línguas da  <strong>Europa Central e Oriental</strong>).</li>
+    <li><code>.txt2</code> os arquivos serão codificados como ISO-8859-2, que abrange a maioria das línguas da <strong>Europa Central e Oriental</strong></li>
 
-   <li>
-      Os arquivos <strong>.utf8</strong> são interpretados pelo OmegaT como sendo codificados pelo UTF-8 (uma codificação que abrange quase  <strong>todas</strong> as línguas no mundo).</li>
-</ul>
+    <li><code>.utf8</code> os arquivos serão interpretados pelo OmegaT como codificados em UTF-8 (uma codificação que abrange quase <strong>todas</strong> as línguas no mundo).</li>
+  </ul>
 
-<p>Claro que as codificações de arquivo <strong>.txt1</strong>, <strong>.txt2</strong> e <strong>.utf8</strong> não existem na vida real. O OmegaT preparou uma lista pequena que poderá facilitar seu trabalho ao lidar com arquivos <strong>estrangeiros</strong>.</p>
+  <p>Você pode verificar isso selecionando o item <strong>Filtros de arquivos</strong> no menu <strong>Opções</strong>. Por exemplo, quando você tem um arquivo de texto em checo (muito provavelmente gravado no código <strong>ISO-8859-2</strong> ), só precisa mudar a extensão <code>.txt</code> para <code>.txt2</code> e o OmegaT irá interpretar o seu conteúdo corretamente. E, claro, para se garantir, considere converter esse tipo de arquivos em Unicode, ou seja, o formato de arquivo .utf8.</p>
+  <hr>
 
-<p>Portanto, agora, quando você tiver um arquivo em francês (<strong>in_french.txt</strong> por exemplo) para traduzir em um computador japonês, visto que é provável que ele foi criado com a codificação <strong>ISO-8859-1</strong> acrescente  <strong>1</strong> no final do seu nome (<strong>in_french.txt1</strong>) e o OmegaT interpretará corretamente que ele contém um ISO-8859-1... Et voilà!</p>
+  <table style="width: 100%;" summary="just formatting" border="0" cellpadding=
+  "2" cellspacing="2">
+    <tbody>
+      <tr>
+        <td style="text-align: left;"><a href="legalNotices.html">Avisos legais</a></td>
 
-<hr>
-<p><a href="legalNotices.html" title="Avisos legais">Avisos legais</a></p>
+        <td style="text-align: center;"><a href="index.html">Home</a></td>
 
+        <td style="text-align: right;"><a href="xindex.html">Índice</a></td>
+      </tr>
+    </tbody>
+  </table>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/docs/pt_BR/preventingDataLoss.html b/docs/pt_BR/preventingDataLoss.html
index 4507e56..0d19ffc 100644
--- a/docs/pt_BR/preventingDataLoss.html
+++ b/docs/pt_BR/preventingDataLoss.html
@@ -1,30 +1,57 @@
 <html>
 <head>
-   <meta http-equiv="content-type" content="text/html; charset=UTF-8">
-   <title>Evitar perda de dados - OmegaT 1.6.1 Manual do Usuário</title>
+  <link rel="stylesheet" href="./OmegaT.css" type="text/css">
+  <meta http-equiv="content-type" content="text/html; charset=UTF-8">
+
+  <title>Evitar perda de dados - Manual do Usuário, OmegaT 2.0 </title>
 </head>
+
 <body>
+  <h2>Evitar perda de dados</h2>
+
+  <p>OmegaT é um aplicativo estável. Entretanto, o usuário deve tomar as precauções contra perda de dados ao usar o OmegaT, como faz com qualquer outro aplicativo. Quando você traduz, o OmegaT guarda o seu trabalho na memória de tradução <code>project_save.tmx</code> localizada na subpasta <code>/omegat</code> do projeto.</p>
+
+  <p>Também faz backup da memória de tradução no <code>project_save.tmx.AAAAMMDDHHMM.bak</code> na mesma subpasta, cada vez que um projeto é aberto e recarregado. <code>AAAA</code> são os 4 dígitos do ano, <code>MM</code> indica o mês, <code>DD</code> o dia do mês, <code>HH</code> e <code>MM</code> são horas e minutos quando a versão anterior da memória foi gravada.</p>
+
+  <p>Se você achar que perdeu o material traduzido, siga o procedimento abaixo que irá restaurar o projeto à versão mais recente que foi gravada, em muitos casos há 10 minutos das modificações mais recentes:</p>
+
+  <ol>
+    <li>Feche o projeto</li>
+
+    <li>Mude o nome do <code>project_save.tmx</code> atual para algo fácil de lembrar (como <code>project_save.tmx.anterior</code> por exemplo)</li>
+
+    <li>Selecione a memória de tradução de backup onde podem estar os dados que você perdeu</li>
 
-<h1>Evitar perda de dados</h1>
+    <li>Mude o nome para <code>project_save.tmx</code></li>
 
-<p>OmegaT é um aplicativo resistente. Entretanto, o usuário deve tomar as precauções contra perda de dados ao usar o OmegaT, como faz com qualquer outro aplicativo.</p>
+    <li>Abra o projeto</li>
+  </ol>
 
-<p>Quando você traduz, o OmegaT guarda todos os seus arquivos na memória de tradução no subdiretório <code>/omegat</code>. Também faz backup da memória de tradução no <code>project_save.tmx.AAAAMMDDHHMM.bak</code> no mesmo subdiretório, cada vez que um projeto é aberto e recarregado. <code>AAAA</code> são os 4 dígitos do ano, <code>MM</code> indica o mês, <code>DD</code> o dia do mês, <code>HH</code> e <code>MM</code> são horas e minutos quando a versão anterior da memória foi gravada.</p>
+  <p>Para evitar a perda de dados importantes:</p>
 
-<p>Para evitar desastres:</p>
+  <ul>
+    <li>Faça regularmente cópias do arquivo <code>/omegat/project_save.tmx</code> para mídia externa, como CD ou DVD.</li>
 
-<ul>
-   <li>Faça regularmente cópias do arquivo <code>/omegat/project_save.tmx</code> para mídia externa, como CD ou DVD.</li>
+    <li>Até se familiarizar com o OmegaT, crie os arquivos traduzidos em intervalos regulares e verifique que contenham a última versão da sua tradução.</li>
 
-   <li>Até se familiarizar com o OmegaT, crie os arquivos traduzidos em intervalos regulares e verifique que contenham a última versão da sua tradução.</li>
+    <li>Recomendamos prestar atenção especial ao fazer quaisquer modificações nos arquivos na pasta <code>/source</code> enquanto estiver no meio de um projeto. Se o arquivo fonte for modificado após o início da tradução, o OmegaT pode não localizar um segmento que já foi traduzido.</li>
 
-   <li>Recomendamos prestar atenção especial ao fazer quaisquer modificações nos arquivos no <code>/source</code> enquanto estiver no meio de um projeto. Se o arquivo fonte for modificado após o início da tradução, o OmegaT pode não localizar um segmento que já foi traduzido.</li>
+    <li>Com os textos de ajuda fica fácil começar a usar o programa. Se tiver problemas, envie uma mensagem para o <a href=
+    "http://groups.yahoo.com/group/omegat">grupo de usuários OmegaT</a>. As mensagens podem ser enviadas no idioma que você se sentir mais à vontade.</li>
+  </ul>
+  <hr>
 
-   <li>Com esses textos de ajuda fica fácil começar a usar o programa. Se tiver problemas, envie uma mensagem para o <a href="http://groups.yahoo.com/group/omegat" >grupo de usuários OmegaT</a>. As mensagens podem ser enviadas no idioma que você se sentir mais à vontade.</li>
-</ul>
+  <table style="width: 100%;" summary="just formatting" border="0" cellpadding=
+  "2" cellspacing="2">
+    <tbody>
+      <tr>
+        <td style="text-align: left;"><a href="legalNotices.html">Avisos legais</a></td>
 
-<hr>
-<p><a href="legalNotices.html" title="Avisos legais">Avisos legais</a></p>
+        <td style="text-align: center;"><a href="index.html">Home</a></td>
 
+        <td style="text-align: right;"><a href="xindex.html">Índice</a></td>
+      </tr>
+    </tbody>
+  </table>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/docs/pt_BR/projectProperties.html b/docs/pt_BR/projectProperties.html
index c0ff44a..1e03116 100644
--- a/docs/pt_BR/projectProperties.html
+++ b/docs/pt_BR/projectProperties.html
@@ -1,43 +1,82 @@
 <html>
 <head>
-   <meta http-equiv="content-type" content="text/html; charset=UTF-8">
-   <title>Propriedades do projeto - OmegaT 1.6.1 Manual do Usuário</title>
+  <link rel="stylesheet" href="./OmegaT.css" type="text/css">
+  <meta http-equiv="content-type" content="text/html; charset=UTF-8">
+
+  <title>Propriedades do projeto - Manual do Usuári, OmegaT 2.0 o</title>
 </head>
+
 <body>
+  <h2>Propriedades do projeto</h2>
+
+  <ul>
+    <li>
+      <a href="#dialog">Caixa de diálogo Propriedades</a>
+
+      <ul>
+        <li><a href="#language">Modificações da língua</a></li>
+
+        <li><a href="#segmentos">Modificações na segmentação</a></li>
+
+        <li><a href="#folder">Modificações na estrutura de pastas</a></li>
+      </ul>
+    </li>
+
+    <li><a href="#warning">Modificar as propriedades do projeto durante a sessão</a></li>
+  </ul>
+  <hr>
+  <a name="dialog" id="dialog"></a>
+
+  <h2>Caixa de diálogo Propriedades</h2>
+
+  <p>Esta caixa de diálogo é usada para modificar as pastas e as línguas do projeto. Para abri-la, pressione <code><a href="menu.html#shortcuts">Ctrl+E</a></code> ou clique em <strong>Projeto -> Propriedades...</strong> no <a href=
+  "menu.html">menu principal</a>. A caixa contém:</p>
+
+  <ul>
+    <li>Área com menus suspensos para definir as línguas fonte e destino </li>
+
+    <li>Marcação das definições para segmentação</li>
+
+    <li>Área para definir as pastas do projeto</li>
+  </ul>
 
-<h1>Propriedades do projeto</h1>
+  <p>Todos os campos são editáveis. As línguas podem ser digitadas ou então selecionadas do menu suspenso. Você pode digitar nomes de pastas que ainda não existem e elas serão criadas pelo OmegaT.</p><a name="language" id="language"></a>
 
-<p>Esta caixa de diálogo é usada para modificar as pastas e idiomas do projeto. Para abri-la, pressione <a href="keyboardShortcuts.html" title="Atalhos de teclado do OmegaT"><code>Ctrl+E</code></a> ou clique em <strong>Projeto -> Propriedades...</strong> no <a href="menu.html" title="Menu principal">menu principal</a>.</p>
+  <h3>Modificação da língua</h3>
 
-<p>A caixa contém:</p>
+  <p>Lembre-se de que modificar as línguas pode inutilizar as memórias de tradução usadas pois elas podem não corresponder às novas línguas definidas.</p><a name="segments" id="segments"></a>
 
-<ul>
-   <li>Área para definir os idiomas fonte e destino com menus suspensos</li>
-   <li>Marcação das definições para segmentação</li>
-   <li>Área para definir as pastas do projeto</li>
-</ul>
+  <h3>Modificações na segmentação</h3>
 
-<p>Todos os campos são editáveis. Os idiomas podem ser digitados ou então selecionados das opções no menu. Você pode digitar nomes de pastas que não existem e elas serão criadas pelo OmegaT.</p>
+  <p>As definições da segmentação apenas tratam da forma como os arquivos fonte são processados pelo OmegaT. Eles não modificam a segmentação das memórias de tradução já existentes.</p>
 
-<a name="Modifying_Project_Properties_Half-Way"></a>
-<h3>Modificações das propriedades no meio do projeto</h3>
+  <p>Se você modificar as configurações de segmentação, alguns segmentos já traduzidos podem ficar divididos ou combinados. Isto praticamente faz com que os segmentos sejam considerados como "não traduzidos", pois não correspondem mais àqueles gravados na memória do projeto, mesmo que a tradução anterior ainda esteja lá.</p>
 
-<p>É possível, mas não incentivamos modificar as propriedades do projeto durante o processo de tradução. Ao iniciar a tradução, todos os ajustes e definições devem ser considerados como finais, a menos que você perceba que cometeu um erro crasso.</p>
+  <p>O OmegaT pode <a href="translationMemories.html#upgrading_TM">atualizar memórias de traduções antigas</a> que não usaram segmentação de sentença, mas não vice-versa. Se você mudar de idéia no meio da tradução, a memória do projeto não será alterada.</p><a name="folder" id=
+  "folder"></a>
 
-<p>Especificamente:</p>
+  <h3>Modificações na estrutura de pastas</h3>
 
-<ul>
-   <li>Modificar os idiomas pode inutilizar as memórias de tradução usadas pois os idiomas podem não corresponder com os novos idiomas definidos.</li>
+  <p>Caso pretenda modificar as pastas do projeto, lembre-se de que isso não vai mover os arquivos contidos em pastas antigas para as novas. Isso pode criar uma situação onde nem você nem o OmegaT saberão o que são as pastas do projeto e quais delas estão sendo usadas.</p>
+  <hr>
+  <a name="warning" id="warning"></a>
 
-   <li>A modificação das definições de segmentação pode resultar que alguns segmentos já traduzidos sejam divididos ou combinados, o que literalmente reverterá sua condição para "não traduzidos", mesmo que a tradução anterior e a nova sem correspondência já estejam na memória. O OmegaT pode <a href="translationMemories.html#Upgrading_Translation_Memories" title="Memórias de tradução"> atualizar memórias de traduções antigas</a> que não usaram segmentação de sentença, mas não vice-versa, e não na memória de tradução do projeto caso você mude de idéia no meio da tradução.</li>
+  <h2>Modificar as propriedades do projeto durante a sessão</h2>
 
-   <li>A modificação das pastas do projeto não passará os arquivos das pastas antigas para as novas, portanto você poderá criar uma situação onde nem você nem o OmegaT sabem o que as pastas realmente significam e quais delas foram usadas.</li>
-</ul>
+  <p>É possível modificar as propriedades do projeto durante uma sessão de tradução. No entanto, a maneira mais segura é considerar todos ajustes e definições como definitivos, a menos que você perceba que cometeu um erro crasso. Veja a seção <a href="preventingDataLoss.html">Evitar perda de dados</a> para aprender sobre maneiras de proteger o seu trabalho.</p>
+  <hr>
 
-<p>Veja a seção <a href="preventingDataLoss.html" title="Evitar perda de dados">Evitar perda de dados</a> para aprender sobre maneiras de proteger o seu trabalho.</p>
+  <table style="width: 100%;" summary="just formatting" border="0" cellpadding=
+  "2" cellspacing="2">
+    <tbody>
+      <tr>
+        <td style="text-align: left;"><a href="legalNotices.html">Avisos legais</a></td>
 
-<hr>
-<p><a href="legalNotices.html" title="Avisos legais">Avisos legais</a></p>
+        <td style="text-align: center;"><a href="index.html">Home</a></td>
 
+        <td style="text-align: right;"><a href="xindex.html">Índice</a></td>
+      </tr>
+    </tbody>
+  </table>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/docs/pt_BR/searches.html b/docs/pt_BR/searches.html
index 0907779..166dec6 100644
--- a/docs/pt_BR/searches.html
+++ b/docs/pt_BR/searches.html
@@ -1,195 +1,196 @@
 <html>
 <head>
-   <meta http-equiv="content-type" content="text/html; charset=UTF-8">
-   <title>Buscas - OmegaT 1.6.1 Manual do Usuário</title>
+	<link rel="stylesheet" href="./OmegaT.css" type="text/css">
+  <meta http-equiv="content-type" content="text/html; charset=UTF-8">
+  <title>Buscas - Manual do Usuário, OmegaT 2.0 </title>
 </head>
-<body>
-
-<h1>Buscas</h1>
-
-<h2>Índice</h2>
-
-<ul type="none">
-   <li>1. <a href="#Search_window">Janela de busca</a></li>
-   <li>2. <a href="#Search_locations">Locais de busca</a></li>
 
-   <li>3. <a href="#Search_methods">Métodos de busca</a>
-
-      <ul type="none">
-         <li>3.1. <a href="#Exact searches">Buscas exatas</a></li>
-         <li>3.2. <a href="#Keyword_searches">Buscas de palavra-chave</a></li>
-      </ul>
-   </li>
-
-   <li>4. <a href="#Searching_using_wildcards">Busca usando curingas</a></li>
+<body>
+  <h2>Buscas</h2>
 
-   <li>5. <a href="#Searching_using_regular_expressions">Busca usando expressões regulares</a>
+  <p><a href="#searchwindow">Janela Busca</a></p>
 
-      <ul>
-         <li>5.1. <a href="#Regular_Expressions_to_use_in_searches">Expressões regulares para usar em buscas</a></li>
-         <li>5.2. <a href="#Short_summary_of_regular-expression_constructs">Resumo de elaborações de expressões regulares</a></li>
-      </ul>
-   </li>
-</ul>
+  <ul>
+      <li>
+        <a href="#calling">Acionar uma busca</a>
+      </li>
 
-<a name="Search_window"></a>
-<h2>Janela de busca</h2>
+      <li>
+        <a href="#location">Local da busca</a>
+      </li>
+  </ul>
 
-<p>O OmegaT oferece um grande leque de funções avançadas de busca.</p>
+  <p><a href="#searchmethods">Métodos de busca</a></p>
 
-<p>Para acessar a janela de busca, pressione <code>Ctrl+F</code> e digite a palavra ou frase que quer localizar na caixa de texto "Buscar por".</p>
+  <p><a href="#usingwildcards">Usando curingas</a></p>
 
-<p>Uma outra forma é selecionar uma palavra ou frase no texto destino do segmento aberto (chamado de campo de edição ou campo destino) e pressionar <code>Ctrl+F</code>. Neste caso, a palavra ou frase é inserida automaticamente na caixa "Buscar por".</p>
+  <p><a href="#usingregularexpressions">Usando expressões regulares</a></p>
 
-<p>Para cada busca será aberta uma nova janela. Se esquecer de fechá-las, ficará com diversas janelas de busca abertas.</p>
+  <p><a href="#display">Exibição dos resultados da busca</a></p>
+  
+  <p><a href="#filter">Filtrar as entradas no Editor de acordo com a busca</a></p>
+  <hr>
 
-<p>As buscas são feitas nos segmentos fonte e destino de um projeto.</p>
+  <h2><a name="searchwindow" id="searchwindow"></a>Janela Busca</h2><img src=
+  "images/TextSearch.png" name="graphics1" align="left" width="659" height=
+  "446" border="0" id="graphics1" alt="Janela Busca de texto"><br clear="left">
 
-<a name="Search_locations"></a>
-<h2>Locais de busca</h2>
+  <p><br>
+  <br></p>
 
-<p>Selecione o local  usando as caixas de seleção.</p>
+  <h3><a name="calling" id="calling"></a>Acionar uma busca</h3>
 
-<p>É possível selecionar diversos locais para sua busca:</p>
+  <p>O OmegaT oferece um grande leque de funções avançadas de busca. Para acessar a janela <strong>Busca</strong>, pressione <code>Ctrl+F</code> e digite a palavra ou frase que quer localizar na caixa de texto <strong>Buscar por</strong>. Uma outra forma é selecionar uma palavra ou frase no campo de edição e pressionar <code>Ctrl+F</code>. Neste caso, a palavra ou frase é inserida automaticamente na caixa <strong>Buscar por</strong>. Cada vez que a <strong>Busca</strong> é acionada, uma janela nova é aberta. Não se esqueça de fechá-las, para que elas não encham o seu desktop.</p>
 
-<ul>
-   <li>Somente no projeto (opção predefinida)</li>
-   <li>O projeto, bem como as memórias de tradução de referência da pasta  /tm/ (marque <i>Buscar nas MTs</i>)</li>
-   <li>Um único arquivo ou pasta contendo um conjunto de arquivos (marque <i>Buscar arquivos</i>)</li>
-</ul>
+  <h3><a name="location" id="location"></a>Local da busca</h3>
 
-<p>Neste último caso, o OmegaT somente pesquisará os arquivos que pode ler (Veja  <a href="fileFormats">Formatos de arquivos compatíveis</a>).</p>
+  <p>As buscas são feitas nos segmentos fonte e destino de um projeto. As buscas podem ser </p>
 
-<a name="Search_methods"></a>
-<h2>Métodos de busca</h2>
+  <ul>
+    <li>
+      <p>somente no projeto (opção predefinida)</p>
+    </li>
 
-<p>Selecione o método usando as opções.</p>
+    <li>
+      <p>no projeto, bem como nas memórias de tradução de referência da pasta  /tm/ (marque <i>Buscar nas MTs</i>)</p>
+    </li>
 
-<p>Há dois métodos para realizar as buscas:</p>
+    <li>
+      <p>em um único arquivo ou pasta contendo um conjunto de arquivos (marque <i>Buscar arquivos</i>)</p>
+    </li>
+  </ul>
 
-<ul>
-   <li><strong>Busca exata</strong>: faz a busca por segmentos contendo a seqüência por você especificada.</li>
-   <li><strong>Busca de palavra-chave</strong>: faz a busca por segmentos contendo todas as palavras-chaves especificadas, em qualquer seqüência.</li>
-</ul>
+  <p>Quando fizer buscas em arquivos, o OmegaT somente pesquisará os arquivos que pode ler (Veja <a href="filesToTranslate.html#formats">Formatos de arquivos</a>). Por exemplo, embora o OmegaT possa processar arquivos TMX, eles não serão incluídos na busca.</p>
+  <hr>
 
-<p>Para qualquer um desses dois métodos é possível selecionar as três seguintes opções:</p>
+  <h2><a name="searchmethods" id="searchmethods"></a>Métodos de busca</h2>
 
-<ul>
-   <li>
-      <strong>Distinição entre maiúsculas e minúsculas</strong>: se selecionada, a busca será feita conforme a seqüência exata especificada; caso contrário, as letras maiúsculas serão ignoradas.</li>
+  <p>Selecione o método usando as opções. Há dois métodos para realizar as buscas:</p>
 
-   <li>
-      <strong>Expressões regulares</strong>: se selecionada, a seqüência da busca será tratada como uma expressão regular (no caso da busca de palavra-chave, ela será tratada como expressões múltiplas).</li>
+  <table summary= "just formatting" width="100%" border="0" cellpadding="3" cellspacing="0">
+    <col width="20%">
+    <col width="80%">
 
-   <li>
-      <strong>Buscar nas MTs</strong>: se selecionada, todas as memórias serão incluídas na busca.</li>
-</ul>
+    <tr>
+      <td width="20%">
+        <p><strong>Busca exata</strong></p>
+      </td>
 
-<a name="Exact_searches"></a>
-<h2>Buscas exatas</h2>
+      <td width="80%">
+        <p>Faz a busca por segmentos contendo a sequência por você especificada.</p>
+      </td>
+    </tr>
 
-<p>Uma busca exata procura por uma frase, isto é, se forem fornecidas diversas palavras elas serão localizadas somente se ocorrerem exatamente na mesma seqüência. As buscas exatas são similares a uma pesquisa por "frase exata" em um dispositivo de busca na Internet, como o Google.</p>
+    <tr>
+      <td width="20%">
+        <p><strong>Busca de palavra-chave</strong></p>
+      </td>
 
-<a name="Keyword_searches"></a>
-<h2>Buscas de palavra-chave</h2>
+      <td width="80%">
+        <p>Busca os segmentos contendo todas as palavras-chave especificadas, em qualquer sequência.</p>
+      </td>
+    </tr>
+  </table>
 
-<p>Selecione "busca de palavra-chave" e digite qualquer quantidade de palavras individuais, separadas por espaços e em qualquer seqüência; o OmegaT exibe uma lista de todos os segmentos nos quais todas as palavras aparecem. As buscas de palavra-chave são similares à pesquisa "com todas as palavras" em um dispositivo de busca na Internet, como o Google (lógica AND).</p>
+  <p>Uma <strong>busca exata</strong> procura por uma frase, isto é, se forem fornecidas diversas palavras elas serão localizadas somente se ocorrerem exatamente na mesma seqüência. As buscas exatas são similares a uma pesquisa por "frase exata" em um dispositivo de busca na Internet, como o Google. Selecione <strong>busca de palavra-chave</strong> e digite qualquer quantidade de palavras individuais, separadas por espaços e em qualquer seqüência. O OmegaT exibe uma lista de todos os segmentos em que todas as palavras aparecem. As buscas de palavra-chave são similares à pesquisa "com todas as palavras" em um dispositivo de busca na Internet, como o Google (lógica AND).</p>
 
-<a name="Searching_using_wildcards"></a>
-<h2>Busca usando curingas</h2>
+  <p>Para qualquer um desses dois métodos é possível selecionar as três seguintes opções:</p>
 
-<p>Tanto na busca exata como na busca de palavra-chave pode-se usar os curingas  '<code>*</code>' e '<code>?</code>'. Para usar curingas, verifique se a opção <strong>expressões regulares</strong> não está selecionada; caso contrário, esses caracteres serão interpretados como caracteres especiais (metacaracteres) da expressão regular.</p>
+  <table summary= "just formatting" width="100%" border="0" cellpadding="3" cellspacing="0">
+    <col width="20%">
+    <col width="80%">
 
-<p>O curinga  '<code>?</code>' substitui qualquer caractere único, isto é,  '<code>be?a</code>' encontrará ocorrências de '<code>beca</code>' e '<code>bela</code>'. O curinga '<code>*</code>' substitui um ou vários caracteres, isto é '<code>be*a</code>' encontrará ocorrências de '<code>beca</code>', '<code>bela</code>', '<code>beata</code>' e '<code>bebida</code>'.</p>
+    <tr>
+      <td width="20%">
+        <p><strong>Distinção entre maiúsculas e minúsculas</strong></p>
+      </td>
 
-<p>Se quiser fazer buscas por segmentos contendo esses caracteres, será necessário ativar expressões regulares e deixar de lado esses caracteres acrescentando a eles uma barra invertida  ('<code>\</code>'), isto é '<code>x\*y</code>' para localizar ocorrências de '<code>x*y</code>' e '<code>x\?y</code>' para localizar ocorrências de '<code>x?y</code>'.</p>
+      <td width="80%">
+        <p>A busca será feita conforme a seqüência exata especificada, caso contrário, as letras maiúsculas serão ignoradas.</p>
+      </td>
+    </tr>
 
-<a name="Searching_using_regular_expressions"></a>
-<h2>Busca usando expressões regulares</h2>
+    <tr>
+      <td width="20%">
+        <p><strong>Expressões regulares</strong></p>
+      </td>
 
-<p>A busca usando expressões regulares é uma excelente maneira de localizar ocorrências de uma seqüência de caracteres e palavras (string). É similar à busca normal, porém com muito mais flexibilidade. Estão disponíveis na Internet tutoriais simples, como por exemplo o <a href="http://www.regular-expressions.info/quickstart.html" title="http://www.regular-expressions.info/quickstart.html" rel="nofollow">http://www.regular-expressions.info/quickstart.html</a>.</p>
+      <td width="80%">
+        <p>A seqüência da busca será tratada como uma expressão regular (no caso da busca de palavra-chave, ela será tratada como expressões múltiplas).</p>
+      </td>
+    </tr>
 
-<a name="Regular_Expressions_to_use_in_searches"></a>
-<h3>Expressões regulares para usar em buscas</h3>
+    <tr>
+      <td width="20%">
+        <p><strong>Buscar nas MTs</strong></p>
+      </td>
 
-<p>As expressões regulares usadas em buscas são aquelas suportadas pelo Java. Se precisar de informações específicas, consulte <a href="http://java.sun.com/j2se/1.4.2/docs/api/java/util/regex/Pattern.html"> http://java.sun.com/j2se/1.4.2/docs/api/java/util/regex/Pattern.html</a>.</p>
+      <td width="80%">
+        <p>Todas as memórias serão incluídas na busca.</p>
+      </td>
+    </tr>
+  </table>
+  <hr>
 
-<a name="Short_summary_of_regular-expression_constructs"></a>
-<h4>Resumo de elaborações de expressões regulares</h4>
+  <h2><a name="usingwildcards" id="usingwildcards"></a>Usando curingas</h2>
 
-<table border="0" width="80%" cellpadding="1" cellspacing="0" summary="Elaborações de expressões regulares e o que elas correspondem">
-    <tr bgcolor="#DDEEFF"><th width="10%" align="left" id="construct">Elaborar </th><th align="left">Correspondências</th></tr>
-    <tr><th> </th></tr>
-    <tr align="left"><th colspan="2" id="flags">Flags</th></tr>
-    <tr><td><tt>(?i)</tt></td><td>Ativa correspondências que ignoram maiúsculas e minúsculas (o padrão predefinido faz a distinção entre maiúsculas e minúsculas).</td></tr>
-    <tr><th> </th></tr>
-    <tr><th align="left" colspan="2" id="characters">Caracteres</th></tr>
+  <p>Tanto na busca exata como na busca de palavra-chave pode-se usar os curingas  '<code>*</code>' e '<code>?</code>'. Para usar curingas, verifique se a opção <strong>expressões regulares</strong> não está selecionada; caso contrário, esses caracteres serão interpretados como caracteres especiais (metacaracteres) da expressão regular.</p>
 
-    <tr><td><strong>x</strong></td><td>O caractere <strong>x</strong>, exceto o seguinte...</td></tr>
-    <tr><td><tt>\u</tt><strong>hhhh</strong></td><td>O caractere com valor hexadecimal <tt>0x</tt><strong>hhhh</strong></td></tr>
-    <tr><td><tt>\t</tt></td><td>O caractere de tabulação (<tt>'\u0009'</tt>)</td></tr>
+  <ul>
+    <li>
+      <p>'<strong>*</strong>' corresponde a zero ou mais caracteres. Por exemplo, a busca por '<strong>corre*</strong>' encontraria '<strong>corre</strong>', '<strong>correm</strong>', e '<strong>correndo</strong>'.</p>
+    </li>
 
-    <tr><td><tt>\n</tt></td><td>O caractere de nova linha (alimentação de linha)  (<tt>'\u000A'</tt>)</td></tr>
-    <tr><td><tt>\r</tt></td><td>O caractere de retornar ao início da linha (<tt>'\u000D'</tt>)</td></tr>
-    <tr><th> </th></tr>
-    <tr align="left"><th colspan="2" id="quot">Escapar</th></tr>
+    <li>
+      <p>'<strong>?</strong>' corresponde qualquer caractere único. Por exemplo, '<strong>corre?</strong>' encontraria '<strong>correm</strong>' e '<strong>correr</strong>', mas não '<strong>corre</strong>' ou '<strong>correndo</strong>'.</p>
+    </li>
+  </ul>
 
-    <tr><td><tt>\</tt></td><td>Nada, mas escapa o caractere seguinte. Isto é necessário se você quiser inserir quaisquer metacaracteres <code>!$()*+.<>?[\]^{|}</code> para corresponder a eles mesmos.</td></tr>
-    <tr><td><tt>\\</tt></td><td>Por exemplo, este é um caractere de barra invertida</td></tr>
-    <tr><td><tt>\Q</tt></td><td>Nada, mas escapa todos os caracteres até <tt>\E</tt></td></tr>
+  <p>Se quiser fazer buscas por segmentos contendo <strong>*</strong> ou <strong>?</strong>, será necessário ativar expressões regulares e escapar esses caracteres acrescentando a eles uma barra invertida  ('\'), isto é 'x\*y' para localizar ocorrências de 'x*y' e 'x\?<code>y</code>' para localizar ocorrências de '<code>x?y</code>'.</p>
+  <hr>
 
-    <tr><td><tt>\E</tt></td><td>Nada, mas finaliza o escape iniciado pelo <tt>\Q</tt></td></tr>
-    <tr><th> </th></tr>
-    <tr align="left"><th colspan="2" id="classes">Classes de caracteres</th></tr>
-    <tr><td><tt>[abc]</tt></td><td><tt>a</tt>, <tt>b</tt>, ou <tt>c</tt> (classe simples)</td></tr>
+  <h2><a name="usingregularexpressions" id="usingregularexpressions"></a>Usando expressões regulares</h2>
 
-    <tr><td><tt>[^abc]</tt></td><td>Qualquer caractere exceto <tt>a</tt>, <tt>b</tt>, ou <tt>c</tt> (negação)</td></tr>
-    <tr><td><tt>[a-zA-Z]</tt></td><td><tt>a</tt> até <tt>z</tt> ou <tt>A</tt> até <tt>Z</tt>, inclusive (intervalo)</td></tr>
+  <p>A busca com expressões regulares é uma excelente maneira de localizar ocorrências de uma seqüência de caracteres e palavras (string). É similar à busca com curingas, porém com muito mais flexibilidade. As expressões regulares usadas em buscas são aquelas suportadas pelo Java. Um resumo está disponível no anexo <a href="regexp.html">Construir expressões regulares</a>. Se precisar de informações específicas, consulte  <a href=
+  "http://java.sun.com/j2se/1.5/docs/api/java/util/regex/Pattern.html">http://java.sun.com/j2se/1.5/docs/api/java/util/regex/Pattern.html</a>.</p>
 
-    <tr><th> </th></tr>
-    <tr align="left"><th colspan="2" id="predef">Classes de caracteres predefinidas</th></tr>
-    <tr><td><tt>.</tt></td><td>Qualquer caractere (exceto para terminadores de linha)</td></tr>
-    <tr><td><tt>\d</tt></td><td>Um dígito: <tt>[0-9]</tt></td></tr>
-    <tr><td><tt>\D</tt></td><td>Um caractere que não seja dígito: <tt>[^0-9]</tt></td></tr>
+  <p>Na Internet há tutoriais simples, como por exemplo <a href=
+  "http://www.regular-expressions.info/quickstart.html">http://www.regular-expressions.info/quickstart.html</a>.</p>
+  <hr>
 
-    <tr><td><tt>\s</tt></td><td>Um caractere de espaçamento: <tt>[ \t\n\x0B\f\r]</tt></td></tr>
-    <tr><td><tt>\S</tt></td><td>Um caractere que não seja de espaçamento: <tt>[^\s]</tt></td></tr>
-    <tr><td><tt>\w</tt></td><td>Um caractere de palavra: <tt>[a-zA-Z_0-9]</tt></td></tr>
-    <tr><td><tt>\W</tt></td><td>Um caractere que não seja de palavra: <tt>[^\w]</tt></td></tr>
+  <h2><a name="display" id="display"></a>Exibição dos resultados da busca</h2>
 
-    <tr><th> </th></tr>
-    <tr align="left"><th colspan="2" id="bounds">Correspondentes de limite (borda)</th></tr>
-    <tr><td><tt>^</tt></td><td>O início de uma linha</td></tr>
-    <tr><td><tt>$</tt></td><td>O final de uma linha</td></tr>
-    <tr><td><tt>\b</tt></td><td>Limite de uma palavra</td></tr>
+  <p>Após digitar a palavra ou string clique no botão Buscar; o campo de busca mostrará todos os segmentos correspondentes que encontrar no projeto. Visto que o OmegaT considera todos os segmentos iguais como uma única entidade  -- apenas o primeiro segmento único é exibido.</p>
 
-    <tr><td><tt>\B</tt></td><td>Limite que não seja de palavra</td></tr>
-    <tr><th> </th></tr>
-    <tr align="left"><th colspan="2" id="greedy">Quantificadores vorazes (gulosos ou possessivos)</th></tr>
-    <tr><td colspan="2">Eles farão o maior número de correspondências possíveis. Por exemplo, <code>a+</code> corresponderá  a <code>aaa</code> em <code>aaabbb</code></td></tr>
+  <p>Os segmentos são exibidos na seqüência em que aparecem no projeto. Os segmentos traduzidos serão exibidos na parte superior com o texto original e a tradução na parte inferior; os segmentos não traduzidos aparecerão apenas com o texto original.</p>
 
-    <tr><td><strong>X</strong><tt>?</tt></td><td><strong>X</strong>, uma ou nenhuma</td></tr>
-    <tr><td><strong>X</strong><tt>*</tt></td><td><strong>X</strong>, zero ou mais vezes</td></tr>
-    <tr><td><strong>X</strong><tt>+</tt></td><td><strong>X</strong>, uma ou mais vezes</td></tr>
+  <p>Clique em um segmento se precisar abri-lo no Editor para modificações. Depois, é só voltar à janela Busca e ir ao próximo segmento, repetindo o processo, caso precise corrigir a terminologia.</p>
+  <hr>
 
-    <tr><th> </th></tr>
-    <tr align="left"><th colspan="2" id="reluc">Quantificadores relutantes (não-vorazes)</th></tr>
-    <tr><td colspan="2">Eles farão o menor número possível de correspondências. Por exemplo, <code>a+?</code> corresponderá o primeiro <code>a</code> em <code>aaabbb</code></td></tr>
-    <tr><td><strong>X</strong><tt>??</tt></td><td><strong>X</strong>, uma ou nenhuma</td></tr>
+  <h2><a name="filter" id="filter"></a>Filtrar as entradas no Editor de acordo com a busca</h2>
 
-    <tr><td><strong>X</strong><tt>*?</tt></td><td><strong>X</strong>, zero ou mais vezes</td></tr>
-    <tr><td><strong>X</strong><tt>+?</tt></td><td><strong>X</strong>, uma ou mais vezes</td></tr>
-    <tr><th> </th></tr>
-    <tr align="left"><th colspan="2" id="logical">Operadores lógicos</th></tr>
+  <p>Para facilitar a navegação nos resultados da busca, você pode usar a busca no Editor. Clique no botão 'Filtrar' na parte inferior para limitar as entradas mostradas na janela Editor àquelas que correspondem à busca atual. Use os comandos de navegação normal para ir, por exemplo, ao próximo segmento (não traduzido) que corresponde ao critério de busca.</p>
+  <p>Nota:</p>
+  <ul><li>uma busca é limitada a 1000 itens, portanto se você fizer a pesquisa de uma frase comum, o Editor mostrará apenas 1000 entradas, e não todas as entradas que correspondem ao critério de busca.</li>
+  <li>um arquivo pode não ter entradas que correspondam ao critério pesquisado, então o campo ficará vazios.</li> 
+  <li>se a busca remover entradas duplas, você não encontrará duplicatas no Editor.</li>
+  </ul>
 
-    <tr><td><strong>XY</strong></td><td><strong>X</strong> seguido por <strong>Y</strong></td></tr>
-    <tr><td><strong>X</strong><tt>|</tt><strong>Y</strong></td><td>Ou <strong>X</strong> ou <strong>Y</strong></td></tr>
+  <p>Para remover o filtro, pressione o botão 'Remover filtro', ou recarregue o projeto.
+  </p>
 
-    <tr><td><tt>(</tt><strong>XY</strong><tt>)</tt></td><td><strong>XY</strong> como um grupo único</td></tr>
-</table>
+  <hr>
+  <table summary= "just formatting" style="width: 100%;" border="0" cellpadding="2" cellspacing="2">
+    <tbody>
+      <tr>
+        <td style="text-align: left;"><a href="legalNotices.html">Avisos legais</a> </td>
+        <td style="text-align: center;"><a href="index.html">Home</a>
+        </td>
+        <td style="text-align: right;"><a href="xindex.html">Índice</a> </td>
+      </tr>
+    </tbody>
+  </table>
 
-<hr>
-<p><a href="legalNotices.html" title="Avisos legais">Avisos legais</a></p>
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/docs/pt_BR/segmentation.html b/docs/pt_BR/segmentation.html
index cd181a6..d366a43 100644
--- a/docs/pt_BR/segmentation.html
+++ b/docs/pt_BR/segmentation.html
@@ -1,201 +1,228 @@
 <html>
 <head>
-   <meta http-equiv="content-type" content="text/html; charset=UTF-8">
-   <title>Segmentação do texto fonte - OmegaT 1.6.1 Manual do Usuário</title>
-</head>
-<body>
+  <link rel="stylesheet" href="./OmegaT.css" type="text/css">
+  <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 
-<h1>Segmentação do texto fonte</h1>
+  <title>Segmentação do texto fonte - Manual do Usuário, OmegaT 2.0 </title>
+</head>
 
-<h2>Índice</h2></div>
+<body>
+  <h2>Segmentação do texto fonte</h2>
 
-<ul type="none">
-   <li>1. <a href="#Segmentation_Basics">Introdução à segmentação</a></li>
+  <ul>
+    <li>
+      <p><a href="#structure">Segmentação baseada na estrutura do texto</a></p>
+    </li>
 
-   <li>2. <a href="#Sentence_Segmentation">Segmentação de sentenças</a>
+    <li>
+      <p><a href="#sentence">Segmentação por sentenças</a></p>
 
       <ul>
-         <li>2.1. <a href="#About_Rules">Sobre as regras</a></li>
-
-         <li>2.2. <a href="#Rules_Setup">Definição das regras</a>
-
-            <ul>
-               <li>2.2.1. <a href="#Sets_of_Rules">Conjunto de regras</a></li>
-               <li>2.2.2. <a href="#Simple_examples">Exemplos simples</a></li>
-            </ul>
-         </li>
-
-         <li>2.3. <a href="#Regular_Expressions_to_use_in_segmentation_rules">Expressões regulares para usar nas regras de segmentação</a>
-
-            <ul>
-               <li>2.3.1. <a href="#Short_summary_of_regular-expression_constructs">Resumo de elaborações de expressões regulares</a></li>
-            </ul>
-         </li>
+        <li>
+          <p><a href="#about">Regras de Segmentação</a></p>
+        </li>
+
+        <li>
+          <p><a href="#setup">Definição das regras</a></p>
+
+          <ul>
+            <li>
+              <p><a href="#priority">Prioridade</a></p>
+            </li>
+
+            <li>
+              <p><a href="#creation">Criação de regras</a></p>
+            </li>
+
+            <li>
+              <p><a href="#break">Quebra/exceção</a></p>
+            </li>
+
+            <li>
+              <p><a href="#examples">Alguns exemplos simples</a></p>
+            </li>
+          </ul>
+        </li>
       </ul>
-   </li>
-</ul>
-
-<a name="Segmentation_Basics"></a>
-<h2>Introdução à segmentação</h2>
-
-<p>As ferramentas da memória de tradução trabalham com unidades de texto chamadas segmentos. Existem várias maneiras de segmentar um texto.</p>
-
-<p>O OmegaT analisa primeiro o texto pela segmentação de nível de estrutura Durante este processo somente a estrutura do arquivo fonte é usada para produzir segmentos. Por exemplo, os arquivos podem ser segmentados nas quebras de linha, nas linhas vazias ou não serem segmentados no nível de estrutura. Os arquivos com formatação (documentos OpenOffice.org, OpenDocument, XHTML e HTML) são segmentados nas tags de nível de bloco (ou seja, parágrafos).</p>
-
-<p>Atributos de objeto traduzíveis (em arquivos  XHTML ou HTML) são também extraídos para segmentos separados.</p>
-
-<p>OmegaT também pode segmentar por sentenças. A segmentação de sentenças ocorre após a segmentação de nível de estrutura. Os segmentos criados durante os dois processos não podem ser modificados (divididos ou combinados) durante a tradução. Esta é uma limitação do OmegaT que nós reconhecemos.</p>
-
-<p>Se você não estiver contente com a segmentação, terá que modificar o arquivo externamente e/ou modificar as regras de segmentação. Depois disso, terá que recarregar o projeto para que suas modificações sejam consideradas pelo programa.</p>
-
-<a name="Sentence_Segmentation"></a>
-<h2>Segmentação de sentenças</h2>
+    </li>
 
-<p>Após o OmegaT segmentar o arquivo fonte em unidades lógicas -- os arquivos geralmente formatados em parágrafos -- ele segmentará esses parágrafos em sentenças, caso você não tenha desativado a opção de segmentação de sentença. De modo geral, o OmegaT segmenta os blocos lógicos do arquivo fonte conforme o que você determinar. Entretanto, o ajuste <strong>predefinido</strong> do OmegaT é segmentar em frases, o que chamaremos de segmentação de <strong>sentença</strong>.</p>
+    <li>
+      <p><a href="regexp.html">Construção de expressão regular</a></p>
+    </li>
+  </ul>
 
-<p>A Segmentação de Sentença foi elaborada considerando o padrão <a href="http://www.lisa.org/standards/srx/">SRX (Segmentation Rules eXchange)</a>, ou seja, Troca de Regras de Segmentação,  embora no momento o OmegaT não seja compatível com todos os recursos SRX, nem pode importar/exportar as regras definidas no formato SRX. Porém, se você sabe como o SRX funciona, já sabe como o OmegaT funciona, pois eles são mais ou menos o mesmo.</p>
+  <p>As ferramentas de memória de tradução trabalham com unidades de texto chamadas segmentos. O OmegaT tem duas maneiras de segmentar um texto: segmentação por parágrafo e por sentença. Para selecionar o tipo de segmentação, clique em <strong>Projeto → Propriedades...</strong> no menu principal e use a caixa de diálogo disponível. Note que a segmentação por parágrafo não é muito usada e na maioria dos projetos a segmentação por sentença é a opção preferida. Se escolher segmentação por sentença, você pode definir as regras; basta clicar em  <strong>Opções → Segmentação...</strong> no menu principal.</p>
 
-<a name="About_Rules"></a>
-<h3>Sobre as regras</h3>
+  <p>Note que uma boa parte do desenvolvimento foi gasto na criação de regras de segmentação confiável, por isso na maioria dos casos, você não precisará se envolver criando suas regras próprias de segmentação. Por outro lado, esta funcionalidade pode ser muito útil em casos especiais, possibilitando-lhe traduzir o que precisa ser traduzido sem correr o perigo de mudar o que deve permanecer inalterado.</p>
 
-<p>Existem dois tipos possíveis de regras</p>
+  <p><strong>Alerta!</strong> Mudar as opções de filtros com um projeto aberto pode resultar na perda de dados. Se você modificar as opções de segmentação com um projeto aberto, terá que recarregar o projeto para que as modificações sejam efetivadas.</p>
+  <hr>
 
-<ul>
-   <li>As regras de quebra dividem o texto em segmentos.</li>
-   <li>As regras de exceção especificam a parte do texto que não deve ser separada das outras.</li>
-</ul>
+  <h2><a name="structure" id="structure"></a>Segmentação baseada na estrutura do texto</h2>
 
-<p>Exemplo de regra de quebra: <i>"Isto fazia sentido? Eu não tinha certeza."</i> pode ser segmentada em duas sentenças depois do  "<code>?</code>". Deve haver uma regra de quebra para o  "<code>?</code>".</p>
+  <p>O OmegaT analisa primeiro o texto pela segmentação usando o nível de estrutura. Durante este processo somente a estrutura do arquivo fonte é usada para produzir segmentos.</p>
 
-<p>Exemplo de regra de exceção: <i>"Quem tem medo da Sra. Woolf?"</i> não pode ser segmentada após o  "<code>.</code>". Deve haver uma regra de exceção para  "<code>Sra.</code>".</p>
+  <p>Por exemplo, os <a href="fileFilters.html#filter_options">arquivos de texto</a> podem ser segmentados nas quebras de linha, nas linhas vazias ou não serem segmentados. Os arquivos com formatação (documentos OpenOffice.org, HTML, etc.) são segmentados nas tags de nível de bloco (ou seja, parágrafos). Os <a href=
+  "fileFilters.html#filter_options">atributos</a> de objeto traduzíveis em arquivos  XHTML ou HTML podem ser extraídos como segmentos separados.</p>
+  <hr>
 
-<p>As regras de quebra predefinidas devem ser suficientes para a maioria dos idiomas europeus e japonês, mas recomendamos definir mais regras de exceção para o idioma que você traduz, pois é impossível predefinir todas as exceções possíveis para todos os idiomas possíveis.</p>
+  <h2><a name="sentence" id="sentence"></a>Segmentação por sentenças</h2>
 
-<a name="Rules_Setup"></a>
-<h3>Definição das regras</h3>
+  <p>Após segmentar o arquivo fonte em unidades lógicas, o OmegaT segmentará esses blocos em sentenças.</p>
 
-<p>Para definir as regras, selecione <strong>Opções > Segmentação...</strong> no menu principal. Observe que se você modificar as opções de segmentação quando um projeto estiver aberto, terá que recarregar o projeto para que as modificações sejam efetivadas.</p>
+  <h3><a name="about" id="about"></a>Regras de Segmentação</h3>
 
-<a name="Sets_of_Rules"></a>
-<h4>Conjunto de regras</h4>
+  <p>O processo de segmentação pode ser ilustrado da seguinte forma: imagine o cursor passando pelo texto, um caractere de cada vez. Para cada posição do cursor, é usada uma regra em uma determinada sequência para verificar se o padrão <strong>Antes</strong> se aplica ao texto que está à esquerda do cursor e o padrão <strong>Depois</strong> ao texto que está à direita do cursor. Se a regra corresponder, o programa interrompe a verificação das regras (exceto a regra de exceção) ou cria um novo segmento (para a regra de quebra).</p>
 
-<p>Todos os conjuntos de regras de segmentação com um padrão de idioma correspondente são aplicados na ordem de prioridade estabelecida, portanto as regras para um idioma específico devem ter maior prioridade do que aquelas predefinidas.</p>
+  <p>A segmentação por sentença foi implementada baseada no padrão <a href="http://www.lisa.org/standards/srx/">Segmentation Rules eXchange (SRX)</a>  - note que nem todos os recursos SRX são suportados. E não é possível importar/exportar regras definidas no formato SRX. Porém, se você sabe como o SRX funciona, saberá como o OmegaT processa a segmentação.</p>
 
-<p>Por exemplo, as regras para francês canadense (FR-CA) devem ter prioridade às regras para o francês (FR.*), e a outros idiomas definidos como padrão (.*). Assim, ao traduzir para o francês canadense, seu projeto usará as regras definidas para este idioma, depois as regras para o francês e as regras do idioma padrão, seguindo a ordem correta.</p>
+  <p>Existem dois tipos de regras:</p>
 
-<p>Para criar um conjunto vazio de regras, clique em <strong>Adicionar</strong> na metade superior da caixa de diálogo. Será exibida uma linha vazia na parte inferior de uma tabela. Mude o nome do conjunto de regras e o padrão do idioma. A sintaxe do padrão do idioma se ajusta à sintaxe de expressões regulares. Veja acima a seção <a href="#Short_summary_of_regular-expression_constructs"> Resumo de elaborações de expressões regulares</a>.</p>
+  <ul>
+    <li>
+      <p><strong>Regras de quebra</strong> separam o texto fonte em segmentos. Por exemplo, <i>"Isto fez sentido? Eu não tinha certeza." </i>deve ser separado em dois segmentos e para isso deve haver uma regra de quebra para "<code>?</code>".</p>
+    </li>
 
-<p>Se o seu conjunto de regras processa um par de idioma-país, recomendamos que o coloque no topo da lista usando o botão <strong>Mover para cima</strong>.</p>
+    <li>
+      <p><strong>Regras de exceção</strong> especificam que partes do texto NÃO devem ser separadas. Apesar do ponto de abreviatura, <i>"Sra. Dumont "</i> não deve ser separada em dois segmentos, portanto uma regra de exceção deve ser criada para Sra. (bem como para Sr. e Srta. e Dr. e prof. e etc.), seguida por um ponto.</p>
+    </li>
+  </ul>
 
-<p>Para editar um conjunto de regras, basta clicar nele na tabela; as regras aparecerão na parte inferior da janela.</p>
+  <p>As regras de quebra predefinidas devem ser suficientes para a maioria das línguas europeias e para o japonês. Dada a flexibilidade desse recurso, você pode definir mais regras de excepção para a língua que está traduzindo, e obter segmentos mais significativo e coerente.</p>
 
-<p>A caixa de seleção 'Quebra/exceção' determina se é uma regra de quebra (caixa selecionada) ou uma regra de exceção (caixa não selecionada). Duas expressões regulares Antes e Depois especificam o que deve vir antes e depois de uma posição, de forma a indicar se é uma regra de exceção ou uma regra de quebra.</p>
+  <h3><a name="setup" id="setup"></a>Definição das regras</h3>
 
-<p>O processo de segmentação pode ser simplificado conforme segue. Imagine um cursor movendo-se no espaço logo após o primeiro caractere até antes do último caractere do texto do segmento. Para cada posição do cursor, consideramos cada regra em uma determinada ordem e tentamos aplicar ao padrão <strong>Antes</strong> para todo o texto que está à esquerda do cursor e o padrão <strong>Depois</strong> para o texto que está à direita de forma que encostem no cursor.</p>
+  <h3><a name="priority" id="priority"></a>Prioridade</h3>
 
-<p>Para as regras que funcionam, se forem de exceção nada faremos senão parar de examinar mais regras; se forem regras de quebra, o texto à esquerda será considerado um segmento separado, isto válido para qualquer posição de cursor no texto.</p>
+  <p>Todos os conjuntos de regras de segmentação com um padrão de língua correspondente são aplicados na ordem de prioridade estabelecida, portanto as regras para uma língua específica devem ter maior prioridade do que aquelas predefinidas. Por exemplo, as regras para francês canadense (FR-CA) devem ter prioridade às regras para o francês (FR.*), bem como àquelas definidas como padrão (.*). Assim, ao traduzir para o francês canadense, seu projeto usará as regras definidas para esta língua, depois as regras para o francês e as regras padrão, seguindo a ordem correta.</p>
 
-<a name="Simple_examples"></a>
-<h4>Exemplos simples</h4>
+  <h3><a name="creation" id="creation"></a>Criação de regras</h3>
 
-<p>
-<dl>
-   <dt><strong>Objetivo:</strong> definir uma segmentação após um ponto ('<code>.</code>') e antes de um espaço</dt>
-   <dd>Antes: <code>\.</code> Depois: <code>\s</code> <br> <strong>Observação:</strong> "<code>\.</code>" significa o caractere "<code>.</code>" <br> "<code>\s</code>" significa qualquer caractere de espaçamento em branco</dd>
+  <p>Para editar ou expandir um conjunto de regras existentes, basta clicar nas regras na tabela superior. As regras serão mostradas na janela inferior.</p>
 
-   <dt><strong>Objetivo:</strong> não segmentar após "<code>Mr.<c/code>"</dt>
-   <dd>Antes: <code>Mr\.</code> Depois: <code>\s</code> <br> <strong>Observação:</strong> não esqueça de deixar a caixa de seleção <strong>desmarcada</strong>
-   </dd>
+  <p>Para criar um conjunto de regras para uma nova língua, clique em <strong>Adicionar</strong> na metade superior da caixa de diálogo. Na parte de baixo da tabela será acrescentada uma linha <font color="black" face=
+  "Times New Roman" size="3"><span style="font-size: 12pt; color: black;" lang=
+  "EN-US">(faça a rolagem para tela para ver a nova linha)</span></font>. Mude o nome do conjunto de regras e o padrão da língua. A sintaxe do padrão da língua segue a sintaxe das <a href="regexp.html">expressões regulares</a>. Se o seu conjunto de regras processa um par de língua, recomendamos que o coloque no topo da lista usando o botão <strong>Mover para cima</strong>. </p>
 
-   <dt><strong>Meta:</strong> definir uma segmentação após "。" (ponto usado no japonês)</dt>
-   <dd>Antes: 。 Depois: (vazio) <br> <strong>Observação:</strong> você pode deixar um campo vazio</dd>
-</dl>
-</p>
+  <h3><a name="break" id="break"></a>Quebra/exceção</h3>
 
-<a name="Regular_Expressions_to_use_in_segmentation_rules"></a>
-<h3>Expressões regulares para usar nas regras de segmentação</h3>
+  <p>A caixa de seleção 'Quebra/exceção' determina se é uma regra de quebra (caixa selecionada) ou uma regra de exceção (caixa não selecionada). Duas expressões regulares Antes e Depois especificam o que deve vir antes e depois de uma posição, de forma a indicar se é uma regra de exceção ou uma regra de quebra.</p>
 
-<p>As próprias regras de segmentação são representadas com o uso de expressões regulares. Isto permite o máximo em flexibilidade na hora de definir as regras e estar de conformidade com o SRX.</p>
+  <h3><a name="examples" id="examples"></a>Alguns exemplos simples</h3>
 
-<a name="Short_summary_of_regular-expression_constructs"></a>
-<h4>Resumo de elaborações de expressões regulares</h4>
+  <table summary="just formatting" border="0" cellpadding="4" cellspacing="0">
+    <tbody>
+      <tr bgcolor="#DDDDDD">
+        <td width="26%">
+          <p><strong>Intenção</strong></p>
+        </td>
 
-<p>Essas não são as únicas elaborações que podem ser usadas nas regras de segmentação do OmegaT; são apenas as mais usadas. O OmegaT é compatível com todos os recursos de expressões regulares, conforme descrito no padrão <a href="http://www.lisa.org/standards/srx/">SRX</a>.</p>
+        <td>
+          <p><strong>Antes</strong></p>
+        </td>
 
-<table border="0" width="80%" cellpadding="1" cellspacing="0" summary="Elaborações de expressões regulares e o que elas correspondem">
-    <tr bgcolor="#DDEEFF"><th width="10%" align="left" id="construct">Elaborar </th><th align="left">Correspondências</th></tr>
+        <td>
+          <p><strong>Depois</strong></p>
+        </td>
 
-    <tr><th> </th></tr>
-    <tr align="left"><th colspan="2" id="flags">Flags</th></tr>
-    <tr><td><tt>(?i)</tt></td><td>Ativa correspondências que ignoram maiúsculas e minúsculas (o padrão predefinido faz a distinção entre maiúsculas e minúsculas).</td></tr>
-    <tr><th> </th></tr>
-    <tr><th align="left" colspan="2" id="characters">Caracteres</th></tr>
-    <tr><td><strong>x</strong></td><td>O caractere <strong>x</strong>, exceto o seguinte...</td></tr>
+        <td width="52%">
+          <p><strong>Observação:</strong></p>
+        </td>
+      </tr>
 
-    <tr><td><tt>\u</tt><strong>hhhh</strong></td><td>O caractere com valor hexadecimal <tt>0x</tt><strong>hhhh</strong></td></tr>
-    <tr><td><tt>\t</tt></td><td>O caractere de tabulação (<tt>'\u0009'</tt>)</td></tr>
-    <tr><td><tt>\n</tt></td><td>O caractere de nova linha (alimentação de linha)  (<tt>'\u000A'</tt>)</td></tr>
+      <tr>
+        <td width="26%">
+          <p>definir uma segmentação após um ponto ('<code>.</code>') e antes de um espaço</p>
+        </td>
 
-    <tr><td><tt>\r</tt></td><td>O caractere de retornar ao início da linha (<tt>'\u000D'</tt>)</td></tr>
-    <tr><th> </th></tr>
-    <tr align="left"><th colspan="2" id="quot">Escapar</th></tr>
-    <tr><td><tt>\</tt></td><td>Nada, mas escapa o caractere seguinte. Isto é necessário se você quiser inserir quaisquer metacaracteres <code>!$()*+.<>?[\]^{|}</code> para corresponder a eles mesmos.</td></tr>
+        <td>
+          <p><code>\.</code></p>
+        </td>
 
-    <tr><td><tt>\\</tt></td><td>Por exemplo, este é um caractere de barra invertida</td></tr>
-    <tr><td><tt>\Q</tt></td><td>Nada, mas escapa todos os caracteres até <tt>\E</tt></td></tr>
-    <tr><td><tt>\E</tt></td><td>Nada, mas finaliza o escape iniciado pelo <tt>\Q</tt></td></tr>
-    <tr><th> </th></tr>
-    <tr align="left"><th colspan="2" id="classes">Classes de caracteres</th></tr>
+        <td>
+          <p><code>\s</code></p>
+        </td>
 
-    <tr><td><tt>[abc]</tt></td><td><tt>a</tt>, <tt>b</tt>, ou <tt>c</tt> (classe simples)</td></tr>
-    <tr><td><tt>[^abc]</tt></td><td>Qualquer caractere exceto <tt>a</tt>, <tt>b</tt>, ou <tt>c</tt> (negação)</td></tr>
+        <td width="52%">
+          <p>"<code>\.</code>" significa o caractere "<code>.</code>" "<code>\s</code>" significa qualquer caractere de espaçamento em branco</p>
+        </td>
+      </tr>
 
-    <tr><td><tt>[a-zA-Z]</tt></td><td><tt>a</tt> até <tt>z</tt> ou <tt>A</tt> até <tt>Z</tt>, inclusive (intervalo)</td></tr>
-    <tr><th> </th></tr>
-    <tr align="left"><th colspan="2" id="predef">Classes de caracteres predefinidas</th></tr>
+      <tr bgcolor="#DDDDDD">
+        <td width="26%">
+          <p>não segmentar após Dr.</p>
+        </td>
 
-    <tr><td><tt>.</tt></td><td>Qualquer caractere (exceto para terminadores de linha)</td></tr>
-    <tr><td><tt>\d</tt></td><td>Um dígito: <tt>[0-9]</tt></td></tr>
-    <tr><td><tt>\D</tt></td><td>Um caractere que não seja dígito: <tt>[^0-9]</tt></td></tr>
-    <tr><td><tt>\s</tt></td><td>Um caractere de espaçamento: <tt>[ \t\n\x0B\f\r]</tt></td></tr>
+        <td>
+          <p><code>Dr\.</code></p>
+        </td>
 
-    <tr><td><tt>\S</tt></td><td>Um caractere que não seja de espaçamento: <tt>[^\s]</tt></td></tr>
-    <tr><td><tt>\w</tt></td><td>Um caractere de palavra: <tt>[a-zA-Z_0-9]</tt></td></tr>
-    <tr><td><tt>\W</tt></td><td>Um caractere que não seja de palavra: <tt>[^\w]</tt></td></tr>
-    <tr><th> </th></tr>
+        <td>
+          <p><code>\s</code></p>
+        </td>
 
-    <tr align="left"><th colspan="2" id="bounds">Correspondentes de limite (borda)</th></tr>
-    <tr><td><tt>^</tt></td><td>O início de uma linha</td></tr>
-    <tr><td><tt>$</tt></td><td>O final de uma linha</td></tr>
-    <tr><td><tt>\b</tt></td><td>Limite de uma palavra</td></tr>
-    <tr><td><tt>\B</tt></td><td>Limite que não seja de palavra</td></tr>
+        <td width="52%">
+          <p>É uma regra de exceção, portanto a caixa de seleção da regra deve ser desmarcada</p>
+        </td>
+      </tr>
 
-    <tr><th> </th></tr>
-    <tr align="left"><th colspan="2" id="greedy">Quantificadores vorazes (gulosos ou possessivos)</th></tr>
-    <tr><td colspan="2">Eles farão o maior número de correspondências possíveis. Por exemplo, <code>a+</code> corresponderá  a <code>aaa</code> em <code>aaabbb</code></td></tr>
-    <tr><td><strong>X</strong><tt>?</tt></td><td><strong>X</strong>, uma ou nenhuma</td></tr>
+      <tr>
+        <td width="26%">
+          <p>definir um segmento após "。" (ponto em japonês)</p>
+        </td>
 
-    <tr><td><strong>X</strong><tt>*</tt></td><td><strong>X</strong>, zero ou mais vezes</td></tr>
-    <tr><td><strong>X</strong><tt>+</tt></td><td><strong>X</strong>, uma ou mais vezes</td></tr>
-    <tr><th> </th></tr>
-    <tr align="left"><th colspan="2" id="reluc">Quantificadores relutantes (não-vorazes)</th></tr>
+        <td>
+          <p><span lang="zxx"><code>。</code></span></p>
+        </td>
 
-    <tr><td colspan="2">Eles farão o menor número possível de correspondências. Por exemplo, <code>a+?</code> corresponderá o primeiro <code>a</code> em <code>aaabbb</code></td></tr>
-    <tr><td><strong>X</strong><tt>??</tt></td><td><strong>X</strong>, uma ou nenhuma</td></tr>
-    <tr><td><strong>X</strong><tt>*?</tt></td><td><strong>X</strong>, zero ou mais vezes</td></tr>
+        <td></td>
 
-    <tr><td><strong>X</strong><tt>+?</tt></td><td><strong>X</strong>, uma ou mais vezes</td></tr>
-    <tr><th> </th></tr>
-    <tr align="left"><th colspan="2" id="logical">Operadores lógicos</th></tr>
-    <tr><td><strong>XY</strong></td><td><strong>X</strong> seguido por <strong>Y</strong></td></tr>
+        <td width="52%">
+          <p>Note que <i>após</i> está vazio</p>
+        </td>
+      </tr>
 
-    <tr><td><strong>X</strong><tt>|</tt><strong>Y</strong></td><td>Ou <strong>X</strong> ou <strong>Y</strong></td></tr>
-    <tr><td><tt>(</tt><strong>XY</strong><tt>)</tt></td><td><strong>XY</strong> como um grupo único</td></tr>
+      <tr bgcolor="#DDDDDD">
+        <td width="26%">
+          <p>não segmentar após Sr. e Sra. </p>
+        </td>
 
-</table>
+        <td>
+          <p><code>Sr??a??\.</code></p>
+        </td>
 
-<hr>
-<p><a href="legalNotices.html" title="Avisos legais">Avisos legais</a></p>
+        <td>
+          <p><code>\s</code></p>
+        </td>
 
+        <td width="52%">
+          <p>regra de exceção - ver o uso de ? em expressões regulares (identificador não-guloso)</p>
+        </td>
+      </tr>
+    </tbody>
+  </table>
+  <hr>
+
+  <h2><a name="regex" id="regex"></a>Construir expressões regulares</h2>
+
+  <p>As expressões regulares usadas em segmentação são aquelas suportadas pelo Java. Um resumo está disponível no anexo <a href="regexp.html">Construir expressões regulares</a>. Se precisar de informações específicas, consulte  <a href=
+  "http://java.sun.com/j2se/1.5/docs/api/java/util/regex/Pattern.html">http://java.sun.com/j2se/1.5/docs/api/java/util/regex/Pattern.html</a>.</p>
+
+  <p>Na Internet há tutoriais simples, como por exemplo <a href=
+  "http://www.regular-expressions.info/quickstart.html">http://www.regular-expressions.info/quickstart.html</a>.</p>
+  <hr>
+
+  <table summary="just formatting" style="width: 100%;" border="0" cellpadding=
+  "2" cellspacing="2">
+    <tbody>
+      <tr>
+        <td style="text-align: left;"><a href="legalNotices.html">Avisos legais</a></td>
+
+        <td style="text-align: center;"><a href="index.html">Home</a></td>
+
+        <td style="text-align: right;"><a href="xindex.html">Índice</a></td>
+      </tr>
+    </tbody>
+  </table>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/docs/pt_BR/translationEditing.html b/docs/pt_BR/translationEditing.html
index ee86413..1c194ea 100644
--- a/docs/pt_BR/translationEditing.html
+++ b/docs/pt_BR/translationEditing.html
@@ -1,47 +1,94 @@
 <html>
 <head>
-   <meta http-equiv="content-type" content="text/html; charset=UTF-8">
-   <title>Tradução e edição - OmegaT 1.6.1 Manual do Usuário</title>
+  <link rel="stylesheet" href="./OmegaT.css" type="text/css">
+  <meta http-equiv="content-type" content="text/html; charset=UTF-8">
+
+  <title>Tradução e edição - Manual do Usuário, OmegaT 2.0 </title>
 </head>
+
 <body>
+  <h2>Editar o modo de trabalho</h2>
+
+  <ul>
+    <li>
+      <p><a href="#auto_insert">Inserção automática das correspondências</a></p>
+    </li>
+
+    <li>
+      <p><a href="#validation">Permitir que a tradução seja igual ao texto fonte</a></p>
+    </li>
+
+    <li>
+      <p><a href="#Export">Exportar o segmento para arquivos de texto</a></p>
+    </li>
+  </ul><img alt="Modo de trabalho - caixa de diálogo" src=
+  "images/EditingBehaviourOptions.png"><br>
+
+  <p>Nesta caixa de diálogo, disponível em Opções > Modo de trabalho..., o usuário pode determinar o modo de abrir e trabalhar no campo do texto destino.</p>
+
+  <h2><a name="auto_insert" id="auto_insert"></a>Inserção automática das correspondências</h2>
 
-<h1>Tradução e edição</h1>
+  <p>O trabalho de tradução é feito de segmento em  segmento e, ao mesmo tempo que traduz, você também faz a revisão do texto traduzido. Ao passar de um segmento para outro, o programa pode inserir no campo de tradução o texto original ou uma tradução já existente na memória.</p>
 
-<p>A tradução dos seus arquivos é feita de segmento em  segmento e a revisão/edição também. Ao passar de um segmento para outro, o campo de edição pode ser preenchido, ou não, por texto. Por exemplo, o campo destino (ou campo de edição) é sempre preenchido com a tradução existente, quando você passa para o segmento traduzido, possibilitando assim revisar sua tradução.</p>
+  <p>Em <strong>Opções → Modo de trabalho...</strong> o OmegaT oferece as seguintes alternativas:</p>
 
-<p>Entretanto, ao passar para um segmento que não foi ainda traduzido, o OmegaT pode preencher o segmento com o texto que você definir; desta forma poderá editar da maneira que preferir:</p>
+  <table summary="just formatting" cellpadding="2" cellspacing="2">
+    <tr valign="top">
+      <td>
+        <p><strong>O texto fonte</strong></p>
+      </td>
 
-<ul>
-   <li>OmegaT preenche automaticamente o campo de edição com o texto fonte. Isto é extremamente útil para texto com muitos nomes de marcas comerciais ou outros nomes próprios que não são traduzidos. Acesse <strong>Opções -> Modo de trabalho...</strong> e confirme que a opção <strong>O texto fonte</strong> esteja selecionada.</li>
+      <td>
+        <p>o campo de tradução será preenchido automaticamente com o texto original. Isto é muito útil para texto com muitos nomes de marcas comerciais ou outros nomes próprios que não são traduzidos.</p>
+      </td>
+    </tr>
 
-   <li>Ou o OmegaT deixa o campo de edição em branco. Com esta opção você pode digitar a tradução sem precisar apagar o texto fonte, economizando alguns toques no teclado (<code>Ctrl+A</code> e <code>Del</code>). Acesse <srong>Opções -> Modo de trabalho...</strong> e selecione a opção <strong>Deixar o segmento em branco</strong>.</li>
+    <tr valign="top">
+      <td>
+        <p><strong>Deixar o segmento em branco</strong></p>
+      </td>
 
-   <li>O OmegaT também pode inserir a tradução do segmento mais similar (correspondência de string da memória) àquele que você vai traduzir. Acesse <strong>Opções -> Modo de trabalho...</strong>, marque a opção <strong>Inserir a melhor correspondência imperfeita</strong>, ajuste a porcentagem de similaridade mínima que o segmento correspondente deve ter para ser inserido automaticamente.</li>
-</ul>
+      <td>
+        <p>O OmegaT deixará o campo de tradução em branco. Com esta opção você pode digitar a tradução sem precisar apagar o texto fonte, economizando alguns toques no teclado (<code>Ctrl+A</code> e <code>Del</code>).</p>
+      </td>
+    </tr>
 
-<p>Para definir o OmegaT para qualquer das seguintes ações, acesse <strong>Opções -> Modo de trabalho...</strong>, e...</p>
+    <tr valign="top">
+      <td>
+        <p><strong>Inserir a melhor correspondência parcial</strong></p>
+      </td>
 
-<ul>
-   <li>Confirme que a opção <strong>O texto fonte</strong> esteja selecionada. Esta opção está predefinida, portanto é provável que já esteja selecionada.</li>
+      <td>
+        <p>O OmegaT irá inserir a correspondência que encontrar na memória que for mais similar ao segmento aberto, respeitando o limite de similaridade que você definir. Se encontrar correspondência, o segmento destino será marcado com um prefixo especificado no campo Prefixo ([parcial] no exemplo acima). Assim fica fácil identificar depois os segmentos pré-traduzidos.</p>
+      </td>
+    </tr>
+  </table>
+  <hr>
 
-   <li>Selecione a opção <strong>Deixar o segmento em branco</strong>.</li>
+  <h2><a name="validation" id="validation"></a>Permitir que a tradução seja igual ao texto fonte</h2>
 
-   <li>Marque a opção <strong>Inserir a melhor correspondência imperfeita</strong> e ajuste a porcentagem de similaridade mínima que o segmento correspondente deve ter para ser inserido automaticamente. Se preferir, você também pode modificar o prefixo para distinguir o texto como correspondências imperfeitas.</li>
-</ul>
+  <p>Os documentos a serem traduzidos podem conter marcas comerciais, nomes próprios e outros nomes que devem permanecer intactos no documento traduzido. Há duas estratégias para lidar com segmentos que contenham este tipo de texto invariável.</p>
 
-<p>... depois é só clicar em <strong>OK</strong>.</p>
+  <p>Você pode optar por não traduzir tais segmentos;o OmegaT relatará esses segmentos como não traduzidos. Esta opção está predefinida.</p>
 
-<a name="Text_To_Store"></a>
-<h2>Texto para guardar</h2>
+  <p>A alternativa é digitar a tradução, mesmo que seja idêntica ao texto fonte, assim o OmegaT gravará que você reviu o texto e aprovou que fosse igual ao original. Para fazer isso, acesse <strong>Opções → Modo de trabalho...</strong> e selecione <strong>Permitir que a tradução seja igual ao texto fonte</strong>.</p>
 
-<p>Os documentos a serem traduzidos podem conter marcas comerciais, nomes próprios e outros nomes que devem permanecer intactos no documento traduzido. Há duas estratégias para lidar com segmentos que contenham este tipo de texto invariável.</p>
+  <h2><a name="Export" id="Export"></a>Exportar o segmento para arquivos de texto</h2>
 
-<p>A primeira, você pode optar por não traduzir tais segmentos; entretanto, caso esqueça e traduza-os posteriormente durante a revisão, o OmegaT relatará esses segmentos como não traduzidos. Esta opção está predefinida.</p>
+  <p>Uma opção é deixar os segmentos não traduzidos do jeito que estão e retornar a eles mais tarde. Neste caso, você pode marcar a opção 'Permitir que a tradução seja igual ao texto fonte' e o OmegaT gravará tais segmentos em um arquivo a ser traduzido posteriormente.</p>
+  <hr>
 
-<p>A segunda, você pode determinar para que o OmegaT guarde a tradução, mesmo que seja idêntica ao texto fonte, assim ele gravará que você reviu o texto e aprovou que fosse igual ao original. Acesse <strong>Opções -> Modo de trabalho...</strong> e selecione a opção <strong>Permitir que a tradução seja igual al texto fonte</strong>.</p>
+  <table summary="just formatting" style="width: 100%;" border="0" cellpadding=
+  "2" cellspacing="2">
+    <tbody>
+      <tr>
+        <td style="text-align: left;"><a href="legalNotices.html">Avisos legais</a></td>
 
-<hr>
-<p><a href="legalNotices.html" title="Avisos legais">Avisos legais</a></p>
+        <td style="text-align: center;"><a href="index.html">Home</a></td>
 
+        <td style="text-align: right;"><a href="xindex.html">Índice</a></td>
+      </tr>
+    </tbody>
+  </table>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/docs/pt_BR/translationMemories.html b/docs/pt_BR/translationMemories.html
index 5d0dcb3..1edd193 100644
--- a/docs/pt_BR/translationMemories.html
+++ b/docs/pt_BR/translationMemories.html
@@ -1,117 +1,207 @@
 <html>
 <head>
-   <meta http-equiv="content-type" content="text/html; charset=UTF-8">
-   <title>Memórias de tradução - OmegaT 1.6.1 Manual do Usuário</title>
+  <link rel="stylesheet" href="./OmegaT.css" type="text/css">
+  <meta http-equiv="content-type" content="text/html; charset=UTF-8">
+  <title>Memórias de tradução - Manual do Usuário, OmegaT 2.0 </title>
 </head>
+
 <body>
+  <h2>Memórias de tradução</h2>
 
-<h1>Memórias de tradução</h1>
+  <ul>
+    <li>
+      <a href="#OmegaT_and_TMX_files">OmegaT e arquivos TMX</a>
 
-<h2>Índice</h2>
+      <ul>
+        <li><a href="#TMX_files_location_and_purpose">Local e finalidade</a></li>
 
-<ul type="none">
-   <li>1. <a href="#OmegaT_and_TMX_files">OmegaT e arquivos TMX</a>
+        <li><a href="#TMX_backup">Backup de TMX</a></li>
 
-      <ul type="none">
-         <li><a href="#TMX_files_location_and_purpose">Local e finalidade dos arquivos TMX</a></li>
-         <li><a href="#TMX_files_and_language">Idiomas e arquivos TMX</span></a></li>
+        <li><a href="#TMX_files_and_language">TMX e línguas</a></li>
       </ul>
-   </li>
+    </li>
+
+    <li><a href="#keeping_a_memory">Como o OmegaT lembra de suas traduções</a></li>
+
+    <li><a href="#Using_TMs_from_previous_projects">Usar memórias de tradução de projetos anteriores</a></li>
 
-   <li>2. <a href="#Keeping_a_memory_of_your_translation_with_OmegaT">Como manter uma memória de suas traduções no OmegaT</a></li>
+    <li>
+      <a href="#using_memories">Usar memórias criadas por outras ferramentas de tradução</a>
 
-   <li>5. <a href="#Using_memories_created_by_other_translation_tools">Usar memórias criadas por outras ferramentas de tradução</span></a>
+      <ul>
+        <li><a href="#importing_files">Importar arquivos</a></li>
 
-      <ul type="none">
-         <li>5.1. <a href="#Importing_files">Importar arquivos</a></li>
-         <li>5.2. <a href="#Imported_files_handling">Como lidar com arquivos importados</a></li>
+        <li><a href="#imported_files_handling">Como lidar com arquivos importados</a></li>
       </ul>
-   </li>
+    </li>
+
+    <li><a href="#using_OmegaT_TM">Usar memórias de tradução do OmegaT em outras ferramentas de tradução</a></li>
+    
+    <li><a href="#pseudo_translate">Memória pseudo-traduzida</a></li>
+
+    <li><a href="#upgrading_TM">Utualizar memórias de tradução</a></li>
+  </ul>
+  <hr>
+  <a name="OmegaT_and_TMX_files" id="OmegaT_and_TMX_files"></a>
+
+  <h2>OmegaT e arquivos TMX</h2><a name="TMX_files_location_and_purpose" id=
+  "TMX_files_location_and_purpose"></a>
 
-   <li>6. <a href="#Using_OmegaT_translation_memories_in_other_translation_tools">Usar memórias de tradução do OmegaT em outras ferramentas de tradução</a></li>
-   <li>7. <a href="#Upgrading_Translation_Memories">Utualizar memórias de tradução</a></li>
-</ul>
+  <h3>Arquivos TMX - local e finalidade</h3>
 
-<a name="OmegaT_and_TMX_files"></a>
-<h2>OmegaT e arquivos TMX</h2>
+  <p>O OmegaT usa arquivos TMX em 3 locais separados.</p>
 
-<a name="TMX_files_location_and_purpose"></a>
-<h3>Local e finalidade dos arquivos TMX</h3>
+  <ul>
+    <li>
+      <p>A pasta <em>/omegat/</em> contém <em>project_save.tmx</em> e eventualmente diversos arquivos TMX de backup.</p>
 
-<p>OmegaT usa arquivos TMX em 3 locais separados.</p>
+      <p>O arquivo <em>project_save.tmx</em> contém todos os segmentos que foram memorizados desde que você começou o projeto.</p>
+    </li>
 
-<ul>
-   <li>A pasta /omegat/ contém <strong>project_save.tmx</strong> e eventualmente os arquivos TMX de backup. O arquivo project_save.tmx contém <strong>todos</strong> os segmentos que foram memorizados desde que você começou o projeto.</li>
+    <li>
+      <p>A pasta principal do projeto conterá 3 arquivos TMX:</p>
 
-   <li>A pasta principal do projeto conterá 3 arquivos TMX: <strong><nome_projeto>-omegat.tmx</strong>, <strong><nome_projeto>-level1.tmx</strong> e <strong><nome_projeto>-level2.tmx</strong>, onde <code><nome_projeto></code> é simplesmente o nome do seu projeto. Esses são arquivos TMX exportados e contêm somente os pares de segmentos traduzidos.<ul>
-         <li><nome_projeto>-level1.tmx é um TMX que contém somente informações de texto.</li>
+      <ol>
+        <li><em>project_name-omegat.tmx</em></li>
 
-         <li><nome_projeto>-level2.tmx é um TMX que inclui as tags específicas do OmegaT nas tags TMX corretas, assim o arquivo pode ser usado com suas informações de formação em uma ferramenta de tradução que suporta memórias TMX de nível 2, ou no próprio OmegaT.</li>
+        <li><em>project_name-level1.tmx</em></li>
 
-         <li>O <nome_projeto>-omegat.tmx é um TMX que contém tags de formatação específica do OmegaT, assim o arquivo pode ser usado com suas informações de formatação em outro projeto no OmegaT.</li>
+        <li><em>project_name-level2.tmx</em></li>
+      </ol>(<i>project_name</i> é o nome do seu projeto).
+
+      <p>Esses arquivos contêm segmentos do texto original e da tradução que correspondem ao conteúdo da pasta /source/ no momento em que foram criados (geralmente quando os arquivos traduzidos são criados).</p>
+
+      <ul>
+        <li>O arquivo <em>level1</em> contém apenas informações de texto.</li>
+
+        <li>O arquivo <em>level2</em> inclui as tags específicas do OmegaT nas tags TMX corretas, assim o arquivo pode ser usado com suas informações de formatação em uma ferramenta de tradução que aceita memórias TMX nível 2, ou no próprio OmegaT.</li>
+
+        <li>O arquivo <em>omegat</em> contém tags de formatação específica do OmegaT, assim o arquivo pode ser usado em outros projetos no OmegaT</li>
       </ul>
-   </li>
+    </li>
+
+    <li>A pasta <em>/tm/</em> pode conter qualquer quantidade de arquivos TMX. Tais arquivos devem ser os TMX corretos e podem conter apenas as informações de texto (TMX nível 1) ou informações de formatação e de texto do OmegaT (TMX omegat), ou então informações de formatação e de texto TMX (TMX nível 2). As diferenças entre eles são técnicas (veja os detalhes abaixo), e se você quiser usar uma memória de tradução de um projeto anterior, elas são amplamente intercambiáveis, ou seja, todas funcionam bem.
+    </li>
+  </ul>
+  <p>Opcionalmente, o OmegaT fazer um arquivo TMX adicional (estilo OmegaT) em qualquer lugar que você especificar, contendo todos os segmentos traduzíveis do projeto. Veja <a href="#pseudo_translate">memória pseudo-traduzida</a>.</p>
+  
+
+  <a name="TMX_backup" id="TMX_backup"></a>
+  <h3>Backup de TMX</h3>
+
+  <p>Quando você traduz, o OmegaT guarda todos os seus arquivos na memória de tradução no subdiretório <em>/omegat</em>.</p>
+
+  <p>Também faz o backup da memória de tradução no <em>project_save.tmx.AAAAMMDDHHMM.bak</em> no mesmo subdiretório, cada vez que um projeto é aberto e recarregado. <em>AAAA</em> são os 4 dígitos do ano, <em>MM</em> indica o mês, <em>DD</em> o dia do mês, <em>HH</em> e <em>MM</em> são horas e minutos quando a versão anterior da memória foi gravada.</p>
+
+  <p>Se você achar que perdeu o material traduzido, siga este procedimento:</p>
+
+  <ol>
+    <li>Feche o projeto</li>
+
+    <li>Mude o nome do <em>project_save.tmx</em> atual para algo fácil de lembrar (como <em>project_save.tmx.anterior</em> por exemplo)</li>
+
+    <li>Selecione a memória de tradução de backup onde podem estar os dados que você perdeu</li>
+
+    <li>Mude o nome para <em>project_save.tmx</em></li>
+
+    <li>Abra o projeto</li>
+  </ol><a name="TMX_files_and_language" id="TMX_files_and_language"></a>
+
+  <h3>Línguas e arquivos TMX</h3>
+
+  <p>Os arquivos TMX contêm <i>unidades de tradução</i> que são compostas por segmentos equivalentes em diferentes línguas. Uma unidade de tradução é composta de no mínimo duas <i>variações de unidade de tradução</i> (tuv). Elas podem ser usadas como fonte ou como destino.</p>
+
+  <p>A maneira como você define o projeto indicará qual é a língua fonte e qual é a língua da tradução. O OmegaT considerará a <strong>tuv</strong> correspondente ao código da língua fonte do projeto e usará aquele segmento como fonte, e considerará a <strong>tuv</strong> correspondente ao código da língua destino e usará aquele segmento na tradução. O OmegaT reconhece esses códigos de línguas usando duas convenções:</p>
+
+  <ul>
+    <li>2 letras (p.ex. <strong>JA</strong> para japonês), ou</li>
 
-   <li>A pasta /tm/ pode conter qualquer quantidade de arquivos TMX. Tais arquivos devem ser os TMX corretos e podem conter apenas as informações de texto (TMX nível 1) ou informações de formatação e de texto do OmegaT (TMX omegat), ou então informações de formatação e de texto TMX (TMX nível 2).</li>
-</ul>
+    <li>código de língua de 2 letras seguido pelo código de 2 letras para o país (e.x. <strong>EN-US</strong>)</li>
+  </ul>
 
-<a name="TMX_files_and_language"></a>
-<h3>Idiomas e arquivos TMX</h3>
+  <p>Veja  <a href="languages.html">Línguas</a>  para obter uma lista parcial de códigos de língua e de país.</p>
 
-<p>Os arquivos TMX contêm <i>unidades de tradução</i> que são compostas por segmentos equivalentes em diferentes idiomas. Uma unidade de tradução é composta de no mínimo duas <i>variações de unidade de tradução</i> (tuv). As duas podem ser usadas como fonte ou como destino.</p>
+  <p>Se os códigos de língua do projeto e os códigos de língua do arquivo TMX corresponderem, os segmentos serão carregados na memória. Se os códigos corresponderem apenas no idioma mas não no país, os segmentos também serão carregados na memória. Se não houver correspondência nem no código de idioma nem no do país, os segmentos não serão carregados na memória.</p>
+  <hr>
+  <a name="keeping_a_memory" id="keeping_a_memory"></a>
 
-<p>A maneira como você define o projeto indicará qual é o idioma fonte e qual é o idioma destino. O OmegaT considerará a <strong>tuv</strong> correspondente ao código do idioma fonte do projeto e usará aquele segmento como fonte, tratando a <strong>tuv</strong> correspondente ao código de idioma destino como segmento de destino.</p>
+  <h2>Como o OmegaT lembra de suas traduções</h2>
 
-<p>Os códigos de idiomas são apresentados de diversas formas. O OmegaT atualmente reconhece somente os códigos que mostram:</p>
+  <p>O arquivo project_save.tmx contém todos os segmentos que foram memorizados desde que você começou o projeto. Se fizer qualquer modificação na segmentação do projeto, o <em>project_save.tmx</em> gravará novos pares de tradução, mas manterá todas as informações anteriores.</p>
 
-<ul><li>O código de idioma em 2 letras (ex: <strong>JA</strong> para japonês)</li></ul>
+  <p>Isto poderá ocasionalmente trazer <strong>strings órfãs</strong> no visualizador de correspondências. Tais correspondências não se referem mais aos segmentos existentes, mas aos segmentos gravados antes das modificações serem feitas. Se a modificação foi um engano, reverta para as definições anteriores e os segmentos gravados anteriormente reaparecerão.</p>
+  <hr>
+  <a name="Using_TMs_from_previous_projects" id=
+  "Using_TMs_from_previous_projects"></a>
 
-<p>ou</p>
+  <h2>Usar memórias de tradução de projetos anteriores</h2>
 
-<ul><li>O código de idioma em duas letras e o código do país em duas letras, separados por um hífen (ex: <strong>JA-JP</strong> para japonês que é usado no Japão)</li></ul>
+  <p>Quando você cria os documentos traduzidos em um projeto OmegaT, a memória de tradução do projeto é gerada na forma de três arquivos na pasta raiz do seu projeto (veja a descrição acima). Você pode considerar esses três arquivos TMX (-<em>omegat.tmx</em>". "<em>-Level1.tmx</em>" e "<em> -Level2.tmx</em>") como uma "memória de tradução de exportação", ou seja, um resumo bilíngue exportável de seu projeto atual.</p>
 
-<p>Se os códigos de idioma do projeto e os códigos de idioma do TMX corresponderem, os segmentos serão carregados na memória. Se os códigos corresponderem apenas no idioma mas não no país, os segmentos também serão carregados na memória. Se não houver correspondência nem no código de idioma nem no do país, os segmentos não serão carregados na memória.</p>
+  <p>Se quiser reutilizar uma memória de tradução de um projeto anterior (por exemplo, por semelhança do novo projeto com o anterior, ou sua terminologia já foi usada antes), você pode usar essas memórias de tradução como "memórias de entrada de tradução", ou seja, para importar para o novo projeto. Neste caso, coloque as memórias de tradução que você quer usar na pasta <em>\tm</em> do seu novo projeto.</p>
 
-<a name="Keeping_a_memory_of_your_translation_with_OmegaT"></a>
-<h2>Como manter uma memória de suas traduções no OmegaT</h2>
+  <p>Está predefinido que a pasta <em>\tm</em> fica acima da pasta raiz do projeto (p.ex. ..<em>\MyProject\tm)</em>, mas você pode escolher uma pasta diferente na caixa de propriedades do projeto. Isso é útil se você costuma usar as memórias de tradução produzidas anteriormente, por exemplo, porque se referem ao mesmo assunto ou são para o mesmo cliente. Neste caso, um procedimento muito útil seria:</p>
 
-<p>O arquivo project_save.tmx contém <strong>todos</strong> os segmentos que foram memorizados desde que você começou o projeto. Se fizer qualquer modificação na segmentação do projeto, por exemplo, o project_save.tmx gravará novos pares de tradução, mas manterá todas as informações anteriores. Isto poderá ocasionalmente trazer <strong>strings órfãs</strong> no visualizador de correspondências. Tais correspondências não se referem mais aos segmentos existentes, mas aos segmentos gravados antes das modificações serem feitas. Se a modificação foi um engano, reverta para as definições anteriores e os segmentos gravados anteriormente reaparecerão.</p>
+  <ul>
+    <li>Crie uma pasta ("repositório") em um local conveniente no disco rígido para as memórias de tradução para um cliente específico ou assunto.</li>
 
-<a name="Using_memories_created_by_other_translation_tools"></a>
-<h2>Usar memórias criadas por outras ferramentas de tradução</h2>
+    <li>Sempre que terminar um projeto, copie uma das três memórias de tradução "de exportação" da pasta raiz do projeto para a pasta de repositório.</li>
 
-<a name="Importing_files"></a>
-<h3>Importar arquivos</h3>
+    <li>Quando iniciar um novo projeto sobre o mesmo assunto ou para o mesmo cliente, acesse a pasta de repositório em  <em>Projeto > Propriedades > Editar projeto</em> e selecione-a como a pasta de memória de tradução.</li>
+  </ul>
 
-<p>O OmegaT é compatível com importação de TMX de versões 1.1-1.4b (nível 1 e nível  2). Isto possibilita que as memórias de tradução produzidas por outras ferramentas possam ser lidas pelo OmegaT.</p>
+  <p>Note que todos os arquivos TMX no respositório <em>/tm</em> são analisados durante a inicialização do programa, assim, se houver muitos arquivos TMX nesta pasta, o OmegaT ficará lento desnecessariamente. Considere até eliminar aquelas memórias que são estritamente necessárias (por exemplo, deixando-as no subidretório <em>/tm</em>, mas modificando a sua extensão), uma vez que seus conteúdos tenham migrado para a  <em>project_save.tmx</em>  de seu projeto atual.</p>
 
-<p>Entretanto, o OmegaT não é <i>totalmente</i> compatível com arquivos TMX nível 2 importados (que guardam não apenas a tradução, mas também formatação); dessa forma os resultados de correspondências imperfeitas pode ser menor com arquivos TMX nível 2 importados.</p>
+  <p><a name="using_memories" id="using_memories"></a></p>
 
-<a name="Imported_files_handling"></a>
-<h3>Como lidar com arquivos importados</h3>
+  <h2>Usar memórias criadas por outras ferramentas de tradução</h2>
 
-<p>Para processar arquivos de memórias de tradução (arquivos TMX), o OmegaT segue procedimentos extremamente precisos.</p>
+  <h3><a name=
+  "importing_files" id="importing_files"></a>Importar arquivos</h3>
 
-<p>Se encontrar qualquer erro em um arquivo de memória, o OmegaT simplesmente não o carregará.</p>
+  <p>O OmegaT pode importar TMX de versões 1.1-1.4b (nível 1 e nível  2). Isto possibilita que as memórias de tradução produzidas por outras ferramentas possam ser lidas pelo OmegaT. Entretanto, o OmegaT não é <i>totalmente</i> compatível com arquivos TMX nível 2 importados (que guardam não apenas a tradução, mas também formatação); dessa forma os resultados de correspondências parciais pode ser menor com arquivos TMX nível 2 importados.</p>
 
-<p>Algumas ferramentas são conhecidas por produzirem, em muitos casos, arquivos TMX inválidos. Se quiser usar tais arquivos como referências para traduções no OmegaT, eles devem ser corrigidos caso o OmegaT tenha se recusado a abrir tais memórias. As correções são operações triviais e o OmegaT dará indicações nas mensagens de erros relacionadas. Se não puder corrigir você mesmo o problema, solicite ajuda ao grupo de usuários.</p>
+  <h3><a name=
+  "imported_files_handling" id="imported_files_handling"></a>Como lidar com arquivos importados</h3>
 
-<a name="Using_OmegaT_translation_memories_in_other_translation_tools"></a>
-<h2>Usar memórias de tradução do OmegaT em outras ferramentas de tradução</h2>
+  <p>Para processar arquivos de memórias de tradução (arquivos TMX), o OmegaT segue procedimentos extremamente precisos. Se encontrar erro em um arquivo de memória, o OmegaT simplesmente não o carregará.</p>
 
-<p>O OmegaT exporta arquivos TMX em versão 1.4 (nível 1 e nível 2). A exportação de nível 2 não é um formato nível 2 padrão, mas é suficiente para gerar correspondências corretas em outras ferramentas de tradução compatíveis com TMX Nível 2.</p>
+  <p>Algumas ferramentas são conhecidas por produzirem, em determinados casos, arquivos TMX inválidos. Se quiser usar tais arquivos como referência para traduções no OmegaT, eles devem ser corrigidos caso o OmegaT tenha se recusado a abrir tais memórias. As correções são operações triviais e o OmegaT dará indicações nas mensagens de erros relacionadas. Se não puder corrigir você mesmo o problema, solicite ajuda ao <a href="http://groups.yahoo.com/group/OmegaT/">grupo de usuários</a>.</p>
+  <hr>
+  <a name="using_OmegaT_TM" id="using_OmegaT_TM"></a>
 
-<p>Se você precisa apenas de informações de texto (e não de formatação), use o arquivo nível 1 gerado pelo OmegaT.</p>
+  <h2>Usar memórias de tradução do OmegaT em outras ferramentas de tradução</h2>
 
-<a name="Upgrading_Translation_Memories"></a>
-<h2>Utualizar memórias de tradução</h2>
+  <p>O OmegaT exporta arquivos TMX em versão 1.4 (nível 1 e nível 2). A exportação de nível 2 não é um formato nível 2 padrão, mas é suficiente para gerar correspondências corretas em outras ferramentas de tradução compatíveis com TMX Nível 2. Se você precisa apenas de informações de texto (e não de formatação), use o arquivo nível 1 gerado pelo OmegaT.</p>
+  <hr>
+  <a name="pseudo_translate" id="pseudo_translate"></a>
+  <h2>Memória pseudo-traduzida</h2>
+  <p>Pode haver casos em que você precise fazer um pré-processamento ou algum tipo de processamento que o OmegaT não oferece. Por exemplo, criar uma pseudo-tradução para fins de teste.</p>
+  <p>OmegaT permite que você crie um arquivo TMX extra que contém todos os segmentos do projeto. A tradução deste arquivo tmx pode ser</p>
+  <ul><li>tradução igual ao texto fonte (predefinido)</li>
+  <li>segmento de tradução vazio</li></ul>
+  <p>O arquivo tmx aceita qualquer nome, mas se você esquecer a extensão  '.tmx', ela será acrescentada automaticamente.</p>
+  <P>A geração é ativada no modo de console. Veja o <a href="consoleMode.html">modo console</a> para saber como fazer isso.</P>
+  <p>O arquivo tmx gerado pode ser processado com qualquer ferramenta. Para reusar o arquivo tmx no OmegaT:<br> mude o seu nome para <em>project_save.tmx</em> e coloque-o na pasta <em>omegat</em> do seu projeto.</p>
+  <hr>
 
-<p>As versões anteriores do OmegaT podiam segmentar os arquivos fonte somente em parágrafos e eram inconsistentes na numeração das tags de formatação em arquivos HTML e Open Document. O OmegaT 1.6.1 pode detectar e atualizar tais arquivos TMX para aumentar os resultados de correspondências imperfeitas para serem melhor aproveitadas -- assim você não terá que refazer tudo.</p>
+  <a name="upgrading_TM" id="upgrading_TM"></a>
+  <h2>Utualizar memórias de tradução</h2>
 
-<p>Um arquivo TMX do projeto pode ser atualizado apenas uma vez e será gravado em forma atualizada e os arquivos TMX de legado serão atualizados cada vez que o projeto for carregado. Observe que algumas modificações nos filtros de arquivos do Omega 1.6.1 podem levar à segmentação totalmente diferente e, em casos raros, é possível que você tenha que atualizar a tradução manualmente.</p>
+  <p>As versões anteriores do OmegaT podiam segmentar os arquivos fonte somente em parágrafos e eram inconsistentes na numeração das tags de formatação em arquivos HTML e Open Document. O OmegaT 2.0 pode detectar e atualizar tais arquivos TMX para aumentar os resultados de correspondências parciais para serem melhor aproveitadas -- assim você não terá que refazer tudo.</p>
 
-<hr>
-<p><a href="legalNotices.html" title="Avisos legais">Avisos legais</a></p>
+  <p>Um arquivo TMX do projeto será atualizado apenas uma vez e após atualizado, o arquivo será gravado no formato mais recente; os arquivos TMX de legado serão atualizados cada vez que o projeto for carregado. Observe que algumas modificações nos filtros de arquivos do Omega 2.0 podem levar à segmentação totalmente diferente e, em casos raros, é possível que você tenha que atualizar a tradução manualmente.</p>
+  <hr>
+  <table summary="just formatting"  style="width: 100%;" border="0" cellpadding="2" cellspacing="2">
+    <tbody>
+      <tr>
+        <td style="text-align: left;"><a href="legalNotices.html">Avisos legais</a> </td>
+        <td style="text-align: center;"><a href="index.html">Home</a>
+        </td>
+        <td style="text-align: right;"><a href="xindex.html">Índice</a> </td>
+      </tr>
+    </tbody>
+  </table>
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/docs/pt_BR/userInterface.html b/docs/pt_BR/userInterface.html
index accebe6..90f9845 100644
--- a/docs/pt_BR/userInterface.html
+++ b/docs/pt_BR/userInterface.html
@@ -1,328 +1,565 @@
 <html>
 <head>
-   <meta http-equiv="content-type" content="text/html; charset=UTF-8">
-   <title>A interface do usuário - OmegaT 1.6.1 Manual do Usuário</title>
-</head>
-<body>
-
-<h1>A interface do usuário</h1>
-
-<h2>Índice</h2>
-
-<ul type="none">
-   <li>1. <a href="#User_Interface_Items">Itens da interface do usuário</a>
-
-      <ul type="none">
-         <li>1.1. <a href="#Windows_you.27ll_use_most_of_the_time">Janelas que você usará freqüentemente</a></li>
-         <li>1.2. <a href="#Windows_you.27ll_use_sometimes">Janelas que você usará esporadicamente</a></li>
-         <li>1.3. <a href="#Dialogs_you.27ll_use_to_change_your_project_settings">Caixas de diálogo que você usará para modificar as definições do projeto</a></li>
-      </ul>
-   </li>
-
-   <li>2. <a href="#OmegaT_Main_Window">Janela principal do OmegaT</a>
-
-      <ul>
-         <li>2.1. <a href="#Editor_Pane">Painel Editor</a></li>
-         <li>2.2. <a href="#Fuzzy_Matches">Correspondências imperfeitas</a></li>
-         <li>2.3. <a href="#Glossary">Glossário</a></li>
-         <li>2.4. <a href="#Main_Menu">Menu principal</a></li>
-         <li>2.5. <a href="#Status_Bar">Barra de status</a></li>
-      </ul>
-   </li>
-
-   <li>3. <a href="#Other_Windows">Outras janelas</a>
-
-      <ul>
-         <li>3.1. <a href="#Project_Files">Arquivos do projeto</a></li>
-         <li>3.2. <a href="#Search_Window">Janela de busca</a></li>
-
-         <li>3.3. <a href="#Tag_Validation">Validação de tags</a>
-
-            <ul>
-               <li>3.3.1. <a href="#Tag_validation_window">janela Validação de tags</a></li>
-               <li>3.3.2. <a href="#Tag_errors">Erros de tags</a></li>
-               <li>3.3.3. <a href="#Hints_for_tags_management">Dicas para controle de tags</a></li>
-            </ul>
-         </li>
-
-         <li>3.4. <a href="#Help_Browser">Navegador da Ajuda</a></li>
-      </ul>
-   </li>
-
-   <li>4. <a href="#Dialogs">Caixas de diálogos</a></li>
-</ul>
-
-<a name="User_Interface_Items"></a>
-<h2>Itens da interface do usuário</h2>
-
-<p>A interface do usuário do OmegaT consiste de diversos itens. Abaixo está um resumo de todos e depois aparecem descritos em mais detalhes.</p>
+  <link type="text/css" href="./OmegaT.css" rel="stylesheet">
+  <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 
-<a name="Windows_you.27ll_use_most_of_the_time"></a>
-<h3>Janelas que você usará freqüentemente</h3>
-
-<ul>
-   <li>
-      <strong>Janela principal do OmegaT</strong>com três painéis:<ul>
-         <li><i>Editor</i> onde você digita e revisa a tradução</li>
-         <li><i>Visualizador de correspondências</i> que mostra os segmentos mais similares das memórias de tradução</li>
-         <li><i>Visualizador de glossário</i> com a tradução da terminologia</li>
-         <li>E também o <i>Menu principal</i> onde você pode acessar a maioria das funções do OmegaT</li>
-         <li>Além da <i>Barra de status</i> na parte inferior da janela para ver as mensagens relacionadas ao fluxo do trabalho</li>
-      </ul>
-   </li>
-
-   <li><strong>Janela Arquivos do projeto</strong> com a lista de seus arquivos traduzíveis</li>
-   <li><strong>Janela Busca</strong> usada para localizar segmentos específicos no projeto</li>
-</ul>
-
-<a name="Windows_you.27ll_use_sometimes"></a>
-<h3>Janelas que você usará esporadicamente</h3>
-
-<ul>
-   <li><strong>Validação de tags</strong> para detectar erros na formatação de documentos traduzidos</li>
-   <li><strong>Navegador da Ajuda</strong> para ler o manual do usuário</li>
-</ul>
-
-<a name="Dialogs_you.27ll_use_to_change_your_project_settings"></a>
-<h3>Caixas de diálogo que você usará para modificar as definições do projeto</h3>
-
-<ul>
-   <li><strong>Propriedades do projeto</strong> para modificar as pastas e idiomas do projeto</li>
-   <li><strong>Fonte</strong> para modificar a fonte que o OmegaT usa para exibir o texto fonte, a tradução, as correspondências e os termos do glossário</li>
-   <li><strong>Filtro de arquivo</strong> para ajustar a forma de processamento dos formatos de arquivos compatíveis</li>
-   <li><strong>Segmentação</strong> para modificar a segmentação do texto em sentenças</li>
-   <li><strong>Modo de trabalho</strong> para modificar as ações do OmegaT na sua interação com os segmentos</li>
-</ul>
-
-<a name="OmegaT_Main_Window"></a>
-<h2>Janela principal do OmegaT</h2>
-
-<p>A janela principal é formada por três painéis, menu principal e uma barra de status.</p>
-
-<p>As janelas podem ser posicionadas de acordo com sua preferência ou então desconectadas; basta arrastar o painel pelo nome. Dependendo do status no painel, este pode exibir 5 ícones diferentes no topo direito. Coloque o ponteiro do mouse sobre cada ícone para ver a descrição.</p>
-
-<p>
-<img src="images/Minimize.gif" alt="Minimizar" width="18" height="18">reduz o painel para mostrar somente o nome na parte inferior, perto da barra de status. <br> <i1/>faz com que o painel ocupe todo o espaço disponível na janela. <br> <i3/> coloca o painel na posição onde estava antes de ser minimizado ou maximizado. <br> <i5/> desconecta o painel da janela principal para uma janela separada. <br> <i7/> recoloca o painel dentro da janela principal.</p>
-
-<p>É possível também dispor os painéis de forma que se sobreponham. Neste caso os painéis exibirão uma guia na parte superior. Clique na guia para colocar o painel no primeiro plano. Os separadores entre os painéis podem ser arrastados para redimensionar os painéis.</p>
-
-<a name="Editor_Pane"></a>
-<h3>Painel Editor</h3>
-
-<p>Aqui você digitará e editará a tradução. O painel Editor exibe o texto do documento com a sua tradução nos segmentos já traduzidos e o texto original nos segmentos pendentes de tradução.</p>
-
-<p>O texto exibido é dividido em segmentos; você pode se movimentar pelo documento com a barra de rolagem e clicar duas vezes em qualquer segmento para abri-lo.</p>
+  <title>A interface do usuário - Manual do Usuário, OmegaT 2.0 </title>
+</head>
 
-<p>Um dos segmentos aparece aberto, ou ativo. É o único exibido em duas partes: a parte superior é o texto original, em negrito com um fundo verde; a parte inferior é o campo de edição, delimitado por dois marcadores - o da esquerda, "<segmento nnnn>" onde "nnnn" indica o número do segmento no projeto e o marcador da direita é o "<fim do segmento>". Use a parte superior como referência e digite sobre ou modifique o conteúdo do campo de edição para conter sua tradução.</p>
+<body>
+  <h2>A interface do usuário</h2>
+
+  <table summary="just formatting" border="0" cellpadding="0" cellspacing="0"
+  width="100%">
+    <tbody>
+      <tr>
+        <td>
+          <ul>
+            <li>
+              <p><a href="#item">Itens da interface do usuário</a></p>
+
+              <ul>
+                <li>
+                  <p><a href="#most">Janelas que você usará frequentemente</a></p>
+                </li>
+
+                <li>
+                  <p><a href="#some">Janelas que você usará vez ou outra</a></p>
+                </li>
+
+                <li>
+                  <p><a href="#dialogs">Caixas de diálogo que você usará para modificar as definições do projeto</a></p>
+                </li>
+              </ul>
+            </li>
+
+            <li>
+              <p><a href="#OmegaT_Main_Window">Janela principal do OmegaT</a></p>
+
+              <ul>
+                <li>
+                  <p><a href="#Editor">Painel Editor</a></p>
+                </li>
+
+                <li>
+                  <p><a href="#Match">Visualizador de correspondências</a></p>
+                </li>
+
+                <li>
+                  <p><a href="#Glossary">Glossário</a></p>
+                </li>
+
+                <li>
+                  <p><a href="#Glossary">Glossário</a></p>
+                </li>
+
+                <li>
+                  <p><a href="#Dictionaries">Dicionários</a></p>
+                </li>
+
+                <li>
+                  <p><a href="#Google_Translate">Google Tradutor</a></p>
+                </li>
+
+                <li>
+                  <p><a href="#menu">Menu principal</a></p>
+                </li>
+
+                <li>
+                  <p><a href="#bar">Barra de status</a></p>
+                </li>
+              </ul>
+            </li>
+
+            <li>
+              <p><a href="#dialogs">Caixas de diálogo que você usará para modificar as definições do projeto</a></p>
+            </li>
+          </ul>
+        </td>
+
+        <td>
+          <ul>
+            <li>
+              <p><a href="#Other_windows">Outras janelas</a></p>
+
+              <ul>
+                <li>
+                  <p><a href="#files">Arquivos do projeto</a></p>
+
+                  <ul>
+                    <li>
+                      <p><a href="#proj_files">Informações da janela 'Arquivos do projeto'</a></p>
+                    </li>
+
+                    <li>
+                      <p><a href="#unique">Segmentos únicos</a></p>
+                    </li>
+
+                    <li>
+                      <p><a href="#adding_files">Acrescentar arquivos ao projeto</a></p>
+                    </li>
+                  </ul>
+                </li>
+
+                <li>
+                  <p><a href="#search">Janela Busca</a></p>
+
+                  <ul>
+                    <li>
+                      <p><a href="#search_types">Tipos de busca</a></p>
+                    </li>
+
+                    <li>
+                      <p><a href="#wildcards_regexp">Curingas e expressões regulares</a></p>
+                    </li>
+
+                    <li>
+                      <p><a href="#search_display">Exibição dos resultados da busca</a></p>
+                    </li>
+                  </ul>
+                </li>
+
+                <li>
+                  <p><a href="#tag_validation">Verificação de tags</a></p>
+                </li>
+
+                <li>
+                  <p><a href="#manual">Navegador da Ajuda</a></p>
+                </li>
+              </ul>
+            </li>
+          </ul>
+        </td>
+      </tr>
+    </tbody>
+  </table>
+  <hr>
+
+  <h2><a name="item" id="item"></a>Itens da interface do usuário</h2>
+
+  <h3><a name="most" id="most"></a>Janelas que você usará frequentemente</h3>
+
+  <table summary="just formatting" border="0" cellpadding="0" cellspacing="0"
+  width="100%">
+    <col width="43*">
+    <col width="213*">
+
+    <tbody>
+      <tr>
+        <td width="24%">
+          <p><strong>Janela principal do OmegaT</strong></p>
+        </td>
+
+        <td width="83%">
+          <p>contém o menu principal, barra de status e três painéis:</p>
+        </td>
+      </tr>
+
+      <tr>
+        <td width="24%">
+          <p>--- painel Editor</p>
+        </td>
+
+        <td width="83%">
+          <p>onde você digita e revisa a tradução</p>
+        </td>
+      </tr>
+
+      <tr>
+        <td width="24%">
+          <p>--- painel Visualizador de correspondências</p>
+        </td>
+
+        <td width="83%">
+          <p>com os segmentos mais similares das memórias de tradução</p>
+        </td>
+      </tr>
+
+      <tr>
+        <td width="24%">
+          <p>--- painel Visualizador de glossário</p>
+        </td>
+
+        <td width="83%">
+          <p>com a tradução da terminologia</p>
+        </td>
+      </tr>
+
+      <tr>
+        <td width="24%">
+          <p><strong>Janela Arquivos do projeto</strong></p>
+        </td>
+
+        <td width="83%">
+          <dl>
+            <dd>com a lista de seus arquivos de tradução, acionada com <code>Ctrl+L</code>, fechada com <code>esc</code></dd>
+          </dl>
+        </td>
+      </tr>
+
+      <tr>
+        <td width="24%">
+          <dl>
+            <dt><strong>Janela Busca</strong></dt>
+          </dl>
+        </td>
+
+        <td width="83%">
+          <dl>
+            <dd>para buscar segmentos específicos do projeto, acionada com <code>Ctrl+F</code>, fechada com <code>esc</code></dd>
+          </dl>
+        </td>
+      </tr>
+    </tbody>
+  </table>
+
+  <h3><a name="some" id="some"></a>Janelas que você usará vez ou outra</h3>
+
+  <table summary="just formatting" border="0" cellpadding="0" cellspacing="0"
+  width="100%">
+    <col width="43*">
+    <col width="213*">
+
+    <tbody>
+      <tr>
+        <td width="23%">
+          <dl>
+            <dt><strong>Janela Verificação de tags</strong></dt>
+          </dl>
+        </td>
+
+        <td width="83%">
+          <dl>
+            <dd>para verificar se há erros de tag nas traduções, acionada com <code>Ctrl+T</code>, fechada com <code>esc</code></dd>
+          </dl>
+        </td>
+      </tr>
+
+      <tr>
+        <td width="23%">
+          <dl>
+            <dt><strong>Navegador da Ajuda</strong></dt>
+          </dl>
+        </td>
+
+        <td width="83%">
+          <dl>
+            <dd>para ler o manual do usuário, fechada com <code><b>esc</b></code></dd>
+          </dl>
+        </td>
+      </tr>
+    </tbody>
+  </table>
+
+  <h3><a name="dialogs" id="dialogs"></a>Caixas de diálogo que você usará para modificar as definições do projeto</h3>
+
+  <p>As caixas de diálogo são usadas para modificar as definições do OmegaT e do projeto. Todas elas estão descritas em seções separadas; abaixo está um resumo sobre sua utilização e como podem ser acionadas:</p>
+
+  <p><br></p>
+
+  <table summary="just formatting" border="0" cellpadding="0" cellspacing="0"
+  width="100%">
+    <col width="43*">
+    <col width="213*">
+
+    <tbody>
+      <tr>
+        <td width="17%">
+          <dl>
+            <dt><strong>Propriedades do projeto</strong></dt>
+          </dl>
+        </td>
+
+        <td width="83%">
+          <dl>
+            <dd>para modificar as pastas de projeto e línguas, acionada com <code>Ctrl+E</code> ou com <strong>Projeto → Propriedades...</strong>, fechada com <code>esc</code></dd>
+          </dl>
+        </td>
+      </tr>
+
+      <tr>
+        <td width="17%">
+          <dl>
+            <dt><strong>Fonte</strong></dt>
+          </dl>
+        </td>
+
+        <td width="83%">
+          <dl>
+            <dd>para modificar a fonte que o OmegaT usa para exibir os arquivos originais, a tradução, as correspondências e os termos do glossário, acionada com <strong>Opções → Fonte ...</strong> , fechada com <code>esc</code></dd>
+          </dl>
+        </td>
+      </tr>
+
+      <tr>
+        <td width="17%">
+          <dl>
+            <dt><strong>Filtros de arquivos</strong></dt>
+          </dl>
+        </td>
+
+        <td width="83%">
+          <dl>
+            <dd>para ajustar o processamento de formatos de arquivos compatíveis, acionada com <strong>Opções → Filtros de arquivos...</strong>, fechada com <code>esc</code></dd>
+          </dl>
+        </td>
+      </tr>
+
+      <tr>
+        <td width="17%">
+          <dl>
+            <dt><strong>Segmentação</strong></dt>
+          </dl>
+        </td>
+
+        <td width="83%">
+          <dl>
+            <dd>para modificar a forma como o texto é segmentado em sentenças, acionada com  <strong>Opções → Segmentação</strong>, fechada com <code>esc</code></dd>
+          </dl>
+        </td>
+      </tr>
+
+      <tr>
+        <td width="17%">
+          <dl>
+            <dt><strong>Modo de trabalho</strong></dt>
+          </dl>
+        </td>
+
+        <td width="83%">
+          <dl>
+            <dd>para modificar a forma de trabalhar do OmegaT na sua interação com os segmentos, acionada com <strong>Opções → Modo de trabalho...</strong>, fechada com <code>esc</code></dd>
+          </dl>
+        </td>
+      </tr>
+    </tbody>
+  </table>
+  <hr>
+  <a name="OmegaT_Main_Window" id="OmegaT_Main_Window"></a>
 
-<pre>Esta frase foi traduzida.
+  <h2>Janela principal do OmegaT</h2><img src="images/OmegaT_panes.png" name="grafika1"
+  alt="Painéis do OmegaT" id="grafika1" border="0"><br clear="left">
 
-Esta frase também foi traduzida.
+  <p><br>
+  <br></p>
 
-<strong>Cette phrase est en train d'être traduite.</strong>
-<segmento 0003>[Aqui você deve digitar: Esta frase está sendo traduzida]<fim do segmento></pre>
+  <p>A janela principal é formada por diversos painéis, o menu principal e a barra de status. Você pode mudar a posição de qualquer painel ou mesmo desencaixá-lo para uma janela separada; basta arrastar o painel pelo nome. Dependendo do status no painel, este pode exibir ícones diferentes no canto direito.</p>
 
-<p>Dependendo das definições em <a href="translationEditing.html" title="Tradução e edição">Modo de trabalho</a> o campo de edição para segmentos não traduzidos pode ficar em branco ou conter texto diferente quando você acessá-lo:</p>
+  <p><img src="images/Minimize.gif" name="graphics1" alt="Minimizar" id=
+  "graphics1" align="bottom" border="0" height="18" width="18"> reduz o painel para mostrar somente o nome na parte inferior, perto da barra de status.<br> <img src="images/Maximize.gif" name="graphics2" alt="Maximizar" id="graphics2"
+  align="bottom" border="0" height="18" width="18"> faz com que o painel ocupe todo o espaço disponível na janela.<br> <img src="images/Restore.gif" name="graphics3" alt="Restaurar" id="graphics3"
+  align="bottom" border="0" height="18" width="18"> coloca o painel na posição que estava antes de ser minimizado ou maximizado.<br> <img src="images/Undock.gif" name="graphics4" alt="Desencaixar" id="graphics4"
+  align="bottom" border="0" height="18" width="18"> desconecta o painel da janela principal para uma janela separada.<br> <img src="images/Dock.gif" name="graphics5" alt="Encaixar" id="graphics5" align=
+  "bottom" border="0" height="18" width="18"> recoloca o painel dentro da janela principal.</p>
 
-<ul>
-   <li>O texto fonte</li>
-   <li>A tradução do segmento que está na memória com maior semelhança ao que você vai traduzir</li>
-</ul>
+  <p>É possível também dispor os painéis de forma que se sobreponham. Neste caso os painéis exibirão uma guia na parte superior. Clique na guia para colocar o painel no primeiro plano. Para redimensionar os painéis, basta arrastar os separadores que ficam entre eles.</p>
 
-<p>Ao passar para um outro segmento, a tradução é validada e guardada.</p>
+  <p>Os números no canto inferior direito registram o progresso da tradução:</p>
 
-<p>Se quiser que o segmento permanece sem tradução, basta deixá-lo em branco apagando todo o texto (selecione tudo com <code>Ctrl+A</code> e apague com <code>Del</code>).</p>
+  <p><img alt="main menu counters" title="main menu counters" src=
+  "images/Main_pane_counters.png"></p>
 
-<p>Dependendo das opções defindas em <a href="translationEditing.html" title="Tradução e edição">Modo de trabalho</a>, o OmegaT pode lembrar uma tradução quando ela for idêntica ao texto original. Isto é um recurso útil em documentos que contêm marcas comerciais, nomes próprios e outros nomes ou partes em um terceiro idioma que não requerem tradução.</p>
+  <table summary="" border="0" cellpadding="2" cellspacing="2">
+    <tbody>
+      <tr>
+        <td>31/34</td>
 
-<p>Veja <a href="translationEditing.html" title="Tradução e edição">Tradução e edição</a> para obter mais detalhes.</p>
+        <td>número de segmentos - traduzido / total, para o arquivo atual</td>
+      </tr>
 
-<a name="Fuzzy_Matches"></a>
-<h3>Correspondências imperfeitas</h3>
+      <tr>
+        <td>2530/2605</td>
 
-<p>O visualizador de correspondência mostra os segmentos das <a href="translationMemories.html" title="Memórias de tradução">memórias de tradução</a> que mais se assemelham ao segmento ativo; pode ser a memória criada durante a tradução, as memórias já existentes importadas de trabalhos anteriores ou então as que o cliente enviar.</p>
+        <td>número de segmentos únicos - traduzido / total no projeto</td>
+      </tr>
 
-<p>Ao passar para o próximo segmento, a primeira correspondência imperfeita (a que tiver melhor porcentagem de semelhança) é selecionada automaticamente. Pode-se selecionar uma outra correspondência; para isso basta <a href="keyboardShortcuts.html" title="Atalhos de teclado do OmegaT">pressionar <code>Ctrl+2</code>, <code>3</code>, <code>4</code>, ou <code>5</code></a>, dependendo de quantas forem apresentadas.</p>
+      <tr>
+        <td>3196</td>
 
-<p>Para usar na sua tradução a correspondência <strong>selecionada</strong>, pressione <a href="keyboardShortcuts.html" title="Atalhos de teclado do OmegaT"><code>Ctrl+R</code></a> para substituir o campo destino com a correspondência, ou  <a href="keyboardShortcuts.html" title="Atalhos de teclado do OmegaT"><code>Ctrl+I</code></a> para inseri-la na posição onde está o cursor.</p>
+        <td>total de segmentos (incluindo repetições) no projeto</td>
+      </tr>
 
-<p>A porcentagem de correspondência é calculada aproximadamente considerando-se o número de palavras comuns nos segmentos 'casados' que é dividido pelo número de palavras no segmento mais longo dos dois.</p>
+      <tr>
+        <td>39/53</td>
 
-<p>Correspondência imperfeita selecionada</p>
+        <td>número de caracteres no segmento, texto original e na tradução </td>
+      </tr>
+    </tbody>
+  </table><br>
 
-<ul>
-   <li>Estará destacada em <strong>negrito</strong></li>
-   <li>Palavras que estão faltando no segmento a ser traduzido estarão marcadas em  <font color="blue"><strong>azul</strong></font></li>
-   <li>Essas palavras perto das azuis ou em posições que não são similares ao original estarão em <font color="green"><strong>verde</strong></font></li>
-</ul>
+  <h3><a name="Editor" id="Editor"></a>Painel Editor</h3>
 
-<p>Considere o segmento:</p>
+  <p>Aqui você digitará e editará a tradução. O painel Editor exibe o texto do documento com a sua tradução nos segmentos já traduzidos e o texto original nos segmentos pendentes de tradução. O texto exibido é dividido em segmentos; você pode se movimentar pelo documento com a barra de rolagem e clicar duas vezes em qualquer segmento para abri-lo. No caso acima, os segmentos já traduzidos estão marcados;  a configuração pode ser mudada para atender às suas preferências, por exemplo, marcação em amarelo (veja o menu  <a href="menu.html">Exibir).</a> </p>
 
-<pre>   <strong>Informações sobre Java e OmegaT</strong></pre>
+  <p>Um dos segmentos é o segmento ativo, ou aberto. É o único exibido em duas partes: a parte superior é o texto original, em negrito com um fundo verde; a parte inferior é o campo de edição, delimitado por dois marcadores - o da esquerda, <strong><code>segmento nnnn</code></strong> onde <strong><code>nnnn</code></strong> indica o número do segmento no projeto e o marcador da direita é o <strong><code>fim do segmento</code></strong>. Use a parte superior como referência e digite sobre ou modifique o conteúdo do campo de edição para conter sua tradução.</p>
 
-<p>O segmento correspondente:</p>
+  <p>Dependendo das definições em <a href="translationEditing.html">Modo de trabalho</a> o campo de edição para segmentos não traduzidos pode ficar em branco, conter o texto fonte ou a melhor correspondência parcial encontrada na memória de tradução. Ao passar para um outro segmento, a tradução é validada e guardada. Se quiser que o segmento permaneça sem tradução, basta deixá-lo em branco apagando todo o texto (selecione tudo com <code>Ctrl+A</code> e apague com <code>Del</code>). OmegaT pode lembrar uma tradução quando for idêntica ao texto original. Isto é um recurso útil em documentos que contêm marcas comerciais, nomes próprios e outros nomes ou partes em um terceiro idioma que não requerem tradução.</p>
 
-<pre>   <strong>Observações gerais sobre Java e OmegaT</strong></pre>
+  <p>Veja <a href="translationEditing.html">Tradução e edição</a> para obter mais detalhes.</p>
 
-<p>estará colorido:</p>
+  <h3><a name="Match" id="Match"></a>Visualizador de correspondências</h3>O visualizador de correspondência mostra os segmentos das <a href="translationMemories.html">memórias de tradução</a> que mais se assemelham ao segmento ativo; pode ser da memória criada durante a tradução, e das memórias já existentes importadas de trabalhos anteriores ou então as que o cliente enviar.<br>
+  <img src="images/MatchesPane.png" name="grafika2" alt="Painel Correspondências do OmegaT" id=
+  "grafika2" align="left" border="0"><br clear="left">
 
-<pre>   <strong><font color="blue">Observações gerais</font> <font color="green">sobre</font> Java e OmegaT</strong></pre>
+  <p><br></p>
 
-<p>e a porcentagem deve ser cerca de 3/5=<strong>60%</strong>
-</p>
+  <p>Ao passar para o próximo segmento, a primeira correspondência parcial (a que tiver melhor porcentagem de semelhança) é selecionada automaticamente. A correspondência parcial selecionada será destacada em <strong>negrito</strong>, as palavras que não constam no segmento a ser traduzido aparecerão em <strong><font color=
+  "#0000FF">azul</font></strong> e a palavra adjacente às partes que faltam estarão marcadas em  <font color="#00FF00"><b>verde</b></font>. O usuário pode <a href=
+  "menu.html#shortcuts">selecionar</a> uma outra correspondência pressionando <code>Ctrl+2</code>, <code>3</code>, <code>4</code>, ou <code>5.</code> Claro que se não houver apenas quatro correspondências, não adianta pressionar <code>Ctrl+5</code>. Para usar na sua tradução a correspondência <strong>selecionada</strong>, pressione <code><a href="menu.html#shortcuts">Ctrl+R</a></code> para substituir o campo destino com a correspondência, ou  <code><a href=
+  "menu.html#shortcuts">Ctrl+I</a></code> para inseri-la no campo destino na posição onde está o cursor.</p>
 
-<a name="Glossary"></a>
-<h3>Glossário</h3>
+  <p>A porcentagem de correspondência - ou seja, a diferença entre o segmento original e as possíveis correspondências - é mais ou menos equivalente ao número de palavras comuns no segmento 'correspondente' dividido pelo número de palavras no segmento mais longo dos dois. Se usar o plug-in tokenizer (enumeração), as palavras em dois segmentos serão primeiro reduzidas às suas raizes. Alternativamente, as palavras não são reduzidas e apenas a interpontuação, números e tags serão ignorados. Por fim, as diferenças nas tags, números e interpontuação - que foram ignoradas nos dois primeiros casos - podem ser incluídas no cálculo. O visualizador de correspondência pode mostrar as três métricas, conforme segue:</p>        <<span style=
+  "font-style: italic;">% de correspondência, quando o plugin tokenizer é usado / % para a correspondência predefinida do OmegaT / % de correspondência com tags, números, pontuação incluídos</span>> 
 
-<p>O painel Glossário apresenta a tradução da terminologia carregada dos <a href="glossaries.html" title="Glossários">arquivos de glossários</a>. Ele mostra a tradução dos termos encontrados no segmento aberto, mas somente para fins de referência e não permite nenhuma inserção ou substituição na sua tradução. O OmegaT também suporta termos compostos de diversas palavras, mas em uma forma muito básica: se duas palavras de um termo são encontradas no segmento aberto, o termo é exibido.</p>
+  <p>No exemplo acima, as primeiras duas métricas (46/46) são iguais, pois o tokenizer não foi usado. A terceira porcentagem (39) é menor porque foram usadas as diferenças na interpontuação e tags.</p>
 
-<p>O formato para a terminologia no painel Glossário é</p>
+  <p>Se não houver nenhum nome de arquivo exibido, a fonte é a memória de tradução predefinida do projeto. Os segmentos órfãos (a correspondência no. 1) indicam os segmentos na memória de tradução predefinida do projeto que não possuem correspondentes nos arquivos originais. No caso acima, a frase original, já traduzida no OmegaT, foi editada.<br></p>
 
-<pre>
-   'termo fonte' = 'tradução do termo'
-   Comentário geral sobre o termo, se houver
-</pre>
+  <h3><a name="Glossary" id="Glossary"></a>Glossário</h3>
 
-<a name="Main_Menu"></a>
-<h3>Menu principal</h3>
+  <p>No painel 'Glossário' você pode acessar sua coleção particular de expressões e terminologia especializada, acumulada nos seus <a href=
+  "glossaries.html">arquivos de glossários</a>. Ele mostra a tradução dos termos encontrados no segmento aberto, mas somente para fins de referência e não permite nenhuma inserção ou substituição na sua tradução.</p><img src=
+  "images/Glossary_pane.png" name="grafika3" alt="Painel de glossário do OmegaT" id=
+  "grafika3" align="left" border="0"><br clear="left">
 
-<p>Obviamente você pode usar o menu principal para acessar todas as funções do OmegaT. As funções mais usadas podem ser acessadas através de <a href="keyboardShortcuts.html" title="Atalhos de teclado do OmegaT">atalhos de teclado</a>, assim quando você estiver acostumado com eles, não precisará mais navegar até os menus durante a tradução.</p>
+  <p><br></p>
 
-<p>Veja o anexo <a href="menu.html" title="Menu principal">Menu principal</a> para obter uma descrição completa de todos os menus e seus itens.</p>
+  <p>O segmento fonte no exemplo acima era “<i>In most translation jobs it is considered important to have the translated document look similar to the original.</i>”, e duas palavras - 'document' e 'translation' - foram encontradas no arquivo de glossário. O OmegaT também suporta termos compostos de diversas palavras, mas em uma forma muito básica: se duas palavras de um termo são encontradas no segmento aberto, o termo será exibido.</p><br>
 
-<a name="Status_Bar"></a>
-<h3>Barra de status</h3>
+  <h3><a name="Dictionaries" id="Dictionaries"></a>Dicionários</h3>
 
-<p>A barra de status mostra, na parte inferior da janela principal, as mensagens relacionadas ao fluxo de trabalho. Esta barra mostra mensagens de feedback ao usuário sobre operações específicas que estão em andamento. Também mostra o número de correspondências imperfeitas da memória e equivalentes no glossário para o segmento aberto.</p>
+  <p><a href="dictionaries.html">Dicionários</a> são a versão eletrônica das versões impressas do MerriamWebsters, Duden, Larousse etc., que você tem na sua escrivaninha.</p><br>
 
-<a name="Other_Windows"></a>
-<h2>Outras janelas</h2>
+  <h3><a name="Google_Translate" id="Google_Translate"></a>Google Tradutor</h3>
 
-<a name="Project_Files"></a>
-<h3>Arquivos do projeto</h3>
+  <p>Se o Google Tradutor estiver ativado no Menu → Opções, o painel <a href=
+  "GoogleTranslate.html">Google Tradutor</a> fornecerá sugestões para a tradução do segmento atual, que pode ser inserida no segmento a ser traduzido.</p><br>
 
-<p>A janela 'Arquivos do projeto' relaciona os arquivos do projeto e exibe outras informações a ele relacionadas. É exibida automaticamente quando OmegaT carrega um projeto. Quando o projeto é aberto, pode-se usar o <a href="keyboardShortcuts.html" title="Atalhos de teclado do OmegaT">atalho <code>Ctrl+L</code></a> na janela principal para abrir e fechar esta janela.</p>
+  <h3><a name="menu" id="menu"></a>Menu principal</h3>
 
-<p>A janela 'Arquivos do projeto' apresenta:</p>
+  <p>Obviamente você pode usar o menu principal para acessar todas as funções do OmegaT. Veja o anexo <a href="menu.html#menu">Menu principal</a> para obter uma descrição completa de todos os menus e seus itens. As funções mais usadas podem ser acessadas através de <a href="menu.html#shortcuts">atalhos de teclado</a>, assim quando você estiver acostumado com eles, não precisará mais navegar até os menus durante a tradução.</p>
 
-<ul>
-   <li>Lista de todos os arquivos traduzíveis (acessíveis com um clique no link) que compõem o projeto. Esses arquivos estão na pasta Source que o <a href="fileFormats.html" title="Formatos de arquivos compatíveis">OmegaT pode processar</a>. Clique no nome de qualquer arquivo que quer traduzir e ele será exibido na janela Editor.</li>
-   <li>O número de segmentos em cada arquivo é exibido próximo ao seu nome.</li>
-   <li>Número de segmentos únicos (diferentes) em todo o projeto.</li>
-   <li>Número de segmentos únicos que você já traduziu. É atualizado sempre após a tradução de um segmento.</li>
-</ul>
+  <h3><a name="bar" id="bar"></a>Barra de status</h3>
 
-<p>O conjunto de segmentos <strong>Únicos</strong> é computado considerando-se todos os segmentos, deduzindo todos os segmentos duplicados que são semelhantes até nas letras maiúsculas e minúsculas ("Rodar" e "rodar" são consideradas diferentes).</p>
+  <p>A barra de status mostra, na parte inferior da janela principal, as mensagens relacionadas ao fluxo de trabalho. Esta barra mostra mensagens de feedback ao usuário sobre operações específicas que estão em andamento. Também mostra o número de correspondências parciais da memória e equivalentes no glossário para o segmento aberto.</p>
+  <hr>
 
-<p>A diferença entre "Números de segmentos" e "Número de segmentos únicos" dá uma idéia aproximada das repetições de segmentos no texto. Esses números não dão uma indicação clara da importância das repetições: segmentos podem ser longas frases repetidas diversas vezes (muita sorte!) ou simplismente palavras-chaves preenchendo uma tabela (que azar....)</p>
+  <h2><a name="other_windows" id="other_windows"></a>Outras janelas</h2>
 
-<p>É possível modificar o número de segmentos/segmentos únicos com a modificação das regras de segmentação. Tais modificações "nunca" devem ser executadas após o início da tradução do projeto. Veja as <a href="segmentation.html" title="Segmentação do texto fonte">regras de segmentação</a> para obter mais informações.</p>
+  <h3><a name="files" id="files"></a>Arquivos do projeto</h3>
 
-<p>Para acrescentar arquivos fonte ao projeto, basta clicar no botão "Importar arquivos fonte...". Ele copia os arquivos selecionados para o diretório <code>/source</code> e recarrega o projeto com os novos arquivos.</p>
+  <p>A janela 'Arquivos do projeto' relaciona os arquivos do projeto e exibe outras informações a ele relacionadas. Ela é exibida automaticamente quando o OmegaT carrega um projeto. Para fechá-la use <code>esc</code>, e para abri-la ou acioná-la para o primeiro plano use <code>Ctrl+L</code>.</p>
 
-<a name="Search_Window"></a>
-<h3>Janela de busca</h3>
+  <h3><a name="proj_files" id="proj_files"></a>Informações da janela 'Arquivos do projeto'</h3>
 
-<p>A janela de busca é usada para localizar segmentos específicos no projeto. Podem existir diversas janelas de busca abertas simultaneamente. Para abrir uma nova, use <a href="keyboardShortcuts.html" title="Atalhos de teclado do OmegaT"><code>Ctrl+F</code></a> na janela principal.</p>
+  <p>Esta janela exibe as seguintes informações:</p>
 
-<p>A janela de busca apresenta:</p>
+  <ul>
+    <li>
+      <p>a lista de todos os arquivos de tradução no projeto. Esses arquivos que o <a href=
+      "filesToTranslate.html">OmegaT pode processar</a> estão na pasta 'source'. Clique em qualquer arquivo para abri-lo para tradução.</p>
+    </li>
 
-<ul>
-   <li>Campo de busca para entrada da palavra-chave ou da string de busca</li>
-   <li>Algumas opções para modificar os critérios de busca</li>
-   <li>Espaço para exibição dos resultados, acessíveis com um clique</li>
-</ul>
+    <li>
+      <p>o arquivo atualmente disponível no painel Editor é destacado com um fundo azul</p>
+    </li>
 
-<p>Após digitar a palavra ou string e clicar no botão Buscar, o campo de busca exibirá todos os segmentos correspondentes que encontrar no projeto. Visto que o OmegaT considera todos os segmentos iguais como uma única entidade  -- se você modificar um deles, todos os segmentos iguais serão atualizados, embora apenas o primeiro segmento único seja exibido.</p>
+    <li>
+      <p>o número de segmentos em cada arquivo é exibido próximo ao nome do arquivo.</p>
+    </li>
 
-<p>Os segmentos são exibidos na seqüência em que aparecem no projeto. Os segmentos traduzidos serão exibidos na parte superior com o texto original e a tradução na parte inferior; os segmentos não traduzidos aparecerão apenas com o texto original.</p>
+    <li>
+      <p>o número de segmentos únicos (diferentes) em todo o projeto.</p>
+    </li>
 
-<p>Se a string for encontrada em um dos arquivos do projeto, basta clicar nela para abri-la no Editor e fazer as modificações necessárias. Depois, é só voltar à janela de busca e ir ao próximo segmento, repetindo o processo. Este recurso é útil para atualizações de terminologia em todo o projeto.</p>
+    <li>
+      <p>o número de segmentos únicos que você já traduziu. É atualizado sempre após a tradução de um segmento.</p>
+    </li>
+  </ul>
 
-<p>Existem dois tipos de busca disponíveis:</p>
+  <h3><a name="unique" id="unique"></a>Segmentos únicos</h3>
 
-<ul>
-   <li>A busca exata procura pela seqüência de palavras (string) consultadas dentro do projeto atual ou em qualquer diretório ou árvore de diretórios. A busca exata aceita os curingas * e ?. O caractere '<strong>*'</strong> corresponde a zero ou mais caracteres (por exemplo, a busca por '<strong>corre*'</strong> encontraria '<strong>corre'</strong>, '<strong>correm'</strong> e '<strong>correndo'</strong>). O caractere '<strong>?'</strong> corresponde exatamente a um carectere ('<strong>corre?'</strong> encontraria '<strong>correm'</strong> e '<strong>correr'</strong>, por exemplo, mas não  '<strong>corre'</strong> ou '<strong>correndo'</strong>). Esta operação faz a busca nos dois idiomas: fonte e destino.</li>
+  <p>O conjunto de segmentos <strong>únicos</strong> é computado considerando-se todos os segmentos, deduzindo todos os segmentos duplicados que são semelhantes até nas letras maiúsculas e minúsculas ("Rodar" e "rodar" são consideradas diferentes).</p>
 
-   <li>As buscas de palavra-chave examina o projeto atual e retorna todos os segmentos que contêm todas as palavras consultadas, em qualquer ordem.</li>
-</ul>
+  <p>A diferença entre "Números de segmentos" e "Número de segmentos únicos" dá uma idéia aproximada das repetições de segmentos no texto. Note que esses números não dão uma indicação clara da importância das repetições: segmentos podem ser longas frases repetidas diversas vezes (muita sorte!) ou simplesmente palavras-chaves preenchendo uma tabela (que azar....) O <code>project_stats.txt</code> localizado na pasta <code>/omegat</code> do projeto contém mais informações detalhadas sobre o segmento do arquivo.</p>
 
-<p>A busca também pode ser feita em qualquer diretório, mas considere que o OmegaT só pode fazer pesquisas em <a href="fileFormats.html" title="Formatos de arquivos compatíveis">arquivos compatíveis</a>.</p>
+  <p>É possível modificar o número de segmentos/segmentos únicos modificando as regras de segmentação. No entanto, tais modificações devem ser evitadas a todo custo, uma vez que você já começou a traduzir o projeto. Veja as <a href=
+  "segmentation.html">regras de segmentação</a> para obter mais informações.</p>
 
-<a name="Tag_Validation"></a>
-<h3>Validação de tags</h3>
+  <h3><a name="adding_files" id="adding_files"></a>Acrescentar arquivos ao projeto</h3>
 
-<a name="Tag_validation_window"></a>
-<h4>Janela Validação de tags</h4>
+  <p>Para acrescentar arquivos fonte ao projeto, basta clicar no botão "Importar arquivos fonte...". Ele copia os arquivos selecionados para a pasta <code>/source</code> e recarrega o projeto com os novos arquivos. Para acrescentar arquivos de páginas de Internet ao projeto, gravados no MediaWiki, basta clicar no botão "Importar do MediaWiki" e fornecer o URL correspondente.</p>
 
-<p>A janela de validação de tags é usada para detectar problemas na formatação dos documentos traduzidos. Para abrir a janela, use <a href="keyboardShortcuts.html" title="Atalhos de teclado do OmegaT"><code>Ctrl+T</code></a>.</p>
+  <h3><a name="search" id="search"></a>Janela Busca</h3>
 
-<p>A janela abre uma tabela de três colunas com:</p>
+  <p>A janela de busca é usada para localizar segmentos específicos no projeto. Podem existir diversas janelas de busca abertas simultaneamente. Para abrir uma nova, use <code><a href="menu.html#shortcuts">Ctrl+F</a></code> na janela principal. A janela de busca consiste de um campo de texto para sequência de pesquisa ou palavras-chave, bandeiras e opções para a criação da pesquisa e uma área de exibição contendo os resultados da busca.</p>
 
-<ul>
-   <li>Um link para o segmento com um provável erro de tag</li>
-   <li>Conteúdo do segmento original</li>
-   <li>Conteúdo do segmento traduzido</li>
-</ul>
+  <h3><a name="search_types" id="search_types"></a>Tipos de busca</h3>
 
-<p>Clique no link para trazer o segmento no Editor.</p>
+  <dl>
+    <dt>Existem dois <a href="searches.html#searchmethods">tipos</a> de busca disponíveis:</dt>
 
-<a name="Tag_errors"></a>
-<h4>Erros de tags</h4>
+    <dt><strong>buscas exatas -</strong> procuram pela sequência de palavras (string) no projeto atual ou em qualquer pasta ou árvore de pasta.</dt>
 
-<p>Aqui estão alguns erros prováveis com tags:</p>
+    <dt><strong>buscas de palavras-chave -</strong> examinam o projeto atual e retornam todos os segmentos contendo todas as palavras consultadas, em qualquer ordem.</dt>
+  </dl>
 
-<ul>
-   <li>Uma tag estava no segmento fonte mas foi apagada no segmento traduzido.</li>
-   <li>Uma tag não estava no segmento fonte mas foi inserida por engano na tradução.</li>
-   <li>A seqüência das tags foi modificada no segmento traduzido.</li>
-</ul>
+  <p>As buscas são feitas nos segmentos fonte e na tradução. A busca também pode ser feita em qualquer pasta, mas considere que o OmegaT só pode fazer pesquisas em <a href=
+  "filesToTranslate.html">arquivos compatíveis</a>.</p>
 
-<a name="Hints_for_tags_management"></a>
-<h4>Dicas para controle de tags</h4>
+  <h3><a name="wildcards_regexp" id="wildcards_regexp"></a>Curingas e expressões regulares</h3>
 
-<p>As tags geralmente representam algum tipo de formatação no texto original. <strong>Simplificar a formatação do texto original </strong> ajuda bastante na redução do número de tags. Se possível, considere unificar as fontes usadas, os tamanhos e cores, etc. para simplificar a tradução e reduzir o número de possíveis erros de tags.</p>
+  <p>As buscas podem usar <a href="searches.html#usingwildcards">caracteres curingas</a> * e ? bem como <a href=
+  "searches.html#usingregularexpressions">expressões regulares</a>.</p>
 
-<p>Dê uma olhada na seção <a href="formattedText.html#Tag_operations" title="Trabalhar com texto formatado">Trabalhar com tags</a> para ver o que pode ser feito com tags.</p>
+  <h3><a name="search_display" id="search_display"></a>Exibição dos resultados da busca</h3>
 
-<p>Lembre-se de que se as tags dificultarem seu trabalho e a formatação não for extremamente importante para o trabalho a ser traduzido, remover a formatação do documento fonte facilitará bastante a tradução.</p>
+  <p>Após digitar a palavra ou string clique no botão Buscar; o campo de busca mostrará todos os segmentos correspondentes que encontrar no projeto.</p>
 
-<p>Se precisar ver as tags no OmegaT, mas não precisar reter a maioria do formato no documento traduzido, você pode optar por não acrescentar as tags na tradução. Neste caso, <strong>preste bastante atenção aos pares de tags</strong>. Se sobrar uma tag do par que foi apagado, ela corromperá a formatação do documento e invalidará o documento OpenOffice.org traduzido ou não lerá um arquivo HTML traduzido.</p>
+  <p>Visto que o OmegaT processa todos os segmentos iguais como uma única entidade, apenas o primeiro segmento único é exibido. Marque a opção 'Exibir todos os resultados' para mostrar todas as instâncias de segmentos idênticos. Os segmentos serão exibidos na sequência em que aparecem no projeto. Os segmentos traduzidos serão exibidos na parte superior com o texto original e a tradução na parte inferior; os segmentos não traduzidos aparecerão apenas com o texto original.</p>
 
-<p>Já que há tags inseridas no próprio documento, é possível usar as <a href="segmentation.html" title="Segmentação do texto fonte">regras de segmentação</a> para criar segmentos que incluam menos tags. Esta é uma função avançada e não deve ser usada por usuários iniciantes.</p>
+  <p>Clique em um segmento se precisar abri-lo no Editor para modificações. Depois, é só voltar à janela de busca e ir ao próximo segmento, repetindo o processo. Este recurso é útil para atualizações de terminologia em todo o projeto.</p>
 
-<a name="Help_Browser"></a>
-<h3>Navegador da Ajuda</h3>
+  <h3><a name="tag_validation" id="tag_validation"></a>Verificação de tags</h3>
 
-<p>O navegador da Ajuda (que exibe este manual) pode ser ativado pressionando a tecla <a href="keyboardShortcuts.html" title="Atalhos de teclado do OmegaT">F1</a> ou com um clique em <strong>Ajuda -> Manual do Usuário...</strong> no <a href="menu.html" title="Menu principal">menu principal</a>.</p>
+  <p>A janela de verificação de tags detecta e relaciona problemas de tag na tradução. Para abrir a janela, use <code><a href=
+  "menu.html#shortcuts">Ctrl+T</a></code>. A janela abre uma tabela de três colunas com um link para o segmento e seu conteúdo original e tradução:</p>
 
-<p>Na janela aparecerá o manual e dois botões: <strong>Voltar</strong> e <strong>Conteúdo</strong>.</p>
+  <p><img src="images/TagValidator.png" name="grafika4" alt=
+  "Verificador de tags do OmegaT" id="grafika4" align="left" border="0"><br clear=
+  "left">
+  <br>
+  <br></p>
 
-<p>O manual do usuário é um documento HTML com links para os diversos capítulos. Clique em um link, como faria em um navegador da Internet, para acessar a página desejada.</p>
+  <p>As tags estão destacadas em azul escuro para facilitar a comparação entre o original e o conteúdo traduzido. Clique no link para abrir o segmento no Editor. Corrija o erro, se necessário, e pressione <code><a href="menu.html#shortcuts">Ctrl+T</a></code> para voltar à janela de verificação de tags para ver se há outros erros. No primeiro e terceiro caso acima, as tags estão agrupadas incorretamente, e no segundo caso, na tag inicial o sinal < está faltando.</p>
 
-<p>O manual do usuário está localizado na subpasta <code>doc</code> na pasta de instalação do OmegaT, portanto, se quiser ver a documentação em português, clique no arquivo <code>doc/por/index.hmtl</code> no navegador. Dessa forma você poderá seguir os links externos também, pois o navegador da ajuda incluído aqui não aceita links externos da Internet.</p>
+  <p>Os erros de <a href="formattedText.html#intro">tag</a> ocorrem na <a href=
+  "formattedText.html#tag_operation">manipulação de tags</a> na tradução que acabam não refletindo o número e sequência do segmento original. Algumas manipulações de tags são necessárias e não causam erros; algumas causarão problemas quando for criado o documento traduzido. As tags geralmente representam algum tipo de formatação no texto original. <strong>Simplificar a formatação do texto original</strong> reduz bastante a quantidade de tags.</p>
 
-<a name="Dialogs"></a>
-<h2>Caixas de diálogos</h2>
+  <h3>Navegador da Ajuda</h3>
 
-<p>As caixas de diálogo são usadas para modificar as definições do projeto. Todas elas estão descritas em seções separadas; abaixo está um resumo sobre sua utilização e como podem ser acionadas.</p>
+  <p>O navegador da Ajuda (que exibe este manual) pode ser ativado pressionando a tecla <a href="menu.html#shortcuts">F1</a> ou com um clique em <strong>Ajuda -> Manual do Usuário...</strong> no <a href="menu.html">menu principal</a>.</p>
 
-<ul>
-   <li>
-      <a href="projectProperties.html" title="Propriedades do projeto">Propriedades do projeto</a> é usada para modificar as pastas e idiomas do projeto. Para abri-la, pressione <a href="keyboardShortcuts.html" title="Atalhos de teclado do OmegaT"><code>Ctrl+E</code></a> ou clique em <strong>Projeto -> Propriedades...</strong> no <a href="menu.html" title="Menu principal">menu principal</a>.</li>
+  <h3><a name="manual" id="manual"></a>Como usar o Navegador da Ajuda</h3>
 
-   <li>
-      <a href="fontSettings.html" title="Definições de fontes">Definições de fontes</a> serve para modificar a fonte que o OmegaT usa para exibir o texto fonte, a tradução, as correspondências e os termos do glossário. Para abri-la, acesse <strong>Opções -> Fonte...</strong> no <a href="menu.html" title="Menu principal">menu principal</a>.</li>
+  <p>Na janela aparecerá o manual e dois botões: <strong>Voltar</strong> e <strong>Conteúdo</strong>. O manual do usuário é um documento HTML com links para os diversos capítulos. Clique em um link, como faria em um navegador da Internet, para acessar a página desejada.</p>
 
-   <li>Use <a href="fileFilters.html" title="Filtros de arquivos">Opções de Filtros de arquivos</a> para modificar os arquivos que devem ser processados por cada um dos <a href="fileFormts.html" title="Formatos de arquivos compatíveis">filtros disponíveis</a>.</li>
+  <h3>Navegação off-line do Manual do Usuário</h3>
 
-   <li>A caixa de diálogo <a href="segmentation.html" title="Segmentação do texto fonte">Definição de segmentação</a> possibilita-lhe modificar a forma que o texto é segmentado em sentenças. Observe que a segmentação de sentença é ativada/desativada na caixa de diálogo <a href="projectProperties.html" title="Propriedades do projeto">Propriedades do projeto</a>.</li>
+  <p>O manual do usuário está localizado na subpasta <code>docs</code> na pasta de instalação do OmegaT, portanto, se quiser ver a documentação em português, clique no arquivo <code>doc/pt_BR/index.hmtl</code> no navegador. Dessa forma você poderá seguir os links externos também, pois o navegador da ajuda incluído aqui não aceita links externos da Internet.</p>
+  <hr>
 
-   <li>A caixa de diálogo <a href="translationEditing.html" title="Tradução e edição">Modo de trabalho</a> modifica as ações do OmegaT na sua interação com os segmentos.</li>
-</ul>
+  <table summary="just formatting" style="width: 100%;" border="0" cellpadding=
+  "2" cellspacing="2">
+    <tbody>
+      <tr>
+        <td style="text-align: left;"><a href="legalNotices.html">Avisos legais</a></td>
 
-<hr>
-<p><a href="legalNotices.html" title="Avisos legais">Avisos legais</a></p>
+        <td style="text-align: center;"><a href="index.html">Home</a></td>
 
+        <td style="text-align: right;"><a href="xindex.html">Índice</a></td>
+      </tr>
+    </tbody>
+  </table>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/docs/pt_BR/website.html b/docs/pt_BR/website.html
index fef32e3..88e437d 100644
--- a/docs/pt_BR/website.html
+++ b/docs/pt_BR/website.html
@@ -1,49 +1,65 @@
 <html>
 <head>
-   <meta http-equiv="content-type" content="text/html; charset=UTF-8">
-   <title>O projeto OmegaT na Web, relato de erros e contribuição -  OmegaT 1.6.1 Manual do Usuário</title>
+  <link rel="stylesheet" href="./OmegaT.css" type="text/css">
+  <meta http-equiv="content-type" content="text/html; charset=UTF-8">
+  <meta http-equiv="content-language" content="en">
+  <title>O projeto OmegaT na Web, relato de erros e contribuição -  Manual do Usuário, OmegaT 2.0 </title>
 </head>
-<body>
-
-<h1>O projeto OmegaT na Web, relato de erros e contribuição</h1>
 
-<a name="Additional_Information_about_OmegaT"></a>
-<h2>Informações adicionais sobre o OmegaT</h2>
-
-<p>O <a href="http://www.omegat.org/omegat/omegat.html">site do OmegaT</a> contém links para vários recursos do OmegaT, portanto é interessante começar por ele.</p>
+<body>
+  <h2>OmegaT na Web</h2>
 
-<p>O suporte aos usuários é fornecido no <a href="http://groups.yahoo.com/group/OmegaT/">OmegaT Yahoo User Group</a>. Os arquivos podem ser pesquisados sem ser preciso fazer a inscrição no grupo.</p>
+  <h3>Sites do OmegaT e o projeto OmegaT SourceForge</h3>
 
-<p>Novas versões do OmegaT podem ser baixadas do <a href="http://sourceforge.net/projects/omegat/">OmegaT SourceForge.net Project</a>, onde o usuário pode enviar <a href="http://sourceforge.net/tracker/?group_id=68187&atid=520347">relatórios de bug</a> e <a href="http://sourceforge.net/tracker/?group_id=68187&atid=520350">pedidos para melhorias</a>.</p>
+  <p>O <a href="http://www.omegat.org/">site do OmegaT</a> contém links para vários recursos do OmegaT, portanto é interessante começar por ele. O suporte aos usuários é fornecido por voluntários no <a href=
+  "http://groups.yahoo.com/group/OmegaT/">Grupo de Usuários do OmegaT no Yahoo</a>. A seção de  <a href=
+  "http://tech.groups.yahoo.com/group/OmegaT/database?method=reportRows&tbl=1">perguntas frequentes</a> pode ser um bom lugar para esclarecer suas perguntas. O OmegaT também possui um canal IRC (Internet Relay Chat) no freenode: # omegat. Novas versões do OmegaT estão disponíveis para download no <a href=
+  "http://sourceforge.net/projects/omegat/">OmegaT SourceForge.net Project</a>, onde o usuário pode enviar <a href=
+  "http://sourceforge.net/tracker/?group_id=68187&atid=520347">relatórios de bug</a> e <a href=
+  "http://sourceforge.net/tracker/?group_id=68187&atid=520350">pedidos para melhorias</a>.</p>
 
-<p>Lembre-se porém que um bom relatório de bugs deve conter exatamente três coisas:</p>
+  <h3>Relatórios de erros</h3>
 
-<ul>
-   <li>Passos para reproduzir</li>
-   <li>O que você esperava ver</li>
-   <li>O que viu em vez disso.</li>
-</ul>
+  <p>Lembre-se porém que um bom relatório de bugs deve conter três coisas:</p>
 
-<p>Mais detalhes no artigo <a href="http://www.joelonsoftware.com/articles/fog0000000029.html">Painless Bug Tracking</a> de Joel Spolsky</p>
+  <ul>
+    <li>Passos para reproduzir</li>
 
-<p>Você deve acrescentar cópias de arquivos, partes do arquivo de registro, capturas de tela, qualquer coisa que achar que possa ajudar os desenvolvedores a localizar e consertar o problema. Observe que os relatórios de bugs e pedidos de melhorias estão disponíveis para o público, portanto não anexe documentos com dados confidenciais.</p>
+    <li>O que você esperava ver</li>
 
-<p>Se quiser acompanhar o andamento do seu relatório, registre-se como usuário no site da SourceForge, faça o login e envie o relatório de bug enquanto estiver conectado ao site; ou então, basta clicar Monitor no topo do relatório.</p>
+    <li>O que viu em vez disso.</li>
+  </ul>
 
-<a name="Contributing_to_OmegaT_Project"></a>
-<h2>Contribuição para o Projeto OmegaT</h2>
+  <p>Mais detalhes no artigo <a href=
+  "http://www.joelonsoftware.com/articles/fog0000000029.html">Painless Bug Tracking </a>de Joel Spolsky</p>
 
-<p>Para contribuir para o OmegaT, primeiro faça seu registro no <a href="http://groups.yahoo.com/group/OmegaT/">grupo de usuários</a> (via web ou envie um e-mail para <a href="mailto:OmegaT-subscribe at yahoogroups.com">OmegaT-subscribe at yahoogroups.com</a>).</p>
+  <p>Acrescente cópias de arquivos, partes do arquivo de registro (veja <em>Arquivos e diretórios do OmegaT > Arquivos do usuário</em>), capturas de tela, qualquer coisa que achar que possa ajudar os desenvolvedores a localizar e consertar o problema. Observe que os relatórios de bugs e pedidos de melhorias estão disponíveis para o público, portanto não anexe documentos com dados confidenciais. Se quiser acompanhar o andamento do seu relatório, registre-se como usuário no site da SourceForge, faça o login e envie o relatório de bug enquanto estiver conectado ao site; ou então, basta clicar Monitor no topo do relatório.</p>
 
-<p>Para contribuir com o desenvolvimento do OmegaT, inscreva-se no <a href="https://lists.sourceforge.net/lists/listinfo/omegat-development">grupo de desenvolvedores</a> (via web ou envie um e-mail para <a href="mailto:omegat-development-request at lists.sourceforge.net?subject=subscribe"
->omegat-development-request at lists.sourceforge.net</a> e coloque na linha de assunto "subscribe").</p>
+  <h3>Contribuição para o Projeto OmegaT</h3>
 
-<p>Para traduzir a interface de usuário do OmegaT, o manual do usuário ou outros documentos relacionados, primeira leia o guia  <a href="http://www.omegat.org/omegat/translation-info.html">Localizing and customizing OmegaT</a> e inscreva-se no <a href="https://lists.sourceforge.net/lists/listinfo/omegat-l10n">grupo de tradutores do OmegaT</a> (via web ou envie e-mail para <a href="mailto:omegat-development-request at lists.sourceforge.net?subject=subscribe"> omegat-development-request at lists.sourceforge.net</a> e coloque na linha de assunto "subscribe").</p>
+  <p>Para contribuir para o OmegaT, primeiro faça seu registro no <a href=
+  "http://groups.yahoo.com/group/OmegaT/">grupo de usuários</a> (via web ou envie um e-mail para <a href=
+  "mailto:OmegaT-subscribe at yahoogroups.com">OmegaT-subscribe at yahoogroups.com</a>). Para contribuir com o desenvolvimento do OmegaT, inscreva-se no <a href=
+  "https://lists.sourceforge.net/lists/listinfo/omegat-development">grupo de desenvolvedores</a> (via web ou envie um e-mail para <a href=
+  "mailto:omegat-development-request at lists.sourceforge.net?subject=subscribe">omegat-development-request at lists.sourceforge.net</a> e coloque na linha de assunto "subscribe").</p>
 
-<p>E fique por dentro do que acontece no mundo do OmegaT...</p>
+  <p>Para traduzir a interface de usuário do OmegaT, o manual do usuário ou outros documentos relacionados, primeira leia o guia  <a href=
+  "http://www.omegat.org/en/howtos/localizing_omegat.html">Localizing and customizing OmegaT</a> e inscreva-se no <a href=
+  "https://lists.sourceforge.net/lists/listinfo/omegat-l10n">grupo de tradutores do OmegaT</a> (via web ou envie e-mail para <a href=
+  "mailto:omegat-development-request at lists.sourceforge.net?subject=subscribe">omegat-development-request at lists.sourceforge.net</a> e coloque na linha de assunto "subscribe").</p>
 
-<hr>
-<p><a href="legalNotices.html" title="Avisos legais">Avisos legais</a></p>
+  <p>E fique por dentro do que acontece no mundo do OmegaT...</p>
+  <hr>
+  <table summary="just formatting"  style="width: 100%;" border="0" cellpadding="2" cellspacing="2">
+    <tbody>
+      <tr>
+        <td style="text-align: left;"><a href="legalNotices.html">Avisos legais</a> </td>
+        <td style="text-align: center;"><a href="index.html">Home</a>
+        </td>
+        <td style="text-align: right;"><a href="xindex.html">Índice</a> </td>
+      </tr>
+    </tbody>
+  </table>
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/manifest-template.mf b/manifest-template.mf
index 6d66be7..8a19aa0 100644
--- a/manifest-template.mf
+++ b/manifest-template.mf
@@ -78,6 +78,12 @@ OmegaT-Plugin: filter
 Name: org.omegat.filters3.xml.svg.SvgFilter
 OmegaT-Plugin: filter
 
+Name: org.omegat.filters3.xml.infix.InfixFilter
+OmegaT-Plugin: filter
+
+Name: org.omegat.filters3.xml.flash.FlashFilter
+OmegaT-Plugin: filter
+
 Name: org.omegat.core.matching.Tokenizer
 OmegaT-Plugin: tokenizer
 
diff --git a/release/changes.txt b/release/changes.txt
index 4c65da6..71eb6dd 100644
--- a/release/changes.txt
+++ b/release/changes.txt
@@ -1,4 +1,90 @@
 ----------------------------------------------------------------------
+ OmegaT 2.3.0 update 1
+----------------------------------------------------------------------
+   0 Enhancement
+   1 Bug fix
+   3 Localisation updates
+----------------------------------------------------------------------
+2.3.0 update 1 vs. 2.3.0 
+
+  Bug fixes:
+
+  - Mozilla DTD handler is skipping segments
+  http://sourceforge.net/support/tracker.php?aid=3369466
+
+  Localisation updates:  
+
+  - Dutch localisation updated to 2.3, backported from 2.5 (UI)
+  - Hungarian localisation updated to 2.3 (UI, Instant Start)
+  - Italian localisation updated to 2.3 (UI, Instant Start, readme)
+
+----------------------------------------------------------------------
+ OmegaT 2.3.0
+----------------------------------------------------------------------
+  10 Enhancements
+   6 Bug fixes
+   2 Localisation updates
+----------------------------------------------------------------------
+2.3.0 vs. 2.2.3 update 4
+
+  Implemented requests:
+
+  - Allow blank translations in PO files
+  http://sourceforge.net/support/tracker.php?aid=2974663
+
+  - TransTips to consider letter case
+  http://sourceforge.net/support/tracker.php?aid=3027339
+
+  - Ability to translate WordArt in MS Office files
+  http://sourceforge.net/support/tracker.php?aid=3311077
+
+  - Add .xliff extension to the XLIFF filter
+  http://sourceforge.net/support/tracker.php?aid=3339675
+
+  - Enable no prefix for fuzzy matches
+  http://sourceforge.net/support/tracker.php?aid=1616157
+
+  Other enhancements:
+
+  - In the MS Open XML filter, a new option allows to preserve white space 
+(e.g., spaces and newlines) in all tags, even if it is not set technically 
+in the document. As it corresponds to the most usual situation (e.g., 
+preserving spaces in Excel tags), the option is on by default.
+
+  - New version of the JNA library (used to launch Hunspell), compatible 
+with Windows 64-bit
+
+  - New Iceni Infix file filter
+
+  - Partial support for StarDict dictionaries with sametypesequence=h
+
+  - New Flash XML export file filter
+
+  Bug fixes:
+
+  - PO filter mangles \\r strings
+  http://sourceforge.net/support/tracker.php?aid=3292553
+
+  - Wrong TransTip when target term contains comma
+  http://sourceforge.net/support/tracker.php?aid=2970681
+
+  - LaTeX filter: comments are removed from target documents
+  http://sourceforge.net/support/tracker.php?aid=3297471
+
+  - Overeager numbered header segmentation rule
+  http://sourceforge.net/support/tracker.php?aid=3308282
+
+  - PO filter: when a segment had trailing spaces, it was not visible for 
+translation in OmegaT
+
+  - XLIFF filter: in some cases, some extra tags could appear
+
+  Localisation updates:
+
+  - Brazilian Portuguese localisation updated to 2.2.3 update 2 (UI, documentation)
+  - Dutch localisation updated to 2.2.4 (UI)
+
+----------------------------------------------------------------------
  OmegaT 2.2.3 update 4
 ----------------------------------------------------------------------
    0 Enhancement
@@ -42,7 +128,7 @@ with a preceding \
 
   - Italian localisation updated to 2.2.3 update 2 (UI, documentation)
   - Czech localisation updated to 2.2.3 update 2 (UI, documentation, readme)
-  - Brazilian Portuguese  localisation updated to 2.2.3 update 2 (UI, Instant Start, readme)
+  - Brazilian Portuguese localisation updated to 2.2.3 update 2 (UI, Instant Start, readme)
 
 ----------------------------------------------------------------------
  OmegaT 2.2.3 update 2
diff --git a/release/readme.txt b/release/readme.txt
index 6221c9b..42a216f 100644
--- a/release/readme.txt
+++ b/release/readme.txt
@@ -71,6 +71,9 @@ OmegaT supports the following file formats out of the box:
   - Windows RC resources
   - Mozilla DTD
   - DokuWiki
+  - Wix  
+  - Infix
+  - Flash XML export
 
 OmegaT can be customized to support other file formats as well.
 
diff --git a/release/readme_fr.txt b/release/readme_fr.txt
index 1a42a37..b2f7d72 100644
--- a/release/readme_fr.txt
+++ b/release/readme_fr.txt
@@ -1,4 +1,4 @@
-Ce document a été traduit par Didier Briel et Jean-Christophe Helary, copyright© 2007-2010.
+Ce document a été traduit par Didier Briel et Jean-Christophe Helary, copyright© 2007-2011.
 
 ==============================================================================
   OmegaT 2.0, fichier « Lisez-moi »
@@ -67,6 +67,9 @@ OmegaT prend en charge directement les formats de fichier suivants :
   - Ressources Windows RC
   - DTD Mozilla
   - DokuWiki
+  - Wix  
+  - Infix
+  - Export XML Flash
 
 Il est également possible de personnaliser OmegaT pour accepter d'autres formats.
 
diff --git a/release/readme_it.txt b/release/readme_it.txt
index 5e13acc..c291903 100644
--- a/release/readme_it.txt
+++ b/release/readme_it.txt
@@ -1,4 +1,4 @@
-Questa traduzione è frutto del lavoro di Valter Mura e della revisione di Tonia Santoro, copyright© 2010.
+Questa traduzione è frutto del lavoro di Valter Mura, copyright© 2011.
 
 ==============================================================================
   File Leggimi di OmegaT 2.0
@@ -38,7 +38,7 @@ Le caratteristiche principali di OmegaT sono:
   - segmentazione flessibile della frase (grazie all'uso di un metodo di tipo SRX)
   - ricerche nel progetto e nelle memorie di traduzione di riferimento
   - ricerche dei file nei formati supportati in qualsiasi cartella 
-  - corrispondenze parziali (fuzzy)
+  - concordanze parziali (fuzzy)
   - semplice gestione dei progetti che prevedono strutture di cartelle complesse
   - supporto dei glossari (ricerca terminologica) 
   - supporto dei correttori ortografici open source "al volo"
@@ -68,6 +68,9 @@ OmegaT è in grado di riconoscere immediatamente i seguenti formati di file form
   - risorse RC di Windows
   - Mozilla DTD
   - DokuWiki
+  - Wix  
+  - Infix
+  - esportazione Flash XML
 
 OmegaT può essere personalizzato per gestire anche altri tipi di formati di file.
 
@@ -188,6 +191,7 @@ Contributi al codice:
   Tiago Saboga
   Andrzej Sawuła
   Benjamin Siband
+  Rashid Umarov  
   Antonio Vilei
   Martin Wunderlich
 
diff --git a/release/readme_pt_BR.txt b/release/readme_pt_BR.txt
index af33ac0..8cbf0f7 100644
--- a/release/readme_pt_BR.txt
+++ b/release/readme_pt_BR.txt
@@ -1,4 +1,4 @@
-This translation is the work of Thelma L Sabim, copyright© 2011.
+Esta tradução foi feita por Thelma L Sabim, copyright© 2011.
 
 ==============================================================================
   OmegaT 2.0, arquivo Leia-me
@@ -29,15 +29,15 @@ Os relatórios de 'bugs' (em inglês), no site da SourceForge:
 ==============================================================================
   2.  O que é OmegaT?
 
-OmegaT é uma ferramenta de tradução com auxílio do computador. É gratuito, isto é, você não precisa pagar nada para usar o programa, mesmo se usá-lo profissionalmente; também poderá modificar e redistribuir o programa, desde que respeite os termos da licença de usuário.
+OmegaT é uma ferramenta de tradução com auxílio do computador (sigla em inglês CAT). É gratuito, isto é, você não precisa pagar nada para usar o programa, mesmo se usá-lo profissionalmente; também poderá modificar e redistribuir o programa, desde que respeite os termos da licença de usuário.
 
-Os principais recursos do OmegaT são
+Os principais recursos do OmegaT são:
   - pode ser executado em qualquer sistema operacional que suporta Java
   - usa qualquer arquivo TMX válido como referência de tradução
   - flexibilidade de segmentação de frases (usando um método como SRX)
   - busca no projeto e nas memórias de tradução de referência
   - pesquisa de arquivos nos formatos suportados em qualquer pasta 
-  - apresenta correspondência parcial
+  - apresenta correspondência parcial de frases
   - processamento inteligente de projetos, inclusive hierarquias complexas de diretórios
   - suporte para glossários (verificação de terminologia) 
   - suporte para corretores ortográficos do OpenSource à medida que surgirem
@@ -56,9 +56,9 @@ OmegaT trabalha diretamente com os seguintes tipos de arquivos:
   - arquivos PO
   - formato de arquivo de documentação DocBook
   - arquivos Microsoft OpenXML 
-  - arquivos XLIFF monolíngue do Okapi
+  - arquivos XLIFF monolingue do Okapi
   - QuarkXPress CopyFlowGold
-  - arquivos legendas (SRT)
+  - Arquivos legendas (SRT)
   - ResX
   - recursos Android
   - LaTeX
@@ -74,14 +74,13 @@ OmegaT analisará automaticamente até mesmo as hierarquias mais complexas de pa
 
 Para acessar as instruções básicas, inicie o OmegaT e leia o tutorial do Início Rápido.
 
-O manual do usuário está no pacote de arquivos que você acabou de baixar; ele pode ser acessado no menu [Ajuda], após iniciar o OmegaT.
+O manual do usuário está no pacote de arquivos que você acabou de baixar; ele está disponível no menu [Ajuda], após iniciar o OmegaT.
 
 ==============================================================================
  3. Instalação do OmegaT
 
 3.1 Geral
-Para rodar, o OmegaT requer que o Java Runtime Environment (JRE) versão 
-1.5 ou mais recente esteja instalado no seu computador. O OmegaT agora já vem com o Java Runtime Environment para evitar problemas aos usuários na seleção, baixa e instalação do Java. 
+Para rodar, o OmegaT requer que o Java Runtime Environment (JRE) versão 1.5 ou mais recente esteja instalado no seu computador. O OmegaT agora já vem com o Java Runtime Environment para evitar problemas aos usuários na seleção, baixa e instalação do Java. 
 
 Se o Java já estiver instalado no seu computador, a maneira mais fácil de instalar a versão atual do OmegaT é usar o Java Web Start. 
 Para isso, baixe e rode o seguinte arquivo:
@@ -91,14 +90,12 @@ Para isso, baixe e rode o seguinte arquivo:
 Ele instalará o ambiente correto para seu computador e o aplicativo na primeira rodada. Para outras chamadas do programa não é preciso estar on-line.
 
 Durante a instalação, dependendo do seu sistema operacional, você pode receber diversos avisos de segurança. O certificado de autenticidade e segurança tem a assinatura do "Didier Briel". 
-As permissões que você dá a esta versão (que podem ser mencionada como um "acesso irrestrito ao computador") são idênticas às permissões dadas à versão local, instaladas por um procedimento descrito posteriormente: elas permitem acesso ao disco rígido do computador. Se você estiver on-line e clicar em OmegaT.jnlp 
-o programa verificará se há atualizações. Se houver, instale-as e depois inicie o OmegaT. 
+As permissões que você dá a esta versão (que podem ser mencionada como um "acesso irrestrito ao computador") são idênticas às permissões que você dá à versão local, instaladas por um procedimento descrito posteriormente: elas permitem acesso ao disco rígido do computador. Se você estiver on-line e clicar em OmegaT.jnlp o programa verificará se há atualizações. Se houver, instale-as e depois inicie o OmegaT. 
 
 Veja a seguir as formas e meios alternativos para baixar e instalar o OmegaT. 
 
 Usuário do Windows e Linux: se você tiver certeza de que seu computador já tem a versão apropriada do JRE, instale o OmegaT sem o JRE (o nome da versão sem Java indica "Without_JRE"). 
-Se tiver dúvidas, recomendamos que use a versão "standard", 
-ou seja, com JRE. Este procedimento é seguro, mesmo se o JRE já estiver instalado no seu computador; esta versão não causará nenhuma interferência no sistema.
+Se tiver dúvidas, recomendamos que use a versão "standard", ou seja, com JRE. Este procedimento é seguro, mesmo se o JRE já estiver instalado no seu computador; esta versão não causará nenhuma interferência no sistema.
 
 Usuário do Linux: note que o OmegaT não funciona com as implementações Java gratuitas/código-aberto que estão incluídas em muitas distribuições do Linux (por exemplo, Ubuntu), pois elas podem estar desatualizadas ou incompletas. Use o link acima para baixar e instalar o Java Runtime Environment (JRE) da Sun, ou baixe e instale o pacote OmegaT com o JRE (o pacote .tar.gz marcado "Linux").
 
@@ -111,18 +108,14 @@ O Linux em sistemas PowerPC: os usuários precisarão baixar o JRE da IBM, pois
 
 3.2 Instalação
 * Usuário do Windows: é só rodar o programa de instalação. Se quiser, o programa de instalação cria atalhos para iniciar o OmegaT.
-* Outros: para instalar o OmegaT, basta criar uma pasta para o OmegaT
-(p.ex., /usr/local/lib no Linux). Copie o arquivo compactado OmegaT ou tar.gz
-para esta pasta e faça a descompactação.
+* Outros: para instalar o OmegaT, basta criar uma pasta para o OmegaT(p.ex., /usr/local/lib no Linux). Copie o arquivo compactado OmegaT ou tar.gz para esta pasta e faça a descompactação.
 
 3.3 Como rodar o OmegaT
 O OmegaT pode ser acessado de várias maneiras.
 
-* Usuário do Windows: abrir o arquivo OmegaT.exe com um clique duplo. Se o Gerenciador de Arquivos (Windows Explorer) exibir o arquivo OmegaT mas não o arquivo OmegaT.exe, 
-modifique as configurações para que as extensões dos arquivos sejam exibidas.
+* Usuário do Windows: abra o arquivo OmegaT.exe com um clique duplo. Se o Gerenciados de Arquivos (Windows Explorer) exibir o arquivo OmegaT mas não o arquivo OmegaT.exe, modifique as configurações para que as extensões dos arquivos sejam exibidas.
 
-* Dê um clique duplo no arquivo OmegaT.jar. Isto funcionará somente se o tipo de arquivo .jar
-estiver associado com o Java no seu sistema.
+* Dê um clique duplo no arquivo OmegaT.jar. Isto funcionará somente se o tipo de arquivo .jar estiver associado com o Java no seu sistema.
 
 * Na linha de comando. O comando para acessar o OmegaT é:
 
@@ -131,26 +124,25 @@ cd <pasta que contém o arquivo OmegaT.jar>
 <nome e caminho do arquivo executável java> -jar OmegaT.jar
 
 (O arquivo Java executável é o arquivo java no Linux e o java.exe no Windows.
-Se o Java for instalado no sistema, não é necessário digitar o caminho completo.)
+Se o Java estiver instalado no sistema, não é necessário digitar o caminho completo.)
 
-* Usuário do Windows: o programa de instalação pode criar atalhos no menu Iniciar, na área de trabalho e na área de acesso rápido. Você também pode arrastar o arquivo OmegaT.exe para o menu Iniciar, para a área de trabalho ou para a de acesso rápido para fazer um link dali.
+* Usuário do Windows: o programa de instalação pode criar atalhos no menu iniciar, na área de trabalho e na área de acesso rápido. Você também pode arrastar o arquivo OmegaT.exe para o menu Iniciar, para a área de trabalho ou para a de acesso rápido para fazer um link dali.
 
 * Usuário do Linux KDE: o OmegaT pode ser adicionado nos menus da seguinte maneira:
 
-Centro de Controle - Desktop - Panels - Menus - Edit K Menu - File - New Item/New 
-Submenu.
+Centro de Controle - Desktop - Painéis - Menus - Editar Menu K  - Arquivo - Novo item/Novo submenu.
 
-Depois de selecionar um menu, acrescente um submenu/item com File - New Submenu (Arquivo, Submenu) e File - New Item (Arquivo - Novo Item). Digite OmegaT como o nome do novo item.
+Depois de selecionar um menu, acrescente um submenu/item com Arquivo - Submenu e Arquivo - Novo item. Digite OmegaT como o nome do novo item.
 
-No campo 'Command', use o botão de navegação para localizar e selecionar o script que inicia o OmegaT. 
+No campo 'Comando', use o botão de navegação para localizar e selecionar o script que inicia o OmegaT. 
 
-Clique no ícone (à direita dos campos Name/Description/Comment) Other Icons - Browse (Outros Ícones - Navegar), e acesse a subpasta /imagens na pasta do OmegaT. Selecione o ícone OmegaT.png.
+Clique no ícone (à direita dos campos Nome/Descrição/Comentário) Outros ícones - Navegar, e acesse a subpasta /imagens na pasta do OmegaT. Selecione o ícone OmegaT.png.
 
-Finalmente, grave as modificações com File - Save (Arquivo - Salvar).
+Finalmente, grave as modificações com Arquivo - Salvar.
 
 * Usuário do Linux GNOME: o OmegaT pode ser adicionado ao seu painel (a barra no topo da tela) conforme segue:
 
-Clique com o botão direito do mouse no painel - Add New Launcher (Adicionar Novo Chamador). Digite 'OmegaT' no campo 'Name'; no campo 'Command', use o botão de navegação para localizar o script para iniciar o OmegaT. Selecione e confirme com OK.
+Clique com o botão direito do mouse no painel - Adicionar Novo Chamador. Digite 'OmegaT' no campo 'Nome'; no campo 'Comando', use o botão de navegação para localizar o script para iniciar o OmegaT. Selecione e confirme com OK.
 
 ==============================================================================
  4. Como participar no projeto OmegaT
@@ -173,8 +165,7 @@ E fique por dentro do que acontece no mundo do OmegaT...
   OmegaT originou-se do trabalho de Keith Godfrey.
   Marc Prior é o coordenador do projeto OmegaT.
 
-Contribuidores anteriores:
-(ordem alfabética)
+Contribuidores anteriores:(ordem alfabética)
 
 O código é uma contribuição de
   Zoltan Bartko
@@ -235,7 +226,7 @@ OmegaT usa as seguintes bibliotecas:
 
 Antes de relatar um erro, verifique com atenção a documentação. O que você vê pode ser que seja uma característica do OmegaT que acabou de descobrir. Se verificar o arquivo de registro do OmegaT e lá encontrar palavras como "Erro", "Aviso", "Exceção" ou "morreu inesperadamente", então realmente você descobriu um problema (o log.txt está localizado na pasta de preferências do usuário; consulte o manual para sua localização).
 
-A próxima coisa que você deve fazer é perguntar para outros usuários sobre o que encontrou, para ter certeza de que o problema ainda não foi relatado. Você também pode verificar a página de relatório de 'bugs' no site da SourceForge. Envie um relatório de erro somente quando tiver certeza de que é o primeiro a encontrar uma sequência de evento reproduzível que causou algum problema.
+A próxima coisa que você deve fazer é confirmar o que encontrou com outros usuários, para ter certeza de que o problema ainda não foi relatado. Você também pode verificar a página de relatório de 'bugs' no site da SourceForge. Envie um relatório de erro somente quando tiver certeza de que é o primeiro a encontrar uma seqüência de evento reproduzível que causou algum problema.
 
 O relatório de 'bugs' deve conter três informações.
   - Passos para reproduzir,
diff --git a/release/win32-specific/L4j_OMT.xml b/release/win32-specific/L4j_OMT.xml
deleted file mode 100644
index 18348aa..0000000
--- a/release/win32-specific/L4j_OMT.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<launch4jConfig>
-  <dontWrapJar>true</dontWrapJar>
-  <headerType>gui</headerType>
-  <jar>OmegaT.jar</jar>
-  <outfile>OmegaT.exe</outfile>
-  <errTitle>OmegaT</errTitle>
-  <cmdLine></cmdLine>
-  <chdir></chdir>
-  <priority>normal</priority>
-  <downloadUrl>http://java.com/download</downloadUrl>
-  <supportUrl>http://groups.yahoo.com/group/OmegaT/</supportUrl>
-  <customProcName>true</customProcName>
-  <stayAlive>false</stayAlive>
-  <manifest></manifest>
-  <icon>..\..\Images\OmegaT.ico</icon>
-  <jre>
-    <path>jre</path>
-    <minVersion>1.5.0</minVersion>
-    <maxVersion></maxVersion>
-    <jdkPreference>preferJdk</jdkPreference>
-  </jre>
-</launch4jConfig>
\ No newline at end of file
diff --git a/release/win32-specific/OmegaT-JRE.iss b/release/win32-specific/OmegaT-JRE.iss
deleted file mode 100644
index 5f8c901..0000000
--- a/release/win32-specific/OmegaT-JRE.iss
+++ /dev/null
@@ -1,134 +0,0 @@
-; -- OmegaT.iss --
-
-[Setup]
-AppName=OmegaT @VERSION_NUMBER_SUBST@
-AppVerName=OmegaT version @VERSION_NUMBER_SUBST@
-AppPublisher=OmegaT
-AppPublisherURL=http://www.omegat.org/
-DefaultDirName={pf}\OmegaT
-DefaultGroupName=OmegaT
-UninstallDisplayIcon={app}\OmegaT.exe
-AllowNoIcons=yes
-Compression=lzma
-SolidCompression=yes
-LicenseFile=license.txt
-OutputDir=..\dist2
-OutputBaseFilename=OmegaT_ at VERSION_NUMBER_SUBST@_Windows
-
-[Files]
-Source: "docs\*"; DestDir: "{app}\docs"; Flags: recursesubdirs
-Source: "images\*"; DestDir: "{app}\images"; Flags: recursesubdirs
-Source: "lib\*"; DestDir: "{app}\lib"; Flags: recursesubdirs
-Source: "native\*"; DestDir: "{app}\native"; Flags: recursesubdirs
-Source: "plugins\*"; DestDir: "{app}\plugins"; Flags: recursesubdirs
-Source: "..\..\jre\*"; DestDir: "{app}\jre"; Flags: recursesubdirs
-Source: "OmegaT.exe"; DestDir: "{app}"
-Source: "OmegaT.l4J.ini"; DestDir: "{app}"; Flags: onlyifdoesntexist
-Source: "OmegaT.jar"; DestDir: "{app}"
-Source: "license.txt"; DestDir: "{app}"
-Source: "doc-license.txt"; DestDir: "{app}"
-Source: "readme.txt"; DestDir: "{app}"; Flags: isreadme;
-Source: "readme_ar.txt"; DestDir: "{app}"; Flags: isreadme; Languages: ar
-Source: "readme_ca.txt"; DestDir: "{app}"; Flags: isreadme; Languages: ca ca_VAL
-Source: "readme_cs.txt"; DestDir: "{app}"; Flags: isreadme; Languages: cs
-;Source: "readme_cy.txt"; DestDir: "{app}"; Flags: isreadme; Languages: cy
-Source: "readme_de.txt"; DestDir: "{app}"; Flags: isreadme; Languages: de
-Source: "readme_eu.txt"; DestDir: "{app}"; Flags: isreadme; Languages: eu
-Source: "readme_fr.txt"; DestDir: "{app}"; Flags: isreadme; Languages: fr
-Source: "readme_hu.txt"; DestDir: "{app}"; Flags: isreadme; Languages: hu
-Source: "readme_it.txt"; DestDir: "{app}"; Flags: isreadme; Languages: it
-Source: "readme_ja.txt"; DestDir: "{app}"; Flags: isreadme; Languages: ja
-Source: "readme_nl.txt"; DestDir: "{app}"; Flags: isreadme; Languages: nl
-Source: "readme_pl.txt"; DestDir: "{app}"; Flags: isreadme; Languages: pl
-Source: "readme_pt_BR.txt"; DestDir: "{app}"; Flags: isreadme; Languages: pt_BR
-Source: "readme_ru.txt"; DestDir: "{app}"; Flags: isreadme; Languages: ru
-;Source: "readme_sh.txt"; DestDir: "{app}"; Flags: isreadme; Languages: sh
-Source: "readme_sk.txt"; DestDir: "{app}"; Flags: isreadme; Languages: sk
-Source: "readme_sl.txt"; DestDir: "{app}"; Flags: isreadme; Languages: sl
-Source: "readme_sq.txt"; DestDir: "{app}"; Flags: isreadme; Languages: sq
-Source: "readme_sv.txt"; DestDir: "{app}"; Flags: isreadme; Languages: sv
-Source: "readme_tr.txt"; DestDir: "{app}"; Flags: isreadme; Languages: tr
-Source: "readme_zh_CN.txt"; DestDir: "{app}"; Flags: isreadme; Languages: zh_CN
-Source: "readme_zh_TW.txt"; DestDir: "{app}"; Flags: isreadme; Languages: zh_TW
-Source: "readme*.txt"; DestDir: "{app}";
-Source: "join.html"; DestDir: "{app}"
-Source: "index.html"; DestDir: "{app}"
-Source: "changes.txt"; DestDir: "{app}"; Flags: isreadme;
-
-[Tasks]
-Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
-Name: "quicklaunchicon"; Description: "{cm:CreateQuickLaunchIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
-
-[Icons]
-Name: "{group}\OmegaT @VERSION_NUMBER_SUBST@"; Filename: "{app}\OmegaT.exe"; WorkingDir: "{app}"
-Name: "{commondesktop}\OmegaT"; Filename: "{app}\OmegaT.exe"; Tasks: desktopicon
-Name: "{userappdata}\Microsoft\Internet Explorer\Quick Launch\OmegaT"; Filename: "{app}\OmegaT.exe"; Tasks: quicklaunchicon
-Name: "{group}\OmegaT Readme"; Filename: "{app}\readme.txt"
-Name: "{group}\OmegaT User Manual"; Filename: "{app}\docs\index.html"
-Name: "{group}\Join OmegaT Mailing List"; Filename: "{app}\join.html"
-Name: "{group}\Uninstall OmegaT"; Filename: "{uninstallexe}"
-
-[Languages]
-; Official translations
-Name: "en"; MessagesFile: "compiler:Default.isl"
-Name: "eu"; MessagesFile: "compiler:Languages\Basque.isl"
-Name: "pt_BR"; MessagesFile: "compiler:Languages\BrazilianPortuguese.isl"
-Name: "ca"; MessagesFile: "compiler:Languages\Catalan.isl"
-Name: "cs"; MessagesFile: "compiler:Languages\Czech.isl"
-Name: "da"; MessagesFile: "compiler:Languages\Danish.isl"
-Name: "nl"; MessagesFile: "compiler:Languages\Dutch.isl"
-Name: "fi"; MessagesFile: "compiler:Languages\Finnish.isl"
-Name: "fr"; MessagesFile: "compiler:Languages\French.isl"
-Name: "de"; MessagesFile: "compiler:Languages\German.isl"
-Name: "he"; MessagesFile: "compiler:Languages\Hebrew.isl"
-Name: "hu"; MessagesFile: "compiler:Languages\Hungarian.isl"
-Name: "it"; MessagesFile: "compiler:Languages\Italian.isl"
-Name: "nb"; MessagesFile: "compiler:Languages\Norwegian.isl"
-Name: "pl"; MessagesFile: "compiler:Languages\Polish.isl"
-Name: "pt"; MessagesFile: "compiler:Languages\Portuguese.isl"
-Name: "ru"; MessagesFile: "compiler:Languages\Russian.isl"
-Name: "sk"; MessagesFile: "compiler:Languages\Slovak.isl"
-Name: "sl"; MessagesFile: "compiler:Languages\Slovenian.isl"
-Name: "es"; MessagesFile: "compiler:Languages\Spanish.isl"
-; Non-official translations
-Name: "af"; MessagesFile: "compiler:Languages\Afrikaans.isl"
-Name: "sq"; MessagesFile: "compiler:Languages\Albanian.isl"
-Name: "ar"; MessagesFile: "compiler:Languages\Arabic.isl"
-Name: "ast"; MessagesFile: "compiler:Languages\Asturian.isl"
-Name: "be"; MessagesFile: "compiler:Languages\Belarus.isl"
-Name: "bs"; MessagesFile: "compiler:Languages\Bosnian.isl"
-Name: "bg"; MessagesFile: "compiler:Languages\Bulgarian.isl"
-Name: "zh_CN"; MessagesFile: "compiler:Languages\ChineseSimp.isl"
-Name: "zh_TW"; MessagesFile: "compiler:Languages\ChineseTrad.isl"
-Name: "hr"; MessagesFile: "compiler:Languages\Croatian.isl"
-Name: "eo"; MessagesFile: "compiler:Languages\Esperanto.isl"
-Name: "et"; MessagesFile: "compiler:Languages\Estonian.isl"
-Name: "fa"; MessagesFile: "compiler:Languages\Farsi.isl"
-Name: "gl"; MessagesFile: "compiler:Languages\Galician.isl"
-Name: "el"; MessagesFile: "compiler:Languages\Greek.isl"
-Name: "is"; MessagesFile: "compiler:Languages\Icelandic.isl"
-Name: "id"; MessagesFile: "compiler:Languages\Indonesian.isl"
-Name: "ja"; MessagesFile: "compiler:Languages\Japanese.isl"
-Name: "kk"; MessagesFile: "compiler:Languages\Kazakh.isl"
-Name: "kk"; MessagesFile: "compiler:Languages\Kazakh.isl"
-Name: "ko"; MessagesFile: "compiler:Languages\Korean.isl"
-Name: "lv"; MessagesFile: "compiler:Languages\Latvian.isl"
-Name: "lt"; MessagesFile: "compiler:Languages\Lithuanian.isl"
-Name: "lb"; MessagesFile: "compiler:Languages\Luxemburgish.isl"
-Name: "mk"; MessagesFile: "compiler:Languages\Macedonian.isl"
-Name: "ms"; MessagesFile: "compiler:Languages\Malaysian.isl"
-Name: "nn"; MessagesFile: "compiler:Languages\NorwegianNynorsk.isl"
-Name: "oc"; MessagesFile: "compiler:Languages\Occitan.isl"
-Name: "ro"; MessagesFile: "compiler:Languages\Romanian.isl"
-Name: "sr"; MessagesFile: "compiler:Languages\Serbian.isl"
-Name: "sv"; MessagesFile: "compiler:Languages\Swedish.isl"
-Name: "tt"; MessagesFile: "compiler:Languages\Tatarish.isl"
-Name: "th"; MessagesFile: "compiler:Languages\Thai.isl"
-Name: "tr"; MessagesFile: "compiler:Languages\Turkish.isl"
-Name: "uk"; MessagesFile: "compiler:Languages\Ukrainian.isl"
-Name: "ca_VAL"; MessagesFile: "compiler:Languages\Valencian.isl"
-
-
-
-
-
diff --git a/release/win32-specific/OmegaT.iss b/release/win32-specific/OmegaT.iss
deleted file mode 100644
index c25c355..0000000
--- a/release/win32-specific/OmegaT.iss
+++ /dev/null
@@ -1,136 +0,0 @@
-; -- OmegaT.iss --
-
-[Setup]
-AppName=OmegaT @VERSION_NUMBER_SUBST@
-AppVerName=OmegaT version @VERSION_NUMBER_SUBST@
-AppPublisher=OmegaT
-AppPublisherURL=http://www.omegat.org/
-DefaultDirName={pf}\OmegaT
-DefaultGroupName=OmegaT
-UninstallDisplayIcon={app}\OmegaT.exe
-AllowNoIcons=yes
-Compression=lzma
-SolidCompression=yes
-LicenseFile=license.txt
-OutputDir=..\dist2
-OutputBaseFilename=OmegaT_ at VERSION_NUMBER_SUBST@_Windows_without_JRE
-
-[Files]
-Source: "docs\*"; DestDir: "{app}\docs"; Flags: recursesubdirs
-Source: "images\*"; DestDir: "{app}\images"; Flags: recursesubdirs
-Source: "lib\*"; DestDir: "{app}\lib"; Flags: recursesubdirs
-Source: "native\*"; DestDir: "{app}\native"; Flags: recursesubdirs
-Source: "plugins\*"; DestDir: "{app}\plugins"; Flags: recursesubdirs
-Source: "OmegaT.exe"; DestDir: "{app}"
-Source: "OmegaT.l4J.ini"; DestDir: "{app}"; Flags: onlyifdoesntexist
-Source: "OmegaT.jar"; DestDir: "{app}"
-Source: "license.txt"; DestDir: "{app}"
-Source: "doc-license.txt"; DestDir: "{app}"
-Source: "readme.txt"; DestDir: "{app}"; Flags: isreadme;
-Source: "readme_ar.txt"; DestDir: "{app}"; Flags: isreadme; Languages: ar
-Source: "readme_ca.txt"; DestDir: "{app}"; Flags: isreadme; Languages: ca ca_VAL
-Source: "readme_cs.txt"; DestDir: "{app}"; Flags: isreadme; Languages: cs
-;Source: "readme_cy.txt"; DestDir: "{app}"; Flags: isreadme; Languages: cy
-Source: "readme_de.txt"; DestDir: "{app}"; Flags: isreadme; Languages: de
-Source: "readme_eu.txt"; DestDir: "{app}"; Flags: isreadme; Languages: eu
-Source: "readme_fr.txt"; DestDir: "{app}"; Flags: isreadme; Languages: fr
-Source: "readme_hu.txt"; DestDir: "{app}"; Flags: isreadme; Languages: hu
-Source: "readme_it.txt"; DestDir: "{app}"; Flags: isreadme; Languages: it
-Source: "readme_ja.txt"; DestDir: "{app}"; Flags: isreadme; Languages: ja
-Source: "readme_nl.txt"; DestDir: "{app}"; Flags: isreadme; Languages: nl
-Source: "readme_pl.txt"; DestDir: "{app}"; Flags: isreadme; Languages: pl
-Source: "readme_pt_BR.txt"; DestDir: "{app}"; Flags: isreadme; Languages: pt_BR
-Source: "readme_ru.txt"; DestDir: "{app}"; Flags: isreadme; Languages: ru
-;Source: "readme_sh.txt"; DestDir: "{app}"; Flags: isreadme; Languages: sh
-Source: "readme_sk.txt"; DestDir: "{app}"; Flags: isreadme; Languages: sk
-Source: "readme_sl.txt"; DestDir: "{app}"; Flags: isreadme; Languages: sl
-Source: "readme_sq.txt"; DestDir: "{app}"; Flags: isreadme; Languages: sq
-Source: "readme_sv.txt"; DestDir: "{app}"; Flags: isreadme; Languages: sv
-Source: "readme_tr.txt"; DestDir: "{app}"; Flags: isreadme; Languages: tr
-Source: "readme_zh_CN.txt"; DestDir: "{app}"; Flags: isreadme; Languages: zh_CN
-Source: "readme_zh_TW.txt"; DestDir: "{app}"; Flags: isreadme; Languages: zh_TW
-Source: "readme*.txt"; DestDir: "{app}";
-Source: "join.html"; DestDir: "{app}"
-Source: "index.html"; DestDir: "{app}"
-Source: "changes.txt"; DestDir: "{app}"; Flags: isreadme;
-
-[UninstallDelete]
-Type: filesandordirs; Name: "{app}\plugins\"
-
-[Tasks]
-Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
-Name: "quicklaunchicon"; Description: "{cm:CreateQuickLaunchIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
-
-[Icons]
-Name: "{group}\OmegaT @VERSION_NUMBER_SUBST@"; Filename: "{app}\OmegaT.exe"; WorkingDir: "{app}"
-Name: "{commondesktop}\OmegaT"; Filename: "{app}\OmegaT.exe"; Tasks: desktopicon
-Name: "{userappdata}\Microsoft\Internet Explorer\Quick Launch\OmegaT"; Filename: "{app}\OmegaT.exe"; Tasks: quicklaunchicon
-Name: "{group}\OmegaT Readme"; Filename: "{app}\readme.txt"
-Name: "{group}\OmegaT User Manual"; Filename: "{app}\docs\index.html"
-Name: "{group}\Join OmegaT Mailing List"; Filename: "{app}\join.html"
-Name: "{group}\Uninstall OmegaT"; Filename: "{uninstallexe}"
-
-[Languages]
-; Official translations
-Name: "en"; MessagesFile: "compiler:Default.isl"
-Name: "eu"; MessagesFile: "compiler:Languages\Basque.isl"
-Name: "pt_BR"; MessagesFile: "compiler:Languages\BrazilianPortuguese.isl"
-Name: "ca"; MessagesFile: "compiler:Languages\Catalan.isl"
-Name: "cs"; MessagesFile: "compiler:Languages\Czech.isl"
-Name: "da"; MessagesFile: "compiler:Languages\Danish.isl"
-Name: "nl"; MessagesFile: "compiler:Languages\Dutch.isl"
-Name: "fi"; MessagesFile: "compiler:Languages\Finnish.isl"
-Name: "fr"; MessagesFile: "compiler:Languages\French.isl"
-Name: "de"; MessagesFile: "compiler:Languages\German.isl"
-Name: "he"; MessagesFile: "compiler:Languages\Hebrew.isl"
-Name: "hu"; MessagesFile: "compiler:Languages\Hungarian.isl"
-Name: "it"; MessagesFile: "compiler:Languages\Italian.isl"
-Name: "nb"; MessagesFile: "compiler:Languages\Norwegian.isl"
-Name: "pl"; MessagesFile: "compiler:Languages\Polish.isl"
-Name: "pt"; MessagesFile: "compiler:Languages\Portuguese.isl"
-Name: "ru"; MessagesFile: "compiler:Languages\Russian.isl"
-Name: "sk"; MessagesFile: "compiler:Languages\Slovak.isl"
-Name: "sl"; MessagesFile: "compiler:Languages\Slovenian.isl"
-Name: "es"; MessagesFile: "compiler:Languages\Spanish.isl"
-; Non-official translations
-Name: "af"; MessagesFile: "compiler:Languages\Afrikaans.isl"
-Name: "sq"; MessagesFile: "compiler:Languages\Albanian.isl"
-Name: "ar"; MessagesFile: "compiler:Languages\Arabic.isl"
-Name: "ast"; MessagesFile: "compiler:Languages\Asturian.isl"
-Name: "be"; MessagesFile: "compiler:Languages\Belarus.isl"
-Name: "bs"; MessagesFile: "compiler:Languages\Bosnian.isl"
-Name: "bg"; MessagesFile: "compiler:Languages\Bulgarian.isl"
-Name: "zh_CN"; MessagesFile: "compiler:Languages\ChineseSimp.isl"
-Name: "zh_TW"; MessagesFile: "compiler:Languages\ChineseTrad.isl"
-Name: "hr"; MessagesFile: "compiler:Languages\Croatian.isl"
-Name: "eo"; MessagesFile: "compiler:Languages\Esperanto.isl"
-Name: "et"; MessagesFile: "compiler:Languages\Estonian.isl"
-Name: "fa"; MessagesFile: "compiler:Languages\Farsi.isl"
-Name: "gl"; MessagesFile: "compiler:Languages\Galician.isl"
-Name: "el"; MessagesFile: "compiler:Languages\Greek.isl"
-Name: "is"; MessagesFile: "compiler:Languages\Icelandic.isl"
-Name: "id"; MessagesFile: "compiler:Languages\Indonesian.isl"
-Name: "ja"; MessagesFile: "compiler:Languages\Japanese.isl"
-Name: "kk"; MessagesFile: "compiler:Languages\Kazakh.isl"
-Name: "kk"; MessagesFile: "compiler:Languages\Kazakh.isl"
-Name: "ko"; MessagesFile: "compiler:Languages\Korean.isl"
-Name: "lv"; MessagesFile: "compiler:Languages\Latvian.isl"
-Name: "lt"; MessagesFile: "compiler:Languages\Lithuanian.isl"
-Name: "lb"; MessagesFile: "compiler:Languages\Luxemburgish.isl"
-Name: "mk"; MessagesFile: "compiler:Languages\Macedonian.isl"
-Name: "ms"; MessagesFile: "compiler:Languages\Malaysian.isl"
-Name: "nn"; MessagesFile: "compiler:Languages\NorwegianNynorsk.isl"
-Name: "oc"; MessagesFile: "compiler:Languages\Occitan.isl"
-Name: "ro"; MessagesFile: "compiler:Languages\Romanian.isl"
-Name: "sr"; MessagesFile: "compiler:Languages\Serbian.isl"
-Name: "sv"; MessagesFile: "compiler:Languages\Swedish.isl"
-Name: "tt"; MessagesFile: "compiler:Languages\Tatarish.isl"
-Name: "th"; MessagesFile: "compiler:Languages\Thai.isl"
-Name: "tr"; MessagesFile: "compiler:Languages\Turkish.isl"
-Name: "uk"; MessagesFile: "compiler:Languages\Ukrainian.isl"
-Name: "ca_VAL"; MessagesFile: "compiler:Languages\Valencian.isl"
-
-
-
-
-
diff --git a/release/win32-specific/OmegaT.l4J.ini b/release/win32-specific/OmegaT.l4J.ini
deleted file mode 100644
index 8417c61..0000000
--- a/release/win32-specific/OmegaT.l4J.ini
+++ /dev/null
@@ -1,17 +0,0 @@
-# OmegaT.exe runtime configuration
-#
-# To use a parameter, remove the '#' before the '-'
-
-# Memory
-#-Xmx1024M
-# Language
-#-Duser.language=en
-# Country
-#-Duser.country=GB
-# Anti-aliasing (Java 1.5 only)
-#-Dswing.aatext=true
-# Settings to access the Internet behind a proxy
-#-Dhttp.proxyHost=192.168.1.1
-#-Dhttp.proxyPort=3128
-
-
diff --git a/src/org/omegat/Bundle.properties b/src/org/omegat/Bundle.properties
index c083ef9..6cff2a3 100644
--- a/src/org/omegat/Bundle.properties
+++ b/src/org/omegat/Bundle.properties
@@ -42,7 +42,7 @@
 #  @author Wildrich Fourie
 #  @author Antonio Vilei
 #
-#  @version 2.2
+#  @version 2.3
 #
 
 # The version number is taken from Version.properties, key version
@@ -849,6 +849,10 @@ LATEXFILTER_FILTER_NAME=LaTeX Files
 # PoFilter.java
 
 POFILTER_FILTER_NAME=PO Files
+POFILTER_OPTIONS_TITLE=PO Filter Options
+POFILTER_ALLOW_BLANK=Allow blank translations in the target files
+POFILTER_EXCEPTION=The PO filter threw an exception:
+POFILTER_INVALID_FORMAT=Invalid file format
 
 # RcFilter.java
 
@@ -902,6 +906,12 @@ WIX_FILTER_NAME=WiX Localization Files
 # SvgFilter.java
 SVG_FILTER_NAME=SVG Image Files
 
+# Infix filter
+INFIX_FILTER_NAME=Infix Files
+
+# Flash filter
+FLASH_FILTER_NAME=Flash XML export
+
 # org.omegat.filters3.xml.Handler
 XML_FATAL_ERROR=Error in file {0}, line {1}
 
@@ -945,7 +955,7 @@ OpenDoc_ERROR_IN_FILE=Error in file
 OpenXML_FILTER_NAME=Microsoft Open XML Files
 OpenXML_FILTER_OPTIONS=Open XML Filter Options
 OpenXML_WORD=Word
-OpenXML_TRANSLATE_HIDDEN_TEXT=Non-visible Instruction &Text
+OpenXML_TRANSLATE_HIDDEN_TEXT=Non-visible Instruction Te&xt
 OpenXML_TRANSLATE_COMMENTS=Co&mments
 OpenXML_TRANSLATE_FOOTNOTES=&Footnotes
 OpenXML_TRANSLATE_ENDNOTES=&Endnotes
@@ -962,8 +972,10 @@ OpenXML_GLOBAL=Global
 OpenXML_TRANSLATE_CHARTS=C&harts
 OpenXML_TRANSLATE_DIAGRAMS=D&iagrams
 OpenXML_TRANSLATE_DRAWINGS=Dra&wings
+OpenXML_TRANSLATE_WORDART=WordAr&t
 OpenXML_GENERIC_OPTIONS=Other Options:
 OpenXML_AGGREGATE_TAGS=A&ggregate Tags
+OpenXML_PRESERVE_SPACES=&Preserve spaces for all tags
 
 OpenXML_ERROR_IN_FILE=Error in file
 
@@ -1138,7 +1150,7 @@ CORE_SRX_RULES_LANG_JAPANESE=Japanese
 CORE_SRX_RULES_LANG_ENGLISH=English
 CORE_SRX_RULES_LANG_DEFAULT=Default
 CORE_SRX_RULES_FORMATTING_TEXT=Text files segmentation
-CORE_SRX_RULES_FORMATTING_HTML=HTML, XHTML and ODF segmentation
+CORE_SRX_RULES_FORMATTING_HTML=HTML, XHTML, ODF and Infix segmentation
 
 
 # org.omegat.segmentation.SegmentationCustomizer
@@ -1431,3 +1443,4 @@ LT_OPTIONS_MENU_ENABLED=Language Checker
 
 # org.omegat.gui.dialogs.TeamOptionsDialog
 PROXY_LOGIN_DIALOG=Proxy User and Password
+OpenXML_TRANSLATE_WORDART=WordAr&t
diff --git a/src/org/omegat/Bundle_fr.properties b/src/org/omegat/Bundle_fr.properties
index a23fe4d..85f3709 100644
--- a/src/org/omegat/Bundle_fr.properties
+++ b/src/org/omegat/Bundle_fr.properties
@@ -42,7 +42,7 @@
 #  @author Wildrich Fourie
 #  @author Antonio Vilei
 #
-#  @version 2.2
+#  @version 2.3
 #
 
 # The version number is taken from Version.properties, key version
@@ -304,7 +304,7 @@ TF_FONT_SAMPLE_TEXT=Les textes seront affich\u00e9s avec cette police.
 
 
 TF_FONT_SAMPLE_TITLE=Exemple
-TF_APPLY_TO_PROJECT_FILES=&Appliquer cette police \u00e0 la fen\u00eatre Fichiers du projet
+TF_APPLY_TO_PROJECT_FILES=A&ppliquer cette police \u00e0 la fen\u00eatre Fichiers du projet
 
 # Project frame
 # org.omegat.gui.ProjectFrame
@@ -500,7 +500,7 @@ PP_BUTTON_BROWSE_GL=S\u00e9lect&ionner
 
 PP_BUTTON_BROWSE_TM=S\u00e9lectio&nner
 
-PP_BUTTON_BROWSE_DICT=S\u00e9lectionner
+PP_BUTTON_BROWSE_DICT=S\u00e9lec&tionner
 
 PP_BROWSE_TITLE_SOURCE=Dossier des fichiers en langue source
 
@@ -796,6 +796,10 @@ LATEXFILTER_FILTER_NAME=Fichiers LaTeX
 # PoFilter.java
 
 POFILTER_FILTER_NAME=Fichiers PO
+POFILTER_OPTIONS_TITLE=Options du filtre PO
+POFILTER_ALLOW_BLANK=Autoriser les traductions vides dans les fichiers cible
+POFILTER_EXCEPTION=Le filtre PO a g\u00e9n\u00e9r\u00e9 une exception :
+POFILTER_INVALID_FORMAT=Format de fichier non valide
 
 # RcFilter.java
 
@@ -849,6 +853,12 @@ WIX_FILTER_NAME=Fichiers de localisation WiX
 # SvgFilter.java
 SVG_FILTER_NAME=Fichiers image SVG
 
+# Infix filter
+INFIX_FILTER_NAME=Fichiers Infix
+
+# Flash filter
+FLASH_FILTER_NAME=Export XML Flash
+
 # org.omegat.filters3.xml.Handler
 XML_FATAL_ERROR=Erreur dans le fichier {0} \u00e0 la ligne {1}
 
@@ -909,8 +919,10 @@ OpenXML_GLOBAL=Globales
 OpenXML_TRANSLATE_CHARTS=Graphi&ques
 OpenXML_TRANSLATE_DIAGRAMS=Dia&grammes
 OpenXML_TRANSLATE_DRAWINGS=De&ssins
+OpenXML_TRANSLATE_WORDART=&WordArt
 OpenXML_GENERIC_OPTIONS=Autres options :
 OpenXML_AGGREGATE_TAGS=Agr\u00e9ger les &balises
+OpenXML_PRESERVE_SPACES=Pr\u00e9se&rver les espaces pour toutes les balises
 
 OpenXML_ERROR_IN_FILE=Erreur dans le fichier
 
@@ -1064,7 +1076,7 @@ CORE_SRX_RULES_LANG_JAPANESE=Japonais
 CORE_SRX_RULES_LANG_ENGLISH=Anglais
 CORE_SRX_RULES_LANG_DEFAULT=Valeurs par d\u00e9faut
 CORE_SRX_RULES_FORMATTING_TEXT=R\u00e8gles pour fichiers textes
-CORE_SRX_RULES_FORMATTING_HTML=Segmentation HTML, XHTML et ODF
+CORE_SRX_RULES_FORMATTING_HTML=Segmentation HTML, XHTML, ODF et Infix
 
 
 # org.omegat.segmentation.SegmentationCustomizer
@@ -1336,3 +1348,4 @@ LT_OPTIONS_MENU_ENABLED=V\u00e9rificateur linguistique
 
 # org.omegat.gui.dialogs.TeamOptionsDialog
 PROXY_LOGIN_DIALOG=Utilisateur et mot de passe pour proxy
+OpenXML_TRANSLATE_WORDART=&WordArt
diff --git a/src/org/omegat/Bundle_hu.properties b/src/org/omegat/Bundle_hu.properties
index 068de74..c678091 100644
--- a/src/org/omegat/Bundle_hu.properties
+++ b/src/org/omegat/Bundle_hu.properties
@@ -9,6 +9,7 @@
 #               2009 Didier Briel, Alex Buloichik, Martin Fleurke
 #               2010 Didier Briel, Wildrich Fourie, Martin Fleurke, 
 #                    Antonio Vilei, Arno Peters, Alex Buloichik
+#               2011 Didier Briel
 #               Home page: http://www.omegat.org/
 #               Support center: http://groups.yahoo.com/group/OmegaT/
 #
@@ -41,12 +42,12 @@
 #  @author Wildrich Fourie
 #  @author Antonio Vilei
 #
-#  @version 2.2
+#  @version 2.3
 #
 
 # The version number is taken from Version.properties, key version
 # and inserted into the following template
-version-template=OmegaT-{0}
+version-template=OmegaT-{0}T
 version-update-template=OmegaT-{0}_{1}
 
 # buttons
@@ -756,7 +757,7 @@ MAIN_ERROR_CANT_INIT_OSLF=Nem siker\u00fclt elind\u00edtani az oper\u00e1ci\u00f
 # PluginUtils.java
 PLUGIN_UNKNOWN=Ismeretlen t\u00edpus\u00fa seg\u00e9dprogram itt: '{0}'
 
-PLUGIN_MARKER_INITIALIZE=Hiba a  '{0}' jel\u00f6l\u0151 inicializ\u00e1l\u00e1sa k\u00f6zben 
+PLUGIN_MARKER_INITIALIZE=Error initializing marker '{0}' 
 
 # FilterMaster.java
 
@@ -795,6 +796,10 @@ LATEXFILTER_FILTER_NAME=LaTeX-\u00e1llom\u00e1nyok
 # PoFilter.java
 
 POFILTER_FILTER_NAME=PO-\u00e1llom\u00e1nyok
+POFILTER_OPTIONS_TITLE=PO Filter Options
+POFILTER_ALLOW_BLANK=Allow blank translations in the target files
+POFILTER_EXCEPTION=The PO filter threw an exception:
+POFILTER_INVALID_FORMAT=Invalid file format
 
 # RcFilter.java
 
@@ -848,6 +853,12 @@ WIX_FILTER_NAME=WiX honos\u00edt\u00e1si \u00e1llom\u00e1nyok
 # SvgFilter.java
 SVG_FILTER_NAME=SVG k\u00e9p\u00e1llom\u00e1nyok
 
+# Infix filter
+INFIX_FILTER_NAME=Infix Files
+
+# Flash filter
+FLASH_FILTER_NAME=Flash XML export
+
 # org.omegat.filters3.xml.Handler
 XML_FATAL_ERROR=Hiba: {0} \u00e1llom\u00e1ny, {1} sor
 
@@ -883,6 +894,7 @@ OpenDoc_TRANSLATE_NOTES=Megjegy&z\u00e9sek
 OpenDoc_TRANSLATE_COMMENTS=Ma&gyar\u00e1zatok
 OpenDoc_TRANSLATE_PRES_NOTES=&Bemutat\u00f3hoz tartoz\u00f3 megjegyz\u00e9sek
 OpenDoc_TRANSLATE_LINKS=Ugr\u00f3pontok (&URL)
+OpenDoc_TRANSLATE_SHEET_NAMES=&T\u00e1blanevek
 OpenDoc_ERROR_IN_FILE=Hiba az \u00e1llom\u00e1nyban
 
 # org.omegat.filters3.xml.openxml.OpenXMLFilter
@@ -890,7 +902,7 @@ OpenDoc_ERROR_IN_FILE=Hiba az \u00e1llom\u00e1nyban
 OpenXML_FILTER_NAME=Microsoft Open XML \u00e1llom\u00e1nyok
 OpenXML_FILTER_OPTIONS=Az Open XML sz\u0171r\u00e9si opci\u00f3i
 OpenXML_WORD=Word
-OpenXML_TRANSLATE_HIDDEN_TEXT=L\u00e1thatatlan utas\u00edt\u00e1s \u00e9s sz\u00f6veg
+OpenXML_TRANSLATE_HIDDEN_TEXT=L\u00e1thatatlan &utas\u00edt\u00e1ssz\u00f6veg
 OpenXML_TRANSLATE_COMMENTS=Ma&gyar\u00e1zatok
 OpenXML_TRANSLATE_FOOTNOTES=L&\u00e1bjegyzetek
 OpenXML_TRANSLATE_ENDNOTES=&V\u00e9gjegyzetek
@@ -907,8 +919,10 @@ OpenXML_GLOBAL=Glob\u00e1lis
 OpenXML_TRANSLATE_CHARTS=&Folyamat\u00e1br\u00e1k
 OpenXML_TRANSLATE_DIAGRAMS=D&iagramok
 OpenXML_TRANSLATE_DRAWINGS=Ra&jzok
+OpenXML_TRANSLATE_WORDART=WordAr&t
 OpenXML_GENERIC_OPTIONS=Egy\u00e9b lehet\u0151s\u00e9&gek
 OpenXML_AGGREGATE_TAGS=C\u00edmke&\u00f6sszes\u00edt\u00e9s
+OpenXML_PRESERVE_SPACES=Sz\u00f3k\u00f6z&\u00f6k meg\u0151rz\u00e9se minden c\u00edmke eset\u00e9n
 
 OpenXML_ERROR_IN_FILE=Hiba az \u00e1llom\u00e1nyban
 
@@ -919,10 +933,10 @@ ABOUTDIALOG_VERSION=OmegaT {0} verzi\u00f3
 ABOUTDIALOG_VERSION_UPDATE=OmegaT {0} verzi\u00f3, {1} friss\u00edt\u00e9s
 
 ABOUTDIALOG_TITLE=Az OmegaT le\u00edr\u00e1sa
-ABOUTDIALOG_COPYRIGHT=Szerz\u0151i jog(\u00a9) 2000-2010 Keith Godfrey, Makszim Mihalcsuk \u00e9s m\u00e1sok
+ABOUTDIALOG_COPYRIGHT=Szerz\u0151i jog(\u00a9) 2000-2011 Keith Godfrey, Makszim Mihalcsuk \u00e9s m\u00e1sok
 
 ABOUTDIALOG_LICENSE_BUTTON=&Licenc
-ABOUTDIALOG_CONTRIBUTORS=Az OmegaT ingyenes, t\u00f6bb platformon haszn\u00e1lhat\u00f3, ny\u00edlt forr\u00e1sk\u00f3d\u00fa seg\u00e9deszk\u00f6z a sz\u00e1m\u00edt\u00f3g\u00e9ppel seg\u00edtett ford\u00edt\u00e1shoz, mely bizonytalan mintailleszt\u00e9s, ford\u00edt\u00e1si mem\u00f3ria, kulcsszavas keres\u00e9s, sz\u00f3jegyz\u00e9kek haszn\u00e1lat\u00e1val seg\u00edti ford\u00edt\u00e1si projektek lebonyol\u00edt\u00e1s\u00e1t.\n\nAz OmegaT eredetileg Keith Godfrey munk\u00e1ja.\nAz OmegaT projektet Marc Prior koordin\u00e1lja.\n\nA programk\u00f3dot k\u00e9sz\u00edtett\u00e9k: Bartk\u00f3 Zolt\u00e1n, Volker Berlin, Didier Briel (verzi\u00f3vezet\u0151), Kim Bruning, Alex Bulojcsik, Sandra Jean Chua, Martin Fleurke, Wildrich Fourie, Thomas Huriaux, Ibai Lakunza Velasco, Fabi\u00e1n Mandelbaum, Makszim Mihalcsuk, Arno Peters, Henry Pijffers, Tiago Saboga, Andrzej Sawu\u0142a, Benjamin Siband, Antonio Vilei \u00e9s Martin Wunderlich.\n\nA t\u00f6bbi r\u00e9sztvev\u0151 felsorol\u00e1s\u00e1t l\u00e1sd a readme.txt \u00e1llom\u00e1nyban\n\nAz OmegaT az al\u00e1bbi k\u00f6nyvt\u00e1rakat haszn\u00e1lja:\n  A HTMLParser 1.6 Somik Raha, Derrick Oswald \u00e9s m\u00e1sok programja (LGPL-enged\u00e9ly).\n  Az MRJ-adapter 1.0.8 Steve Roy munk\u00e1ja (LGPL-enged\u00e9ly).\n  A VLDocking Framework 2.1.4 nev\u0171 programja a VLSolutions c\u00e9gt\u0151l (CeCILL-enged\u00e9ly).\n  A Hunspell 1.1.12 N\u00e9meth L\u00e1szl\u00f3t\u00f3l \u00e9s m\u00e1sokt\u00f3l (LGPL-enged\u00e9ly)\n  A JNA Todd Fast, Timothy Wall \u00e9s m\u00e1sok munk\u00e1ja (LGPL-enged\u00e9ly)\n  Swing-Layout 1.0.2 (LGPL-enged\u00e9ly)\n  Jmyspell 2.1.4 (LGPL-enged\u00e9ly) \n  JAXB (GPLv2 + classpath exception)
+ABOUTDIALOG_CONTRIBUTORS=Az OmegaT ingyenes, t\u00f6bb platformon haszn\u00e1lhat\u00f3, ny\u00edlt forr\u00e1sk\u00f3d\u00fa seg\u00e9deszk\u00f6z a sz\u00e1m\u00edt\u00f3g\u00e9ppel seg\u00edtett ford\u00edt\u00e1shoz, mely bizonytalan mintailleszt\u00e9s, ford\u00edt\u00e1si mem\u00f3ria, kulcsszavas keres\u00e9s, sz\u00f3jegyz\u00e9kek haszn\u00e1lat\u00e1val seg\u00edti ford\u00edt\u00e1si projektek lebonyol\u00edt\u00e1s\u00e1t.\n\nAz OmegaT eredetileg Keith Godfrey munk\u00e1ja.\nAz OmegaT projektet Marc Prior koordin\u00e1lja.\n\nA programk\u00f3dot k\u00e9sz\u00edtett\u00e9k: Bartk\u00f3 Zolt\u00e1n, Volker Berlin, Didier Briel (fejleszt\u00e9svezet\u0151), Kim Bruning, Alex Bulojcsik (f\u0151 fejleszt\u0151), Sandra Jean Chua, Martin Fleurke, Wildrich Fourie, Thomas Huriaux, Ibai Lakunza Velasco, Fabi\u00e1n Mandelbaum, Makszim Mihalcsuk, Arno Peters, Henry Pijffers, Tiago Saboga, Andrzej Sawu\u0142a, Benjamin Siband, Rasid Umarov, Antonio Vilei \u00e9s Martin Wunderlich.\n\nA t\u00f6bbi k\u00f6zrem\u0171k\u00f6d\u0151 felsorol\u00e1s\u00e1t l\u00e1sd a readme.txt \u00e1llom\u00e1nyban\n\nAz OmegaT az al\u00e1bbi k\u00f6nyvt\u00e1rakat haszn\u00e1lja:\n  A HTMLParser 1.6 Somik Raha, Derrick Oswald \u00e9s m\u00e1sok programja (LGPL-enged\u00e9ly).\n  Az MRJ-adapter 1.0.8 Steve Roy munk\u00e1ja (LGPL-enged\u00e9ly).\n  A VLDocking Framework 2.1.4 nev\u0171 programja a VLSolutions c\u00e9gt\u0151l (CeCILL-enged\u00e9ly).\n  A Hunspell 1.1.12 N\u00e9meth L\u00e1szl\u00f3t\u00f3l \u00e9s m\u00e1sokt\u00f3l (LGPL-enged\u00e9ly)\n  A JNA Todd Fast, Timothy Wall \u00e9s m\u00e1sok munk\u00e1ja (LGPL-enged\u00e9ly)\n  Swing-Layout 1.0.2 (LGPL-enged\u00e9ly)\n  Jmyspell 2.1.4 (LGPL-enged\u00e9ly) \n  JAXB (GPLv2 + classpath exception)
 
 # LicenseDialog.java
 
@@ -981,6 +995,7 @@ ST_PROJECT_AUTOSAVED=A projekt automatikusan mentve ekkor: {0}
 # org.omegat.filters2.html2.*
 
 HTML__FILE_TOO_BIG=T\u00fal nagy HTML-\u00e1llom\u00e1ny!
+HTML__INVALID_HTML=Invalid HTML file
 
 HTML__FILTER_NAME=HTML- \u00e9s XHTML-\u00e1llom\u00e1nyok
 
@@ -1061,7 +1076,7 @@ CORE_SRX_RULES_LANG_JAPANESE=jap\u00e1n
 CORE_SRX_RULES_LANG_ENGLISH=angol
 CORE_SRX_RULES_LANG_DEFAULT=Alapbe\u00e1ll\u00edt\u00e1s szerinti
 CORE_SRX_RULES_FORMATTING_TEXT=Sz\u00f6veges \u00e1llom\u00e1nyok darabol\u00e1sa
-CORE_SRX_RULES_FORMATTING_HTML=HTML-, XHTML- \u00e9s ODF-\u00e1llom\u00e1nyok darabol\u00e1sa
+CORE_SRX_RULES_FORMATTING_HTML=HTML, XHTML, ODF and Infix segmentation
 
 
 # org.omegat.segmentation.SegmentationCustomizer
@@ -1238,6 +1253,8 @@ GUI_SPELLCHECKER_AVAILABLE_LABEL=El\u00e9rhet\u0151 nyelvek:
 
 GUI_SPELLCHECKER_DICTIONARYLABEL=Sz\u00f3t\u00e1rk\u00f6nyvt\u00e1r:
 
+GUI_SPELLCHECKER_FILE_CHOOSER_TITLE=Sz\u00f3t\u00e1r\u00e1llom\u00e1ny mapp\u00e1ja
+
 GUI_SPELLCHECKER_DIRECTORYCHOOSERBUTTON=&V\u00e1laszt\u00e1s...
 
 GUI_SPELLCHECKER_INSTALLBUTTON=&Telep\u00edt\u00e9s...
@@ -1331,3 +1348,4 @@ LT_OPTIONS_MENU_ENABLED=Nyelvi ellen\u0151rz\u0151
 
 # org.omegat.gui.dialogs.TeamOptionsDialog
 PROXY_LOGIN_DIALOG=Proxy-felhaszn\u00e1l\u00f3n\u00e9v \u00e9s -jelsz\u00f3
+OpenXML_TRANSLATE_WORDART=WordAr&t
diff --git a/src/org/omegat/Bundle_it.properties b/src/org/omegat/Bundle_it.properties
index 7bf8d49..6f0f030 100644
--- a/src/org/omegat/Bundle_it.properties
+++ b/src/org/omegat/Bundle_it.properties
@@ -42,7 +42,7 @@
 #  @author Wildrich Fourie
 #  @author Antonio Vilei
 #
-#  @version 2.2
+#  @version 2.3
 #
 
 # The version number is taken from Version.properties, key version
@@ -149,9 +149,9 @@ TF_MENU_EDIT_REDO=&Ripristina l'ultima azione
 
 TF_MENU_EDIT_FIND=Ce&rca nel progetto...
 
-TF_MENU_EDIT_INSERT=&Inserisci corrispondenza
+TF_MENU_EDIT_INSERT=&Inserisci concordanza
 
-TF_MENU_EDIT_RECYCLE=Sostituisci con corrispond&enza
+TF_MENU_EDIT_RECYCLE=Sostituisci con concord&anza
 
 TF_MENU_EDIT_OVERWRITE_MACHITE_TRANSLATION=Sostituisci con la &Traduzione automatica
 
@@ -163,15 +163,15 @@ TF_MENU_EDIT_TAGPAINT=Inserisci ta&g di partenza
 
 TF_MENU_EDIT_CREATE_GLOSSARY_ENTRY=Crea &voce di glossario
 
-TF_MENU_EDIT_COMPARE_1=Seleziona corrispondenza #&1
+TF_MENU_EDIT_COMPARE_1=Seleziona concordanza #&1
 
-TF_MENU_EDIT_COMPARE_2=Seleziona corrispondenza #&2
+TF_MENU_EDIT_COMPARE_2=Seleziona concordanza #&2
 
-TF_MENU_EDIT_COMPARE_3=Seleziona corrispondenza #&3
+TF_MENU_EDIT_COMPARE_3=Seleziona concordanza #&3
 
-TF_MENU_EDIT_COMPARE_4=Seleziona corrispondenza #&4
+TF_MENU_EDIT_COMPARE_4=Seleziona concordanza #&4
 
-TF_MENU_EDIT_COMPARE_5=Seleziona corrispondenza #&5
+TF_MENU_EDIT_COMPARE_5=Seleziona concordanza #&5
 
 MW_GOTOMENU=&Vai
 
@@ -193,7 +193,7 @@ TF_MENU_TOOLS=&Strumenti
 
 TF_MENU_TOOLS_VALIDATE=Con&valida i tag
 TF_MENU_TOOLS_STATISTICS_STANDARD=&Statistiche
-TF_MENU_TOOLS_STATISTICS_MATCHES=&Corrispondenza statistiche
+TF_MENU_TOOLS_STATISTICS_MATCHES=&Concordanza statistiche
 
 MW_OPTIONSMENU=&Opzioni
 
@@ -227,7 +227,7 @@ TF_OPTIONSMENU_TRANSTIPS=Su&ggerimenti
 
 TF_OPTIONSMENU_TRANSTIPS_ENABLE=&Abilita suggerimenti
 
-TF_OPTIONSMENU_TRANSTIPS_EXACTMATCH=Corrispondenza &esatta
+TF_OPTIONSMENU_TRANSTIPS_EXACTMATCH=Concordanza &esatta
 
 MW_OPTIONSMENU_ALWAYS_CONFIRM_QUIT=Conferma sempre l'&uscita
 
@@ -459,15 +459,15 @@ CT_STATS_FILE_Unique_Remaining_Characters=Caratteri univoci restanti (con spazi)
 
 CT_STATSSTANDARD_WindowHeader=Statistiche
 
-CT_STATSMATCH_WindowHeader=Corrispondenza statistiche
+CT_STATSMATCH_WindowHeader=Concordanza statistiche
 
 CT_STATSMATCH_RowRepetitions=Ripetizioni:
-CT_STATSMATCH_RowExactMatch=Corrispondenza esatta:
+CT_STATSMATCH_RowExactMatch=Concordanza esatta:
 CT_STATSMATCH_RowMatch95=95%-100%:
 CT_STATSMATCH_RowMatch85=85%-94%:
 CT_STATSMATCH_RowMatch75=75%-84%:
 CT_STATSMATCH_RowMatch50=50%-74%:
-CT_STATSMATCH_RowNoMatch=Nessuna corrispondenza:
+CT_STATSMATCH_RowNoMatch=Nessuna concordanza:
 
 
 # org.omegat.core.matching.LevenshteinDistance
@@ -611,7 +611,7 @@ SW_ERROR_BAD_DIR=Nome della cartella non corretta {0}
 
 ST_FATAL_ERROR=Il processo di ricerca si \u00e8 interrotto in modo inatteso. Chiudere la finestra di ricerca.
 
-ST_NOTHING_FOUND=Nessuna corrispondenza trovata.
+ST_NOTHING_FOUND=Nessuna concordanza trovata.
 
 # 0 - Nr of hits
 SW_NR_OF_RESULTS=N. di risultati: {0}
@@ -796,6 +796,10 @@ LATEXFILTER_FILTER_NAME=File LaTeX
 # PoFilter.java
 
 POFILTER_FILTER_NAME=File PO
+POFILTER_OPTIONS_TITLE=Opzioni filtro PO
+POFILTER_ALLOW_BLANK=Consenti traduzioni vuote nei file tradotti
+POFILTER_EXCEPTION=Il filtro PO ha restituito un'eccezione:
+POFILTER_INVALID_FORMAT=Formato del file non valido
 
 # RcFilter.java
 
@@ -849,6 +853,12 @@ WIX_FILTER_NAME=File di localizzazione WiX
 # SvgFilter.java
 SVG_FILTER_NAME=File immagine SVG
 
+# Infix filter
+INFIX_FILTER_NAME=File Infix
+
+# Flash filter
+FLASH_FILTER_NAME=Esportazione Flash XML
+
 # org.omegat.filters3.xml.Handler
 XML_FATAL_ERROR=Errore nel file {0}, riga {1}
 
@@ -892,7 +902,7 @@ OpenDoc_ERROR_IN_FILE=Errore nel file
 OpenXML_FILTER_NAME=File Microsoft Open XML
 OpenXML_FILTER_OPTIONS=Opzioni filtro Open XML
 OpenXML_WORD=Word
-OpenXML_TRANSLATE_HIDDEN_TEXT=&Testo di istruzioni non visibili
+OpenXML_TRANSLATE_HIDDEN_TEXT=Te&sto di istruzioni non visibili
 OpenXML_TRANSLATE_COMMENTS=Co&mmenti
 OpenXML_TRANSLATE_FOOTNOTES=Note a &pi\u00e8 pagina
 OpenXML_TRANSLATE_ENDNOTES=Note di &chiusura
@@ -909,8 +919,10 @@ OpenXML_GLOBAL=Globale
 OpenXML_TRANSLATE_CHARTS=Gra&fici
 OpenXML_TRANSLATE_DIAGRAMS=D&iagrammi
 OpenXML_TRANSLATE_DRAWINGS=Dis&egni
+OpenXML_TRANSLATE_WORDART=WordAr&t
 OpenXML_GENERIC_OPTIONS=Altre opzioni:
 OpenXML_AGGREGATE_TAGS=Tag complessi&vi
+OpenXML_PRESERVE_SPACES=&Preserva spazi per tutti i tag
 
 OpenXML_ERROR_IN_FILE=Errore nel file
 
@@ -924,7 +936,7 @@ ABOUTDIALOG_TITLE=Panoramica su OmegaT
 ABOUTDIALOG_COPYRIGHT=Copyright \u00a9 2000-2011 Keith Godfrey, Maxym Mykhalchuk et al
 
 ABOUTDIALOG_LICENSE_BUTTON=&Licenza
-ABOUTDIALOG_CONTRIBUTORS=OmegaT \u00e8 un software di traduzione assistita (CAT, Computer Assisted Translation) multi-piattaforma dalle numerose funzioni, tra cui: ricerca delle corrispondenze parziali, uso di memorie di traduzione, ricerca di parole chiave, glossari e integrazione delle traduzioni all'interno di progetti aggiornati.\n\nOmegaT \u00e8 un lavoro originale di Keith Godfrey.\nMarc Prior \u00e8 il coordinatore del progetto OmegaT.\n\nHanno contribuito al codice: \nZoltan Bartko, Volker Berlin, Didier Briel (gestore dello sviluppo), Kim Bruning, Alex Buloichik (sviluppatore principale), Sandra Jean Chua, Martin Fleurke, Wildrich Fourie, Thomas Huriaux, Ibai Lakunza Velasco, Fabi\u00e1n Mandelbaum, Maxym Mykhalchuk, Arno Peters, Henry Pijffers, Tiago Saboga, Andrzej Sawu\u0142a, Benjamin Siband, Rashid Umarov, Antonio Vilei e Martin Wunderlich\n\nIl dettaglio degli altri contributi si trova nel file readme.txt\n\nOmegaT usa le seguenti librerie:\n  HTMLParser 1.6 di Somik Raha, Derrick Oswald et al (licenza LGPL)\n  MRJ Adapter 1.0.8 di Steve Roy (licenza LGPL)\n  VLDocking Framework 2.1.4 di VLSolutions (licenza CeCILL)\n  Hunspell di L\u00e1szl\u00f3 N\u00e9meth et al (licenza LGPL)\n  JNA di Todd Fast, Timothy Wall et al (licenza LGPL)\n  Swing-Layout 1.0.2 (licenza LGPL)\n  Jmyspell 2.1.4 (licenza LGPL) \n  JAXB (GPLv2 + classpath exception)
+ABOUTDIALOG_CONTRIBUTORS=OmegaT \u00e8 un software di traduzione assistita (CAT, Computer Assisted Translation) multi-piattaforma dalle numerose funzioni, tra cui: ricerca delle concordanze parziali, uso di memorie di traduzione, ricerca di parole chiave, glossari e integrazione delle traduzioni all'interno di progetti aggiornati.\n\nOmegaT \u00e8 un lavoro originale di Keith Godfrey.\nMarc Prior \u00e8 il coordinatore del progetto OmegaT.\n\nHanno contribuito al codice: \nZoltan Bartko, Volker Berlin, Didier Briel (gestore dello sviluppo), Kim Bruning, Alex Buloichik (sviluppatore principale), Sandra Jean Chua, Martin Fleurke, Wildrich Fourie, Thomas Huriaux, Ibai Lakunza Velasco, Fabi\u00e1n Mandelbaum, Maxym Mykhalchuk, Arno Peters, Henry Pijffers, Tiago Saboga, Andrzej Sawu\u0142a, Benjamin Siband, Rashid Umarov, Antonio Vilei e Martin Wunderlich\n\nIl dettaglio degli altri contributi si trova nel file readme.txt\n\nOmegaT usa le seguenti librerie:\n  HTMLParser 1.6 di Somik Raha, Derrick Oswald et al (licenza LGPL)\n  MRJ Adapter 1.0.8 di Steve Roy (licenza LGPL)\n  VLDocking Framework 2.1.4 di VLSolutions (licenza CeCILL)\n  Hunspell di L\u00e1szl\u00f3 N\u00e9meth et al (licenza LGPL)\n  JNA di Todd Fast, Timothy Wall et al (licenza LGPL)\n  Swing-Layout 1.0.2 (licenza LGPL)\n  Jmyspell 2.1.4 (licenza LGPL) \n  JAXB (GPLv2 + classpath exception)
 
 # LicenseDialog.java
 
@@ -1064,7 +1076,7 @@ CORE_SRX_RULES_LANG_JAPANESE=Giapponese
 CORE_SRX_RULES_LANG_ENGLISH=Inglese
 CORE_SRX_RULES_LANG_DEFAULT=Predefinito
 CORE_SRX_RULES_FORMATTING_TEXT=Segmentazione file di testo
-CORE_SRX_RULES_FORMATTING_HTML=Segmentazione HTML, XHTML e ODF
+CORE_SRX_RULES_FORMATTING_HTML=Segmentazione HTML, XHTML, ODF e Infix
 
 
 # org.omegat.segmentation.SegmentationCustomizer
@@ -1107,9 +1119,9 @@ WF_OPTION_INSERT_SOURCE=&Testo di partenza
 
 WF_OPTION_INSERT_NOTHTHING=&Lascia il segmento vuoto
 
-WF_OPTION_INSERT_FUZZY_MATCH=Inserisci la corrispondenza parziale &migliore
+WF_OPTION_INSERT_FUZZY_MATCH=Inserisci la concordanza parziale &migliore
 
-GUI_WORKFLOW_OPTION_Minimal_Similarity=&Corrispondenza minima:
+GUI_WORKFLOW_OPTION_Minimal_Similarity=&Concordanza minima:
 
 WF_OPTION_INSERT_FUZZY_PREFIX=&Prefisso:
 
@@ -1157,7 +1169,7 @@ TV_OPTION_FULL_CHECK=Controlla &tutte le variabili printf (es.: %s, %-s)
 
 # org.omegat.gui.main.MainWindow / Docking
 
-GUI_MATCHWINDOW_SUBWINDOWTITLE_Fuzzy_Matches=Corrispondenze parziali (fuzzy)
+GUI_MATCHWINDOW_SUBWINDOWTITLE_Fuzzy_Matches=Concordanze parziali (fuzzy)
 
 GUI_MATCHWINDOW_SUBWINDOWTITLE_Glossary=Glossario
 
@@ -1311,9 +1323,9 @@ MW_VIEW_MENU_MODIFICATION_INFO_ALL=&Tutti
 
 MATCHES_GO_TO_SEGMENT_SOURCE=Vai al segmento sorgente
 
-MATCHES_INSERT=Inserisci corrispondenza nella traduzione
+MATCHES_INSERT=Inserisci concordanza nella traduzione
 
-MATCHES_REPLACE=Sostituisci la traduzione con la corrispondenza
+MATCHES_REPLACE=Sostituisci la traduzione con la concordanza
 
 # Dictionary area popup menu
 DICTIONARY_HIDE=Nascondi '{0}'
@@ -1336,3 +1348,4 @@ LT_OPTIONS_MENU_ENABLED=Verificatore linguistico
 
 # org.omegat.gui.dialogs.TeamOptionsDialog
 PROXY_LOGIN_DIALOG=Nome utente proxy e password
+OpenXML_TRANSLATE_WORDART=WordAr&t
diff --git a/src/org/omegat/Bundle_ja.properties b/src/org/omegat/Bundle_ja.properties
index 1a7ad7d..2e89b34 100644
--- a/src/org/omegat/Bundle_ja.properties
+++ b/src/org/omegat/Bundle_ja.properties
@@ -47,8 +47,8 @@
 
 # The version number is taken from Version.properties, key version
 # and inserted into the following template
-version-template=OmegaT-{0}
-version-update-template=OmegaT-{0}_{1}
+version-template=OmegaT \u30d0\u30fc\u30b8\u30e7\u30f3 {0}
+version-update-template=OmegaT \u30d0\u30fc\u30b8\u30e7\u30f3 {0} \u30a2\u30c3\u30d7\u30c7\u30fc\u30c8 {1}
 
 # buttons
 BUTTON_OK=\u78ba\u5b9a
@@ -59,7 +59,7 @@ BUTTON_CLOSE=\u9589\u3058\u308b
 
 BUTTON_FILTER=\u30d5\u30a3\u30eb\u30bf\u30fc
 
-BUTTON_REMOVEFILTER=\u30d5\u30a3\u30eb\u30bf\u30fc\u3092\u524a\u9664
+BUTTON_REMOVEFILTER=\u30d5\u30a3\u30eb\u30bf\u30fc\u3092\u89e3\u9664
 
 BUTTON_HOME=\u76ee\u6b21
 
@@ -93,16 +93,16 @@ ERROR_TITLE=\u30a8\u30e9\u30fc
 
 CONFIRM_DIALOG_TITLE=\u78ba\u8a8d
 
-OUT_OF_MEMORY=\u30e1\u30e2\u30ea\u30fc\u4e0d\u8db3\u306e\u305f\u3081OmegaT\u304c\u52d5\u4f5c\u3057\u307e\u305b\u3093\u3002OK\u3092\u62bc\u3059\u3068\u3001OmegaT\u306f\u7d42\u4e86\u3057\u307e\u3059\u3002\u4ee5\u4e0b\u306e\u3088\u3046\u306a\u5bfe\u51e6\u6cd5\u304c\u3042\u308a\u307e\u3059\uff1a\n\n1\uff09\u4e00\u5ea6\u306b\u7ffb\u8a33\u3059\u308b\u539f\u6587\u30d5\u30a1\u30a4\u30eb\u306e\u6570\u3092\u6e1b\u3089\u3057\u3001\u8907\u6570\u306b\u5206\u3051\u3066\u7ffb\u8a33\u3059\u308b\u3002\n\n2\uff09\u30b3\u30de\u30f3\u30c9\u30e9\u30a4\u30f3\u3001\u307e\u305f\u306fOmegaT\u8d77\u52d5\u30b9\u30af\u30ea\u30d7\u30c8\u3067 java -Xmx<\u5bb9\u91cf[MB]>M -jar OmegaT.jar \u3068\u6307\u5b9a\u3057\u3001OmegaT\u304c\u4f7f\u7528\u3067\u304d\u308b\u30e1\u30e2\u30ea\u30fc\u3092\u5897\u3084\u3059\uff08\u73fe\u5728\u306e\u8a2d\u5b9a\uff1a{0} MB\uff09\n\n3\uff09http://sourceforge.net/projects/omegat \u3067\u30d0\u30b0\u5831\u544a\u3092\u884c\u3046\u3002\n\nOmegaT\u3092\u7d42\u4e86\u3057\u307e\u3059\u3002\n
+OUT_OF_MEMORY=\u30e1\u30e2\u30ea\u30fc\u4e0d\u8db3\u306e\u305f\u3081 OmegaT \u304c\u52d5\u4f5c\u3057\u307e\u305b\u3093\u3002OK \u3092\u62bc\u3059\u3068\u3001OmegaT \u3092\u7d42\u4e86\u3057\u307e\u3059\u3002\u4ee5\u4e0b\u306e\u3088\u3046\u306a\u5bfe\u51e6\u6cd5\u304c\u3042\u308a\u307e\u3059\uff1a\n\n1) \u4e00\u5ea6\u306b\u7ffb\u8a33\u3059\u308b\u539f\u6587\u30d5\u30a1\u30a4\u30eb\u306e\u6570\u3092\u6e1b\u3089\u3057\u3001\u8907\u6570\u306b\u5206\u3051\u3066\u7ffb\u8a33\u3059\u308b\n\n2) \u30b3\u30de\u30f3\u30c9\u30e9\u30a4\u30f3\u307e\u305f\u306f OmegaT \u8d77\u52d5\u30b9\u30af\u30ea\u30d7\u30c8\u3067 java -Xmx<\u5bb9\u91cf[MB]>M -jar OmegaT.jar \u3068\u6307\u5b9a\u3057\u3001OmegaT \u304c\u4f7f\u7528\u3067\u304d\u308b\u30e1\u30e2\u30ea\u30fc\u3092\u5897\u3084\u3059\uff08\u73fe\u5728\u306e\u8a2d\u5b9a\uff1a{0} MB\uff09\n\n3) http://sourceforge.net/projects/omegat \u306b\u30d0\u30b0\u3068\u3057\u3066\u5831\u544a\u3059\u308b\n\nOmegaT \u3092\u7d42\u4e86\u3057\u307e\u3059\u3002\n
 
-MEMORY_USAGE=\u73fe\u5728VM\u304c\u4f7f\u7528\u3057\u3066\u3044\u308b\u30e1\u30e2\u30ea\u30fc\u306f {0} MB\u3067\u3059\u3002\u7a7a\u304d\u306f {1} MB\u3067\u3001\u6700\u5927 {2} MB\u4f7f\u7528\u53ef\u80fd\u3067\u3059\u3002
+MEMORY_USAGE=\u73fe\u5728 VM \u304c\u4f7f\u7528\u3057\u3066\u3044\u308b\u30e1\u30e2\u30ea\u30fc\u306f {0} MB \u3067\u3059\u3002\u7a7a\u304d\u5bb9\u91cf\u306f {1} MB \u3067\u3001\u6700\u5927 {2} MB \u304c\u4f7f\u7528\u53ef\u80fd\u3067\u3059\u3002
 
 #The name of encoding meaning that the filter should determine the encoding itself.
 ENCODING_AUTO=<\u81ea\u52d5>
 
 
 # MainWindow
-TF_INTRO_EMPTYPROJECT=OmegaT\u304c\u5bfe\u5fdc\u3059\u308b\u30d5\u30a1\u30a4\u30eb\u5f62\u5f0f\u306e\u539f\u6587\u30d5\u30a1\u30a4\u30eb\u304c\u542b\u307e\u308c\u3066\u3044\u307e\u305b\u3093\u3002\uff08\u53d6\u6271\u8aac\u660e\u66f8\u306e\u300c\u7ffb\u8a33\u5bfe\u8c61\u30d5\u30a1\u30a4\u30eb\u300d\u2192\u300c\u30d5\u30a1\u30a4\u30eb\u5f62\u5f0f\u300d\u3092\u53c2\u7167\u3057\u3066\u304f\u3060\u3055\u3044\u3002\uff09\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306b\u30d5\u30a1\u30a4\u30eb\u3092\u8ffd\u52a0\u3059\u308b\u306b\u306f\u3001\u7ffb\u8a33\u5bfe\u8c61\u30d5\u30a1\u30a4\u30eb\u4e00\u89a7\u30a6\u30a3\u30f3\u30c9\u30a6\u306e\uff3b\u539f\u6587\u30d5\u30a1\u30a4\u30eb\u3092\u30a4\u30f3\u30dd\u30fc\u30c8...\uff3d\u3092\u30af\u30ea\u30c3\u30af\u3059\u308b\u304b\u3001\uff3b\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\uff3d\u30e1\u30cb\u30e5\u30fc\u304b\u3089\u540c\u3058\u9805\u76ee\u3092\u9078\u629e\u3057\u3001\u8ffd\u52a0\u3057\u305f\u3044\u539f\u6587\u30d5\u30a1\u30a4\u30eb\u3092\u9078\u629e\u3057\u3066\u304f\u3060\u3055\u3044\u3002\u30d5\u30a1\u30a4\u30eb\u30de\u30cd\u30fc\u30b8\u30e3\u30fc\u3092\u4f7f\u7528\u3057\u3066\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306esource\u30d5\u30a9\u30eb\u30c0\u30fc\u306b\u30d5\u30a1\u30a4\u30eb\u3092\u30b3\u30d4\u30fc\u3057\u3001\u30e1\u30cb\u30e5\u30fc\u306e\uff3b\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\uff3d\u2192\uff3b\u518d\u8aad\u307f\u8fbc\u307f\uff3d\u3067\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3092\u518d\u5ea6\u8aad\u307f\u8fbc\u3080\u3053\u3068\u3082\u3067\u304d\u307e\u3059\u3002
+TF_INTRO_EMPTYPROJECT=OmegaT \u304c\u5bfe\u5fdc\u3059\u308b\u30d5\u30a1\u30a4\u30eb\u5f62\u5f0f\u306e\u539f\u6587\u30d5\u30a1\u30a4\u30eb\u304c\u542b\u307e\u308c\u3066\u3044\u307e\u305b\u3093\u3002\uff08\u53d6\u6271\u8aac\u660e\u66f8\u306e\u300c\u7ffb\u8a33\u5bfe\u8c61\u30d5\u30a1\u30a4\u30eb\u300d\u2192\u300c\u30d5\u30a1\u30a4\u30eb\u5f62\u5f0f\u300d\u3092\u53c2\u7167\u3057\u3066\u304f\u3060\u3055\u3044\u3002\uff09\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306b\u30d5\u30a1\u30a4\u30eb\u3092\u8ffd\u52a0\u3059\u308b\u306b\u306f\u3001\u7ffb\u8a33\u5bfe\u8c61\u30d5\u30a1\u30a4\u30eb\u4e00\u89a7\u30a6\u30a3\u30f3\u30c9\u30a6\u3001\u307e\u305f\u306f\u30e1\u30a4\u30f3\u30e1\u30cb\u30e5\u30fc\u306e\uff3b\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\uff3d\u306b\u3042\u308b\uff3b\u539f\u6587\u30d5\u30a1\u30a4\u30eb\u3092\u8ffd\u52a0...\uff3d\u306b\u3088\u308a\u3001\u8ffd\u52a0\u3057\u305f\u3044\u539f\u6587\u30d5\u30a1\u30a4\u30eb\u3092\u9078\u629e\u3057\u3066\u304f\u3060\u3055\u3044\u3002\u30d5\u30a1\u30a4\u30eb\u30de\u30cd\u30fc\u30b8\u30e3\u30fc\u3092\u4f7f\u7528\u3057\u3066\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306e source \u30d5\u30a9\u30eb\u30c0\u30fc\u306b\u30d5\u30a1\u30a4\u30eb\u3092\u30b3\u30d4\u30fc\u3057\u3001\u30e1\u30cb\u30e5\u30fc\u306e\uff3b\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\uff3d\u2192\uff3b\u518d\u8aad\u307f\u8fbc\u307f\uff3d\u3092\u884c\u3063\u3066\u3082\u539f\u6587\u30d5\u30a1\u30a4\u30eb\u3092\u8ffd\u52a0\u3067\u304d\u307e\u3059\u3002
 
 TF_INTRO_EMPTYPROJECT_FILENAME=\u7a7a\u306e\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3067\u3059\u3002
 
@@ -114,16 +114,16 @@ TF_MENU_FILE=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8
 
 TF_MENU_FILE_CREATE=\u65b0\u898f\u4f5c\u6210...
 
-TF_MENU_FILE_OPEN=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3092\u958b\u304f...
+TF_MENU_FILE_OPEN=\u958b\u304f...
 
 TF_MENU_FILE_IMPORT=\u539f\u6587\u30d5\u30a1\u30a4\u30eb\u3092\u8ffd\u52a0...
 TF_FILE_IMPORT_TITLE=\u539f\u6587\u30d5\u30a1\u30a4\u30eb\u3092\u8ffd\u52a0...
 
-TF_MENU_WIKI_IMPORT=MediaWiki\u304b\u3089\u539f\u6587\u30d5\u30a1\u30a4\u30eb\u3092\u8ffd\u52a0...
+TF_MENU_WIKI_IMPORT=MediaWiki \u304b\u3089\u539f\u6587\u30d5\u30a1\u30a4\u30eb\u3092\u8ffd\u52a0...
 
-TF_WIKI_IMPORT_TITLE=MediaWiki\u304b\u3089\u539f\u6587\u30d5\u30a1\u30a4\u30eb\u3092\u8ffd\u52a0
+TF_WIKI_IMPORT_TITLE=MediaWiki \u304b\u3089\u539f\u6587\u30d5\u30a1\u30a4\u30eb\u3092\u8ffd\u52a0
 
-TF_WIKI_IMPORT_PROMPT=MediaWiki\u30da\u30fc\u30b8\u306eURL\u3092\u5165\u529b\u3057\u3066\u304f\u3060\u3055\u3044\u3002
+TF_WIKI_IMPORT_PROMPT=MediaWiki \u30da\u30fc\u30b8\u306e URL \u3092\u5165\u529b\u3057\u3066\u304f\u3060\u3055\u3044\uff1a
 
 MAIN_ERROR_File_Import_Failed=\u539f\u6587\u30d5\u30a1\u30a4\u30eb\u304c\u8ffd\u52a0\u3067\u304d\u307e\u305b\u3093\u3002
 
@@ -163,15 +163,15 @@ TF_MENU_EDIT_TAGPAINT=\u539f\u6587\u306e\u30bf\u30b0\u3092\u633f\u5165
 
 TF_MENU_EDIT_CREATE_GLOSSARY_ENTRY=\u7528\u8a9e\u306e\u8ffd\u52a0
 
-TF_MENU_EDIT_COMPARE_1=\u53c2\u8003\u8a33\u65871\u3092\u9078\u629e
+TF_MENU_EDIT_COMPARE_1=\u53c2\u8003\u8a33\u6587 1 \u3092\u9078\u629e
 
-TF_MENU_EDIT_COMPARE_2=\u53c2\u8003\u8a33\u65872\u3092\u9078\u629e
+TF_MENU_EDIT_COMPARE_2=\u53c2\u8003\u8a33\u6587 2 \u3092\u9078\u629e
 
-TF_MENU_EDIT_COMPARE_3=\u53c2\u8003\u8a33\u65873\u3092\u9078\u629e
+TF_MENU_EDIT_COMPARE_3=\u53c2\u8003\u8a33\u6587 3 \u3092\u9078\u629e
 
-TF_MENU_EDIT_COMPARE_4=\u53c2\u8003\u8a33\u65874\u3092\u9078\u629e
+TF_MENU_EDIT_COMPARE_4=\u53c2\u8003\u8a33\u6587 4 \u3092\u9078\u629e
 
-TF_MENU_EDIT_COMPARE_5=\u53c2\u8003\u8a33\u65875\u3092\u9078\u629e
+TF_MENU_EDIT_COMPARE_5=\u53c2\u8003\u8a33\u6587 5 \u3092\u9078\u629e
 
 MW_GOTOMENU=\u79fb\u52d5
 
@@ -183,9 +183,9 @@ TF_MENU_EDIT_PREV=\u524d\u306e\u5206\u7bc0
 
 TF_MENU_EDIT_GOTO=\u5206\u7bc0\u756a\u53f7\u3092\u6307\u5b9a...
 
-TF_MENU_GOTO_FORWARD_IN_HISTORY=\u9078\u629e\u3057\u305f\u5206\u7bc0\u5c65\u6b74\u3092\u3055\u304b\u306e\u307c\u308b
+TF_MENU_GOTO_FORWARD_IN_HISTORY=\u5206\u7bc0\u306e\u9078\u629e\u5c65\u6b74\u3092\u3055\u304b\u306e\u307c\u308b
 
-TF_MENU_GOTO_BACK_IN_HISTORY=\u9078\u629e\u3057\u305f\u5206\u7bc0\u5c65\u6b74\u3092\u304f\u3060\u308b
+TF_MENU_GOTO_BACK_IN_HISTORY=\u5206\u7bc0\u306e\u9078\u629e\u5c65\u6b74\u3092\u304f\u3060\u308b
 
 TF_MENU
 
@@ -197,7 +197,7 @@ TF_MENU_TOOLS_STATISTICS_MATCHES=\u53c2\u8003\u8a33\u6587\u306e\u4e00\u81f4\u738
 
 MW_OPTIONSMENU=\u8a2d\u5b9a
 
-TF_MENU_DISPLAY_ADVANCE=\uff3bTAB\uff3d\u3067\u9032\u3080
+TF_MENU_DISPLAY_ADVANCE=TAB \u30ad\u30fc\u3067\u6b21\u306e\u5206\u7bc0\u3078
 
 TF_MENU_DISPLAY_MARK_TRANSLATED=\u7ffb\u8a33\u6e08\u307f\u5206\u7bc0\u3092\u8272\u3065\u3051
 
@@ -211,7 +211,7 @@ MW_OPTIONSMENU_WORKFLOW=\u7ffb\u8a33\u5165\u529b\u884c...
 
 MW_OPTIONSMENU_TAGVALIDATION=\u30bf\u30b0\u691c\u8a3c...
 
-MW_OPTIONSMENU_TEAM=\u30c1\u30fc\u30e0...
+MW_OPTIONSMENU_TEAM=\u7ffb\u8a33\u8005\u540d...
 
 MW_OPTIONSMENU_EXT_TMX=\u5916\u90e8 TMX \u30d5\u30a1\u30a4\u30eb...
 
@@ -225,7 +225,7 @@ TF_OPTIONSMENU_MACHINETRANSLATE=\u6a5f\u68b0\u7ffb\u8a33
 
 TF_OPTIONSMENU_TRANSTIPS=TransTips
 
-TF_OPTIONSMENU_TRANSTIPS_ENABLE=TransTips\u3092\u6709\u52b9\u5316
+TF_OPTIONSMENU_TRANSTIPS_ENABLE=TransTips \u3092\u6709\u52b9\u5316
 
 TF_OPTIONSMENU_TRANSTIPS_EXACTMATCH=\u5b8c\u5168\u4e00\u81f4
 
@@ -239,13 +239,13 @@ TF_MENU_HELP=\u30d8\u30eb\u30d7
 
 TF_MENU_HELP_CONTENTS=\u53d6\u6271\u8aac\u660e\u66f8...
 
-TF_MENU_HELP_ABOUT=OmegaT\u306b\u3064\u3044\u3066...
+TF_MENU_HELP_ABOUT=OmegaT \u306b\u3064\u3044\u3066...
 
-MW_REOPEN_QUESTION=\u5909\u66f4\u3092\u53cd\u6620\u3055\u305b\u308b\u306b\u306f\u3001OmegaT\u3092\u7d42\u4e86\u3057\u3001\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3092\u518d\u5ea6\u958b\u3044\u3066\u304f\u3060\u3055\u3044\u3002\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3092\u518d\u8aad\u307f\u8fbc\u307f\u3057\u307e\u3059\u304b\uff1f
+MW_REOPEN_QUESTION=\u5909\u66f4\u3092\u53cd\u6620\u3055\u305b\u308b\u305f\u3081 OmegaT \u3092\u7d42\u4e86\u3057\u3001\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3092\u518d\u5ea6\u958b\u3044\u3066\u304f\u3060\u3055\u3044\u3002\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3092\u518d\u8aad\u307f\u8fbc\u307f\u3057\u307e\u3059\u304b\uff1f
 
 TF_TM_LOAD_ERROR=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306e\u7ffb\u8a33\u30e1\u30e2\u30ea\u3092\u8aad\u307f\u8fbc\u3081\u307e\u305b\u3093\u3067\u3057\u305f\u3002
 
-TF_LOAD_ERROR=\u6307\u5b9a\u3055\u308c\u305f\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3092\u8aad\u307f\u8fbc\u3081\u307e\u305b\u3093\u3067\u3057\u305f\u3002
+TF_LOAD_ERROR=\u6307\u5b9a\u3057\u305f\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3092\u8aad\u307f\u8fbc\u3081\u307e\u305b\u3093\u3067\u3057\u305f\u3002
 
 TF_COMPILE_ERROR=\u8a33\u6587\u30d5\u30a1\u30a4\u30eb\u3092\u751f\u6210\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002
 
@@ -260,9 +260,9 @@ MW_PROMPT_SEG_NR_MSG=\u5206\u7bc0\u756a\u53f7\u3092\u5165\u529b\u3057\u3066\u304
 MW_PROMPT_SEG_NR_TITLE=\u5206\u7bc0\u3078\u79fb\u52d5
 
 # {0} = total nr of segments in project
-MW_SEGMENT_NUMBER_ERROR=1\u304b\u3089 {0} \u306e\u6570\u5024\u3092\u5165\u529b\u3057\u3066\u304f\u3060\u3055\u3044\u3002
+MW_SEGMENT_NUMBER_ERROR=1 \u304b\u3089 {0} \u306e\u6570\u5024\u3092\u5165\u529b\u3057\u3066\u304f\u3060\u3055\u3044\u3002
 
-MW_ERROR_PROJECT_NOT_EDITABLE=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306e\u8a2d\u5b9a\u5909\u66f4\u6642\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002
+MW_ERROR_PROJECT_NOT_EDITABLE=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306e\u8a2d\u5b9a\u3092\u5909\u66f4\u3059\u308b\u969b\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002
 
 MW_REOPEN_TITLE=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3092\u518d\u8aad\u307f\u8fbc\u307f\u3057\u307e\u3059\u304b\uff1f
 
@@ -291,7 +291,7 @@ TF_CUR_SEGMENT_AUTHOR_DATE={0} \u304c {1} / {2} \u306b\u4fee\u6b63\u3057\u305f\u
 
 TF_CUR_SEGMENT_AUTHOR={0} \u306b\u3088\u308b\u4fee\u6b63
 
-TF_CUR_SEGMENT_UNKNOWN_AUTHOR=\u4e0d\u660e
+TF_CUR_SEGMENT_UNKNOWN_AUTHOR=\uff08\u4e0d\u660e\uff09
 
 TF_SELECT_FONTS_TITLE=\u8868\u793a\u7528\u5b57\u4f53\u306e\u8a2d\u5b9a
 
@@ -303,7 +303,7 @@ TF_FONT_SAMPLE_TEXT=\u8868\u793a\u306f\u3053\u306e\u3088\u3046\u306b\u306a\u308a
 
 
 
-TF_FONT_SAMPLE_TITLE=\u3053\u308c\u3067\u3069\u3046\u3067\u3059\u304b\uff1f
+TF_FONT_SAMPLE_TITLE=\u30b5\u30f3\u30d7\u30eb\u30c6\u30ad\u30b9\u30c8
 TF_APPLY_TO_PROJECT_FILES=\u3053\u306e\u5b57\u4f53\u3092\u7ffb\u8a33\u5bfe\u8c61\u30d5\u30a1\u30a4\u30eb\u4e00\u89a7\u306b\u9069\u7528
 
 # Project frame
@@ -315,7 +315,7 @@ PF_FILENAME=\u30d5\u30a1\u30a4\u30eb\u540d
 
 PF_NUM_SEGMENTS=\u5206\u7bc0\u6570
 
-PF_STAT_PATH=\u8a73\u7d30\u306f\u4ee5\u4e0b\u306e\u30d5\u30a1\u30a4\u30eb\u3092\u53c2\u7167\u3057\u3066\u304f\u3060\u3055\u3044\uff1a{0}
+PF_STAT_PATH=\u8a73\u7d30\u306f\u3053\u306e\u30d5\u30a1\u30a4\u30eb\u3092\u53c2\u7167\u3057\u3066\u304f\u3060\u3055\u3044\uff1a{0}
 
 GUI_PROJECT_TOTAL_SEGMENTS=\u3059\u3079\u3066\u306e\u5206\u7bc0\u6570
 
@@ -329,39 +329,39 @@ HF_WINDOW_TITLE=\u53d6\u6271\u8aac\u660e\u66f8
 
 HF_CANT_FIND_HELP=\u53d6\u6271\u8aac\u660e\u66f8\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\uff1a
 
-HF_ERROR_EXTLINK_TITLE=\u30ea\u30f3\u30af\u300c{0}\u300d\u304c\u958b\u3051\u307e\u305b\u3093
+HF_ERROR_EXTLINK_TITLE=\u30ea\u30f3\u30af {0} \u304c\u958b\u3051\u307e\u305b\u3093
 
-HF_ERROR_EXTLINK_MSG=\u53d6\u6271\u8aac\u660e\u66f8\u306e\u30a6\u30a3\u30f3\u30c9\u30a6\u304b\u3089\u3001\u5916\u90e8\u30ea\u30f3\u30af\u3092\u958b\u304f\u3053\u3068\u306f\u3067\u304d\u307e\u305b\u3093\u3002\u3053\u306e\u30ea\u30f3\u30af\u3078\u30a2\u30af\u30bb\u30b9\u3059\u308b\u306b\u306f\u3001URL\u3092 \u30b3\u30d4\u30fc\u3057\u3066Web\u30d6\u30e9\u30a6\u30b6\u3078\u8cbc\u308a\u4ed8\u3051\u308b\u304b\u3001\u53d6\u6271\u8aac\u660e\u66f8\uff08{0} \u30d5\u30a1\u30a4\u30eb\uff09\u3092Web\u30d6\u30e9\u30a6\u30b6\u4e0a\u3067\u958b\u3044\u3066\u304f\u3060\u3055\u3044\u3002
+HF_ERROR_EXTLINK_MSG=\u53d6\u6271\u8aac\u660e\u66f8\u306e\u30a6\u30a3\u30f3\u30c9\u30a6\u304b\u3089\u3001\u5916\u90e8\u30ea\u30f3\u30af\u3092\u76f4\u63a5\u958b\u304f\u3053\u3068\u306f\u3067\u304d\u307e\u305b\u3093\u3002\u30a2\u30af\u30bb\u30b9\u3059\u308b\u306b\u306f URL \u3092\u30b3\u30d4\u30fc\u3057\u3066 Web \u30d6\u30e9\u30a6\u30b6\u3078\u8cbc\u308a\u4ed8\u3051\u308b\u304b\u3001\u53d6\u6271\u8aac\u660e\u66f8\uff08{0} \u30d5\u30a1\u30a4\u30eb\uff09\u3092 Web \u30d6\u30e9\u30a6\u30b6\u3067\u958b\u3044\u3066\u304f\u3060\u3055\u3044\u3002
 
 # immortalize the BeOS 404 messages (some modified a bit for context)
-HF_HAIKU_1=docs\u30d5\u30a9\u30eb\u30c0\u30fc\u306e\u4f4d\u7f6e\u3092\u78ba\u8a8d\u3057\u3066\u304f\u3060\u3055\u3044\u3002
+HF_HAIKU_1=docs \u30d5\u30a9\u30eb\u30c0\u30fc\u306e\u5834\u6240\u3092\u78ba\u8a8d\u3057\u3066\u304f\u3060\u3055\u3044\u3002
 
-HF_HAIKU_2=docs\u30d5\u30a9\u30eb\u30c0\u30fc\u306e\u4f4d\u7f6e\u3092\u78ba\u8a8d\u3057\u3066\u304f\u3060\u3055\u3044\u3002
+HF_HAIKU_2=docs \u30d5\u30a9\u30eb\u30c0\u30fc\u306e\u5834\u6240\u3092\u78ba\u8a8d\u3057\u3066\u304f\u3060\u3055\u3044\u3002
 
-HF_HAIKU_3=docs\u30d5\u30a9\u30eb\u30c0\u30fc\u306e\u4f4d\u7f6e\u3092\u78ba\u8a8d\u3057\u3066\u304f\u3060\u3055\u3044\u3002
+HF_HAIKU_3=docs \u30d5\u30a9\u30eb\u30c0\u30fc\u306e\u5834\u6240\u3092\u78ba\u8a8d\u3057\u3066\u304f\u3060\u3055\u3044\u3002
 
-HF_HAIKU_4=docs\u30d5\u30a9\u30eb\u30c0\u30fc\u306e\u4f4d\u7f6e\u3092\u78ba\u8a8d\u3057\u3066\u304f\u3060\u3055\u3044\u3002
+HF_HAIKU_4=docs \u30d5\u30a9\u30eb\u30c0\u30fc\u306e\u5834\u6240\u3092\u78ba\u8a8d\u3057\u3066\u304f\u3060\u3055\u3044\u3002
 
-HF_HAIKU_5=docs\u30d5\u30a9\u30eb\u30c0\u30fc\u306e\u4f4d\u7f6e\u3092\u78ba\u8a8d\u3057\u3066\u304f\u3060\u3055\u3044\u3002
+HF_HAIKU_5=docs \u30d5\u30a9\u30eb\u30c0\u30fc\u306e\u5834\u6240\u3092\u78ba\u8a8d\u3057\u3066\u304f\u3060\u3055\u3044\u3002
 
-HF_HAIKU_6=docs\u30d5\u30a9\u30eb\u30c0\u30fc\u306e\u4f4d\u7f6e\u3092\u78ba\u8a8d\u3057\u3066\u304f\u3060\u3055\u3044\u3002
+HF_HAIKU_6=docs \u30d5\u30a9\u30eb\u30c0\u30fc\u306e\u5834\u6240\u3092\u78ba\u8a8d\u3057\u3066\u304f\u3060\u3055\u3044\u3002
 
-HF_HAIKU_7=docs\u30d5\u30a9\u30eb\u30c0\u30fc\u306e\u4f4d\u7f6e\u3092\u78ba\u8a8d\u3057\u3066\u304f\u3060\u3055\u3044\u3002
+HF_HAIKU_7=docs \u30d5\u30a9\u30eb\u30c0\u30fc\u306e\u5834\u6240\u3092\u78ba\u8a8d\u3057\u3066\u304f\u3060\u3055\u3044\u3002
 
-HF_HAIKU_8=docs\u30d5\u30a9\u30eb\u30c0\u30fc\u306e\u4f4d\u7f6e\u3092\u78ba\u8a8d\u3057\u3066\u304f\u3060\u3055\u3044\u3002
+HF_HAIKU_8=docs \u30d5\u30a9\u30eb\u30c0\u30fc\u306e\u5834\u6240\u3092\u78ba\u8a8d\u3057\u3066\u304f\u3060\u3055\u3044\u3002
 
-HF_HAIKU_9=docs\u30d5\u30a9\u30eb\u30c0\u30fc\u306e\u4f4d\u7f6e\u3092\u78ba\u8a8d\u3057\u3066\u304f\u3060\u3055\u3044\u3002
+HF_HAIKU_9=docs \u30d5\u30a9\u30eb\u30c0\u30fc\u306e\u5834\u6240\u3092\u78ba\u8a8d\u3057\u3066\u304f\u3060\u3055\u3044\u3002
 
-HF_HAIKU_10=docs\u30d5\u30a9\u30eb\u30c0\u30fc\u306e\u4f4d\u7f6e\u3092\u78ba\u8a8d\u3057\u3066\u304f\u3060\u3055\u3044\u3002
+HF_HAIKU_10=docs \u30d5\u30a9\u30eb\u30c0\u30fc\u306e\u5834\u6240\u3092\u78ba\u8a8d\u3057\u3066\u304f\u3060\u3055\u3044\u3002
 
-HF_HAIKU_11=docs\u30d5\u30a9\u30eb\u30c0\u30fc\u306e\u4f4d\u7f6e\u3092\u78ba\u8a8d\u3057\u3066\u304f\u3060\u3055\u3044\u3002
+HF_HAIKU_11=docs \u30d5\u30a9\u30eb\u30c0\u30fc\u306e\u5834\u6240\u3092\u78ba\u8a8d\u3057\u3066\u304f\u3060\u3055\u3044\u3002
 
 # CommandThread
-CT_FUZZY_X_OF_Y=\u5206\u7bc0\u3092\u8abf\u67fb\u4e2d... {1} \u5206\u306e {0} \u5b8c\u4e86
+CT_FUZZY_X_OF_Y=\u5206\u7bc0\u3092\u8abf\u67fb\u4e2d... {1} \u306e\u3046\u3061 {0} \u304c\u5b8c\u4e86
 
 CT_LOADING_PROJECT=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3092\u8aad\u307f\u8fbc\u307f\u4e2d...
 
-CT_LOADING_GLOSSARIES=\u7528\u8a9e\u96c6\u3092\u8aad\u307f\u8fbc\u307f\u4e2d...
+CT_LOADING_GLOSSARIES=\u7528\u8a9e\u96c6\u3092\u8aad\u307f\u8fbc\u307f\u4e2d
 
 CT_CANCEL_LOAD=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306e\u8aad\u307f\u8fbc\u307f\u304c\u4e2d\u65ad\u3055\u308c\u307e\u3057\u305f\u3002
 
@@ -369,29 +369,29 @@ CT_ERROR_SAVING_PROJ=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306e\u30d5\u30a1\u30a
 
 CT_ERROR_CREATE=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u4f5c\u6210\u6642\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002
 
-CT_FATAL_ERROR=\u81f4\u547d\u7684\u306a\u30a8\u30e9\u30fc\uff1a\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u30d5\u30a1\u30a4\u30eb\u306b .recover \u62e1\u5f35\u5b50\u3092\u4ed8\u3051\u3066\u30d0\u30c3\u30af\u30a2\u30c3\u30d7\u3092\u4fdd\u5b58\u3057\u3066\u3044\u307e\u3059\u3002\u56de\u5fa9\u65b9\u6cd5\u306b\u3064\u3044\u3066\u306f\u3001\u53d6\u6271\u8aac\u660e\u66f8\u3092\u53c2\u7167\u3057\u3066\u304f\u3060\u3055\u3044\u3002\u307e\u305f\u3001\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u305f\u969b\u306e\u64cd\u4f5c\u306a\u3069\u306b\u95a2\u3059\u308b\u60c5\u5831\u3092\u958b\u767a\u8005\u306b\u9001\u3063\u3066\u304f\u3060\u3055\u3044\u3002\n
+CT_FATAL_ERROR=\u81f4\u547d\u7684\u306a\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u30d5\u30a1\u30a4\u30eb\u306b .recover \u62e1\u5f35\u5b50\u3092\u4ed8\u3051\u3066\u30d0\u30c3\u30af\u30a2\u30c3\u30d7\u3092\u4fdd\u5b58\u3057\u3066\u3044\u307e\u3059\u3002\u56de\u5fa9\u65b9\u6cd5\u306b\u3064\u3044\u3066\u53d6\u6271\u8aac\u660e\u66f8\u306a\u3069\u3092\u53c2\u7167\u3057\u3066\u304f\u3060\u3055\u3044\u3002\u3053\u306e\u30a8\u30e9\u30fc\u304c\u3069\u306e\u3088\u3046\u306b\u3057\u3066\u767a\u751f\u3057\u305f\u304b\u306e\u60c5\u5831\u3068\u3068\u3082\u306b\u3001\u30bd\u30d5\u30c8\u30a6\u30a7\u30a2\u958b\u767a\u62c5\u5f53\u306b\u9001\u3063\u3066\u304f\u3060\u3055\u3044\u3002\n
 
 # 0 - Name of file being loaded
 CT_LOAD_FILE_MX={0} \u3092\u8aad\u307f\u8fbc\u307f\u4e2d
 
-CT_LOAD_SRC_COMPLETE=\u539f\u6587\u30d5\u30a1\u30a4\u30eb\u8aad\u307f\u8fbc\u307f\u5b8c\u4e86
+CT_LOAD_SRC_COMPLETE=\u539f\u6587\u30d5\u30a1\u30a4\u30eb\u306e\u8aad\u307f\u8fbc\u307f\u3092\u5b8c\u4e86\u3057\u307e\u3057\u305f
 
 CT_LOAD_TMX=TMX \u30d5\u30a1\u30a4\u30eb\u3092\u8aad\u307f\u8fbc\u307f\u4e2d...
 
 # 0 - Name of target document
 CT_COMPILE_FILE_MX=\u8a33\u6587\u30d5\u30a1\u30a4\u30eb {0} \u3092\u751f\u6210\u4e2d
 
-CT_COMPILE_DONE_MX=\u8a33\u6587\u30d5\u30a1\u30a4\u30eb\u751f\u6210\u5b8c\u4e86
+CT_COMPILE_DONE_MX=\u8a33\u6587\u30d5\u30a1\u30a4\u30eb\u306e\u751f\u6210\u3092\u5b8c\u4e86\u3057\u307e\u3057\u305f
 
 CT_ERROR_CREATING_TMX=\u65b0\u3057\u3044 TMX \u30d5\u30a1\u30a4\u30eb\u3092\u4f5c\u6210\u3067\u304d\u307e\u305b\u3093\u3002
 
 CT_ERROR_CREATING_PROJECT=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3092\u4f5c\u6210\u3067\u304d\u307e\u305b\u3093\u3002
 
-CT_ERROR_LOADING_PROJECT_FILE=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306e\u30d5\u30a1\u30a4\u30eb\u8aad\u307f\u8fbc\u307f\u6642\u306b\u554f\u984c\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002
+CT_ERROR_LOADING_PROJECT_FILE=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306e\u30d5\u30a1\u30a4\u30eb\u3092\u8aad\u307f\u8fbc\u3080\u969b\u306b\u554f\u984c\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002
 
 CT_ERROR_ACCESS_GLOSSARY_DIR=\u7528\u8a9e\u96c6\u30d5\u30a9\u30eb\u30c0\u30fc\u306b\u30a2\u30af\u30bb\u30b9\u3067\u304d\u307e\u305b\u3093\u3002
 
-CT_ERROR_CREATING_TARGET_DIR=\u8a33\u6587\u30d5\u30a1\u30a4\u30eb\u7528\u306e\u30d5\u30a9\u30eb\u30c0\u30fc\u304c\u4f5c\u6210\u3067\u304d\u307e\u305b\u3093\u3002
+CT_ERROR_CREATING_TARGET_DIR=\u8a33\u6587\u30d5\u30a1\u30a4\u30eb\u7528\u306e\u30d5\u30a9\u30eb\u30c0\u30fc\u304c\u4f5c\u6210\u3067\u304d\u307e\u305b\u3093\uff1a
 
 # 0 - Name of TMX file
 CT_ERROR_CANNOT_FIND_TMX=\u4fdd\u5b58\u3055\u308c\u305f TMX \u30d5\u30a1\u30a4\u30eb\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\uff1a{0}
@@ -424,37 +424,37 @@ CT_STATS_FILE_Statistics=\u30d5\u30a1\u30a4\u30eb\u3054\u3068\u306e\u7ffb\u8a33\
 
 CT_STATS_FILE_Name=\u30d5\u30a1\u30a4\u30eb\u540d
 
-CT_STATS_FILE_Total_Segments=\u5408\u8a08\u306e\u5206\u7bc0\u6570
+CT_STATS_FILE_Total_Segments=\u3059\u3079\u3066\u306e\u5206\u7bc0\u6570
 
-CT_STATS_FILE_Remaining_Segments=\u672a\u7ffb\u8a33\u306e\u5206\u7bc0\u6570
+CT_STATS_FILE_Remaining_Segments=\u672a\u7ffb\u8a33\u5206\u7bc0\u6570
 
 CT_STATS_FILE_Unique_Segments=\u7e70\u308a\u8fd4\u3057\u3092\u9664\u3044\u305f\u5206\u7bc0\u6570
 
-CT_STATS_FILE_Unique_Remaining_Segments=\u7e70\u308a\u8fd4\u3057\u3092\u9664\u3044\u305f\u672a\u7ffb\u8a33\u306e\u5206\u7bc0\u6570
+CT_STATS_FILE_Unique_Remaining_Segments=\u7e70\u308a\u8fd4\u3057\u3092\u9664\u3044\u305f\u672a\u7ffb\u8a33\u5206\u7bc0\u6570
 
-CT_STATS_FILE_Total_Words=\u5408\u8a08\u5358\u8a9e\u6570
+CT_STATS_FILE_Total_Words=\u3059\u3079\u3066\u306e\u5358\u8a9e\u6570
 
 CT_STATS_FILE_Remaining_Words=\u672a\u7ffb\u8a33\u5358\u8a9e\u6570
 
 CT_STATS_FILE_Unique_Words=\u7e70\u308a\u8fd4\u3057\u3092\u9664\u3044\u305f\u5358\u8a9e\u6570
 
-CT_STATS_FILE_Unique_Remaining_Words=\u7e70\u308a\u8fd4\u3057\u3092\u9664\u3044\u305f\u672a\u7ffb\u8a33\u306e\u5358\u8a9e\u6570
+CT_STATS_FILE_Unique_Remaining_Words=\u7e70\u308a\u8fd4\u3057\u3092\u9664\u3044\u305f\u672a\u7ffb\u8a33\u5358\u8a9e\u6570
 
-CT_STATS_FILE_Total_Characters_NOSP=\u5408\u8a08\u6587\u5b57\u6570\uff08\u7a7a\u767d\u3092\u9664\u304f\uff09
+CT_STATS_FILE_Total_Characters_NOSP=\u3059\u3079\u3066\u306e\u6587\u5b57\u6570\uff08\u7a7a\u767d\u3092\u9664\u304f\uff09
 
 CT_STATS_FILE_Remaining_Characters_NOSP=\u672a\u7ffb\u8a33\u6587\u5b57\u6570\uff08\u7a7a\u767d\u3092\u9664\u304f\uff09
 
 CT_STATS_FILE_Unique_Characters_NOSP=\u7e70\u308a\u8fd4\u3057\u3092\u9664\u3044\u305f\u6587\u5b57\u6570\uff08\u7a7a\u767d\u3092\u9664\u304f\uff09
 
-CT_STATS_FILE_Unique_Remaining_Characters_NOSP=\u7e70\u308a\u8fd4\u3057\u3092\u9664\u3044\u305f\u672a\u7ffb\u8a33\u306e\u6587\u5b57\u6570\uff08\u7a7a\u767d\u3092\u9664\u304f\uff09
+CT_STATS_FILE_Unique_Remaining_Characters_NOSP=\u7e70\u308a\u8fd4\u3057\u3092\u9664\u3044\u305f\u672a\u7ffb\u8a33\u6587\u5b57\u6570\uff08\u7a7a\u767d\u3092\u9664\u304f\uff09
 
-CT_STATS_FILE_Total_Characters=\u5408\u8a08\u6587\u5b57\u6570\uff08\u7a7a\u767d\u3092\u542b\u3080\uff09
+CT_STATS_FILE_Total_Characters=\u3059\u3079\u3066\u306e\u6587\u5b57\u6570\uff08\u7a7a\u767d\u3092\u542b\u3080\uff09
 
 CT_STATS_FILE_Remaining_Characters=\u672a\u7ffb\u8a33\u6587\u5b57\u6570\uff08\u7a7a\u767d\u3092\u542b\u3080\uff09
 
 CT_STATS_FILE_Unique_Characters=\u7e70\u308a\u8fd4\u3057\u3092\u9664\u3044\u305f\u6587\u5b57\u6570\uff08\u7a7a\u767d\u3092\u542b\u3080\uff09
 
-CT_STATS_FILE_Unique_Remaining_Characters=\u7e70\u308a\u8fd4\u3057\u3092\u9664\u3044\u305f\u672a\u7ffb\u8a33\u306e\u6587\u5b57\u6570\uff08\u7a7a\u767d\u3092\u542b\u3080\uff09
+CT_STATS_FILE_Unique_Remaining_Characters=\u7e70\u308a\u8fd4\u3057\u3092\u9664\u3044\u305f\u672a\u7ffb\u8a33\u6587\u5b57\u6570\uff08\u7a7a\u767d\u3092\u542b\u3080\uff09
 
 
 CT_STATSSTANDARD_WindowHeader=\u7ffb\u8a33\u72b6\u6cc1
@@ -462,19 +462,19 @@ CT_STATSSTANDARD_WindowHeader=\u7ffb\u8a33\u72b6\u6cc1
 CT_STATSMATCH_WindowHeader=\u53c2\u8003\u8a33\u6587\u306e\u4e00\u81f4\u7387
 
 CT_STATSMATCH_RowRepetitions=\u7e70\u308a\u8fd4\u3057\uff1a
-CT_STATSMATCH_RowExactMatch=\u5b8c\u5168\u4e00\u81f4\uff1a
-CT_STATSMATCH_RowMatch95=95%\u304b\u3089100%\uff1a
-CT_STATSMATCH_RowMatch85=85%\u304b\u308994%\uff1a
-CT_STATSMATCH_RowMatch75=75%\u304b\u308984%\uff1a
-CT_STATSMATCH_RowMatch50=50%\u304b\u308974%\uff1a
+CT_STATSMATCH_RowExactMatch=\u5b8c\u5168\u306b\u4e00\u81f4\uff1a
+CT_STATSMATCH_RowMatch95=\ 95% - 100%\uff1a
+CT_STATSMATCH_RowMatch85=\ 85% -  94%\uff1a
+CT_STATSMATCH_RowMatch75=\ 75% -  84%\uff1a
+CT_STATSMATCH_RowMatch50=\ 50% -  74%\uff1a
 CT_STATSMATCH_RowNoMatch=\u4e00\u81f4\u3057\u306a\u3044\uff1a
 
 
 # org.omegat.core.matching.LevenshteinDistance
-LD_NULL_ARRAYS_ERROR=\u7a7a\u306e\u914d\u5217\u3092\u4f5c\u6210\u3059\u308b\u3053\u3068\u306f\u3067\u304d\u307e\u305b\u3093\u3002
+LD_NULL_ARRAYS_ERROR=\u7a7a\u306e\u914d\u5217\u306f\u4f5c\u6210\u3067\u304d\u307e\u305b\u3093\u3002
 
 # ProjectProperties
-PP_CREATE_PROJ=\u65b0\u898f\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u4f5c\u6210
+PP_CREATE_PROJ=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306e\u65b0\u898f\u4f5c\u6210
 
 PP_OPEN_PROJ=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3092\u958b\u304f
 
@@ -512,32 +512,32 @@ PP_BROWSE_TITLE_TM=\u7ffb\u8a33\u30e1\u30e2\u30ea\u30d5\u30a1\u30a4\u30eb\u30d5\
 
 PP_BROWSE_TITLE_DICT=\u8f9e\u66f8\u30d5\u30a1\u30a4\u30eb\u30d5\u30a9\u30eb\u30c0\u30fc
 
-PP_MESSAGE_BADPROJ=\u79fb\u52d5\u3055\u308c\u305f\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u30d5\u30a9\u30eb\u30c0\u30fc\u304c\u3042\u308a\u307e\u3059\u3002\u65b0\u3057\u3044\u4f4d\u7f6e\u3092\u6307\u5b9a\u3059\u308b\u304b\u3001\u6539\u3081\u3066\u4f5c\u6210\u3057\u3066\u304f\u3060\u3055\u3044\u3002
+PP_MESSAGE_BADPROJ=\u79fb\u52d5\u3055\u308c\u305f\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u30d5\u30a9\u30eb\u30c0\u30fc\u304c\u3042\u308a\u307e\u3059\u3002\u65b0\u3057\u3044\u5834\u6240\u3092\u6307\u5b9a\u3059\u308b\u304b\u3001\u518d\u4f5c\u6210\u3057\u3066\u304f\u3060\u3055\u3044\u3002
 
-PP_MESSAGE_CONFIGPROJ=\u539f\u6587\u30d5\u30a1\u30a4\u30eb\u306e\u8a00\u8a9e\u3068\u3001\u8a33\u6587\u30d5\u30a1\u30a4\u30eb\u306e\u8a00\u8a9e\u3092\u9078\u629e\u3057\u3066\u304f\u3060\u3055\u3044\u3002\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u30d5\u30a9\u30eb\u30c0\u30fc\u306e\u4f4d\u7f6e\u3092\u5909\u66f4\u3059\u308b\u3053\u3068\u3082\u3067\u304d\u307e\u3059\u3002
+PP_MESSAGE_CONFIGPROJ=\u539f\u6587\u30d5\u30a1\u30a4\u30eb\u306e\u8a00\u8a9e\u3068\u3001\u8a33\u6587\u30d5\u30a1\u30a4\u30eb\u306e\u8a00\u8a9e\u3092\u9078\u629e\u3057\u3066\u304f\u3060\u3055\u3044\u3002\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u30d5\u30a9\u30eb\u30c0\u30fc\u306e\u5834\u6240\u306f\u5909\u66f4\u3067\u304d\u307e\u3059\u3002
 
-PP_SAVE_PROJECT_FILE=\u65b0\u898f\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u4f5c\u6210
+PP_SAVE_PROJECT_FILE=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306e\u65b0\u898f\u4f5c\u6210
 
 PP_PROJECT_FILES_DESC=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306e\u7ffb\u8a33\u5bfe\u8c61\u30d5\u30a1\u30a4\u30eb\u4e00\u89a7
 
 PP_ERROR_UNABLE_TO_READ_PROJECT_FILE=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u30d5\u30a1\u30a4\u30eb\u3092\u8aad\u307f\u8fbc\u3081\u307e\u305b\u3093\u3002 \n
 
 # NewProjectDialog.java
-NP_INVALID_SOURCE_LOCALE=\u5165\u529b\u3055\u308c\u305f\u539f\u6587\u30d5\u30a1\u30a4\u30eb\u306e\u8a00\u8a9e\u304c\u6b63\u3057\u304f\u3042\u308a\u307e\u305b\u3093\u3002\n
+NP_INVALID_SOURCE_LOCALE=\u5165\u529b\u3057\u305f\u539f\u6587\u30d5\u30a1\u30a4\u30eb\u306e\u8a00\u8a9e\u304c\u6b63\u3057\u304f\u3042\u308a\u307e\u305b\u3093\u3002\n
 
-NP_LOCALE_SUGGESTION=\u8a00\u8a9e\u30b3\u30fc\u30c9\u306e\u66f8\u5f0f\u306fxx-YY\u3001xx_YY\u3001xxx-YY\u3001xxx-YY\u306e\u3044\u305a\u308c\u304b\u3067\u3059\u3002xx\u3084xxx\u306f\u8a00\u8a9e\u30b3\u30fc\u30c9\u3001YY\u306f\u5730\u57df\u30b3\u30fc\u30c9\uff08\u4efb\u610f\uff09\u3092\u305d\u308c\u305e\u308c\u8868\u3057\u307e\u3059\u3002
+NP_LOCALE_SUGGESTION=\u8a00\u8a9e\u30b3\u30fc\u30c9\u306e\u66f8\u5f0f\u306f xx-YY\u3001xx_YY\u3001xxx-YY\u3001xxx-YY \u306e\u3044\u305a\u308c\u304b\u3067\u3059\u3002xx \u3084 xxx \u306f\u8a00\u8a9e\u30b3\u30fc\u30c9\u3001YY \u306f\u5730\u57df\u30b3\u30fc\u30c9\uff08\u4efb\u610f\uff09\u3092\u305d\u308c\u305e\u308c\u8868\u3057\u307e\u3059\u3002
 
-NP_INVALID_TARGET_LOCALE=\u5165\u529b\u3055\u308c\u305f\u8a33\u6587\u30d5\u30a1\u30a4\u30eb\u306e\u8a00\u8a9e\u304c\u6b63\u3057\u304f\u3042\u308a\u307e\u305b\u3093\u3002\n
+NP_INVALID_TARGET_LOCALE=\u5165\u529b\u3057\u305f\u8a33\u6587\u30d5\u30a1\u30a4\u30eb\u306e\u8a00\u8a9e\u304c\u6b63\u3057\u304f\u3042\u308a\u307e\u305b\u3093\u3002\n
 
-NP_SOURCEDIR_DOESNT_EXIST=\u6307\u5b9a\u3055\u308c\u305f\u539f\u6587\u30d5\u30a1\u30a4\u30eb\u30d5\u30a9\u30eb\u30c0\u30fc\u306f\u5b58\u5728\u3057\u307e\u305b\u3093\u3002
+NP_SOURCEDIR_DOESNT_EXIST=\u6307\u5b9a\u3057\u305f\u539f\u6587\u30d5\u30a1\u30a4\u30eb\u30d5\u30a9\u30eb\u30c0\u30fc\u306f\u5b58\u5728\u3057\u307e\u305b\u3093\u3002
 
-NP_TRANSDIR_DOESNT_EXIST=\u6307\u5b9a\u3055\u308c\u305f\u8a33\u6587\u30d5\u30a1\u30a4\u30eb\u30d5\u30a9\u30eb\u30c0\u30fc\u306f\u5b58\u5728\u3057\u307e\u305b\u3093\u3002
+NP_TRANSDIR_DOESNT_EXIST=\u6307\u5b9a\u3057\u305f\u8a33\u6587\u30d5\u30a1\u30a4\u30eb\u30d5\u30a9\u30eb\u30c0\u30fc\u306f\u5b58\u5728\u3057\u307e\u305b\u3093\u3002
 
-NP_GLOSSDIR_DOESNT_EXIST=\u6307\u5b9a\u3055\u308c\u305f\u7528\u8a9e\u96c6\u30d5\u30a9\u30eb\u30c0\u30fc\u306f\u5b58\u5728\u3057\u307e\u305b\u3093\u3002
+NP_GLOSSDIR_DOESNT_EXIST=\u6307\u5b9a\u3057\u305f\u7528\u8a9e\u96c6\u30d5\u30a9\u30eb\u30c0\u30fc\u306f\u5b58\u5728\u3057\u307e\u305b\u3093\u3002
 
-NP_TMDIR_DOESNT_EXIST=\u6307\u5b9a\u3055\u308c\u305f\u7ffb\u8a33\u30e1\u30e2\u30ea\u30d5\u30a1\u30a4\u30eb\u30d5\u30a9\u30eb\u30c0\u30fc\u306f\u5b58\u5728\u3057\u307e\u305b\u3093\u3002
+NP_TMDIR_DOESNT_EXIST=\u6307\u5b9a\u3057\u305f\u7ffb\u8a33\u30e1\u30e2\u30ea\u30d5\u30a1\u30a4\u30eb\u30d5\u30a9\u30eb\u30c0\u30fc\u306f\u5b58\u5728\u3057\u307e\u305b\u3093\u3002
 
-NP_DICTDIR_DOESNT_EXIST=\u6307\u5b9a\u3055\u308c\u305f\u8f9e\u66f8\u30d5\u30a1\u30a4\u30eb\u30d5\u30a9\u30eb\u30c0\u30fc\u306f\u5b58\u5728\u3057\u307e\u305b\u3093\u3002
+NP_DICTDIR_DOESNT_EXIST=\u6307\u5b9a\u3057\u305f\u8f9e\u66f8\u30d5\u30a1\u30a4\u30eb\u30d5\u30a9\u30eb\u30c0\u30fc\u306f\u5b58\u5728\u3057\u307e\u305b\u3093\u3002
 
 #LogDisplay
 
@@ -546,7 +546,7 @@ LD_ERROR=\u30a8\u30e9\u30fc\uff1a{0}
 
 #ProjectFileChooser
 
-PFC_OMEGAT_PROJECT=OmegaT\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u30d5\u30a9\u30eb\u30c0\u30fc
+PFC_OMEGAT_PROJECT=OmegaT \u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u30d5\u30a9\u30eb\u30c0\u30fc
 
 #NewFileChooser
 
@@ -556,7 +556,7 @@ NDC_SELECT_UNIQUE_TITLE=\u30a8\u30e9\u30fc
 
 #OmegaTFileChooser
 
-OFC_NEW_DIR_ERROR=\u65b0\u898f\u30d5\u30a9\u30eb\u30c0\u30fc\u4f5c\u6210\u6642\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002
+OFC_NEW_DIR_ERROR=\u65b0\u898f\u30d5\u30a9\u30eb\u30c0\u30fc\u3092\u4f5c\u6210\u3059\u308b\u969b\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002
 
 #SearchWindow
 SW_SEARCH_TEXT=\u691c\u7d22\u6587\u5b57\u5217\uff1a
@@ -584,7 +584,7 @@ SW_CHANGED_BEFORE=\u3053\u308c\u4ee5\u524d\u306e\u5909\u66f4\uff1a
 SW_CASE_SENSITIVE=\u5927\u6587\u5b57\u3068\u5c0f\u6587\u5b57\u3092\u533a\u5225
 
 SW_SEARCH_TM=\u7ffb\u8a33\u30e1\u30e2\u30ea\u3092\u691c\u7d22
-SW_ALL_RESULTS=\u3059\u3079\u3066\u8868\u793a
+SW_ALL_RESULTS=\u3059\u3079\u3066\u306e\u7d50\u679c\u3092\u8868\u793a
 
 SW_LOCATION=\u5834\u6240
 
@@ -594,38 +594,38 @@ SW_DIR_SEARCH=\u30d5\u30a1\u30a4\u30eb\u691c\u7d22
 
 SW_DIR_RECURSIVE=\u518d\u5e30\u691c\u7d22
 
-SW_TITLE=\u6587\u5b57\u5217\u691c\u7d22
+SW_TITLE=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306e\u691c\u7d22
 
 SW_NUMBER=\u691c\u7d22\u7d50\u679c\u306e\u4e0a\u9650\u6570\uff1a
 
-SW_VIEWER_TEXT=\u539f\u6587\u3084\u8a33\u6587\u3001\u307e\u305f\u306f\u305d\u306e\u4e21\u65b9\u3092\u5bfe\u8c61\u306b\u3057\u3066\u691c\u7d22\u3067\u304d\u307e\u3059\u3002 \n\u73fe\u5728\u306e\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u5185\u3001\u307e\u305f\u306f\u4efb\u610f\u306e\u30d5\u30a9\u30eb\u30c0\u30fc\u3084\u30d5\u30a9\u30eb\u30c0\u30fc\u968e\u5c64\u3092\u6307\u5b9a\u3057\u3066\u691c\u7d22\u3067\u304d\u307e\u3059\u3002 \n\u5b8c\u5168\u4e00\u81f4\u691c\u7d22\u306f\u3001\u6307\u5b9a\u3057\u305f\u5168\u4f53\u306e\u6587\u5b57\u5217\u3092\u542b\u3080\u5206\u7bc0\u3092\u691c\u7d22\u3057\u307e\u3059\u3002 \n\u30ad\u30fc\u30ef\u30fc\u30c9\u691c\u7d22\u306f\u3001\u6307\u5b9a\u3057\u305f\u6587\u5b57\u5217\u3092\uff08\u7a7a\u767d\u3067\u533a\u5207\u3089\u308c\u305f\uff09\u691c\u7d22\u30ad\u30fc\u30ef\u30fc\u30c9\u306e\u7d44\u3068\u307f\u306a\u3057\u307e\u3059\u3002\u30ad\u30fc\u30ef\u30fc\u30c9\u306e\u9806\u5e8f\u306f\u554f\u308f\u305a\u3001\u305d\u308c\u3089\u3092\u3059\u3079\u3066\u542b\u3080\u5206\u7bc0\u3092\u691c\u7d22\u3057\u307e\u3059\u3002 \n\u3044\u305a\u308c\u306e\u691c\u7d22\u3067\u3082\u3001\u30ef\u30a4\u30eb\u30c9\u30ab\u30fc\u30c9\u3068\u3057\u3066\u300c*\u300d\u3068\u300c?\u300d\u3092\u4f7f\u7528\u3067\u304d\u307e\u3059\u3002\u534a\u89d2\u300c*\u300d\u306f\u30010\u500b\u4ee5\u4e0a\u306e\u4efb\u610f\u306e\u6587\u5b57\u3068\u4e00\u81f4\u3057\u307e\u3059\u3002\u4f8b\u3048\u3070\u300crun*\u300d\u3067\u691c\u7d22\u3059\u308b\u3068\u3001\u300crun\u300d\u300cruns\u300d\u300crunning\u300d\u306a\u3069\u306b\u4e00\u81f4\u3057\u307e\u3059\u3002\u534a\u89d2\u300c?\u300d\u306f\u3001\u4efb\u610f\u306e1\u6587\u5b57\u3068\u4e00\u81f4\u3057\u307e\u3059\u3002\u4f8b\u3048\u3070\u300crun?\u300d\u306f\u3001\u300cruns\u300d\u300crung\u300d\u306b\u306f\u4e00\u81f4\u3057\u307e\u3059\u304c\u3001\u300crun\u300d\u3084\u300crunning\u300d\u306b\u306f\u4e00\u81f4\u3057\u307e\u305b\u3093\u3002
+SW_VIEWER_TEXT=\u539f\u6587\u3084\u8a33\u6587\u3001\u307e\u305f\u306f\u305d\u306e\u4e21\u65b9\u3092\u5bfe\u8c61\u3068\u3057\u305f\u6587\u5b57\u5217\u691c\u7d22\u304c\u884c\u3048\u307e\u3059\u3002 \n\u73fe\u5728\u306e\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3084\u3001\u4efb\u610f\u306e\u30d5\u30a9\u30eb\u30c0\u30fc\u3001\u307e\u305f\u306f\u30d5\u30a9\u30eb\u30c0\u30fc\u968e\u5c64\u3092\u6307\u5b9a\u3057\u3066\u691c\u7d22\u3067\u304d\u307e\u3059\u3002 \n\u5b8c\u5168\u4e00\u81f4\u691c\u7d22\u306f\u3001\u6307\u5b9a\u3057\u305f\u6587\u5b57\u5217\u5168\u4f53\u3092\u542b\u3080\u5206\u7bc0\u3092\u691c\u7d22\u3057\u307e\u3059\u3002 \n\u30ad\u30fc\u30ef\u30fc\u30c9\u691c\u7d22\u306f\u3001\u6307\u5b9a\u3057\u305f\u6587\u5b57\u5217\u3092\uff08\u7a7a\u767d\u3067\u533a\u5207\u3089\u308c\u305f\uff09\u691c\u7d22\u30ad\u30fc\u30ef\u30fc\u30c9\u306e\u7d44\u307f\u5408\u308f\u305b\u3068\u307f\u306a\u3057\u307e\u3059\u3002\u30ad\u30fc\u30ef\u30fc\u30c9\u306e\u9806\u5e8f\u306f\u554f\u308f\u305a\u3001\u305d\u308c\u3089\u3092\u3059\u3079\u3066\u542b\u3080\u5206\u7bc0\u3092\u691c\u7d22\u3057\u307e\u3059\u3002 \n\u3069\u306e\u691c\u7d22\u3067\u3082\u30ef\u30a4\u30eb\u30c9\u30ab\u30fc\u30c9\u3068\u3057\u3066\u534a\u89d2 * \u3068 ? \u3092\u4f7f\u7528\u3067\u304d\u307e\u3059\u3002\u534a\u89d2 * \u306f\u30010 \u500b\u4ee5\u4e0a\u306e\u4efb\u610f\u306e\u6587\u5b57\u3068\u4e00\u81f4\u3057\u307e\u3059\u3002\u4f8b\u3048\u3070 run* \u3067\u691c\u7d22\u3059\u308b\u3068\u3001run, runs, running \u306a\u3069\u3068\u4e00\u81f4\u3057\u307e\u3059\u3002\u534a\u89d2 ? \u306f\u3001\u4efb\u610f\u306e 1 \u6587\u5b57\u3068\u4e00\u81f4\u3057\u307e\u3059\u3002\u4f8b\u3048\u3070 run? \u306f\u3001runs, rung \u306b\u306f\u4e00\u81f4\u3057\u307e\u3059\u304c\u3001run \u3084 running \u306b\u306f\u4e00\u81f4\u3057\u307e\u305b\u3093\u3002
 
 # 0 - Maximun number of finds/hits
-SW_MAX_FINDS_REACHED=\u4e00\u81f4\u3057\u305f\u691c\u7d22\u7d50\u679c\u306e\u6570\u304c\u4e0a\u9650\u306b\u9054\u3057\u307e\u3057\u305f\uff1a{0}
+SW_MAX_FINDS_REACHED=\u691c\u7d22\u7d50\u679c\u306e\u6570\u304c\u4e0a\u9650\u306b\u9054\u3057\u307e\u3057\u305f\uff1a{0}
 
 ST_FILE_SEARCH_ERROR=\u30d5\u30a9\u30eb\u30c0\u30fc\u968e\u5c64\u306e\u691c\u7d22\u6642\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002
 
-ST_REGEXP_ERROR=\u4e0d\u6b63\u306a\u6b63\u898f\u8868\u73fe\u3067\u3059\u3002
+ST_REGEXP_ERROR=\u6b63\u3057\u304f\u306a\u3044\u6b63\u898f\u8868\u73fe\u3067\u3059\u3002
 
-SW_ERROR_BAD_DIR=\u4e0d\u6b63\u306a\u30d5\u30a9\u30eb\u30c0\u30fc\u540d\u3067\u3059\uff1a {0} 
+SW_ERROR_BAD_DIR=\u30d5\u30a9\u30eb\u30c0\u30fc\u540d\u304c\u6b63\u3057\u304f\u3042\u308a\u307e\u305b\u3093\uff1a{0} 
 
 ST_FATAL_ERROR=\u4e88\u671f\u3057\u306a\u3044\u30a8\u30e9\u30fc\u306e\u305f\u3081\u3001\u691c\u7d22\u51e6\u7406\u3092\u7d42\u4e86\u3057\u307e\u3057\u305f\u3002\u691c\u7d22\u30a6\u30a3\u30f3\u30c9\u30a6\u3092\u9589\u3058\u3066\u304f\u3060\u3055\u3044\u3002
 
 ST_NOTHING_FOUND=\u4e00\u81f4\u3059\u308b\u7d50\u679c\u306f\u3042\u308a\u307e\u305b\u3093\u3067\u3057\u305f\u3002
 
 # 0 - Nr of hits
-SW_NR_OF_RESULTS=\u4e00\u81f4\u6570\uff1a{0}
+SW_NR_OF_RESULTS=\u691c\u7d22\u7d50\u679c\u306e\u6570\uff1a{0}
 
 
 # XMLStreamReader
-XSR_ERROR_UNABLE_INIT_READ_XML=XML\u30d5\u30a1\u30a4\u30eb\u3092\u8aad\u307f\u8fbc\u3080\u521d\u671f\u5316\u304c\u884c\u3048\u307e\u305b\u3093\u3002
+XSR_ERROR_UNABLE_INIT_READ_XML=XML \u30d5\u30a1\u30a4\u30eb\u3092\u8aad\u307f\u8fbc\u3081\u307e\u305b\u3093\u3002
 
 # {0} - the version, which we can't support
-XSR_ERROR_UNSUPPORTED_XML_VERSION=\u672a\u5bfe\u5fdc\u306eXML\u30d0\u30fc\u30b8\u30e7\u30f3\uff1a{0}
+XSR_ERROR_UNSUPPORTED_XML_VERSION=\u672a\u5bfe\u5fdc\u306e XML \u30d0\u30fc\u30b8\u30e7\u30f3\uff1a{0}
 
-XSR_ERROR_NONVALID_XML=\u4e0d\u6b63\u306aXML\u30d5\u30a1\u30a4\u30eb\u3067\u3059\u3002
+XSR_ERROR_NONVALID_XML=\u4e0d\u6b63\u306a XML \u30d5\u30a1\u30a4\u30eb\u3067\u3059\u3002
 
-XSR_ERROR_CANNOT_LOAD_XML=\u6307\u5b9a\u3055\u308c\u305fXML\u30d5\u30a1\u30a4\u30eb\u3092\u8aad\u307f\u8fbc\u3081\u307e\u305b\u3093\u3002 \n
+XSR_ERROR_CANNOT_LOAD_XML=\u6307\u5b9a\u3057\u305f XML \u30d5\u30a1\u30a4\u30eb\u3092\u8aad\u307f\u8fbc\u3081\u307e\u305b\u3093\u3002 \n
 
 XSR_ERROR_IOEXCEPTION=IOException\uff08\u5165\u51fa\u529b\u4f8b\u5916\uff09\u304c\u767a\u751f\u3057\u307e\u3057\u305f\uff1a
 
@@ -633,7 +633,7 @@ XSR_ERROR_IOEXCEPTION=IOException\uff08\u5165\u51fa\u529b\u4f8b\u5916\uff09\u304
 # {1} - stream reader state
 XSR_ERROR_UNEXPECTED_CHAR=\u4e88\u671f\u3057\u306a\u3044\u6587\u5b57\u5217 {0} \u3067\u3059\uff08{1}\uff09
 
-XSR_ERROR_CONFUSED=\u4e0d\u6b63\u306a\u30b3\u30e1\u30f3\u30c8\u30bf\u30b0\u306e\u958b\u59cb\u90e8\u5206\u304c\u898b\u3064\u304b\u308a\u307e\u3057\u305f\u3002
+XSR_ERROR_CONFUSED=\u30b3\u30e1\u30f3\u30c8\u30bf\u30b0\u306e\u958b\u59cb\u90e8\u5206\u3092\u8a8d\u8b58\u3067\u304d\u307e\u305b\u3093\u3002
 
 XSR_ERROR_TAG_NAME=\n\u30bf\u30b0\u540d\uff1a
 
@@ -649,15 +649,15 @@ XSR_ERROR_LOADED=\u8aad\u307f\u8fbc\u307f\u304c\u5b8c\u4e86\u3057\u307e\u3057\u3
 
 XSR_ERROR_ATTRIBUTES= \u5c5e\u6027
 
-XSR_ERROR_END_OF_STREAM=\u30b9\u30c8\u30ea\u30fc\u30e0\u306e\u7d42\u7aef\u306b\u9054\u3057\u307e\u3057\u305f\u304c\u3001\u7d42\u4e86\u30d6\u30ed\u30c3\u30af\u304c\u3042\u308a\u307e\u305b\u3093\u3002
+XSR_ERROR_END_OF_STREAM=\u30b9\u30c8\u30ea\u30fc\u30e0\u306e\u7d42\u7aef\u306b\u9054\u3057\u307e\u3057\u305f\u304c\u3001\u7d42\u4e86\u30d6\u30ed\u30c3\u30af\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3002
 
 XSR_ERROR_UNTERMINATED_ESCAPE_CHAR=\u30a8\u30b9\u30b1\u30fc\u30d7\u6587\u5b57\u304c\u7d42\u4e86\u3057\u3066\u3044\u307e\u305b\u3093\u3002
 
 # {0} - bad hex value
-XSR_ERROR_BAD_BINARY_CHAR=\u30a8\u30b9\u30b1\u30fc\u30d7\u3055\u308c\u305f2\u9032\u6587\u5b57\u306b\u4e0d\u6b63\u306a\u30c7\u30fc\u30bf {0} \u304c\u542b\u307e\u308c\u3066\u3044\u307e\u3059\u3002
+XSR_ERROR_BAD_BINARY_CHAR=\u30a8\u30b9\u30b1\u30fc\u30d7\u3055\u308c\u305f 2 \u9032\u6587\u5b57\u306b\u4e0d\u6b63\u306a\u30c7\u30fc\u30bf {0} \u304c\u542b\u307e\u308c\u3066\u3044\u307e\u3059\u3002
 
 # {0} - bad decimal value
-XSR_ERROR_BAD_DECIMAL_CHAR=\u30a8\u30b9\u30b1\u30fc\u30d7\u3055\u308c\u305f10\u9032\u6587\u5b57\u306b\u4e0d\u6b63\u306a\u30c7\u30fc\u30bf {0} \u304c\u542b\u307e\u308c\u3066\u3044\u307e\u3059\u3002
+XSR_ERROR_BAD_DECIMAL_CHAR=\u30a8\u30b9\u30b1\u30fc\u30d7\u3055\u308c\u305f 10 \u9032\u6587\u5b57\u306b\u4e0d\u6b63\u306a\u30c7\u30fc\u30bf {0} \u304c\u542b\u307e\u308c\u3066\u3044\u307e\u3059\u3002
 
 # LFileCopy
 LFC_ERROR_FILE_DOESNT_EXIST=\u30d5\u30a1\u30a4\u30eb {0} \u306f\u5b58\u5728\u3057\u307e\u305b\u3093\u3002
@@ -666,7 +666,7 @@ LFC_ERROR_FILE_DOESNT_EXIST=\u30d5\u30a1\u30a4\u30eb {0} \u306f\u5b58\u5728\u305
 
 PM_ERROR_SAVE=\u8a2d\u5b9a\u304c\u4fdd\u5b58\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002
 
-PM_WARNING_PARSEERROR_ON_READ=\u8a2d\u5b9a\u30d5\u30a1\u30a4\u30eb\u8aad\u307f\u8fbc\u307f\u4e2d\u306b\u89e3\u6790\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002 
+PM_WARNING_PARSEERROR_ON_READ=\u8a2d\u5b9a\u30d5\u30a1\u30a4\u30eb\u8aad\u307f\u8fbc\u307f\u4e2d\u306b\u69cb\u6587\u89e3\u6790\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002 
 
 PM_UNSUPPORTED_ENCODING=\u672a\u5bfe\u5fdc\u306e\u30d5\u30a1\u30a4\u30eb\u30a8\u30f3\u30b3\u30fc\u30c7\u30a3\u30f3\u30b0\u3067\u3059\u3002
 
@@ -685,56 +685,56 @@ TMXR_INFO_READING_FILE=\nTMX \u30d5\u30a1\u30a4\u30eb {0} \u3092\u8aad\u307f\u8f
 TMXR_INFO_READING_COMPLETE=TMX \u30d5\u30a1\u30a4\u30eb\u306e\u8aad\u307f\u8fbc\u307f\u304c\u5b8c\u4e86\u3057\u307e\u3057\u305f\u3002
 
 # 0 - Name of the tool that created the TMX file
-TMXR_INFO_CREATION_TOOL=\u4f5c\u6210\u8005\uff1a {0}
+TMXR_INFO_CREATION_TOOL=\u4f5c\u6210\u8005\uff1a{0}
 
 # 0 - Version of the creation tool
-TMXR_INFO_CREATION_TOOL_VERSION=\u30d0\u30fc\u30b8\u30e7\u30f3\uff1a {0}
+TMXR_INFO_CREATION_TOOL_VERSION=\u30d0\u30fc\u30b8\u30e7\u30f3\uff1a{0}
 
 # 0 - Segmentation method
-TMXR_INFO_SEG_TYPE=\u5206\u7bc0\u5316\u306e\u65b9\u6cd5\uff1a {0}
+TMXR_INFO_SEG_TYPE=\u5206\u7bc0\u5316\u306e\u65b9\u6cd5\uff1a{0}
 
 # 0 - Source language
-TMXR_INFO_SOURCE_LANG=\u539f\u6587\u8a00\u8a9e\uff1a {0}
+TMXR_INFO_SOURCE_LANG=\u539f\u6587\u8a00\u8a9e\uff1a{0}
 
 # 0 - Variant languages
-TMXR_INFO_VARIANT_LANGUAGES_DISPLAYED=\u4ee5\u4e0b\u306e\u8a00\u8a9e\u306e\u5909\u7570\u5f62\u304c\u8868\u793a\u3055\u308c\u307e\u3059\uff1a {0}
+TMXR_INFO_VARIANT_LANGUAGES_DISPLAYED=\u4ee5\u4e0b\u306e\u8a00\u8a9e\u306e\u5909\u7570\u5f62\u304c\u8868\u793a\u3055\u308c\u307e\u3059\uff1a{0}
 
 # {0} - the exception
-TMXR_EXCEPTION_WHILE_PARSING=\u89e3\u6790\u4e2d\u306b\u4f8b\u5916\u304c\u767a\u751f\u3057\u307e\u3057\u305f\uff1a {0}
+TMXR_EXCEPTION_WHILE_PARSING=\u69cb\u6587\u89e3\u6790\u4e2d\u306b\u4f8b\u5916\u304c\u767a\u751f\u3057\u307e\u3057\u305f\uff1a{0}
 
 # {0} - the name of the TMX file
 # {1} - location of the log file
-TMXR_EXCEPTION_WHILE_PARSING__DISPLAY=TMX \u30d5\u30a1\u30a4\u30eb {0} \u3092\u89e3\u6790\u4e2d\u306b\u4f8b\u5916\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002TMX \u30d5\u30a1\u30a4\u30eb\u306e\u8aad\u307f\u8fbc\u307f\u3092\u4e2d\u6b62\u3057\u307e\u3059\u3002\u30ed\u30b0 {1} \u3092\u8abf\u67fb\u3057\u30a8\u30e9\u30fc\u306e\u539f\u56e0\u3092\u7279\u5b9a\u3057\u3066\u304b\u3089\u3001\u518d\u5ea6 TMX \u30d5\u30a1\u30a4\u30eb\u3092\u8aad\u307f\u8fbc\u3093\u3067\u304f\u3060\u3055\u3044\u3002
+TMXR_EXCEPTION_WHILE_PARSING__DISPLAY=TMX \u30d5\u30a1\u30a4\u30eb {0} \u306e\u69cb\u6587\u89e3\u6790\u4e2d\u306b\u4f8b\u5916\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002TMX \u30d5\u30a1\u30a4\u30eb\u306e\u8aad\u307f\u8fbc\u307f\u3092\u4e2d\u6b62\u3057\u307e\u3059\u3002\u30ed\u30b0 {1} \u306b\u3088\u308a\u30a8\u30e9\u30fc\u306e\u539f\u56e0\u3092\u7279\u5b9a\u3057\u3066\u304b\u3089\u3001\u518d\u5ea6 TMX \u30d5\u30a1\u30a4\u30eb\u3092\u8aad\u307f\u8fbc\u3093\u3067\u304f\u3060\u3055\u3044\u3002
 
 # {0} - the line number
 # {1} - the column number
 # {2} - the warning
-TMXR_WARNING_WHILE_PARSING=\u30d5\u30a1\u30a4\u30eb {2} \u3092\u89e3\u6790\u4e2d\u3001\u884c {0} \u306e\u5217 {1} \u306b\u8b66\u544a\u304c\u767a\u751f\u3057\u307e\u3057\u305f\uff1a
+TMXR_WARNING_WHILE_PARSING=\u30d5\u30a1\u30a4\u30eb {2} \u306e\u69cb\u6587\u89e3\u6790\u306e\u7d50\u679c\u3001\u884c {0} \u306e\u5217 {1} \u306b\u8b66\u544a\u304c\u5b58\u5728\u3057\u307e\u3059\uff1a
 
 # {0} - the line number
 # {1} - the column number
 # {2} - the error
-TMXR_RECOVERABLE_ERROR_WHILE_PARSING=\u30d5\u30a1\u30a4\u30eb {2} \u3092\u89e3\u6790\u4e2d\u3001\u884c {0} \u306e\u5217 {1} \u306b\u56de\u5fa9\u53ef\u80fd\u306a\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f\uff1a
+TMXR_RECOVERABLE_ERROR_WHILE_PARSING=\u30d5\u30a1\u30a4\u30eb {2} \u306e\u69cb\u6587\u89e3\u6790\u306e\u7d50\u679c\u3001\u884c {0} \u306e\u5217 {1} \u306b\u56de\u5fa9\u53ef\u80fd\u306a\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f\uff1a
 
 # {0} - the line number
 # {1} - the column number
 # {2} - the error
-TMXR_FATAL_ERROR_WHILE_PARSING=\u30d5\u30a1\u30a4\u30eb {2} \u3092\u89e3\u6790\u4e2d\u3001\u884c {0} \u306e\u5217 {1} \u306b\u56de\u5fa9\u4e0d\u53ef\u80fd\u306a\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f\uff1a
+TMXR_FATAL_ERROR_WHILE_PARSING=\u30d5\u30a1\u30a4\u30eb {2} \u306e\u69cb\u6587\u89e3\u6790\u306e\u7d50\u679c\u3001\u884c {0} \u306e\u5217 {1} \u306b\u56de\u5fa9\u4e0d\u53ef\u80fd\u306a\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f\uff1a
 
 # {0} - the name of the TMX file
 # {1} - the line number
 # {2} - the column number
-TMXR_FATAL_ERROR_WHILE_PARSING__DISPLAY=TMX \u30d5\u30a1\u30a4\u30eb {0} \u3092\u89e3\u6790\u4e2d\u3001\u884c {1} \u306e\u5217 {2} \u3067\u56de\u5fa9\u4e0d\u53ef\u80fd\u306a\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002 \nTMX \u30d5\u30a1\u30a4\u30eb\u306f\u8aad\u307f\u8fbc\u307e\u308c\u307e\u305b\u3093\u3002\u30a8\u30e9\u30fc\u3092\u4fee\u6b63\u3057\u305f\u306e\u3061\u3001\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306e\u518d\u8aad\u307f\u8fbc\u307f\u3092\u884c\u3063\u3066\u304f\u3060\u3055\u3044\u3002\n
+TMXR_FATAL_ERROR_WHILE_PARSING__DISPLAY=TMX \u30d5\u30a1\u30a4\u30eb {0} \u306e\u69cb\u6587\u89e3\u6790\u306e\u7d50\u679c\u3001\u884c {1} \u306e\u5217 {2} \u3067\u56de\u5fa9\u4e0d\u53ef\u80fd\u306a\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002 \nTMX \u30d5\u30a1\u30a4\u30eb\u306f\u8aad\u307f\u8fbc\u307e\u308c\u307e\u305b\u3093\u3002\u30a8\u30e9\u30fc\u3092\u4fee\u5fa9\u3057\u305f\u306e\u3061\u3001\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306e\u518d\u8aad\u307f\u8fbc\u307f\u3092\u884c\u3063\u3066\u304f\u3060\u3055\u3044\u3002\n
 
-TMXR_ERROR_TU_BEFORE_HEADER=TMX \u30d8\u30c3\u30c0\u30fc\u306e\u524d\u306b\u3042\u308b\u7ffb\u8a33\u5bfe\u304c\u898b\u3064\u304b\u308a\u307e\u3057\u305f\u3002
+TMXR_ERROR_TU_BEFORE_HEADER=TMX \u30d8\u30c3\u30c0\u30fc\u3088\u308a\u3082\u524d\u306b\u7ffb\u8a33\u5bfe\u304c\u898b\u3064\u304b\u308a\u307e\u3057\u305f\u3002
 
-TMXR_WARNING_TUV_NOT_IN_TU=\u7ffb\u8a33\u5bfe\u306e\u5916\u5074\u306b\u3001\u7ffb\u8a33\u5bfe\u5909\u7570\u304c\u898b\u3064\u304b\u308a\u307e\u3057\u305f\u3002\u7ffb\u8a33\u5bfe\u5909\u7570\u306f\u7121\u8996\u3055\u308c\u307e\u3057\u305f\u3002
+TMXR_WARNING_TUV_NOT_IN_TU=\u7ffb\u8a33\u5bfe\u306e\u5916\u5074\u306b\u7ffb\u8a33\u5bfe\u5909\u7570\u304c\u898b\u3064\u304b\u308a\u307e\u3057\u305f\u3002\u7ffb\u8a33\u5bfe\u5909\u7570\u306f\u7121\u8996\u3055\u308c\u307e\u3057\u305f\u3002
 
 TMXR_WARNING_TUV_LANG_NOT_SPECIFIED=\u7ffb\u8a33\u5bfe\u5909\u7570\u306e\u8a00\u8a9e\u304c\u6307\u5b9a\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002\u7ffb\u8a33\u5bfe\u5909\u7570\u306f\u7121\u8996\u3055\u308c\u307e\u3057\u305f\u3002
 
-TMXR_WARNING_SEG_NOT_IN_TUV=\u7ffb\u8a33\u5bfe\u5909\u7570\u306e\u5916\u5074\u306b\u3001\u5206\u7bc0\u304c\u898b\u3064\u304b\u308a\u307e\u3057\u305f\u3002\u5206\u7bc0\u306f\u7121\u8996\u3055\u308c\u307e\u3057\u305f\u3002
+TMXR_WARNING_SEG_NOT_IN_TUV=\u7ffb\u8a33\u5bfe\u5909\u7570\u306e\u5916\u5074\u306b\u5206\u7bc0\u304c\u898b\u3064\u304b\u308a\u307e\u3057\u305f\u3002\u5206\u7bc0\u306f\u7121\u8996\u3055\u308c\u307e\u3057\u305f\u3002
 
-TMXR_WARNING_SOURCE_NOT_FOUND=\u3044\u304f\u3064\u304b\u306e\u7ffb\u8a33\u5bfe\u306b\u5bfe\u3057\u3066\u3001\u539f\u6587\u5206\u7bc0\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3067\u3057\u305f\u3002\u3053\u308c\u3089\u306e\u7ffb\u8a33\u5bfe\u306f\u7121\u8996\u3055\u308c\u307e\u3057\u305f\u3002
+TMXR_WARNING_SOURCE_NOT_FOUND=\u7ffb\u8a33\u5bfe\u306b\u5bfe\u5fdc\u3059\u308b\u539f\u6587\u306e\u5206\u7bc0\u304c\u3001\u3044\u304f\u3064\u304b\u5b58\u5728\u3057\u307e\u305b\u3093\u3067\u3057\u305f\u3002\u3053\u308c\u3089\u306e\u7ffb\u8a33\u5bfe\u306f\u7121\u8996\u3055\u308c\u307e\u3057\u305f\u3002
 
 # {0} - TMX source language
 # {1} - Project source language
@@ -752,12 +752,12 @@ CT_LOADING_GLOSSARY=\u7528\u8a9e\u96c6 {0} \u3092\u8aad\u307f\u8fbc\u307f\u4e2d.
 
 
 # org.omegat.Main
-MAIN_ERROR_CANT_INIT_OSLF=\u30aa\u30da\u30ec\u30fc\u30c6\u30a3\u30f3\u30b0\u30b7\u30b9\u30c6\u30e0\u7528\u306e\u5916\u89b3\u304c\u521d\u671f\u5316\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002
+MAIN_ERROR_CANT_INIT_OSLF=\u30aa\u30da\u30ec\u30fc\u30c6\u30a3\u30f3\u30b0\u30b7\u30b9\u30c6\u30e0\u7528\u306e\u5916\u89b3\u3092\u521d\u671f\u5316\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002
 
 # PluginUtils.java
-PLUGIN_UNKNOWN='{0}' \u306e\u30d7\u30e9\u30b0\u30a4\u30f3\u306e\u578b\u304c\u4e0d\u660e\u3067\u3059\u3002
+PLUGIN_UNKNOWN={0} \u306e\u30d7\u30e9\u30b0\u30a4\u30f3\u306e\u578b\u304c\u4e0d\u660e\u3067\u3059\u3002
 
-PLUGIN_MARKER_INITIALIZE=\u30de\u30fc\u30ab\u30fc '{0}' \u306e\u521d\u671f\u5316\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002 
+PLUGIN_MARKER_INITIALIZE=\u30de\u30fc\u30ab\u30fc {0} \u306e\u521d\u671f\u5316\u6642\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002 
 
 # FilterMaster.java
 
@@ -777,7 +777,7 @@ FILTERS_FILE_FORMAT=\u30d5\u30a1\u30a4\u30eb\u5f62\u5f0f
 
 FILTERS_ON=\u6709\u52b9
 
-FILTERS_ERROR_COLUMN_INDEX_NOT_1=\u5217\u306e\u30a4\u30f3\u30c7\u30c3\u30af\u30b9\u306f1\u3067\u3042\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002
+FILTERS_ERROR_COLUMN_INDEX_NOT_1=\u5217\u306e\u30a4\u30f3\u30c7\u30c3\u30af\u30b9\u306f 1 \u3067\u3042\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002
 
 # OneFilter.java
 
@@ -791,22 +791,22 @@ ONEFILTER_TARGET_FILENAME_ENCODING=\u8a33\u6587\u30d5\u30a1\u30a4\u30eb\u540d\u3
 
 # LatexFilter.java
 
-LATEXFILTER_FILTER_NAME=LaTeX\u30d5\u30a1\u30a4\u30eb
+LATEXFILTER_FILTER_NAME=LaTeX \u30d5\u30a1\u30a4\u30eb
 
 # PoFilter.java
 
-POFILTER_FILTER_NAME=PO\u30d5\u30a1\u30a4\u30eb
+POFILTER_FILTER_NAME=PO \u30d5\u30a1\u30a4\u30eb
 
 # RcFilter.java
 
-RCFILTER_FILTER_NAME=Windows\u30ea\u30bd\u30fc\u30b9\u30d5\u30a1\u30a4\u30eb
+RCFILTER_FILTER_NAME=Windows \u30ea\u30bd\u30fc\u30b9\u30d5\u30a1\u30a4\u30eb
 
 # MozillaDTDFilter.java
 
-MOZDTD_FILTER_NAME=Mozilla DTD\u30d5\u30a1\u30a4\u30eb
+MOZDTD_FILTER_NAME=Mozilla DTD \u30d5\u30a1\u30a4\u30eb
 
 # XtagFilter.java
-XTAGFILTER_FILTER_NAME=CopyFlow Gold for QuarkXPress\u30d5\u30a1\u30a4\u30eb
+XTAGFILTER_FILTER_NAME=CopyFlow Gold for QuarkXPress \u30d5\u30a1\u30a4\u30eb
 
 # TextFilter.java
 
@@ -824,44 +824,44 @@ TEXTFILTER_OPTION_NEVER_SEGMENT=\u3057\u306a\u3044
 
 # ResourceBundleFilter.java
 
-RBFILTER_FILTER_NAME=Java\u30ea\u30bd\u30fc\u30b9\u30d0\u30f3\u30c9\u30eb
+RBFILTER_FILTER_NAME=Java(TM) \u30ea\u30bd\u30fc\u30b9\u30d0\u30f3\u30c9\u30eb
 
-RBFH_ERROR_ILLEGAL_U_SEQUENCE=\u4e0d\u6b63\u306a \\u \u6587\u5b57\u5217\u304c\u898b\u3064\u304b\u308a\u307e\u3057\u305f\u3002
+RBFH_ERROR_ILLEGAL_U_SEQUENCE=\u4e0d\u6b63\u306a \\u \u30b7\u30fc\u30b1\u30f3\u30b9\u304c\u898b\u3064\u304b\u308a\u307e\u3057\u305f\u3002
 
 # XLIFFFilter.java
-XLIFF_FILTER_NAME=XLIFF\u30d5\u30a1\u30a4\u30eb
+XLIFF_FILTER_NAME=XLIFF \u30d5\u30a1\u30a4\u30eb
 
 # RESXFilter.java
-RESX_FILTER_NAME=ResX\u30d5\u30a1\u30a4\u30eb
+RESX_FILTER_NAME=ResX \u30d5\u30a1\u30a4\u30eb
 
 # HelpAndManualFilter.java
-HELPANDMANUAL_FILTER_NAME=\u30d8\u30eb\u30d7\u3001\u30de\u30cb\u30e5\u30a2\u30eb\u30d5\u30a1\u30a4\u30eb
+HELPANDMANUAL_FILTER_NAME=\u30d8\u30eb\u30d7\u3068\u30de\u30cb\u30e5\u30a2\u30eb\u30d5\u30a1\u30a4\u30eb
 
 # Typo3Filter.java
-TYPO3_FILTER_NAME=Typo3 LocManager\u30d5\u30a1\u30a4\u30eb
+TYPO3_FILTER_NAME=Typo3 LocManager \u30d5\u30a1\u30a4\u30eb
 
 # L10nmgrFilter.java
-L10NMGR_FILTER_NAME=TYPO3 l10nmgr\u30d5\u30a1\u30a4\u30eb
+L10NMGR_FILTER_NAME=TYPO3 l10nmgr \u30d5\u30a1\u30a4\u30eb
 
 # WixFilter.java
-WIX_FILTER_NAME=WiX\u30ed\u30fc\u30ab\u30ea\u30bc\u30fc\u30b7\u30e7\u30f3\u30d5\u30a1\u30a4\u30eb
+WIX_FILTER_NAME=WiX \u30ed\u30fc\u30ab\u30ea\u30bc\u30fc\u30b7\u30e7\u30f3\u30d5\u30a1\u30a4\u30eb
 
 # SvgFilter.java
-SVG_FILTER_NAME=SVG\u753b\u50cf\u30d5\u30a1\u30a4\u30eb
+SVG_FILTER_NAME=SVG \u753b\u50cf\u30d5\u30a1\u30a4\u30eb
 
 # org.omegat.filters3.xml.Handler
 XML_FATAL_ERROR=\u30d5\u30a1\u30a4\u30eb {0} \u306e\u884c {1} \u306b\u30a8\u30e9\u30fc\u304c\u3042\u308a\u307e\u3059\u3002
 
 # org.omegat.filters3.xml.docbook.DocBookFilter
-DocBook_FILTER_NAME=DocBook\u30d5\u30a1\u30a4\u30eb
+DocBook_FILTER_NAME=DocBook \u30d5\u30a1\u30a4\u30eb
 
-DocBook_HINT=\u3054\u6ce8\u610f\uff1aDocBook\u30d5\u30a1\u30a4\u30eb\u3092\u8a8d\u8b58\u3055\u305b\u308b\u5834\u5408\u3001\u62e1\u5f35\u5b50\u306b\u52a0\u3048\u3066\u3001\u4ee5\u4e0b\u306e\u3088\u3046\u306bDOCTYPE\u5ba3\u8a00\u6587\uff08DocBook 4\u7528\uff09 : <!DOCTYPE book PUBLIC \\"-//OASIS//DTD DocBook XML ...>\u3001\u307e\u305f\u306f\u540d\u524d\u7a7a\u9593\uff08DocBook 5\u7528\uff09\uff1axmlns="http://docbook.org/ns/docbook" \u304c\u5fc5\u8981\u3067\u3059\u3002
+DocBook_HINT=\u3054\u6ce8\u610f\uff1aDocBook \u30d5\u30a1\u30a4\u30eb\u3092\u8a8d\u8b58\u3055\u305b\u308b\u5834\u5408\u3001\u62e1\u5f35\u5b50\u306b\u52a0\u3048\u4ee5\u4e0b\u306e\u3088\u3046\u306a DOCTYPE \u5ba3\u8a00\u6587\uff08DocBook 4 \u7528\uff09 <!DOCTYPE book PUBLIC \\"-//OASIS//DTD DocBook XML ...>\u3001\u307e\u305f\u306f\u540d\u524d\u7a7a\u9593\uff08DocBook 5 \u7528\uff09 xmlns="http://docbook.org/ns/docbook" \u304c\u5fc5\u8981\u3067\u3059\u3002
 
 # SrtFilter.java
-SRTFILTER_FILTER_NAME=SubRip\u5b57\u5e55\u30d5\u30a1\u30a4\u30eb
+SRTFILTER_FILTER_NAME=SubRip \u5b57\u5e55\u30d5\u30a1\u30a4\u30eb
 
 # AndroidFilter.java
-Android_FILTER_NAME=Android\u30ea\u30bd\u30fc\u30b9\u30d5\u30a1\u30a4\u30eb
+Android_FILTER_NAME=Android \u30ea\u30bd\u30fc\u30b9\u30d5\u30a1\u30a4\u30eb
 
 
 # INIFilter.java
@@ -870,14 +870,14 @@ INIFILTER_FILTER_NAME=\u300c\u30ad\u30fc=\u5024\u300d\u5f62\u5f0f\u306e\u30c6\u3
 
 # DokuWikiFilter.java
 
-DWFILTER_FILTER_NAME=DokuWiki\u30d5\u30a1\u30a4\u30eb
+DWFILTER_FILTER_NAME=DokuWiki \u30d5\u30a1\u30a4\u30eb
 
 # org.omegat.filters3.xml.opendoc.OpenDocFilter
 
-OpenDoc_FILTER_NAME=OpenDocument\u3084OpenOffice.org\u30d5\u30a1\u30a4\u30eb
-OpenDoc_FILTER_OPTIONS=OpenDocument\u30d5\u30a3\u30eb\u30bf\u30fc\u8a2d\u5b9a
-OpenDoc_TRANSLATE_ELEMENTS=\u9078\u629e\u3057\u305f\u8981\u7d20\u3092\u7ffb\u8a33\u5bfe\u8c61\u3068\u3057\u307e\u3059\uff1a
-OpenDoc_TRANSLATE_INDEXES=Index\u9805\u76ee
+OpenDoc_FILTER_NAME=OpenDocument \u307e\u305f\u306f OpenOffice.org \u30d5\u30a1\u30a4\u30eb
+OpenDoc_FILTER_OPTIONS=OpenDocument \u30d5\u30a3\u30eb\u30bf\u30fc\u8a2d\u5b9a
+OpenDoc_TRANSLATE_ELEMENTS=\u4ee5\u4e0b\u306e\u8981\u7d20\u3092\u7ffb\u8a33\uff1a
+OpenDoc_TRANSLATE_INDEXES=Index \u9805\u76ee
 OpenDoc_TRANSLATE_BOOKMARKS=\u30d6\u30c3\u30af\u30de\u30fc\u30af
 OpenDoc_TRANSLATE_BOOKMARKREFS=\u30d6\u30c3\u30af\u30de\u30fc\u30af\u53c2\u7167
 OpenDoc_TRANSLATE_NOTES=\u30ce\u30fc\u30c8
@@ -889,8 +889,8 @@ OpenDoc_ERROR_IN_FILE=\u30d5\u30a1\u30a4\u30eb\u306b\u30a8\u30e9\u30fc\u304c\u30
 
 # org.omegat.filters3.xml.openxml.OpenXMLFilter
 
-OpenXML_FILTER_NAME=Microsoft Open XML\u30d5\u30a1\u30a4\u30eb
-OpenXML_FILTER_OPTIONS=Open XML\u30d5\u30a3\u30eb\u30bf\u30fc\u8a2d\u5b9a
+OpenXML_FILTER_NAME=Microsoft Open XML \u30d5\u30a1\u30a4\u30eb
+OpenXML_FILTER_OPTIONS=Open XML \u30d5\u30a3\u30eb\u30bf\u30fc\u8a2d\u5b9a
 OpenXML_WORD=Microsoft Word
 OpenXML_TRANSLATE_HIDDEN_TEXT=\u975e\u8868\u793a\u306e\u547d\u4ee4\u3068\u30c6\u30ad\u30b9\u30c8
 OpenXML_TRANSLATE_COMMENTS=\u30b3\u30e1\u30f3\u30c8
@@ -911,6 +911,7 @@ OpenXML_TRANSLATE_DIAGRAMS=\u30c0\u30a4\u30a2\u30b0\u30e9\u30e0
 OpenXML_TRANSLATE_DRAWINGS=\u56f3
 OpenXML_GENERIC_OPTIONS=\u305d\u306e\u4ed6\u306e\u8a2d\u5b9a\uff1a
 OpenXML_AGGREGATE_TAGS=\u30bf\u30b0\u3092\u7d50\u5408
+OpenXML_PRESERVE_SPACES=\u5206\u7bc0\u5185\u306e\u7a7a\u767d\u3092\u4fdd\u6301
 
 OpenXML_ERROR_IN_FILE=\u30d5\u30a1\u30a4\u30eb\u306b\u30a8\u30e9\u30fc\u304c\u3042\u308a\u307e\u3059\u3002
 
@@ -920,41 +921,41 @@ ABOUTDIALOG_VERSION=OmegaT \u30d0\u30fc\u30b8\u30e7\u30f3 {0}
 
 ABOUTDIALOG_VERSION_UPDATE=OmegaT \u30d0\u30fc\u30b8\u30e7\u30f3 {0} \u30a2\u30c3\u30d7\u30c7\u30fc\u30c8 {1}
 
-ABOUTDIALOG_TITLE=OmegaT\u306b\u3064\u3044\u3066
+ABOUTDIALOG_TITLE=OmegaT \u306b\u3064\u3044\u3066
 ABOUTDIALOG_COPYRIGHT=Copyright \u00a9 2000-2011 Keith Godfrey, Maxym Mykhalchuk \u306a\u3069
 
 ABOUTDIALOG_LICENSE_BUTTON=\u30e9\u30a4\u30bb\u30f3\u30b9
-ABOUTDIALOG_CONTRIBUTORS=OmegaT\u306f\u3001\u81ea\u7531\u306b\u4f7f\u7528\u3067\u304d\u308b\u30b3\u30f3\u30d4\u30e5\u30fc\u30bf\u30fc\u7ffb\u8a33\u652f\u63f4\u30c4\u30fc\u30eb\u3067\u3059\u3002\u53c2\u8003\u8a33\u6587\u3001\u7ffb\u8a33\u30e1\u30e2\u30ea\u3001\u30ad\u30fc\u30ef\u30fc\u30c9\u691c\u7d22\u3001\u7528\u8a9e\u96c6\u306a\u3069\u306e\u6a5f\u80fd\u304c\u3042\u308a\u3001\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306e\u66f4\u65b0\u306b\u7ffb\u8a33\u3092\u6d3b\u7528\u3067\u304d\u307e\u3059\u3002 \n\nOmegaT \u306e\u30aa\u30ea\u30b8\u30ca\u30eb\u306f Keith Godfrey \u306b\u3088\u308b\u3082\u306e\u3067\u3059\u3002Marc Prior \u304c OmegaT \u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306e\u30b3\u30fc\u30c7\u30a3\u30cd\u30fc\u30bf\u30fc\u3067\u3059\u3002 \n\n\u30b3\u30fc\u30c9\u306b\u95a2\u3059\u308b\u8ca2\u732e\u8005\uff1a \nZoltan Bartko\u3001Volker Berlin\u3001Didier Briel\uff08\u958b\u767a\u62c5\u5f53\uff09\u3001Kim Bruning\u3001Alex Buloichik\uff08\u958b\u767a\u30ea\u30fc\u30c0\u30fc\uff09\u3001Sandra Jean Chua\u3001Martin Fleurke\u3001Wildrich Fourie\u3001Thomas Huriaux\u3001Ibai Lakunza Velasco\u3001Fabi\u00e1n Mandelbaum\u3001Maxym Mykhalchuk\u3001Arno Peters\u3001Henry Pijffers\u3001Tiago Saboga\u3001Andrzej Sawu\u0142a\u3001Benjamin Siband\u3001Rashid Umarov\u3001Antonio Vilei\u3001\u305d\u3057\u3066Martin Wunderlich\n\n\u4ed6\u306e\u8ca2\u732e\u8005\u306b\u3064\u3044\u3066\u306f\u3001readme_ja.txt\u30d5\u30a1\u30a4\u30eb\u306b\u8a18\u8f09\u3057\u3066\u3044\u307e\u3059\u3002\n\nOmegaT \u306f\u4ee5\u4e0b\u306b\u793a\u3059\u30e9\u30a4\u30d6\u30e9\u30ea\u3092\u4f7f\u7528\u3057\u3066\u3044\u307e\u3059\u3002\n  Somik Raha\u3001Derrick Oswald\u306a\u3069\u306b\u3088\u308bHTMLParser 1.6\uff08LGPL\u30e9\u30a4\u30bb\u30f3\u30b9\uff09\n  Steve Roy\u306b\u3088\u308bMRJ Adapter 1.0.8\uff08LGPL\u30e9\u30a4\u30bb\u30f3\u30b9\uff09\n  VLSolutions\u793e\u306b\u3088\u308bVLDocking Framework 2.1.4\uff08CeCILL\u30e9\u30a4\u30bb\u30f3\u30b9\uff09\n  L\u00e1szl\u00f3 N\u00e9meth\u306a\u3069\u306b\u3088\u308bHunspell\uff08LGPL\u30e9\u30a4\u30bb\u30f3\u30b9\uff09\n  Todd Fast\u3001Timothy Wall\u306a\u3069\u306b\u3088\u308bJNA \uff08LGPL\u30e9\u30a4\u30bb\u30f3\u30b9\uff09\n  Swing-Layout 1.0.2\uff08LGPL\u30e9\u30a4\u30bb\u30f3\u30b9\uff09\n  Jmyspell 2.1.4\uff08LGPL\u30e9\u30a4\u30bb\u30f3\u30b9\uff09 \n  JAXB\uff08GPLv2\u30e9\u30a4\u30bb\u30f3\u30b9\u3068Classpath\u4f8b\u5916\uff09
+ABOUTDIALOG_CONTRIBUTORS=OmegaT \u306f\u3001\u81ea\u7531\u306b\u4f7f\u7528\u3067\u304d\u308b\u30b3\u30f3\u30d4\u30e5\u30fc\u30bf\u30fc\u7ffb\u8a33\u652f\u63f4\u30c4\u30fc\u30eb\u3067\u3059\u3002\u53c2\u8003\u8a33\u6587\u3001\u7ffb\u8a33\u30e1\u30e2\u30ea\u3001\u30ad\u30fc\u30ef\u30fc\u30c9\u691c\u7d22\u3001\u7528\u8a9e\u96c6\u306a\u3069\u306e\u6a5f\u80fd\u304c\u3042\u308a\u3001\u3059\u3067\u306b\u4f5c\u6210\u3057\u305f\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3092\u5bfe\u8c61\u3068\u3059\u308b\u7ffb\u8a33\u306b\u3082\u6d3b\u7528\u3067\u304d\u307e\u3059\u3002 \nOmegaT \u306e\u30aa\u30ea\u30b8\u30ca\u30eb\u306f Keith Godfrey \u306b\u3088\u308b\u3082\u306e\u3067\u3059\u3002Marc Prior \u304c OmegaT \u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306e\u30b3\u30fc\u30c7\u30a3\u30cd\u30fc\u30bf\u30fc\u3067\u3059\u3002 \n\u30b3\u30fc\u30c9\u306b\u95a2\u3059\u308b\u8ca2\u732e\u8005\uff1a\nZoltan Bartko, Volker Berlin, Didier Briel\uff08\u958b\u767a\u62c5\u5f53\uff09, Kim Bruning, Alex Buloichik\uff08\u958b\u767a\u30ea\u30fc\u30c0\u30fc\uff09, Sandra Jean Chua, Martin Fleurke, Wildrich Fourie, Thomas Huriaux, Ibai Lakunza Velasco, Fabi\u00e1n Mandelbaum, Maxym Mykhalchuk, Arno Peters, Henry Pijffers, Tiago Saboga, Andrzej Sawu\u0142a, Benjamin Siband, Rashid Umarov, Antonio Vilei \u305d\u3057\u3066 Martin Wunderlich\n\n\u4ed6\u306e\u8ca2\u732e\u8005\u306b\u3064\u3044\u3066\u306f\u3001readme_ja.txt \u30d5\u30a1\u30a4\u30eb\u306b\u8a18\u8f09\u3057\u3066\u3044\u307e\u3059\u3002\n\nOmegaT \u306f\u4ee5\u4e0b\u306b\u793a\u3059\u30e9\u30a4\u30d6\u30e9\u30ea\u3092\u4f7f\u7528\u3057\u3066\u3044\u307e\u3059\u3002\n  Somik Raha, Derrick Oswald \u306a\u3069\u306b\u3088\u308b HTMLParser 1.6\uff08LGPL \u30e9\u30a4\u30bb\u30f3\u30b9\uff09\n  Steve Roy \u306b\u3088\u308b MRJ Adapter 1.0.8\uff08LGPL \u30e9\u30a4\u30bb\u30f3\u30b9\uff09\n  VLSolutions \u793e\u306b\u3088\u308b VLDocking Framework 2.1.4\uff08CeCILL \u30e9\u30a4\u30bb\u30f3\u30b9\uff09\n  L\u00e1szl\u00f3 N\u00e9meth \u306a\u3069\u306b\u3088\u308b Hunspell\uff08LGPL \u30e9\u30a4\u30bb\u30f3\u30b9\uff09\n  Todd Fast, Timothy Wall \u306a\u3069\u306b\u3088\u308b JNA \uff08LGPL \u30e9\u30a4\u30bb\u30f3\u30b9\uff09\n  Swing-Layout 1.0.2\uff08LGPL \u30e9\u30a4\u30bb\u30f3\u30b9\uff09\n  Jmyspell 2.1.4\uff08LGPL \u30e9\u30a4\u30bb\u30f3\u30b9\uff09 \n  JAXB\uff08GPL v2 \u30e9\u30a4\u30bb\u30f3\u30b9\u3068 Classpath \u4f8b\u5916\uff09
 
 # LicenseDialog.java
 
-LICENSEDIALOG_TITLE=OmegaT\u30e9\u30a4\u30bb\u30f3\u30b9
+LICENSEDIALOG_TITLE=OmegaT \u30e9\u30a4\u30bb\u30f3\u30b9
 
 #Not sure if this should be translated or not.
 #In any case translated version should contain English original.
-LICENSEDIALOG_PREFACE=\u3053\u306e\u30d7\u30ed\u30b0\u30e9\u30e0\u306f\u81ea\u7531\u306a\u30bd\u30d5\u30c8\u30a6\u30a7\u30a2\u3067\u3059\u3002\u3042\u306a\u305f\u306f\u3053\u308c\u3092\u3001\u30d5\u30ea\u30fc\u30bd\u30d5\u30c8\u30a6\u30a7\u30a2\u8ca1\u56e3\u306b\u3088\u3063\u3066\u767a\u884c\u3055\u308c\u305f GNU\u4e00\u822c\u516c\u8846\u5229\u7528\u8a31\u8afe\u5951\u7d04\u66f8\uff08\u30d0\u30fc\u30b8\u30e7\u30f32\u304b\u3001\u5e0c\u671b\u306b\u3088\u3063\u3066\u306f\u305d\u308c\u4ee5\u964d\u306e\u30d0\u30fc\u30b8\u30e7\u30f3\u306e\u3046\u3061\u3069\u308c\u304b\uff09\u306e\u5b9a\u3081\u308b\u6761\u4ef6\u306e\u4e0b\u3067\u518d\u9812\u5e03\u307e\u305f\u306f\u6539\u5909\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u3059\u3002 \n\u3053\u306e\u30d7\u30ed\u30b0\u30e9\u30e0\u306f\u6709\u52b9\u6d3b\u7528\u3055\u308c\u308b\u3053\u3068\u3092\u9858\u3063\u3066\u9812\u5e03\u3055\u308c\u308b\u3082\u306e\u3067\u3059\u304c\u3001\u305d\u306e\u5185\u5bb9\u306b\u3064\u3044\u3066\u306f\u5168\u304f\u306e\u7121\u4fdd\u8a3c\u3068\u306a\u308a\u307e\u3059\u3002\u5546\u54c1\u6027\u306e\u9ed9\u793a\u4fdd\u8a3c\u3001\u307e\u305f\u306f\u7279\u5b9a\u76ee\u7684\u3078\u306e\u9069\u5408\u6027\u306f\u5168\u304f\u5b58\u5728\u3057\u307e\u305b\u3093\u3002
+LICENSEDIALOG_PREFACE=\u3053\u306e\u30d7\u30ed\u30b0\u30e9\u30e0\u306f\u81ea\u7531\u306a\u30bd\u30d5\u30c8\u30a6\u30a7\u30a2\u3067\u3059\u3002\u3042\u306a\u305f\u306f\u3053\u308c\u3092\u3001\u30d5\u30ea\u30fc\u30bd\u30d5\u30c8\u30a6\u30a7\u30a2\u8ca1\u56e3\u306b\u3088\u3063\u3066\u767a\u884c\u3055\u308c\u305f GNU \u4e00\u822c\u516c\u8846\u5229\u7528\u8a31\u8afe\u5951\u7d04\u66f8\uff08\u30d0\u30fc\u30b8\u30e7\u30f3 2 \u304b\u3001\u5e0c\u671b\u306b\u3088\u3063\u3066\u306f\u305d\u308c\u4ee5\u964d\u306e\u30d0\u30fc\u30b8\u30e7\u30f3\u306e\u3046\u3061\u3069\u308c\u304b\uff09\u306e\u5b9a\u3081\u308b\u6761\u4ef6\u306e\u4e0b\u3067\u518d\u9812\u5e03\u307e\u305f\u306f\u6539\u5909\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u3059\u3002 \n\u3053\u306e\u30d7\u30ed\u30b0\u30e9\u30e0\u306f\u6709\u52b9\u6d3b\u7528\u3055\u308c\u308b\u3053\u3068\u3092\u9858\u3063\u3066\u9812\u5e03\u3055\u308c\u308b\u3082\u306e\u3067\u3059\u304c\u3001\u305d\u306e\u5185\u5bb9\u306b\u3064\u3044\u3066\u306f\u5168\u304f\u306e\u7121\u4fdd\u8a3c\u3068\u306a\u308a\u307e\u3059\u3002\u5546\u54c1\u6027\u306e\u9ed9\u793a\u4fdd\u8a3c\u3001\u307e\u305f\u306f\u7279\u5b9a\u76ee\u7684\u3078\u306e\u9069\u5408\u6027\u306f\u5168\u304f\u5b58\u5728\u3057\u307e\u305b\u3093\u3002
 
 # FilterEditor.java
 
-FILTEREDITOR_Edit_a_single_file_filter=\u30d5\u30a3\u30eb\u30bf\u30fc\u7de8\u96c6
+FILTEREDITOR_Edit_a_single_file_filter=\u30d5\u30a3\u30eb\u30bf\u30fc\u306e\u7de8\u96c6
 
 FILTEREDITOR_really_delete_filter_instance=\u69cb\u6210\u4f8b {0} \u3092\u524a\u9664\u3057\u307e\u3059\u3002
 
 FILTEREDITOR_Confirm_deletion_TITLE=\u69cb\u6210\u4f8b\u3092\u524a\u9664\u3057\u307e\u3059\u304b\uff1f
 
-FILTEREDITOR_ERROR_Reverting_To_Def=\u30d5\u30a3\u30eb\u30bf\u30fc\u3092\u521d\u671f\u5024\u306b\u623b\u305b\u307e\u305b\u3093\u3002 \n\u4f8b\u5916\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002\n
+FILTEREDITOR_ERROR_Reverting_To_Def=\u30d5\u30a3\u30eb\u30bf\u30fc\u306e\u69cb\u6210\u4f8b\u3092\u521d\u671f\u5024\u306b\u623b\u305b\u307e\u305b\u3093\u3002 \n\u4f8b\u5916\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002\n
 
 FILTEREDITOR_BUTTON_To_Defaults=\u521d\u671f\u5024
 
 FILTEREDITOR_File_Format=\u30d5\u30a1\u30a4\u30eb\u5f62\u5f0f
 
-FILTEREDITOR_DESC=\u30d5\u30a3\u30eb\u30bf\u30fc\u5bfe\u8c61\u3068\u3059\u308b\u539f\u6587\u30d5\u30a1\u30a4\u30eb\u540d\u69cb\u6210\u4f8b\u306e\u8a2d\u5b9a\u3001\u8a33\u6587\u30d5\u30a1\u30a4\u30eb\u540d\u306e\u30ab\u30b9\u30bf\u30de\u30a4\u30ba\u3001\u8aad\u307f\u8fbc\u3080\u30d5\u30a1\u30a4\u30eb\u3068\u751f\u6210\u3055\u308c\u308b\u8a33\u6587\u30d5\u30a1\u30a4\u30eb\u306e\u30a8\u30f3\u30b3\u30fc\u30c7\u30a3\u30f3\u30b0\u306e\u9078\u629e\u304c\u884c\u3048\u307e\u3059\u3002\u30d5\u30a3\u30eb\u30bf\u30fc\u306b\u3088\u3063\u3066\u306f\u3001\u30a8\u30f3\u30b3\u30fc\u30c7\u30a3\u30f3\u30b0\u304c\u9078\u629e\u3067\u304d\u306a\u3044\u5834\u5408\u304c\u3042\u308a\u307e\u3059\u3002
+FILTEREDITOR_DESC=\u30d5\u30a3\u30eb\u30bf\u30fc\u3067\u51e6\u7406\u3059\u308b\u539f\u6587\u30d5\u30a1\u30a4\u30eb\u540d\u306e\u69cb\u6210\u4f8b\u306e\u6307\u5b9a\u3001\u8a33\u6587\u30d5\u30a1\u30a4\u30eb\u540d\u306e\u30ab\u30b9\u30bf\u30de\u30a4\u30ba\u3001\u8aad\u307f\u8fbc\u3080\u539f\u6587\u30d5\u30a1\u30a4\u30eb\u3068\u751f\u6210\u3059\u308b\u8a33\u6587\u30d5\u30a1\u30a4\u30eb\u306e\u30a8\u30f3\u30b3\u30fc\u30c7\u30a3\u30f3\u30b0\u3092\u8a2d\u5b9a\u3057\u307e\u3059\u3002\u30a8\u30f3\u30b3\u30fc\u30c7\u30a3\u30f3\u30b0\u3092\u6307\u5b9a\u3067\u304d\u306a\u3044\u30d5\u30a3\u30eb\u30bf\u30fc\u3082\u3042\u308a\u307e\u3059\u3002
 
 # FiltersCustomizer.java
 
 FILTERSCUSTOMIZER_TITLE=\u30d5\u30a1\u30a4\u30eb\u30d5\u30a3\u30eb\u30bf\u30fc
 
-FILTERSCUSTOMIZER_DESCRIPTION=\u30d5\u30a1\u30a4\u30eb\u30d5\u30a3\u30eb\u30bf\u30fc\u306e\u8868\u793a\u3084\u7de8\u96c6\u304c\u884c\u3048\u307e\u3059\u3002\u30d5\u30a3\u30eb\u30bf\u30fc\u3067\u51e6\u7406\u3059\u308b\u30d5\u30a1\u30a4\u30eb\u3068\u30a8\u30f3\u30b3\u30fc\u30c7\u30a3\u30f3\u30b0\u3092\u5909\u66f4\u3059\u308b\u306b\u306f\u3001\u4e00\u89a7\u304b\u3089\u30d5\u30a3\u30eb\u30bf\u30fc\u3092\u9078\u629e\u3057\uff3b\u7de8\u96c6...\uff3d\u3092\u30af\u30ea\u30c3\u30af\u3057\u3066\u304f\u3060\u3055\u3044\u3002\u30d5\u30a3\u30eb\u30bf\u30fc\u306b\u95a2\u3059\u308b\u8a2d\u5b9a\u306f\u3001\uff3b\u8a2d\u5b9a...\uff3d\u304b\u3089\u884c\u3048\u307e\u3059\u3002
+FILTERSCUSTOMIZER_DESCRIPTION=\u30d5\u30a1\u30a4\u30eb\u30d5\u30a3\u30eb\u30bf\u30fc\u306e\u8a2d\u5b9a\u5185\u5bb9\u3092\u78ba\u8a8d\u3001\u307e\u305f\u306f\u7de8\u96c6\u3067\u304d\u307e\u3059\u3002\u30d5\u30a3\u30eb\u30bf\u30fc\u5bfe\u8c61\u3068\u3059\u308b\u30d5\u30a1\u30a4\u30eb\u3084\u30a8\u30f3\u30b3\u30fc\u30c7\u30a3\u30f3\u30b0\u3092\u5909\u66f4\u3059\u308b\u5834\u5408\u306f[\u7de8\u96c6...]\u3092\u30af\u30ea\u30c3\u30af\u3057\u307e\u3059\u3002[\u8a2d\u5b9a...]\u3067\u30d5\u30a3\u30eb\u30bf\u30fc\u500b\u5225\u306e\u8a2d\u5b9a\u5909\u66f4\u3082\u884c\u3048\u307e\u3059\u3002
 
 FILTERSCUSTOMIZER_BUTTON_EDIT_HINT=\u30d5\u30a3\u30eb\u30bf\u30fc\u69cb\u6210\u4f8b\u3092\u7de8\u96c6
 
@@ -982,52 +983,52 @@ ST_PROJECT_AUTOSAVED={0} \u306b\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3092\u81ea\
 
 # org.omegat.filters2.html2.*
 
-HTML__FILE_TOO_BIG=HTML\u30d5\u30a1\u30a4\u30eb\u306e\u30b5\u30a4\u30ba\u304c\u5927\u304d\u3059\u304e\u307e\u3059\u3002
-HTML__INVALID_HTML=HTML\u30d5\u30a1\u30a4\u30eb\u306f\u7121\u52b9\u3067\u3059\u3002
+HTML__FILE_TOO_BIG=HTML \u30d5\u30a1\u30a4\u30eb\u306e\u30b5\u30a4\u30ba\u304c\u5927\u304d\u3059\u304e\u307e\u3059\u3002
+HTML__INVALID_HTML=\u4e0d\u6b63\u306a HTML \u30d5\u30a1\u30a4\u30eb\u3067\u3059\u3002
 
-HTML__FILTER_NAME=HTML\u30d5\u30a1\u30a4\u30eb\u30fbXHTML\u30d5\u30a1\u30a4\u30eb
+HTML__FILTER_NAME=HTML \u30d5\u30a1\u30a4\u30eb\u30fbXHTML \u30d5\u30a1\u30a4\u30eb
 
-HTML_NOTE=\u3054\u6ce8\u610f\uff1a\u539f\u6587\u30d5\u30a1\u30a4\u30eb\u306e\u30a8\u30f3\u30b3\u30fc\u30c7\u30a3\u30f3\u30b0\u8a2d\u5b9a\u304c\u6709\u52b9\u3068\u306a\u308b\u306e\u306f\u3001HTML\u30d5\u30a1\u30a4\u30eb\u4e2d\u306b\u30a8\u30f3\u30b3\u30fc\u30c7\u30a3\u30f3\u30b0\u5ba3\u8a00\u304c\u306a\u3044\u5834\u5408\u306e\u307f\u3067\u3059\u3002HTML\u30d5\u30a1\u30a4\u30eb\u4e2d\u306b\u30a8\u30f3\u30b3\u30fc\u30c7\u30a3\u30f3\u30b0\u5ba3\u8a00\u304c\u5b58\u5728\u3059\u308b\u5834\u5408\u3001\u3053\u306e\u6b04\u3067\u306e\u30a8\u30f3\u30b3\u30fc\u30c7\u30a3\u30f3\u30b0\u306e\u8a2d\u5b9a\u306f\u7121\u8996\u3055\u308c\u307e\u3059\u3002
+HTML_NOTE=\u3054\u6ce8\u610f\uff1aHTML \u30d5\u30a1\u30a4\u30eb\u4e2d\u306b\u30a8\u30f3\u30b3\u30fc\u30c7\u30a3\u30f3\u30b0\u5ba3\u8a00\u304c\u5b58\u5728\u3057\u306a\u3044\u5834\u5408\u3001\u4ee5\u4e0b\u306e\u539f\u6587\u30d5\u30a1\u30a4\u30eb\u306e\u30a8\u30f3\u30b3\u30fc\u30c7\u30a3\u30f3\u30b0\u8a2d\u5b9a\u304c\u6709\u52b9\u306b\u306a\u308a\u307e\u3059\u3002HTML \u30d5\u30a1\u30a4\u30eb\u4e2d\u306b\u30a8\u30f3\u30b3\u30fc\u30c7\u30a3\u30f3\u30b0\u5ba3\u8a00\u304c\u5b58\u5728\u3059\u308b\u5834\u5408\u3001\u4ee5\u4e0b\u306e\u8a2d\u5b9a\u306f\u53cd\u6620\u3055\u308c\u305a\u3001\u305d\u306e\u5ba3\u8a00\u304c\u4f7f\u7528\u3055\u308c\u307e\u3059\u3002
 
-HTML_Filter_Options=(X)HTML\u30d5\u30a3\u30eb\u30bf\u30fc\u8a2d\u5b9a
+HTML_Filter_Options=(X)HTML \u30d5\u30a3\u30eb\u30bf\u30fc\u8a2d\u5b9a
 
-HTML_OPTION_REWRITE_ENC=HTML\u30fbXHTML\u30d5\u30a1\u30a4\u30eb\u306b\u30a8\u30f3\u30b3\u30fc\u30c7\u30a3\u30f3\u30b0\u5ba3\u8a00\u3092\u8ffd\u52a0\u307e\u305f\u306f\u5909\u66f4\u3059\u308b\uff1a
+HTML_OPTION_REWRITE_ENC=\u4ee5\u4e0b\u306e\u5834\u5408\u306b HTML\u30fbXHTML \u30d5\u30a1\u30a4\u30eb\u306b\u30a8\u30f3\u30b3\u30fc\u30c7\u30a3\u30f3\u30b0\u5ba3\u8a00\u3092\u8ffd\u52a0\u307e\u305f\u306f\u5909\u66f4\uff1a
 
 HTML_REWRITE_ENC_ALWAYS=\u5e38\u306b
 
-HTML_REWRITE_ENC_IF_HAS_HEADER=\ (X)HTML\u30d5\u30a1\u30a4\u30eb\u306b\u30d8\u30c3\u30c0\u30fc\u304c\u3042\u308b\u5834\u5408\u306e\u307f 
+HTML_REWRITE_ENC_IF_HAS_HEADER=\ (X)HTML \u30d5\u30a1\u30a4\u30eb\u306b\u30d8\u30c3\u30c0\u30fc\u304c\u3042\u308b\u5834\u5408\u306e\u307f 
 
 HTML_SKIPREGEXP=\u4ee5\u4e0b\u306e\u6b63\u898f\u8868\u73fe\u306b\u4e00\u81f4\u3059\u308b\u6587\u5b57\u5217\u306f\u7ffb\u8a33\u3057\u306a\u3044\uff1a
 
-HTML_SKIPMETA=<meta>\u30bf\u30b0\u5185\u306b\u3042\u308b\u4ee5\u4e0b\u306e\u300c\u5c5e\u6027=\u5024\u300d\u306f\u7ffb\u8a33\u3057\u306a\u3044\uff08\u30ab\u30f3\u30de\u533a\u5207\u308a\u3067\u8907\u6570\u6307\u5b9a\uff09\uff1a
+HTML_SKIPMETA=<meta> \u30bf\u30b0\u5185\u306e\u4ee5\u4e0b\u306e\u5c5e\u6027\u3068\u5024\u306f\u7ffb\u8a33\u3057\u306a\u3044\uff08\u30ab\u30f3\u30de\u533a\u5207\u308a\u3067\u8907\u6570\u6307\u5b9a\uff09:
 
-HTML_REWRITE_ENC_IF_HAS_META=(X)HTML\u30d5\u30a1\u30a4\u30eb\u306b\u30a8\u30f3\u30b3\u30fc\u30c7\u30a3\u30f3\u30b0\u5ba3\u8a00\u304c\u3042\u308b\u5834\u5408\u306e\u307f 
+HTML_REWRITE_ENC_IF_HAS_META=(X)HTML \u30d5\u30a1\u30a4\u30eb\u306b\u30a8\u30f3\u30b3\u30fc\u30c7\u30a3\u30f3\u30b0\u5ba3\u8a00\u304c\u3042\u308b\u5834\u5408\u306e\u307f 
 
 HTML_REWRITE_ENC_NEVER=\u3057\u306a\u3044
 
-HTML_TRANSLATE_ATTRIBUTES=\u4ee5\u4e0b\u306e\u5c5e\u6027\u3092\u7ffb\u8a33\u3059\u308b\uff1a
-HTML_TRANSLATE_HREF=href\uff08\u30ea\u30f3\u30af\u306eURL\uff09
-HTML_TRANSLATE_SRC=src\uff08\u753b\u50cf\u306eURL\uff09
+HTML_TRANSLATE_ATTRIBUTES=\u4ee5\u4e0b\u306e\u5c5e\u6027\u3092\u7ffb\u8a33\uff1a
+HTML_TRANSLATE_HREF=href\uff08\u30ea\u30f3\u30af\u5148\u306e URL\uff09
+HTML_TRANSLATE_SRC=src\uff08\u753b\u50cf\u306e URL\uff09
 HTML_TRANSLATE_LANG=lang\uff08\u8a00\u8a9e\uff09
 HTML_TRANSLATE_HREFLANG=hreflang\uff08\u30ea\u30f3\u30af\u5148\u306e\u8a00\u8a9e\uff09
-HTML_TRANSLATE_VALUE=value\uff08button\u3084submit\u3001reset\u3092\u542b\u3080\u30d5\u30a9\u30fc\u30e0\u5165\u529b\uff09
-HTML_TRANSLATE_BUTTON_VALUE=value\uff08button\u3084submit\u3001reset\uff09
+HTML_TRANSLATE_VALUE=value\uff08button \u3084 submit, reset \u3092\u542b\u3080\u30d5\u30a9\u30fc\u30e0\u5165\u529b\uff09
+HTML_TRANSLATE_BUTTON_VALUE=value\uff08button \u3084 submit, reset\uff09
 
-HTML_PARAGRAPH_ON=\u4ee5\u4e0b\u306e\u30bf\u30b0\u3067\u5206\u7bc0\u5316\u3059\u308b\uff1a
+HTML_PARAGRAPH_ON=\u4ee5\u4e0b\u306e\u30bf\u30b0\u3067\u5206\u7bc0\u5316\uff1a
 HTML_PARAGRAPH_ON_BR=<br>\uff08\u6539\u884c\uff09
 
-HTML_EXC_EDIT_OPTIONS=\u8a2d\u5b9a\u306e\u7de8\u96c6\u4e2d\u306b\u3001\u4f8b\u5916\u304c\u767a\u751f\u3057\u307e\u3057\u305f\uff1a
+HTML_EXC_EDIT_OPTIONS=\u8a2d\u5b9a\u306e\u7de8\u96c6\u4e2d\u306b\u4f8b\u5916\u304c\u767a\u751f\u3057\u307e\u3057\u305f\uff1a
 
 # org.omegat.filters2.hhc
 
-HHC__FILTER_NAME=HTML\u30d8\u30eb\u30d7\u30b3\u30f3\u30d1\u30a4\u30e9\uff08HHC\uff09\u30d5\u30a1\u30a4\u30eb
-HHC__FILE_TOO_BIG=HHC\u30d5\u30a1\u30a4\u30eb\u306e\u30b5\u30a4\u30ba\u304c\u5927\u304d\u3059\u304e\u307e\u3059\u3002
-HHC_NOTE=\u3054\u6ce8\u610f\uff1a\u539f\u6587\u30d5\u30a1\u30a4\u30eb\u306e\u30a8\u30f3\u30b3\u30fc\u30c7\u30a3\u30f3\u30b0\u8a2d\u5b9a\u304c\u6709\u52b9\u3068\u306a\u308b\u306e\u306f\u3001HHC\u30fbHNK\u30d5\u30a1\u30a4\u30eb\u4e2d\u306b\u30a8\u30f3\u30b3\u30fc\u30c7\u30a3\u30f3\u30b0\u5ba3\u8a00\u304c\u306a\u3044\u5834\u5408\u306e\u307f\u3067\u3059\u3002HHC\u30fbHNK\u30d5\u30a1\u30a4\u30eb\u4e2d\u306b\u30a8\u30f3\u30b3\u30fc\u30c7\u30a3\u30f3\u30b0\u5ba3\u8a00\u304c\u5b58\u5728\u3059\u308b\u5834\u5408\u3001\u3053\u306e\u6b04\u3067\u306e\u8a2d\u5b9a\u306b\u95a2\u308f\u3089\u305a\u3001\u305d\u306e\u5ba3\u8a00\u304c\u4f7f\u7528\u3055\u308c\u307e\u3059\u3002
+HHC__FILTER_NAME=HTML \u30d8\u30eb\u30d7\u30b3\u30f3\u30d1\u30a4\u30e9\uff08HHC\uff09\u30d5\u30a1\u30a4\u30eb
+HHC__FILE_TOO_BIG=HHC \u30d5\u30a1\u30a4\u30eb\u306e\u30b5\u30a4\u30ba\u304c\u5927\u304d\u3059\u304e\u307e\u3059\u3002
+HHC_NOTE=\u3054\u6ce8\u610f\uff1aHHC\u30fbHNK \u30d5\u30a1\u30a4\u30eb\u4e2d\u306b\u30a8\u30f3\u30b3\u30fc\u30c7\u30a3\u30f3\u30b0\u5ba3\u8a00\u304c\u5b58\u5728\u3057\u306a\u3044\u5834\u5408\u3001\u4ee5\u4e0b\u306e\u539f\u6587\u30d5\u30a1\u30a4\u30eb\u306e\u30a8\u30f3\u30b3\u30fc\u30c7\u30a3\u30f3\u30b0\u8a2d\u5b9a\u304c\u6709\u52b9\u306b\u306a\u308a\u307e\u3059\u3002HHC \u307e\u305f\u306f HHK \u30d5\u30a1\u30a4\u30eb\u4e2d\u306b\u30a8\u30f3\u30b3\u30fc\u30c7\u30a3\u30f3\u30b0\u5ba3\u8a00\u304c\u5b58\u5728\u3059\u308b\u5834\u5408\u3001\u4ee5\u4e0b\u306e\u8a2d\u5b9a\u306f\u53cd\u6620\u3055\u308c\u305a\u3001\u305d\u306e\u5ba3\u8a00\u304c\u4f7f\u7528\u3055\u308c\u307e\u3059\u3002
 
 # org.omegat.filters3.xml.xhtml
 
-XHTML_FILTER_NAME=XHTML\u30d5\u30a1\u30a4\u30eb
-XHTML_Filter_Options=XHTML\u30d5\u30a3\u30eb\u30bf\u30fc\u8a2d\u5b9a
+XHTML_FILTER_NAME=XHTML \u30d5\u30a1\u30a4\u30eb
+XHTML_Filter_Options=XHTML \u30d5\u30a3\u30eb\u30bf\u30fc\u8a2d\u5b9a
 
 # org.omegat.gui.ProjectProperties
 
@@ -1042,11 +1043,11 @@ PP_MESSAGE_EDITPROJ=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u8a2d\u5b9a\u306e\u78ba
 # 0 - exceptions
 CORE_SRX_EXC_LOADING_SEG_RULES=\u5206\u7bc0\u5316\u898f\u5247\u3092\u8aad\u307f\u8fbc\u307f\u4e2d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f\uff1a
 
-CORE_SRX_ERROR_SAVING_SEGMENTATION_CONFIG=\u5206\u7bc0\u5316\u898f\u5247\u306e\u8a2d\u5b9a\u3092\u4fdd\u5b58\u3059\u308b\u969b\u306e\u30a8\u30e9\u30fc\uff1a
+CORE_SRX_ERROR_SAVING_SEGMENTATION_CONFIG=\u5206\u7bc0\u5316\u898f\u5247\u306e\u8a2d\u5b9a\u3092\u4fdd\u5b58\u3059\u308b\u969b\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f\uff1a
 
 CORE_SRX_TABLE_HEADER_Language_Name=\u8a00\u8a9e\u540d
 
-CORE_SRX_TABLE_HEADER_Language_Pattern=\u8a00\u8a9e\u30b3\u30fc\u30c9\u306e\u69cb\u6210\u4f8b
+CORE_SRX_TABLE_HEADER_Language_Pattern=\u8a00\u8a9e\u30b3\u30fc\u30c9\u69cb\u6210\u4f8b
 
 CORE_SRX_TABLE_COLUMN_Break=\u5206\u7bc0 \u307e\u305f\u306f \u4f8b\u5916
 
@@ -1062,16 +1063,16 @@ CORE_SRX_RULES_LANG_DUTCH=\u30aa\u30e9\u30f3\u30c0\u8a9e
 CORE_SRX_RULES_LANG_RUSSIAN=\u30ed\u30b7\u30a2\u8a9e
 CORE_SRX_RULES_LANG_JAPANESE=\u65e5\u672c\u8a9e
 CORE_SRX_RULES_LANG_ENGLISH=\u82f1\u8a9e
-CORE_SRX_RULES_LANG_DEFAULT=\u65e2\u5b9a\u5024
+CORE_SRX_RULES_LANG_DEFAULT=\u521d\u671f\u5024
 CORE_SRX_RULES_FORMATTING_TEXT=\u30c6\u30ad\u30b9\u30c8\u30d5\u30a1\u30a4\u30eb\u306e\u5206\u7bc0\u5316
-CORE_SRX_RULES_FORMATTING_HTML=HTML\u3001XHTML \u3068 ODF \u30d5\u30a1\u30a4\u30eb\u306e\u5206\u7bc0\u5316
+CORE_SRX_RULES_FORMATTING_HTML=HTML, XHTML \u3068 ODF \u30d5\u30a1\u30a4\u30eb\u306e\u5206\u7bc0\u5316
 
 
 # org.omegat.segmentation.SegmentationCustomizer
 
-GUI_SEGMENTATION_TITLE=\u5206\u7bc0\u5316\u306e\u8a2d\u5b9a
+GUI_SEGMENTATION_TITLE=\u5206\u7bc0\u5316\u898f\u5247\u306e\u8a2d\u5b9a
 
-GUI_SEGMENTATION_NOTE=\u8a00\u8a9e\u30b3\u30fc\u30c9\u69cb\u6210\u4f8b\u306b\u4e00\u81f4\u3059\u308b\u5206\u7bc0\u5316\u898f\u5247\u306f\u3001\u8a2d\u5b9a\u3055\u308c\u305f\u9806\u306b\u9069\u7528\u3055\u308c\u307e\u3059\u3002\u4f8b\u3048\u3070\u3001\u30ab\u30ca\u30c0\u30d5\u30e9\u30f3\u30b9\u8a9e\uff08FR-CA\uff09\u306e\u5206\u7bc0\u5316\u898f\u5247\u306f\u3001\u4e00\u822c\u30d5\u30e9\u30f3\u30b9\u8a9e\uff08FR.*\uff09\u306e\u305d\u308c\u3088\u308a\u3082\u4e0a\u4f4d\u306b\u3001\u3055\u3089\u306b\u65e2\u5b9a\u5024\uff08.*\uff09\u3088\u308a\u3082\u4e0a\u4f4d\u306b\u8a2d\u5b9a\u3057\u3066\u304f\u3060\u3055\u3044\u3002\u3053\u306e\u3088\u3046\u306b\u8a2d\u5b9a\u3059\u308b\u3068\u3001\u30ab\u30ca\u30c0\u30d5\u30e9\u30f3\u30b9\u8a9e\u306e\u539f\u6587\u304b\u3089\u7ffb\u8a33\u3059\u308b\u5834\u5408\u3001\u5b9a\u7fa9\u3057\u305f\u3059\u3079\u3066\u306e\u5206\u7bc0\u5316\u898f\u5247\u3092\u3001\u9069\u5207\u306a\u9806\u5e8f\u3067\u4f7f\u7528\u3067\u304d\u307e\u3059\u3002
+GUI_SEGMENTATION_NOTE=\u8a00\u8a9e\u30b3\u30fc\u30c9\u69cb\u6210\u4f8b\u306b\u4e00\u81f4\u3059\u308b\u5206\u7bc0\u5316\u898f\u5247\u306f\u3001\u8a2d\u5b9a\u3057\u305f\u9806\u306b\u9069\u7528\u3055\u308c\u307e\u3059\u3002\u4f8b\u3048\u3070\u3001\u30ab\u30ca\u30c0\u30d5\u30e9\u30f3\u30b9\u8a9e\uff08FR-CA\uff09\u306e\u5206\u7bc0\u5316\u898f\u5247\u306f\u3001\u4e00\u822c\u30d5\u30e9\u30f3\u30b9\u8a9e\uff08FR.*\uff09\u306e\u305d\u308c\u3088\u308a\u3082\u4e0a\u4f4d\u306b\u3001\u3055\u3089\u306b\u65e2\u5b9a\u5024\uff08.*\uff09\u3088\u308a\u3082\u4e0a\u4f4d\u306b\u8a2d\u5b9a\u3057\u3066\u304f\u3060\u3055\u3044\u3002\u3053\u308c\u306b\u3088\u308a\u3001\u30ab\u30ca\u30c0\u30d5\u30e9\u30f3\u30b9\u8a9e\u306e\u539f\u6587\u3092\u7ffb\u8a33\u3059\u308b\u969b\u3001\u5bfe\u8c61\u3068\u3059\u3079\u304d\u3059\u3079\u3066\u306e\u5206\u7bc0\u5316\u898f\u5247\u3092\u9069\u5207\u306a\u9806\u5e8f\u3067\u4f7f\u7528\u3067\u304d\u307e\u3059\u3002
 
 GUI_SEGMENTATION_BUTTON_UP_2=\u4e0a\u3078
 
@@ -1083,19 +1084,19 @@ GUI_SEGMENTATION_BUTTON_DOWN_1=\u4e0b\u3078
 
 GUI_SEGMENTATION_RULESETS=\u5206\u7bc0\u5316\u898f\u5247\u7fa4\uff1a
 
-GUI_SEGMENTATION_RULEORDER=\u5206\u7bc0\u5316\u898f\u5247\u306f\u3001\u4ee5\u4e0b\u306b\u793a\u3059\u9806\u5e8f\u3067\u9069\u7528\u3055\u308c\u307e\u3059\uff1a
+GUI_SEGMENTATION_RULEORDER=\u5206\u7bc0\u5316\u898f\u5247\u306f\u3001\u4ee5\u4e0b\u306e\u9806\u5e8f\u3067\u9069\u7528\u3055\u308c\u307e\u3059\uff1a
 
-SEG_CONFIRM_REMOVE_SENTSEG_SET=\u5206\u7bc0\u5316\u898f\u5247\u7fa4\u300c{0}\u300d\u3092\u524a\u9664\u3057\u3066\u3088\u3044\u3067\u3059\u304b\uff1f 
+SEG_CONFIRM_REMOVE_SENTSEG_SET=\u5206\u7bc0\u5316\u898f\u5247\u7fa4 {0} \u3092\u524a\u9664\u3057\u3066\u3088\u3044\u3067\u3059\u304b\uff1f 
 
-SEG_NEW_LN_CO=\u65b0\u898f\u8a00\u8a9e\uff08\u8a00\u8a9e\u30b3\u30fc\u30c9\uff0b\u5730\u57df\u30b3\u30fc\u30c9\uff09
+SEG_NEW_LN_CO=\u65b0\u898f\u8a00\u8a9e\uff08\u8a00\u8a9e\u30b3\u30fc\u30c9 + \u5730\u57df\u30b3\u30fc\u30c9\uff09
 
 # org.omegat.gui.dialogs.TeamOptionsDialog
 
-GUI_TITLE_Team_Options=\u30c1\u30fc\u30e0\u8a2d\u5b9a
+GUI_TITLE_Team_Options=\u7ffb\u8a33\u8005\u540d\u306e\u8a2d\u5b9a
 
-GUI_TEAM_DESCRIPTION=\u540d\u524d\u307e\u305f\u306fID\u3092\u5165\u529b\u3057\u3066\u304f\u3060\u3055\u3044\u3002\u3042\u306a\u305f\u304c\u884c\u3063\u305f\u7ffb\u8a33\u306b\u30de\u30fc\u30af\u3059\u308b\u969b\u306b\u4f7f\u7528\u3055\u308c\u307e\u3059\u3002
+GUI_TEAM_DESCRIPTION=\u540d\u524d\u307e\u305f\u306f ID \u3092\u5165\u529b\u3057\u3066\u304f\u3060\u3055\u3044\u3002\u3042\u306a\u305f\u304c\u884c\u3063\u305f\u7ffb\u8a33\u306b\u30de\u30fc\u30af\u3059\u308b\u969b\u306b\u4f7f\u7528\u3055\u308c\u307e\u3059\u3002
 
-WF_OPTION_INSERT_AUTHOR_PREFIX=\u540d\u524d\u307e\u305f\u306fID\uff1a
+WF_OPTION_INSERT_AUTHOR_PREFIX=\u540d\u524d\u307e\u305f\u306f ID\uff1a
 
 # org.omegat.gui.dialogs.WorkflowOptionsDialog
 
@@ -1103,34 +1104,34 @@ GUI_TITLE_Workflow_Options=\u7ffb\u8a33\u5165\u529b\u884c\u306e\u8a2d\u5b9a
 
 GUI_WORKFLOW_DESCRIPTION=\u672a\u7ffb\u8a33\u306e\u5206\u7bc0\u306b\u79fb\u52d5\u3057\u305f\u3068\u304d\u3001\u305d\u306e\u5206\u7bc0\u306b\u633f\u5165\u3057\u305f\u3044\u5185\u5bb9\u3092\u4ee5\u4e0b\u304b\u3089\u9078\u629e\u3057\u3066\u304f\u3060\u3055\u3044\u3002
 
-WF_OPTION_INSERT_SOURCE=\u539f\u6587\u3092\u633f\u5165\u3059\u308b
+WF_OPTION_INSERT_SOURCE=\u539f\u6587\u3092\u633f\u5165
 
 WF_OPTION_INSERT_NOTHTHING=\u539f\u6587\u306f\u633f\u5165\u3057\u306a\u3044
 
-WF_OPTION_INSERT_FUZZY_MATCH=\u6700\u3082\u4e00\u81f4\u7387\u306e\u9ad8\u3044\u53c2\u8003\u8a33\u6587\u3092\u81ea\u52d5\u633f\u5165
+WF_OPTION_INSERT_FUZZY_MATCH=\u6700\u3082\u4e00\u81f4\u7387\u306e\u9ad8\u3044\u53c2\u8003\u8a33\u6587\u3092\u81ea\u52d5\u3067\u633f\u5165
 
-GUI_WORKFLOW_OPTION_Minimal_Similarity=\u6700\u5c0f\u4e00\u81f4\u7387
+GUI_WORKFLOW_OPTION_Minimal_Similarity=\u3057\u304d\u3044\u5024\u3068\u306a\u308b\u4e00\u81f4\u7387\uff1a
 
-WF_OPTION_INSERT_FUZZY_PREFIX=\u524d\u7f6e\u6587\u5b57\u5217
+WF_OPTION_INSERT_FUZZY_PREFIX=\u5148\u982d\u306b\u4ed8\u52a0\u3059\u308b\u6587\u5b57\u5217\uff1a
 
 WF_DEFAULT_PREFIX=[\u53c2\u8003] 
-WF_OPTION_ALLOW_TRANS_EQ_TO_SRC=\u539f\u6587\u3068\u540c\u3058\u3067\u3042\u308b\u8a33\u6587\u3092\u8a31\u53ef
+WF_OPTION_ALLOW_TRANS_EQ_TO_SRC=\u539f\u6587\u3068\u540c\u3058\u8a33\u6587\u3092\u8a31\u53ef
 WF_OPTION_EXPORT__CURRENT_SEGMENT=\u5206\u7bc0\u3092\u30c6\u30ad\u30b9\u30c8\u30d5\u30a1\u30a4\u30eb\u3078\u51fa\u529b
 
 # org.omegat.gui.dialogs.ExternalTMXMatchesDialog.java
 EXT_TMX_TITLE=\u5916\u90e8 TMX \u30d5\u30a1\u30a4\u30eb\u306e\u8a2d\u5b9a
-EXT_TMX_DESCRIPTION=OmegaT \u304c\u4f5c\u6210\u3057\u3066\u3044\u306a\u3044 TMX \u306e\u30bf\u30b0\u3092\u3069\u306e\u3088\u3046\u306b\u6271\u3046\u304b\u9078\u629e\u3057\u3066\u304f\u3060\u3055\u3044\u3002
-EXT_TMX_SHOW_LEVEL2=\u30bf\u30b0\u3092\u8868\u793a
-EXT_TMX_USE_XML=\u72ec\u7acb\u3057\u305f\u30bf\u30b0\uff08\u4f8b\uff1a<i/>\uff09\u306e\u5834\u5408\u306fXML\u3092\u4f7f\u7528
+EXT_TMX_DESCRIPTION=OmegaT \u304c\u5bfe\u5fdc\u3057\u3066\u3044\u306a\u3044 TMX \u306e\u30bf\u30b0\u3092\u3069\u306e\u3088\u3046\u306b\u6271\u3046\u304b\u9078\u629e\u3057\u3066\u304f\u3060\u3055\u3044\u3002
+EXT_TMX_SHOW_LEVEL2=\u30bf\u30b0\u3092\u305d\u306e\u307e\u307e\u8868\u793a
+EXT_TMX_USE_XML=\u72ec\u7acb\u3057\u305f\u30bf\u30b0\uff08\u4f8b\uff1a<i/>\uff09\u306e\u5834\u5408\u306f XML \u3092\u4f7f\u7528
 
 # org.omegat.gui.dialogs.ViewOptionsDialog.java
-VIEW_OPTION_TITLE=\u8868\u793a\u8a2d\u5b9a
+VIEW_OPTION_TITLE=\u8868\u793a\u306e\u8a2d\u5b9a
 VIEW_OPTION_SOURCE=\u539f\u6587\u3092\u592a\u5b57\u3067\u8868\u793a
 VIEW_OPTION_UNIQUE=\u7e70\u308a\u8fd4\u3057\u306e\u3042\u308b\u5206\u7bc0\u3092\u8272\u3065\u3051\uff08\u6700\u521d\u306e\u5206\u7bc0\u3092\u542b\u3080\uff09
 
 # org.omegat.gui.dialogs.CreateGlossaryEntry.java
 CREATE_GLOSSARY_TITLE=\u7528\u8a9e\u306e\u8ffd\u52a0
-CREATE_GLOSSARY_DESCRIPTION=\u539f\u6587\u306e\u7528\u8a9e\u3068\u3001\u5bfe\u5fdc\u3059\u308b\u8a33\u6587\u3001\u5fc5\u8981\u306a\u3089\u30b3\u30e1\u30f3\u30c8\u3092\u5165\u529b\u3057\u3066\u304f\u3060\u3055\u3044\uff1a
+CREATE_GLOSSARY_DESCRIPTION=\u539f\u6587\u306e\u7528\u8a9e\u3001\u5bfe\u5fdc\u3059\u308b\u8a33\u6587\u3001\u30b3\u30e1\u30f3\u30c8(\u4efb\u610f)\u3092\u5165\u529b\uff1a
 CREATE_GLOSSARY_SOURCE=\u539f\u6587\u306e\u7528\u8a9e\uff1a
 CREATE_GLOSSARY_TARGET=\u5bfe\u5fdc\u3059\u308b\u8a33\u6587\uff1a
 CREATE_GLOSSARY_COMMENT=\u30b3\u30e1\u30f3\u30c8\uff1a
@@ -1147,13 +1148,13 @@ LOG_DECODING_ERROR=\u30e6\u30fc\u30b6\u30fc\u540d\u3068\u30d1\u30b9\u30ef\u30fc\
 
 GUI_TITLE_TagValidation_Options=\u30bf\u30b0\u691c\u8a3c\u306e\u8a2d\u5b9a
 
-GUI_TAGVALIDATION_DESCRIPTION=OmegaT\u306f\u3001\u4f8b\u3048\u3070\uff08printf\u95a2\u6570\u3067\u4f7f\u7528\u3055\u308c\u308b\uff09\uff05s\u306e\u3088\u3046\u306a\u3001\u30d7\u30ed\u30b0\u30e9\u30df\u30f3\u30b0\u8a00\u8a9e\u3067\u4f7f\u7528\u3055\u308c\u308b\u5909\u6570\u3082\u78ba\u8a8d\u3067\u304d\u307e\u3059\u3002\n\u30bf\u30b0\u691c\u8a3c\u6642\u306b\u3001\u3053\u308c\u3089\u3092\u3069\u306e\u3088\u3046\u306b\u51e6\u7406\u3057\u305f\u3044\u304b\u3092\u9078\u629e\u3057\u3066\u304f\u3060\u3055\u3044\u3002\u3059\u3079\u3066\u3092\u78ba\u8a8d\u3059\u308b\u8a2d\u5b9a\u306b\u3057\u305f\u5834\u5408\u3001\u901a\u5e38\u306e\u30c6\u30ad\u30b9\u30c8\u3067\u306f\u8aa4\u691c\u51fa\u304c\u304a\u3053\u308b\u53ef\u80fd\u6027\u3082\u3042\u308a\u307e\u3059\u3002
+GUI_TAGVALIDATION_DESCRIPTION=OmegaT \u306f\u3001\u30d7\u30ed\u30b0\u30e9\u30df\u30f3\u30b0\u8a00\u8a9e\u3067\u4f7f\u7528\u3055\u308c\u308b\uff08printf \u95a2\u6570\u306e %s \u306e\u3088\u3046\u306a\uff09\u5909\u6570\u3082\u691c\u51fa\u3067\u304d\u307e\u3059\u3002\u30bf\u30b0\u691c\u8a3c\u6642\u306b\u3053\u308c\u3089\u3092\u3069\u3046\u51e6\u7406\u3057\u305f\u3044\u304b\u3092\u9078\u629e\u3057\u3066\u304f\u3060\u3055\u3044\u3002\u3059\u3079\u3066\u3092\u691c\u51fa\u3059\u308b\u8a2d\u5b9a\u306b\u3059\u308b\u3068\u3001\u901a\u5e38\u306e\u30c6\u30ad\u30b9\u30c8\u306b\u5bfe\u3057\u3066\u306f\u8aa4\u691c\u51fa\u3092\u3082\u305f\u3089\u3059\u53ef\u80fd\u6027\u3082\u3042\u308a\u307e\u3059\u3002
 
-TV_OPTION_NO_CHECK=printf\u5909\u6570\u306f\u78ba\u8a8d\u3057\u306a\u3044
+TV_OPTION_NO_CHECK=printf \u5909\u6570\u306f\u78ba\u8a8d\u3057\u306a\u3044
 
-TV_OPTION_SIMPLE_CHECK=\u5358\u7d14\u306aprintf\u5909\u6570\uff08\uff05s\u3001\uff05d\u306a\u3069\uff09\u3092\u78ba\u8a8d
+TV_OPTION_SIMPLE_CHECK=\u5358\u7d14\u306a printf \u5909\u6570\uff08\uff05s, \uff05d \u306a\u3069\uff09\u3092\u78ba\u8a8d
 
-TV_OPTION_FULL_CHECK=\u3059\u3079\u3066\u306eprintf\u5909\u6570\uff08\uff05s\u3001\uff05-s\u306a\u3069\uff09\u3092\u78ba\u8a8d
+TV_OPTION_FULL_CHECK=\u3059\u3079\u3066\u306e printf \u5909\u6570\uff08\uff05s, \uff05-s \u306a\u3069\uff09\u3092\u78ba\u8a8d
 
 # org.omegat.gui.main.MainWindow / Docking
 
@@ -1183,11 +1184,11 @@ DOCKING_INSTANT_START_TITLE=\u304a\u624b\u8efd\u30b9\u30bf\u30fc\u30c8
 
 # StaticUtils
 
-SU_USERHOME_PROP_ACCESS_ERROR=OmegaT\u306f\u3001\u30aa\u30da\u30ec\u30fc\u30c6\u30a3\u30f3\u30b0\u30b7\u30b9\u30c6\u30e0\u306e\u540d\u79f0\u3084\u3001\u30db\u30fc\u30e0\u30d5\u30a9\u30eb\u30c0\u3092\u542b\u3080\u30b7\u30b9\u30c6\u30e0\u8a2d\u5b9a\u3078\u30a2\u30af\u30bb\u30b9\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002\u305d\u306e\u305f\u3081\u3001OmegaT\u306e\u8a2d\u5b9a\u30d5\u30a9\u30eb\u30c0\u306e\u4f4d\u7f6e\u3092\u78ba\u5b9f\u306b\u6307\u5b9a\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u305b\u3093\u3002\u4ee3\u308f\u308a\u306b\u73fe\u5728\u306e\u30d5\u30a9\u30eb\u30c0\u304c\u4f7f\u7528\u3055\u308c\u307e\u3059\u3002\u3053\u306e\u305f\u3081\u3001\u3059\u3079\u3066\u306e\u8a2d\u5b9a\u304c\u521d\u671f\u5024\u3068\u306a\u308a\u3001\u4e88\u671f\u3057\u306a\u3044\u52d5\u4f5c\u304c\u304a\u3053\u308b\u53ef\u80fd\u6027\u304c\u3042\u308a\u307e\u3059\u3002\u305f\u3060\u3057\u3053\u308c\u306f\u6b63\u5e38\u306a\u52d5\u4f5c\u3067\u3059\u3002
+SU_USERHOME_PROP_ACCESS_ERROR=OmegaT \u306f\u3001\u30aa\u30da\u30ec\u30fc\u30c6\u30a3\u30f3\u30b0\u30b7\u30b9\u30c6\u30e0\u306e\u540d\u79f0\u3084\u30db\u30fc\u30e0\u30d5\u30a9\u30eb\u30c0\u30fc\u306e\u5834\u6240\u306a\u3069\u3092\u542b\u3080\u30b7\u30b9\u30c6\u30e0\u8a2d\u5b9a\u3078\u30a2\u30af\u30bb\u30b9\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002\u305d\u306e\u305f\u3081 OmegaT \u306e\u8a2d\u5b9a\u30d5\u30a9\u30eb\u30c0\u30fc\u306e\u5834\u6240\u3092\u78ba\u5b9a\u3067\u304d\u307e\u305b\u3093\u3002\u30ab\u30ec\u30f3\u30c8\u30d5\u30a9\u30eb\u30c0\u30fc\u304c\u305d\u306e\u4ee3\u308f\u308a\u306b\u4f7f\u7528\u3055\u308c\u307e\u3059\u3002\u3053\u306e\u5834\u5408\u3001\u3059\u3079\u3066\u306e\u8a2d\u5b9a\u304c\u521d\u671f\u5024\u3068\u306a\u308a\u3001\u4e88\u671f\u3057\u306a\u3044\u6319\u52d5\u304c\u767a\u751f\u3059\u308b\u53ef\u80fd\u6027\u3082\u3042\u308a\u307e\u3059\u304c\u3001\u52d5\u4f5c\u3068\u3057\u3066\u306f\u6b63\u5e38\u3067\u3059\u3002
 
-SU_CONFIG_DIR_CREATE_ERROR=OmegaT\u306e\u8a2d\u5b9a\u30d5\u30a9\u30eb\u30c0\u306e\u4f5c\u6210\u304c\u3001\u30aa\u30da\u30ec\u30fc\u30c6\u30a3\u30f3\u30b0\u30b7\u30b9\u30c6\u30e0\u306b\u62d2\u5426\u3055\u308c\u307e\u3057\u305f\u3002\u4ee3\u308f\u308a\u306b\u73fe\u5728\u306e\u30d5\u30a9\u30eb\u30c0\u304c\u4f7f\u7528\u3055\u308c\u307e\u3059\u3002\u8a2d\u5b9a\u3057\u305f\u3044\u4f4d\u7f6e\u306b\u30a2\u30af\u30bb\u30b9\u3067\u304d\u308b\u3088\u3046\u306b\u306a\u308b\u4ee5\u964d\u3001\u305d\u3053\u304c\u4f7f\u7528\u3055\u308c\u307e\u3059\u3002\u305d\u306e\u969b\u3001\u4f4d\u7f6e\u5909\u66f4\u306e\u305f\u3081\u3001\u8a2d\u5b9a\u306f\u3059\u3079\u3066\u521d\u671f\u5024\u306b\u5fa9\u5143\u3055\u308c\u307e\u3059\u3002
+SU_CONFIG_DIR_CREATE_ERROR=\u30aa\u30da\u30ec\u30fc\u30c6\u30a3\u30f3\u30b0\u30b7\u30b9\u30c6\u30e0\u306e\u8a2d\u5b9a\u306b\u3088\u308a\u3001OmegaT \u306e\u8a2d\u5b9a\u30d5\u30a9\u30eb\u30c0\u30fc\u304c\u4f5c\u6210\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002\u30ab\u30ec\u30f3\u30c8\u30d5\u30a9\u30eb\u30c0\u30fc\u304c\u305d\u306e\u4ee3\u308f\u308a\u306b\u4f7f\u7528\u3055\u308c\u307e\u3059\u3002\u6307\u5b9a\u3057\u305f\u5834\u6240\u306f\u3001\u305d\u3053\u3078\u30a2\u30af\u30bb\u30b9\u3067\u304d\u308b\u3088\u3046\u306b\u306a\u3063\u305f\u5f8c\u306b\u4f7f\u7528\u3055\u308c\u307e\u3059\u3002\u305d\u306e\u969b\u3001\u8a2d\u5b9a\u306f\u3059\u3079\u3066\u521d\u671f\u5024\u304c\u3042\u3089\u305f\u3081\u3066\u4f7f\u7528\u3055\u308c\u307e\u3059\u3002
 
-SU_SCRIPT_DIR_CREATE_ERROR=\u8a2d\u5b9a\u30d5\u30a9\u30eb\u30c0\u306e\u4e2d\u306b\u3001\u30b9\u30af\u30ea\u30d7\u30c8\u30d5\u30a9\u30eb\u30c0\u3092\u4f5c\u6210\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002\u4ee3\u308f\u308a\u306b\u8a2d\u5b9a\u30d5\u30a9\u30eb\u30c0\u304c\u4f7f\u7528\u3055\u308c\u307e\u3059\u3002
+SU_SCRIPT_DIR_CREATE_ERROR=\u8a2d\u5b9a\u30d5\u30a9\u30eb\u30c0\u30fc\u306e\u4e2d\u306b\u3001\u30b9\u30af\u30ea\u30d7\u30c8\u30d5\u30a9\u30eb\u30c0\u30fc\u3092\u4f5c\u6210\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002\u8a2d\u5b9a\u30d5\u30a9\u30eb\u30c0\u30fc\u304c\u4ee3\u308f\u308a\u306b\u4f7f\u7528\u3055\u308c\u307e\u3059\u3002
 
 # Log
 
@@ -1202,20 +1203,20 @@ LOG_STARTUP_INFO=Java\uff1a{0} \u7248{1} \u304c {2} \u304b\u3089\u5b9f\u884c\u30
 LOG_MENU_CLICK=\u30e1\u30cb\u30e5\u30fc\u9805\u76ee {0} \u3092\u30af\u30ea\u30c3\u30af
 
 
-LOG_INFO_EVENT_PROJECT_CHANGE=\u30a4\u30d9\u30f3\u30c8\uff1a\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306e\u5909\u66f4 - \u300c{0}\u300d
+LOG_INFO_EVENT_PROJECT_CHANGE=\u30a4\u30d9\u30f3\u30c8\uff1a\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306e\u5909\u66f4 - {0}
 LOG_INFO_EVENT_APPLICATION_STARTUP=\u30a4\u30d9\u30f3\u30c8\uff1a\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u306e\u8d77\u52d5
 LOG_INFO_EVENT_APPLICATION_SHUTDOWN=\u30a4\u30d9\u30f3\u30c8\uff1a\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u306e\u7d42\u4e86
-LOG_INFO_EVENT_ENTRY_NEWFILE=\u30a4\u30d9\u30f3\u30c8\uff1a\u65b0\u3057\u3044\u30d5\u30a1\u30a4\u30eb\uff08{0}\uff09\u304c\u6709\u52b9\u306b\u306a\u308a\u307e\u3057\u305f
+LOG_INFO_EVENT_ENTRY_NEWFILE=\u30a4\u30d9\u30f3\u30c8\uff1a\u65b0\u3057\u3044\u30d5\u30a1\u30a4\u30eb {0} \u304c\u6709\u52b9\u306b\u306a\u308a\u307e\u3057\u305f
 LOG_INFO_EVENT_ENTRY_ACTIVATED=\u30a4\u30d9\u30f3\u30c8\uff1a\u65b0\u3057\u3044\u9805\u76ee\u304c\u6709\u52b9\u306b\u306a\u308a\u307e\u3057\u305f
 LOG_INFO_EVENT_FONT_CHANGED=\u30a4\u30d9\u30f3\u30c8\uff1a\u5b57\u4f53\u304c\u5909\u66f4\u3055\u308c\u307e\u3057\u305f
-LOG_ERROR_MUST_BE_SWING_THREAD=\u3053\u306e\u30b3\u30fc\u30eb\u306fSwing\u306e\u30b9\u30ec\u30c3\u30c9\u306b\u5b58\u5728\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059
-LOG_ERROR_MUSTNOT_BE_SWING_THREAD=\u3053\u306e\u30b3\u30fc\u30eb\u306fSwing\u306e\u30b9\u30ec\u30c3\u30c9\u306b\u5b58\u5728\u3059\u3079\u304d\u3067\u306f\u3042\u308a\u307e\u305b\u3093
+LOG_ERROR_MUST_BE_SWING_THREAD=\u3053\u306e\u30b3\u30fc\u30eb\u306f Swing \u30b9\u30ec\u30c3\u30c9\u3067\u884c\u308f\u308c\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059
+LOG_ERROR_MUSTNOT_BE_SWING_THREAD=\u3053\u306e\u30b3\u30fc\u30eb\u306f Swing \u30b9\u30ec\u30c3\u30c9\u3067\u884c\u308f\u308c\u308b\u3079\u304d\u3067\u306f\u3042\u308a\u307e\u305b\u3093
 
 LOG_DATAENGINE_LOAD_START=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u8aad\u307f\u8fbc\u307f\u306e\u958b\u59cb
 LOG_DATAENGINE_LOAD_END=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u8aad\u307f\u8fbc\u307f\u306e\u7d42\u4e86
 LOG_DATAENGINE_SAVE_START=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u4fdd\u5b58\u306e\u958b\u59cb
 LOG_DATAENGINE_SAVE_END=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u4fdd\u5b58\u306e\u7d42\u4e86
-LOG_DATAENGINE_SAVE_NONEED=\u5909\u66f4\u7b87\u6240\u304c\u5b58\u5728\u3057\u306a\u304b\u3063\u305f\u305f\u3081\u3001\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u4fdd\u5b58\u306e\u5fc5\u8981\u306f\u3042\u308a\u307e\u305b\u3093
+LOG_DATAENGINE_SAVE_NONEED=\u5909\u66f4\u7b87\u6240\u304c\u5b58\u5728\u3057\u306a\u304b\u3063\u305f\u305f\u3081\u3001\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3092\u4fdd\u5b58\u3059\u308b\u5fc5\u8981\u306f\u3042\u308a\u307e\u305b\u3093
 LOG_DATAENGINE_CLOSE=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u304c\u9589\u3058\u3089\u308c\u307e\u3057\u305f
 LOG_DATAENGINE_COMPILE_START=\u8a33\u6587\u30d5\u30a1\u30a4\u30eb\u751f\u6210\u306e\u958b\u59cb
 LOG_DATAENGINE_COMPILE_END=\u8a33\u6587\u30d5\u30a1\u30a4\u30eb\u751f\u6210\u306e\u7d42\u4e86
@@ -1253,11 +1254,11 @@ GUI_SPELLCHECKER_UNINSTALL_CURRENT=\u73fe\u5728\u30d7\u30ed\u30b8\u30a7\u30af\u3
 
 GUI_SPELLCHECKER_UNINSTALL_CURRENT_TITLE=\u524a\u9664\u306e\u78ba\u8a8d
 
-GUI_SPELLCHECKER_UNINSTALL_UNABLE=\u9078\u629e\u3055\u308c\u305f\u8f9e\u66f8\u3092\u524a\u9664\u3067\u304d\u307e\u305b\u3093\u3002
+GUI_SPELLCHECKER_UNINSTALL_UNABLE=\u9078\u629e\u3057\u305f\u8f9e\u66f8\u3092\u524a\u9664\u3067\u304d\u307e\u305b\u3093\u3002
 
-GUI_SPELLCHECKER_UNINSTALL_UNABLE_TITLE=\u524a\u9664\u306e\u5931\u6557
+GUI_SPELLCHECKER_UNINSTALL_UNABLE_TITLE=\u524a\u9664\u306b\u5931\u6557\u3057\u307e\u3057\u305f
 
-GUI_SPELLCHECKER_INSTALL_UNABLE_TITLE=\u7d44\u307f\u8fbc\u307f\u306e\u5931\u6557
+GUI_SPELLCHECKER_INSTALL_UNABLE_TITLE=\u7d44\u307f\u8fbc\u307f\u306b\u5931\u6557\u3057\u307e\u3057\u305f
 
 GUI_SPELLCHECKER_INSTALL_UNABLE=\u8f9e\u66f8\u30d5\u30a1\u30a4\u30eb\u30d5\u30a9\u30eb\u30c0\u30fc\u3092\u307e\u305a\u6307\u5b9a\u3057\u3066\u304f\u3060\u3055\u3044\u3002
 
@@ -1271,7 +1272,7 @@ GUI_DICTIONARY_INSTALLER_TEXT_WAIT=\u8f9e\u66f8\u306e\u4fdd\u7ba1\u5834\u6240\u3
 
 GUI_DICTIONARY_INSTALLER_TEXT_GO=\u7d44\u307f\u8fbc\u3080\u8f9e\u66f8\u3092\u9078\u629e\u3057\u3066\uff3b\u7d44\u307f\u8fbc\u307f\uff3d\u3092\u30af\u30ea\u30c3\u30af\u3057\u3066\u304f\u3060\u3055\u3044\u3002
 
-GUI_DICTIONARY_INSTALLER_TEXT_NOTHING=\u30ea\u30e2\u30fc\u30c8\u30b5\u30fc\u30d0\u30fc\u306b\u306f\u65b0\u3057\u3044\u8f9e\u66f8\u306f\u3042\u308a\u307e\u305b\u3093\u3002
+GUI_DICTIONARY_INSTALLER_TEXT_NOTHING=\u30ea\u30e2\u30fc\u30c8\u30b5\u30fc\u30d0\u30fc\u306b\u65b0\u3057\u3044\u8f9e\u66f8\u306f\u5b58\u5728\u3057\u307e\u305b\u3093\u3002
 
 GUI_DICTIONARY_INSTALLER_INSTALL=\u7d44\u307f\u8fbc\u307f
 
@@ -1287,7 +1288,7 @@ TF_EDIT_MENU_SWITCH_CASE_TO_LOWER=\u3059\u3079\u3066\u5c0f\u6587\u5b57\u306b
 
 TF_EDIT_MENU_SWITCH_CASE_TO_UPPER=\u3059\u3079\u3066\u5927\u6587\u5b57\u306b
 
-TF_EDIT_MENU_SWITCH_CASE_TO_TITLE=\u5358\u8a9e\u306e\u5148\u982d\u3092\u5927\u6587\u5b57\u306b\uff08Title case\uff09
+TF_EDIT_MENU_SWITCH_CASE_TO_TITLE=Title case\uff08\u5358\u8a9e\u306e\u5148\u982d\u3092\u5927\u6587\u5b57\uff09\u306b
 
 TF_EDIT_MENU_SWITCH_CASE_CYCLE=\u4e0a\u8a18\u3092\u9806\u306b\u5207\u308a\u66ff\u3048
 
@@ -1316,15 +1317,15 @@ MATCHES_INSERT=\u53c2\u8003\u8a33\u6587\u3092\u633f\u5165
 MATCHES_REPLACE=\u53c2\u8003\u8a33\u6587\u306b\u7f6e\u63db
 
 # Dictionary area popup menu
-DICTIONARY_HIDE=\u300c{0}\u300d\u3092\u96a0\u3059
+DICTIONARY_HIDE={0} \u3092\u96a0\u3059
 
 STARTUP_ERRORBOX_TITLE=\u30d7\u30ed\u30b0\u30e9\u30e0\u8d77\u52d5\u6642\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002
-STARTUP_JAXB_LINKAGE_ERROR=JDK\u3092\u30d0\u30fc\u30b8\u30e7\u30f31.6\u306e\u6700\u65b0\u7248\u306b\u66f4\u65b0\u3059\u308b\u304b\u3001OmegaT\u306elib\u30d5\u30a9\u30eb\u30c0\u304b\u3089jaxb-*.jar\u30d5\u30a1\u30a4\u30eb\u3092\u524a\u9664\u3057\u3066\u304f\u3060\u3055\u3044\u3002
+STARTUP_JAXB_LINKAGE_ERROR=JDK \u3092\u30d0\u30fc\u30b8\u30e7\u30f3 1.6 \u306e\u6700\u65b0\u7248\u306b\u66f4\u65b0\u3059\u308b\u304b\u3001OmegaT \u306e lib \u30d5\u30a9\u30eb\u30c0\u30fc\u304b\u3089 jaxb-*.jar \u30d5\u30a1\u30a4\u30eb\u3092\u524a\u9664\u3057\u3066\u304f\u3060\u3055\u3044\u3002
 
 # Cut, Copy, Paste Popup menu 
 CCP_CUT=\u5207\u308a\u53d6\u308a 
 CCP_COPY=\u30b3\u30d4\u30fc
-CCP_PASTE=\u30da\u30fc\u30b9\u30c8
+CCP_PASTE=\u8cbc\u308a\u4ed8\u3051
 
 # Machine translation engines
 MT_ENGINE_GOOGLE=Google Translate
diff --git a/src/org/omegat/Bundle_nl.properties b/src/org/omegat/Bundle_nl.properties
index 200332a..61dc073 100644
--- a/src/org/omegat/Bundle_nl.properties
+++ b/src/org/omegat/Bundle_nl.properties
@@ -42,7 +42,7 @@
 #  @author Wildrich Fourie
 #  @author Antonio Vilei
 #
-#  @version 2.2
+#  @version 2.3
 #
 
 # The version number is taken from Version.properties, key version
@@ -492,6 +492,8 @@ PP_LOC_LANG=&Taal vertaalde documenten:
 
 PP_DICT_ROOT=map Woordenboek:
 
+PP_ALLOW_DEFAULTS=&Automatisch uitbreiden van vertalingen
+
 PP_BUTTON_BROWSE_SRC=&Bladeren
 
 PP_BUTTON_BROWSE_TAR=Blade&ren
@@ -796,6 +798,10 @@ LATEXFILTER_FILTER_NAME=LaTeX-bestanden
 # PoFilter.java
 
 POFILTER_FILTER_NAME=PO-bestanden
+POFILTER_OPTIONS_TITLE=PO filteropties
+POFILTER_ALLOW_BLANK=Blanco vertalingen in doelbestanden toestaan
+POFILTER_EXCEPTION=Het POfilter genereerde een uitzondering:
+POFILTER_INVALID_FORMAT=Ongeldig bestandsformaat
 
 # RcFilter.java
 
@@ -847,7 +853,13 @@ L10NMGR_FILTER_NAME=Typo3 l10nmgrbestanden
 WIX_FILTER_NAME=WiX Localization-bestanden
 
 # SvgFilter.java
-SVG_FILTER_NAME=SVG Image Files
+SVG_FILTER_NAME=SVG afbeeldingsbestanden
+
+# Infix filter
+INFIX_FILTER_NAME=Infixbestanden
+
+# Flash filter
+FLASH_FILTER_NAME=Flash XML export
 
 # org.omegat.filters3.xml.Handler
 XML_FATAL_ERROR=Fout in bestand {0}, regel {1}
@@ -892,7 +904,7 @@ OpenDoc_ERROR_IN_FILE=Fout in bestand
 OpenXML_FILTER_NAME=Microsoft Open XML-bestanden
 OpenXML_FILTER_OPTIONS=Open XML filteropties
 OpenXML_WORD=Word
-OpenXML_TRANSLATE_HIDDEN_TEXT=Onzichtbare instructie &tekst
+OpenXML_TRANSLATE_HIDDEN_TEXT=Onzichtbare instructie te&kst
 OpenXML_TRANSLATE_COMMENTS=Op&merkingen
 OpenXML_TRANSLATE_FOOTNOTES=&Voetnoten
 OpenXML_TRANSLATE_ENDNOTES=&Eindnoten
@@ -909,8 +921,10 @@ OpenXML_GLOBAL=Globaal
 OpenXML_TRANSLATE_CHARTS=Dia&grammen
 OpenXML_TRANSLATE_DIAGRAMS=Dia&grammen
 OpenXML_TRANSLATE_DRAWINGS=Teke&ningen
+OpenXML_TRANSLATE_WORDART=WordAr&t
 OpenXML_GENERIC_OPTIONS=Andere opties:
 OpenXML_AGGREGATE_TAGS=Hoeveelheid tags
+OpenXML_PRESERVE_SPACES=&Spaties voor alle tags behouden
 
 OpenXML_ERROR_IN_FILE=Fout in bestand
 
@@ -968,9 +982,9 @@ INSTANCEEDITOR_TITLE_UPDATE=Patroon bewerken
 
 INSTANCEEDITOR_SOURCE_MASK=Patroon voor bronbestandsnaam:
 
-INSTANCEEDITOR_SOURCE_ENCODING=Codering van bronbestand
+INSTANCEEDITOR_SOURCE_ENCODING=Codering van bronbestand:
 
-INSTANCEEDITOR_Target_Encoding=Codering van vertaald document
+INSTANCEEDITOR_Target_Encoding=Codering van vertaald document:
 
 INSTANCEEDITOR_Substituted_Variable=Bestandsnaam variabelen:
 
@@ -1064,7 +1078,7 @@ CORE_SRX_RULES_LANG_JAPANESE=Japans
 CORE_SRX_RULES_LANG_ENGLISH=Engels
 CORE_SRX_RULES_LANG_DEFAULT=Standaard
 CORE_SRX_RULES_FORMATTING_TEXT=Segmentatie van tekstbestanden
-CORE_SRX_RULES_FORMATTING_HTML=HTML-, XHTML- en ODF-segmentatie
+CORE_SRX_RULES_FORMATTING_HTML=segmentatie voor HTML, XHTML, ODF en Infix
 
 
 # org.omegat.segmentation.SegmentationCustomizer
@@ -1134,7 +1148,7 @@ CREATE_GLOSSARY_DESCRIPTION=Voer een bronterm, doelterm en opmerking in:
 CREATE_GLOSSARY_SOURCE=Bronterm:
 CREATE_GLOSSARY_TARGET=Doelterm:
 CREATE_GLOSSARY_COMMENT=Opmerking:
-CREATE_GLOSSARY_FILE=Woordenlijst bestand: {0}
+CREATE_GLOSSARY_FILE=Woordenlijstbestand: {0}
 
 # org.omegat.gui.dialogs.ProxyLoginDialog.java
 PROXY_LOGIN_TITLE=Proxy - gebruiker en wachtwoord
@@ -1336,3 +1350,11 @@ LT_OPTIONS_MENU_ENABLED=Taalcontrole
 
 # org.omegat.gui.dialogs.TeamOptionsDialog
 PROXY_LOGIN_DIALOG=Proxy - gebruiker en wachtwoord
+
+# Multiple translations
+MULT_TITLE=Meerdere vertalingen
+MULT_MENU_DEFAULT=Als standaard vertaling gebruiken
+MULT_MENU_MULTIPLE=Alternatieve vertaling maken
+MULT_POPUP_DEFAULT=Als standaard vertaling gebruiken
+MULT_POPUP_REPLACE=Vertaling door tekst vervangen
+MULT_POPUP_GOTO=Ga naar bronsegment 
diff --git a/src/org/omegat/Bundle_pt_BR.properties b/src/org/omegat/Bundle_pt_BR.properties
index 4d75e5a..8cd7bf3 100644
--- a/src/org/omegat/Bundle_pt_BR.properties
+++ b/src/org/omegat/Bundle_pt_BR.properties
@@ -83,7 +83,7 @@ BUTTON_ADD_NODOTS=&Adicionar
 
 BUTTON_ADD_NODOTS2=A&dicionar
 
-BUTTON_TO_DEFAULTS=Restaurar pa&dr\u00f5es
+BUTTON_TO_DEFAULTS=Restaurar pre&defini\u00e7\u00f5es
 
 BUTTON_INSERT=&Inserir
 
@@ -93,7 +93,7 @@ ERROR_TITLE=Erro
 
 CONFIRM_DIALOG_TITLE=Confirmar
 
-OUT_OF_MEMORY=N\u00e3o h\u00e1 mem\u00f3ria suficiente para o OmegaT; ele ser\u00e1 encerrado quando voc\u00ea clicar em OK.\nPara solucionar este problema, fa\u00e7a o seguinte:\n\n1) Reduza o n\u00famero de arquivos fonte; divida-os em grupos para tradu\u00e7\u00e3o;\n\n2) Aumente a mem\u00f3ria dispon\u00edvel para o OmegaT, especificando\n'java -Xmx<size-in-MB>M -jar OmegaT.jar' na linha de comando ou no script\ninicial do OmegaT; a configura\u00e7\u00e3o atual \u00e9 de {0}MB. \n\n3) Envie um relat\u00f3rio de bug para http://sourceforge.net/projects/omegat\n\nO OmegaT ser\u00e1 encerrado agora.\n
+OUT_OF_MEMORY=N\u00e3o h\u00e1 mem\u00f3ria suficiente para OmegaT; ele ser\u00e1 encerrado quando voc\u00ea clicar em OK.\nPara solucionar este problema, fa\u00e7a o seguinte:\n\n1) Reduza o n\u00famero de arquivos fonte; divida-os em grupos para tradu\u00e7\u00e3o;\n\n2) Aumente a mem\u00f3ria dispon\u00edvel para o OmegaT, especificando 'java -Xmx<tamanho-em-MB>M -jar OmegaT.jar' na linha de comando ou no script nicial do OmegaT; a configura\u00e7\u00e3o atual \u00e9 de {0}MB. \n\n3) Envie um relat\u00f3rio de bug para http://sourceforge.net/projects/omegat\n\nO OmegaT ser\u00e1 encerrado agora.\n
 
 MEMORY_USAGE=Mem\u00f3ria em uso pelo VM: {0}MB; da qual {1}MB est\u00e1 livre; m\u00e1ximo dispon\u00edvel: {2}MB;
 
@@ -102,7 +102,7 @@ ENCODING_AUTO=<auto>
 
 
 # MainWindow
-TF_INTRO_EMPTYPROJECT=Seu projeto n\u00e3o cont\u00e9m arquivos dos formatos compat\u00edveis.\n(Para ter a lista dos formatos compat\u00edveis, no Manual do Usu\u00e1rio veja 'Arquivos para traduzir'>'Formatos de arquivo) Para acrescentar arquivos ao projeto, clique no bot\u00e3o 'Importar arquivos fonte...' na janela 'Arquivos do projeto' ou acesse o menu Projeto e selecione os arquivos fonte que quiser importar. Tamb\u00e9m \u00e9 poss\u00edvel copiar os arquivos para a pasta 'source' do projeto usando o gerenciador de arquivos de sua prefer\u00eancia; depois \u00e9 s\u00f3 recarregar o projeto com um clique no menu  Projeto -> Recarregar.
+TF_INTRO_EMPTYPROJECT=Seu projeto n\u00e3o cont\u00e9m arquivos dos formatos compat\u00edveis.\n(Para ter a lista dos formatos compat\u00edveis, no Manual do Usu\u00e1rio veja '> 'Arquivos para traduzir'> 'Formatos de arquivo). Para acrescentar arquivos ao projeto, clique no bot\u00e3o 'Importar arquivos fonte...' na janela 'Arquivos do projeto' ou acesse o menu Projeto e selecione os arquivos fonte que quiser importar. Tamb\u00e9m \u00e9 poss\u00edvel copiar os arquivos para a pasta 'source' do projeto usando o gerenciador de arquivos de sua prefer\u00eancia; depois \u00e9 s\u00f3 recarregar o projeto com um clique no menu  Projeto -> Recarregar.
 
 TF_INTRO_EMPTYPROJECT_FILENAME=Seu projeto est\u00e1 vazio.
 
@@ -139,7 +139,7 @@ MW_PROJECTMENU_EDIT=&Propriedades...
 
 TF_MENU_FILE_PROJWIN=&Arquivos do projeto...
 
-TF_MENU_FILE_QUIT=Sa&ir
+TF_MENU_FILE_QUIT=&Sair
 
 TF_MENU_EDIT=&Editar
 
@@ -153,7 +153,7 @@ TF_MENU_EDIT_INSERT=&Inserir correspond\u00eancia
 
 TF_MENU_EDIT_RECYCLE=S&ubstituir com correspond\u00eancia
 
-TF_MENU_EDIT_OVERWRITE_MACHITE_TRANSLATION=Substituir com tradu\u00e7\u00e3o auto&m\u00e1tica
+TF_MENU_EDIT_OVERWRITE_MACHITE_TRANSLATION=Substituir com Tradu\u00e7\u00e3o Auto&m\u00e1tica
 
 TF_MENU_EDIT_SOURCE_INSERT=I&nserir texto fonte
 
@@ -197,7 +197,7 @@ TF_MENU_TOOLS_STATISTICS_MATCHES=Estat\u00edstica das &correspond\u00eancias
 
 MW_OPTIONSMENU=&Op\u00e7\u00f5es
 
-TF_MENU_DISPLAY_ADVANCE=Usar &TAB para avan\u00e7ar
+TF_MENU_DISPLAY_ADVANCE=Usar &TAB para Avan\u00e7ar
 
 TF_MENU_DISPLAY_MARK_TRANSLATED=Marcar segmentos &traduzidos
 
@@ -207,15 +207,15 @@ TF_MENU_DISPLAY_FILTERS=&Filtros de arquivos...
 
 TF_MENU_DISPLAY_FONT=F&onte...
 
-MW_OPTIONSMENU_WORKFLOW=&Editar modo de trabalho...
+MW_OPTIONSMENU_WORKFLOW=&Modo de trabalho...
 
-MW_OPTIONSMENU_TAGVALIDATION=Valida\u00e7\u00e3o de tags
+MW_OPTIONSMENU_TAGVALIDATION=&Verifica\u00e7\u00e3o de tags...
 
 MW_OPTIONSMENU_TEAM=Eq&uipe...
 
 MW_OPTIONSMENU_EXT_TMX=TM&Xs externas...
 
-MW_OPTIONSMENU_VIEW=Exi&bi\u00e7\u00e3o
+MW_OPTIONSMENU_VIEW=Exi&bi\u00e7\u00e3o...
 
 MW_OPTIONSMENU_LOGIN=Login de &Proxy...
 
@@ -276,7 +276,7 @@ MW_SEGMENT_LENGTH_TOOLTIP=Extens\u00e3o texto fonte/tradu\u00e7\u00e3o (caracter
 
 MW_PROGRESS_DEFAULT=\ --/-- (--/--, --)
 
-MW_PROGRESS_TOOLTIP=Arquivo: traduzido / n\u00famero de segmentos (projeto: \u00fanicos traduzidos / total de segmentos \u00fanicos)
+MW_PROGRESS_TOOLTIP=Arquivo: traduzido / n\u00famero de segmentos (projeto: traduzidos \u00fanicos /  total de segmentos \u00fanicos)
 
 
 
@@ -293,18 +293,18 @@ TF_CUR_SEGMENT_AUTHOR=\u00daltima modifica\u00e7\u00e3o por {0}
 
 TF_CUR_SEGMENT_UNKNOWN_AUTHOR=desconhecido
 
-TF_SELECT_FONTS_TITLE=Fonte de exibi\u00e7\u00e3o
+TF_SELECT_FONTS_TITLE=Fonte de visualiza\u00e7\u00e3o
 
 TF_SELECT_SOURCE_FONT=&Fonte
 
 TF_SELECT_FONTSIZE=&Tamanho
 
-TF_FONT_SAMPLE_TEXT=Esta \u00e9 a maneira como o texto ficar\u00e1 quando exibido
+TF_FONT_SAMPLE_TEXT=Esta \u00e9 a forma como o texto ser\u00e1 exibido.
 
 
 
-TF_FONT_SAMPLE_TITLE=Amostra de texto
-TF_APPLY_TO_PROJECT_FILES=&Aplicar esta fonte na janela 'Arquivos do projeto'
+TF_FONT_SAMPLE_TITLE=Texto de exemplo
+TF_APPLY_TO_PROJECT_FILES=&Aplicar esta fonte \u00e0 janela 'Arquivos do projeto'
 
 # Project frame
 # org.omegat.gui.ProjectFrame
@@ -315,9 +315,9 @@ PF_FILENAME=Nome do arquivo
 
 PF_NUM_SEGMENTS=N\u00famero de segmentos
 
-PF_STAT_PATH=As informa\u00e7\u00f5es detalhadas sobre estat\u00edsticas est\u00e3o no arquivo:\n{0}
+PF_STAT_PATH=Informa\u00e7\u00f5es estat\u00edsticas detalhadas no arquivo:{0}
 
-GUI_PROJECT_TOTAL_SEGMENTS=N\u00famero total de segmentos
+GUI_PROJECT_TOTAL_SEGMENTS=Total de segmentos
 
 GUI_PROJECT_UNIQUE_SEGMENTS=N\u00famero de segmentos \u00fanicos
 
@@ -327,11 +327,11 @@ GUI_PROJECT_TRANSLATED=Segmentos \u00fanicos traduzidos
 # Help Frame
 HF_WINDOW_TITLE=Manual do Usu\u00e1rio
 
-HF_CANT_FIND_HELP=N\u00e3o localizou o arquivo de ajuda:
+HF_CANT_FIND_HELP=Imposs\u00edvel localizar arquivo de ajuda:
 
-HF_ERROR_EXTLINK_TITLE=Imposs\u00edvel abrir o link{0}
+HF_ERROR_EXTLINK_TITLE=Imposs\u00edvel abrir o link {0}
 
-HF_ERROR_EXTLINK_MSG=O visualizador do Manual do Usu\u00e1rio n\u00e3o suporta navega\u00e7\u00e3o para links externos. Para acessar este link, copie e cole o URL no seu navegador de Internet, ou abra o Manual do Usu\u00e1rio no seu navegador de Internet (arquivo{0}).
+HF_ERROR_EXTLINK_MSG=O visualizador do Manual do Usu\u00e1rio n\u00e3o oferece suporte para navega\u00e7\u00e3o a links externos. Para acessar este link, copie e cole o URL no seu navegador de Internet, ou ent\u00e3o abra o Manual do Usu\u00e1rio no seu navegador ({0} arquivo).
 
 # immortalize the BeOS 404 messages (some modified a bit for context)
 HF_HAIKU_1=Excelente p\u00e1gina de ajuda<p>As teias de aranha est\u00e3o te bloqueando<p>404 n\u00e3o encontrada
@@ -344,7 +344,7 @@ HF_HAIKU_4=A p\u00e1gina escorrega pelos dedos<p>Pulso batendo forte e fren\u00e
 
 HF_HAIKU_5=Tr\u00eas coisas s\u00e3o certas:<p>morte, impostos e p\u00e1gina n\u00e3o encontrada.<p>Voc\u00ea, v\u00edtima de uma delas.
 
-HF_HAIKU_6=A p\u00e1gina de ajuda que voc\u00ea procura<p>est\u00e1 al\u00e9m da nossa percep\u00e7\u00e3o<p>Mas outras aguardam
+HF_HAIKU_6=A p\u00e1gina de ajuda que voc\u00ea procura<p>est\u00e1 al\u00e9m da sua percep\u00e7\u00e3o<p>Mas outras aguardam
 
 HF_HAIKU_7=Vazio da alma<p>A escurid\u00e3o continua para sempre<p>Sua p\u00e1gina de ajuda n\u00e3o foi encontrada
 
@@ -354,7 +354,7 @@ HF_HAIKU_9=Em vez de um som<p>ou uma rude mensagem de erro,<p>estas palavras: 'P
 
 HF_HAIKU_10=Lamenta\u00e7\u00e3o e tristeza<p>404 n\u00e3o se encontra mais entre n\u00f3s<p>Est\u00e1 perdida no para\u00edso
 
-HF_HAIKU_11=A ajuda que voc\u00ea procura<p>foge do seu caminho<p>A ajuda se escondeu com o frio
+HF_HAIKU_11=A ajuda que voc\u00ea procura<p>foge do seu caminho<p>O inverno chegou
 
 # CommandThread
 CT_FUZZY_X_OF_Y=Analisando strings - {0} de {1} conclu\u00eddas
@@ -369,7 +369,7 @@ CT_ERROR_SAVING_PROJ=Erro ao gravar arquivo do projeto!
 
 CT_ERROR_CREATE=Erro ao criar o projeto!
 
-CT_FATAL_ERROR=Erro fatal encontrado - gravando o projeto com a extens\u00e3o de backup '.recover'.\nConsulte a documenta\u00e7\u00e3o sobre suas op\u00e7\u00f5es de recupera\u00e7\u00e3o e \nenvie a informa\u00e7\u00e3o abaixo ao fabricante do software com \numa descri\u00e7\u00e3o de como este erro foi produzido.\n
+CT_FATAL_ERROR=Erro fatal encontrado - gravando o projeto com a extens\u00e3o de backup '.recover'.\nConsulte a documenta\u00e7\u00e3o sobre suas op\u00e7\u00f5es de recupera\u00e7\u00e3o e envie a informa\u00e7\u00e3o abaixo ao fabricante do software com uma descri\u00e7\u00e3o de como este erro foi produzido.\n
 
 # 0 - Name of file being loaded
 CT_LOAD_FILE_MX=Carregando: {0}
@@ -525,7 +525,7 @@ PP_ERROR_UNABLE_TO_READ_PROJECT_FILE=Imposs\u00edvel ler o arquivo do projeto! \
 # NewProjectDialog.java
 NP_INVALID_SOURCE_LOCALE=A l\u00edngua inserida para o arquivo fonte n\u00e3o \u00e9 v\u00e1lida!\n
 
-NP_LOCALE_SUGGESTION=O c\u00f3digo da l\u00edngua deve ser no formato xx-YY, xxx-YY, xx_YY ou xxx_YY, onde \nxx ou xxx \u00e9 o c\u00f3digo da l\u00edngua e YY \u00e9 o c\u00f3digo do pa\u00eds (opcional).
+NP_LOCALE_SUGGESTION=O c\u00f3digo da l\u00edngua deve ser no formato xx-YY, xxx-YY, xx_YY ou xxx_YY, onde xx \u00e9 o c\u00f3digo da l\u00edngua e YY \u00e9 o c\u00f3digo do pa\u00eds (opcional).
 
 NP_INVALID_TARGET_LOCALE=A l\u00edngua indicada do arquivo traduzido n\u00e3o \u00e9 v\u00e1lida!\n
 
@@ -577,9 +577,9 @@ SW_AUTHOR=Aut&or:
 
 SW_NOW=Agora
 
-SW_CHANGED_AFTER=Modifica&do ap\u00f3s:
+SW_CHANGED_AFTER=Modific&a\u00e7\u00e3o ap\u00f3s:
 
-SW_CHANGED_BEFORE=Modificado &antes de:
+SW_CHANGED_BEFORE=Modifica\u00e7\u00e3o &antes de:
 
 SW_CASE_SENSITIVE=Di&stin\u00e7\u00e3o entre mai\u00fasculas e min\u00fasculas
 
@@ -598,7 +598,7 @@ SW_TITLE=Busca de texto
 
 SW_NUMBER=N\u00famero de resultados:
 
-SW_VIEWER_TEXT=As buscas s\u00e3o feitas nos segmentos fonte e/ou na tradu\u00e7\u00e3o.\n\nAs buscas s\u00e3o feitas no projeto atual ou em qualquer pasta ou estrutura de pastas.\n\nA busca exata procura pela seq\u00fc\u00eancia de palavras (string) especificadas.\n\nA busca de palavra-chave considera a sequ\u00eancia de palavras (string) especificadas como um conjunto de palavras para consultar (separadas por espa\u00e7o) e retorna todos os segmentos que cont\u00eam essas palavras, em qualquer ordem.\n\nOs dois tipos de busca aceitam caracteres curingas * e ?. O caractere * corresponde a zero ou mais caracteres (por exemplo, a busca por 'corre*' encontraria 'corre', 'correm' e 'correndo'). O caractere '?' corresponde exatamente a um caractere ('corre?' encontraria 'correm' e 'correr', por exemplo, mas n\u00e3o 'corre' ou 'correndo').
+SW_VIEWER_TEXT=As buscas s\u00e3o feitas nos segmentos fonte e/ou na tradu\u00e7\u00e3o.\n\nAs buscas s\u00e3o feitas no projeto atual ou em qualquer pasta ou estrutura de pastas.\n\nA busca exata procura pela sequ\u00eancia de palavras (string) especificadas.\n\nA busca de palavra-chave considera a sequ\u00eancia de palavras (string) especificadas como um conjunto de palavras para consultar (separadas por espa\u00e7o) e retorna todos os segmentos que cont\u00eam essas palavras, em qualquer ordem.\n\nOs dois tipos de busca aceitam caracteres curingas * e ?. O caractere * corresponde a zero ou mais caracteres (por exemplo, a busca por 'corre*' encontraria 'corre', 'correm' e 'correndo'). O caractere '?' corresponde exatamente a um caractere ('corre?' encontraria 'correm' e 'correr', por exemplo, mas n\u00e3o 'corre' ou 'correndo').
 
 # 0 - Maximun number of finds/hits
 SW_MAX_FINDS_REACHED=N\u00famero m\u00e1ximo de resultados encontrados ({0})
@@ -704,27 +704,27 @@ TMXR_EXCEPTION_WHILE_PARSING=Exce\u00e7\u00e3o durante a an\u00e1lise:
 
 # {0} - the name of the TMX file
 # {1} - location of the log file
-TMXR_EXCEPTION_WHILE_PARSING__DISPLAY=Ocorreu uma exce\u00e7\u00e3o durante a an\u00e1lise do arquivo TMX\n{0}\nO arquivo TMX n\u00e3o ser\u00e1 carregado. Consulte o arquivo de registro (log)\n({1})\npara determinar a origem do erro e tente novamente.
+TMXR_EXCEPTION_WHILE_PARSING__DISPLAY=Ocorreu uma exce\u00e7\u00e3o durante a an\u00e1lise do arquivo TMX{0} O arquivo TMX n\u00e3o ser\u00e1 carregado. Consulte o arquivo de registro (log)({1}) para determinar a origem do erro e tente novamente.
 
 # {0} - the line number
 # {1} - the column number
 # {2} - the warning
-TMXR_WARNING_WHILE_PARSING=Aviso na linha {0}, coluna {1} durante a an\u00e1lise:\n{2}
+TMXR_WARNING_WHILE_PARSING=Aviso na linha {0}, coluna {1} durante a an\u00e1lise:{2}
 
 # {0} - the line number
 # {1} - the column number
 # {2} - the error
-TMXR_RECOVERABLE_ERROR_WHILE_PARSING=Erro recuper\u00e1vel na linha {0}, coluna {1} durante a an\u00e1lise:\n{2}
+TMXR_RECOVERABLE_ERROR_WHILE_PARSING=Erro recuper\u00e1vel na linha {0}, coluna {1} durante a an\u00e1lise:{2}
 
 # {0} - the line number
 # {1} - the column number
 # {2} - the error
-TMXR_FATAL_ERROR_WHILE_PARSING=Erro fatal na linha {0}, coluna {1} durante a an\u00e1lise:\n{2}
+TMXR_FATAL_ERROR_WHILE_PARSING=Erro fatal na linha {0}, coluna {1} durante a an\u00e1lise:{2}
 
 # {0} - the name of the TMX file
 # {1} - the line number
 # {2} - the column number
-TMXR_FATAL_ERROR_WHILE_PARSING__DISPLAY=Erro irrecuper\u00e1vel durante a an\u00e1lise do arquivo TMX\n{0}\nna linha {1}, coluna {2}.\n\nO arquivo TMX n\u00e3o ser\u00e1 carregado.\nTente corrigir o erro e carregue novamente o projeto.\n
+TMXR_FATAL_ERROR_WHILE_PARSING__DISPLAY=Erro irrecuper\u00e1vel durante a an\u00e1lise do arquivo TMX{0} na linha {1}, coluna {2}.\n\nO arquivo TMX n\u00e3o ser\u00e1 carregado.Tente corrigir o erro e carregue novamente o projeto.\n
 
 TMXR_ERROR_TU_BEFORE_HEADER=Encontrada unidade de tradu\u00e7\u00e3o antes do cabe\u00e7alho TMX.
 
@@ -752,7 +752,7 @@ CT_LOADING_GLOSSARY=Carregando gloss\u00e1rio {0}
 
 
 # org.omegat.Main
-MAIN_ERROR_CANT_INIT_OSLF=Imposs\u00edvel inicializar a apar\u00eancia do Sistema Operacional!
+MAIN_ERROR_CANT_INIT_OSLF=Imposs\u00edvel inicializar a apar\u00eancia do SO!
 
 # PluginUtils.java
 PLUGIN_UNKNOWN=Tipo desconhecido de plugin no '{0}'
@@ -769,7 +769,7 @@ FILTERMASTER_ERROR_SAVING_FILTERS_CONFIG=Imposs\u00edvel gravar arquivo de confi
 
 # 0 - filter class name
 # 1 - class file location
-FILTERMASTER_ERROR_LOADING_FILTER=Filtro '{0}' n\u00e3o pode ser carregado de '{1}'
+FILTERMASTER_ERROR_LOADING_FILTER=Filtro '{0}' n\u00e3o p\u00f4de ser carregado de '{1}'
 
 # Filters.java
 
@@ -781,13 +781,13 @@ FILTERS_ERROR_COLUMN_INDEX_NOT_1=\u00cdndice de coluna deve ser igual a 1
 
 # OneFilter.java
 
-ONEFILTER_SOURCE_FILENAME_MASK=Padr\u00e3o do nome de arquivo fonte
+ONEFILTER_SOURCE_FILENAME_MASK=Tipo de arquivo fonte
 
-ONEFILTER_SOURCE_FILE_ENCODING=Codifica\u00e7\u00e3o do arquivo fonte
+ONEFILTER_SOURCE_FILE_ENCODING=Codifica\u00e7\u00e3o arquivo fonte
 
-ONEFILTER_TARGET_FILE_ENCODING=Codifica\u00e7\u00e3o do arquivo traduzido
+ONEFILTER_TARGET_FILE_ENCODING=Codifica\u00e7\u00e3o arquivo traduzido
 
-ONEFILTER_TARGET_FILENAME_ENCODING=Padr\u00e3o do nome do arquivo traduzido
+ONEFILTER_TARGET_FILENAME_ENCODING=Tipo de arquivo traduzido
 
 # LatexFilter.java
 
@@ -799,14 +799,14 @@ POFILTER_FILTER_NAME=Arquivos PO
 
 # RcFilter.java
 
-RCFILTER_FILTER_NAME=Arquivos de recurso do Window
+RCFILTER_FILTER_NAME=Arquivos de recurso do Windows
 
 # MozillaDTDFilter.java
 
 MOZDTD_FILTER_NAME=Arquivos Mozilla DTD
 
 # XtagFilter.java
-XTAGFILTER_FILTER_NAME=Arquivos QuarkXpress CopyFlow Gold
+XTAGFILTER_FILTER_NAME=Arquivos CopyFlow Gold do QuarkXPress
 
 # TextFilter.java
 
@@ -826,7 +826,7 @@ TEXTFILTER_OPTION_NEVER_SEGMENT=&Nunca
 
 RBFILTER_FILTER_NAME=Pacotes de recursos Java(TM)
 
-RBFH_ERROR_ILLEGAL_U_SEQUENCE=Encontrada seq\u00fc\u00eancia \\u ilegal
+RBFH_ERROR_ILLEGAL_U_SEQUENCE=Encontrada sequ\u00eancia \\u ilegal
 
 # XLIFFFilter.java
 XLIFF_FILTER_NAME=Arquivos XLIFF
@@ -835,7 +835,7 @@ XLIFF_FILTER_NAME=Arquivos XLIFF
 RESX_FILTER_NAME=Arquivos ResX
 
 # HelpAndManualFilter.java
-HELPANDMANUAL_FILTER_NAME=Arquivos de Ajuda e Manual
+HELPANDMANUAL_FILTER_NAME=Arquivos do Help & Manual
 
 # Typo3Filter.java
 TYPO3_FILTER_NAME=Arquivos Typo3 LocManager
@@ -921,10 +921,10 @@ ABOUTDIALOG_VERSION=OmegaT vers\u00e3o {0}
 ABOUTDIALOG_VERSION_UPDATE=OmegaT vers\u00e3o {0}, atualiza\u00e7\u00e3o {1}
 
 ABOUTDIALOG_TITLE=Sobre o OmegaT
-ABOUTDIALOG_COPYRIGHT=Copyright \u00a9 2000-2011 Keith Godfrey, Maxym Mykhalchuk e outros
+ABOUTDIALOG_COPYRIGHT=Copyright \u00a9 2000-2009 Keith Godfrey, Maxym Mykhalchuk e outros
 
 ABOUTDIALOG_LICENSE_BUTTON=&Licen\u00e7a
-ABOUTDIALOG_CONTRIBUTORS=O OmegaT \u00e9 uma ferramenta de tradu\u00e7\u00e3o assistida por computador, ou seja CAT (Computer Assisted Translation), gratuita e de c\u00f3digo aberto, compat\u00edvel com diversas plataformas; oferece correspond\u00eancias parciais, mem\u00f3ria de tradu\u00e7\u00e3o, busca de palavras-chaves, gloss\u00e1rios e reutiliza\u00e7\u00e3o de tradu\u00e7\u00e3o em atualiza\u00e7\u00e3o de projetos traduzidos.\n\nOmegaT originou-se do trabalho de Keith Godfrey.\nMarc Prior \u00e9 o coordenador do projeto OmegaT.\n\nContribuidores do c\u00f3digo: \nZoltan Bartko, Volker Berlin, Didier Briel (gerente de desenvolvimento), Kim Bruning, Alex Buloichik (desenvolvedor l\u00edder), Sandra Jean Chua, Martin Fleurke, Wildrich Fourie, Thomas Huriaux, Ibai Lakunza Velasco, Fabi\u00e1n Mandelbaum, Maxym Mykhalchuk, Arno Peters, Henry Pijffers, Tiago Saboga, Andrzej Sawu\u0142a, Benjamin Siband, Rashid Umarov, Antonio Vilei and Martin Wunderlich\n\nOutros contribuidores est\u00e3o detalhados no arquivo readme.txt\n\nOmegaT usa as seguintes bibliotecas:\n  HTMLParser 1.6 por Somik Raha, Derrick Oswald e outros (Licen\u00e7a LGPL)\n  MRJ Adapter 1.0.8 por Steve Roy (Licen\u00e7a LGPL).\n  VLDocking Framework 2.1.4 por VLSolutions (Licen\u00e7a CeCILL).\n  Hunspell por L\u00e1szl\u00f3 N\u00e9meth e outros (Licen\u00e7a LGPL)\n  JNA por Todd Fast, Timothy Wall e outros (Licen\u00e7a LGPL)\n  Swing-Layout 1.0.2 (Licen\u00e7a LGPL)\n  Jmyspell 2.1.4 (Licen\u00e7a LGPL) \n  JAXB 2.1.7 (GPLv2 + exce\u00e7\u00e3o classpath)
+ABOUTDIALOG_CONTRIBUTORS=O OmegaT \u00e9 uma ferramenta de tradu\u00e7\u00e3o assistida por computador, ou seja CAT (Computer Assisted Translation), gratuita e de c\u00f3digo aberto, compat\u00edvel com diversas plataformas; oferece correspond\u00eancias parciais, mem\u00f3ria de tradu\u00e7\u00e3o, busca de palavras-chaves, gloss\u00e1rios e reutiliza\u00e7\u00e3o de tradu\u00e7\u00e3o em atualiza\u00e7\u00e3o de projetos traduzidos.\n\nOmegaT originou-se do trabalho de Keith Godfrey.\nMarc Prior \u00e9 o coordenador do projeto OmegaT.\n\nContribuidores do c\u00f3digo: Zoltan Bartko, Volker Berlin, Didier Briel (gerente de desenvolvimento), Kim Bruning, Alex Buloichik (desenvolvedor l\u00edder), Sandra Jean Chua, Martin Fleurke, Wildrich Fourie, Thomas Huriaux, Ibai Lakunza Velasco, Fabi\u00e1n Mandelbaum, Maxym Mykhalchuk, Arno Peters, Henry Pijffers, Tiago Saboga, Andrzej Sawu\u0142a, Benjamin Siband, Rashid Umarov, Antonio Vilei e Martin Wunderlich\n\nOutros contribuidores est\u00e3o detalhados no arquivo readme.txt\n\nOmegaT usa as seguintes bibliotecas:\n  HTMLParser 1.6 por Somik Raha, Derrick Oswald e outros (Licen\u00e7a LGPL)\n  MRJ Adapter 1.0.8 por Steve Roy (Licen\u00e7a LGPL).\n  VLDocking Framework 2.1.4 por VLSolutions (Licen\u00e7a CeCILL).\n  Hunspell por L\u00e1szl\u00f3 N\u00e9meth e outros (Licen\u00e7a LGPL)\n  JNA por Todd Fast, Timothy Wall e outros (Licen\u00e7a LGPL)\n  Swing-Layout 1.0.2 (Licen\u00e7a LGPL)\n  Jmyspell 2.1.4 (Licen\u00e7a LGPL) \n  JAXB 2.1.7 (GPLv2 + exce\u00e7\u00e3o classpath)
 
 # LicenseDialog.java
 
@@ -932,7 +932,7 @@ LICENSEDIALOG_TITLE=Licen\u00e7a do OmegaT
 
 #Not sure if this should be translated or not.
 #In any case translated version should contain English original.
-LICENSEDIALOG_PREFACE=Este programa \u00e9 software livre; voc\u00ea pode redistribu\u00ed-lo e/ou modific\u00e1-lo sob os termos da Licen\u00e7a P\u00fablica Geral da GNU como publicada pela Free Software Foundation; seja a\nvers\u00e3o 2 da Licen\u00e7a, ou (a sua escolha) qualquer vers\u00e3o posterior.\n\nEste programa \u00e9 distribu\u00eddo na expectativa de que possa ser \u00fatil, mas SEM NENHUMA GARANTIA; sem mesmo a garantia impl\u00edcita de COMERCIALIZA\u00c7\u00c3O ou ADEQUA\u00c7\u00c3O PARA UM PROP\u00d3SITO PARTICULAR.
+LICENSEDIALOG_PREFACE=Este programa \u00e9 software livre; voc\u00ea pode redistribu\u00ed-lo e/ou modific\u00e1-lo sob os termos da Licen\u00e7a P\u00fablica Geral da GNU como publicada pela Free Software Foundation; seja a vers\u00e3o 2 da Licen\u00e7a, ou (a sua escolha) qualquer vers\u00e3o posterior.\n\nEste programa \u00e9 distribu\u00eddo na expectativa de que possa ser \u00fatil, mas SEM NENHUMA GARANTIA; sem mesmo a garantia impl\u00edcita de COMERCIALIZA\u00c7\u00c3O ou ADEQUA\u00c7\u00c3O PARA UM PROP\u00d3SITO PARTICULAR.
 
 # FilterEditor.java
 
@@ -948,7 +948,7 @@ FILTEREDITOR_BUTTON_To_Defaults=&Padr\u00f5es
 
 FILTEREDITOR_File_Format=&Formato de arquivo
 
-FILTEREDITOR_DESC=Aqui voc\u00ea pode definir os padr\u00f5es do nome de arquivos fonte que o filtro processar\u00e1, adaptar os nomes dos arquivos traduzidos e selecionar a codifica\u00e7\u00e3o que ele usar\u00e1 para carregar o arquivo e gravar sua tradu\u00e7\u00e3o correspondente.\nNota: nem todos os filtros permitem a sele\u00e7\u00e3o de codifica\u00e7\u00e3o.
+FILTEREDITOR_DESC=Aqui voc\u00ea pode definir os tipos de arquivos fonte que o filtro processar\u00e1, adaptar os nomes dos arquivos traduzidos e selecionar a codifica\u00e7\u00e3o que ele usar\u00e1 para carregar o arquivo e gravar sua tradu\u00e7\u00e3o correspondente.\nNota: nem todos os filtros permitem a sele\u00e7\u00e3o de codifica\u00e7\u00e3o.
 
 # FiltersCustomizer.java
 
@@ -974,7 +974,7 @@ INSTANCEEDITOR_Target_Encoding=Codifica\u00e7\u00e3o do arquivo traduzido:
 
 INSTANCEEDITOR_Substituted_Variable=Vari\u00e1veis do nome de arquivo :
 
-INSTANCEEDITOR_Target_Filename_Pattern=Padr\u00e3o do nome do arquivo traduzido
+INSTANCEEDITOR_Target_Filename_Pattern=Tipo de arquivo traduzido
 
 # org.omegat.core.threads.SaveThread
 #{0} -- hours, {1} -- minutes when the autosave happened
@@ -1099,9 +1099,9 @@ WF_OPTION_INSERT_AUTHOR_PREFIX=&Nome/ID:
 
 # org.omegat.gui.dialogs.WorkflowOptionsDialog
 
-GUI_TITLE_Workflow_Options=Modo de trabalho
+GUI_TITLE_Workflow_Options=Op\u00e7\u00f5es do modo de trabalho
 
-GUI_WORKFLOW_DESCRIPTION=Ao abrir um segmento que n\u00e3o est\u00e1 traduzido ainda, selecione o que gostaria de ver nele inserido.
+GUI_WORKFLOW_DESCRIPTION=Ao passar para um segmento que n\u00e3o est\u00e1 traduzido ainda, selecione qual texto gostaria que nele fosse inserido.
 
 WF_OPTION_INSERT_SOURCE=O texto f&onte
 
@@ -1145,15 +1145,15 @@ LOG_DECODING_ERROR=Erro na decodifica\u00e7\u00e3o do nome de usu\u00e1rio e sen
 
 # org.omegat.gui.dialogs.TagValidationOptionsDialog
 
-GUI_TITLE_TagValidation_Options=Valida\u00e7\u00e3o de tags
+GUI_TITLE_TagValidation_Options=Verifica\u00e7\u00e3o de tags
 
-GUI_TAGVALIDATION_DESCRIPTION=OmegaT pode validar as vari\u00e1veis de programa\u00e7\u00e3o (vari\u00e1veis da fun\u00e7\u00e3o printf) como '% s'. Selecione o modo de trabalho que lhe for adequado. A valida\u00e7\u00e3o completa pode levar a falsos positivos em textos normais.
+GUI_TAGVALIDATION_DESCRIPTION=O OmegaT tamb\u00e9m pode verificar as vari\u00e1veis de programa\u00e7\u00e3o (vari\u00e1veis da fun\u00e7\u00e3o printf) como '% s'. Selecione o procedimento que for apropriado. A verifica\u00e7\u00e3o completa pode levar a falsos positivos em textos normais.
 
-TV_OPTION_NO_CHECK=& N\u00e3o validar vari\u00e1veis printf
+TV_OPTION_NO_CHECK=& N\u00e3o verificar vari\u00e1veis printf
 
-TV_OPTION_SIMPLE_CHECK=&Validar vari\u00e1veis printf simples (p.ex., % s,% d)
+TV_OPTION_SIMPLE_CHECK=&Verificar vari\u00e1veis printf simples (p.ex., % s,% d)
 
-TV_OPTION_FULL_CHECK=Validar todas as vari\u00e1veis printf (p.ex.,% s,% s)
+TV_OPTION_FULL_CHECK=Verificar &todas as vari\u00e1veis printf (p.ex.,% s,% s)
 
 # org.omegat.gui.main.MainWindow / Docking
 
@@ -1166,7 +1166,7 @@ GUI_MATCHWINDOW_SUBWINDOWTITLE_Dictionary=Dicion\u00e1rio
 GUI_MATCHWINDOW_SUBWINDOWTITLE_MachineTranslate=Tradu\u00e7\u00e3o autom\u00e1tica
 
 # 0 - filename
-GUI_SUBWINDOWTITLE_Editor=Painel Editor
+GUI_SUBWINDOWTITLE_Editor=Editor - {0}
 
 DOCKING_HINT_DOCK=Encaixar
 
@@ -1183,11 +1183,11 @@ DOCKING_INSTANT_START_TITLE=In\u00edcio R\u00e1pido
 
 # StaticUtils
 
-SU_USERHOME_PROP_ACCESS_ERROR=N\u00e3o foi permitido ao OmegaT acessar a propriedade do sistema contendo o nome do seu Sistema Operacional e/ou a propriedade do sistema contendo sua pasta home. Portanto, o local da pasta de configura\u00e7\u00e3o do OmegaT n\u00e3o pode ser determinada com certeza. Em vez disso, a pasta atual ser\u00e1 usada. Assim sendo, todas as configura\u00e7\u00f5es ser\u00e3o as predefinidas e pode ocorrer um comportamento inesperado, por\u00e9m correto do programa.
+SU_USERHOME_PROP_ACCESS_ERROR=N\u00e3o foi permitido ao OmegaT acessar a propriedade do sistema contendo o nome do seu SO e/ou a propriedade do sistema contendo sua pasta home. Portanto, o local da pasta de configura\u00e7\u00e3o do OmegaT n\u00e3o pode ser determinado com certeza. Em vez disso, a pasta atual ser\u00e1 usada. Assim sendo, todas as configura\u00e7\u00f5es ser\u00e3o as predefinidas e pode ocorrer um comportamento inesperado, por\u00e9m correto do programa.
 
 SU_CONFIG_DIR_CREATE_ERROR=Seu sistema operacional n\u00e3o deixou o OmegaT criar a pasta de configura\u00e7\u00e3o. Em vez disso, a pasta atual ser\u00e1 usada. Se o acesso ao local desejado for liberado posteriormente, ele ser\u00e1 usado e todas as configura\u00e7\u00f5es voltar\u00e3o \u00e0s predefinidas, em decorr\u00eancia da mudan\u00e7a de local.
 
-SU_SCRIPT_DIR_CREATE_ERROR=N\u00e3o foi poss\u00edvel criar a pasta de script dentro da pasta de configura\u00e7\u00e3o. Em vez disso, ser\u00e1 usada a pasta de configura\u00e7\u00e3o.
+SU_SCRIPT_DIR_CREATE_ERROR=N\u00e3o foi poss\u00edvel criar a pasta de script dentro da pasta de configura\u00e7\u00e3o. Em vez disso, a pasta atual ser\u00e1 usada.
 
 # Log
 
@@ -1269,7 +1269,7 @@ GUI_SPELLCHECKER_SOURCE_LABEL=&Fonte (segmento {0}):
 GUI_DICTIONARY_INSTALLER_TITLE=Instalador do dicion\u00e1rio
 GUI_DICTIONARY_INSTALLER_TEXT_WAIT=Conectando ao reposit\u00f3rio de dicion\u00e1rios... Aguarde.
 
-GUI_DICTIONARY_INSTALLER_TEXT_GO=Selecione os dicion\u00e1rios que quer instalar e clique em Instalar.
+GUI_DICTIONARY_INSTALLER_TEXT_GO=Selecione os dicion\u00e1rios que quer instalar e clique no bot\u00e3o Instalar.
 
 GUI_DICTIONARY_INSTALLER_TEXT_NOTHING=N\u00e3o h\u00e1 dicion\u00e1rios dispon\u00edveis no servidor remoto.
 
diff --git a/src/org/omegat/Version.properties b/src/org/omegat/Version.properties
index 54be0da..3aa764b 100644
--- a/src/org/omegat/Version.properties
+++ b/src/org/omegat/Version.properties
@@ -31,5 +31,5 @@
 # 
 
 #NOI18N
-version=2.2.3
-update=4
+version=2.3.0
+update=1
diff --git a/src/org/omegat/core/data/RealProject.java b/src/org/omegat/core/data/RealProject.java
index 0c94fc1..e40548f 100644
--- a/src/org/omegat/core/data/RealProject.java
+++ b/src/org/omegat/core/data/RealProject.java
@@ -980,7 +980,7 @@ public class RealProject implements IProject {
 
         protected String getSegmentTranslation(String id, int segmentIndex, String segmentSource) {
             TransEntry tr = translations.get(segmentSource);
-            return tr != null ? tr.translation : segmentSource;
+            return tr != null ? tr.translation : null;
         }
     };
 
diff --git a/src/org/omegat/core/data/TranslateEntry.java b/src/org/omegat/core/data/TranslateEntry.java
index 91b567d..e53bae7 100644
--- a/src/org/omegat/core/data/TranslateEntry.java
+++ b/src/org/omegat/core/data/TranslateEntry.java
@@ -3,7 +3,7 @@
           with fuzzy matching, translation memory, keyword search, 
           glossaries, and translation leveraging into updated projects.
 
- Copyright (C) 2009 Alex Buloichik
+ Copyright (C) 2009-2011 Alex Buloichik
                Home page: http://www.omegat.org/
                Support center: http://groups.yahoo.com/group/OmegaT/
 
@@ -60,6 +60,7 @@ public abstract class TranslateEntry implements ITranslateCallback {
 
         StringBuffer res = new StringBuffer();
 
+        boolean translated = false;
         if (m_config.isSentenceSegmentingEnabled()) {
             List<StringBuffer> spaces = new ArrayList<StringBuffer>();
             List<Rule> brules = new ArrayList<Rule>();
@@ -68,12 +69,27 @@ public abstract class TranslateEntry implements ITranslateCallback {
             List<String> segments = Segmenter.segment(sourceLang, source, spaces, brules);
             for (int i = 0; i < segments.size(); i++) {
                 String onesrc = segments.get(i);
-                segments.set(i, getSegmentTranslation(id, i, onesrc));
+                String tr = getSegmentTranslation(id, i, onesrc);
+                if (tr == null) {
+                    tr = onesrc;
+                } else {
+                    translated = true;
+                }
+                segments.set(i, tr);
             }
             res.append(Segmenter.glue(sourceLang, targetLang, segments, spaces, brules));
         } else {
+            String tr = getSegmentTranslation(id, 0, source);
+            if (tr == null) {
+                tr = source;
+            } else {
+                translated = true;
+            }
             res.append(getSegmentTranslation(id, 0, source));
         }
+        if (!translated) {
+            return null;
+        }
 
         // replacing all occurrences of LF (\n) by either single CR (\r) or CRLF
         // (\r\n)
diff --git a/src/org/omegat/core/dictionaries/StarDict.java b/src/org/omegat/core/dictionaries/StarDict.java
index 2468e4f..49d1d87 100644
--- a/src/org/omegat/core/dictionaries/StarDict.java
+++ b/src/org/omegat/core/dictionaries/StarDict.java
@@ -71,7 +71,10 @@ public class StarDict implements IDictionary {
             throw new Exception("Invalid version of dictionary: " + version);
         }
         contentType = header.get("sametypesequence");
-        if (!"g".equals(contentType) && !"m".equals(contentType) && !"x".equals(contentType)) {
+        if (!"g".equals(contentType) && 
+            !"m".equals(contentType) && 
+            !"x".equals(contentType) &&
+            !"h".equals(contentType)) {
             throw new Exception("Invalid type of dictionary: " + contentType);
         }
     }
diff --git a/src/org/omegat/core/segmentation/defaultRules.xml b/src/org/omegat/core/segmentation/defaultRules.xml
index 43dd78b..f2a170e 100644
--- a/src/org/omegat/core/segmentation/defaultRules.xml
+++ b/src/org/omegat/core/segmentation/defaultRules.xml
@@ -5,6 +5,7 @@
  OmegaT - Java based Computer Assisted Translation (CAT) tool
  Copyright (C) 2000-2007 Keith Godfrey and Maxym Mykhalchuk
                2008-2010 Alex Buloichik, Didier Briel  
+               2011 Didier Briel
                Home page: http://www.omegat.org/
                Support center: http://groups.yahoo.com/group/OmegaT/
 
@@ -3647,8 +3648,8 @@
     </rule>
     <rule break="yes">
      <!--numbered headers break rule 
-         contributed by Jean-Christophe Helary -->
-     <beforebreak>^\s*[\p{Nd}\.]+\s*</beforebreak>
+         based on an idea by Jean-Christophe Helary -->
+     <beforebreak>^\s*\p{Nd}+[\p{Nd}\.\)\]]+\s+</beforebreak>
      <afterbreak>\p{Lu}</afterbreak>
     </rule>
     <rule break="yes">
diff --git a/src/org/omegat/filters2/AbstractFilter.java b/src/org/omegat/filters2/AbstractFilter.java
index 85bebc1..7d5b844 100644
--- a/src/org/omegat/filters2/AbstractFilter.java
+++ b/src/org/omegat/filters2/AbstractFilter.java
@@ -442,7 +442,8 @@ public abstract class AbstractFilter implements IFilter {
             entryParseCallback.addEntry(null, entry, null, false, null, this);
             return entry;
         } else {
-            return entryTranslateCallback.getTranslation(null, entry);
+            String translation = entryTranslateCallback.getTranslation(null, entry);
+            return translation != null ? translation : entry;
         }
     }
 
diff --git a/src/org/omegat/filters2/ITranslateCallback.java b/src/org/omegat/filters2/ITranslateCallback.java
index bd563bd..1c04df4 100644
--- a/src/org/omegat/filters2/ITranslateCallback.java
+++ b/src/org/omegat/filters2/ITranslateCallback.java
@@ -37,7 +37,7 @@ public interface ITranslateCallback {
      *            ID in source file, or null if ID not supported by format
      * @param source
      *            source entry text
-     * @return translation or source if translation not exist
+     * @return translation or null if translation not exist
      */
     String getTranslation(String id, String source);
 }
diff --git a/src/org/omegat/filters2/latex/LatexFilter.java b/src/org/omegat/filters2/latex/LatexFilter.java
index f62139d..2ef3f76 100644
--- a/src/org/omegat/filters2/latex/LatexFilter.java
+++ b/src/org/omegat/filters2/latex/LatexFilter.java
@@ -7,6 +7,7 @@
                2006 Thomas Huriaux
                2008 Martin Fleurke
                2009 Arno Peters
+               2011 Didier Briel
                Home page: http://www.omegat.org/
                Support center: http://groups.yahoo.com/group/OmegaT/
 
@@ -49,6 +50,7 @@ import org.omegat.util.OStrings;
  * @author Thomas Huriaux
  * @author Martin Fleurke
  * @author Arno Peters
+ * @author Didier Briel
  */
 public class LatexFilter extends AbstractFilter {
 
@@ -126,6 +128,7 @@ public class LatexFilter extends AbstractFilter {
     private void processLatexFile(BufferedReader in, Writer out) throws IOException {
         StringBuffer par = new StringBuffer();
         String s;
+        StringBuffer comment = new StringBuffer();
 
         LinkedList<String> commands = new LinkedList<String>();
 
@@ -182,7 +185,6 @@ public class LatexFilter extends AbstractFilter {
                     }
                 } else if (cat == 14) {
                     /* parse comment */
-                    StringBuffer comment = new StringBuffer();
                     comment.append(cidx);
                     idx++;
                     while (idx < c.length) {
@@ -190,8 +192,6 @@ public class LatexFilter extends AbstractFilter {
                         comment.append(commentc);
                         idx++;
                     }
-                    // state = "N";
-                    // out.write("\n");
                 } else {
                     state = "M";
                     par.append(cidx);
@@ -203,11 +203,18 @@ public class LatexFilter extends AbstractFilter {
             /* at the end of the line */
             if (state.equals("N")) {
                 /* \par */
-                out.write(processParagraph(commands, par.toString()));
-                out.write("\n\n");
-                par.setLength(0);
+                if (par.length() > 0) {
+                    out.write(processParagraph(commands, par.toString()));
+                    out.write("\n\n");
+                    par.setLength(0);
+                }
                 // System.out.println(commands);
                 commands.clear();
+                if (comment.length() > 0) { // If there is a comment, write it
+                     out.write(comment.toString());
+                     out.write("\n");
+                     comment.setLength(0);
+                }
             } else if (state.equals("M")) {
                 par.append(" ");
             }
diff --git a/src/org/omegat/filters2/mozdtd/MozillaDTDFilter.java b/src/org/omegat/filters2/mozdtd/MozillaDTDFilter.java
index b2c0f51..afbc417 100644
--- a/src/org/omegat/filters2/mozdtd/MozillaDTDFilter.java
+++ b/src/org/omegat/filters2/mozdtd/MozillaDTDFilter.java
@@ -4,6 +4,7 @@
           glossaries, and translation leveraging into updated projects.
 
  Copyright (C) 2010 Alex Buloichik, Didier Briel
+               2011 Didier Briel
                Home page: http://www.omegat.org/
                Support center: http://groups.yahoo.com/group/OmegaT/
 
@@ -110,6 +111,10 @@ public class MozillaDTDFilter extends AbstractFilter {
                 isInBlock = false;
                 processBlock(block.toString(), outFile);
                 block.setLength(0);
+            } else if ((c == '>' && isInBlock && previousChar == '-')) { // This was a comment
+                isInBlock = false;
+                outFile.write(block.toString());
+                block.setLength(0);
             }
             if (!Character.isWhitespace(c) ) { // In the regexp, there could be whitespace between " and >
                 previousChar = c;
@@ -132,7 +137,7 @@ public class MozillaDTDFilter extends AbstractFilter {
             // replace translation
             String trans = entryTranslateCallback.getTranslation(null, text);
             out.write(block.substring(0, m.start(2)));
-            out.write(trans);
+            out.write(trans != null ? trans : text);
             out.write(block.substring(m.end(2)));
         } else if (entryAlignCallback != null && id != null) {
             align.put(id, text);
diff --git a/src/org/omegat/filters2/po/PoFilter.java b/src/org/omegat/filters2/po/PoFilter.java
index db00dc9..c67942a 100644
--- a/src/org/omegat/filters2/po/PoFilter.java
+++ b/src/org/omegat/filters2/po/PoFilter.java
@@ -7,6 +7,7 @@
                2006 Thomas Huriaux
                2008 Martin Fleurke
                2009 Alex Buloichik
+               2011 Didier Briel
                Home page: http://www.omegat.org/
                Support center: http://groups.yahoo.com/group/OmegaT/
 
@@ -27,10 +28,12 @@
 
 package org.omegat.filters2.po;
 
+import java.awt.Dialog;
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
 import java.io.File;
 import java.io.IOException;
+import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -39,6 +42,7 @@ import org.omegat.filters2.FilterContext;
 import org.omegat.filters2.Instance;
 import org.omegat.filters2.TranslationException;
 import org.omegat.util.OStrings;
+import org.omegat.util.Log;
 
 /**
  * Filter to support po files (in various encodings).
@@ -52,9 +56,17 @@ import org.omegat.util.OStrings;
  * @author Thomas Huriaux
  * @author Martin Fleurke
  * @author Alex Buloichik (alex73mail at gmail.com)
+ * @author Didier Briel
  */
 public class PoFilter extends AbstractFilter {
 
+    public static final String OPTION_ALLOW_BLANK = "disallowBlank";
+
+    /**
+     * If true, non-translated segments will contain the source text in ms
+     */
+    public static boolean allowBlank = false;
+
     protected static Pattern COMMENT_FUZZY = Pattern.compile("#, fuzzy");
     protected static Pattern COMMENT_FUZZY_OTHER = Pattern.compile("#,.* fuzzy.*");
     protected static Pattern COMMENT_NOWRAP = Pattern.compile("#,.* no-wrap.*");
@@ -88,12 +100,22 @@ public class PoFilter extends AbstractFilter {
         return true;
     }
 
+    @Override
     public String getFuzzyMark() {
         return "PO-fuzzy";
     }
 
+    @Override
     public void processFile(File inFile, File outFile, FilterContext fc) throws IOException,
             TranslationException {
+
+        String disallowBlankStr = processOptions.get(OPTION_ALLOW_BLANK);
+        if ((disallowBlankStr == null) || (disallowBlankStr.equalsIgnoreCase("true"))) {
+            allowBlank = true;
+        } else {
+            allowBlank = false;
+        }
+
         BufferedReader reader = createReader(inFile, fc.getInEncoding());
         try {
             BufferedWriter writer;
@@ -154,6 +176,11 @@ public class PoFilter extends AbstractFilter {
 
         String s;
         while ((s = in.readLine()) != null) {
+
+            // We trim trailing spaces, otherwise the regexps could fail, thus making some segments
+            // invisible to OmegaT
+            s = s.trim();
+
             /*
              * Removing the fuzzy markers, as it has no meanings after being processed by omegat
              */
@@ -227,7 +254,7 @@ public class PoFilter extends AbstractFilter {
             if ((m = MSG_OTHER.matcher(s)).matches()) {
                 String text = m.group(1);
                 if (currentMode == null) {
-                    throw new IOException("Invalid file format");
+                    throw new IOException(OStrings.getString("POFILTER_INVALID_FORMAT"));
                 }
                 switch (currentMode) {
                 case MSGID:
@@ -295,7 +322,8 @@ public class PoFilter extends AbstractFilter {
             } else {
                 // header
                 if (out != null) {
-                    out.write("msgstr " + getTranslation(targets[0]) + "\n");
+                    // Header is always written
+                    out.write("msgstr " + getTranslation(targets[0], false) + "\n");
                 } else {
                     alignHeader(targets[0].toString());
                 }
@@ -306,15 +334,15 @@ public class PoFilter extends AbstractFilter {
             if (sources[1].length() == 0) {
                 // non-plurals
                 if (out != null) {
-                    out.write("msgstr " + getTranslation(sources[0]) + "\n");
+                    out.write("msgstr " + getTranslation(sources[0], allowBlank) + "\n");
                 } else {
                     align(0);
                 }
             } else {
                 // plurals
                 if (out != null) {
-                    out.write("msgstr[0] " + getTranslation(sources[0]) + "\n");
-                    out.write("msgstr[1] " + getTranslation(sources[1]) + "\n");
+                    out.write("msgstr[0] " + getTranslation(sources[0], allowBlank) + "\n");
+                    out.write("msgstr[1] " + getTranslation(sources[1], allowBlank) + "\n");
                 } else {
                     align(0);
                     align(1);
@@ -346,21 +374,23 @@ public class PoFilter extends AbstractFilter {
      * (except for at newline characters), but that was already not done without nowrap.] [ 1869069 ] Escape
      * support for PO
      * 
-     * @param entry
-     *            The entire source text, without it's surrounding double quotes, but otherwise
-     *            not-interpreted
-     * @param nowrap
-     *            gives indication if the translation should not be wrapped over multiple lines and all lines
-     *            be left-aligned.
+     * @param en
+     *            The entire source text
+     * @param allowNull
+     *            Allow to output a blank translation in msgstr
      * @return The translated entry, within double quotes on each line (thus ready to be printed to target
      *         file immediately)
      **/
-    private String getTranslation(StringBuilder en) {
+    private String getTranslation(StringBuilder en, boolean allowNull) {
         String entry = unescape(en.toString());
 
         // Do real translation
         String translation = entryTranslateCallback.getTranslation(null, entry);
 
+        if (translation == null && !allowNull) { // We write the source in translation
+            translation = entry;
+        }
+
         if (translation != null) {
             return "\"" + escape(translation) + "\"";
         } else {
@@ -406,8 +436,6 @@ public class PoFilter extends AbstractFilter {
         translation = translation.replace("\\", "\\\\");
         // Adds escapes to quotes. ( " becomes \" )
         translation = translation.replace("\"", "\\\"");
-        // AB: restore \r
-        translation = translation.replace("\\\\r", "\\r");
 
         /*
          * Normally, long lines are wrapped at 'output page width', which defaults to ?76?, and always at
@@ -436,4 +464,31 @@ public class PoFilter extends AbstractFilter {
 
         return translation;
     }
+
+    @Override
+    public Map<String, String> changeOptions(Dialog parent, Map<String, String> config) {
+        try {
+            PoOptionsDialog dialog = new PoOptionsDialog(parent, config);
+            dialog.setVisible(true);
+            if (PoOptionsDialog.RET_OK == dialog.getReturnStatus())
+                return dialog.getOptions();
+            else
+                return null;
+        } catch (Exception e) {
+            Log.log(OStrings.getString("POFILTER_EXCEPTION"));
+            Log.log(e);
+            return null;
+        }
+    }
+
+    /**
+     * Returns true to indicate that Text filter has options.
+     *
+     * @return True, because the PO filter has options.
+     */
+    @Override
+    public boolean hasOptions() {
+        return true;
+    }
+
 }
diff --git a/src/org/omegat/filters2/po/PoOptionsDialog.form b/src/org/omegat/filters2/po/PoOptionsDialog.form
new file mode 100644
index 0000000..f58f3e4
--- /dev/null
+++ b/src/org/omegat/filters2/po/PoOptionsDialog.form
@@ -0,0 +1,96 @@
+<?xml version="1.1" encoding="UTF-8" ?>
+
+<Form version="1.2" maxVersion="1.2" type="org.netbeans.modules.form.forminfo.JDialogFormInfo">
+  <Properties>
+    <Property name="title" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+      <ResourceString bundle="org/omegat/Bundle.properties" key="POFILTER_OPTIONS_TITLE" replaceFormat="OStrings.getString("{key}")"/>
+    </Property>
+    <Property name="resizable" type="boolean" value="false"/>
+  </Properties>
+  <SyntheticProperties>
+    <SyntheticProperty name="formSizePolicy" type="int" value="0"/>
+    <SyntheticProperty name="generateSize" type="boolean" value="false"/>
+    <SyntheticProperty name="generateCenter" type="boolean" value="true"/>
+  </SyntheticProperties>
+  <Events>
+    <EventHandler event="windowClosing" listener="java.awt.event.WindowListener" parameters="java.awt.event.WindowEvent" handler="closeDialog"/>
+  </Events>
+  <AuxValues>
+    <AuxValue name="FormSettings_autoResourcing" type="java.lang.Integer" value="0"/>
+    <AuxValue name="FormSettings_autoSetComponentName" type="java.lang.Boolean" value="false"/>
+    <AuxValue name="FormSettings_generateFQN" type="java.lang.Boolean" value="true"/>
+    <AuxValue name="FormSettings_generateMnemonicsCode" type="java.lang.Boolean" value="true"/>
+    <AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean" value="false"/>
+    <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="2"/>
+    <AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
+    <AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
+    <AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>
+    <AuxValue name="designerSize" type="java.awt.Dimension" value="-84,-19,0,5,115,114,0,18,106,97,118,97,46,97,119,116,46,68,105,109,101,110,115,105,111,110,65,-114,-39,-41,-84,95,68,20,2,0,2,73,0,6,104,101,105,103,104,116,73,0,5,119,105,100,116,104,120,112,0,0,0,120,0,0,1,-112"/>
+  </AuxValues>
+
+  <Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/>
+  <SubComponents>
+    <Container class="javax.swing.JPanel" name="buttonPanel">
+      <Constraints>
+        <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription">
+          <BorderConstraints direction="South"/>
+        </Constraint>
+      </Constraints>
+
+      <Layout class="org.netbeans.modules.form.compat2.layouts.DesignFlowLayout">
+        <Property name="alignment" type="int" value="2"/>
+      </Layout>
+      <SubComponents>
+        <Component class="javax.swing.JButton" name="okButton">
+          <Properties>
+            <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+              <ResourceString bundle="org/omegat/Bundle.properties" key="BUTTON_OK" replaceFormat="OStrings.getString("{key}")"/>
+            </Property>
+          </Properties>
+          <Events>
+            <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="okButtonActionPerformed"/>
+          </Events>
+        </Component>
+        <Component class="javax.swing.JButton" name="cancelButton">
+          <Properties>
+            <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+              <ResourceString bundle="org/omegat/Bundle.properties" key="BUTTON_CANCEL" replaceFormat="OStrings.getString("{key}")"/>
+            </Property>
+          </Properties>
+          <Events>
+            <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="cancelButtonActionPerformed"/>
+          </Events>
+        </Component>
+      </SubComponents>
+    </Container>
+    <Container class="javax.swing.JPanel" name="jPanel1">
+      <Properties>
+        <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
+          <Border info="org.netbeans.modules.form.compat2.border.EmptyBorderInfo">
+            <EmptyBorder bottom="3" left="3" right="3" top="3"/>
+          </Border>
+        </Property>
+      </Properties>
+      <Constraints>
+        <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription">
+          <BorderConstraints direction="Center"/>
+        </Constraint>
+      </Constraints>
+
+      <Layout class="org.netbeans.modules.form.compat2.layouts.DesignGridLayout">
+        <Property name="columns" type="int" value="1"/>
+        <Property name="rows" type="int" value="0"/>
+        <Property name="verticalGap" type="int" value="3"/>
+      </Layout>
+      <SubComponents>
+        <Component class="javax.swing.JCheckBox" name="allowBlankCB">
+          <Properties>
+            <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+              <ResourceString bundle="org/omegat/Bundle.properties" key="POFILTER_ALLOW_BLANK" replaceFormat="OStrings.getString("{key}")"/>
+            </Property>
+          </Properties>
+        </Component>
+      </SubComponents>
+    </Container>
+  </SubComponents>
+</Form>
diff --git a/src/org/omegat/filters2/po/PoOptionsDialog.java b/src/org/omegat/filters2/po/PoOptionsDialog.java
new file mode 100644
index 0000000..a34c3fb
--- /dev/null
+++ b/src/org/omegat/filters2/po/PoOptionsDialog.java
@@ -0,0 +1,176 @@
+/**************************************************************************
+ OmegaT - Computer Assisted Translation (CAT) tool 
+          with fuzzy matching, translation memory, keyword search, 
+          glossaries, and translation leveraging into updated projects.
+
+ Copyright (C) 2000-2006 Keith Godfrey and Maxym Mykhalchuk
+               2011 Didier Briel
+               Home page: http://www.omegat.org/
+               Support center: http://groups.yahoo.com/group/OmegaT/
+
+ 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ **************************************************************************/
+
+package org.omegat.filters2.po;
+
+import java.awt.Dialog;
+import java.awt.event.ActionEvent;
+import java.awt.event.KeyEvent;
+import java.util.Map;
+import java.util.TreeMap;
+
+import javax.swing.AbstractAction;
+import javax.swing.Action;
+import javax.swing.JComponent;
+import javax.swing.KeyStroke;
+
+import org.omegat.util.OStrings;
+
+/**
+ * Modal dialog to edit the PO filter options.
+ * 
+ * @author Maxym Mykhalchuk
+ * @author Didier Briel
+ */
+public class PoOptionsDialog extends javax.swing.JDialog {
+    /** A return status code - returned if Cancel button has been pressed */
+    public static final int RET_CANCEL = 0;
+    /** A return status code - returned if OK button has been pressed */
+    public static final int RET_OK = 1;
+
+    private Map<String, String> options;
+
+    /**
+     * Creates new form PoOptionsDialog
+     */
+    public PoOptionsDialog(Dialog parent, Map<String, String> options) {
+        super(parent, true);
+        this.options = new TreeMap<String, String>(options);
+        initComponents();
+
+        allowBlankCB.setSelected(PoFilter.allowBlank);
+        
+        // Handle escape key to close the window
+        KeyStroke escape = KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0, false);
+        Action escapeAction = new AbstractAction() {
+            public void actionPerformed(ActionEvent e) {
+                doClose(RET_CANCEL);
+            }
+        };
+        getRootPane().getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(escape, "ESCAPE");
+        getRootPane().getActionMap().put("ESCAPE", escapeAction);
+    }
+
+    /** @return the return status of this dialog - one of RET_OK or RET_CANCEL */
+    public int getReturnStatus() {
+        return returnStatus;
+    }
+
+    /** Returns updated options. */
+    public Map<String, String> getOptions() {
+        return options;
+    }
+
+    /**
+     * This method is called from within the constructor to initialize the form.
+     * WARNING: Do NOT modify this code. The content of this method is always
+     * regenerated by the Form Editor.
+     */
+    // <editor-fold defaultstate="collapsed"
+    // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
+    private void initComponents() {
+
+        buttonPanel = new javax.swing.JPanel();
+        okButton = new javax.swing.JButton();
+        cancelButton = new javax.swing.JButton();
+        jPanel1 = new javax.swing.JPanel();
+        allowBlankCB = new javax.swing.JCheckBox();
+
+        setTitle(OStrings.getString("POFILTER_OPTIONS_TITLE")); // NOI18N
+        setResizable(false);
+        addWindowListener(new java.awt.event.WindowAdapter() {
+            public void windowClosing(java.awt.event.WindowEvent evt) {
+                closeDialog(evt);
+            }
+        });
+
+        buttonPanel.setLayout(new java.awt.FlowLayout(java.awt.FlowLayout.RIGHT));
+
+        org.openide.awt.Mnemonics.setLocalizedText(okButton, OStrings.getString("BUTTON_OK")); // NOI18N
+        okButton.addActionListener(new java.awt.event.ActionListener() {
+            public void actionPerformed(java.awt.event.ActionEvent evt) {
+                okButtonActionPerformed(evt);
+            }
+        });
+        buttonPanel.add(okButton);
+
+        org.openide.awt.Mnemonics.setLocalizedText(cancelButton, OStrings.getString("BUTTON_CANCEL")); // NOI18N
+        cancelButton.addActionListener(new java.awt.event.ActionListener() {
+            public void actionPerformed(java.awt.event.ActionEvent evt) {
+                cancelButtonActionPerformed(evt);
+            }
+        });
+        buttonPanel.add(cancelButton);
+
+        getContentPane().add(buttonPanel, java.awt.BorderLayout.SOUTH);
+
+        jPanel1.setBorder(javax.swing.BorderFactory.createEmptyBorder(3, 3, 3, 3));
+        jPanel1.setLayout(new java.awt.GridLayout(0, 1, 0, 3));
+
+        org.openide.awt.Mnemonics.setLocalizedText(allowBlankCB, OStrings.getString("POFILTER_ALLOW_BLANK")); // NOI18N
+        jPanel1.add(allowBlankCB);
+
+        getContentPane().add(jPanel1, java.awt.BorderLayout.CENTER);
+
+        pack();
+        java.awt.Dimension screenSize = java.awt.Toolkit.getDefaultToolkit().getScreenSize();
+        java.awt.Dimension dialogSize = getSize();
+        setLocation((screenSize.width-dialogSize.width)/2,(screenSize.height-dialogSize.height)/2);
+    }// </editor-fold>//GEN-END:initComponents
+
+    private void okButtonActionPerformed(java.awt.event.ActionEvent evt)// GEN-FIRST:event_okButtonActionPerformed
+    {
+        options.put(PoFilter.OPTION_ALLOW_BLANK, Boolean.toString(allowBlankCB.isSelected()));
+    
+        doClose(RET_OK);
+    }// GEN-LAST:event_okButtonActionPerformed
+
+    private void cancelButtonActionPerformed(java.awt.event.ActionEvent evt)// GEN-FIRST:event_cancelButtonActionPerformed
+    {
+        doClose(RET_CANCEL);
+    }// GEN-LAST:event_cancelButtonActionPerformed
+
+    /** Closes the dialog */
+    private void closeDialog(java.awt.event.WindowEvent evt)// GEN-FIRST:event_closeDialog
+    {
+        doClose(RET_CANCEL);
+    }// GEN-LAST:event_closeDialog
+
+    private void doClose(int retStatus) {
+        returnStatus = retStatus;
+        setVisible(false);
+        dispose();
+    }
+
+    // Variables declaration - do not modify//GEN-BEGIN:variables
+    private javax.swing.JCheckBox allowBlankCB;
+    private javax.swing.JPanel buttonPanel;
+    private javax.swing.JButton cancelButton;
+    private javax.swing.JPanel jPanel1;
+    private javax.swing.JButton okButton;
+    // End of variables declaration//GEN-END:variables
+
+    private int returnStatus = RET_CANCEL;
+}
diff --git a/src/org/omegat/filters2/rc/RcFilter.java b/src/org/omegat/filters2/rc/RcFilter.java
index b8a7804..553c7f0 100644
--- a/src/org/omegat/filters2/rc/RcFilter.java
+++ b/src/org/omegat/filters2/rc/RcFilter.java
@@ -137,6 +137,9 @@ public class RcFilter extends AbstractFilter {
                 } else if (entryTranslateCallback != null) {
                     // replace translation
                     String trans = entryTranslateCallback.getTranslation(null, loc);
+                    if (trans == null) {
+                        trans = loc;
+                    }
                     trans = trans.replace("\"", "\"\"");
                     s = s.substring(0, b + 1) + trans + s.substring(e);
                 } else if (entryAlignCallback != null && id != null) {
diff --git a/src/org/omegat/filters2/text/bundles/ResourceBundleFilter.java b/src/org/omegat/filters2/text/bundles/ResourceBundleFilter.java
index 9fe9e94..f9ef9aa 100644
--- a/src/org/omegat/filters2/text/bundles/ResourceBundleFilter.java
+++ b/src/org/omegat/filters2/text/bundles/ResourceBundleFilter.java
@@ -359,7 +359,8 @@ public class ResourceBundleFilter extends AbstractFilter {
             entryParseCallback.addEntry(key, value, null, false, null, this);
             return value;
         } else if (entryTranslateCallback != null) {
-            return entryTranslateCallback.getTranslation(key, value);
+            String trans = entryTranslateCallback.getTranslation(key, value);
+            return trans != null ? trans : value;
         } else if (entryAlignCallback != null) {
             align.put(key, value);
         }
diff --git a/src/org/omegat/filters3/xml/DefaultXMLDialect.java b/src/org/omegat/filters3/xml/DefaultXMLDialect.java
index 97ec01b..c775ae1 100644
--- a/src/org/omegat/filters3/xml/DefaultXMLDialect.java
+++ b/src/org/omegat/filters3/xml/DefaultXMLDialect.java
@@ -7,6 +7,7 @@
                2008 Martin Fleurke
                2009 Didier Briel
                2010 Antonio Vilei
+               2011 Didier Briel
                Home page: http://www.omegat.org/
                Support center: http://groups.yahoo.com/group/OmegaT/
 
@@ -408,4 +409,20 @@ public class DefaultXMLDialect implements XMLDialect {
         return tagsAggregationEnabled;
     }
 
+    private boolean forceSpacePreserving = false;
+
+    /**
+     * {@inheritDoc}
+     */
+    public Boolean getForceSpacePreserving() {
+        return forceSpacePreserving;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public void setForceSpacePreserving(boolean onOff) {
+        forceSpacePreserving = onOff;
+    }
+
 }
diff --git a/src/org/omegat/filters3/xml/Handler.java b/src/org/omegat/filters3/xml/Handler.java
index 966c54a..73711a2 100644
--- a/src/org/omegat/filters3/xml/Handler.java
+++ b/src/org/omegat/filters3/xml/Handler.java
@@ -581,8 +581,8 @@ class Handler extends DefaultHandler implements LexicalHandler, DeclHandler {
         else {
             org.omegat.filters3.Attributes atts = null;
             if (tag.equals(paragraphTagName.lastElement())) {
-                paragraphTagName.peek();
-                atts = paragraphTagAttributes.peek(); // Restore attributes
+                paragraphTagName.pop();
+                atts = paragraphTagAttributes.pop(); // Restore attributes
             }
             return dialect.validateParagraphTag(tag, atts);
         }
@@ -617,8 +617,8 @@ class Handler extends DefaultHandler implements LexicalHandler, DeclHandler {
         else {
             org.omegat.filters3.Attributes atts = null;
             if (tag.equals(preformatTagName.lastElement())) {
-                preformatTagName.peek();
-                atts = preformatTagAttributes.peek(); // Restore attributes
+                preformatTagName.pop();
+                atts = preformatTagAttributes.pop(); // Restore attributes
             }
             return dialect.validatePreformatTag(tag, atts);
         }
@@ -713,6 +713,10 @@ class Handler extends DefaultHandler implements LexicalHandler, DeclHandler {
      */
     private boolean isSpacePreservingSet(org.omegat.filters3.Attributes currentAttributes) {
 
+        if (dialect.getForceSpacePreserving()) {
+            return true;
+        }
+        
         boolean preserve = false;
 
         for (int i = 0; i < currentAttributes.size(); i++) {
diff --git a/src/org/omegat/filters3/xml/XMLDialect.java b/src/org/omegat/filters3/xml/XMLDialect.java
index fe2627b..98fafb4 100644
--- a/src/org/omegat/filters3/xml/XMLDialect.java
+++ b/src/org/omegat/filters3/xml/XMLDialect.java
@@ -7,6 +7,7 @@
                2008 Martin Fleurke
                2009 Didier Briel
                2010 Antonio Vilei
+               2011 Didier Briel
                Home page: http://www.omegat.org/
                Support center: http://groups.yahoo.com/group/OmegaT/
 
@@ -246,4 +247,16 @@ public interface XMLDialect {
      * Gives the value of tagsAggregationEnabled.
      */
     Boolean getTagsAggregationEnabled();
+
+    /**
+     * Gives the value of forceSpacePreserving;
+     * @return whether forceSpacePreserving is set.
+     */
+    Boolean getForceSpacePreserving();
+
+    /**
+     * Set forceSpacePreserving.
+     */
+    void setForceSpacePreserving(boolean onOff);
+
 }
diff --git a/src/org/omegat/filters3/xml/flash/FlashDialect.java b/src/org/omegat/filters3/xml/flash/FlashDialect.java
new file mode 100644
index 0000000..4a7bca4
--- /dev/null
+++ b/src/org/omegat/filters3/xml/flash/FlashDialect.java
@@ -0,0 +1,49 @@
+/**************************************************************************
+ OmegaT - Computer Assisted Translation (CAT) tool 
+          with fuzzy matching, translation memory, keyword search, 
+          glossaries, and translation leveraging into updated projects.
+
+ Copyright (C) 2000-2006 Keith Godfrey and Maxym Mykhalchuk
+               2011 Didier Briel
+ 
+               Home page: http://www.omegat.org/
+               Support center: http://groups.yahoo.com/group/OmegaT/
+
+ 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ **************************************************************************/
+
+package org.omegat.filters3.xml.flash;
+
+import java.util.regex.Pattern;
+
+import org.omegat.filters3.xml.DefaultXMLDialect;
+
+/**
+ * This class specifies the Flash XML Dialect.
+ * 
+ * @author Didier Briel
+ */
+public class FlashDialect extends DefaultXMLDialect {
+    public static final Pattern FLASH_XMLNS = Pattern
+            .compile("xmlns(:\\w+)?=\"http://ns.adobe.com/xfl/2008/\"");
+
+    public FlashDialect() {
+
+        defineParagraphTags(new String[] { "characters"});
+
+        defineIntactTags(new String[] { "script" });
+    }
+
+}
diff --git a/src/org/omegat/filters3/xml/flash/FlashFilter.java b/src/org/omegat/filters3/xml/flash/FlashFilter.java
new file mode 100644
index 0000000..b6a308c
--- /dev/null
+++ b/src/org/omegat/filters3/xml/flash/FlashFilter.java
@@ -0,0 +1,113 @@
+/**************************************************************************
+ OmegaT - Computer Assisted Translation (CAT) tool 
+          with fuzzy matching, translation memory, keyword search, 
+          glossaries, and translation leveraging into updated projects.
+
+ Copyright (C) 2000-2006 Keith Godfrey and Maxym Mykhalchuk
+               2011 Didier Briel
+               Home page: http://www.omegat.org/
+               Support center: http://groups.yahoo.com/group/OmegaT/
+
+ 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ **************************************************************************/
+
+package org.omegat.filters3.xml.flash;
+
+import java.io.BufferedReader;
+import java.util.regex.Matcher;
+import org.omegat.filters2.Instance;
+import org.omegat.filters3.xml.XMLFilter;
+import org.omegat.util.OConsts;
+import org.omegat.util.OStrings;
+
+/**
+ * Filter for Flash files.
+ * 
+ * @author Didier Briel
+ */
+public class FlashFilter extends XMLFilter {
+
+    /**
+     * Creates a new instance of Flash
+     */
+    public FlashFilter() {
+        super(new FlashDialect());
+    }
+
+    /**
+     * Human-readable name of the File Format this filter supports.
+     * 
+     * @return File format name
+     */
+    public String getFileFormatName() {
+        return OStrings.getString("FLASH_FILTER_NAME");
+    }
+
+    /**
+     * The default list of filter instances that this filter class has. One
+     * filter class may have different filter instances, different by source
+     * file mask, encoding of the source file etc.
+     * <p>
+     * Note that the user may change the instances freely.
+     * 
+     * @return Default filter instances
+     */
+    public Instance[] getDefaultInstances() {
+        return new Instance[] { new Instance("*.xml") };
+    }
+
+    /**
+     * Either the encoding can be read, or it is UTF-8.
+     * 
+     * @return <code>false</code>
+     */
+    @Override
+    public boolean isSourceEncodingVariable() {
+        return false;
+    }
+
+    /**
+     * Yes, Flash may be written out in a variety of encodings.
+     * 
+     * @return <code>true</code>
+     */
+    @Override
+    public boolean isTargetEncodingVariable() {
+        return true;
+    }
+
+    /**
+     * Returns whether the file is supported by the filter, by checking
+     * namespace constraints.
+     *
+     * @return <code>true</code> or <code>false</code>
+     */
+    @Override
+    public boolean isFileSupported(BufferedReader reader) {
+        try {
+            char[] cbuf = new char[OConsts.READ_AHEAD_LIMIT];
+            int cbuf_len = reader.read(cbuf);
+            String buf = new String(cbuf, 0, cbuf_len);
+            Matcher matcher = FlashDialect.FLASH_XMLNS.matcher(buf);
+            if (matcher.find()) {
+                    return true;
+            }
+        } catch (Exception e) {
+            return false;
+        }
+        return false;
+    }
+
+}
diff --git a/src/org/omegat/filters3/xml/infix/InfixDialect.java b/src/org/omegat/filters3/xml/infix/InfixDialect.java
new file mode 100644
index 0000000..32ae9dd
--- /dev/null
+++ b/src/org/omegat/filters3/xml/infix/InfixDialect.java
@@ -0,0 +1,50 @@
+/**************************************************************************
+ OmegaT - Computer Assisted Translation (CAT) tool 
+          with fuzzy matching, translation memory, keyword search, 
+          glossaries, and translation leveraging into updated projects.
+
+ Copyright (C) 2000-2006 Keith Godfrey and Maxym Mykhalchuk
+           (C) 2011 Didier Briel
+ 
+               Home page: http://www.omegat.org/
+               Support center: http://groups.yahoo.com/group/OmegaT/
+
+ 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ **************************************************************************/
+
+package org.omegat.filters3.xml.infix;
+
+import java.util.regex.Pattern;
+
+import org.omegat.filters3.xml.DefaultXMLDialect;
+
+/**
+ * This class specifies the Infix XML Dialect.
+ * 
+ * @author Didier Briel
+ */
+public class InfixDialect extends DefaultXMLDialect {
+    public static final Pattern ROOT_TAG = Pattern.compile("DOC");
+
+    public InfixDialect() {
+       defineConstraint(CONSTRAINT_ROOT, ROOT_TAG);
+
+        defineParagraphTags(new String[] { "STORY", "P", });
+
+        defineShortcut("BR", "br");
+
+    }
+
+}
diff --git a/src/org/omegat/filters3/xml/infix/InfixFilter.java b/src/org/omegat/filters3/xml/infix/InfixFilter.java
new file mode 100644
index 0000000..2ddf035
--- /dev/null
+++ b/src/org/omegat/filters3/xml/infix/InfixFilter.java
@@ -0,0 +1,85 @@
+/**************************************************************************
+ OmegaT - Computer Assisted Translation (CAT) tool 
+          with fuzzy matching, translation memory, keyword search, 
+          glossaries, and translation leveraging into updated projects.
+
+ Copyright (C) 2000-2006 Keith Godfrey and Maxym Mykhalchuk
+               2011 Didier Briel
+               Home page: http://www.omegat.org/
+               Support center: http://groups.yahoo.com/group/OmegaT/
+
+ 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ **************************************************************************/
+
+package org.omegat.filters3.xml.infix;
+
+import org.omegat.filters2.Instance;
+import org.omegat.filters3.xml.XMLFilter;
+import org.omegat.util.OStrings;
+
+/**
+ * Filter for Infix files.
+ * 
+ * @author Didier Briel
+ */
+public class InfixFilter extends XMLFilter {
+
+    /**
+     * Creates a new instance of Infix
+     */
+    public InfixFilter() {
+        super(new InfixDialect());
+    }
+
+    /**
+     * Human-readable name of the File Format this filter supports.
+     * 
+     * @return File format name
+     */
+    public String getFileFormatName() {
+        return OStrings.getString("INFIX_FILTER_NAME");
+    }
+
+    /**
+     * The default list of filter instances that this filter class has. One
+     * filter class may have different filter instances, different by source
+     * file mask, encoding of the source file etc.
+     * <p>
+     * Note that the user may change the instances freely.
+     * 
+     * @return Default filter instances
+     */
+    public Instance[] getDefaultInstances() {
+        return new Instance[] { new Instance("*.xml") };
+    }
+
+    /**
+     * Either the encoding can be read, or it is UTF-8.
+     * 
+     * @return <code>false</code>
+     */
+    public boolean isSourceEncodingVariable() {
+        return false;
+    }
+
+    /**
+     * Yes, Infix may be written out in a variety of encodings.
+     * 
+     * @return <code>true</code>
+     */
+    public boolean isTargetEncodingVariable() {
+        return true;
+    }
+}
diff --git a/src/org/omegat/filters3/xml/openxml/EditOpenXMLOptionsDialog.form b/src/org/omegat/filters3/xml/openxml/EditOpenXMLOptionsDialog.form
index 83b42cc..2214b9b 100644
--- a/src/org/omegat/filters3/xml/openxml/EditOpenXMLOptionsDialog.form
+++ b/src/org/omegat/filters3/xml/openxml/EditOpenXMLOptionsDialog.form
@@ -284,6 +284,16 @@
             <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="translateDrawingsCBradiosActionPerformed"/>
           </Events>
         </Component>
+        <Component class="javax.swing.JCheckBox" name="translateWordArtCB">
+          <Properties>
+            <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+              <ResourceString bundle="org/omegat/Bundle.properties" key="OpenXML_TRANSLATE_WORDART" replaceFormat="OStrings.getString("{key}")"/>
+            </Property>
+          </Properties>
+          <Events>
+            <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="translateWordArtCBradiosActionPerformed"/>
+          </Events>
+        </Component>
         <Component class="javax.swing.JLabel" name="jLabel1">
           <Properties>
             <Property name="text" type="java.lang.String" value="                                                                 "/>
@@ -307,6 +317,16 @@
             <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="aggregateTagsCBActionPerformed"/>
           </Events>
         </Component>
+        <Component class="javax.swing.JCheckBox" name="preserveSpacesCB">
+          <Properties>
+            <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+              <ResourceString bundle="org/omegat/Bundle.properties" key="OpenXML_PRESERVE_SPACES" replaceFormat="OStrings.getString("{key}")"/>
+            </Property>
+          </Properties>
+          <Events>
+            <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="preserveSpacesCBActionPerformed"/>
+          </Events>
+        </Component>
       </SubComponents>
     </Container>
   </SubComponents>
diff --git a/src/org/omegat/filters3/xml/openxml/EditOpenXMLOptionsDialog.java b/src/org/omegat/filters3/xml/openxml/EditOpenXMLOptionsDialog.java
index 5ac3abc..fbecd38 100644
--- a/src/org/omegat/filters3/xml/openxml/EditOpenXMLOptionsDialog.java
+++ b/src/org/omegat/filters3/xml/openxml/EditOpenXMLOptionsDialog.java
@@ -6,6 +6,7 @@
  Copyright (C) 2000-2006 Keith Godfrey and Maxym Mykhalchuk
                2007-2010 Didier Briel
                2010 Antonio Vilei
+               2011 Didier Briel
                Home page: http://www.omegat.org/
                Support center: http://groups.yahoo.com/group/OmegaT/
 
@@ -71,7 +72,9 @@ public class EditOpenXMLOptionsDialog extends javax.swing.JDialog {
         translateSlideLayoutsCB.setSelected(options.getTranslateSlideLayouts());
         translateChartsCB.setSelected(options.getTranslateCharts());
         translateDrawingsCB.setSelected(options.getTranslateDrawings());
+        translateWordArtCB.setSelected(options.getTranslateWordArt());
         aggregateTagsCB.setSelected(options.getAggregateTags());
+        preserveSpacesCB.setSelected(options.getSpacePreserving());
 
         // Handle escape key to close the window
         KeyStroke escape = KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0, false);
@@ -131,9 +134,11 @@ public class EditOpenXMLOptionsDialog extends javax.swing.JDialog {
         translateChartsCB = new javax.swing.JCheckBox();
         translateDiagramsCB = new javax.swing.JCheckBox();
         translateDrawingsCB = new javax.swing.JCheckBox();
+        translateWordArtCB = new javax.swing.JCheckBox();
         jLabel1 = new javax.swing.JLabel();
         jLabel6 = new javax.swing.JLabel();
         aggregateTagsCB = new javax.swing.JCheckBox();
+        preserveSpacesCB = new javax.swing.JCheckBox();
 
         setTitle(OStrings.getString("OpenXML_FILTER_OPTIONS")); // NOI18N
         setCursor(new java.awt.Cursor(java.awt.Cursor.DEFAULT_CURSOR));
@@ -296,6 +301,14 @@ public class EditOpenXMLOptionsDialog extends javax.swing.JDialog {
         });
         jPanel1.add(translateDrawingsCB);
 
+        org.openide.awt.Mnemonics.setLocalizedText(translateWordArtCB, OStrings.getString("OpenXML_TRANSLATE_WORDART")); // NOI18N
+        translateWordArtCB.addActionListener(new java.awt.event.ActionListener() {
+            public void actionPerformed(java.awt.event.ActionEvent evt) {
+                translateWordArtCBradiosActionPerformed(evt);
+            }
+        });
+        jPanel1.add(translateWordArtCB);
+
         org.openide.awt.Mnemonics.setLocalizedText(jLabel1, "                                                                 ");
         jLabel1.setEnabled(false);
         jPanel1.add(jLabel1);
@@ -311,6 +324,14 @@ public class EditOpenXMLOptionsDialog extends javax.swing.JDialog {
         });
         jPanel1.add(aggregateTagsCB);
 
+        org.openide.awt.Mnemonics.setLocalizedText(preserveSpacesCB, OStrings.getString("OpenXML_PRESERVE_SPACES")); // NOI18N
+        preserveSpacesCB.addActionListener(new java.awt.event.ActionListener() {
+            public void actionPerformed(java.awt.event.ActionEvent evt) {
+                preserveSpacesCBActionPerformed(evt);
+            }
+        });
+        jPanel1.add(preserveSpacesCB);
+
         getContentPane().add(jPanel1, java.awt.BorderLayout.CENTER);
 
         pack();
@@ -319,6 +340,14 @@ public class EditOpenXMLOptionsDialog extends javax.swing.JDialog {
         setLocation((screenSize.width-dialogSize.width)/2,(screenSize.height-dialogSize.height)/2);
     }// </editor-fold>//GEN-END:initComponents
 
+    private void preserveSpacesCBActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_preserveSpacesCBActionPerformed
+        // TODO add your handling code here:
+    }//GEN-LAST:event_preserveSpacesCBActionPerformed
+
+    private void translateWordArtCBradiosActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_translateWordArtCBradiosActionPerformed
+        // TODO add your handling code here:
+    }//GEN-LAST:event_translateWordArtCBradiosActionPerformed
+
     private void translateExcelCommentsCBradiosActionPerformed(java.awt.event.ActionEvent evt) {// GEN-FIRST:event_translateExcelCommentsCBradiosActionPerformed
     // TODO add your handling code here:
     }// GEN-LAST:event_translateExcelCommentsCBradiosActionPerformed
@@ -366,7 +395,9 @@ public class EditOpenXMLOptionsDialog extends javax.swing.JDialog {
         options.setTranslateSlideLayouts(translateSlideLayoutsCB.isSelected());
         options.setTranslateCharts(translateChartsCB.isSelected());
         options.setTranslateDrawings(translateDrawingsCB.isSelected());
+        options.setTranslateWordArt(translateWordArtCB.isSelected());
         options.setAggregateTags(aggregateTagsCB.isSelected());
+        options.setSpacePreserving(preserveSpacesCB.isSelected());
         doClose(RET_OK);
     }// GEN-LAST:event_okButtonActionPerformed
 
@@ -418,6 +449,7 @@ public class EditOpenXMLOptionsDialog extends javax.swing.JDialog {
     private javax.swing.JPanel jPanel1;
     private javax.swing.JPanel jPanel2;
     private javax.swing.JButton okButton;
+    private javax.swing.JCheckBox preserveSpacesCB;
     private javax.swing.JCheckBox translateChartsCB;
     private javax.swing.JCheckBox translateCommentsCB;
     private javax.swing.JCheckBox translateDiagramsCB;
@@ -432,5 +464,6 @@ public class EditOpenXMLOptionsDialog extends javax.swing.JDialog {
     private javax.swing.JCheckBox translateSlideCommentsCB;
     private javax.swing.JCheckBox translateSlideLayoutsCB;
     private javax.swing.JCheckBox translateSlideMastersCB;
+    private javax.swing.JCheckBox translateWordArtCB;
     // End of variables declaration//GEN-END:variables
 }
diff --git a/src/org/omegat/filters3/xml/openxml/OpenXMLDialect.java b/src/org/omegat/filters3/xml/openxml/OpenXMLDialect.java
index 9fe9c70..1089b72 100644
--- a/src/org/omegat/filters3/xml/openxml/OpenXMLDialect.java
+++ b/src/org/omegat/filters3/xml/openxml/OpenXMLDialect.java
@@ -6,6 +6,7 @@
  Copyright (C) 2000-2006 Keith Godfrey and Maxym Mykhalchuk
                2007-2010 Didier Briel
                2010 Antonio Vilei
+               2011 Didier Briel
                Home page: http://www.omegat.org/
                Support center: http://groups.yahoo.com/group/OmegaT/
 
@@ -68,6 +69,10 @@ public class OpenXMLDialect extends DefaultXMLDialect {
 
         defineTranslatableTagAttribute("sheet", "name"); // Excel
 
+        if (options.getTranslateWordArt()) {
+            defineTranslatableTagAttribute("v:textpath", "string"); // WordArt
+        }
+
         boolean aggregationEnabled = options.getAggregateTags();
         /*
          * The current OpenXML filter finds too many tags, usually causing what
@@ -76,5 +81,8 @@ public class OpenXMLDialect extends DefaultXMLDialect {
          * only as a temporary hack, until we improve the OpenXML filter.
          */
         setTagsAggregationEnabled(aggregationEnabled);
+
+        // If defined in the options, set space preserving for all tags
+        setForceSpacePreserving(options.getSpacePreserving());
     }
 }
diff --git a/src/org/omegat/filters3/xml/openxml/OpenXMLOptions.java b/src/org/omegat/filters3/xml/openxml/OpenXMLOptions.java
index 6cf4a89..a208d66 100644
--- a/src/org/omegat/filters3/xml/openxml/OpenXMLOptions.java
+++ b/src/org/omegat/filters3/xml/openxml/OpenXMLOptions.java
@@ -5,6 +5,7 @@
 
  Copyright (C) 2007-2010 Didier Briel
                2010 Antonio Vilei
+               2011 Didier Briel
                Home page: http://www.omegat.org/
                Support center: http://groups.yahoo.com/group/OmegaT/
 
@@ -50,10 +51,12 @@ import org.omegat.filters2.AbstractOptions;
  * <li>[] Charts (Global)
  * <li>[] Diagrams (Global)
  * <li>[] Drawings (Global)
+ * <li>[] WordArt (Global)
  * </ul>
  * Other options:
  * <ul>
  * <li>[+] Tags Aggregation
+ * <li>[+] Preserve space for all tags
  * </ul>
  * 
  * @author Didier Briel, Antonio Vilei
@@ -73,7 +76,9 @@ public class OpenXMLOptions extends AbstractOptions {
     private static final String OPTION_TRANSLATE_SLIDE_LAYOUTS = "translateSlideLayouts";
     private static final String OPTION_TRANSLATE_CHARTS = "translateCharts";
     private static final String OPTION_TRANSLATE_DRAWINGS = "translateDrawings";
+    private static final String OPTION_TRANSLATE_WORDART = "translateWordArt";
     private static final String OPTION_AGGREGATE_TAGS = "aggregateTags";
+    private static final String OPTION_PRESERVE_SPACES = "preserveSpaces";
 
     public OpenXMLOptions(Map<String, String> options) {
         super(options);
@@ -276,6 +281,20 @@ public class OpenXMLOptions extends AbstractOptions {
     }
 
     /**
+     * Returns whether Word art should be translated.
+     */
+    public boolean getTranslateWordArt() {
+        return getBoolean(OPTION_TRANSLATE_WORDART, false);
+    }
+
+    /**
+     * Sets whether Word art should be translated.
+     */
+    public void setTranslateWordArt(boolean translateWordArt) {
+        setBoolean(OPTION_TRANSLATE_WORDART, translateWordArt);
+    }
+
+    /**
      * Returns whether OpenXML tags should be aggregated.
      */
     public boolean getAggregateTags() {
@@ -289,4 +308,19 @@ public class OpenXMLOptions extends AbstractOptions {
         setBoolean(OPTION_AGGREGATE_TAGS, aggregateTags);
     }
 
+    /**
+     * Returns whether spaces should be preserved for all tags
+     * @return the state of OPTION_PRESERVE_SPACES
+     */
+    public boolean getSpacePreserving() {
+        return getBoolean(OPTION_PRESERVE_SPACES, true);
+    }
+
+    /**
+     * Sets whether spaces should be preserved for all tags
+     * @param onOff The option for space preserving
+     */
+    public void setSpacePreserving(boolean onOff) {
+        setBoolean(OPTION_PRESERVE_SPACES, onOff);
+    }
 }
diff --git a/src/org/omegat/filters3/xml/xliff/XLIFFFilter.java b/src/org/omegat/filters3/xml/xliff/XLIFFFilter.java
index bb924ed..b0675b1 100644
--- a/src/org/omegat/filters3/xml/xliff/XLIFFFilter.java
+++ b/src/org/omegat/filters3/xml/xliff/XLIFFFilter.java
@@ -4,7 +4,7 @@
           glossaries, and translation leveraging into updated projects.
 
  Copyright (C) 2000-2006 Keith Godfrey and Maxym Mykhalchuk
-               2007-2010 Didier Briel
+               2007-2011 Didier Briel
                Home page: http://www.omegat.org/
                Support center: http://groups.yahoo.com/group/OmegaT/
 
@@ -62,7 +62,9 @@ public class XLIFFFilter extends XMLFilter {
      * @return Default filter instances
      */
     public Instance[] getDefaultInstances() {
-        return new Instance[] { new Instance("*.xlf", null, null), new Instance("*.sdlxliff", null, null), };
+        return new Instance[] { new Instance("*.xlf", null, null), 
+                                new Instance("*.xliff", null, null),
+                                new Instance("*.sdlxliff", null, null), };
     }
 
     /**
diff --git a/src/org/omegat/gui/dialogs/WorkflowOptionsDialog.form b/src/org/omegat/gui/dialogs/WorkflowOptionsDialog.form
index ac4d3a1..31da384 100644
--- a/src/org/omegat/gui/dialogs/WorkflowOptionsDialog.form
+++ b/src/org/omegat/gui/dialogs/WorkflowOptionsDialog.form
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?xml version="1.1" encoding="UTF-8" ?>
 
 <Form version="1.2" maxVersion="1.2" type="org.netbeans.modules.form.forminfo.JDialogFormInfo">
   <NonVisualComponents>
diff --git a/src/org/omegat/gui/dialogs/WorkflowOptionsDialog.java b/src/org/omegat/gui/dialogs/WorkflowOptionsDialog.java
index 4b8b25e..bc55088 100644
--- a/src/org/omegat/gui/dialogs/WorkflowOptionsDialog.java
+++ b/src/org/omegat/gui/dialogs/WorkflowOptionsDialog.java
@@ -5,6 +5,7 @@
 
  Copyright (C) 2000-2006 Keith Godfrey and Maxym Mykhalchuk
                2009 Didier Briel
+               2011 John Moran
                Home page: http://www.omegat.org/
                Support center: http://groups.yahoo.com/group/OmegaT/
 
@@ -43,6 +44,7 @@ import org.omegat.util.Preferences;
  * 
  * @author Maxym Mykhalchuk
  * @author Didier Briel
+ * @author John Moran
  */
 public class WorkflowOptionsDialog extends JDialog {
     /** A return status code - returned if Cancel button has been pressed */
@@ -81,8 +83,12 @@ public class WorkflowOptionsDialog extends JDialog {
                         Preferences.BEST_MATCH_MINIMAL_SIMILARITY_DEFAULT)));
         similaritySpinner.setEnabled(insertFuzzyCheckBox.isSelected());
         prefixLabel.setEnabled(insertFuzzyCheckBox.isSelected());
-        prefixText.setText(Preferences.getPreferenceDefault(Preferences.BEST_MATCH_EXPLANATORY_TEXT,
-                OStrings.getString("WF_DEFAULT_PREFIX")));
+        if (!Preferences.existsPreference(Preferences.BEST_MATCH_EXPLANATORY_TEXT)) {
+            prefixText.setText(OStrings.getString("WF_DEFAULT_PREFIX"));
+        } else {
+            prefixText.setText(Preferences.getPreferenceDefaultAllowEmptyString(
+                                         Preferences.BEST_MATCH_EXPLANATORY_TEXT));
+        }
         prefixText.setEnabled(insertFuzzyCheckBox.isSelected());
 
         allowTranslationEqualToSource.setSelected(Preferences
diff --git a/src/org/omegat/gui/editor/mark/EntryMarks.java b/src/org/omegat/gui/editor/mark/EntryMarks.java
index dcfb275..f060bac 100644
--- a/src/org/omegat/gui/editor/mark/EntryMarks.java
+++ b/src/org/omegat/gui/editor/mark/EntryMarks.java
@@ -47,7 +47,7 @@ public class EntryMarks {
         this.builder = builder;
         this.entryVersion = entryVersion;
         this.isActive = builder.isActive();
-        this.sourceText = builder.getSourceText();
+        this.sourceText = builder.getSourceTextEntry().getSrcText();
         this.translationText = builder.getTranslationText();
     }
 }
diff --git a/src/org/omegat/gui/glossary/TransTips.java b/src/org/omegat/gui/glossary/TransTips.java
index adf5c19..1bf3609 100644
--- a/src/org/omegat/gui/glossary/TransTips.java
+++ b/src/org/omegat/gui/glossary/TransTips.java
@@ -4,6 +4,7 @@
           glossaries, and translation leveraging into updated projects.
 
  Copyright (C) 2010 Wildrich Fourie, Alex Buloichik, Didier Briel
+               2011 Didier Briel
                Home page: http://www.omegat.org/
                Support center: http://groups.yahoo.com/group/OmegaT/
 
@@ -90,12 +91,17 @@ public class TransTips {
             return;
         }
 
-        // Search for the word.
-        // Since we're comparing with lower case,
-        // the source text has to be in lower case too.
-        String content = sourceText.toLowerCase();
+        String content = sourceText;
+
+        if (!word.equals(word.toUpperCase())) { // The glossary word is not in full uppercase
+            // We're comparing with lower case,
+            // and the source text has to be in lower case too.
+            content = sourceText.toLowerCase();
+            word = word.toLowerCase();
+        } // Otherwise, if the glossary word is in full uppercase,
+          // we only apply transtips to source words that are in full uppercase too
+
 
-        word = word.toLowerCase();
         int lastIndex = 0;
         int wordSize = word.length();
 
diff --git a/src/org/omegat/gui/glossary/TransTipsPopup.java b/src/org/omegat/gui/glossary/TransTipsPopup.java
index 7bab945..46a59ff 100644
--- a/src/org/omegat/gui/glossary/TransTipsPopup.java
+++ b/src/org/omegat/gui/glossary/TransTipsPopup.java
@@ -4,6 +4,7 @@
           glossaries, and translation leveraging into updated projects.
 
  Copyright (C) 2010 Wildrich Fourie, Alex Buloichik
+               2011 Didier Briel
                Home page: http://www.omegat.org/
                Support center: http://groups.yahoo.com/group/OmegaT/
 
@@ -26,6 +27,8 @@ package org.omegat.gui.glossary;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+import java.util.ArrayList;
+import java.util.List;
 
 import javax.swing.JMenuItem;
 import javax.swing.JPopupMenu;
@@ -41,6 +44,7 @@ import org.omegat.util.Preferences;
  * 
  * @author W. Fourie
  * @author Alex Buloichik (alex73mail at gmail.com)
+ * @author Didier Briel
  */
 public class TransTipsPopup implements IPopupMenuConstructor {
     public void addItems(final JPopupMenu menu, JTextComponent comp, final int mousepos,
@@ -66,7 +70,7 @@ public class TransTipsPopup implements IPopupMenuConstructor {
                 // is inside found word ?
                 if (startSource + start <= mousepos && mousepos <= startSource + end) {
                     // Split the terms and remove the leading space.
-                    String[] locs = ge.getLocText().split(",");
+                    String[] locs = parseLine(ge.getLocText());
                     for (int l = 1; l < locs.length; l++) {
                         locs[l] = locs[l].trim();
                     }
@@ -88,4 +92,51 @@ public class TransTipsPopup implements IPopupMenuConstructor {
             TransTips.search(sb.getSourceText(), ge, callback);
         }
     }
+
+    /**
+     * Separator for glossary entries
+     */
+    protected static final char SEPARATOR = ',';
+
+    /**
+     * Parse the glossary entries
+     * @param line A line containing the multiple terms
+     * @return An array with the multiple terms
+     */
+    private static String[] parseLine(String line) {
+        List<String> result = new ArrayList<String>();
+        StringBuilder term = new StringBuilder();
+        boolean fopened = false; // Field opened by "
+        for (int i = 0; i < line.length(); i++) {
+            char c = line.charAt(i);
+            switch (c) {
+            case '"':
+                if (term.toString().trim().length() == 0 && !fopened) {
+                    // First " in field
+                    fopened = true;
+                } else if (fopened) {
+                    // Last " in field
+                    fopened = false;
+                } else {
+                    term.append(c);
+                }
+                break;
+            case SEPARATOR:
+                if (fopened) {
+                    term.append(c);
+                } else {
+                    result.add(term.toString());
+                    term.setLength(0);
+                }
+                break;
+            default:
+                term.append(c);
+                break;
+            }
+        }
+        result.add(term.toString());
+        return result.toArray(new String[result.size()]);
+    }
+
+
 }
diff --git a/src/org/omegat/gui/matches/MatchesTextArea.java b/src/org/omegat/gui/matches/MatchesTextArea.java
index 31b58d2..f8b3e0d 100644
--- a/src/org/omegat/gui/matches/MatchesTextArea.java
+++ b/src/org/omegat/gui/matches/MatchesTextArea.java
@@ -5,6 +5,7 @@
 
  Copyright (C) 2000-2006 Keith Godfrey and Maxym Mykhalchuk
                2007 Zoltan Bartko
+               2011 John Moran
                Home page: http://www.omegat.org/
                Support center: http://groups.yahoo.com/group/OmegaT/
 
@@ -61,6 +62,7 @@ import org.omegat.util.gui.UIThreadsUtil;
  * @author Keith Godfrey
  * @author Maxym Mykhalchuk
  * @author Zoltan Bartko
+ * @author John Moran
  */
 public class MatchesTextArea extends EntryInfoPane<List<NearString>> implements IMatcher {
 
@@ -180,9 +182,17 @@ public class MatchesTextArea extends EntryInfoPane<List<NearString>> implements
             // </HP-experiment>
             NearString thebest = matches.get(0);
             if (thebest.score >= percentage) {
-                String translation = Preferences.getPreferenceDefault(
-                        Preferences.BEST_MATCH_EXPLANATORY_TEXT, OStrings.getString("WF_DEFAULT_PREFIX"))
-                        + thebest.translation;
+            	String translation = null;
+
+		if (Preferences.getPreferenceDefaultAllowEmptyString(
+		        Preferences.BEST_MATCH_EXPLANATORY_TEXT).equals("")) {
+			translation = thebest.translation;
+                } else {
+                    translation = Preferences.getPreferenceDefault(
+			    Preferences.BEST_MATCH_EXPLANATORY_TEXT,
+			    OStrings.getString("WF_DEFAULT_PREFIX"))
+			    + thebest.translation;
+		}
                 SourceTextEntry currentEntry = Core.getEditor().getCurrentEntry();
                 TransEntry te = Core.getProject().getTranslation(currentEntry);
                 if (te == null) {
diff --git a/src/org/omegat/util/Language.java b/src/org/omegat/util/Language.java
index 9e0d340..326a49d 100644
--- a/src/org/omegat/util/Language.java
+++ b/src/org/omegat/util/Language.java
@@ -125,6 +125,8 @@ public class Language {
         else { 
             // Patch Java locale, to return correct locales instead of obsolete codes
             String returnString = locale.toString();
+            if (returnString.length()<2)
+                return returnString; // We cannot test a locale of less than 2 characters
             if (returnString.substring(0, 2).equalsIgnoreCase("in")) {
                 returnString = "id" + returnString.substring(2);
             } else if (returnString.substring(0, 2).equalsIgnoreCase("iw")) {
diff --git a/src/org/omegat/util/Preferences.java b/src/org/omegat/util/Preferences.java
index 1d85bed..68cf7e2 100644
--- a/src/org/omegat/util/Preferences.java
+++ b/src/org/omegat/util/Preferences.java
@@ -7,6 +7,7 @@
                2007 Zoltan Bartko
                2008-2009 Didier Briel
                2010 Wildrich Fourie, Antonio Vilei, Didier Briel
+               2011 John Moran
                Home page: http://www.omegat.org/
                Support center: http://groups.yahoo.com/group/OmegaT/
 
@@ -53,6 +54,7 @@ import org.omegat.util.xml.XMLStreamReader;
  * @author Didier Briel
  * @author Wildrich Fourie
  * @author Antonio Vilei
+ * @author John Moran
  */
 public class Preferences {
     /** OmegaT-wide Preferences Filename */
@@ -250,6 +252,30 @@ public class Preferences {
         }
         return v;
     }
+    
+	/**
+	 * Returns true if the preference is in OmegaT's preferences
+	 * file.
+	 * <p>
+	 * If the key is not found return false
+	 * 
+	 * @param key
+	 *            key of the key to look up, usually OConsts.PREF_...
+	 * @return true if preferences exists
+	 */
+	public static boolean existsPreference(String key) {
+		boolean exists = false;
+		if (key == null)
+			exists = false;
+		if (!m_loaded)
+			doLoad();
+		Integer i = m_preferenceMap.get(key);
+		if (i != null) {
+			exists = true;
+		}		
+		return exists;
+	}
+    
 
     /**
      * Returns the boolean defaultValue of some preference.
@@ -286,6 +312,19 @@ public class Preferences {
         }
         return val;
     }
+    
+    /**
+     * Returns the value of some preference out of OmegaT's preferences file, if
+     * it exists.
+     * <p>
+     * @param key
+     *            name of the key to look up, usually OConsts.PREF_...
+     * @return preference value as a string
+     */
+    public static String getPreferenceDefaultAllowEmptyString(String key) {
+        String val = getPreference(key);
+        return val;
+    }
 
     /**
      * Returns the integer value of some preference out of OmegaT's preferences
@@ -414,12 +453,13 @@ public class Preferences {
 
                 pref = blk.getTagName();
                 blk = lst.get(++i);
-                if (blk.isTag()) {
-                    // parse error - keep trying
-                    continue;
-                }
-                val = blk.getText();
-                if (pref != null && !pref.equals("") && val != null) {
+		if (blk.isClose()) {
+		    //allow empty string as a preference value
+                    val = "";
+		} else {
+                    val = blk.getText();
+		}
+                if (pref != null && val != null) {
                     // valid match - record these
                     m_preferenceMap.put(pref, m_valList.size());
                     m_nameList.add(pref);
@@ -462,8 +502,6 @@ public class Preferences {
         for (int i = 0; i < m_nameList.size(); i++) {
             String name = m_nameList.get(i);
             String val = StaticUtils.makeValidXML(m_valList.get(i));
-            if (val.equals(""))
-                continue; // don't write blank preferences
             out.write("    <" + name + ">");
             out.write(val);
             out.write("</" + name + ">\n");
diff --git a/test/src/org/omegat/gui/main/MainWindowMenuTest.java b/test/src/org/omegat/gui/main/MainWindowMenuTest.java
index b583788..b3d31be 100644
--- a/test/src/org/omegat/gui/main/MainWindowMenuTest.java
+++ b/test/src/org/omegat/gui/main/MainWindowMenuTest.java
@@ -64,8 +64,6 @@ public class MainWindowMenuTest extends TestCore {
                 Method m = MainWindowMenuHandler.class.getMethod(actionMethodName);
                 assertNotNull("Action method not defined for " + f.getName(), m);
                 assertNotNull(existsMethods.remove(actionMethodName));
-            } else {
-                System.out.println("Action not need for " + f);
             }
         }
         assertTrue("menu items not found", count > 30);


hooks/post-receive
-- 
omegat packaging



More information about the pkg-java-commits mailing list