diff --git a/arduino-core/src/cc/arduino/Compiler.java b/arduino-core/src/cc/arduino/Compiler.java
index f2af0f739c5..ddd0fad52f3 100644
--- a/arduino-core/src/cc/arduino/Compiler.java
+++ b/arduino-core/src/cc/arduino/Compiler.java
@@ -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 {
diff --git a/arduino-core/src/processing/app/i18n/python/pull.py b/arduino-core/src/processing/app/i18n/python/pull.py
index 3c3158bd71e..bf0ec34e8ee 100644
--- a/arduino-core/src/processing/app/i18n/python/pull.py
+++ b/arduino-core/src/processing/app/i18n/python/pull.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 #vim:set fileencoding=utf-8 sw=2 expandtab
 
 from transifex import Transifex
diff --git a/arduino-core/src/processing/app/i18n/python/push.py b/arduino-core/src/processing/app/i18n/python/push.py
index 8433a486477..b156decd267 100644
--- a/arduino-core/src/processing/app/i18n/python/push.py
+++ b/arduino-core/src/processing/app/i18n/python/push.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 #vim:set fileencoding=utf-8 sw=2 expandtab
 
 from transifex import Transifex
diff --git a/arduino-core/src/processing/app/i18n/python/transifex.py b/arduino-core/src/processing/app/i18n/python/transifex.py
index 51101d2ff13..472de4084a1 100644
--- a/arduino-core/src/processing/app/i18n/python/transifex.py
+++ b/arduino-core/src/processing/app/i18n/python/transifex.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 #vim:set fileencoding=utf-8 sw=2 expandtab
 
 import update
diff --git a/arduino-core/src/processing/app/i18n/python/update.py b/arduino-core/src/processing/app/i18n/python/update.py
index 29b26fbae3c..afcada35b31 100644
--- a/arduino-core/src/processing/app/i18n/python/update.py
+++ b/arduino-core/src/processing/app/i18n/python/update.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 #vim:set fileencoding=utf-8 sw=2 expandtab
 
 def unquote(s):
diff --git a/arduino-core/src/processing/app/i18n/update.sh b/arduino-core/src/processing/app/i18n/update.sh
index 4a2e46c4172..bc050e66e38 100755
--- a/arduino-core/src/processing/app/i18n/update.sh
+++ b/arduino-core/src/processing/app/i18n/update.sh
@@ -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.