Skip to content

Commit 33083d8

Browse files
committed
Merge of arduino-1.0.1. Work in progress...
2 parents b276a75 + 6e8e13d commit 33083d8

File tree

215 files changed

+37699
-6864
lines changed

Some content is hidden

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

215 files changed

+37699
-6864
lines changed

.gitignore

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,15 @@ app/pde.jar
33
build/macosx/work/
44
core/bin/
55
core/core.jar
6-
build/macosx/arduino.xcworkspace/contents.xcworkspacedata
7-
8-
build/macosx/arduino.xcworkspace/xcuserdata/mellis.xcuserdatad/UserInterfaceState.xcuserstate
6+
hardware/arduino/bootloaders/caterina_LUFA/Descriptors.o
7+
hardware/arduino/bootloaders/caterina_LUFA/Descriptors.lst
8+
hardware/arduino/bootloaders/caterina_LUFA/Caterina.sym
9+
hardware/arduino/bootloaders/caterina_LUFA/Caterina.o
10+
hardware/arduino/bootloaders/caterina_LUFA/Caterina.map
11+
hardware/arduino/bootloaders/caterina_LUFA/Caterina.lst
12+
hardware/arduino/bootloaders/caterina_LUFA/Caterina.lss
13+
hardware/arduino/bootloaders/caterina_LUFA/Caterina.elf
14+
hardware/arduino/bootloaders/caterina_LUFA/Caterina.eep
15+
hardware/arduino/bootloaders/caterina_LUFA/.dep/
16+
.gitignore
17+
build/windows/work/

app/src/processing/app/Preferences.java

Lines changed: 29 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -82,48 +82,72 @@ public class Preferences {
8282

8383
String[] languages = {
8484
_("System Default"),
85+
"العربية" + " (" + _("Arabic") + ")",
86+
"Aragonés" + " (" + _("Aragonese") + ")",
8587
"Català" + " (" + _("Catalan") + ")",
8688
"简体中文" + " (" + _("Chinese Simplified") + ")",
8789
"繁體中文" + " (" + _("Chinese Traditional") + ")",
8890
"Dansk" + " (" + _("Danish") + ")",
8991
"Nederlands" + " (" + _("Dutch") + ")",
9092
"English" + " (" + _("English") + ")",
91-
"Français" + " (" + _("French") + ")",
93+
"Eesti" + " (" + _("Estonian") + ")",
9294
"Pilipino" + " (" + _("Filipino") + ")",
95+
"Français" + " (" + _("French") + ")",
9396
"Galego" + " (" + _("Galician") + ")",
9497
"Deutsch" + " (" + _("German") + ")",
9598
"ελληνικά" + " (" + _("Greek") + ")",
99+
"Magyar" + " (" + _("Hindi") + ")",
96100
"Magyar" + " (" + _("Hungarian") + ")",
101+
"Bahasa Indonesia" + " (" + _("Indonesian") + ")",
97102
"Italiano" + " (" + _("Italian") + ")",
98103
"日本語" + " (" + _("Japanese") + ")",
104+
"한국어" + " (" + _("Korean") + ")",
99105
"Latviešu" + " (" + _("Latvian") + ")",
106+
"Lietuvių Kalba" + " (" + _("Lithuaninan") + ")",
107+
"मराठी" + " (" + _("Marathi") + ")",
108+
"Norsk" + " (" + _("Norwegian") + ")",
100109
"فارسی" + " (" + _("Persian") + ")",
101-
"Português" + " (" + _("Portuguese") + ")",
110+
"Język Polski" + " (" + _("Polish") + ")",
111+
"Português" + " (" + _("Portuguese") + " - Brazil)",
112+
"Português" + " (" + _("Portuguese") + " - Portugal)",
102113
"Română" + " (" + _("Romanian") + ")",
103114
"Русский" + " (" + _("Russian") + ")",
104-
"Español" + " (" + _("Spanish") + ")"};
115+
"Español" + " (" + _("Spanish") + ")",
116+
"தமிழ்" + " (" + _("Tamil") + ")"};
105117
String[] languagesISO = {
106118
"",
119+
"ar",
120+
"an",
107121
"ca",
108122
"zh_cn",
109123
"zh_tw",
110124
"da",
111125
"nl",
112126
"en",
113-
"fr",
127+
"et",
114128
"tl",
129+
"fr",
115130
"gl",
116131
"de",
117132
"el",
133+
"hi",
118134
"hu",
135+
"id",
119136
"it",
120137
"ja",
138+
"ko",
121139
"lv",
140+
"lt",
141+
"mr",
142+
"no",
122143
"fa",
144+
"pl",
123145
"pt_br",
146+
"pt_pt",
124147
"ro",
125148
"ru",
126-
"es"};
149+
"es",
150+
"ta"};
127151

128152
/**
129153
* Standardized width for buttons. Mac OS X 10.3 wants 70 as its default,

0 commit comments

Comments
 (0)