Updated some translation strings

Author: cmaglie

arduino-core/src/cc/arduino/packages/uploaders/SerialUploader.java

@@ -114,7 +114,8 @@ public boolean uploadUsingPreferences(File sourcePath, String buildPath, String
         List<String> before = Serial.list();
         if (before.contains(uploadPort)) {
           if (verbose)
-            System.out.println(_("Forcing reset using 1200bps open/close on port ") + uploadPort);
+            System.out.println(
+              I18n.format(_("Forcing reset using 1200bps open/close on port {0}"), uploadPort));
           Serial.touchPort(uploadPort, 1200);
         }
         Thread.sleep(400);

arduino-core/src/processing/app/BaseNoGui.java

@@ -487,9 +487,9 @@ static public void init(String[] args) {
         List<String> warningsAccumulator = new LinkedList<String>();
         boolean success = false;
         try {
-          // costruttore di Editor carica lo sketch usando handleOpenInternal() che fa
-          // la new di Sketch che chiama load() nel suo costruttore
-          // In questo punto questo si traduce in:
+          // Editor constructor loads the sketch with handleOpenInternal() that
+          // creates a new Sketch that, in trun, calls load() inside its constructor
+          // This translates here as:
           //   SketchData data = new SketchData(file);
           //   File tempBuildFolder = getBuildFolder();
           //   data.load();
@@ -498,17 +498,17 @@ static public void init(String[] args) {
           data.load();
 
           // Sketch.exportApplet()
-          //  - chiama Sketch.prepare() che chiama Sketch.ensureExistence()
-          //  - chiama Sketch.build(verbose=false) che chiama Sketch.ensureExistence(), imposta il progressListener e chiama Compiler.build()
-          //  - chiama Sketch.upload() (cfr. dopo...)
+          //  - calls Sketch.prepare() that calls Sketch.ensureExistence()
+          //  - calls Sketch.build(verbose=false) that calls Sketch.ensureExistence(), set progressListener and calls Compiler.build()
+          //  - calls Sketch.upload() (see later...)
           if (!data.getFolder().exists()) showError(_("No sketch"), _("Can't find the sketch in the specified path"), null);
           String suggestedClassName = Compiler.build(data, tempBuildFolder.getAbsolutePath(), tempBuildFolder, null, parser.isDoVerboseBuild());
           if (suggestedClassName == null) showError(_("Error while verifying"), _("An error occurred while verifying the sketch"), null);
           showMessage(_("Done compiling"), _("Done compiling"));
 
           //  - chiama Sketch.upload() ... to be continued ...        
           Uploader uploader = Compiler.getUploaderByPreferences(parser.isNoUploadPort());
-          if (uploader.requiresAuthorization() && !PreferencesData.has(uploader.getAuthorizationKey())) showError(_("..."), _("..."), null);
+          if (uploader.requiresAuthorization() && !PreferencesData.has(uploader.getAuthorizationKey())) showError("...", "...", null);
           try {
             success = Compiler.upload(data, uploader, tempBuildFolder.getAbsolutePath(), suggestedClassName, parser.isDoUseProgrammer(), parser.isNoUploadPort(), warningsAccumulator);
             showMessage(_("Done uploading"), _("Done uploading"));
@@ -531,19 +531,19 @@ static public void init(String[] args) {
         for (String path : parser.getFilenames())
         {
           try {
-            // costruttore di Editor carica lo sketch usando handleOpenInternal() che fa
-            // la new di Sketch che chiama load() nel suo costruttore
-            // In questo punto questo si traduce in:
+            // Editor constructor loads sketch with handleOpenInternal() that
+            // creates a new Sketch that calls load() in its constructor
+            // This translates here as:
             //   SketchData data = new SketchData(file);
             //   File tempBuildFolder = getBuildFolder();
             //   data.load();
             SketchData data = new SketchData(absoluteFile(path));
             File tempBuildFolder = getBuildFolder();
             data.load();
 
-            // metodo Sketch.prepare() chiama Sketch.ensureExistence()
-            // Sketch.build(verbose) chiama Sketch.ensureExistence() e poi imposta il progressListener e, finalmente, chiama Compiler.build()
-            // In questo punto questo si traduce in:
+            // Sketch.prepare() calls Sketch.ensureExistence()
+            // Sketch.build(verbose) calls Sketch.ensureExistence() and set progressListener and, finally, calls Compiler.build()
+            // This translates here as:
             //    if (!data.getFolder().exists()) showError(...);
             //    String ... = Compiler.build(data, tempBuildFolder.getAbsolutePath(), tempBuildFolder, null, verbose);
             if (!data.getFolder().exists()) showError(_("No sketch"), _("Can't find the sketch in the specified path"), null);

arduino-core/src/processing/app/debug/Compiler.java

@@ -86,7 +86,7 @@ public interface ProgressListener {
   static public String build(SketchData data, String buildPath, File tempBuildFolder, ProgressListener progListener, boolean verbose) throws RunnerException, PreferencesMapException {
     if (SketchData.checkSketchFile(data.getPrimaryFile()) == null)
       BaseNoGui.showError(_("Bad file selected"),
-                          _("Bad sketch primary file or bad sketck directory structure"), null);
+                          _("Bad sketch primary file or bad sketch directory structure"), null);
 
     String primaryClassName = data.getName() + ".cpp";
     Compiler compiler = new Compiler(data, buildPath, primaryClassName);

arduino-core/src/processing/app/i18n/update.sh

@@ -21,6 +21,7 @@ catalog()
   # Generate the new text catalog without the already translated texts.
   # The 'merge existing' option for xgetext does not work propery for our purpose.
   find ../../../ -name '*.java' -print > "$files"
+  find ../../../../../app/src -name '*.java' -print >> "$files"
   xgettext -s -L Java --from-code=utf-8 -k_ --output="$catalog" --files-from="$files"
 }