Skip to content

Commit 4d49f4a

Browse files
committed
eliminate duplicates
1 parent d0d8644 commit 4d49f4a

File tree

6 files changed

+48915
-43267
lines changed

6 files changed

+48915
-43267
lines changed

assets/js/binary-en.js

Lines changed: 48732 additions & 43212 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

assets/strings/en/tooltips.json

Lines changed: 11 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
"T12": "release",
4141
"T13": "move",
4242
"T14": "timer",
43-
"T15": "light",
43+
"T15": "light (external)",
4444
"T16": "temperature",
4545
"T17": "radio receive",
4646
"T18": "sound",
@@ -55,7 +55,7 @@
5555
"T27": "light",
5656
"T28": "moisture",
5757
"T29": "distance",
58-
"T30": "line",
58+
"T30": "reflected light",
5959
"T40": "switch page",
6060
"T41": "play sound",
6161
"T43": "music",
@@ -90,7 +90,7 @@
9090
"T86": "5 seconds",
9191
"T87": "loud",
9292
"T88": "quiet",
93-
"T89": "NA",
93+
"T89": "NA1",
9494
"T90": "shake",
9595
"T91": "tilt up",
9696
"T92": "tilt down",
@@ -110,21 +110,16 @@
110110
"T107": "lost right",
111111
"T108": "face up",
112112
"T109": "face down",
113-
"T110": "on",
114-
"T111": "off",
113+
"T110": "active",
114+
"T111": "unactive",
115115
"T150": "page 1",
116116
"T151": "page 2",
117117
"T152": "page 3",
118118
"T153": "page 4",
119119
"T154": "page 5",
120-
"T155": "1",
121-
"T156": "2",
122-
"T157": "3",
123-
"T158": "4",
124-
"T159": "5",
125120
"T160": "LED image",
126-
"T161": "red",
127-
"T162": "purple",
121+
"T161": "NA5",
122+
"T162": "NA6",
128123
"T163": "giggle",
129124
"T164": "happy",
130125
"T165": "hello",
@@ -135,15 +130,12 @@
135130
"T170": "spring",
136131
"T171": "twinkle",
137132
"T172": "yawn",
138-
"T173": "variable X",
139-
"T174": "variable Y",
140-
"T175": "variable Z",
141133
"T176": "radio value",
142134
"T177": "random number",
143135
"T178": "repeat",
144136
"T179": "melody",
145-
"T180": "temperature",
146-
"T181": "NA",
137+
"T180": "temp.",
138+
"T181": "NA2",
147139
"T182": "red",
148140
"T183": "green",
149141
"T184": "blue",
@@ -154,8 +146,8 @@
154146
"T189": "sparkle",
155147
"T190": "forward",
156148
"T191": "reverse",
157-
"T192": "turn left",
158-
"T193": "turn right",
149+
"T192": "NA3",
150+
"T193": "NA4",
159151
"T194": "stop",
160152
"T195": "fast forward",
161153
"T196": "spin left",

locales/tooltips.json

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
"T12": "release",
4545
"T13": "move",
4646
"T14": "timer",
47-
"T15": "light",
47+
"T15": "light (external)",
4848
"T16": "temperature",
4949
"T17": "radio receive",
5050
"T18": "sound",
@@ -61,7 +61,7 @@
6161
"T28": "moisture",
6262
"T29": "distance",
6363

64-
"T30": "line",
64+
"T30": "reflected light",
6565

6666
"T40": "switch page",
6767
"T41": "play sound",
@@ -100,7 +100,7 @@
100100
"T86": "5 seconds",
101101
"T87": "loud",
102102
"T88": "quiet",
103-
"T89": "NA",
103+
"T89": "NA1",
104104

105105
"T90": "shake",
106106
"T91": "tilt up",
@@ -123,8 +123,8 @@
123123
"T108": "face up",
124124
"T109": "face down",
125125

126-
"T110": "on",
127-
"T111": "off",
126+
"T110": "active",
127+
"T111": "unactive",
128128

129129
"T150": "page 1",
130130
"T151": "page 2",
@@ -133,8 +133,8 @@
133133
"T154": "page 5",
134134

135135
"T160": "LED image",
136-
"T161": "red",
137-
"T162": "purple",
136+
"T161": "NA5",
137+
"T162": "NA6",
138138
"T163": "giggle",
139139
"T164": "happy",
140140
"T165": "hello",
@@ -151,8 +151,8 @@
151151
"T178": "repeat",
152152
"T179": "melody",
153153

154-
"T180": "temperature",
155-
"T181": "NA",
154+
"T180": "temp.",
155+
"T181": "NA2",
156156
"T182": "red",
157157
"T183": "green",
158158
"T184": "blue",
@@ -164,8 +164,8 @@
164164

165165
"T190": "forward",
166166
"T191": "reverse",
167-
"T192": "turn left",
168-
"T193": "turn right",
167+
"T192": "NA3",
168+
"T193": "NA4",
169169
"T194": "stop",
170170
"T195": "fast forward",
171171
"T196": "spin left",

scripts/lochex.mjs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -85,12 +85,9 @@ for (const lang of languages.filter(l => l !== "pxt")) {
8585
const entries = {}
8686

8787
/*
88-
ERROR: already have entry for light
89-
ERROR: already have entry for line
90-
ERROR: already have entry for temperature
91-
ERROR: already have entry for NA
9288
ERROR: already have entry for red
9389
ERROR: already have entry for purple
90+
9491
ERROR: already have entry for turn-left
9592
ERROR: already have entry for turn-right
9693
ERROR: already have entry for on

tiles.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -176,8 +176,8 @@ namespace microcode {
176176
CAR_MODIFIER_BEGIN = 190,
177177
TID_MODIFIER_CAR_FORWARD = 190,
178178
TID_MODIFIER_CAR_REVERSE = 191,
179-
TID_MODIFIER_CAR_TURN_LEFT = 192,
180-
TID_MODIFIER_CAR_TURN_RIGHT = 193,
179+
TID_MODIFIER_CAR_TURN_LEFT = 192, // deprecate
180+
TID_MODIFIER_CAR_TURN_RIGHT = 193, // deprecate
181181
TID_MODIFIER_CAR_STOP = 194,
182182
TID_MODIFIER_CAR_FORWARD_FAST = 195,
183183
TID_MODIFIER_CAR_SPIN_LEFT = 196,

0 commit comments

Comments
 (0)