arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-06-15 00:02:49 +03:00
Code Activity

Updated some translation strings

Browse Source
This commit is contained in:
Cristian Maglie
2015-01-14 18:05:00 +01:00
parent 81808d532e
commit ff95d03663
4 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
arduino-core/src/cc/arduino/packages/uploaders/SerialUploader.java
View File

@ -114,7 +114,8 @@ public class SerialUploader extends Uploader {
List<String> before = Serial.list(); List<String> before = Serial.list();
if (before.contains(uploadPort)) { if (before.contains(uploadPort)) {
if (verbose) 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); Serial.touchPort(uploadPort, 1200);
} }
Thread.sleep(400); Thread.sleep(400);

26
arduino-core/src/processing/app/BaseNoGui.java
View File

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

2
arduino-core/src/processing/app/debug/Compiler.java
View File

@ -86,7 +86,7 @@ public class Compiler implements MessageConsumer {
static public String build(SketchData data, String buildPath, File tempBuildFolder, ProgressListener progListener, boolean verbose) throws RunnerException, PreferencesMapException { static public String build(SketchData data, String buildPath, File tempBuildFolder, ProgressListener progListener, boolean verbose) throws RunnerException, PreferencesMapException {
if (SketchData.checkSketchFile(data.getPrimaryFile()) == null) if (SketchData.checkSketchFile(data.getPrimaryFile()) == null)
BaseNoGui.showError(_("Bad file selected"), 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"; String primaryClassName = data.getName() + ".cpp";
Compiler compiler = new Compiler(data, buildPath, primaryClassName); Compiler compiler = new Compiler(data, buildPath, primaryClassName);

1
arduino-core/src/processing/app/i18n/update.sh
View File

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