Skip to content

Commit 1ec3580

Browse files
tannewttannewt
authored
Merge branch 'main' into memmonitor
2 parents eb24653 + 05a10f7 commit 1ec3580

File tree

49 files changed

+492
-143
lines changed

Some content is hidden

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

49 files changed

+492
-143
lines changed

‎.github/workflows/build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
run: |
3838
sudo apt-get install -y eatmydata
3939
sudo eatmydata apt-get install -y gettext librsvg2-bin mingw-w64
40-
pip install requests sh click setuptools cpp-coveralls "Sphinx<4" sphinx-rtd-theme recommonmark sphinx-autoapi sphinxcontrib-svg2pdfconverter polib pyyaml astroid
40+
pip install requests sh click setuptools cpp-coveralls "Sphinx<4" sphinx-rtd-theme recommonmark sphinx-autoapi sphinxcontrib-svg2pdfconverter polib pyyaml astroid isort
4141
- name: Versions
4242
run: |
4343
gcc --version

‎frozen/circuitpython-stage‎

‎locale/ID.po‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ msgid ""
55
msgstr ""
66
"Project-Id-Version: PACKAGE VERSION\n"
77
"Report-Msgid-Bugs-To: \n"
8-
"POT-Creation-Date: 2020-07-07 14:38-0500\n"
8+
"POT-Creation-Date: 2020-07-17 18:03-0700\n"
99
"PO-Revision-Date: 2020-07-06 18:10+0000\n"
1010
"Last-Translator: oon arfiandwi <[email protected]>\n"
1111
"Language-Team: LANGUAGE <[email protected]>\n"
@@ -111,6 +111,10 @@ msgstr "%q() mengambil posisi argumen %d tapi %d yang diberikan"
111111
msgid "'%q' argument required"
112112
msgstr "'%q' argumen dibutuhkan"
113113

114+
#: py/objarray.c
115+
msgid "'%q' object is not bytes-like"
116+
msgstr ""
117+
114118
#: py/emitinlinethumb.c py/emitinlinextensa.c
115119
#, c-format
116120
msgid "'%s' expects a label"
@@ -3137,7 +3141,7 @@ msgstr "struct: index keluar dari jangkauan"
31373141
msgid "struct: no fields"
31383142
msgstr "struct: tidak ada fields"
31393143

3140-
#: py/objstr.c
3144+
#: py/objarray.c py/objstr.c
31413145
msgid "substring not found"
31423146
msgstr ""
31433147

‎locale/circuitpython.pot‎

Lines changed: 6 additions & 2 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: 2020-07-17 18:00-0700\n"
11+
"POT-Creation-Date: 2020-07-17 18:03-0700\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"
@@ -110,6 +110,10 @@ msgstr ""
110110
msgid "'%q' argument required"
111111
msgstr ""
112112

113+
#: py/objarray.c
114+
msgid "'%q' object is not bytes-like"
115+
msgstr ""
116+
113117
#: py/emitinlinethumb.c py/emitinlinextensa.c
114118
#, c-format
115119
msgid "'%s' expects a label"
@@ -3120,7 +3124,7 @@ msgstr ""
31203124
msgid "struct: no fields"
31213125
msgstr ""
31223126

3123-
#: py/objstr.c
3127+
#: py/objarray.c py/objstr.c
31243128
msgid "substring not found"
31253129
msgstr ""
31263130

‎locale/cs.po‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ msgid ""
55
msgstr ""
66
"Project-Id-Version: PACKAGE VERSION\n"
77
"Report-Msgid-Bugs-To: \n"
8-
"POT-Creation-Date: 2020-07-07 14:38-0500\n"
8+
"POT-Creation-Date: 2020-07-17 18:03-0700\n"
99
"PO-Revision-Date: 2020-05-24 03:22+0000\n"
1010
"Last-Translator: dronecz <[email protected]>\n"
1111
"Language-Team: LANGUAGE <[email protected]>\n"
@@ -111,6 +111,10 @@ msgstr ""
111111
msgid "'%q' argument required"
112112
msgstr ""
113113

114+
#: py/objarray.c
115+
msgid "'%q' object is not bytes-like"
116+
msgstr ""
117+
114118
#: py/emitinlinethumb.c py/emitinlinextensa.c
115119
#, c-format
116120
msgid "'%s' expects a label"
@@ -3106,7 +3110,7 @@ msgstr ""
31063110
msgid "struct: no fields"
31073111
msgstr ""
31083112

3109-
#: py/objstr.c
3113+
#: py/objarray.c py/objstr.c
31103114
msgid "substring not found"
31113115
msgstr ""
31123116

‎locale/de_DE.po‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ msgid ""
55
msgstr ""
66
"Project-Id-Version: \n"
77
"Report-Msgid-Bugs-To: \n"
8-
"POT-Creation-Date: 2020-07-07 14:38-0500\n"
8+
"POT-Creation-Date: 2020-07-17 18:03-0700\n"
99
"PO-Revision-Date: 2020-06-16 18:24+0000\n"
1010
"Last-Translator: Andreas Buchen <[email protected]>\n"
1111
"Language: de_DE\n"
@@ -110,6 +110,10 @@ msgstr "%q() nimmt %d Argumente ohne Keyword an, aber es wurden %d angegeben"
110110
msgid "'%q' argument required"
111111
msgstr "'%q' Argument erforderlich"
112112

113+
#: py/objarray.c
114+
msgid "'%q' object is not bytes-like"
115+
msgstr ""
116+
113117
#: py/emitinlinethumb.c py/emitinlinextensa.c
114118
#, c-format
115119
msgid "'%s' expects a label"
@@ -3190,7 +3194,7 @@ msgstr "struct: index außerhalb gültigen Bereichs"
31903194
msgid "struct: no fields"
31913195
msgstr "struct: keine Felder"
31923196

3193-
#: py/objstr.c
3197+
#: py/objarray.c py/objstr.c
31943198
msgid "substring not found"
31953199
msgstr "substring nicht gefunden"
31963200

‎locale/es.po‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: \n"
1010
"Report-Msgid-Bugs-To: \n"
11-
"POT-Creation-Date: 2020-07-07 14:38-0500\n"
11+
"POT-Creation-Date: 2020-07-17 18:03-0700\n"
1212
"PO-Revision-Date: 2020-07-13 19:24+0000\n"
1313
"Last-Translator: Alvaro Figueroa <[email protected]>\n"
1414
"Language-Team: \n"
@@ -115,6 +115,10 @@ msgstr "%q() toma %d argumentos posicionales pero %d fueron dados"
115115
msgid "'%q' argument required"
116116
msgstr "argumento '%q' requerido"
117117

118+
#: py/objarray.c
119+
msgid "'%q' object is not bytes-like"
120+
msgstr ""
121+
118122
#: py/emitinlinethumb.c py/emitinlinextensa.c
119123
#, c-format
120124
msgid "'%s' expects a label"
@@ -3174,7 +3178,7 @@ msgstr "struct: index fuera de rango"
31743178
msgid "struct: no fields"
31753179
msgstr "struct: sin campos"
31763180

3177-
#: py/objstr.c
3181+
#: py/objarray.c py/objstr.c
31783182
msgid "substring not found"
31793183
msgstr "substring no encontrado"
31803184

‎locale/fil.po‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ msgid ""
55
msgstr ""
66
"Project-Id-Version: \n"
77
"Report-Msgid-Bugs-To: \n"
8-
"POT-Creation-Date: 2020-07-07 14:38-0500\n"
8+
"POT-Creation-Date: 2020-07-17 18:03-0700\n"
99
"PO-Revision-Date: 2018-12-20 22:15-0800\n"
1010
"Last-Translator: Timothy <[email protected]>\n"
1111
"Language-Team: fil\n"
@@ -106,6 +106,10 @@ msgstr ""
106106
msgid "'%q' argument required"
107107
msgstr "'%q' argument kailangan"
108108

109+
#: py/objarray.c
110+
msgid "'%q' object is not bytes-like"
111+
msgstr ""
112+
109113
#: py/emitinlinethumb.c py/emitinlinextensa.c
110114
#, c-format
111115
msgid "'%s' expects a label"
@@ -3153,7 +3157,7 @@ msgstr "struct: index hindi maabot"
31533157
msgid "struct: no fields"
31543158
msgstr "struct: walang fields"
31553159

3156-
#: py/objstr.c
3160+
#: py/objarray.c py/objstr.c
31573161
msgid "substring not found"
31583162
msgstr "substring hindi nahanap"
31593163

‎locale/fr.po‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ msgid ""
77
msgstr ""
88
"Project-Id-Version: 0.1\n"
99
"Report-Msgid-Bugs-To: \n"
10-
"POT-Creation-Date: 2020-07-07 14:38-0500\n"
10+
"POT-Creation-Date: 2020-07-17 18:03-0700\n"
1111
"PO-Revision-Date: 2020-06-05 17:29+0000\n"
1212
"Last-Translator: aberwag <[email protected]>\n"
1313
"Language: fr\n"
@@ -115,6 +115,10 @@ msgstr "%q() prend %d arguments positionnels mais %d ont été donnés"
115115
msgid "'%q' argument required"
116116
msgstr "'%q' argument requis"
117117

118+
#: py/objarray.c
119+
msgid "'%q' object is not bytes-like"
120+
msgstr ""
121+
118122
#: py/emitinlinethumb.c py/emitinlinextensa.c
119123
#, c-format
120124
msgid "'%s' expects a label"
@@ -3197,7 +3201,7 @@ msgstr "struct : index hors limites"
31973201
msgid "struct: no fields"
31983202
msgstr "struct : aucun champs"
31993203

3200-
#: py/objstr.c
3204+
#: py/objarray.c py/objstr.c
32013205
msgid "substring not found"
32023206
msgstr "sous-chaîne non trouvée"
32033207

‎locale/it_IT.po‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ msgid ""
66
msgstr ""
77
"Project-Id-Version: PACKAGE VERSION\n"
88
"Report-Msgid-Bugs-To: \n"
9-
"POT-Creation-Date: 2020-07-07 14:38-0500\n"
9+
"POT-Creation-Date: 2020-07-17 18:03-0700\n"
1010
"PO-Revision-Date: 2018-10-02 16:27+0200\n"
1111
"Last-Translator: Enrico Paganin <[email protected]>\n"
1212
"Language-Team: \n"
@@ -105,6 +105,10 @@ msgstr "%q() prende %d argomenti posizionali ma ne sono stati forniti %d"
105105
msgid "'%q' argument required"
106106
msgstr "'%q' argomento richiesto"
107107

108+
#: py/objarray.c
109+
msgid "'%q' object is not bytes-like"
110+
msgstr ""
111+
108112
#: py/emitinlinethumb.c py/emitinlinextensa.c
109113
#, c-format
110114
msgid "'%s' expects a label"
@@ -3160,7 +3164,7 @@ msgstr "struct: indice fuori intervallo"
31603164
msgid "struct: no fields"
31613165
msgstr "struct: nessun campo"
31623166

3163-
#: py/objstr.c
3167+
#: py/objarray.c py/objstr.c
31643168
msgid "substring not found"
31653169
msgstr "sottostringa non trovata"
31663170

0 commit comments

Comments
 (0)