Menu
▾
▴
[Omegat-git-changes] [SCM] omegat branch release-2-5 created. b853ef0ab92e43339fa81e9ee6f7449998668442
|
From: Alex B. <al...@us...> - 2012-08-27 02:58:35
|
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".
The branch, release-2-5 has been created
at b853ef0ab92e43339fa81e9ee6f7449998668442 (commit)
- Log -----------------------------------------------------------------
http://omegat.git.sourceforge.net/git/gitweb.cgi?p=omegat/omegat;a=commitdiff;h=b853ef0ab92e43339fa81e9ee6f7449998668442
commit b853ef0ab92e43339fa81e9ee6f7449998668442
Author: Alex Buloichik <ale...@gm...>
Date: Mon Aug 27 02:57:05 2012 +0000
Fix project-specific file filters config loading
git-svn-id: https://omegat.svn.sourceforge.net/svnroot/omegat/branches/release-2-5@4587 b0d8beef-cb45-0410-a8e4-c0d495c3b779
diff --git a/src/org/omegat/core/data/RealProject.java b/src/org/omegat/core/data/RealProject.java
index 133a65a..5c950f1 100644
--- a/src/org/omegat/core/data/RealProject.java
+++ b/src/org/omegat/core/data/RealProject.java
@@ -218,7 +218,7 @@ public class RealProject implements IProject {
// set project specific file filters if they exist
Filters filterMasterConfig = FilterMaster.loadConfig(m_config.getProjectInternal());
- if (filterMasterConfig != null) {
+ if (filterMasterConfig == null) {
filterMasterConfig = FilterMaster.loadConfig(StaticUtils.getConfigDir());
}
if (filterMasterConfig == null) {
http://omegat.git.sourceforge.net/git/gitweb.cgi?p=omegat/omegat;a=commitdiff;h=df35817cdac71060525628665c8063b36cb4fad2
commit df35817cdac71060525628665c8063b36cb4fad2
Author: Didier Briel <d....@fr...>
Date: Fri Aug 3 13:39:55 2012 +0000
Update documentation
git-svn-id: https://omegat.svn.sourceforge.net/svnroot/omegat/branches/release-2-5@4584 b0d8beef-cb45-0410-a8e4-c0d495c3b779
diff --git a/docs/en/chapter.instant.start.guide.html b/docs/en/chapter.instant.start.guide.html
index ba30893..0cea0dd 100644
--- a/docs/en/chapter.instant.start.guide.html
+++ b/docs/en/chapter.instant.start.guide.html
@@ -158,10 +158,7 @@
<p>If a file does not loads into the Editor pane, then it could be
that your source file is in a format that doesn't work in OmegaT. See
Chapter 7: File Filters in the User Manual for a list of file formats
- that OmegaT can handle. If a file does not loads into the Editor pane,
- then it could be that your source file is in a format that doesn't
- work in OmegaT. See Chapter 7: File Filters in the User Manual for a
- list of file formats that OmegaT can handle.
+ that OmegaT can handle.
</p>
</li>
</ul>
diff --git a/docs/en/index.html b/docs/en/index.html
index 26b52ad..41e7e96 100644
--- a/docs/en/index.html
+++ b/docs/en/index.html
@@ -36,7 +36,7 @@
</div>
</div>
<div>
- <p class="pubdate">07/21/2012</p>
+ <p class="pubdate">08/03/2012</p>
</div>
<div>
<div class="abstract" title="Abstract">
diff --git a/docs/en/instantStartGuideNoTOC.html b/docs/en/instantStartGuideNoTOC.html
index 25a922c..04caa2c 100644
--- a/docs/en/instantStartGuideNoTOC.html
+++ b/docs/en/instantStartGuideNoTOC.html
@@ -131,10 +131,7 @@
<p>If a file does not loads into the Editor pane, then it could be
that your source file is in a format that doesn't work in OmegaT. See
Chapter 7: File Filters in the User Manual for a list of file formats
- that OmegaT can handle. If a file does not loads into the Editor pane,
- then it could be that your source file is in a format that doesn't
- work in OmegaT. See Chapter 7: File Filters in the User Manual for a
- list of file formats that OmegaT can handle.
+ that OmegaT can handle.
</p>
</li>
</ul>
http://omegat.git.sourceforge.net/git/gitweb.cgi?p=omegat/omegat;a=commitdiff;h=626d17a40aaa1cbb8d8326efc6eaf1d965e549f5
commit 626d17a40aaa1cbb8d8326efc6eaf1d965e549f5
Author: Didier Briel <d....@fr...>
Date: Fri Aug 3 13:13:58 2012 +0000
Remove #3542912 Update JRE to 1.7
git-svn-id: https://omegat.svn.sourceforge.net/svnroot/omegat/branches/release-2-5@4582 b0d8beef-cb45-0410-a8e4-c0d495c3b779
diff --git a/release/changes.txt b/release/changes.txt
index 3e9973e..f0329f3 100644
--- a/release/changes.txt
+++ b/release/changes.txt
@@ -1,18 +1,12 @@
----------------------------------------------------------------------
OmegaT 2.5.5 update 1
----------------------------------------------------------------------
- 1 Enhancement
+ 0 Enhancement
2 Bug fixes
1 Localisation update
----------------------------------------------------------------------
2.5.5 update 1 vs. 2.5.5
- Implemented requests:
-
- - Update JRE to 1.7
- (full support for Khmer script rendering)
- http://sourceforge.net/support/tracker.php?aid=3542912
-
Bug fixes:
- Project specific filter settings not saved
http://omegat.git.sourceforge.net/git/gitweb.cgi?p=omegat/omegat;a=commitdiff;h=c599b83c2d66d311bbad902e0756d07e3d6b0201
commit c599b83c2d66d311bbad902e0756d07e3d6b0201
Author: Didier Briel <d....@fr...>
Date: Thu Aug 2 15:39:17 2012 +0000
Missing character
git-svn-id: https://omegat.svn.sourceforge.net/svnroot/omegat/branches/release-2-5@4579 b0d8beef-cb45-0410-a8e4-c0d495c3b779
diff --git a/release/changes.txt b/release/changes.txt
index 3350266..3e9973e 100644
--- a/release/changes.txt
+++ b/release/changes.txt
@@ -18,7 +18,7 @@
- Project specific filter settings not saved
http://sourceforge.net/support/tracker.php?aid=3546645
- PowerPoint documents (.pptx and .pptm) could not be opened with Java 1.7
+ - PowerPoint documents (.pptx and .pptm) could not be opened with Java 1.7
Localisation updates:
http://omegat.git.sourceforge.net/git/gitweb.cgi?p=omegat/omegat;a=commitdiff;h=691a61ec39f368000eb9ee7a366273cae644e0d3
commit 691a61ec39f368000eb9ee7a366273cae644e0d3
Author: Didier Briel <d....@fr...>
Date: Thu Aug 2 15:35:17 2012 +0000
#3546645 Project specific filter settings not saved
git-svn-id: https://omegat.svn.sourceforge.net/svnroot/omegat/branches/release-2-5@4576 b0d8beef-cb45-0410-a8e4-c0d495c3b779
diff --git a/release/changes.txt b/release/changes.txt
index 26fc14e..3350266 100644
--- a/release/changes.txt
+++ b/release/changes.txt
@@ -2,7 +2,7 @@
OmegaT 2.5.5 update 1
----------------------------------------------------------------------
1 Enhancement
- 1 Bug fix
+ 2 Bug fixes
1 Localisation update
----------------------------------------------------------------------
2.5.5 update 1 vs. 2.5.5
@@ -15,6 +15,9 @@
Bug fixes:
+ - Project specific filter settings not saved
+ http://sourceforge.net/support/tracker.php?aid=3546645
+
PowerPoint documents (.pptx and .pptm) could not be opened with Java 1.7
Localisation updates:
http://omegat.git.sourceforge.net/git/gitweb.cgi?p=omegat/omegat;a=commitdiff;h=d68a067cda5225d64fc14213a05b0b5caa10e9b0
commit d68a067cda5225d64fc14213a05b0b5caa10e9b0
Author: Alex Buloichik <ale...@gm...>
Date: Thu Aug 2 08:57:48 2012 +0000
Fix project-dependent filters settings handling
git-svn-id: https://omegat.svn.sourceforge.net/svnroot/omegat/branches/release-2-5@4574 b0d8beef-cb45-0410-a8e4-c0d495c3b779
diff --git a/src/org/omegat/core/Core.java b/src/org/omegat/core/Core.java
index fce653d..5c1c938 100644
--- a/src/org/omegat/core/Core.java
+++ b/src/org/omegat/core/Core.java
@@ -35,6 +35,7 @@ import org.omegat.core.spellchecker.ISpellChecker;
import org.omegat.core.spellchecker.SpellChecker;
import org.omegat.core.threads.IAutoSave;
import org.omegat.core.threads.SaveThread;
+import org.omegat.filters2.master.FilterMaster;
import org.omegat.gui.comments.CommentsTextArea;
import org.omegat.gui.dictionaries.DictionariesTextArea;
import org.omegat.gui.editor.EditorController;
@@ -74,6 +75,7 @@ public class Core {
private static ITagValidation tagValidation;
private static IMatcher matcher;
private static ISpellChecker spellChecker;
+ private static FilterMaster filterMaster;
private static IAutoSave saveThread;
@@ -126,6 +128,14 @@ public class Core {
return spellChecker;
}
+ public static FilterMaster getFilterMaster() {
+ return filterMaster;
+ }
+
+ public static void setFilterMaster(FilterMaster newFilterMaster) {
+ filterMaster = newFilterMaster;
+ }
+
public static MachineTranslateTextArea getMachineTranslatePane() {
return machineTranslatePane;
}
diff --git a/src/org/omegat/core/data/IProject.java b/src/org/omegat/core/data/IProject.java
index 3681f8a..d8a00f0 100644
--- a/src/org/omegat/core/data/IProject.java
+++ b/src/org/omegat/core/data/IProject.java
@@ -175,14 +175,4 @@ public interface IProject {
public interface MultipleTranslationsIterator {
void iterate(EntryKey source, TMXEntry trans);
}
-
- /**
- * Returns the project specific FilterMaster, if it exists.
- */
- public FilterMaster getFilterMaster();
-
- /**
- * Sets new file filter configuration for the project
- */
- public void setConfig(Filters filters);
}
diff --git a/src/org/omegat/core/data/NotLoadedProject.java b/src/org/omegat/core/data/NotLoadedProject.java
index 4ba72cc..9e42397 100644
--- a/src/org/omegat/core/data/NotLoadedProject.java
+++ b/src/org/omegat/core/data/NotLoadedProject.java
@@ -122,12 +122,4 @@ public class NotLoadedProject implements IProject {
public void findNonUniqueSegments() {
}
-
- public FilterMaster getFilterMaster() {
- return null;
- }
-
- public void setConfig(Filters filters) {
-
- }
}
diff --git a/src/org/omegat/core/data/RealProject.java b/src/org/omegat/core/data/RealProject.java
index c41cab1..133a65a 100644
--- a/src/org/omegat/core/data/RealProject.java
+++ b/src/org/omegat/core/data/RealProject.java
@@ -56,7 +56,6 @@ import org.omegat.core.CoreEvents;
import org.omegat.core.events.IProjectEventListener;
import org.omegat.core.matching.ITokenizer;
import org.omegat.core.matching.Tokenizer;
-import org.omegat.core.segmentation.SRX;
import org.omegat.core.segmentation.Segmenter;
import org.omegat.core.statistics.CalcStandardStatistics;
import org.omegat.core.statistics.Statistics;
@@ -114,14 +113,6 @@ public class RealProject implements IProject {
private final ITokenizer sourceTokenizer, targetTokenizer;
private DirectoryMonitor tmMonitor;
- /**
- * If project uses project-specific file filters, the filterMaster is set, containing the file filter settings
- */
- private FilterMaster filterMaster;
- /**
- * If project uses project-specific segmentation rules, the srx is set;
- */
- private SRX srx;
/**
* Storage for all translation memories, which shouldn't be changed and saved, i.e. for /tm/*.tmx files,
@@ -226,9 +217,14 @@ public class RealProject implements IProject {
Set<EntryKey> existKeys = new HashSet<EntryKey>();
// set project specific file filters if they exist
- if (FilterMaster.projectConfigFileExists(m_config.getProjectInternal())) {
- this.filterMaster = FilterMaster.getProjectInstance(m_config.getProjectInternal());
+ Filters filterMasterConfig = FilterMaster.loadConfig(m_config.getProjectInternal());
+ if (filterMasterConfig != null) {
+ filterMasterConfig = FilterMaster.loadConfig(StaticUtils.getConfigDir());
+ }
+ if (filterMasterConfig == null) {
+ filterMasterConfig = FilterMaster.createDefaultFiltersConfig();
}
+ Core.setFilterMaster(new FilterMaster(filterMasterConfig));
// set project specific segmentation rules if they exist
Segmenter.srx = m_config.getProjectSRX();
@@ -294,7 +290,7 @@ public class RealProject implements IProject {
*/
public Map<String, TMXEntry> align(final ProjectProperties props, final File translatedDir)
throws Exception {
- FilterMaster fm = getActiveFilterMaster();
+ FilterMaster fm = Core.getFilterMaster();
List<String> srcFileList = new ArrayList<String>();
File root = new File(m_config.getSourceRoot());
@@ -426,7 +422,7 @@ public class RealProject implements IProject {
}
// build translated files
- FilterMaster fm = getActiveFilterMaster();
+ FilterMaster fm = Core.getFilterMaster();
fileList.clear();
StaticUtils.buildFileList(fileList, new File(srcRoot), true);
@@ -592,7 +588,7 @@ public class RealProject implements IProject {
private void loadSourceFiles(final Set<String> existSource, final Set<EntryKey> existKeys)
throws IOException, InterruptedIOException, TranslationException {
long st = System.currentTimeMillis();
- FilterMaster fm = getActiveFilterMaster();
+ FilterMaster fm = Core.getFilterMaster();
List<String> srcFileList = new ArrayList<String>();
File root = new File(m_config.getSourceRoot());
@@ -1099,49 +1095,4 @@ public class RealProject implements IProject {
return localCollator.compare(o1, o2);
}
}
-
- /**
- * returns project FilterMaster if it exists, else returns null (this means: not using project-specific
- * filters!)
- */
- public FilterMaster getFilterMaster() {
- return this.filterMaster;
- }
-
- /**
- * Sets the filter config to the project, or removes it. Creates or deletes config file if necessary and
- * (dis)associates FilterMaster to project. Use this to create project specific file filters.
- *
- * @param filters
- * the filters config. When null, project specific config is removed.
- */
- public void setConfig(Filters filters) {
- if (filters == null) {
- if (this.filterMaster != null) {
- this.filterMaster.deleteConfig();
- this.filterMaster = null;
- }
- return;
- }
- if (this.filterMaster == null) {
- this.filterMaster = FilterMaster.getProjectInstance(this.getProjectProperties()
- .getProjectInternal());
- }
- this.filterMaster.setConfig(filters);
- this.filterMaster.saveConfig();
- }
-
- /**
- * Returns the filtermaster to use: the projects filter master (if it is set), else the default
- * filtermaster
- *
- * @return the filtermaster to use
- */
- private FilterMaster getActiveFilterMaster() {
- // get project specific file filters if they exist, else get normal filters
- if (this.filterMaster == null) {
- return FilterMaster.getInstance();
- }
- return this.filterMaster;
- }
}
diff --git a/src/org/omegat/core/search/Searcher.java b/src/org/omegat/core/search/Searcher.java
index 24d40e8..9b5c49e 100644
--- a/src/org/omegat/core/search/Searcher.java
+++ b/src/org/omegat/core/search/Searcher.java
@@ -39,6 +39,7 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.regex.PatternSyntaxException;
+import org.omegat.core.Core;
import org.omegat.core.data.EntryKey;
import org.omegat.core.data.ExternalTMX;
import org.omegat.core.data.IProject;
@@ -350,10 +351,7 @@ public class Searcher {
m_searchDir += File.separator;
StaticUtils.buildFileList(fileList, new File(m_searchDir), m_searchRecursive);
- FilterMaster fm = m_project.getFilterMaster();
- if (fm == null) {
- fm = FilterMaster.getInstance();
- }
+ FilterMaster fm = Core.getFilterMaster();
SearchCallback searchCallback = new SearchCallback(m_project.getProjectProperties());
diff --git a/src/org/omegat/filters2/master/FilterMaster.java b/src/org/omegat/filters2/master/FilterMaster.java
index 4dd2d14..d2d3b52 100644
--- a/src/org/omegat/filters2/master/FilterMaster.java
+++ b/src/org/omegat/filters2/master/FilterMaster.java
@@ -48,7 +48,6 @@ import java.util.List;
import java.util.Map;
import java.util.TreeMap;
import java.util.regex.Pattern;
-import java.util.regex.Matcher;
import javax.swing.JOptionPane;
import javax.xml.bind.JAXBContext;
@@ -67,7 +66,6 @@ import org.omegat.util.LFileCopy;
import org.omegat.util.Language;
import org.omegat.util.Log;
import org.omegat.util.OStrings;
-import org.omegat.util.StaticUtils;
/**
* A master class that registers and handles all the filters. Singleton - there can be only one instance of
@@ -101,21 +99,17 @@ public class FilterMaster {
/** Currently file filters support version. */
public static String CURRENT_VERSION = "2.0";
- /** FilterMaster instance. */
- private static FilterMaster master = null;
-
- /** Config file. */
- private File configFile;
-
/** Filters config stored in XML file. */
- private Filters config;
+ private final Filters config;
/** Classes of all filters. */
- private List<Class<IFilter>> filtersClasses;
+ private static List<Class<IFilter>> filtersClasses;
static {
try {
CONFIG_CTX = JAXBContext.newInstance(Filters.class);
+ filtersClasses = new ArrayList<Class<IFilter>>();
+ filtersClasses.addAll((List)PluginUtils.getFilterClasses());
} catch (Exception ex) {
throw new ExceptionInInitializerError(ex);
}
@@ -124,22 +118,15 @@ public class FilterMaster {
/**
* Create a new FilterMaster.
*/
- private FilterMaster(File configFile) {
- filtersClasses = new ArrayList<Class<IFilter>>();
- filtersClasses.addAll((List)PluginUtils.getFilterClasses());
- this.configFile = configFile;
-
- loadConfig();
-
- addNewFiltersToConfig(config);
-
- saveConfig();
+ public FilterMaster(Filters config) {
+ this.config = config;
}
/**
* Adds new filters(which was not exist in config yet) into config.
*/
- private void addNewFiltersToConfig(final Filters conf) {
+ private static boolean addNewFiltersToConfig(final Filters conf) {
+ boolean result = false;
for (Class<IFilter> fclass : filtersClasses) {
boolean found = false;
for (Filter fc : conf.getFilter()) {
@@ -152,39 +139,10 @@ public class FilterMaster {
if (!found) {
// filter not found in config
conf.getFilter().add(getDefaultSettingsFromFilter(fclass.getName()));
+ result = true;
}
}
- }
-
- /**
- * Returns the FilterMaster for the non-project-specific file filters.
- *
- * @see IProject.getFilterMaster() for the project specific FilterMaster (if available)
- */
- public static FilterMaster getInstance() {
- if (master == null) {
- File configFile = new File(StaticUtils.getConfigDir() + FILE_FILTERS);
- master = new FilterMaster(configFile);
- }
- return master;
- }
- /**
- * Returns a instance of this class for storage of project specific settings.
- * A settings-file is generated if it does not exist yet.
- * @param configDir the directory for storage of the project settings file.
- */
- public static FilterMaster getProjectInstance(String configDir) {
- //
- File configFile = new File(configDir + FILE_FILTERS);
- return new FilterMaster(configFile);
- }
- /**
- * Does a config file already exists for the project at the given location?
- * @param configDir the directory where project settings file is stored
- */
- public static boolean projectConfigFileExists(String configDir) {
- File configFile = new File(configDir + FILE_FILTERS);
- return configFile.exists();
+ return result;
}
/**
@@ -194,7 +152,7 @@ public class FilterMaster {
* filter's class name
* @return filter instance
*/
- public IFilter getFilterInstance(final String classname) {
+ public static IFilter getFilterInstance(final String classname) {
for (Class<IFilter> f : filtersClasses) {
if (f.getName().equals(classname)) {
try {
@@ -424,7 +382,7 @@ public class FilterMaster {
* <li>Saves the configuration
* </ul>
*/
- public Filters createDefaultFiltersConfig() {
+ public static Filters createDefaultFiltersConfig() {
Filters c = new Filters();
addNewFiltersToConfig(c);
return c;
@@ -434,29 +392,41 @@ public class FilterMaster {
* Loads information about the filters from an XML file. If there's an error loading a file, it calls
* <code>setupDefaultFilters</code>.
*/
- public void loadConfig() {
- if (!this.configFile.exists()) {
- config = new Filters();
- return;
+ public static Filters loadConfig(String configDir) {
+ File configFile = new File(configDir + FILE_FILTERS);
+ if (!configFile.exists()) {
+ return null;
}
+ Filters result;
try {
Unmarshaller unm = CONFIG_CTX.createUnmarshaller();
- config = (Filters) unm.unmarshal(configFile);
+ result = (Filters) unm.unmarshal(configFile);
} catch (Exception e) {
Log.logErrorRB("FILTERMASTER_ERROR_LOADING_FILTERS_CONFIG");
Log.log(e);
- config = new Filters();
+ result = new Filters();
}
+
+ if (addNewFiltersToConfig(result)) {
+ saveConfig(result, configDir);
+ }
+
+ return result;
}
/**
* Saves information about the filters to an XML file.
*/
- public void saveConfig() {
+ public static void saveConfig(Filters config, String configDir) {
+ File configFile = new File(configDir + FILE_FILTERS);
+ if (config == null) {
+ configFile.delete();
+ return;
+ }
try {
Marshaller m = CONFIG_CTX.createMarshaller();
m.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true);
- m.marshal(config, this.configFile);
+ m.marshal(config, configFile);
} catch (Exception e) {
Log.logErrorRB("FILTERMASTER_ERROR_SAVING_FILTERS_CONFIG");
Log.log(e);
@@ -465,15 +435,6 @@ public class FilterMaster {
OStrings.getString("ERROR_TITLE"), JOptionPane.ERROR_MESSAGE);
}
}
- /**
- * Deletes the config file. Use when removing project specific file filters
- * (i.e. this FilterMaster is project-specific)
- */
- public void deleteConfig() {
- if (this.configFile.exists()) {
- this.configFile.delete();
- }
- }
// ////////////////////////////////////////////////////////////////////////
// Static Utility Methods
@@ -664,23 +625,13 @@ public class FilterMaster {
}
/**
- * Set new config. Used by filter's editor.
- *
- * @param config
- * new config
- */
- public void setConfig(final Filters config) {
- this.config = config;
- }
-
- /**
* Clone config for editing
*
* @return new config instance
*/
- public Filters cloneConfig() {
+ public static Filters cloneConfig(Filters orig) {
Filters c = new Filters();
- for (Filter f : config.getFilter()) {
+ for (Filter f : orig.getFilter()) {
c.getFilter().add(cloneFilter(f));
}
return c;
@@ -693,7 +644,7 @@ public class FilterMaster {
* one filter's config
* @return new config instance
*/
- public Filter cloneFilter(Filter filter) {
+ public static Filter cloneFilter(Filter filter) {
Filter f = new Filter();
f.setClassName(filter.getClassName());
f.setEnabled(filter.isEnabled());
@@ -716,7 +667,7 @@ public class FilterMaster {
* new filter's instance config
* @return new config instance
*/
- public Files cloneFiles(Files files) {
+ private static Files cloneFiles(Files files) {
Files ff = new Files();
ff.setSourceEncoding(files.getSourceEncoding());
ff.setSourceFilenameMask(files.getSourceFilenameMask());
@@ -732,7 +683,7 @@ public class FilterMaster {
* filter's classname
* @return default filter's config
*/
- public Filter getDefaultSettingsFromFilter(final String filterClassname) {
+ public static Filter getDefaultSettingsFromFilter(final String filterClassname) {
IFilter f = getFilterInstance(filterClassname);
Filter fc = new Filter();
fc.setClassName(f.getClass().getName());
diff --git a/src/org/omegat/filters2/master/FiltersTableModel.java b/src/org/omegat/filters2/master/FiltersTableModel.java
index 749b614..00e748c 100644
--- a/src/org/omegat/filters2/master/FiltersTableModel.java
+++ b/src/org/omegat/filters2/master/FiltersTableModel.java
@@ -34,6 +34,7 @@ import java.util.TreeMap;
import javax.swing.table.AbstractTableModel;
+import org.omegat.core.Core;
import org.omegat.filters2.IFilter;
import org.omegat.util.OStrings;
@@ -54,7 +55,7 @@ public class FiltersTableModel extends AbstractTableModel {
filters = new ArrayList<Filter>();
// add only exist filters
for (Filter f : config.getFilter()) {
- IFilter fi = FilterMaster.getInstance().getFilterInstance(f.getClassName());
+ IFilter fi = FilterMaster.getFilterInstance(f.getClassName());
if (fi != null) {
// filter exist
filters.add(f);
diff --git a/src/org/omegat/filters2/master/OneFilterTableModel.java b/src/org/omegat/filters2/master/OneFilterTableModel.java
index b93e776..52c6766 100644
--- a/src/org/omegat/filters2/master/OneFilterTableModel.java
+++ b/src/org/omegat/filters2/master/OneFilterTableModel.java
@@ -48,7 +48,7 @@ public class OneFilterTableModel extends AbstractTableModel {
public OneFilterTableModel(final Filter f) {
this.filter = f;
- IFilter fi = FilterMaster.getInstance().getFilterInstance(f.getClassName());
+ IFilter fi = FilterMaster.getFilterInstance(f.getClassName());
sourceEncodingVariable = fi.isSourceEncodingVariable();
targetEncodingVariable = fi.isTargetEncodingVariable();
}
diff --git a/src/org/omegat/gui/dialogs/ProjectPropertiesDialog.java b/src/org/omegat/gui/dialogs/ProjectPropertiesDialog.java
index 42fae8a..78359e8 100644
--- a/src/org/omegat/gui/dialogs/ProjectPropertiesDialog.java
+++ b/src/org/omegat/gui/dialogs/ProjectPropertiesDialog.java
@@ -61,12 +61,14 @@ import javax.swing.border.EtchedBorder;
import org.omegat.core.Core;
import org.omegat.core.data.ProjectProperties;
import org.omegat.core.segmentation.SRX;
+import org.omegat.filters2.master.FilterMaster;
import org.omegat.gui.filters2.FiltersCustomizer;
import org.omegat.gui.segmentation.SegmentationCustomizer;
import org.omegat.util.Language;
import org.omegat.util.OConsts;
import org.omegat.util.OStrings;
import org.omegat.util.Preferences;
+import org.omegat.util.StaticUtils;
import org.omegat.util.StringUtil;
import org.omegat.util.gui.LanguageComboBoxRenderer;
import org.omegat.util.gui.OmegaTFileChooser;
@@ -135,12 +137,13 @@ public class ProjectPropertiesDialog extends JDialog {
* type of the dialog ({@link #NEW_PROJECT},
* {@link #RESOLVE_DIRS} or {@link #EDIT_PROJECT}).
*/
- public ProjectPropertiesDialog(ProjectProperties projectProperties, String projFileName,
+ public ProjectPropertiesDialog(final ProjectProperties projectProperties, String projFileName,
int dialogTypeValue) {
super(Core.getMainWindow().getApplicationFrame(), true);
this.projectProperties = projectProperties;
this.srx = projectProperties.getProjectSRX();
this.dialogType = dialogTypeValue;
+ filters = FilterMaster.loadConfig(projectProperties.getProjectInternal());
Border emptyBorder = new EmptyBorder(2, 0, 2, 0);
Box centerBox = Box.createVerticalBox();
@@ -403,9 +406,11 @@ public class ProjectPropertiesDialog extends JDialog {
m_fileFiltersButton.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
JFrame mainWindow = Core.getMainWindow().getApplicationFrame();
- FiltersCustomizer dlg = new FiltersCustomizer(mainWindow, true);
+ FiltersCustomizer dlg = new FiltersCustomizer(mainWindow, true, FilterMaster
+ .createDefaultFiltersConfig(), FilterMaster.loadConfig(StaticUtils.getConfigDir()),
+ filters);
dlg.setVisible(true);
- if (dlg.result != null) {
+ if (dlg.getReturnStatus() == FiltersCustomizer.RET_OK) {
// saving config
filters = dlg.result;
}
diff --git a/src/org/omegat/gui/filters2/FilterEditor.java b/src/org/omegat/gui/filters2/FilterEditor.java
index 5201e7b..2e610ab 100644
--- a/src/org/omegat/gui/filters2/FilterEditor.java
+++ b/src/org/omegat/gui/filters2/FilterEditor.java
@@ -48,6 +48,7 @@ import javax.swing.event.ListSelectionEvent;
import javax.swing.event.ListSelectionListener;
import javax.swing.table.TableColumn;
+import org.omegat.core.Core;
import org.omegat.filters2.IFilter;
import org.omegat.filters2.master.FilterMaster;
import org.omegat.filters2.master.OneFilterTableModel;
@@ -71,7 +72,7 @@ public class FilterEditor extends JDialog implements ListSelectionListener {
/** Creates new form SingleFilterEditor */
public FilterEditor(Dialog parent, Filter filter) {
super(parent, true);
- this.filter = FilterMaster.getInstance().cloneFilter(filter);
+ this.filter = FilterMaster.cloneFilter(filter);
// HP
// Handle escape key to close the window
@@ -87,7 +88,7 @@ public class FilterEditor extends JDialog implements ListSelectionListener {
initComponents();
- IFilter f = FilterMaster.getInstance().getFilterInstance(filter.getClassName());
+ IFilter f = FilterMaster.getFilterInstance(filter.getClassName());
fileFormatTextField.setText(f.getFileFormatName());
if (!StringUtil.isEmpty(f.getHint()))
hintTextArea.setText(f.getHint());
@@ -347,7 +348,7 @@ public class FilterEditor extends JDialog implements ListSelectionListener {
private void toDefaultsButtonActionPerformed(java.awt.event.ActionEvent evt)// GEN-FIRST:event_toDefaultsButtonActionPerformed
{// GEN-HEADEREND:event_toDefaultsButtonActionPerformed
try {
- filter = FilterMaster.getInstance().getDefaultSettingsFromFilter(filter.getClassName());
+ filter = Core.getFilterMaster().getDefaultSettingsFromFilter(filter.getClassName());
instances.setModel(new OneFilterTableModel(filter));
} catch (Exception e) {
JOptionPane.showMessageDialog(this,
@@ -358,7 +359,7 @@ public class FilterEditor extends JDialog implements ListSelectionListener {
private void addButtonActionPerformed(java.awt.event.ActionEvent evt)// GEN-FIRST:event_addButtonActionPerformed
{// GEN-HEADEREND:event_addButtonActionPerformed
- IFilter f = FilterMaster.getInstance().getFilterInstance(filter.getClassName());
+ IFilter f = FilterMaster.getFilterInstance(filter.getClassName());
InstanceEditor ie = new InstanceEditor(this, f.isSourceEncodingVariable(),
f.isTargetEncodingVariable(), f.getHint());
@@ -378,7 +379,7 @@ public class FilterEditor extends JDialog implements ListSelectionListener {
{// GEN-HEADEREND:event_editButtonActionPerformed
int row = instances.getSelectedRow();
- IFilter f = FilterMaster.getInstance().getFilterInstance(filter.getClassName());
+ IFilter f = FilterMaster.getFilterInstance(filter.getClassName());
InstanceEditor ie = new InstanceEditor(this, f.isSourceEncodingVariable(),
f.isTargetEncodingVariable(), f.getHint(),
instances.getModel().getValueAt(row, 0).toString(), instances.getModel().getValueAt(row, 1)
diff --git a/src/org/omegat/gui/filters2/FiltersCustomizer.java b/src/org/omegat/gui/filters2/FiltersCustomizer.java
index 36f6330..e71e202 100644
--- a/src/org/omegat/gui/filters2/FiltersCustomizer.java
+++ b/src/org/omegat/gui/filters2/FiltersCustomizer.java
@@ -44,7 +44,6 @@ import javax.swing.ListSelectionModel;
import javax.swing.event.ListSelectionEvent;
import javax.swing.event.ListSelectionListener;
-import org.omegat.core.Core;
import org.omegat.filters2.IFilter;
import org.omegat.filters2.master.FilterMaster;
import org.omegat.filters2.master.FiltersTableModel;
@@ -59,28 +58,40 @@ import org.omegat.util.OStrings;
*/
@SuppressWarnings("serial")
public class FiltersCustomizer extends JDialog implements ListSelectionListener {
- private Filters config;
+ /** 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;
+
public Filters result;
+ /** Filters from OmegaT. */
+ private Filters defaultFilters;
+ /** Filters from user preferences. */
+ private Filters userFilters;
+ /** Filters from current project. */
+ private Filters projectFilters;
+ /** Filters which editable now. */
+ private Filters editableFilters;
+
/**
* Flag if this customizer shows project specific filters or not
*/
private boolean isProjectSpecific;
/** Creates new form FilterCustomizer */
- public FiltersCustomizer(Frame parent, boolean projectSpecific) {
+ public FiltersCustomizer(Frame parent, boolean projectSpecific, Filters defaultFilters,
+ Filters userFilters, Filters projectFilters) {
super(parent, true);
isProjectSpecific = projectSpecific;
- FilterMaster filterProjectInstance = null;
- if (projectSpecific) {
- filterProjectInstance = Core.getProject().getFilterMaster();
- }
- if (filterProjectInstance == null) {
- config = FilterMaster.getInstance().cloneConfig();
- } else {
- config = filterProjectInstance.cloneConfig();
+ this.defaultFilters = defaultFilters;
+ this.userFilters = userFilters;
+ this.projectFilters = projectFilters;
+ if (userFilters == null) {
+ userFilters = defaultFilters;
}
-
+ this.editableFilters = isProjectSpecific && projectFilters != null ? FilterMaster.cloneConfig(projectFilters)
+ : FilterMaster.cloneConfig(userFilters);
// HP
// Handle escape key to close the window
@@ -97,7 +108,7 @@ public class FiltersCustomizer extends JDialog implements ListSelectionListener
initComponents();
getRootPane().setDefaultButton(okButton);
- filtersTable.setModel(new FiltersTableModel(config));
+ filtersTable.setModel(new FiltersTableModel(editableFilters));
filtersTable.getSelectionModel().addListSelectionListener(this);
if (projectSpecific) {
@@ -105,13 +116,15 @@ public class FiltersCustomizer extends JDialog implements ListSelectionListener
} else {
projectSpecificCB.setVisible(false);
}
- if (projectSpecific && filterProjectInstance == null) {
+ if (projectSpecific && projectFilters == null) {
filtersTable.setEnabled(false);
filtersTable.setFocusable(false);
+ toDefaultsButton.setEnabled(false);
} else {
if (projectSpecific) projectSpecificCB.setSelected(true);
filtersTable.setEnabled(true);
filtersTable.setFocusable(true);
+ toDefaultsButton.setEnabled(true);
}
// hack for "autoresizing" the dialog
@@ -125,6 +138,11 @@ public class FiltersCustomizer extends JDialog implements ListSelectionListener
setLocation((screenSize.width - dialogSize.width) / 2, (screenSize.height - dialogSize.height) / 2);
}
+ /** @return the return status of this dialog - one of RET_OK or RET_CANCEL */
+ public int getReturnStatus() {
+ return returnStatus;
+ }
+
public void valueChanged(ListSelectionEvent e) {
if (e.getValueIsAdjusting())
return;
@@ -135,8 +153,8 @@ public class FiltersCustomizer extends JDialog implements ListSelectionListener
} else {
editButton.setEnabled(true);
int fIdx = filtersTable.getSelectedRow();
- Filter currFilter = config.getFilter().get(fIdx);
- IFilter f = FilterMaster.getInstance().getFilterInstance(currFilter.getClassName());
+ Filter currFilter = editableFilters.getFilter().get(fIdx);
+ IFilter f = FilterMaster.getFilterInstance(currFilter.getClassName());
optionsButton.setEnabled(f.hasOptions());
}
}
@@ -306,8 +324,8 @@ public class FiltersCustomizer extends JDialog implements ListSelectionListener
private void optionsButtonActionPerformed(java.awt.event.ActionEvent evt)// GEN-FIRST:event_optionsButtonActionPerformed
{// GEN-HEADEREND:event_optionsButtonActionPerformed
int fIdx = filtersTable.getSelectedRow();
- Filter currFilter = config.getFilter().get(fIdx);
- IFilter f = FilterMaster.getInstance().getFilterInstance(currFilter.getClassName());
+ Filter currFilter = editableFilters.getFilter().get(fIdx);
+ IFilter f = FilterMaster.getFilterInstance(currFilter.getClassName());
// new options handling
Map<String, String> newConfig = f.changeOptions(this, FilterMaster.forFilter(currFilter.getOption()));
@@ -318,40 +336,41 @@ public class FiltersCustomizer extends JDialog implements ListSelectionListener
private void toDefaultsButtonActionPerformed(java.awt.event.ActionEvent evt)// GEN-FIRST:event_toDefaultsButtonActionPerformed
{// GEN-HEADEREND:event_toDefaultsButtonActionPerformed
- config = FilterMaster.getInstance().createDefaultFiltersConfig();
- filtersTable.setModel(new FiltersTableModel(config));
+ editableFilters = FilterMaster.cloneConfig(defaultFilters);
+ filtersTable.setModel(new FiltersTableModel(editableFilters));
}// GEN-LAST:event_toDefaultsButtonActionPerformed
private void editButtonActionPerformed(java.awt.event.ActionEvent evt) {// GEN-FIRST:event_editButtonActionPerformed
int row = filtersTable.getSelectedRow();
- FilterEditor editor = new FilterEditor(this, config.getFilter().get(row));
+ FilterEditor editor = new FilterEditor(this, editableFilters.getFilter().get(row));
editor.setVisible(true);
if (editor.result != null) {
- config.getFilter().set(row, editor.result);
+ editableFilters.getFilter().set(row, editor.result);
}
}// GEN-LAST:event_editButtonActionPerformed
private void okButtonActionPerformed(java.awt.event.ActionEvent evt)// GEN-FIRST:event_okButtonActionPerformed
{
- doClose(config);
+ doClose(RET_OK);
}// GEN-LAST:event_okButtonActionPerformed
private void cancelButtonActionPerformed(java.awt.event.ActionEvent evt)// GEN-FIRST:event_cancelButtonActionPerformed
{
- doClose(null);
+ doClose(RET_CANCEL);
}// GEN-LAST:event_cancelButtonActionPerformed
/** Closes the dialog */
private void closeDialog(java.awt.event.WindowEvent evt)// GEN-FIRST:event_closeDialog
{
- doClose(null);
+ doClose(RET_CANCEL);
}// GEN-LAST:event_closeDialog
- private void doClose(Filters res) {
- if (isProjectSpecific && projectSpecificCB.isSelected()==false) {
+ private void doClose(int retStatus) {
+ returnStatus = retStatus;
+ if (isProjectSpecific && projectSpecificCB.isSelected() == false) {
result = null;
} else {
- result = res;
+ result = editableFilters;
}
setVisible(false);
dispose();
@@ -370,4 +389,6 @@ public class FiltersCustomizer extends JDialog implements ListSelectionListener
private javax.swing.JCheckBox projectSpecificCB;
private javax.swing.JButton toDefaultsButton;
// End of variables declaration//GEN-END:variables
+
+ private int returnStatus = RET_CANCEL;
}
diff --git a/src/org/omegat/gui/main/MainWindowMenuHandler.java b/src/org/omegat/gui/main/MainWindowMenuHandler.java
index 962f1b6..d0ec8bd 100644
--- a/src/org/omegat/gui/main/MainWindowMenuHandler.java
+++ b/src/org/omegat/gui/main/MainWindowMenuHandler.java
@@ -606,16 +606,18 @@ public class MainWindowMenuHandler {
* Displays the filters setup dialog to allow customizing file filters in detail.
*/
public void optionsSetupFileFiltersMenuItemActionPerformed() {
- FiltersCustomizer dlg = new FiltersCustomizer(mainWindow, false);
+ FiltersCustomizer dlg = new FiltersCustomizer(mainWindow, false,
+ FilterMaster.createDefaultFiltersConfig(),
+ FilterMaster.loadConfig(StaticUtils.getConfigDir()), null);
dlg.setVisible(true);
- if (dlg.result != null) {
+ if (dlg.getReturnStatus() == FiltersCustomizer.RET_OK) {
// saving config
- FilterMaster.getInstance().setConfig(dlg.result);
- FilterMaster.getInstance().saveConfig();
+ FilterMaster.saveConfig(dlg.result, StaticUtils.getConfigDir());
- if (Core.getProject().isProjectLoaded() ) {
- if (Core.getProject().getFilterMaster() != null) {
- //project specific filters are in place. No need to reload project when non-project-specific filters are changed
+ if (Core.getProject().isProjectLoaded()) {
+ if (FilterMaster.loadConfig(Core.getProject().getProjectProperties().getProjectInternal()) != null) {
+ // project specific filters are in place. No need to reload project when
+ // non-project-specific filters are changed
return;
}
// asking to reload a project
diff --git a/src/org/omegat/gui/main/ProjectUICommands.java b/src/org/omegat/gui/main/ProjectUICommands.java
index d9813b9..a574ea8 100644
--- a/src/org/omegat/gui/main/ProjectUICommands.java
+++ b/src/org/omegat/gui/main/ProjectUICommands.java
@@ -35,6 +35,7 @@ import org.jdesktop.swingworker.SwingWorker;
import org.omegat.core.Core;
import org.omegat.core.data.ProjectFactory;
import org.omegat.core.data.ProjectProperties;
+import org.omegat.filters2.master.FilterMaster;
import org.omegat.gui.dialogs.NewProjectFileChooser;
import org.omegat.gui.dialogs.ProjectPropertiesDialog;
import org.omegat.util.Log;
@@ -280,6 +281,8 @@ public class ProjectUICommands {
if (newProps == null) {
return;
}
+ FilterMaster.saveConfig(newProps.getProjectFilters(), newProps.getProjectInternal());
+
int res = JOptionPane.showConfirmDialog(Core.getMainWindow().getApplicationFrame(),
OStrings.getString("MW_REOPEN_QUESTION"), OStrings.getString("MW_REOPEN_TITLE"),
JOptionPane.YES_NO_OPTION);
http://omegat.git.sourceforge.net/git/gitweb.cgi?p=omegat/omegat;a=commitdiff;h=82afbd7d1b1fb45f6197da066707ccb4be1a3cbd
commit 82afbd7d1b1fb45f6197da066707ccb4be1a3cbd
Author: Didier Briel <d....@fr...>
Date: Wed Aug 1 09:41:48 2012 +0000
#3552714 Duplicate text in Instant Start section
git-svn-id: https://omegat.svn.sourceforge.net/svnroot/omegat/branches/release-2-5@4572 b0d8beef-cb45-0410-a8e4-c0d495c3b779
diff --git a/doc_src/en/InstantStartGuide.xml b/doc_src/en/InstantStartGuide.xml
index 2650408..1985b01 100644
--- a/doc_src/en/InstantStartGuide.xml
+++ b/doc_src/en/InstantStartGuide.xml
@@ -126,10 +126,7 @@
<para>If a file does not loads into the Editor pane, then it could be
that your source file is in a format that doesn't work in OmegaT. See
Chapter 7: File Filters in the User Manual for a list of file formats
- that OmegaT can handle. If a file does not loads into the Editor pane,
- then it could be that your source file is in a format that doesn't
- work in OmegaT. See Chapter 7: File Filters in the User Manual for a
- list of file formats that OmegaT can handle.</para>
+ that OmegaT can handle.</para>
</listitem>
</itemizedlist>
http://omegat.git.sourceforge.net/git/gitweb.cgi?p=omegat/omegat;a=commitdiff;h=a9324acc2f9ef2a132d53a5e42a85d0e031273aa
commit a9324acc2f9ef2a132d53a5e42a85d0e031273aa
Author: Didier Briel <d....@fr...>
Date: Mon Jul 23 12:39:25 2012 +0000
PowerPoint documents (.pptx and .pptm) could not be opened with Java 1.7
git-svn-id: https://omegat.svn.sourceforge.net/svnroot/omegat/branches/release-2-5@4568 b0d8beef-cb45-0410-a8e4-c0d495c3b779
diff --git a/release/changes.txt b/release/changes.txt
index 6f614d6..26fc14e 100644
--- a/release/changes.txt
+++ b/release/changes.txt
@@ -2,7 +2,7 @@
OmegaT 2.5.5 update 1
----------------------------------------------------------------------
1 Enhancement
- 0 Bug fix
+ 1 Bug fix
1 Localisation update
----------------------------------------------------------------------
2.5.5 update 1 vs. 2.5.5
@@ -13,6 +13,10 @@
(full support for Khmer script rendering)
http://sourceforge.net/support/tracker.php?aid=3542912
+ Bug fixes:
+
+ PowerPoint documents (.pptx and .pptm) could not be opened with Java 1.7
+
Localisation updates:
- Japanese localization updated to 2.5.5 (UI)
diff --git a/src/org/omegat/filters3/xml/openxml/OpenXMLFilter.java b/src/org/omegat/filters3/xml/openxml/OpenXMLFilter.java
index f3eb8de..ca80f48 100644
--- a/src/org/omegat/filters3/xml/openxml/OpenXMLFilter.java
+++ b/src/org/omegat/filters3/xml/openxml/OpenXMLFilter.java
@@ -4,7 +4,7 @@
glossaries, and translation leveraging into updated projects.
Copyright (C) 2000-2006 Keith Godfrey and Maxym Mykhalchuk
- 2007-2011 Didier Briel
+ 2007-2012 Didier Briel
Home page: http://www.omegat.org/
Support center: http://groups.yahoo.com/group/OmegaT/
@@ -249,8 +249,9 @@ public class OpenXMLFilter extends AbstractFilter {
return 1;
else if (index1 < index2)
return -1;
- else
- return 0;
+ else { // Documents were not in DOCUMENTS, we keep the normal order
+ return s1.compareTo(s2);
+ }
}
}
});
http://omegat.git.sourceforge.net/git/gitweb.cgi?p=omegat/omegat;a=commitdiff;h=1c28e78b65454a80255e310216a581c78ab9c467
commit 1c28e78b65454a80255e310216a581c78ab9c467
Author: Didier Briel <d....@fr...>
Date: Mon Jul 23 12:37:25 2012 +0000
Update documentation
git-svn-id: https://omegat.svn.sourceforge.net/svnroot/omegat/branches/release-2-5@4567 b0d8beef-cb45-0410-a8e4-c0d495c3b779
diff --git a/docs/en/appendix.LanguageToolPlugin.inOmegaT.html b/docs/en/appendix.LanguageToolPlugin.inOmegaT.html
index 01440c6..fcc2f49 100644
--- a/docs/en/appendix.LanguageToolPlugin.inOmegaT.html
+++ b/docs/en/appendix.LanguageToolPlugin.inOmegaT.html
@@ -29,21 +29,21 @@
<div class="titlepage">
<div>
<div>
- <h2 class="title"><a name="appendix.LanguageToolPlugin.inOmegaT"></a>Appendix B. LanguageTool plugin<a class="indexterm" name="d0e8590"></a></h2>
+ <h2 class="title"><a name="appendix.LanguageToolPlugin.inOmegaT"></a>Appendix B. LanguageTool plugin<a class="indexterm" name="d0e8594"></a></h2>
</div>
</div>
</div>
<div class="toc">
<dl>
- <dt><span class="section"><a href="appendix.LanguageToolPlugin.inOmegaT.html#d0e8595">1. Introduction</a></span></dt>
- <dt><span class="section"><a href="appendix.LanguageToolPlugin.inOmegaT.html#d0e8612">2. Installation and Use</a></span></dt>
+ <dt><span class="section"><a href="appendix.LanguageToolPlugin.inOmegaT.html#d0e8599">1. Introduction</a></span></dt>
+ <dt><span class="section"><a href="appendix.LanguageToolPlugin.inOmegaT.html#d0e8616">2. Installation and Use</a></span></dt>
</dl>
</div>
<div class="section" title="1. Introduction">
<div class="titlepage">
<div>
<div>
- <h2 class="title" style="clear: both"><a name="d0e8595"></a>1. Introduction
+ <h2 class="title" style="clear: both"><a name="d0e8599"></a>1. Introduction
</h2>
</div>
</div>
@@ -58,7 +58,7 @@
checking. LanguageTool will find errors for which a rule has been defined
in its language-specific configuration files.
</p>
- <div class="figure"><a name="d0e8605"></a><p class="title"><b>Figure B.1. The LanguageTool in OmegaT</b></p>
+ <div class="figure"><a name="d0e8609"></a><p class="title"><b>Figure B.1. The LanguageTool in OmegaT</b></p>
<div class="figure-contents">
<div class="screenshot">
<div class="mediaobject"><img src="images/LanguageToolExample.png" alt="The LanguageTool in OmegaT"></div>
@@ -69,7 +69,7 @@
<div class="titlepage">
<div>
<div>
- <h2 class="title" style="clear: both"><a name="d0e8612"></a>2. Installation and Use
+ <h2 class="title" style="clear: both"><a name="d0e8616"></a>2. Installation and Use
</h2>
</div>
</div>
diff --git a/docs/en/appendix.ScriptingPlugin.inOmegaT.html b/docs/en/appendix.ScriptingPlugin.inOmegaT.html
index 7fce52e..2b29996 100644
--- a/docs/en/appendix.ScriptingPlugin.inOmegaT.html
+++ b/docs/en/appendix.ScriptingPlugin.inOmegaT.html
@@ -29,21 +29,21 @@
<div class="titlepage">
<div>
<div>
- <h2 class="title"><a name="appendix.ScriptingPlugin.inOmegaT"></a>Appendix C. Scripting plugin<a class="indexterm" name="d0e8634"></a></h2>
+ <h2 class="title"><a name="appendix.ScriptingPlugin.inOmegaT"></a>Appendix C. Scripting plugin<a class="indexterm" name="d0e8638"></a></h2>
</div>
</div>
</div>
<div class="toc">
<dl>
- <dt><span class="section"><a href="appendix.ScriptingPlugin.inOmegaT.html#d0e8639">1. Introduction</a></span></dt>
- <dt><span class="section"><a href="appendix.ScriptingPlugin.inOmegaT.html#d0e8644">2. Installation and Use</a></span></dt>
+ <dt><span class="section"><a href="appendix.ScriptingPlugin.inOmegaT.html#d0e8643">1. Introduction</a></span></dt>
+ <dt><span class="section"><a href="appendix.ScriptingPlugin.inOmegaT.html#d0e8648">2. Installation and Use</a></span></dt>
</dl>
</div>
<div class="section" title="1. Introduction">
<div class="titlepage">
<div>
<div>
- <h2 class="title" style="clear: both"><a name="d0e8639"></a>1. Introduction
+ <h2 class="title" style="clear: both"><a name="d0e8643"></a>1. Introduction
</h2>
</div>
</div>
@@ -56,7 +56,7 @@
<div class="titlepage">
<div>
<div>
- <h2 class="title" style="clear: both"><a name="d0e8644"></a>2. Installation and Use
+ <h2 class="title" style="clear: both"><a name="d0e8648"></a>2. Installation and Use
</h2>
</div>
</div>
diff --git a/docs/en/appendix.TokenizerPlugin.inOmegaT.html b/docs/en/appendix.TokenizerPlugin.inOmegaT.html
index 441f3e2..4cb4716 100644
--- a/docs/en/appendix.TokenizerPlugin.inOmegaT.html
+++ b/docs/en/appendix.TokenizerPlugin.inOmegaT.html
@@ -29,23 +29,23 @@
<div class="titlepage">
<div>
<div>
- <h2 class="title"><a name="appendix.TokenizerPlugin.inOmegaT"></a>Appendix A. Tokenizer plugin<a class="indexterm" name="d0e8504"></a></h2>
+ <h2 class="title"><a name="appendix.TokenizerPlugin.inOmegaT"></a>Appendix A. Tokenizer plugin<a class="indexterm" name="d0e8508"></a></h2>
</div>
</div>
</div>
<div class="toc">
<dl>
- <dt><span class="section"><a href="appendix.TokenizerPlugin.inOmegaT.html#d0e8509">1. Introduction</a></span></dt>
- <dt><span class="section"><a href="appendix.TokenizerPlugin.inOmegaT.html#d0e8538">2. Installation and command line use</a></span></dt>
- <dt><span class="section"><a href="appendix.TokenizerPlugin.inOmegaT.html#d0e8555">3. Mac OSX specifics</a></span></dt>
- <dt><span class="section"><a href="appendix.TokenizerPlugin.inOmegaT.html#d0e8569">4. Troubleshooting</a></span></dt>
+ <dt><span class="section"><a href="appendix.TokenizerPlugin.inOmegaT.html#d0e8513">1. Introduction</a></span></dt>
+ <dt><span class="section"><a href="appendix.TokenizerPlugin.inOmegaT.html#d0e8542">2. Installation and command line use</a></span></dt>
+ <dt><span class="section"><a href="appendix.TokenizerPlugin.inOmegaT.html#d0e8559">3. Mac OSX specifics</a></span></dt>
+ <dt><span class="section"><a href="appendix.TokenizerPlugin.inOmegaT.html#d0e8573">4. Troubleshooting</a></span></dt>
</dl>
</div>
<div class="section" title="1. Introduction">
<div class="titlepage">
<div>
<div>
- <h2 class="title" style="clear: both"><a name="d0e8509"></a>1. Introduction<a class="indexterm" name="d0e8512"></a><a class="indexterm" name="d0e8517"></a></h2>
+ <h2 class="title" style="clear: both"><a name="d0e8513"></a>1. Introduction<a class="indexterm" name="d0e8516"></a><a class="indexterm" name="d0e8521"></a></h2>
</div>
</div>
</div>
@@ -89,7 +89,7 @@
<div class="titlepage">
<div>
<div>
- <h2 class="title" style="clear: both"><a name="d0e8538"></a>2. Installation and command line use
+ <h2 class="title" style="clear: both"><a name="d0e8542"></a>2. Installation and command line use
</h2>
</div>
</div>
@@ -124,7 +124,7 @@
<div class="titlepage">
<div>
<div>
- <h2 class="title" style="clear: both"><a name="d0e8555"></a>3. Mac OSX specifics
+ <h2 class="title" style="clear: both"><a name="d0e8559"></a>3. Mac OSX specifics
</h2>
</div>
</div>
@@ -154,7 +154,7 @@
<div class="titlepage">
<div>
<div>
- <h2 class="title" style="clear: both"><a name="d0e8569"></a>4. Troubleshooting
+ <h2 class="title" style="clear: both"><a name="d0e8573"></a>4. Troubleshooting
</h2>
</div>
</div>
diff --git a/docs/en/appendix.acknowledgements.html b/docs/en/appendix.acknowledgements.html
index 74cf268..d860975 100644
--- a/docs/en/appendix.acknowledgements.html
+++ b/docs/en/appendix.acknowledgements.html
@@ -36,14 +36,14 @@
</div>
<div class="toc">
<dl>
- <dt><span class="section"><a href="appendix.acknowledgements.html#d0e11307">1. Thank you all!</a></span></dt>
+ <dt><span class="section"><a href="appendix.acknowledgements.html#d0e11311">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="d0e11307"></a>1. Thank you all!
+ <h2 class="title" style="clear: both"><a name="d0e11311"></a>1. Thank you all!
</h2>
</div>
</div>
diff --git a/docs/en/appendix.keyboard.html b/docs/en/appendix.keyboard.html
index e5fca0c..ac15606 100644
--- a/docs/en/appendix.keyboard.html
+++ b/docs/en/appendix.keyboard.html
@@ -39,7 +39,7 @@
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="d0e10237"></a><p class="title"><b>Table F.1. Key behavior in the editor</b></p>
+ <div class="table"><a name="d0e10241"></a><p class="title"><b>Table F.1. Key behavior in the editor</b></p>
<div class="table-contents">
<table summary="Key behavior in the editor" border="1">
<colgroup>
diff --git a/docs/en/appendix.languages.html b/docs/en/appendix.languages.html
index 6acfee1..cb99746 100644
--- a/docs/en/appendix.languages.html
+++ b/docs/en/appendix.languages.html
@@ -35,9 +35,9 @@
<div>
<div>
<h2 class="title"><a name="appendix.languages"></a>Appendix E. Languages - ISO 639 code list
- <a class="indexterm" name="d0e8907"></a>
<a class="indexterm" name="d0e8911"></a>
<a class="indexterm" name="d0e8915"></a>
+ <a class="indexterm" name="d0e8919"></a>
</h2>
</div>
diff --git a/docs/en/appendix.legal.notices.html b/docs/en/appendix.legal.notices.html
index 9395d74..1692201 100644
--- a/docs/en/appendix.legal.notices.html
+++ b/docs/en/appendix.legal.notices.html
@@ -29,7 +29,7 @@
<div class="titlepage">
<div>
<div>
- <h2 class="title"><a name="appendix.legal.notices"></a>Appendix H. <a class="indexterm" name="d0e11235"></a>Legal notices
+ <h2 class="title"><a name="appendix.legal.notices"></a>Appendix H. <a class="indexterm" name="d0e11239"></a>Legal notices
</h2>
</div>
</div>
@@ -44,7 +44,7 @@
<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="d0e11242"></a></h2>
+ <h2 class="title" style="clear: both"><a name="legal.notices.for...
[truncated message content] |