Skip to content

Commit bb4c113

Browse files
author
Federico Fissore
committed
Merge branch 'master' into master-pull115
2 parents 27c5a2e + b703b8a commit bb4c113

File tree

3 files changed

+5
-6
lines changed

3 files changed

+5
-6
lines changed

app/src/processing/app/Preferences.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -734,11 +734,10 @@ static protected void save() {
734734
// Fix for 0163 to properly use Unicode when writing preferences.txt
735735
PrintWriter writer = PApplet.createWriter(preferencesFile);
736736

737-
Enumeration e = table.keys(); //properties.propertyNames();
738-
while (e.hasMoreElements()) {
739-
String key = (String) e.nextElement();
737+
String[] keys = (String[])table.keySet().toArray(new String[0]);
738+
Arrays.sort(keys);
739+
for (String key: keys)
740740
writer.println(key + "=" + ((String) table.get(key)));
741-
}
742741

743742
writer.flush();
744743
writer.close();

app/src/processing/app/Resources_it.po

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1089,7 +1089,7 @@ msgid ""
10891089
"\n"
10901090
msgstr ""
10911091
"\n"
1092-
"Da Arduno 1.0, la classe Udp nella libreria Ethernet è stata rinominata EthernerClient.\n"
1092+
"Da Arduino 1.0, la classe Udp nella libreria Ethernet è stata rinominata EthernetClient.\n"
10931093
"\n"
10941094

10951095
#: debug/Compiler.java:495

app/src/processing/app/Resources_it.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -685,7 +685,7 @@ The\ Client\ class\ has\ been\ renamed\ EthernetClient.=La classe Client \u00e8
685685
The\ Udp\ class\ has\ been\ renamed\ EthernetUdp.=La classe Udp \u00e8 stata rinominata EthernetUdp.
686686

687687
#: debug/Compiler.java:490
688-
\nAs\ of\ Arduino\ 1.0,\ the\ Udp\ class\ in\ the\ Ethernet\ library\ has\ been\ renamed\ to\ EthernetClient.\n\n=\nDa Arduno 1.0, la classe Udp nella libreria Ethernet \u00e8 stata rinominata EthernerClient.\n\n
688+
\nAs\ of\ Arduino\ 1.0,\ the\ Udp\ class\ in\ the\ Ethernet\ library\ has\ been\ renamed\ to\ EthernetClient.\n\n=\nDa Arduino 1.0, la classe Udp nella libreria Ethernet \u00e8 stata rinominata EthernetClient.\n\n
689689

690690
#: debug/Compiler.java:495
691691
Wire.send()\ has\ been\ renamed\ Wire.write().=Wire.send() \u00e8 stato rinominato Wire.write().

0 commit comments

Comments
 (0)