Skip to content

Fix translatable strings removed before 1.8.0 #5803

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 4, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions arduino-core/src/cc/arduino/Compiler.java
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,31 @@ public class Compiler implements MessageConsumer {
tr("Warning: platform.txt from core '{0}' misses property '{1}', using default value '{2}'. Consider upgrading this core.");
tr("Warning: platform.txt from core '{0}' contains deprecated {1}, automatically converted to {2}. Consider upgrading this core.");
tr("WARNING: Spurious {0} folder in '{1}' library");
tr("Sketch uses {0} bytes ({2}%%) of program storage space. Maximum is {1} bytes.");
tr("Couldn't determine program size: {0}");
tr("Global variables use {0} bytes ({2}%%) of dynamic memory, leaving {3} bytes for local variables. Maximum is {1} bytes.");
tr("Global variables use {0} bytes of dynamic memory.");
tr("Sketch too big; see http://www.arduino.cc/en/Guide/Troubleshooting#size for tips on reducing it.");
tr("Not enough memory; see http://www.arduino.cc/en/Guide/Troubleshooting#size for tips on reducing your footprint.");
tr("Low memory available, stability problems may occur.");
tr("An error occurred while verifying the sketch");
tr("An error occurred while verifying/uploading the sketch");
tr("Can't find the sketch in the specified path");
tr("Done compiling");
tr("Done uploading");
tr("Error while uploading");
tr("Error while verifying");
tr("Error while verifying/uploading");
tr("Mode not supported");
tr("Multiple files not supported");
tr("No command line parameters found");
tr("No parameters");
tr("No sketch");
tr("No sketchbook");
tr("Only --verify, --upload or --get-pref are supported");
tr("Sketchbook path not defined");
tr("The --upload option supports only one file at a time");
tr("Verifying and uploading...");
}

enum BuilderAction {
Expand Down
2 changes: 1 addition & 1 deletion arduino-core/src/processing/app/i18n/python/pull.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env python
#!/usr/bin/env python2
#vim:set fileencoding=utf-8 sw=2 expandtab

from transifex import Transifex
Expand Down
2 changes: 1 addition & 1 deletion arduino-core/src/processing/app/i18n/python/push.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env python
#!/usr/bin/env python2
#vim:set fileencoding=utf-8 sw=2 expandtab

from transifex import Transifex
Expand Down
2 changes: 1 addition & 1 deletion arduino-core/src/processing/app/i18n/python/transifex.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env python
#!/usr/bin/env python2
#vim:set fileencoding=utf-8 sw=2 expandtab

import update
Expand Down
2 changes: 1 addition & 1 deletion arduino-core/src/processing/app/i18n/python/update.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env python
#!/usr/bin/env python2
#vim:set fileencoding=utf-8 sw=2 expandtab

def unquote(s):
Expand Down
2 changes: 1 addition & 1 deletion arduino-core/src/processing/app/i18n/update.sh
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ catalog()
update()
{
echo -e "Updating $1...\c"
cat "$catalog" | python python/update.py "$1"
cat "$catalog" | python2 python/update.py "$1"
msgcat -p "$1" > $(basename "$1" .po).properties
# msgcat may complain about "CHARSET" if you didn't replace "CHARSET" with
# your correct charset.
Expand Down