Skip to content

Commit f460da7

Browse files
RinLit-233-shirokoRinLit-233-shiroko
committed
Merge remote-tracking branch 'origin/main'
2 parents 56ca6fc + 1bb9bd4 commit f460da7

7 files changed

Lines changed: 147 additions & 154 deletions

File tree

‎assets/locales/en_US.ts‎

Lines changed: 21 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -794,43 +794,42 @@ Do you want to continue using them, or discard and restore the original schedule
794794
<context>
795795
<name>EntryDelegate</name>
796796
<message>
797-
<location filename="../../src/qml/ClassWidgets/Components/editor/EntryDelegate.qml" line="53"/>
797+
<location filename="../../src/qml/ClassWidgets/Components/editor/EntryDelegate.qml" line="54"/>
798798
<source>Remove</source>
799799
<translation type="unfinished"></translation>
800800
</message>
801801
<message>
802-
<location filename="../../src/qml/ClassWidgets/Components/editor/EntryDelegate.qml" line="205"/>
802+
<location filename="../../src/qml/ClassWidgets/Components/editor/EntryDelegate.qml" line="213"/>
803803
<source>Class</source>
804804
<translation type="unfinished"></translation>
805805
</message>
806806
<message>
807-
<location filename="../../src/qml/ClassWidgets/Components/editor/EntryDelegate.qml" line="206"/>
807+
<location filename="../../src/qml/ClassWidgets/Components/editor/EntryDelegate.qml" line="214"/>
808808
<source>Break</source>
809809
<translation type="unfinished"></translation>
810810
</message>
811811
<message>
812-
<location filename="../../src/qml/ClassWidgets/Components/editor/EntryDelegate.qml" line="207"/>
812+
<location filename="../../src/qml/ClassWidgets/Components/editor/EntryDelegate.qml" line="215"/>
813813
<source>Activity</source>
814814
<translation type="unfinished"></translation>
815815
</message>
816816
<message>
817-
<location filename="../../src/qml/ClassWidgets/Components/editor/EntryDelegate.qml" line="208"/>
817+
<location filename="../../src/qml/ClassWidgets/Components/editor/EntryDelegate.qml" line="216"/>
818818
<source>Unknown Type</source>
819819
<translation type="unfinished"></translation>
820820
</message>
821821
<message>
822-
<location filename="../../src/qml/ClassWidgets/Components/editor/EntryDelegate.qml" line="216"/>
823-
<location filename="../../src/qml/ClassWidgets/Components/editor/EntryDelegate.qml" line="225"/>
822+
<location filename="../../src/qml/ClassWidgets/Components/editor/EntryDelegate.qml" line="224"/>
824823
<source> minutes</source>
825824
<translation type="unfinished"></translation>
826825
</message>
827826
<message>
828-
<location filename="../../src/qml/ClassWidgets/Components/editor/EntryDelegate.qml" line="244"/>
827+
<location filename="../../src/qml/ClassWidgets/Components/editor/EntryDelegate.qml" line="252"/>
829828
<source>Invalid Time Range</source>
830829
<translation type="unfinished"></translation>
831830
</message>
832831
<message>
833-
<location filename="../../src/qml/ClassWidgets/Components/editor/EntryDelegate.qml" line="245"/>
832+
<location filename="../../src/qml/ClassWidgets/Components/editor/EntryDelegate.qml" line="253"/>
834833
<source>End time must be later than start time.</source>
835834
<translation type="unfinished"></translation>
836835
</message>
@@ -919,55 +918,55 @@ Do you want to continue using them, or discard and restore the original schedule
919918
<context>
920919
<name>EntryListView</name>
921920
<message>
922-
<location filename="../../src/qml/ClassWidgets/Components/editor/EntryListView.qml" line="40"/>
921+
<location filename="../../src/qml/ClassWidgets/Components/editor/EntryListView.qml" line="46"/>
923922
<source>No timeline selected</source>
924923
<translation type="unfinished"></translation>
925924
</message>
926925
<message>
927-
<location filename="../../src/qml/ClassWidgets/Components/editor/EntryListView.qml" line="46"/>
926+
<location filename="../../src/qml/ClassWidgets/Components/editor/EntryListView.qml" line="52"/>
928927
<source>Please select a timeline first to add a new schedule.</source>
929928
<translation type="unfinished"></translation>
930929
</message>
931930
<message>
932-
<location filename="../../src/qml/ClassWidgets/Components/editor/EntryListView.qml" line="91"/>
931+
<location filename="../../src/qml/ClassWidgets/Components/editor/EntryListView.qml" line="102"/>
933932
<source> PM</source>
934933
<translation type="unfinished"></translation>
935934
</message>
936935
<message>
937-
<location filename="../../src/qml/ClassWidgets/Components/editor/EntryListView.qml" line="93"/>
936+
<location filename="../../src/qml/ClassWidgets/Components/editor/EntryListView.qml" line="104"/>
938937
<source> AM</source>
939938
<translation type="unfinished"></translation>
940939
</message>
941940
<message>
942-
<location filename="../../src/qml/ClassWidgets/Components/editor/EntryListView.qml" line="142"/>
943-
<location filename="../../src/qml/ClassWidgets/Components/editor/EntryListView.qml" line="171"/>
941+
<location filename="../../src/qml/ClassWidgets/Components/editor/EntryListView.qml" line="153"/>
942+
<location filename="../../src/qml/ClassWidgets/Components/editor/EntryListView.qml" line="182"/>
944943
<source>Class</source>
945944
<translation type="unfinished"></translation>
946945
</message>
947946
<message>
948-
<location filename="../../src/qml/ClassWidgets/Components/editor/EntryListView.qml" line="150"/>
949-
<location filename="../../src/qml/ClassWidgets/Components/editor/EntryListView.qml" line="177"/>
947+
<location filename="../../src/qml/ClassWidgets/Components/editor/EntryListView.qml" line="161"/>
948+
<location filename="../../src/qml/ClassWidgets/Components/editor/EntryListView.qml" line="188"/>
950949
<source>Break</source>
951950
<translation type="unfinished"></translation>
952951
</message>
953952
<message>
954-
<location filename="../../src/qml/ClassWidgets/Components/editor/EntryListView.qml" line="158"/>
955-
<location filename="../../src/qml/ClassWidgets/Components/editor/EntryListView.qml" line="183"/>
953+
<location filename="../../src/qml/ClassWidgets/Components/editor/EntryListView.qml" line="169"/>
954+
<location filename="../../src/qml/ClassWidgets/Components/editor/EntryListView.qml" line="194"/>
956955
<source>Activity</source>
957956
<translation type="unfinished"></translation>
958957
</message>
959958
<message>
960-
<location filename="../../src/qml/ClassWidgets/Components/editor/EntryListView.qml" line="166"/>
959+
<location filename="../../src/qml/ClassWidgets/Components/editor/EntryListView.qml" line="177"/>
961960
<source>New Schedule</source>
962961
<translation type="unfinished"></translation>
963962
</message>
964963
<message>
965-
<location filename="../../src/qml/ClassWidgets/Components/editor/EntryListView.qml" line="242"/>
964+
<location filename="../../src/qml/ClassWidgets/Components/editor/EntryListView.qml" line="299"/>
966965
<source>Conflict with existing schedule</source>
967966
<translation type="unfinished"></translation>
968967
</message>
969968
<message>
970-
<location filename="../../src/qml/ClassWidgets/Components/editor/EntryListView.qml" line="244"/>
969+
<location filename="../../src/qml/ClassWidgets/Components/editor/EntryListView.qml" line="301"/>
971970
<source>This time overlaps with an existing schedule (%1 – %2)</source>
972971
<translation type="unfinished"></translation>
973972
</message>

‎assets/locales/it.ts‎

Lines changed: 21 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -836,43 +836,42 @@ Do you want to continue using them, or discard and restore the original schedule
836836
<context>
837837
<name>EntryDelegate</name>
838838
<message>
839-
<location filename="../../src/qml/ClassWidgets/Components/editor/EntryDelegate.qml" line="53"/>
839+
<location filename="../../src/qml/ClassWidgets/Components/editor/EntryDelegate.qml" line="54"/>
840840
<source>Remove</source>
841841
<translation type="unfinished">Elimina</translation>
842842
</message>
843843
<message>
844-
<location filename="../../src/qml/ClassWidgets/Components/editor/EntryDelegate.qml" line="205"/>
844+
<location filename="../../src/qml/ClassWidgets/Components/editor/EntryDelegate.qml" line="213"/>
845845
<source>Class</source>
846846
<translation type="unfinished">classe</translation>
847847
</message>
848848
<message>
849-
<location filename="../../src/qml/ClassWidgets/Components/editor/EntryDelegate.qml" line="206"/>
849+
<location filename="../../src/qml/ClassWidgets/Components/editor/EntryDelegate.qml" line="214"/>
850850
<source>Break</source>
851851
<translation type="unfinished"></translation>
852852
</message>
853853
<message>
854-
<location filename="../../src/qml/ClassWidgets/Components/editor/EntryDelegate.qml" line="207"/>
854+
<location filename="../../src/qml/ClassWidgets/Components/editor/EntryDelegate.qml" line="215"/>
855855
<source>Activity</source>
856856
<translation type="unfinished"></translation>
857857
</message>
858858
<message>
859-
<location filename="../../src/qml/ClassWidgets/Components/editor/EntryDelegate.qml" line="208"/>
859+
<location filename="../../src/qml/ClassWidgets/Components/editor/EntryDelegate.qml" line="216"/>
860860
<source>Unknown Type</source>
861861
<translation type="unfinished"></translation>
862862
</message>
863863
<message>
864-
<location filename="../../src/qml/ClassWidgets/Components/editor/EntryDelegate.qml" line="216"/>
865-
<location filename="../../src/qml/ClassWidgets/Components/editor/EntryDelegate.qml" line="225"/>
864+
<location filename="../../src/qml/ClassWidgets/Components/editor/EntryDelegate.qml" line="224"/>
866865
<source> minutes</source>
867866
<translation type="unfinished"> minutes</translation>
868867
</message>
869868
<message>
870-
<location filename="../../src/qml/ClassWidgets/Components/editor/EntryDelegate.qml" line="244"/>
869+
<location filename="../../src/qml/ClassWidgets/Components/editor/EntryDelegate.qml" line="252"/>
871870
<source>Invalid Time Range</source>
872871
<translation type="unfinished"></translation>
873872
</message>
874873
<message>
875-
<location filename="../../src/qml/ClassWidgets/Components/editor/EntryDelegate.qml" line="245"/>
874+
<location filename="../../src/qml/ClassWidgets/Components/editor/EntryDelegate.qml" line="253"/>
876875
<source>End time must be later than start time.</source>
877876
<translation type="unfinished"></translation>
878877
</message>
@@ -965,55 +964,55 @@ Do you want to continue using them, or discard and restore the original schedule
965964
<context>
966965
<name>EntryListView</name>
967966
<message>
968-
<location filename="../../src/qml/ClassWidgets/Components/editor/EntryListView.qml" line="91"/>
967+
<location filename="../../src/qml/ClassWidgets/Components/editor/EntryListView.qml" line="102"/>
969968
<source> PM</source>
970969
<translation type="unfinished"></translation>
971970
</message>
972971
<message>
973-
<location filename="../../src/qml/ClassWidgets/Components/editor/EntryListView.qml" line="93"/>
972+
<location filename="../../src/qml/ClassWidgets/Components/editor/EntryListView.qml" line="104"/>
974973
<source> AM</source>
975974
<translation type="unfinished"></translation>
976975
</message>
977976
<message>
978-
<location filename="../../src/qml/ClassWidgets/Components/editor/EntryListView.qml" line="166"/>
977+
<location filename="../../src/qml/ClassWidgets/Components/editor/EntryListView.qml" line="177"/>
979978
<source>New Schedule</source>
980979
<translation type="unfinished"></translation>
981980
</message>
982981
<message>
983-
<location filename="../../src/qml/ClassWidgets/Components/editor/EntryListView.qml" line="142"/>
984-
<location filename="../../src/qml/ClassWidgets/Components/editor/EntryListView.qml" line="171"/>
982+
<location filename="../../src/qml/ClassWidgets/Components/editor/EntryListView.qml" line="153"/>
983+
<location filename="../../src/qml/ClassWidgets/Components/editor/EntryListView.qml" line="182"/>
985984
<source>Class</source>
986985
<translation type="unfinished">classe</translation>
987986
</message>
988987
<message>
989-
<location filename="../../src/qml/ClassWidgets/Components/editor/EntryListView.qml" line="40"/>
988+
<location filename="../../src/qml/ClassWidgets/Components/editor/EntryListView.qml" line="46"/>
990989
<source>No timeline selected</source>
991990
<translation type="unfinished"></translation>
992991
</message>
993992
<message>
994-
<location filename="../../src/qml/ClassWidgets/Components/editor/EntryListView.qml" line="46"/>
993+
<location filename="../../src/qml/ClassWidgets/Components/editor/EntryListView.qml" line="52"/>
995994
<source>Please select a timeline first to add a new schedule.</source>
996995
<translation type="unfinished"></translation>
997996
</message>
998997
<message>
999-
<location filename="../../src/qml/ClassWidgets/Components/editor/EntryListView.qml" line="150"/>
1000-
<location filename="../../src/qml/ClassWidgets/Components/editor/EntryListView.qml" line="177"/>
998+
<location filename="../../src/qml/ClassWidgets/Components/editor/EntryListView.qml" line="161"/>
999+
<location filename="../../src/qml/ClassWidgets/Components/editor/EntryListView.qml" line="188"/>
10011000
<source>Break</source>
10021001
<translation type="unfinished"></translation>
10031002
</message>
10041003
<message>
1005-
<location filename="../../src/qml/ClassWidgets/Components/editor/EntryListView.qml" line="158"/>
1006-
<location filename="../../src/qml/ClassWidgets/Components/editor/EntryListView.qml" line="183"/>
1004+
<location filename="../../src/qml/ClassWidgets/Components/editor/EntryListView.qml" line="169"/>
1005+
<location filename="../../src/qml/ClassWidgets/Components/editor/EntryListView.qml" line="194"/>
10071006
<source>Activity</source>
10081007
<translation type="unfinished"></translation>
10091008
</message>
10101009
<message>
1011-
<location filename="../../src/qml/ClassWidgets/Components/editor/EntryListView.qml" line="242"/>
1010+
<location filename="../../src/qml/ClassWidgets/Components/editor/EntryListView.qml" line="299"/>
10121011
<source>Conflict with existing schedule</source>
10131012
<translation type="unfinished"></translation>
10141013
</message>
10151014
<message>
1016-
<location filename="../../src/qml/ClassWidgets/Components/editor/EntryListView.qml" line="244"/>
1015+
<location filename="../../src/qml/ClassWidgets/Components/editor/EntryListView.qml" line="301"/>
10171016
<source>This time overlaps with an existing schedule (%1 – %2)</source>
10181017
<translation type="unfinished"></translation>
10191018
</message>

0 commit comments

Comments
 (0)