Skip to content

Commit a647ab8

Browse files
tannewttannewt
committed
Merge remote-tracking branch 'adafruit/master' into mixer
2 parents 6da25c8 + e9aefcc commit a647ab8

File tree

10 files changed

+3007
-211
lines changed

10 files changed

+3007
-211
lines changed

‎locale/circuitpython.pot

Lines changed: 58 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: PACKAGE VERSION\n"
1010
"Report-Msgid-Bugs-To: \n"
11-
"POT-Creation-Date: 2018-10-05 15:18-0700\n"
11+
"POT-Creation-Date: 2018-10-07 02:07+0300\n"
1212
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1313
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1414
"Language-Team: LANGUAGE <[email protected]>\n"
@@ -1091,38 +1091,85 @@ msgstr ""
10911091
msgid "'data' requires integer arguments"
10921092
msgstr ""
10931093

1094-
#: py/emitinlinextensa.c:86
1095-
msgid "can only have up to 4 parameters to Xtensa assembly"
1094+
#: py/emitinlinethumb.c:102
1095+
msgid "can only have up to 4 parameters to Thumb assembly"
10961096
msgstr ""
10971097

1098-
#: py/emitinlinextensa.c:91 py/emitinlinextensa.c:96
1099-
msgid "parameters must be registers in sequence a2 to a5"
1098+
#: py/emitinlinethumb.c:107 py/emitinlinethumb.c:112
1099+
msgid "parameters must be registers in sequence r0 to r3"
1100+
msgstr ""
1101+
1102+
#: py/emitinlinethumb.c:188 py/emitinlinethumb.c:230
1103+
#, c-format
1104+
msgid "'%s' expects at most r%d"
11001105
msgstr ""
11011106

1102-
#: py/emitinlinextensa.c:162
1107+
#: py/emitinlinethumb.c:197 py/emitinlinextensa.c:162
11031108
#, c-format
11041109
msgid "'%s' expects a register"
11051110
msgstr ""
11061111

1107-
#: py/emitinlinextensa.c:169
1112+
#: py/emitinlinethumb.c:211
1113+
#, c-format
1114+
msgid "'%s' expects a special register"
1115+
msgstr ""
1116+
1117+
#: py/emitinlinethumb.c:239
1118+
#, c-format
1119+
msgid "'%s' expects an FPU register"
1120+
msgstr ""
1121+
1122+
#: py/emitinlinethumb.c:292
1123+
#, c-format
1124+
msgid "'%s' expects {r0, r1, ...}"
1125+
msgstr ""
1126+
1127+
#: py/emitinlinethumb.c:299 py/emitinlinextensa.c:169
11081128
#, c-format
11091129
msgid "'%s' expects an integer"
11101130
msgstr ""
11111131

1112-
#: py/emitinlinextensa.c:174
1132+
#: py/emitinlinethumb.c:304
11131133
#, c-format
1114-
msgid "'%s' integer %d is not within range %d..%d"
1134+
msgid "'%s' integer 0x%x does not fit in mask 0x%x"
11151135
msgstr ""
11161136

1117-
#: py/emitinlinextensa.c:182
1137+
#: py/emitinlinethumb.c:328
1138+
#, c-format
1139+
msgid "'%s' expects an address of the form [a, b]"
1140+
msgstr ""
1141+
1142+
#: py/emitinlinethumb.c:334 py/emitinlinextensa.c:182
11181143
#, c-format
11191144
msgid "'%s' expects a label"
11201145
msgstr ""
11211146

1122-
#: py/emitinlinextensa.c:193
1147+
#: py/emitinlinethumb.c:345 py/emitinlinextensa.c:193
11231148
msgid "label '%q' not defined"
11241149
msgstr ""
11251150

1151+
#: py/emitinlinethumb.c:806
1152+
#, c-format
1153+
msgid "unsupported Thumb instruction '%s' with %d arguments"
1154+
msgstr ""
1155+
1156+
#: py/emitinlinethumb.c:810
1157+
msgid "branch not in range"
1158+
msgstr ""
1159+
1160+
#: py/emitinlinextensa.c:86
1161+
msgid "can only have up to 4 parameters to Xtensa assembly"
1162+
msgstr ""
1163+
1164+
#: py/emitinlinextensa.c:91 py/emitinlinextensa.c:96
1165+
msgid "parameters must be registers in sequence a2 to a5"
1166+
msgstr ""
1167+
1168+
#: py/emitinlinextensa.c:174
1169+
#, c-format
1170+
msgid "'%s' integer %d is not within range %d..%d"
1171+
msgstr ""
1172+
11261173
#: py/emitinlinextensa.c:327
11271174
#, c-format
11281175
msgid "unsupported Xtensa instruction '%s' with %d arguments"

‎locale/de_DE.po

Lines changed: 59 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ msgid ""
77
msgstr ""
88
"Project-Id-Version: \n"
99
"Report-Msgid-Bugs-To: \n"
10-
"POT-Creation-Date: 2018-10-05 15:17-0700\n"
10+
"POT-Creation-Date: 2018-10-07 02:07+0300\n"
1111
"PO-Revision-Date: 2018-07-27 11:55-0700\n"
1212
"Last-Translator: Sebastian Plamauer\n"
1313
"Language-Team: \n"
@@ -1104,38 +1104,86 @@ msgstr ""
11041104
msgid "'data' requires integer arguments"
11051105
msgstr ""
11061106

1107-
#: py/emitinlinextensa.c:86
1108-
msgid "can only have up to 4 parameters to Xtensa assembly"
1107+
#: py/emitinlinethumb.c:102
1108+
msgid "can only have up to 4 parameters to Thumb assembly"
11091109
msgstr ""
11101110

1111-
#: py/emitinlinextensa.c:91 py/emitinlinextensa.c:96
1112-
msgid "parameters must be registers in sequence a2 to a5"
1111+
#: py/emitinlinethumb.c:107 py/emitinlinethumb.c:112
1112+
msgid "parameters must be registers in sequence r0 to r3"
1113+
msgstr ""
1114+
1115+
#: py/emitinlinethumb.c:188 py/emitinlinethumb.c:230
1116+
#, c-format
1117+
msgid "'%s' expects at most r%d"
11131118
msgstr ""
11141119

1115-
#: py/emitinlinextensa.c:162
1120+
#: py/emitinlinethumb.c:197 py/emitinlinextensa.c:162
11161121
#, c-format
11171122
msgid "'%s' expects a register"
11181123
msgstr ""
11191124

1120-
#: py/emitinlinextensa.c:169
1125+
#: py/emitinlinethumb.c:211
1126+
#, c-format
1127+
msgid "'%s' expects a special register"
1128+
msgstr ""
1129+
1130+
#: py/emitinlinethumb.c:239
1131+
#, c-format
1132+
msgid "'%s' expects an FPU register"
1133+
msgstr ""
1134+
1135+
#: py/emitinlinethumb.c:292
1136+
#, c-format
1137+
msgid "'%s' expects {r0, r1, ...}"
1138+
msgstr ""
1139+
1140+
#: py/emitinlinethumb.c:299 py/emitinlinextensa.c:169
11211141
#, c-format
11221142
msgid "'%s' expects an integer"
11231143
msgstr ""
11241144

1125-
#: py/emitinlinextensa.c:174
1145+
#: py/emitinlinethumb.c:304
11261146
#, c-format
1127-
msgid "'%s' integer %d is not within range %d..%d"
1147+
msgid "'%s' integer 0x%x does not fit in mask 0x%x"
1148+
msgstr ""
1149+
1150+
#: py/emitinlinethumb.c:328
1151+
#, c-format
1152+
msgid "'%s' expects an address of the form [a, b]"
11281153
msgstr ""
11291154

1130-
#: py/emitinlinextensa.c:182
1155+
#: py/emitinlinethumb.c:334 py/emitinlinextensa.c:182
11311156
#, c-format
11321157
msgid "'%s' expects a label"
11331158
msgstr ""
11341159

1135-
#: py/emitinlinextensa.c:193
1160+
#: py/emitinlinethumb.c:345 py/emitinlinextensa.c:193
11361161
msgid "label '%q' not defined"
11371162
msgstr ""
11381163

1164+
#: py/emitinlinethumb.c:806
1165+
#, c-format
1166+
msgid "unsupported Thumb instruction '%s' with %d arguments"
1167+
msgstr ""
1168+
1169+
#: py/emitinlinethumb.c:810
1170+
#, fuzzy
1171+
msgid "branch not in range"
1172+
msgstr "Kalibrierung ist außerhalb der Reichweite"
1173+
1174+
#: py/emitinlinextensa.c:86
1175+
msgid "can only have up to 4 parameters to Xtensa assembly"
1176+
msgstr ""
1177+
1178+
#: py/emitinlinextensa.c:91 py/emitinlinextensa.c:96
1179+
msgid "parameters must be registers in sequence a2 to a5"
1180+
msgstr ""
1181+
1182+
#: py/emitinlinextensa.c:174
1183+
#, c-format
1184+
msgid "'%s' integer %d is not within range %d..%d"
1185+
msgstr ""
1186+
11391187
#: py/emitinlinextensa.c:327
11401188
#, c-format
11411189
msgid "unsupported Xtensa instruction '%s' with %d arguments"

‎locale/en_US.po

Lines changed: 58 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ msgid ""
77
msgstr ""
88
"Project-Id-Version: \n"
99
"Report-Msgid-Bugs-To: \n"
10-
"POT-Creation-Date: 2018-10-05 15:17-0700\n"
10+
"POT-Creation-Date: 2018-10-07 02:07+0300\n"
1111
"PO-Revision-Date: 2018-07-27 11:55-0700\n"
1212
"Last-Translator: \n"
1313
"Language-Team: \n"
@@ -1091,38 +1091,85 @@ msgstr ""
10911091
msgid "'data' requires integer arguments"
10921092
msgstr ""
10931093

1094-
#: py/emitinlinextensa.c:86
1095-
msgid "can only have up to 4 parameters to Xtensa assembly"
1094+
#: py/emitinlinethumb.c:102
1095+
msgid "can only have up to 4 parameters to Thumb assembly"
10961096
msgstr ""
10971097

1098-
#: py/emitinlinextensa.c:91 py/emitinlinextensa.c:96
1099-
msgid "parameters must be registers in sequence a2 to a5"
1098+
#: py/emitinlinethumb.c:107 py/emitinlinethumb.c:112
1099+
msgid "parameters must be registers in sequence r0 to r3"
1100+
msgstr ""
1101+
1102+
#: py/emitinlinethumb.c:188 py/emitinlinethumb.c:230
1103+
#, c-format
1104+
msgid "'%s' expects at most r%d"
11001105
msgstr ""
11011106

1102-
#: py/emitinlinextensa.c:162
1107+
#: py/emitinlinethumb.c:197 py/emitinlinextensa.c:162
11031108
#, c-format
11041109
msgid "'%s' expects a register"
11051110
msgstr ""
11061111

1107-
#: py/emitinlinextensa.c:169
1112+
#: py/emitinlinethumb.c:211
1113+
#, c-format
1114+
msgid "'%s' expects a special register"
1115+
msgstr ""
1116+
1117+
#: py/emitinlinethumb.c:239
1118+
#, c-format
1119+
msgid "'%s' expects an FPU register"
1120+
msgstr ""
1121+
1122+
#: py/emitinlinethumb.c:292
1123+
#, c-format
1124+
msgid "'%s' expects {r0, r1, ...}"
1125+
msgstr ""
1126+
1127+
#: py/emitinlinethumb.c:299 py/emitinlinextensa.c:169
11081128
#, c-format
11091129
msgid "'%s' expects an integer"
11101130
msgstr ""
11111131

1112-
#: py/emitinlinextensa.c:174
1132+
#: py/emitinlinethumb.c:304
11131133
#, c-format
1114-
msgid "'%s' integer %d is not within range %d..%d"
1134+
msgid "'%s' integer 0x%x does not fit in mask 0x%x"
11151135
msgstr ""
11161136

1117-
#: py/emitinlinextensa.c:182
1137+
#: py/emitinlinethumb.c:328
1138+
#, c-format
1139+
msgid "'%s' expects an address of the form [a, b]"
1140+
msgstr ""
1141+
1142+
#: py/emitinlinethumb.c:334 py/emitinlinextensa.c:182
11181143
#, c-format
11191144
msgid "'%s' expects a label"
11201145
msgstr ""
11211146

1122-
#: py/emitinlinextensa.c:193
1147+
#: py/emitinlinethumb.c:345 py/emitinlinextensa.c:193
11231148
msgid "label '%q' not defined"
11241149
msgstr ""
11251150

1151+
#: py/emitinlinethumb.c:806
1152+
#, c-format
1153+
msgid "unsupported Thumb instruction '%s' with %d arguments"
1154+
msgstr ""
1155+
1156+
#: py/emitinlinethumb.c:810
1157+
msgid "branch not in range"
1158+
msgstr ""
1159+
1160+
#: py/emitinlinextensa.c:86
1161+
msgid "can only have up to 4 parameters to Xtensa assembly"
1162+
msgstr ""
1163+
1164+
#: py/emitinlinextensa.c:91 py/emitinlinextensa.c:96
1165+
msgid "parameters must be registers in sequence a2 to a5"
1166+
msgstr ""
1167+
1168+
#: py/emitinlinextensa.c:174
1169+
#, c-format
1170+
msgid "'%s' integer %d is not within range %d..%d"
1171+
msgstr ""
1172+
11261173
#: py/emitinlinextensa.c:327
11271174
#, c-format
11281175
msgid "unsupported Xtensa instruction '%s' with %d arguments"

0 commit comments

Comments
 (0)