diff --git a/app/src/processing/app/EditorStatus.java b/app/src/processing/app/EditorStatus.java index 684b1043f..b6551c7fa 100644 --- a/app/src/processing/app/EditorStatus.java +++ b/app/src/processing/app/EditorStatus.java @@ -346,9 +346,9 @@ public class EditorStatus extends JPanel { message1 += editor.console.getText(); if (!(PreferencesData.getBoolean("build.verbose"))) { message1 += "\n\n"; - message1 += tr(" This report would have more information with\n" + - " \"Show verbose output during compilation\"\n" + - " enabled in File -> Preferences.\n"); + message1 += tr("This report would have more information with\n" + + "\"Show verbose output during compilation\"\n" + + "option enabled in File -> Preferences.\n"); } Clipboard clipboard = Toolkit.getDefaultToolkit().getSystemClipboard(); StringSelection data = new StringSelection(message1); diff --git a/arduino-core/src/processing/app/i18n/Resources_en.po b/arduino-core/src/processing/app/i18n/Resources_en.po index 2cba974d8..6f534181f 100644 --- a/arduino-core/src/processing/app/i18n/Resources_en.po +++ b/arduino-core/src/processing/app/i18n/Resources_en.po @@ -10,13 +10,14 @@ # Translators: # Translators: # Translators: +# Translators: 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 \n" +"PO-Revision-Date: 2016-01-05 11:36+0000\n" +"Last-Translator: Cristian Maglie \n" "Language-Team: English (http://www.transifex.com/mbanzi/arduino-ide-15/language/en/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -1571,9 +1572,10 @@ msgstr "Problem Setting the Platform" msgid "Problem accessing board folder /www/sd" msgstr "Problem accessing board folder /www/sd" -#: ../../../cc/arduino/packages/uploaders/SSHUploader.java:132 -msgid "Problem accessing files in folder " -msgstr "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 "Problem accessing files in folder \"{0}\"" #: Base.java:1673 msgid "Problem getting data folder" @@ -1661,6 +1663,10 @@ msgstr "Replace the existing version of {0}?" msgid "Replace with:" msgstr "Replace with:" +#: ../../../../../arduino-core/src/processing/app/I18n.java:28 +msgid "Retired" +msgstr "Retired" + #: Preferences.java:113 msgid "Romanian" msgstr "Romanian" @@ -1801,10 +1807,6 @@ msgstr "Settings issues" msgid "Show Sketch Folder" msgstr "Show Sketch Folder" -#: ../../../processing/app/EditorStatus.java:468 -msgid "Show verbose output during compilation" -msgstr "Show verbose output during compilation" - #: Preferences.java:387 msgid "Show verbose output during: " msgstr "Show verbose output during: " @@ -1924,6 +1926,10 @@ msgstr "Talossan" msgid "Tamil" msgstr "Tamil" +#: ../../../../../app/src/cc/arduino/i18n/Languages.java:100 +msgid "Thai" +msgstr "Thai" + #: debug/Compiler.java:414 msgid "The 'BYTE' keyword is no longer supported." msgstr "The 'BYTE' keyword is no longer supported." @@ -2037,9 +2043,12 @@ msgid "" "Are you sure you want to delete it?" msgstr "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 -msgid "This report would have more information with" -msgstr "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 "This report would have more information with\n\"Show verbose output during compilation\"\noption enabled in File -> Preferences.\n" #: Base.java:535 msgid "Time for a Break" @@ -2413,14 +2422,14 @@ msgstr "Zip doesn't contain a library" msgid "\".{0}\" is not a valid extension." msgstr "\".{0}\" is not a valid extension." -#: 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." -msgstr "\"{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 "\"{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 msgid "" @@ -2489,10 +2498,6 @@ msgstr "connected!" msgid "createNewFile() returned false" msgstr "createNewFile() returned false" -#: ../../../processing/app/EditorStatus.java:469 -msgid "enabled in File > Preferences." -msgstr "enabled in File > Preferences." - #: ../../../../../app/src/processing/app/Editor.java:1352 msgid "http://www.arduino.cc/" msgstr "http://www.arduino.cc/" @@ -2569,6 +2574,11 @@ msgstr "{0} libraries" msgid "{0} must be a folder" msgstr "{0} must be a folder" +#: ../../../../../app/src/processing/app/EditorLineStatus.java:109 +#, java-format +msgid "{0} on {1}" +msgstr "{0} on {1}" + #: ../../../../../arduino-core/src/cc/arduino/Compiler.java:78 #, java-format msgid "{0} pattern is missing" diff --git a/arduino-core/src/processing/app/i18n/Resources_en.properties b/arduino-core/src/processing/app/i18n/Resources_en.properties index 8fe2a47db..9099d1321 100644 --- a/arduino-core/src/processing/app/i18n/Resources_en.properties +++ b/arduino-core/src/processing/app/i18n/Resources_en.properties @@ -10,7 +10,8 @@ # Translators: # Translators: # Translators: -!=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 \nLanguage-Team\: English (http\://www.transifex.com/mbanzi/arduino-ide-15/language/en/)\nMIME-Version\: 1.0\nContent-Type\: text/plain; charset\=UTF-8\nContent-Transfer-Encoding\: 8bit\nLanguage\: en\nPlural-Forms\: nplurals\=2; plural\=(n \!\= 1);\n +# Translators: +!=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 \nLanguage-Team\: English (http\://www.transifex.com/mbanzi/arduino-ide-15/language/en/)\nMIME-Version\: 1.0\nContent-Type\: text/plain; charset\=UTF-8\nContent-Transfer-Encoding\: 8bit\nLanguage\: en\nPlural-Forms\: nplurals\=2; plural\=(n \!\= 1);\n #: Preferences.java:358 Preferences.java:374 \ \ (requires\ restart\ of\ Arduino)=\ (requires restart of Arduino) @@ -1145,8 +1146,9 @@ Problem\ Setting\ the\ Platform=Problem Setting the Platform #: ../../../cc/arduino/packages/uploaders/SSHUploader.java:136 Problem\ accessing\ board\ folder\ /www/sd=Problem accessing board folder /www/sd -#: ../../../cc/arduino/packages/uploaders/SSHUploader.java:132 -Problem\ accessing\ files\ in\ folder\ =Problem accessing files in folder +#: ../../../../../arduino-core/src/cc/arduino/packages/uploaders/SSHUploader.java:206 +#, java-format +Problem\ accessing\ files\ in\ folder\ "{0}"=Problem accessing files in folder "{0}" #: Base.java:1673 Problem\ getting\ data\ folder=Problem getting data folder @@ -1212,6 +1214,9 @@ Replace\ the\ existing\ version\ of\ {0}?=Replace the existing version of {0}? #: FindReplace.java:81 Replace\ with\:=Replace with\: +#: ../../../../../arduino-core/src/processing/app/I18n.java:28 +Retired=Retired + #: Preferences.java:113 Romanian=Romanian @@ -1316,9 +1321,6 @@ Settings\ issues=Settings issues #: Editor.java:641 Show\ Sketch\ Folder=Show Sketch Folder -#: ../../../processing/app/EditorStatus.java:468 -Show\ verbose\ output\ during\ compilation=Show verbose output during compilation - #: Preferences.java:387 Show\ verbose\ output\ during\:\ =Show verbose output during\: @@ -1402,6 +1404,9 @@ Talossan=Talossan #: Preferences.java:116 Tamil=Tamil +#: ../../../../../app/src/cc/arduino/i18n/Languages.java:100 +Thai=Thai + #: debug/Compiler.java:414 The\ 'BYTE'\ keyword\ is\ no\ longer\ supported.=The 'BYTE' keyword is no longer supported. @@ -1460,8 +1465,8 @@ This\ file\ has\ already\ been\ copied\ to\ the\nlocation\ from\ which\ where\ y #: ../../../../../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?=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=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=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=Time for a Break @@ -1728,9 +1733,9 @@ Zip\ doesn't\ contain\ a\ library=Zip doesn't contain a library #, java-format ".{0}"\ is\ not\ a\ valid\ extension.=".{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 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.="{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=\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 @@ -1765,9 +1770,6 @@ connected\!=connected\! #: Sketch.java:540 createNewFile()\ returned\ false=createNewFile() returned false -#: ../../../processing/app/EditorStatus.java:469 -enabled\ in\ File\ >\ Preferences.=enabled in File > Preferences. - #: ../../../../../app/src/processing/app/Editor.java:1352 http\://www.arduino.cc/=http\://www.arduino.cc/ @@ -1827,6 +1829,10 @@ version\ {0}=version {0} #, java-format {0}\ must\ be\ a\ folder={0} must be a folder +#: ../../../../../app/src/processing/app/EditorLineStatus.java:109 +#, java-format +{0}\ on\ {1}={0} on {1} + #: ../../../../../arduino-core/src/cc/arduino/Compiler.java:78 #, java-format {0}\ pattern\ is\ missing={0} pattern is missing