Skip to content

Commit d347c85

Browse files
hemiao2023hemiao2023
committed
Merge branch 'release-0315' into HEAD
1 parent e3aa459 commit d347c85

111 files changed

Lines changed: 72093 additions & 30608 deletions

File tree

Some content is hidden

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

‎cmake/modules/NSIS.template.in‎

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -634,6 +634,57 @@ FunctionEnd
634634
LicenseLangString LNG_License ${LANG_SIMPCHINESE} "@CPACK_RESOURCE_FILE_LICENSE@"
635635
LicenseLangString LNG_License ${LANG_TRADCHINESE} "@CPACK_RESOURCE_FILE_LICENSE_TD@"
636636

637+
LicenseLangString LNG_License ${LANG_ALBANIAN} "@CPACK_RESOURCE_FILE_LICENSE_EN@"
638+
LicenseLangString LNG_License ${LANG_ARABIC} "@CPACK_RESOURCE_FILE_LICENSE_EN@"
639+
LicenseLangString LNG_License ${LANG_BASQUE} "@CPACK_RESOURCE_FILE_LICENSE_EN@"
640+
LicenseLangString LNG_License ${LANG_BELARUSIAN} "@CPACK_RESOURCE_FILE_LICENSE_EN@"
641+
LicenseLangString LNG_License ${LANG_BOSNIAN} "@CPACK_RESOURCE_FILE_LICENSE_EN@"
642+
LicenseLangString LNG_License ${LANG_BRETON} "@CPACK_RESOURCE_FILE_LICENSE_EN@"
643+
LicenseLangString LNG_License ${LANG_BULGARIAN} "@CPACK_RESOURCE_FILE_LICENSE_EN@"
644+
LicenseLangString LNG_License ${LANG_CROATIAN} "@CPACK_RESOURCE_FILE_LICENSE_EN@"
645+
LicenseLangString LNG_License ${LANG_CZECH} "@CPACK_RESOURCE_FILE_LICENSE_EN@"
646+
LicenseLangString LNG_License ${LANG_DANISH} "@CPACK_RESOURCE_FILE_LICENSE_EN@"
647+
LicenseLangString LNG_License ${LANG_DUTCH} "@CPACK_RESOURCE_FILE_LICENSE_EN@"
648+
LicenseLangString LNG_License ${LANG_ESTONIAN} "@CPACK_RESOURCE_FILE_LICENSE_EN@"
649+
LicenseLangString LNG_License ${LANG_FARSI} "@CPACK_RESOURCE_FILE_LICENSE_EN@"
650+
LicenseLangString LNG_License ${LANG_FINNISH} "@CPACK_RESOURCE_FILE_LICENSE_EN@"
651+
LicenseLangString LNG_License ${LANG_FRENCH} "@CPACK_RESOURCE_FILE_LICENSE_EN@"
652+
LicenseLangString LNG_License ${LANG_GERMAN} "@CPACK_RESOURCE_FILE_LICENSE_EN@"
653+
LicenseLangString LNG_License ${LANG_GREEK} "@CPACK_RESOURCE_FILE_LICENSE_EN@"
654+
LicenseLangString LNG_License ${LANG_HEBREW} "@CPACK_RESOURCE_FILE_LICENSE_EN@"
655+
LicenseLangString LNG_License ${LANG_HUNGARIAN} "@CPACK_RESOURCE_FILE_LICENSE_EN@"
656+
LicenseLangString LNG_License ${LANG_ICELANDIC} "@CPACK_RESOURCE_FILE_LICENSE_EN@"
657+
LicenseLangString LNG_License ${LANG_INDONESIAN} "@CPACK_RESOURCE_FILE_LICENSE_EN@"
658+
LicenseLangString LNG_License ${LANG_IRISH} "@CPACK_RESOURCE_FILE_LICENSE_EN@"
659+
LicenseLangString LNG_License ${LANG_ITALIAN} "@CPACK_RESOURCE_FILE_LICENSE_EN@"
660+
LicenseLangString LNG_License ${LANG_JAPANESE} "@CPACK_RESOURCE_FILE_LICENSE_EN@"
661+
LicenseLangString LNG_License ${LANG_KOREAN} "@CPACK_RESOURCE_FILE_LICENSE_EN@"
662+
LicenseLangString LNG_License ${LANG_KURDISH} "@CPACK_RESOURCE_FILE_LICENSE_EN@"
663+
LicenseLangString LNG_License ${LANG_LATVIAN} "@CPACK_RESOURCE_FILE_LICENSE_EN@"
664+
LicenseLangString LNG_License ${LANG_LITHUANIAN} "@CPACK_RESOURCE_FILE_LICENSE_EN@"
665+
LicenseLangString LNG_License ${LANG_LUXEMBOURGISH} "@CPACK_RESOURCE_FILE_LICENSE_EN@"
666+
LicenseLangString LNG_License ${LANG_MACEDONIAN} "@CPACK_RESOURCE_FILE_LICENSE_EN@"
667+
LicenseLangString LNG_License ${LANG_MALAY} "@CPACK_RESOURCE_FILE_LICENSE_EN@"
668+
LicenseLangString LNG_License ${LANG_MONGOLIAN} "@CPACK_RESOURCE_FILE_LICENSE_EN@"
669+
LicenseLangString LNG_License ${LANG_NORWEGIAN} "@CPACK_RESOURCE_FILE_LICENSE_EN@"
670+
LicenseLangString LNG_License ${LANG_POLISH} "@CPACK_RESOURCE_FILE_LICENSE_EN@"
671+
LicenseLangString LNG_License ${LANG_PORTUGUESE} "@CPACK_RESOURCE_FILE_LICENSE_EN@"
672+
LicenseLangString LNG_License ${LANG_PORTUGUESEBR} "@CPACK_RESOURCE_FILE_LICENSE_EN@"
673+
LicenseLangString LNG_License ${LANG_ROMANIAN} "@CPACK_RESOURCE_FILE_LICENSE_EN@"
674+
LicenseLangString LNG_License ${LANG_RUSSIAN} "@CPACK_RESOURCE_FILE_LICENSE_EN@"
675+
LicenseLangString LNG_License ${LANG_SERBIAN} "@CPACK_RESOURCE_FILE_LICENSE_EN@"
676+
LicenseLangString LNG_License ${LANG_SERBIANLATIN} "@CPACK_RESOURCE_FILE_LICENSE_EN@"
677+
LicenseLangString LNG_License ${LANG_SLOVAK} "@CPACK_RESOURCE_FILE_LICENSE_EN@"
678+
LicenseLangString LNG_License ${LANG_SLOVENIAN} "@CPACK_RESOURCE_FILE_LICENSE_EN@"
679+
LicenseLangString LNG_License ${LANG_SPANISH} "@CPACK_RESOURCE_FILE_LICENSE_EN@"
680+
LicenseLangString LNG_License ${LANG_SWEDISH} "@CPACK_RESOURCE_FILE_LICENSE_EN@"
681+
LicenseLangString LNG_License ${LANG_THAI} "@CPACK_RESOURCE_FILE_LICENSE_EN@"
682+
LicenseLangString LNG_License ${LANG_TURKISH} "@CPACK_RESOURCE_FILE_LICENSE_EN@"
683+
LicenseLangString LNG_License ${LANG_UKRAINIAN} "@CPACK_RESOURCE_FILE_LICENSE_EN@"
684+
LicenseLangString LNG_License ${LANG_WELSH} "@CPACK_RESOURCE_FILE_LICENSE_EN@"
685+
686+
687+
637688
;--------------------------------
638689
;Reserve Files
639690

@@ -1008,6 +1059,7 @@ inst:
10081059
; the install directory by comparing it to the
10091060
; install directory that is expected to be the
10101061
; default
1062+
RMDir /r "@CPACK_LOCAL_APPDATA@\Creality\EBWebView"
10111063
StrCpy $IS_DEFAULT_INSTALLDIR 0
10121064
StrCmp "$INSTDIR" "@CPACK_NSIS_INSTALL_ROOT@\@CPACK_PACKAGE_INSTALL_DIRECTORY@" 0 +2
10131065
StrCpy $IS_DEFAULT_INSTALLDIR 1

‎localization/i18n/Community.pot‎

Lines changed: 103 additions & 87 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,16 @@
11
msgid ""
22
msgstr ""
3+
"Project-Id-Version: \n"
4+
"POT-Creation-Date: \n"
5+
"PO-Revision-Date: \n"
6+
"Last-Translator: \n"
7+
"Language-Team: \n"
8+
"Language: en\n"
9+
"MIME-Version: 1.0\n"
310
"Content-Type: text/plain; charset=utf-8\n"
4-
"Plural-Forms: nplurals=1; plural=0;\n"
11+
"Content-Transfer-Encoding: 8bit\n"
12+
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
13+
"X-Generator: Poedit 3.5\n"
514

615
msgid "Submit"
716
msgstr "Submit"
@@ -118,10 +127,10 @@ msgid "Layer Height"
118127
msgstr "Layer Height"
119128

120129
msgid "Consumables Length"
121-
msgstr "Consumables Length"
130+
msgstr "Filament Length"
122131

123132
msgid "Sync Consumables"
124-
msgstr "Sync Consumables"
133+
msgstr "Sync Filament"
125134

126135
msgid "Time required"
127136
msgstr "Time required"
@@ -136,26 +145,22 @@ msgid "No shelf data available"
136145
msgstr "No shelf data available"
137146

138147
msgid ""
139-
"The number of printer presets cached in the cloud has reached the upper "
140-
"limit (20). Newly created user presets will not be synchronized to the "
141-
"cloud."
148+
"The number of printer presets cached in the cloud has reached the upper limit "
149+
"(20). Newly created user presets will not be synchronized to the cloud."
142150
msgstr ""
143-
"The number of printer presets cached in the cloud has reached the upper "
144-
"limit (20). Newly created user presets will not be synchronized to the "
145-
"cloud."
151+
"The number of printer presets cached in the cloud has reached the upper limit "
152+
"(20). Newly created user presets will not be synchronized to the cloud."
146153

147154
msgid ""
148-
"The presets have not been synced to Creality Cloud yet. Click here to "
149-
"enable it."
155+
"The presets have not been synced to Creality Cloud yet. Click here to enable it."
150156
msgstr ""
151-
"The presets have not been synced to Creality Cloud yet. Click here to "
152-
"enable it."
157+
"The presets have not been synced to Creality Cloud yet. Click here to enable it."
153158

154159
msgid "Please Input"
155160
msgstr "Please Input"
156161

157162
msgid "Consumables"
158-
msgstr "Consumables"
163+
msgstr "Filament"
159164

160165
msgid "Technology"
161166
msgstr "Technology"
@@ -481,8 +486,8 @@ msgstr "Model Details"
481486
msgid "Category"
482487
msgstr "Category"
483488

484-
msgid "models total {count}"
485-
msgstr "models total {count}"
489+
msgid "models total"
490+
msgstr "models total"
486491

487492
msgid "Print Settings"
488493
msgstr "Print Settings"
@@ -785,24 +790,24 @@ msgid "Knowledge Sharing (CC) License Agreement"
785790
msgstr "Knowledge Sharing (CC) License Agreement"
786791

787792
msgid ""
788-
"Creality Cloud adopts the internationally recognized Copyright License 4.0 "
789-
"to protect the rights and interests of model owners. The models of "
790-
"Chuangxiang Cloud platform are shared by a large number of enthusiasts in "
791-
"the community. If you find any violations of relevant laws and "
792-
"infringement, please contact us in a timely manner. "
793+
"Creality Cloud adopts the internationally recognized Copyright License 4.0 to "
794+
"protect the rights and interests of model owners. The models of Chuangxiang Cloud "
795+
"platform are shared by a large number of enthusiasts in the community. If you find "
796+
"any violations of relevant laws and infringement, please contact us in a timely "
797+
"manner. "
793798
msgstr ""
794-
"Creality Cloud adopts the internationally recognized Copyright License 4.0 "
795-
"to protect the rights and interests of model owners. The models of "
796-
"Chuangxiang Cloud platform are shared by a large number of enthusiasts in "
797-
"the community. If you find any violations of relevant laws and "
798-
"infringement, please contact us in a timely manner. "
799+
"Creality Cloud adopts the internationally recognized Copyright License 4.0 to "
800+
"protect the rights and interests of model owners. The models of Chuangxiang Cloud "
801+
"platform are shared by a large number of enthusiasts in the community. If you find "
802+
"any violations of relevant laws and infringement, please contact us in a timely "
803+
"manner. "
799804

800805
msgid ""
801-
"Indicates that the original work is created by the creator, and users can "
802-
"freely use the creator's work"
806+
"Indicates that the original work is created by the creator, and users can freely "
807+
"use the creator's work"
803808
msgstr ""
804-
"Indicates that the original work is created by the creator, and users can "
805-
"freely use the creator's work"
809+
"Indicates that the original work is created by the creator, and users can freely "
810+
"use the creator's work"
806811

807812
msgid ""
808813
"Indicate that the original work is the creator. If changes are made to the "
@@ -812,53 +817,51 @@ msgstr ""
812817
"original work, the revised work must still indicate the original author"
813818

814819
msgid ""
815-
"Indicate that the original work is created by the creator, and users can "
816-
"freely use the creator's work (except for commercial purposes)"
820+
"Indicate that the original work is created by the creator, and users can freely "
821+
"use the creator's work (except for commercial purposes)"
817822
msgstr ""
818-
"Indicate that the original work is created by the creator, and users can "
819-
"freely use the creator's work (except for commercial purposes)"
823+
"Indicate that the original work is created by the creator, and users can freely "
824+
"use the creator's work (except for commercial purposes)"
820825

821826
msgid ""
822-
"Indicate that the original work is created by the creator, and the user "
823-
"cannot change the work or use it for commercial purposes"
827+
"Indicate that the original work is created by the creator, and the user cannot "
828+
"change the work or use it for commercial purposes"
824829
msgstr ""
825-
"Indicate that the original work is created by the creator, and the user "
826-
"cannot change the work or use it for commercial purposes"
830+
"Indicate that the original work is created by the creator, and the user cannot "
831+
"change the work or use it for commercial purposes"
827832

828833
msgid ""
829-
"Indicate that the original work is created by the creator and the user "
830-
"cannot change the work"
834+
"Indicate that the original work is created by the creator and the user cannot "
835+
"change the work"
831836
msgstr ""
832-
"Indicate that the original work is created by the creator and the user "
833-
"cannot change the work"
837+
"Indicate that the original work is created by the creator and the user cannot "
838+
"change the work"
834839

835840
msgid ""
836-
"Abandon copyright and publicly disclose that anyone can use my work at any "
837-
"time without permission"
841+
"Abandon copyright and publicly disclose that anyone can use my work at any time "
842+
"without permission"
838843
msgstr ""
839-
"Abandon copyright and publicly disclose that anyone can use my work at any "
840-
"time without permission"
844+
"Abandon copyright and publicly disclose that anyone can use my work at any time "
845+
"without permission"
841846

842847
msgid ""
843-
"The 3D model files sold on Creality Cloud have standard licenses and are "
844-
"subject to certain restrictions upon purchase and download. In particular, "
845-
"these files cannot be used for any commercial purposes; they are for "
846-
"personal use only. They may not be shared, transmitted, distributed, "
847-
"modified, copied, or resold in the form of files or items, including 3D "
848-
"models or any parts of models"
848+
"The 3D model files sold on Creality Cloud have standard licenses and are subject "
849+
"to certain restrictions upon purchase and download. In particular, these files "
850+
"cannot be used for any commercial purposes; they are for personal use only. They "
851+
"may not be shared, transmitted, distributed, modified, copied, or resold in the "
852+
"form of files or items, including 3D models or any parts of models"
849853
msgstr ""
850-
"The 3D model files sold on Creality Cloud have standard licenses and are "
851-
"subject to certain restrictions upon purchase and download. In particular, "
852-
"these files cannot be used for any commercial purposes; they are for "
853-
"personal use only. They may not be shared, transmitted, distributed, "
854-
"modified, copied, or resold in the form of files or items, including 3D "
855-
"models or any parts of models"
854+
"The 3D model files sold on Creality Cloud have standard licenses and are subject "
855+
"to certain restrictions upon purchase and download. In particular, these files "
856+
"cannot be used for any commercial purposes; they are for personal use only. They "
857+
"may not be shared, transmitted, distributed, modified, copied, or resold in the "
858+
"form of files or items, including 3D models or any parts of models"
856859

857860
msgid "No Data"
858861
msgstr "No Data"
859862

860-
msgid "No results were found for {key}"
861-
msgstr "No results were found for {key}"
863+
msgid "No results were found for"
864+
msgstr "No results were found for"
862865

863866
msgid "Select All"
864867
msgstr "Select All"
@@ -878,12 +881,9 @@ msgstr "You haven't purchased the model yet, go ahead and buy the model~"
878881
msgid "You haven't collected the model yet, go collect the model~"
879882
msgstr "You haven't collected the model yet, go collect the model~"
880883

881-
msgid ""
882-
"You haven't created a creative work yet, go ahead and create a creative "
883-
"work~"
884+
msgid "You haven't created a creative work yet, go ahead and create a creative work~"
884885
msgstr ""
885-
"You haven't created a creative work yet, go ahead and create a creative "
886-
"work~"
886+
"You haven't created a creative work yet, go ahead and create a creative work~"
887887

888888
msgid ""
889889
"You haven't uploaded the print configuration yet, go uploaded the print "
@@ -1026,44 +1026,42 @@ msgid "6.0 Update Description"
10261026
msgstr "6.0 Update Description"
10271027

10281028
msgid ""
1029-
"Introduce the basic usage of Creality Print and guide users to complete the "
1030-
"first printing task."
1029+
"Introduce the basic usage of Creality Print and guide users to complete the first "
1030+
"printing task."
10311031
msgstr ""
1032-
"Introduce the basic usage of Creality Print and guide users to complete the "
1033-
"first printing task."
1032+
"Introduce the basic usage of Creality Print and guide users to complete the first "
1033+
"printing task."
10341034

10351035
msgid ""
1036-
"After obtaining a multi-color printer, use Creality Print for the first "
1037-
"color printing."
1036+
"After obtaining a multi-color printer, use Creality Print for the first color "
1037+
"printing."
10381038
msgstr ""
1039-
"After obtaining a multi-color printer, use Creality Print for the first "
1040-
"color printing."
1039+
"After obtaining a multi-color printer, use Creality Print for the first color "
1040+
"printing."
10411041

10421042
msgid ""
1043-
"Briefly introduce the parameter settings for Creality Print slicing, "
1044-
"including the selection of preset parameters, parameter settings, and "
1045-
"saving, to help you better complete 3D printing."
1043+
"Briefly introduce the parameter settings for Creality Print slicing, including the "
1044+
"selection of preset parameters, parameter settings, and saving, to help you better "
1045+
"complete 3D printing."
10461046
msgstr ""
1047-
"Briefly introduce the parameter settings for Creality Print slicing, "
1048-
"including the selection of preset parameters, parameter settings, and "
1049-
"saving, to help you better complete 3D printing."
1047+
"Briefly introduce the parameter settings for Creality Print slicing, including the "
1048+
"selection of preset parameters, parameter settings, and saving, to help you better "
1049+
"complete 3D printing."
10501050

10511051
msgid "By adjusting various parameters to achieve the best printing effect."
10521052
msgstr "By adjusting various parameters to achieve the best printing effect."
10531053

10541054
msgid ""
1055-
"Creality Print 6.0 has been upgraded to provide you with a better user "
1056-
"experience."
1055+
"Creality Print 6.0 has been upgraded to provide you with a better user experience."
10571056
msgstr ""
1058-
"Creality Print 6.0 has been upgraded to provide you with a better user "
1059-
"experience."
1057+
"Creality Print 6.0 has been upgraded to provide you with a better user experience."
10601058

10611059
msgid ""
1062-
"You can select one as the current device on the 'My Devices' or 'Multiple "
1063-
"Devices' pages"
1060+
"You can select one as the current device on the 'My Devices' or 'Multiple Devices' "
1061+
"pages"
10641062
msgstr ""
1065-
"You can select one as the current device on the 'My Devices' or 'Multiple "
1066-
"Devices' pages"
1063+
"You can select one as the current device on the 'My Devices' or 'Multiple Devices' "
1064+
"pages"
10671065

10681066
msgid "System"
10691067
msgstr "System"
@@ -1127,3 +1125,21 @@ msgstr "Deemos"
11271125

11281126
msgid "Record"
11291127
msgstr "Record"
1128+
1129+
msgid "Filament Type"
1130+
msgstr "Filament Type"
1131+
1132+
msgid "At least one filament must be selected."
1133+
msgstr "At least one filament must be selected."
1134+
1135+
msgid "Do you want to use default filament?"
1136+
msgstr "Do you want to use default filament?"
1137+
1138+
msgid "Add New Filament"
1139+
msgstr "Add New Filament"
1140+
1141+
msgid "Please select at least one printer."
1142+
msgstr "Please select at least one printer."
1143+
1144+
msgid "The filament you want is not found"
1145+
msgstr "The filament you want is not found"

0 commit comments

Comments
 (0)