- I18n-commits - mailman.cloud.codelutin.com

r1777 - trunk
by tchemit＠users.nuiton.org 29 Sep '10

29 Sep '10

Author: tchemit Date: 2010-09-29 10:10:33 +0200 (Wed, 29 Sep 2010) New Revision: 1777 Url: http://nuiton.org/repositories/revision/i18n/1777 Log: Utilisation de mavenpom4redmine 2.2.6 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-09-09 09:29:57 UTC (rev 1776) +++ trunk/pom.xml 2010-09-29 08:10:33 UTC (rev 1777) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.2.5</version> + <version>2.2.6</version> </parent> <artifactId>i18n</artifactId>

1 0

r1776 - trunk
by tchemit＠users.nuiton.org 09 Sep '10

09 Sep '10

Author: tchemit Date: 2010-09-09 11:29:57 +0200 (Thu, 09 Sep 2010) New Revision: 1776 Url: http://nuiton.org/repositories/revision/i18n/1776 Log: Utilisation de mavenpom4redmine 2.2.5 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-08-29 14:19:43 UTC (rev 1775) +++ trunk/pom.xml 2010-09-09 09:29:57 UTC (rev 1776) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.2.4</version> + <version>2.2.5</version> </parent> <artifactId>i18n</artifactId>

1 0

r1775 - trunk
by tchemit＠users.nuiton.org 29 Aug '10

29 Aug '10

Author: tchemit Date: 2010-08-29 16:19:43 +0200 (Sun, 29 Aug 2010) New Revision: 1775 Url: http://nuiton.org/repositories/revision/i18n/1775 Log: Utilisation de mavenpom4redmine 2.2.4 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-08-11 14:46:13 UTC (rev 1774) +++ trunk/pom.xml 2010-08-29 14:19:43 UTC (rev 1775) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.2.3</version> + <version>2.2.4</version> </parent> <artifactId>i18n</artifactId>

1 0

r1774 - trunk
by tchemit＠users.nuiton.org 11 Aug '10

11 Aug '10

Author: tchemit Date: 2010-08-11 16:46:13 +0200 (Wed, 11 Aug 2010) New Revision: 1774 Url: http://nuiton.org/repositories/revision/i18n/1774 Log: Utilisation de mavenpom4redmine 2.2.3 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-07-01 13:15:43 UTC (rev 1773) +++ trunk/pom.xml 2010-08-11 14:46:13 UTC (rev 1774) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.2.2.1</version> + <version>2.2.3</version> </parent> <artifactId>i18n</artifactId>

1 0

r1773 - trunk
by tchemit＠users.nuiton.org 01 Jul '10

01 Jul '10

Author: tchemit Date: 2010-07-01 15:15:43 +0200 (Thu, 01 Jul 2010) New Revision: 1773 Url: http://nuiton.org/repositories/revision/i18n/1773 Log: Utilisation de mavenpom4labs 2.2.2.1 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-07-01 12:54:51 UTC (rev 1772) +++ trunk/pom.xml 2010-07-01 13:15:43 UTC (rev 1773) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.2.2</version> + <version>2.2.2.1</version> </parent> <artifactId>i18n</artifactId>

1 0

r1772 - trunk
by tchemit＠users.nuiton.org 01 Jul '10

01 Jul '10

Author: tchemit Date: 2010-07-01 14:54:51 +0200 (Thu, 01 Jul 2010) New Revision: 1772 Url: http://nuiton.org/repositories/revision/i18n/1772 Log: use new central-safe configuration from mavenpom 2.2.2 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-07-01 12:30:33 UTC (rev 1771) +++ trunk/pom.xml 2010-07-01 12:54:51 UTC (rev 1772) @@ -258,6 +258,14 @@  <locales>fr,en</locales> +  + +  + <arguments>-DperformRelease -Pcentral-safe</arguments> + +  + <releaseProfiles>central-safe</releaseProfiles> + </properties>  @@ -271,51 +279,4 @@ <url>http://www.nuiton.org/repositories/browse/i18n/trunk</url> </scm> - <profiles> - <profile> - <id>central-safe</id> - <activation> - <property> - <name>performRelease</name> - <value>true</value> - </property> - </activation> - - <properties> - -  - <release.repository>${nuiton.central.release.repository}</release.repository> - - </properties> - - <build> - <defaultGoal>validate</defaultGoal> - <plugins> - <plugin> - <groupId>org.nuiton</groupId> - <artifactId>maven-helper-plugin</artifactId> - <executions> - <execution> - <id>check-central-safe</id> - <inherited>true</inherited> - <goals> - <goal>check-auto-container</goal> - </goals> - <configuration> - <addMavenCentral>true</addMavenCentral> - <failIfNotSafe>true</failIfNotSafe> - <repositories> - <nuiton-central-releases> - http://nexus.nuiton.org/nexus/content/repositories/nuiton-central-releases - </nuiton-central-releases> - </repositories> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - - </profiles> </project>

1 0

r1771 - trunk
by tchemit＠users.nuiton.org 01 Jul '10

01 Jul '10

Author: tchemit Date: 2010-07-01 14:30:33 +0200 (Thu, 01 Jul 2010) New Revision: 1771 Url: http://nuiton.org/repositories/revision/i18n/1771 Log: Utilisation de mavenpom4redmine 2.2.2 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-07-01 09:36:47 UTC (rev 1770) +++ trunk/pom.xml 2010-07-01 12:30:33 UTC (rev 1771) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.2.2-SNAPSHOT</version> + <version>2.2.2</version> </parent> <artifactId>i18n</artifactId>

1 0

r1770 - in trunk/nuiton-i18n-editor: . src src/license
by tchemit＠users.nuiton.org 01 Jul '10

01 Jul '10

Author: tchemit Date: 2010-07-01 11:36:47 +0200 (Thu, 01 Jul 2010) New Revision: 1770 Url: http://nuiton.org/repositories/revision/i18n/1770 Log: fix missing THIRD-PARTY Added: trunk/nuiton-i18n-editor/src/license/ trunk/nuiton-i18n-editor/src/license/THIRD-PARTY.properties Modified: trunk/nuiton-i18n-editor/pom.xml Modified: trunk/nuiton-i18n-editor/pom.xml =================================================================== --- trunk/nuiton-i18n-editor/pom.xml 2010-06-29 11:10:54 UTC (rev 1769) +++ trunk/nuiton-i18n-editor/pom.xml 2010-07-01 09:36:47 UTC (rev 1770) @@ -226,11 +226,16 @@ <plugin> <groupId>org.nuiton</groupId> <artifactId>maven-license-plugin</artifactId> + <version>${license.version}</version> <configuration> + <licenseMerges> + <licenseMerge>The Apache Software License, Version 2.0|Apache License, Version 2.0</licenseMerge> + <licenseMerge>BSD License|BSD</licenseMerge> + </licenseMerges> <generateBundle>true</generateBundle> </configuration> </plugin> - + <plugin> <artifactId>maven-jar-plugin</artifactId> <configuration> Added: trunk/nuiton-i18n-editor/src/license/THIRD-PARTY.properties =================================================================== --- trunk/nuiton-i18n-editor/src/license/THIRD-PARTY.properties (rev 0) +++ trunk/nuiton-i18n-editor/src/license/THIRD-PARTY.properties 2010-07-01 09:36:47 UTC (rev 1770) @@ -0,0 +1,18 @@ +# Generated by org.nuiton.license.plugin.AddThirdPartyMojo +#------------------------------------------------------------------------------- +# Already used licenses in project : +# - BSD License +# - Lesser General Public License (LGPL) +# - Lesser General Public License (LGPL) v 3.0 +# - Sun Microsystems, Inc. Binary Code License Agreement for the JDK 5.0 +# - The Apache Software License, Version 2.0 +# - The OpenSymphony Software License 1.1 +#------------------------------------------------------------------------------- +# Please fill the missing licenses for dependencies : +# +# +#Thu Jul 01 11:24:30 CEST 2010 +commons-collections--commons-collections--3.1=The Apache Software License, Version 2.0 +commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 +javax.help--javahelp--2.0.02=Sun Microsystems, Inc. Binary Code License Agreement for the JDK 5.0 +opensymphony--ognl--2.6.11=The OpenSymphony Software License 1.1 Property changes on: trunk/nuiton-i18n-editor/src/license/THIRD-PARTY.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL

1 0

r1769 - in trunk: . ant-i18n-task/src/main/java/org/nuiton/i18n/ant maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl
by tchemit＠users.nuiton.org 29 Jun '10

29 Jun '10

Author: tchemit Date: 2010-06-29 13:10:54 +0200 (Tue, 29 Jun 2010) New Revision: 1769 Url: http://nuiton.org/repositories/revision/i18n/1769 Log: Evolution #729: Use mavenpom 2.2.2 Evolution #727: Use maven-helper-plugin 1.2.6 Evolution #728: Use processor 1.0.4 Evolution #731: Improve management of encoding Modified: trunk/ant-i18n-task/src/main/java/org/nuiton/i18n/ant/I18nExtractorTask.java trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/AbstractI18nMojo.java trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/BundleMojo.java trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/CollectI18nArtifactsMojo.java trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/AbstractFileParser.java trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/AbstractI18nParserMojo.java trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/FileParser.java trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/KeysModifier.java trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/ParserExecutor.java trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/SourceEntry.java trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJavaActionConfigMojo.java trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJavaMojo.java trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserValidationMojo.java trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserXmlMojo.java trunk/pom.xml Modified: trunk/ant-i18n-task/src/main/java/org/nuiton/i18n/ant/I18nExtractorTask.java =================================================================== --- trunk/ant-i18n-task/src/main/java/org/nuiton/i18n/ant/I18nExtractorTask.java 2010-06-27 07:00:49 UTC (rev 1768) +++ trunk/ant-i18n-task/src/main/java/org/nuiton/i18n/ant/I18nExtractorTask.java 2010-06-29 11:10:54 UTC (rev 1769) @@ -25,27 +25,29 @@ package org.nuiton.i18n.ant; -import java.io.File; -import java.io.IOException; -import java.util.ArrayList; -import java.util.List; - import org.apache.tools.ant.BuildException; import org.apache.tools.ant.DirectoryScanner; import org.apache.tools.ant.Project; import org.apache.tools.ant.taskdefs.MatchingTask; import org.nuiton.processor.I18nExtractor; +import org.nuiton.processor.ProcessorUtil; +import java.io.File; +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; + /** * I18nExtractorTask. - * + * * Created: Aug 16, 2004 * * @author Cédric Pineau <pineau(a)codelutin.com> * @version $Revision$ - * - * Last update : $Date$ - * by : */ + * + * Last update : $Date$ + * by : + */ public class I18nExtractorTask extends MatchingTask { public static final int MSG_VERBOSE = Project.MSG_VERBOSE; @@ -60,8 +62,10 @@ protected String[] srcFileNames; - private static final String[] EMPTY_STRING_ARRAY = new String[] {}; + protected String encoding; + private static final String[] EMPTY_STRING_ARRAY = new String[]{}; + public I18nExtractorTask() { } @@ -80,9 +84,12 @@ for (String srcFileName : srcFileNames) { fileList.add(new File(srcFileName)); } + if (encoding == null || encoding.trim().isEmpty()) { + encoding = ProcessorUtil.DEFAULT_ENCODING; + } try { new I18nExtractor().extract( - fileList.toArray(new File[fileList.size()]), destFile); + fileList.toArray(new File[fileList.size()]), destFile, encoding); } catch (IOException eee) { throw new BuildException(eee); } @@ -96,21 +103,25 @@ this.destFile = destFile; } + public void setEncoding(String encoding) { + this.encoding = encoding; + } + @Override public void execute() throws BuildException { // first of all, make sure that we've got a srcdir if (srcDir == null) { throw new BuildException("srcdir attribute must be set!", - getLocation()); + getLocation()); } if (!srcDir.exists()) { throw new BuildException("srcdir \"" + srcDir.getPath() - + "\" does not exist!", getLocation()); + + "\" does not exist!", getLocation()); } if (destFile == null) { throw new BuildException("destFile attribute must be set!", - getLocation()); + getLocation()); } // Build the list of files to compute Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/AbstractI18nMojo.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/AbstractI18nMojo.java 2010-06-27 07:00:49 UTC (rev 1768) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/AbstractI18nMojo.java 2010-06-29 11:10:54 UTC (rev 1769) @@ -29,6 +29,7 @@ import org.nuiton.i18n.I18nUtil; import org.nuiton.plugin.AbstractPlugin; import org.nuiton.plugin.PluginHelper; +import org.nuiton.plugin.PluginWithEncoding; import java.io.File; import java.io.IOException; @@ -42,7 +43,7 @@ * * @author julien */ -public abstract class AbstractI18nMojo extends AbstractPlugin { +public abstract class AbstractI18nMojo extends AbstractPlugin implements PluginWithEncoding { /** Le nombre de getters détectés pendant le cycle de vie du build. */ private static int NB_GETTER_FILES; @@ -91,6 +92,9 @@ /** * encoding a utiliser pour charger et sauver les bundles + * + * Note: If nothing is filled here, we will use the system + * property {@code file.encoding}. * * @parameter expression="${i18n.encoding}" default-value="${project.build.sourceEncoding}" * @required @@ -268,10 +272,12 @@ copyFile(f, dst); } + @Override public String getEncoding() { return encoding; } + @Override public void setEncoding(String encoding) { this.encoding = encoding; } Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/BundleMojo.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/BundleMojo.java 2010-06-27 07:00:49 UTC (rev 1768) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/BundleMojo.java 2010-06-29 11:10:54 UTC (rev 1769) @@ -35,7 +35,12 @@ import java.io.FileOutputStream; import java.io.IOException; import java.net.URL; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Locale; +import java.util.Map; import java.util.Map.Entry; /** Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/CollectI18nArtifactsMojo.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/CollectI18nArtifactsMojo.java 2010-06-27 07:00:49 UTC (rev 1768) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/CollectI18nArtifactsMojo.java 2010-06-29 11:10:54 UTC (rev 1769) @@ -41,7 +41,11 @@ import java.io.File; import java.io.IOException; import java.net.URL; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Locale; +import java.util.Map; /** * Detects any i18n artifacts and store the result as a file. Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/AbstractFileParser.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/AbstractFileParser.java 2010-06-27 07:00:49 UTC (rev 1768) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/AbstractFileParser.java 2010-06-29 11:10:54 UTC (rev 1769) @@ -48,6 +48,8 @@ private boolean touched; + private final String encoding; + protected AbstractFileParser(Log log, String encoding, SortedProperties oldParser, @@ -55,6 +57,7 @@ this.log = log; this.oldParser = oldParser; this.showTouchedFiles = showTouchedFiles; + this.encoding = encoding; result = new SortedProperties(encoding); } @@ -72,6 +75,10 @@ return result; } + public String getEncoding() { + return encoding; + } + @Override public void destroy() { result.clear(); Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/AbstractI18nParserMojo.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/AbstractI18nParserMojo.java 2010-06-27 07:00:49 UTC (rev 1768) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/AbstractI18nParserMojo.java 2010-06-29 11:10:54 UTC (rev 1769) @@ -121,16 +121,6 @@ protected boolean showTouchedFiles; /** - * flag to save at eachfile treated the getter file - * - * @parameter expression="${i18n.safeMode}" default-value="false" - * @since 0.9 - * @deprecated since 1.2, no more used - */ - @Deprecated - protected boolean safeMode; - - /** * flag to save previous getter in a backup before doing parsing. * * Note: by default, do not perform backup (but it was here originaly so let @@ -206,11 +196,6 @@ @Override protected void doAction() throws Exception { - if (safeMode) { - getLog().warn("\n" + - "\nWarning : safeMode is deprecated and has no more effect." + - "\n"); - } if (keysModifier) { getLog().warn("\n" + "\nWarning : keysModifier is deprecated and has no more effect." + Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/FileParser.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/FileParser.java 2010-06-27 07:00:49 UTC (rev 1768) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/FileParser.java 2010-06-29 11:10:54 UTC (rev 1769) @@ -40,6 +40,13 @@ public interface FileParser { /** + * Gets encoding used to read and write files. + * + * @return the encoding + */ + String getEncoding(); + + /** * @return {@code true} if file was touched (says contains at least one i18n * key) */ Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/KeysModifier.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/KeysModifier.java 2010-06-27 07:00:49 UTC (rev 1768) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/KeysModifier.java 2010-06-29 11:10:54 UTC (rev 1769) @@ -27,8 +27,13 @@ import org.nuiton.plugin.PluginHelper; -import javax.swing.*; -import java.awt.*; +import javax.swing.JButton; +import javax.swing.JCheckBox; +import javax.swing.JFrame; +import javax.swing.JLabel; +import javax.swing.JTextField; +import java.awt.Container; +import java.awt.GridLayout; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.WindowAdapter; Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/ParserExecutor.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/ParserExecutor.java 2010-06-27 07:00:49 UTC (rev 1768) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/ParserExecutor.java 2010-06-29 11:10:54 UTC (rev 1769) @@ -26,6 +26,10 @@ package org.nuiton.i18n.plugin.parser; +import org.apache.maven.plugin.logging.Log; +import org.nuiton.io.SortedProperties; +import org.nuiton.plugin.PluginHelper; + import java.io.File; import java.io.IOException; import java.util.ArrayList; @@ -33,12 +37,8 @@ import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import org.apache.maven.plugin.logging.Log; -import org.nuiton.io.SortedProperties; -import org.nuiton.plugin.PluginHelper; /** - * * @author poussin * @since 1.2.2 */ @@ -140,7 +140,8 @@ * * Note: The method does not return until all files are not * consumed. - * @throws InterruptedException if something wrong while waiting end of + * + * @throws InterruptedException if something wrong while waiting end of * executor */ public void terminatesAndWaits() throws InterruptedException { @@ -153,8 +154,8 @@ getLog().info("No file consumed."); } else { getLog().info("Will waits until all files (" + nbFiles + - ") are consumed (still " + getNbFilesToTreate() + - " file(s) to consume)"); + ") are consumed (still " + getNbFilesToTreate() + + " file(s) to consume)"); } } @@ -168,7 +169,7 @@ if (getLog().isDebugEnabled()) { getLog().debug("A task was consumed, still " + getNbFilesToTreate() + - " file(s) to treate."); + " file(s) to treate."); } if (isVerbose()) { Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/SourceEntry.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/SourceEntry.java 2010-06-27 07:00:49 UTC (rev 1768) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/SourceEntry.java 2010-06-29 11:10:54 UTC (rev 1769) @@ -171,7 +171,7 @@ if (includes != null) { sb.append(", includes:").append(Arrays.toString(includes)); } - if (excludes != null && excludes.length>0) { + if (excludes != null && excludes.length > 0) { sb.append(", excludes:").append(Arrays.toString(excludes)); } return sb.toString(); Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJavaActionConfigMojo.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJavaActionConfigMojo.java 2010-06-27 07:00:49 UTC (rev 1768) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJavaActionConfigMojo.java 2010-06-29 11:10:54 UTC (rev 1769) @@ -52,7 +52,7 @@ return new JavaFileParser( getLog(), - encoding, + getEncoding(), oldParser, showTouchedFiles) { Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJavaMojo.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJavaMojo.java 2010-06-27 07:00:49 UTC (rev 1768) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJavaMojo.java 2010-06-29 11:10:54 UTC (rev 1769) @@ -26,13 +26,22 @@ package org.nuiton.i18n.plugin.parser.impl; import org.apache.maven.plugin.logging.Log; -import org.nuiton.i18n.plugin.parser.*; +import org.nuiton.i18n.plugin.parser.AbstractFileParser; +import org.nuiton.i18n.plugin.parser.AbstractI18nParserMojo; +import org.nuiton.i18n.plugin.parser.FileParser; +import org.nuiton.i18n.plugin.parser.I18nSourceEntry; +import org.nuiton.i18n.plugin.parser.ParserException; +import org.nuiton.i18n.plugin.parser.SourceEntry; import org.nuiton.io.FileUpdater; import org.nuiton.io.FileUpdaterHelper; import org.nuiton.io.SortedProperties; import org.nuiton.processor.filters.I18nFilter; -import java.io.*; +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.InputStreamReader; +import java.io.LineNumberReader; /** * Récupération des chaine a traduire depuis les fichiers java. @@ -106,9 +115,9 @@ public FileParser newFileParser() { return new JavaFileParser(getLog(), - encoding, + getEncoding(), oldParser, - showTouchedFiles + isShowTouchedFiles() ); } @@ -127,7 +136,7 @@ public void parseFile(File file) throws IOException { String line = null; LineNumberReader lnr = new LineNumberReader(new InputStreamReader( - new FileInputStream(file))); + new FileInputStream(file), getEncoding())); try { while ((line = lnr.readLine()) != null) { parseLine(file, line); @@ -160,7 +169,7 @@ String[] keys = keysSet.split("="); for (String key : keys) { if (getLog().isDebugEnabled()) { - getLog().debug(file.getName()+" detected key = " + key); + getLog().debug(file.getName() + " detected key = " + key); } registerKey(key); } Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserValidationMojo.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserValidationMojo.java 2010-06-27 07:00:49 UTC (rev 1768) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserValidationMojo.java 2010-06-29 11:10:54 UTC (rev 1769) @@ -31,7 +31,6 @@ import org.nuiton.io.MirroredFileUpdater; import org.xml.sax.EntityResolver; import org.xml.sax.InputSource; -import org.xml.sax.SAXException; import javax.xml.parsers.DocumentBuilder; import javax.xml.xpath.XPath; @@ -143,7 +142,7 @@ builder.setEntityResolver(getEntityResolver()); return new XmlFileParser(getLog(), - encoding, + getEncoding(), oldParser, showTouchedFiles, rules, @@ -178,8 +177,8 @@ boolean useLocal = useLocalResolver; @Override - public InputSource resolveEntity(String publicId, String systemId) - throws SAXException, IOException { + public InputSource resolveEntity(String publicId, + String systemId) throws IOException { if (getLog().isDebugEnabled()) { getLog().debug("publicID:" + publicId + ", systemId:" + systemId); Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserXmlMojo.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserXmlMojo.java 2010-06-27 07:00:49 UTC (rev 1768) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserXmlMojo.java 2010-06-29 11:10:54 UTC (rev 1769) @@ -42,7 +42,12 @@ import javax.xml.xpath.XPathConstants; import javax.xml.xpath.XPathExpression; import javax.xml.xpath.XPathFactory; -import java.io.*; +import java.io.BufferedInputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.io.InputStream; /** * Récupération des chaines à traduire depuis les fichiers xml. Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-06-27 07:00:49 UTC (rev 1768) +++ trunk/pom.xml 2010-06-29 11:10:54 UTC (rev 1769) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.2.1</version> + <version>2.2.2-SNAPSHOT</version> </parent> <artifactId>i18n</artifactId> @@ -253,7 +253,7 @@  <projectId>i18n</projectId> - <processor.version>1.0.3</processor.version> + <processor.version>1.0.4-SNAPSHOT</processor.version>  <locales>fr,en</locales>

1 0

r1768 - in trunk: ant-i18n-task/src ant-i18n-task/src/license maven-i18n-plugin/src maven-i18n-plugin/src/license nuiton-i18n-editor nuiton-i18n-editor/src/main/resources/i18n
by tchemit＠users.nuiton.org 27 Jun '10

27 Jun '10

Author: tchemit Date: 2010-06-27 09:00:49 +0200 (Sun, 27 Jun 2010) New Revision: 1768 Url: http://nuiton.org/repositories/revision/i18n/1768 Log: consolidate THIRD-PARTY Added: trunk/ant-i18n-task/src/license/ trunk/ant-i18n-task/src/license/THIRD-PARTY.properties trunk/maven-i18n-plugin/src/license/ trunk/maven-i18n-plugin/src/license/THIRD-PARTY.properties Modified: trunk/nuiton-i18n-editor/LICENSE.txt trunk/nuiton-i18n-editor/src/main/resources/i18n/nuiton-i18n-editor-en_GB.properties trunk/nuiton-i18n-editor/src/main/resources/i18n/nuiton-i18n-editor-fr_FR.properties Added: trunk/ant-i18n-task/src/license/THIRD-PARTY.properties =================================================================== --- trunk/ant-i18n-task/src/license/THIRD-PARTY.properties (rev 0) +++ trunk/ant-i18n-task/src/license/THIRD-PARTY.properties 2010-06-27 07:00:49 UTC (rev 1768) @@ -0,0 +1,14 @@ +# Generated by org.nuiton.license.plugin.AddThirdPartyMojo +#------------------------------------------------------------------------------- +# Already used licenses in project : +# - Common Public License Version 1.0 +# - Lesser General Public License (LGPL) +# - Lesser General Public License (LGPL) v 3.0 +# - The Apache Software License, Version 2.0 +#------------------------------------------------------------------------------- +# Please fill the missing licenses for dependencies : +# +# +#Sun Jun 27 08:59:58 CEST 2010 +org.apache.ant--ant--1.7.1=The Apache Software License, Version 2.0 +org.apache.ant--ant-launcher--1.7.1=The Apache Software License, Version 2.0 Property changes on: trunk/ant-i18n-task/src/license/THIRD-PARTY.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: trunk/maven-i18n-plugin/src/license/THIRD-PARTY.properties =================================================================== --- trunk/maven-i18n-plugin/src/license/THIRD-PARTY.properties (rev 0) +++ trunk/maven-i18n-plugin/src/license/THIRD-PARTY.properties 2010-06-27 07:00:49 UTC (rev 1768) @@ -0,0 +1,16 @@ +# Generated by org.nuiton.license.plugin.AddThirdPartyMojo +#------------------------------------------------------------------------------- +# Already used licenses in project : +# - Common Public License Version 1.0 +# - Lesser General Public License (LGPL) +# - Lesser General Public License (LGPL) v 3.0 +# - Public Domain +# - The Apache Software License, Version 2.0 +#------------------------------------------------------------------------------- +# Please fill the missing licenses for dependencies : +# +# +#Sun Jun 27 08:59:18 CEST 2010 +classworlds--classworlds--1.1-alpha-2=http\://classworlds.codehaus.org/license.html +commons-collections--commons-collections--3.1=The Apache Software License, Version 2.0 +org.codehaus.plexus--plexus-container-default--1.0-alpha-9-stable-1=The Apache Software License, Version 2.0 Property changes on: trunk/maven-i18n-plugin/src/license/THIRD-PARTY.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/nuiton-i18n-editor/LICENSE.txt =================================================================== --- trunk/nuiton-i18n-editor/LICENSE.txt 2010-06-27 06:35:28 UTC (rev 1767) +++ trunk/nuiton-i18n-editor/LICENSE.txt 2010-06-27 07:00:49 UTC (rev 1768) @@ -1,674 +1,166 @@ - GNU GENERAL PUBLIC LICENSE + GNU LESSER GENERAL PUBLIC LICENSE Version 3, 29 June 2007 Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. - Preamble - The GNU General Public License is a free, copyleft license for -software and other kinds of works. + This version of the GNU Lesser General Public License incorporates +the terms and conditions of version 3 of the GNU General Public +License, supplemented by the additional permissions listed below. - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. + 0. Additional Definitions. - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. + As used herein, "this License" refers to version 3 of the GNU Lesser +General Public License, and the "GNU GPL" refers to version 3 of the GNU +General Public License. - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. + "The Library" refers to a covered work governed by this License, +other than an Application or a Combined Work as defined below. - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. + An "Application" is any work that makes use of an interface provided +by the Library, but which is not otherwise based on the Library. +Defining a subclass of a class defined by the Library is deemed a mode +of using an interface provided by the Library. - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. + A "Combined Work" is a work produced by combining or linking an +Application with the Library. The particular version of the Library +with which the Combined Work was made is also called the "Linked +Version". - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. + The "Minimal Corresponding Source" for a Combined Work means the +Corresponding Source for the Combined Work, excluding any source code +for portions of the Combined Work that, considered in isolation, are +based on the Application, and not on the Linked Version. - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. + The "Corresponding Application Code" for a Combined Work means the +object code and/or source code for the Application, including any data +and utility programs needed for reproducing the Combined Work from the +Application, but excluding the System Libraries of the Combined Work. - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. + 1. Exception to Section 3 of the GNU GPL. - The precise terms and conditions for copying, distribution and -modification follow. + You may convey a covered work under sections 3 and 4 of this License +without being bound by section 3 of the GNU GPL. - TERMS AND CONDITIONS + 2. Conveying Modified Versions. - 0. Definitions. + If you modify a copy of the Library, and, in your modifications, a +facility refers to a function or data to be supplied by an Application +that uses the facility (other than as an argument passed when the +facility is invoked), then you may convey a copy of the modified +version: - "This License" refers to version 3 of the GNU General Public License. + a) under this License, provided that you make a good faith effort to + ensure that, in the event an Application does not supply the + function or data, the facility still operates, and performs + whatever part of its purpose remains meaningful, or - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. + b) under the GNU GPL, with none of the additional permissions of + this License applicable to that copy. - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. + 3. Object Code Incorporating Material from Library Header Files. - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. + The object code form of an Application may incorporate material from +a header file that is part of the Library. You may convey such object +code under terms of your choice, provided that, if the incorporated +material is not limited to numerical parameters, data structure +layouts and accessors, or small macros, inline functions and templates +(ten or fewer lines in length), you do both of the following: - A "covered work" means either the unmodified Program or a work based -on the Program. + a) Give prominent notice with each copy of the object code that the + Library is used in it and that the Library and its use are + covered by this License. - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. + b) Accompany the object code with a copy of the GNU GPL and this license + document. - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. + 4. Combined Works. - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. + You may convey a Combined Work under terms of your choice that, +taken together, effectively do not restrict modification of the +portions of the Library contained in the Combined Work and reverse +engineering for debugging such modifications, if you also do each of +the following: - 1. Source Code. + a) Give prominent notice with each copy of the Combined Work that + the Library is used in it and that the Library and its use are + covered by this License. - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. + b) Accompany the Combined Work with a copy of the GNU GPL and this license + document. - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. + c) For a Combined Work that displays copyright notices during + execution, include the copyright notice for the Library among + these notices, as well as a reference directing the user to the + copies of the GNU GPL and this license document. - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. + d) Do one of the following: - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. + 0) Convey the Minimal Corresponding Source under the terms of this + License, and the Corresponding Application Code in a form + suitable for, and under terms that permit, the user to + recombine or relink the Application with a modified version of + the Linked Version to produce a modified Combined Work, in the + manner specified by section 6 of the GNU GPL for conveying + Corresponding Source. - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. + 1) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (a) uses at run time + a copy of the Library already present on the user's computer + system, and (b) will operate properly with a modified version + of the Library that is interface-compatible with the Linked + Version. - The Corresponding Source for a work in source code form is that -same work. + e) Provide Installation Information, but only if you would otherwise + be required to provide such information under section 6 of the + GNU GPL, and only to the extent that such information is + necessary to install and execute a modified version of the + Combined Work produced by recombining or relinking the + Application with a modified version of the Linked Version. (If + you use option 4d0, the Installation Information must accompany + the Minimal Corresponding Source and Corresponding Application + Code. If you use option 4d1, you must provide the Installation + Information in the manner specified by section 6 of the GNU GPL + for conveying Corresponding Source.) - 2. Basic Permissions. + 5. Combined Libraries. - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. + You may place library facilities that are a work based on the +Library side by side in a single library together with other library +facilities that are not Applications and are not covered by this +License, and convey such a combined library under terms of your +choice, if you do both of the following: - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. + a) Accompany the combined library with a copy of the same work based + on the Library, uncombined with any other library facilities, + conveyed under the terms of this License. - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. + b) Give prominent notice with the combined library that part of it + is a work based on the Library, and explaining where to find the + accompanying uncombined form of the same work. - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + 6. Revised Versions of the GNU Lesser General Public License. - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. + The Free Software Foundation may publish revised and/or new versions +of the GNU Lesser General Public License from time to time. Such new +versions will be similar in spirit to the present version, but may +differ in detail to address new problems or concerns. - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. + Each version is given a distinguishing version number. If the +Library as you received it specifies that a certain numbered version +of the GNU Lesser General Public License "or any later version" +applies to it, you have the option of following the terms and +conditions either of that published version or of any later version +published by the Free Software Foundation. If the Library as you +received it does not specify a version number of the GNU Lesser +General Public License, you may choose any version of the GNU Lesser +General Public License ever published by the Free Software Foundation. - 4. Conveying Verbatim Copies. + If the Library as you received it specifies that a proxy can decide +whether future versions of the GNU Lesser General Public License shall +apply, that proxy's public statement of acceptance of any version is +permanent authorization for you to choose that version for the +Library. - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Use with the GNU Affero General Public License. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - <one line to give the program's name and a brief idea of what it does.> - Copyright (C) <year> <name of author> - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. - -Also add information on how to contact you by electronic and paper mail. - - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: - - <program> Copyright (C) <year> <name of author> - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see -<http://www.gnu.org/licenses/>. - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -<http://www.gnu.org/philosophy/why-not-lgpl.html>. Modified: trunk/nuiton-i18n-editor/src/main/resources/i18n/nuiton-i18n-editor-en_GB.properties =================================================================== --- trunk/nuiton-i18n-editor/src/main/resources/i18n/nuiton-i18n-editor-en_GB.properties 2010-06-27 06:35:28 UTC (rev 1767) +++ trunk/nuiton-i18n-editor/src/main/resources/i18n/nuiton-i18n-editor-en_GB.properties 2010-06-27 07:00:49 UTC (rev 1768) @@ -38,6 +38,7 @@ i18neditor.action.normalscreen.tip=Go back in frame mode i18neditor.action.openOtherProject=Open other project i18neditor.action.openProject=Open a project +i18neditor.action.reload.application= i18neditor.action.reset.value.tip= i18neditor.action.save.value.tip= i18neditor.action.showHelp.tip=Show context sensitve help Modified: trunk/nuiton-i18n-editor/src/main/resources/i18n/nuiton-i18n-editor-fr_FR.properties =================================================================== --- trunk/nuiton-i18n-editor/src/main/resources/i18n/nuiton-i18n-editor-fr_FR.properties 2010-06-27 06:35:28 UTC (rev 1767) +++ trunk/nuiton-i18n-editor/src/main/resources/i18n/nuiton-i18n-editor-fr_FR.properties 2010-06-27 07:00:49 UTC (rev 1768) @@ -38,6 +38,7 @@ i18neditor.action.normalscreen.tip=retour en mode fen\u00EAtre i18neditor.action.openOtherProject=Ouvrir un projet (autre r\u00E9pertoire) i18neditor.action.openProject=Ouvrir un projet... +i18neditor.action.reload.application= i18neditor.action.reset.value.tip=R\u00E9initialiser i18neditor.action.save.value.tip=Sauver la traduction modifi\u00E9e i18neditor.action.showHelp.tip=Voir l'aide contextuelle

1 0