Skip to content

Commit e3e2b76

Browse files
RinLit-233-shirokoRinLit-233-shiroko
committed
Merge remote-tracking branch 'origin/main'
2 parents 52300d1 + 9c1b3d1 commit e3e2b76

10 files changed

Lines changed: 284 additions & 266 deletions

File tree

‎assets/locales/en_US.ts‎

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -214,87 +214,87 @@ You can continue to open another one, or close this window.</source>
214214
<translation type="unfinished"></translation>
215215
</message>
216216
<message>
217-
<location filename="../../src/qml/ClassWidgets/Components/dialogs/ClassSwapDialog.qml" line="137"/>
217+
<location filename="../../src/qml/ClassWidgets/Components/dialogs/ClassSwapDialog.qml" line="142"/>
218218
<source>Odd Week</source>
219219
<translation type="unfinished"></translation>
220220
</message>
221221
<message>
222-
<location filename="../../src/qml/ClassWidgets/Components/dialogs/ClassSwapDialog.qml" line="137"/>
222+
<location filename="../../src/qml/ClassWidgets/Components/dialogs/ClassSwapDialog.qml" line="142"/>
223223
<source>Even Week</source>
224224
<translation type="unfinished"></translation>
225225
</message>
226226
<message>
227-
<location filename="../../src/qml/ClassWidgets/Components/dialogs/ClassSwapDialog.qml" line="138"/>
227+
<location filename="../../src/qml/ClassWidgets/Components/dialogs/ClassSwapDialog.qml" line="143"/>
228228
<source>Week %1</source>
229229
<translation type="unfinished"></translation>
230230
</message>
231231
<message>
232-
<location filename="../../src/qml/ClassWidgets/Components/dialogs/ClassSwapDialog.qml" line="227"/>
232+
<location filename="../../src/qml/ClassWidgets/Components/dialogs/ClassSwapDialog.qml" line="232"/>
233233
<source>Monday</source>
234234
<translation type="unfinished"></translation>
235235
</message>
236236
<message>
237-
<location filename="../../src/qml/ClassWidgets/Components/dialogs/ClassSwapDialog.qml" line="228"/>
237+
<location filename="../../src/qml/ClassWidgets/Components/dialogs/ClassSwapDialog.qml" line="233"/>
238238
<source>Tuesday</source>
239239
<translation type="unfinished"></translation>
240240
</message>
241241
<message>
242-
<location filename="../../src/qml/ClassWidgets/Components/dialogs/ClassSwapDialog.qml" line="229"/>
242+
<location filename="../../src/qml/ClassWidgets/Components/dialogs/ClassSwapDialog.qml" line="234"/>
243243
<source>Wednesday</source>
244244
<translation type="unfinished"></translation>
245245
</message>
246246
<message>
247-
<location filename="../../src/qml/ClassWidgets/Components/dialogs/ClassSwapDialog.qml" line="230"/>
247+
<location filename="../../src/qml/ClassWidgets/Components/dialogs/ClassSwapDialog.qml" line="235"/>
248248
<source>Thursday</source>
249249
<translation type="unfinished"></translation>
250250
</message>
251251
<message>
252-
<location filename="../../src/qml/ClassWidgets/Components/dialogs/ClassSwapDialog.qml" line="231"/>
252+
<location filename="../../src/qml/ClassWidgets/Components/dialogs/ClassSwapDialog.qml" line="236"/>
253253
<source>Friday</source>
254254
<translation type="unfinished"></translation>
255255
</message>
256256
<message>
257-
<location filename="../../src/qml/ClassWidgets/Components/dialogs/ClassSwapDialog.qml" line="232"/>
257+
<location filename="../../src/qml/ClassWidgets/Components/dialogs/ClassSwapDialog.qml" line="237"/>
258258
<source>Saturday</source>
259259
<translation type="unfinished"></translation>
260260
</message>
261261
<message>
262-
<location filename="../../src/qml/ClassWidgets/Components/dialogs/ClassSwapDialog.qml" line="233"/>
262+
<location filename="../../src/qml/ClassWidgets/Components/dialogs/ClassSwapDialog.qml" line="238"/>
263263
<source>Sunday</source>
264264
<translation type="unfinished"></translation>
265265
</message>
266266
<message>
267-
<location filename="../../src/qml/ClassWidgets/Components/dialogs/ClassSwapDialog.qml" line="285"/>
267+
<location filename="../../src/qml/ClassWidgets/Components/dialogs/ClassSwapDialog.qml" line="290"/>
268268
<source>Click to select a class to swap</source>
269269
<translation type="unfinished"></translation>
270270
</message>
271271
<message>
272-
<location filename="../../src/qml/ClassWidgets/Components/dialogs/ClassSwapDialog.qml" line="325"/>
272+
<location filename="../../src/qml/ClassWidgets/Components/dialogs/ClassSwapDialog.qml" line="330"/>
273273
<source>(Empty)</source>
274274
<translation type="unfinished"></translation>
275275
</message>
276276
<message>
277-
<location filename="../../src/qml/ClassWidgets/Components/dialogs/ClassSwapDialog.qml" line="371"/>
277+
<location filename="../../src/qml/ClassWidgets/Components/dialogs/ClassSwapDialog.qml" line="376"/>
278278
<source>All Subjects</source>
279279
<translation type="unfinished"></translation>
280280
</message>
281281
<message>
282-
<location filename="../../src/qml/ClassWidgets/Components/dialogs/ClassSwapDialog.qml" line="437"/>
282+
<location filename="../../src/qml/ClassWidgets/Components/dialogs/ClassSwapDialog.qml" line="442"/>
283283
<source>Click a class to swap</source>
284284
<translation type="unfinished"></translation>
285285
</message>
286286
<message>
287-
<location filename="../../src/qml/ClassWidgets/Components/dialogs/ClassSwapDialog.qml" line="439"/>
287+
<location filename="../../src/qml/ClassWidgets/Components/dialogs/ClassSwapDialog.qml" line="444"/>
288288
<source>Select target class</source>
289289
<translation type="unfinished"></translation>
290290
</message>
291291
<message>
292-
<location filename="../../src/qml/ClassWidgets/Components/dialogs/ClassSwapDialog.qml" line="451"/>
292+
<location filename="../../src/qml/ClassWidgets/Components/dialogs/ClassSwapDialog.qml" line="456"/>
293293
<source>Confirm Swap</source>
294294
<translation type="unfinished"></translation>
295295
</message>
296296
<message>
297-
<location filename="../../src/qml/ClassWidgets/Components/dialogs/ClassSwapDialog.qml" line="480"/>
297+
<location filename="../../src/qml/ClassWidgets/Components/dialogs/ClassSwapDialog.qml" line="485"/>
298298
<source>Cancel</source>
299299
<translation type="unfinished"></translation>
300300
</message>
@@ -2031,83 +2031,83 @@ It&apos;s incompatible and may cause unexpected issues.</source>
20312031
<context>
20322032
<name>ScheduleRuntime</name>
20332033
<message>
2034-
<location filename="../../src/core/schedule/runtime.py" line="291"/>
2034+
<location filename="../../src/core/schedule/runtime.py" line="293"/>
20352035
<source>Class Started</source>
20362036
<translation type="unfinished"></translation>
20372037
</message>
20382038
<message>
2039-
<location filename="../../src/core/schedule/runtime.py" line="308"/>
2039+
<location filename="../../src/core/schedule/runtime.py" line="310"/>
20402040
<source>Activity Started</source>
20412041
<translation type="unfinished"></translation>
20422042
</message>
20432043
<message>
2044-
<location filename="../../src/core/schedule/runtime.py" line="317"/>
2044+
<location filename="../../src/core/schedule/runtime.py" line="319"/>
20452045
<source>Intermission</source>
20462046
<translation type="unfinished"></translation>
20472047
</message>
20482048
<message>
2049-
<location filename="../../src/core/schedule/runtime.py" line="333"/>
2050-
<location filename="../../src/core/schedule/runtime.py" line="343"/>
2051-
<location filename="../../src/core/schedule/runtime.py" line="369"/>
2052-
<location filename="../../src/core/schedule/runtime.py" line="379"/>
2049+
<location filename="../../src/core/schedule/runtime.py" line="335"/>
2050+
<location filename="../../src/core/schedule/runtime.py" line="345"/>
2051+
<location filename="../../src/core/schedule/runtime.py" line="371"/>
2052+
<location filename="../../src/core/schedule/runtime.py" line="381"/>
20532053
<source>Next: {}</source>
20542054
<translation type="unfinished"></translation>
20552055
</message>
20562056
<message>
2057-
<location filename="../../src/core/schedule/runtime.py" line="337"/>
2058-
<location filename="../../src/core/schedule/runtime.py" line="373"/>
2057+
<location filename="../../src/core/schedule/runtime.py" line="339"/>
2058+
<location filename="../../src/core/schedule/runtime.py" line="375"/>
20592059
<source>Next: {} at {}</source>
20602060
<translation type="unfinished"></translation>
20612061
</message>
20622062
<message>
2063-
<location filename="../../src/core/schedule/runtime.py" line="339"/>
2064-
<location filename="../../src/core/schedule/runtime.py" line="375"/>
2063+
<location filename="../../src/core/schedule/runtime.py" line="341"/>
2064+
<location filename="../../src/core/schedule/runtime.py" line="377"/>
20652065
<source>Next: {} (Off-site)</source>
20662066
<translation type="unfinished"></translation>
20672067
</message>
20682068
<message>
2069-
<location filename="../../src/core/schedule/runtime.py" line="353"/>
2069+
<location filename="../../src/core/schedule/runtime.py" line="355"/>
20702070
<source>Recess</source>
20712071
<translation type="unfinished"></translation>
20722072
</message>
20732073
<message>
2074-
<location filename="../../src/core/schedule/runtime.py" line="388"/>
2074+
<location filename="../../src/core/schedule/runtime.py" line="390"/>
20752075
<source>Enjoy your break</source>
20762076
<translation type="unfinished"></translation>
20772077
</message>
20782078
<message>
2079-
<location filename="../../src/core/schedule/runtime.py" line="390"/>
2079+
<location filename="../../src/core/schedule/runtime.py" line="392"/>
20802080
<source>Free Time</source>
20812081
<translation type="unfinished"></translation>
20822082
</message>
20832083
<message>
2084-
<location filename="../../src/core/schedule/runtime.py" line="395"/>
2084+
<location filename="../../src/core/schedule/runtime.py" line="397"/>
20852085
<source>Status Changed</source>
20862086
<translation type="unfinished"></translation>
20872087
</message>
20882088
<message>
2089-
<location filename="../../src/core/schedule/runtime.py" line="395"/>
2089+
<location filename="../../src/core/schedule/runtime.py" line="397"/>
20902090
<source>Current status: {}</source>
20912091
<translation type="unfinished"></translation>
20922092
</message>
20932093
<message>
2094-
<location filename="../../src/core/schedule/runtime.py" line="449"/>
2095-
<location filename="../../src/core/schedule/runtime.py" line="459"/>
2094+
<location filename="../../src/core/schedule/runtime.py" line="451"/>
2095+
<location filename="../../src/core/schedule/runtime.py" line="461"/>
20962096
<source>Coming up: {}</source>
20972097
<translation type="unfinished"></translation>
20982098
</message>
20992099
<message>
2100-
<location filename="../../src/core/schedule/runtime.py" line="453"/>
2100+
<location filename="../../src/core/schedule/runtime.py" line="455"/>
21012101
<source>Coming up: {} at {}</source>
21022102
<translation type="unfinished"></translation>
21032103
</message>
21042104
<message>
2105-
<location filename="../../src/core/schedule/runtime.py" line="455"/>
2105+
<location filename="../../src/core/schedule/runtime.py" line="457"/>
21062106
<source>Coming up: {} (Off-site)</source>
21072107
<translation type="unfinished"></translation>
21082108
</message>
21092109
<message>
2110-
<location filename="../../src/core/schedule/runtime.py" line="467"/>
2110+
<location filename="../../src/core/schedule/runtime.py" line="469"/>
21112111
<source>Preparation Bell</source>
21122112
<translation type="unfinished"></translation>
21132113
</message>

0 commit comments

Comments
 (0)