Merge remote-tracking branch 'arduino/master' into iserial2_complete

Author: facchinm

README.md

@@ -1,16 +1,16 @@
 Arduino
 ========
 
-* Arduino is an open-source physical computing platform based on a simple i/o
+* Arduino is an open-source physical computing platform based on a simple I/O
 board and a development environment that implements the Processing/Wiring
 language. Arduino can be used to develop stand-alone interactive objects or
-can be connected to software on your computer (e.g. Flash, Processing, MaxMSP).
+can be connected to software on your computer (e.g. Flash, Processing and MaxMSP).
 The boards can be assembled by hand or purchased preassembled; the open-source
 IDE can be downloaded for free at http://www.arduino.cc/en/Main/Software
 
 * For more information, see the website at: http://www.arduino.cc/
 or the forums at: http://www.arduino.cc/forum/  
-You can also follow Arduino on twitter at: https://twitter.com/arduino or
+You can also follow Arduino on Twitter at: https://twitter.com/arduino or
 like Arduino on Facebook at: https://www.facebook.com/official.arduino
 
 * To report a *bug* in the software or to request *a simple enhancement* go to:

app/src/processing/app/syntax/PdeKeywords.java

@@ -148,7 +148,11 @@ private void fillMissingTokenType() {
       if (!keywordTokenTypeAsString.containsKey(keyword)) {
         if ("KEYWORD1".equals(oldTokenEntry.getValue())) {
           parseRSyntaxTextAreaTokenType("DATA_TYPE", keyword);
-        } else {
+        }
+        else if ("LITERAL1".equals(oldTokenEntry.getValue())) {      
+          parseRSyntaxTextAreaTokenType("RESERVED_WORD_2", keyword);
+        }
+        else {
           parseRSyntaxTextAreaTokenType("FUNCTION", keyword);
         }
       }

arduino-core/src/cc/arduino/Compiler.java

@@ -269,7 +269,7 @@ private void callArduinoBuilder(TargetBoard board, TargetPlatform platform, Targ
     }
 
     if (result != 0) {
-      RunnerException re = new RunnerException(tr("Error compiling."));
+      RunnerException re = new RunnerException(I18n.format(tr("Error compiling for board {0}."), board.getName()));
       re.hideStackTrace();
       throw re;
     }

arduino-core/src/cc/arduino/utils/network/FileDownloader.java

@@ -32,6 +32,8 @@
 import cc.arduino.net.CustomProxySelector;
 import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.compress.utils.IOUtils;
+
+import processing.app.BaseNoGui;
 import processing.app.PreferencesData;
 
 import java.io.File;
@@ -66,12 +68,15 @@ public enum Status {
   private final File outputFile;
   private InputStream stream = null;
   private Exception error;
+  private String userAgent;
 
   public FileDownloader(URL url, File file) {
     downloadUrl = url;
     outputFile = file;
     downloaded = 0;
     initialSize = 0;
+    userAgent = "ArduinoIDE/" + BaseNoGui.VERSION_NAME + " Java/"
+                + System.getProperty("java.version");
   }
 
   public long getInitialSize() {
@@ -151,7 +156,7 @@ private void downloadFile() throws InterruptedException {
       }
 
       HttpURLConnection connection = (HttpURLConnection) downloadUrl.openConnection(proxy);
-
+      connection.setRequestProperty("User-agent", userAgent);
       if (downloadUrl.getUserInfo() != null) {
         String auth = "Basic " + new String(new Base64().encode(downloadUrl.getUserInfo().getBytes()));
         connection.setRequestProperty("Authorization", auth);
@@ -172,6 +177,7 @@ private void downloadFile() throws InterruptedException {
 
         // open the new connnection again
         connection = (HttpURLConnection) newUrl.openConnection(proxy);
+        connection.setRequestProperty("User-agent", userAgent);
         if (downloadUrl.getUserInfo() != null) {
           String auth = "Basic " + new String(new Base64().encode(downloadUrl.getUserInfo().getBytes()));
           connection.setRequestProperty("Authorization", auth);

arduino-core/src/processing/app/i18n/Resources_af.po

@@ -10,14 +10,15 @@
 # Translators:
 # Translators:
 # Translators:
+# Translators:
 # Edrean Ernst <[email protected]>, 2015
 msgid ""
 msgstr ""
 "Project-Id-Version: Arduino IDE 1.5\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2012-03-29 10:24-0400\n"
-"PO-Revision-Date: 2015-11-18 16:15+0000\n"
-"Last-Translator: Federico Fissore <f.fissore@arduino.cc>\n"
+"PO-Revision-Date: 2016-01-05 11:36+0000\n"
+"Last-Translator: Cristian Maglie <c.maglie@arduino.cc>\n"
 "Language-Team: Afrikaans (http://www.transifex.com/mbanzi/arduino-ide-15/language/af/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -1572,8 +1573,9 @@ msgstr ""
 msgid "Problem accessing board folder /www/sd"
 msgstr ""
 
-#: ../../../cc/arduino/packages/uploaders/SSHUploader.java:132
-msgid "Problem accessing files in folder "
+#: ../../../../../arduino-core/src/cc/arduino/packages/uploaders/SSHUploader.java:206
+#, java-format
+msgid "Problem accessing files in folder \"{0}\""
 msgstr ""
 
 #: Base.java:1673
@@ -1662,6 +1664,10 @@ msgstr ""
 msgid "Replace with:"
 msgstr ""
 
+#: ../../../../../arduino-core/src/processing/app/I18n.java:28
+msgid "Retired"
+msgstr ""
+
 #: Preferences.java:113
 msgid "Romanian"
 msgstr ""
@@ -1802,10 +1808,6 @@ msgstr ""
 msgid "Show Sketch Folder"
 msgstr ""
 
-#: ../../../processing/app/EditorStatus.java:468
-msgid "Show verbose output during compilation"
-msgstr ""
-
 #: Preferences.java:387
 msgid "Show verbose output during: "
 msgstr ""
@@ -1925,6 +1927,10 @@ msgstr ""
 msgid "Tamil"
 msgstr ""
 
+#: ../../../../../app/src/cc/arduino/i18n/Languages.java:100
+msgid "Thai"
+msgstr ""
+
 #: debug/Compiler.java:414
 msgid "The 'BYTE' keyword is no longer supported."
 msgstr ""
@@ -2038,8 +2044,11 @@ msgid ""
 "Are you sure you want to delete it?"
 msgstr ""
 
-#: ../../../processing/app/EditorStatus.java:467
-msgid "This report would have more information with"
+#: ../../../../../app/src/processing/app/EditorStatus.java:349
+msgid ""
+"This report would have more information with\n"
+"\"Show verbose output during compilation\"\n"
+"option enabled in File -> Preferences.\n"
 msgstr ""
 
 #: Base.java:535
@@ -2414,13 +2423,13 @@ msgstr ""
 msgid "\".{0}\" is not a valid extension."
 msgstr ""
 
-#: SketchCode.java:258
+#: ../../../../../arduino-core/src/processing/app/SketchCode.java:201
 #, java-format
 msgid ""
-"\"{0}\" contains unrecognized characters.If this code was created with an "
-"older version of Arduino,you may need to use Tools -> Fix Encoding & Reload "
-"to updatethe sketch to use UTF-8 encoding. If not, you may need todelete the"
-" bad characters to get rid of this warning."
+"\"{0}\" contains unrecognized characters. If this code was created with an "
+"older version of Arduino, you may need to use Tools -> Fix Encoding & Reload"
+" to update the sketch to use UTF-8 encoding. If not, you may need to delete "
+"the bad characters to get rid of this warning."
 msgstr ""
 
 #: debug/Compiler.java:409
@@ -2490,10 +2499,6 @@ msgstr ""
 msgid "createNewFile() returned false"
 msgstr ""
 
-#: ../../../processing/app/EditorStatus.java:469
-msgid "enabled in File > Preferences."
-msgstr ""
-
 #: ../../../../../app/src/processing/app/Editor.java:1352
 msgid "http://www.arduino.cc/"
 msgstr ""
@@ -2570,6 +2575,11 @@ msgstr ""
 msgid "{0} must be a folder"
 msgstr ""
 
+#: ../../../../../app/src/processing/app/EditorLineStatus.java:109
+#, java-format
+msgid "{0} on {1}"
+msgstr ""
+
 #: ../../../../../arduino-core/src/cc/arduino/Compiler.java:78
 #, java-format
 msgid "{0} pattern is missing"

arduino-core/src/processing/app/i18n/Resources_af.properties

@@ -10,8 +10,9 @@
 # Translators:
 # Translators:
 # Translators:
+# Translators:
 # Edrean Ernst <[email protected]>, 2015
-!=Project-Id-Version\: Arduino IDE 1.5\nReport-Msgid-Bugs-To\: \nPOT-Creation-Date\: 2012-03-29 10\:24-0400\nPO-Revision-Date\: 2015-11-18 16\:15+0000\nLast-Translator\: Federico Fissore <f.fissore@arduino.cc>\nLanguage-Team\: Afrikaans (http\://www.transifex.com/mbanzi/arduino-ide-15/language/af/)\nMIME-Version\: 1.0\nContent-Type\: text/plain; charset\=UTF-8\nContent-Transfer-Encoding\: 8bit\nLanguage\: af\nPlural-Forms\: nplurals\=2; plural\=(n \!\= 1);\n
+!=Project-Id-Version\: Arduino IDE 1.5\nReport-Msgid-Bugs-To\: \nPOT-Creation-Date\: 2012-03-29 10\:24-0400\nPO-Revision-Date\: 2016-01-05 11\:36+0000\nLast-Translator\: Cristian Maglie <c.maglie@arduino.cc>\nLanguage-Team\: Afrikaans (http\://www.transifex.com/mbanzi/arduino-ide-15/language/af/)\nMIME-Version\: 1.0\nContent-Type\: text/plain; charset\=UTF-8\nContent-Transfer-Encoding\: 8bit\nLanguage\: af\nPlural-Forms\: nplurals\=2; plural\=(n \!\= 1);\n
 
 #: Preferences.java:358 Preferences.java:374
 !\ \ (requires\ restart\ of\ Arduino)=
@@ -1146,8 +1147,9 @@ Arduino\:\ =Arduino\:
 #: ../../../cc/arduino/packages/uploaders/SSHUploader.java:136
 !Problem\ accessing\ board\ folder\ /www/sd=
 
-#: ../../../cc/arduino/packages/uploaders/SSHUploader.java:132
-!Problem\ accessing\ files\ in\ folder\ =
+#: ../../../../../arduino-core/src/cc/arduino/packages/uploaders/SSHUploader.java:206
+#, java-format
+!Problem\ accessing\ files\ in\ folder\ "{0}"=
 
 #: Base.java:1673
 !Problem\ getting\ data\ folder=
@@ -1213,6 +1215,9 @@ Arduino\:\ =Arduino\:
 #: FindReplace.java:81
 !Replace\ with\:=
 
+#: ../../../../../arduino-core/src/processing/app/I18n.java:28
+!Retired=
+
 #: Preferences.java:113
 !Romanian=
 
@@ -1317,9 +1322,6 @@ Arduino\:\ =Arduino\:
 #: Editor.java:641
 !Show\ Sketch\ Folder=
 
-#: ../../../processing/app/EditorStatus.java:468
-!Show\ verbose\ output\ during\ compilation=
-
 #: Preferences.java:387
 !Show\ verbose\ output\ during\:\ =
 
@@ -1403,6 +1405,9 @@ System\ Default=Stelsel Verstek
 #: Preferences.java:116
 !Tamil=
 
+#: ../../../../../app/src/cc/arduino/i18n/Languages.java:100
+!Thai=
+
 #: debug/Compiler.java:414
 !The\ 'BYTE'\ keyword\ is\ no\ longer\ supported.=
 
@@ -1461,8 +1466,8 @@ System\ Default=Stelsel Verstek
 #: ../../../../../app/src/cc/arduino/contributions/libraries/ui/LibraryManagerUI.java:257
 !This\ library\ is\ not\ listed\ on\ Library\ Manager.\ You\ won't\ be\ able\ to\ reinstall\ it\ from\ here.\nAre\ you\ sure\ you\ want\ to\ delete\ it?=
 
-#: ../../../processing/app/EditorStatus.java:467
-!This\ report\ would\ have\ more\ information\ with=
+#: ../../../../../app/src/processing/app/EditorStatus.java:349
+!This\ report\ would\ have\ more\ information\ with\n"Show\ verbose\ output\ during\ compilation"\noption\ enabled\ in\ File\ ->\ Preferences.\n=
 
 #: Base.java:535
 !Time\ for\ a\ Break=
@@ -1729,9 +1734,9 @@ Yes=Ja
 #, java-format
 !".{0}"\ is\ not\ a\ valid\ extension.=
 
-#: SketchCode.java:258
+#: ../../../../../arduino-core/src/processing/app/SketchCode.java:201
 #, java-format
-!"{0}"\ contains\ unrecognized\ characters.If\ this\ code\ was\ created\ with\ an\ older\ version\ of\ Arduino,you\ may\ need\ to\ use\ Tools\ ->\ Fix\ Encoding\ &\ Reload\ to\ updatethe\ sketch\ to\ use\ UTF-8\ encoding.\ If\ not,\ you\ may\ need\ todelete\ the\ bad\ characters\ to\ get\ rid\ of\ this\ warning.=
+!"{0}"\ contains\ unrecognized\ characters.\ If\ this\ code\ was\ created\ with\ an\ older\ version\ of\ Arduino,\ you\ may\ need\ to\ use\ Tools\ ->\ Fix\ Encoding\ &\ Reload\ to\ update\ the\ sketch\ to\ use\ UTF-8\ encoding.\ If\ not,\ you\ may\ need\ to\ delete\ the\ bad\ characters\ to\ get\ rid\ of\ this\ warning.=
 
 #: debug/Compiler.java:409
 !\nAs\ of\ Arduino\ 0019,\ the\ Ethernet\ library\ depends\ on\ the\ SPI\ library.\nYou\ appear\ to\ be\ using\ it\ or\ another\ library\ that\ depends\ on\ the\ SPI\ library.\n\n=
@@ -1766,9 +1771,6 @@ Yes=Ja
 #: Sketch.java:540
 !createNewFile()\ returned\ false=
 
-#: ../../../processing/app/EditorStatus.java:469
-!enabled\ in\ File\ >\ Preferences.=
-
 #: ../../../../../app/src/processing/app/Editor.java:1352
 !http\://www.arduino.cc/=
 
@@ -1828,6 +1830,10 @@ Yes=Ja
 #, java-format
 !{0}\ must\ be\ a\ folder=
 
+#: ../../../../../app/src/processing/app/EditorLineStatus.java:109
+#, java-format
+!{0}\ on\ {1}=
+
 #: ../../../../../arduino-core/src/cc/arduino/Compiler.java:78
 #, java-format
 !{0}\ pattern\ is\ missing=