Skip to content

Commit 368726f

Browse files
author
Federico Fissore
committed
Merge branch 'ide-1.5.x' into ide-1.5.x-jssc
2 parents 62d96ba + ff970f1 commit 368726f

File tree

112 files changed

+4840
-3073
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

112 files changed

+4840
-3073
lines changed

‎app/src/processing/app/i18n/Resources_an.po

+21-3
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgstr ""
88
"Project-Id-Version: Arduino IDE 1.5\n"
99
"Report-Msgid-Bugs-To: \n"
1010
"POT-Creation-Date: 2012-03-29 10:24-0400\n"
11-
"PO-Revision-Date: 2013-09-10 10:35+0000\n"
11+
"PO-Revision-Date: 2013-11-20 10:43+0000\n"
1212
"Last-Translator: cmaglie <[email protected]>\n"
1313
"Language-Team: Aragonese (http://www.transifex.com/projects/p/arduino-ide-15/language/an/)\n"
1414
"MIME-Version: 1.0\n"
@@ -353,8 +353,8 @@ msgstr ""
353353
msgid "Copy as HTML"
354354
msgstr ""
355355

356-
#: ../../../processing/app/EditorStatus.java:456
357-
msgid "Copy error"
356+
#: ../../../processing/app/EditorStatus.java:455
357+
msgid "Copy error messages"
358358
msgstr ""
359359

360360
#: Editor.java:1165 Editor.java:2715
@@ -529,6 +529,10 @@ msgstr ""
529529
msgid "Discard all changes and reload sketch?"
530530
msgstr ""
531531

532+
#: ../../../processing/app/Preferences.java:438
533+
msgid "Display line numbers"
534+
msgstr ""
535+
532536
#: Editor.java:2064
533537
msgid "Don't Save"
534538
msgstr ""
@@ -1349,6 +1353,10 @@ msgstr ""
13491353
msgid "Sketchbook location:"
13501354
msgstr ""
13511355

1356+
#: ../../../processing/app/Base.java:785
1357+
msgid "Sketches (*.ino, *.pde)"
1358+
msgstr ""
1359+
13521360
#: ../../../processing/app/Preferences.java:152
13531361
msgid "Slovenian"
13541362
msgstr ""
@@ -1590,6 +1598,16 @@ msgstr ""
15901598
msgid "Use external editor"
15911599
msgstr ""
15921600

1601+
#: ../../../processing/app/debug/Compiler.java:94
1602+
#, java-format
1603+
msgid "Using library {0} in folder: {1} {2}"
1604+
msgstr ""
1605+
1606+
#: ../../../processing/app/debug/Compiler.java:320
1607+
#, java-format
1608+
msgid "Using previously compiled file: {0}"
1609+
msgstr ""
1610+
15931611
#: EditorToolbar.java:41 EditorToolbar.java:46
15941612
msgid "Verify"
15951613
msgstr ""

‎app/src/processing/app/i18n/Resources_an.properties

+17-3
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# This file is distributed under the same license as the Arduino IDE package.
44
# Juan Pablo Martinez <[email protected]>, 2012.
55
# Daniel Martinez <[email protected]>, 2012.
6-
!=Project-Id-Version\: Arduino IDE 1.5\nReport-Msgid-Bugs-To\: \nPOT-Creation-Date\: 2012-03-29 10\:24-0400\nPO-Revision-Date\: 2013-09-10 10\:35+0000\nLast-Translator\: cmaglie <[email protected]>\nLanguage-Team\: Aragonese (http\://www.transifex.com/projects/p/arduino-ide-15/language/an/)\nMIME-Version\: 1.0\nContent-Type\: text/plain; charset\=UTF-8\nContent-Transfer-Encoding\: 8bit\nLanguage\: an\nPlural-Forms\: nplurals\=2; plural\=(n \!\= 1);\n
6+
!=Project-Id-Version\: Arduino IDE 1.5\nReport-Msgid-Bugs-To\: \nPOT-Creation-Date\: 2012-03-29 10\:24-0400\nPO-Revision-Date\: 2013-11-20 10\:43+0000\nLast-Translator\: cmaglie <[email protected]>\nLanguage-Team\: Aragonese (http\://www.transifex.com/projects/p/arduino-ide-15/language/an/)\nMIME-Version\: 1.0\nContent-Type\: text/plain; charset\=UTF-8\nContent-Transfer-Encoding\: 8bit\nLanguage\: an\nPlural-Forms\: nplurals\=2; plural\=(n \!\= 1);\n
77

88
#: Preferences.java:358 Preferences.java:374
99
!\ \ (requires\ restart\ of\ Arduino)=
@@ -239,8 +239,8 @@
239239
#: Editor.java:1177 Editor.java:2723
240240
!Copy\ as\ HTML=
241241

242-
#: ../../../processing/app/EditorStatus.java:456
243-
!Copy\ error=
242+
#: ../../../processing/app/EditorStatus.java:455
243+
!Copy\ error\ messages=
244244

245245
#: Editor.java:1165 Editor.java:2715
246246
!Copy\ for\ Forum=
@@ -363,6 +363,9 @@
363363
#: tools/FixEncoding.java:57
364364
!Discard\ all\ changes\ and\ reload\ sketch?=
365365

366+
#: ../../../processing/app/Preferences.java:438
367+
!Display\ line\ numbers=
368+
366369
#: Editor.java:2064
367370
!Don't\ Save=
368371

@@ -960,6 +963,9 @@
960963
#: Preferences.java:315
961964
!Sketchbook\ location\:=
962965

966+
#: ../../../processing/app/Base.java:785
967+
!Sketches\ (*.ino,\ *.pde)=
968+
963969
#: ../../../processing/app/Preferences.java:152
964970
!Slovenian=
965971

@@ -1113,6 +1119,14 @@
11131119
#: Preferences.java:409
11141120
!Use\ external\ editor=
11151121

1122+
#: ../../../processing/app/debug/Compiler.java:94
1123+
#, java-format
1124+
!Using\ library\ {0}\ in\ folder\:\ {1}\ {2}=
1125+
1126+
#: ../../../processing/app/debug/Compiler.java:320
1127+
#, java-format
1128+
!Using\ previously\ compiled\ file\:\ {0}=
1129+
11161130
#: EditorToolbar.java:41 EditorToolbar.java:46
11171131
!Verify=
11181132

‎app/src/processing/app/i18n/Resources_ar.po

+21-3
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ msgstr ""
1111
"Project-Id-Version: Arduino IDE 1.5\n"
1212
"Report-Msgid-Bugs-To: \n"
1313
"POT-Creation-Date: 2012-03-29 10:24-0400\n"
14-
"PO-Revision-Date: 2013-09-10 10:35+0000\n"
14+
"PO-Revision-Date: 2013-11-20 10:43+0000\n"
1515
"Last-Translator: cmaglie <[email protected]>\n"
1616
"Language-Team: Arabic (http://www.transifex.com/projects/p/arduino-ide-15/language/ar/)\n"
1717
"MIME-Version: 1.0\n"
@@ -356,8 +356,8 @@ msgstr "نسخ"
356356
msgid "Copy as HTML"
357357
msgstr "انسخ ك HTML"
358358

359-
#: ../../../processing/app/EditorStatus.java:456
360-
msgid "Copy error"
359+
#: ../../../processing/app/EditorStatus.java:455
360+
msgid "Copy error messages"
361361
msgstr ""
362362

363363
#: Editor.java:1165 Editor.java:2715
@@ -532,6 +532,10 @@ msgstr "الجهاز لا يستجيب, تأكد من المنفذ port او ق
532532
msgid "Discard all changes and reload sketch?"
533533
msgstr "تجاهل كل التغييرات واعد تحميل الشيفرة البرمجية"
534534

535+
#: ../../../processing/app/Preferences.java:438
536+
msgid "Display line numbers"
537+
msgstr ""
538+
535539
#: Editor.java:2064
536540
msgid "Don't Save"
537541
msgstr "لا تحفظ"
@@ -1352,6 +1356,10 @@ msgstr "مجلد كتاب الشيفرة البرمجية \"سكتش بوك\" م
13521356
msgid "Sketchbook location:"
13531357
msgstr "مكان كتاب الشيفرة البرمجية \"سكتش بوك\""
13541358

1359+
#: ../../../processing/app/Base.java:785
1360+
msgid "Sketches (*.ino, *.pde)"
1361+
msgstr ""
1362+
13551363
#: ../../../processing/app/Preferences.java:152
13561364
msgid "Slovenian"
13571365
msgstr ""
@@ -1593,6 +1601,16 @@ msgstr "استخدم المظلل للبحث"
15931601
msgid "Use external editor"
15941602
msgstr "استعمال محرر خارجي"
15951603

1604+
#: ../../../processing/app/debug/Compiler.java:94
1605+
#, java-format
1606+
msgid "Using library {0} in folder: {1} {2}"
1607+
msgstr ""
1608+
1609+
#: ../../../processing/app/debug/Compiler.java:320
1610+
#, java-format
1611+
msgid "Using previously compiled file: {0}"
1612+
msgstr ""
1613+
15961614
#: EditorToolbar.java:41 EditorToolbar.java:46
15971615
msgid "Verify"
15981616
msgstr "افحص"

‎app/src/processing/app/i18n/Resources_ar.properties

+17-3
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# <[email protected]>, 2012.
77
# ameen MS <[email protected]>, 2012.
88
# <[email protected]>, 2012.
9-
!=Project-Id-Version\: Arduino IDE 1.5\nReport-Msgid-Bugs-To\: \nPOT-Creation-Date\: 2012-03-29 10\:24-0400\nPO-Revision-Date\: 2013-09-10 10\:35+0000\nLast-Translator\: cmaglie <[email protected]>\nLanguage-Team\: Arabic (http\://www.transifex.com/projects/p/arduino-ide-15/language/ar/)\nMIME-Version\: 1.0\nContent-Type\: text/plain; charset\=UTF-8\nContent-Transfer-Encoding\: 8bit\nLanguage\: ar\nPlural-Forms\: nplurals\=6; plural\=n\=\=0 ? 0 \: n\=\=1 ? 1 \: n\=\=2 ? 2 \: n%100>\=3 && n%100<\=10 ? 3 \: n%100>\=11 && n%100<\=99 ? 4 \: 5;\n
9+
!=Project-Id-Version\: Arduino IDE 1.5\nReport-Msgid-Bugs-To\: \nPOT-Creation-Date\: 2012-03-29 10\:24-0400\nPO-Revision-Date\: 2013-11-20 10\:43+0000\nLast-Translator\: cmaglie <[email protected]>\nLanguage-Team\: Arabic (http\://www.transifex.com/projects/p/arduino-ide-15/language/ar/)\nMIME-Version\: 1.0\nContent-Type\: text/plain; charset\=UTF-8\nContent-Transfer-Encoding\: 8bit\nLanguage\: ar\nPlural-Forms\: nplurals\=6; plural\=n\=\=0 ? 0 \: n\=\=1 ? 1 \: n\=\=2 ? 2 \: n%100>\=3 && n%100<\=10 ? 3 \: n%100>\=11 && n%100<\=99 ? 4 \: 5;\n
1010

1111
#: Preferences.java:358 Preferences.java:374
1212
\ \ (requires\ restart\ of\ Arduino)=(\u064a\u062a\u0637\u0644\u0628 \u0627\u0639\u0627\u062f\u0629 \u062a\u0634\u063a\u064a\u0644 \u0644\u0644\u0623\u0631\u062f\u0648\u064a\u0646\u0648)
@@ -242,8 +242,8 @@ Copy=\u0646\u0633\u062e
242242
#: Editor.java:1177 Editor.java:2723
243243
Copy\ as\ HTML=\u0627\u0646\u0633\u062e \u0643 HTML
244244

245-
#: ../../../processing/app/EditorStatus.java:456
246-
!Copy\ error=
245+
#: ../../../processing/app/EditorStatus.java:455
246+
!Copy\ error\ messages=
247247

248248
#: Editor.java:1165 Editor.java:2715
249249
Copy\ for\ Forum=\u0627\u0646\u0633\u062e \u0644\u0644\u0645\u0646\u062a\u062f\u0649
@@ -366,6 +366,9 @@ Device\ is\ not\ responding,\ check\ the\ right\ serial\ port\ is\ selected\ or\
366366
#: tools/FixEncoding.java:57
367367
Discard\ all\ changes\ and\ reload\ sketch?=\u062a\u062c\u0627\u0647\u0644 \u0643\u0644 \u0627\u0644\u062a\u063a\u064a\u064a\u0631\u0627\u062a \u0648\u0627\u0639\u062f \u062a\u062d\u0645\u064a\u0644 \u0627\u0644\u0634\u064a\u0641\u0631\u0629 \u0627\u0644\u0628\u0631\u0645\u062c\u064a\u0629
368368

369+
#: ../../../processing/app/Preferences.java:438
370+
!Display\ line\ numbers=
371+
369372
#: Editor.java:2064
370373
Don't\ Save=\u0644\u0627 \u062a\u062d\u0641\u0638
371374

@@ -963,6 +966,9 @@ Sketchbook\ folder\ disappeared=\u0645\u062c\u0644\u062f \u0643\u062a\u0627\u062
963966
#: Preferences.java:315
964967
Sketchbook\ location\:=\u0645\u0643\u0627\u0646 \u0643\u062a\u0627\u0628 \u0627\u0644\u0634\u064a\u0641\u0631\u0629 \u0627\u0644\u0628\u0631\u0645\u062c\u064a\u0629 "\u0633\u0643\u062a\u0634 \u0628\u0648\u0643"
965968

969+
#: ../../../processing/app/Base.java:785
970+
!Sketches\ (*.ino,\ *.pde)=
971+
966972
#: ../../../processing/app/Preferences.java:152
967973
!Slovenian=
968974

@@ -1116,6 +1122,14 @@ Use\ Selection\ For\ Find=\u0627\u0633\u062a\u062e\u062f\u0645 \u0627\u0644\u064
11161122
#: Preferences.java:409
11171123
Use\ external\ editor=\u0627\u0633\u062a\u0639\u0645\u0627\u0644 \u0645\u062d\u0631\u0631 \u062e\u0627\u0631\u062c\u064a
11181124

1125+
#: ../../../processing/app/debug/Compiler.java:94
1126+
#, java-format
1127+
!Using\ library\ {0}\ in\ folder\:\ {1}\ {2}=
1128+
1129+
#: ../../../processing/app/debug/Compiler.java:320
1130+
#, java-format
1131+
!Using\ previously\ compiled\ file\:\ {0}=
1132+
11191133
#: EditorToolbar.java:41 EditorToolbar.java:46
11201134
Verify=\u0627\u0641\u062d\u0635
11211135

‎app/src/processing/app/i18n/Resources_ast.po

+21-3
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgstr ""
88
"Project-Id-Version: Arduino IDE 1.5\n"
99
"Report-Msgid-Bugs-To: \n"
1010
"POT-Creation-Date: 2012-03-29 10:24-0400\n"
11-
"PO-Revision-Date: 2013-09-10 10:35+0000\n"
11+
"PO-Revision-Date: 2013-11-20 10:43+0000\n"
1212
"Last-Translator: cmaglie <[email protected]>\n"
1313
"Language-Team: Asturian (http://www.transifex.com/projects/p/arduino-ide-15/language/ast/)\n"
1414
"MIME-Version: 1.0\n"
@@ -353,8 +353,8 @@ msgstr ""
353353
msgid "Copy as HTML"
354354
msgstr ""
355355

356-
#: ../../../processing/app/EditorStatus.java:456
357-
msgid "Copy error"
356+
#: ../../../processing/app/EditorStatus.java:455
357+
msgid "Copy error messages"
358358
msgstr ""
359359

360360
#: Editor.java:1165 Editor.java:2715
@@ -529,6 +529,10 @@ msgstr ""
529529
msgid "Discard all changes and reload sketch?"
530530
msgstr ""
531531

532+
#: ../../../processing/app/Preferences.java:438
533+
msgid "Display line numbers"
534+
msgstr ""
535+
532536
#: Editor.java:2064
533537
msgid "Don't Save"
534538
msgstr ""
@@ -1349,6 +1353,10 @@ msgstr "Desapaeció'l direutoriu Cartafueyu de bocetos"
13491353
msgid "Sketchbook location:"
13501354
msgstr ""
13511355

1356+
#: ../../../processing/app/Base.java:785
1357+
msgid "Sketches (*.ino, *.pde)"
1358+
msgstr ""
1359+
13521360
#: ../../../processing/app/Preferences.java:152
13531361
msgid "Slovenian"
13541362
msgstr ""
@@ -1590,6 +1598,16 @@ msgstr ""
15901598
msgid "Use external editor"
15911599
msgstr ""
15921600

1601+
#: ../../../processing/app/debug/Compiler.java:94
1602+
#, java-format
1603+
msgid "Using library {0} in folder: {1} {2}"
1604+
msgstr ""
1605+
1606+
#: ../../../processing/app/debug/Compiler.java:320
1607+
#, java-format
1608+
msgid "Using previously compiled file: {0}"
1609+
msgstr ""
1610+
15931611
#: EditorToolbar.java:41 EditorToolbar.java:46
15941612
msgid "Verify"
15951613
msgstr ""

‎app/src/processing/app/i18n/Resources_ast.properties

+17-3
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# This file is distributed under the same license as the PACKAGE package.
44
#
55
# Translators:
6-
!=Project-Id-Version\: Arduino IDE 1.5\nReport-Msgid-Bugs-To\: \nPOT-Creation-Date\: 2012-03-29 10\:24-0400\nPO-Revision-Date\: 2013-09-10 10\:35+0000\nLast-Translator\: cmaglie <[email protected]>\nLanguage-Team\: Asturian (http\://www.transifex.com/projects/p/arduino-ide-15/language/ast/)\nMIME-Version\: 1.0\nContent-Type\: text/plain; charset\=UTF-8\nContent-Transfer-Encoding\: 8bit\nLanguage\: ast\nPlural-Forms\: nplurals\=2; plural\=(n \!\= 1);\n
6+
!=Project-Id-Version\: Arduino IDE 1.5\nReport-Msgid-Bugs-To\: \nPOT-Creation-Date\: 2012-03-29 10\:24-0400\nPO-Revision-Date\: 2013-11-20 10\:43+0000\nLast-Translator\: cmaglie <[email protected]>\nLanguage-Team\: Asturian (http\://www.transifex.com/projects/p/arduino-ide-15/language/ast/)\nMIME-Version\: 1.0\nContent-Type\: text/plain; charset\=UTF-8\nContent-Transfer-Encoding\: 8bit\nLanguage\: ast\nPlural-Forms\: nplurals\=2; plural\=(n \!\= 1);\n
77

88
#: Preferences.java:358 Preferences.java:374
99
!\ \ (requires\ restart\ of\ Arduino)=
@@ -239,8 +239,8 @@ Arduino\ requires\ a\ full\ JDK\ (not\ just\ a\ JRE)\nto\ run.\ Please\ install\
239239
#: Editor.java:1177 Editor.java:2723
240240
!Copy\ as\ HTML=
241241

242-
#: ../../../processing/app/EditorStatus.java:456
243-
!Copy\ error=
242+
#: ../../../processing/app/EditorStatus.java:455
243+
!Copy\ error\ messages=
244244

245245
#: Editor.java:1165 Editor.java:2715
246246
!Copy\ for\ Forum=
@@ -363,6 +363,9 @@ Arduino\ requires\ a\ full\ JDK\ (not\ just\ a\ JRE)\nto\ run.\ Please\ install\
363363
#: tools/FixEncoding.java:57
364364
!Discard\ all\ changes\ and\ reload\ sketch?=
365365

366+
#: ../../../processing/app/Preferences.java:438
367+
!Display\ line\ numbers=
368+
366369
#: Editor.java:2064
367370
!Don't\ Save=
368371

@@ -960,6 +963,9 @@ Sketchbook\ folder\ disappeared=Desapaeci\u00f3'l direutoriu Cartafueyu de bocet
960963
#: Preferences.java:315
961964
!Sketchbook\ location\:=
962965

966+
#: ../../../processing/app/Base.java:785
967+
!Sketches\ (*.ino,\ *.pde)=
968+
963969
#: ../../../processing/app/Preferences.java:152
964970
!Slovenian=
965971

@@ -1113,6 +1119,14 @@ Time\ for\ a\ Break=Tiempu pa un descansu
11131119
#: Preferences.java:409
11141120
!Use\ external\ editor=
11151121

1122+
#: ../../../processing/app/debug/Compiler.java:94
1123+
#, java-format
1124+
!Using\ library\ {0}\ in\ folder\:\ {1}\ {2}=
1125+
1126+
#: ../../../processing/app/debug/Compiler.java:320
1127+
#, java-format
1128+
!Using\ previously\ compiled\ file\:\ {0}=
1129+
11161130
#: EditorToolbar.java:41 EditorToolbar.java:46
11171131
!Verify=
11181132

0 commit comments

Comments
 (0)