Commit graph

115 commits

Author SHA1 Message Date
SoftFever
5b0ba1207e Change Application name to OrcaSlicer 2023-03-12 10:05:22 +08:00
SoftFever
20f2b2cd0e OrcaSlicer 2023-03-10 18:58:43 +08:00
SoftFever
5ef51f6c8a Merge branch 'master-remote' into feature/1.5
Signed-off-by: SoftFever <softfeverever@gmail.com>

# Conflicts:
#	bbl/i18n/BambuStudio.pot
#	bbl/i18n/de/BambuStudio_de.po
#	bbl/i18n/en/BambuStudio_en.po
#	bbl/i18n/es/BambuStudio_es.po
#	bbl/i18n/fr/BambuStudio_fr.po
#	bbl/i18n/hu/BambuStudio_hu.po
#	bbl/i18n/it/BambuStudio_it.po
#	bbl/i18n/nl/BambuStudio_nl.po
#	bbl/i18n/sv/BambuStudio_sv.po
#	bbl/i18n/zh_cn/BambuStudio_zh_CN.po
#	deps/Boost/Boost.cmake
#	deps/wxWidgets/wxWidgets.cmake
#	resources/config.json
#	resources/i18n/de/BambuStudio.mo
#	resources/i18n/en/BambuStudio.mo
#	resources/i18n/es/BambuStudio.mo
#	resources/i18n/fr/BambuStudio.mo
#	resources/i18n/hu/BambuStudio.mo
#	resources/i18n/it/BambuStudio.mo
#	resources/i18n/nl/BambuStudio.mo
#	resources/i18n/sv/BambuStudio.mo
#	resources/i18n/zh_cn/BambuStudio.mo
#	resources/images/tips_arrow.svg
#	resources/profiles/Anycubic.json
#	resources/profiles/Anycubic/filament/Anycubic Generic ABS.json
#	resources/profiles/Anycubic/filament/Anycubic Generic ASA.json
#	resources/profiles/Anycubic/filament/Anycubic Generic PA-CF.json
#	resources/profiles/Anycubic/filament/Anycubic Generic PA.json
#	resources/profiles/Anycubic/filament/Anycubic Generic PC.json
#	resources/profiles/Anycubic/filament/Anycubic Generic PETG.json
#	resources/profiles/Anycubic/filament/Anycubic Generic PLA-CF.json
#	resources/profiles/Anycubic/filament/Anycubic Generic PLA.json
#	resources/profiles/Anycubic/filament/Anycubic Generic PVA.json
#	resources/profiles/Anycubic/filament/Anycubic Generic TPU.json
#	resources/profiles/Anycubic/filament/fdm_filament_common.json
#	resources/profiles/Anycubic/machine/Anycubic 4Max Pro 0.4 nozzle.json
#	resources/profiles/Anycubic/machine/Anycubic 4Max Pro.json
#	resources/profiles/Anycubic/process/0.20mm Standard @4MaxPro.json
#	resources/profiles/Anycubic/process/fdm_process_common.json
#	resources/profiles/BBL.json
#	resources/profiles/BBL/machine/Bambu Lab P1P 0.2 nozzle.json
#	resources/profiles/BBL/machine/Bambu Lab P1P 0.4 nozzle.json
#	resources/profiles/BBL/machine/Bambu Lab P1P 0.6 nozzle.json
#	resources/profiles/BBL/machine/Bambu Lab P1P 0.8 nozzle.json
#	resources/profiles/BBL/machine/Bambu Lab X1 0.2 nozzle.json
#	resources/profiles/BBL/machine/Bambu Lab X1 0.4 nozzle.json
#	resources/profiles/BBL/machine/Bambu Lab X1 0.6 nozzle.json
#	resources/profiles/BBL/machine/Bambu Lab X1 0.8 nozzle.json
#	resources/profiles/BBL/machine/Bambu Lab X1 Carbon 0.2 nozzle.json
#	resources/profiles/BBL/machine/Bambu Lab X1 Carbon 0.4 nozzle.json
#	resources/profiles/BBL/machine/Bambu Lab X1 Carbon 0.6 nozzle.json
#	resources/profiles/BBL/machine/Bambu Lab X1 Carbon 0.8 nozzle.json
#	resources/profiles/BBL/machine/fdm_bbl_3dp_001_common.json
#	resources/profiles/Voron.json
#	resources/web/data/text.js
#	resources/web/image/printer/Anycubic 4Max Pro_cover.png
#	src/BambuStudio.cpp
#	src/libslic3r/GCode.cpp
#	src/libslic3r/GCode.hpp
#	src/libslic3r/GCode/GCodeProcessor.cpp
#	src/libslic3r/GCodeWriter.hpp
#	src/libslic3r/PerimeterGenerator.cpp
#	src/libslic3r/PresetBundle.cpp
#	src/libslic3r/Print.cpp
#	src/libslic3r/Print.hpp
#	src/libslic3r/PrintConfig.cpp
#	src/libslic3r/PrintConfig.hpp
#	src/libslic3r/PrintObject.cpp
#	src/slic3r/GUI/AMSMaterialsSetting.cpp
#	src/slic3r/GUI/AMSMaterialsSetting.hpp
#	src/slic3r/GUI/AmsMappingPopup.cpp
#	src/slic3r/GUI/AmsMappingPopup.hpp
#	src/slic3r/GUI/Auxiliary.cpp
#	src/slic3r/GUI/BackgroundSlicingProcess.cpp
#	src/slic3r/GUI/ConfigManipulation.cpp
#	src/slic3r/GUI/DeviceManager.cpp
#	src/slic3r/GUI/DeviceManager.hpp
#	src/slic3r/GUI/ExtrusionCalibration.cpp
#	src/slic3r/GUI/GCodeViewer.cpp
#	src/slic3r/GUI/GCodeViewer.hpp
#	src/slic3r/GUI/GUI_App.cpp
#	src/slic3r/GUI/IMSlider.cpp
#	src/slic3r/GUI/Jobs/PrintJob.cpp
#	src/slic3r/GUI/Jobs/PrintJob.hpp
#	src/slic3r/GUI/Jobs/SendJob.cpp
#	src/slic3r/GUI/Jobs/SendJob.hpp
#	src/slic3r/GUI/MainFrame.cpp
#	src/slic3r/GUI/MainFrame.hpp
#	src/slic3r/GUI/MediaPlayCtrl.cpp
#	src/slic3r/GUI/OptionsGroup.cpp
#	src/slic3r/GUI/PhysicalPrinterDialog.cpp
#	src/slic3r/GUI/Plater.cpp
#	src/slic3r/GUI/PrintHostDialogs.cpp
#	src/slic3r/GUI/Printer/BambuTunnel.h
#	src/slic3r/GUI/Printer/PrinterFileSystem.cpp
#	src/slic3r/GUI/Printer/gstbambusrc.c
#	src/slic3r/GUI/Printer/gstbambusrc.h
#	src/slic3r/GUI/ReleaseNote.cpp
#	src/slic3r/GUI/ReleaseNote.hpp
#	src/slic3r/GUI/SelectMachine.cpp
#	src/slic3r/GUI/SendToPrinter.cpp
#	src/slic3r/GUI/SetBedTypeDialog.cpp
#	src/slic3r/GUI/StatusPanel.cpp
#	src/slic3r/GUI/StatusPanel.hpp
#	src/slic3r/GUI/Tab.cpp
#	src/slic3r/GUI/Widgets/AMSControl.cpp
#	src/slic3r/GUI/Widgets/AMSControl.hpp
#	src/slic3r/GUI/Widgets/ImageSwitchButton.cpp
#	src/slic3r/GUI/Widgets/Label.cpp
#	src/slic3r/GUI/WipeTowerDialog.cpp
#	src/slic3r/Utils/Process.cpp
#	src/slic3r/Utils/bambu_networking.hpp
#	version.inc
2023-03-08 00:08:26 +08:00
SoftFever
a6cd32fe72 Allow user to turn adaptive layer height for tree support.
Signed-off-by: SoftFever <softfeverever@gmail.com>
#257
2023-03-06 19:57:09 +08:00
SoftFever
c58ed92da1 Support filament shrinkage
Ported from SuperSlicer

Signed-off-by: SoftFever <softfeverever@gmail.com>
#360
2023-03-05 17:23:17 +08:00
Stone Li
a985c21f3a ENH: sync po files with localazy
Change-Id: Ifd5414a6bdb8fa1dfb55b01f7e3f85d6562b3fc1
Signed-off-by: Stone Li <stone.li@bambulab.com>
2023-02-24 17:44:15 +08:00
tao.jin
394391fd12 FIX: chinese translation (STUDIO-2311~13)
Change-Id: I341bae62a88cb6130a2558cbea4083abc360d444
2023-02-24 17:44:15 +08:00
wintergua
d5f2a3e748 ENH: translate of the tooltips of brim type
Change-Id: I37601cbe4b116c79bdd164feac12d463d4b1c5ce
2023-02-24 09:23:57 +08:00
zhimin.zeng
2fe0930777 FIX: Modify translation
Change-Id: I5c29e805dd8b93fbc3d8a59ef146e2fd16ce9ea0
2023-02-24 09:23:57 +08:00
liz.li
3be3c5553e ENH:add some translations
Change-Id: Iec4b31ada7d1f21f7ddb12fd777fd284298a0cde
2023-02-24 09:23:57 +08:00
5axes
6191b4b6dd
Update French Translation (#337)
* Update BambuStudio_fr.po

French translation

* Update BambuStudio_fr.po

New modifications

* Update BambuStudio_fr.po

Test to add Layer time ( missing in the original po file)

* Update French

Change some French initial translation like A-coup in Saccade

* Update BambuStudio_fr.po

Add Jerk(XY)

* Update BambuStudio_fr.po

last modification for today

* Update BambuStudio_fr.po

Last French translation of the Morning
Mainly on the Giszmo

* Update BambuStudio_fr.po

Mainly on Filament parameter

* Update BambuStudio_fr.po

Adjust translation with :

https://github.com/BastR/BambuStudio/blob/french-trad/bbl/i18n/fr/BambuStudio_fr.po

* Update BambuStudio.mo

* last modif

Last modif for today

* Update fr

an other one

* Update

Last Modification

* Update

Missing term in the German translation

* update

Changement

* update

TimeLaps

* Update 11/1/2023

Minor Change
Update  : Year / Month ( not translated in the previous translation)

* Update French Translation

Update for BambuStudio-SoftFever_V1.4.2

* Change some typro

Update some Typo

* Fix some Typo

Fix somme Typo and Label not presnet in the pot file

* Add Calibration SoftFever

Add missing Label on the SoftFever Calibration Menu

* Update BambuStudio_fr.po

Erreur Taper: -> Type:

* Update text.js

Add French Translation for Web interface

* Add Manual Web text

Translate French Manual Web text

* Update text.js

Back to "en"
2023-02-22 23:07:05 +08:00
tao.jin
c1cc270788 ENH: chinese translation
Change-Id: I6c072b36a14fed516a9cdcbd7c7ea2038ec29f3f
2023-02-22 20:09:17 +08:00
lane.wei
6f8f937aa6 ENH: translation: add some translation
Change-Id: I3d7e9d791a3b9425f1addaca65a8ef9181616b13
2023-02-22 20:09:17 +08:00
Stone Li
85bcb8eae8 ENH: sync po files with localazy
Change-Id: Id2637ab8c80e1cc557ded245b612d6692ff6d31f
Signed-off-by: Stone Li <stone.li@bambulab.com>
2023-02-22 20:09:17 +08:00
chunmao.guo
fc96370abe FIX: update po text
Change-Id: Ib120d6725031419e00a6098a40886859783f0b3e
2023-02-22 20:09:17 +08:00
tao wang
72a3828531 ENH:add chinese translation of humidity descriptions
Change-Id: I51a22dde87f5f0eaec44bfe41b3751cd4f12cd9e
2023-02-22 20:09:17 +08:00
liz.li
e994cd02e2 ENH:add some translate
Change-Id: Ic635f5f85f67662339edd28d87a4a37232d5bc0e
2023-02-22 20:09:17 +08:00
Arthur
92022bd809 ENH: translate "No layers" and others
Change-Id: I654490a5e4049dbeb61ef7499adfddfe94bcbcf6
2023-02-22 20:09:17 +08:00
Stone Li
6122f5010a ENH: sync with localazy and fix compile error
Change-Id: I7cae72f24c2fde61e0c1e99c89c21801b7d10125
Signed-off-by: Stone Li <stone.li@bambulab.com>
2023-02-22 20:09:17 +08:00
SoftFever
40e9424bdf fix typo
Signed-off-by: SoftFever <softfeverever@gmail.com>
2023-02-18 11:45:42 +08:00
Heiko Liebscher
0cc7319ac8
fix new features in german after pr (#326) 2023-02-18 09:20:48 +08:00
SoftFever
d72a6d218f fix PO/MO
Signed-off-by: SoftFever <softfeverever@gmail.com>
2023-02-17 23:44:48 +08:00
Arthur
aa36d376ec ENH: translate "is too close to others" and so on
Jira: STUDIO-2020
Change-Id: I73a4cd47bafc32ff580b7970a37f808f78cffc3e
2023-02-01 16:24:44 +08:00
Stone Li
32afff46fc NEW: support language of japanese
update po files for BambuStudio

Change-Id: I6783fe831d05a19eb7fce6f8b24ee7949d1ed86b
Signed-off-by: Stone Li <stone.li@bambulab.com>
2023-02-01 16:24:44 +08:00
Stone Li
f7175a3e14 ENH: refine entries for extrusion calibration
Change-Id: Idcefca17cb026887ea5bd32387ab6d269f8f9d58
Signed-off-by: Stone Li <stone.li@bambulab.com>
2023-02-01 16:24:44 +08:00
Heiko Liebscher
8244693b55
Fix po and pot file (#258)
* fix typo and tooltip

* merge pot po german

* fix more

* merge with bambu master pot

* fix po to Softfever

* fix

* build new Softfever pot mege with xx.po

* enable hints in german again
2023-01-31 22:34:49 +08:00
Heiko Liebscher
68def3cbb0
fix typo pressure adv and german languge (#252)
* fix typo pressure adv and german languge

* typo

* type advnce

* fix typo and msg id
2023-01-28 21:10:57 +08:00
SoftFever
5209719777 fix po file erros
Signed-off-by: SoftFever <softfeverever@gmail.com>
2023-01-27 00:11:21 +08:00
Heiko Liebscher
5866d7b756
fix typo and dups after merge (#209) 2023-01-22 16:53:38 +08:00
SoftFever
2492e5d39c merge upstream changes
Signed-off-by: SoftFever <103989404+SoftFever@users.noreply.github.com>
2023-01-21 00:37:10 +08:00
Heiko Liebscher
ff1303778d
Update de files (#168)
* new ids and typo

* build mo file

* new msgid
2023-01-12 22:56:43 +08:00
5axes
a3e5531e28
New French Translation Update (#158)
* Update BambuStudio_fr.po

French translation

* Update BambuStudio_fr.po

New modifications

* Update BambuStudio_fr.po

Test to add Layer time ( missing in the original po file)

* Update French

Change some French initial translation like A-coup in Saccade

* Update BambuStudio_fr.po

Add Jerk(XY)

* Update BambuStudio_fr.po

last modification for today

* Update BambuStudio_fr.po

Last French translation of the Morning
Mainly on the Giszmo

* Update BambuStudio_fr.po

Mainly on Filament parameter

* Update BambuStudio_fr.po

Adjust translation with :

https://github.com/BastR/BambuStudio/blob/french-trad/bbl/i18n/fr/BambuStudio_fr.po

* Update BambuStudio.mo

* last modif

Last modif for today

* Update fr

an other one

* Update

Last Modification

* Update

Missing term in the German translation

* update

Changement

* update

TimeLaps

* Update 11/1/2023

Minor Change
Update  : Year / Month ( not translated in the previous translation)
2023-01-12 19:36:57 +08:00
5axes
fa403349e6
Update BambuStudio_fr.po (#150)
* Update BambuStudio_fr.po

French translation

* Update BambuStudio_fr.po

New modifications

* Update BambuStudio_fr.po

Test to add Layer time ( missing in the original po file)

* Update French

Change some French initial translation like A-coup in Saccade

* Update BambuStudio_fr.po

Add Jerk(XY)

* Update BambuStudio_fr.po

last modification for today

* Update BambuStudio_fr.po

Last French translation of the Morning
Mainly on the Giszmo

* Update BambuStudio_fr.po

Mainly on Filament parameter

* Update BambuStudio_fr.po

Adjust translation with :

https://github.com/BastR/BambuStudio/blob/french-trad/bbl/i18n/fr/BambuStudio_fr.po

* Update BambuStudio.mo

* last modif

Last modif for today

* Update fr

an other one
2023-01-10 22:30:57 +08:00
Arthur
9dd1cabef6 ENH: translate support setting suggestions
Change-Id: Iabaf85589cd99d3364edeb4c3f2847156657e05a
2023-01-10 19:08:26 +08:00
Heiko Liebscher
985ce27d38
Fix german (#146)
* fix_ger add new msgid

* typo
2023-01-09 09:09:37 +08:00
Heiko Liebscher
07b7fc3768
fix german language again (#104)
* fix german language

* fix_german_calibration
2023-01-04 08:15:22 +08:00
Heiko Liebscher
c0f7c6d5eb
fix some german translation and the bug with the compare settings button if some words to long in the gui (#97) 2023-01-02 16:53:28 +08:00
SoftFever
260156648d Merge branch 'master-remote' into SoftFever
# Conflicts:
#	bbl/i18n/BambuStudio.pot
#	bbl/i18n/de/BambuStudio_de.po
#	bbl/i18n/en/BambuStudio_en.po
#	bbl/i18n/es/BambuStudio_es.po
#	bbl/i18n/fr/BambuStudio_fr.po
#	bbl/i18n/hu/BambuStudio_hu.po
#	bbl/i18n/nl/BambuStudio_nl.po
#	bbl/i18n/sv/BambuStudio_sv.po
#	bbl/i18n/zh_cn/BambuStudio_zh_CN.po
#	resources/i18n/de/BambuStudio.mo
#	resources/i18n/en/BambuStudio.mo
#	resources/i18n/es/BambuStudio.mo
#	resources/i18n/fr/BambuStudio.mo
#	resources/i18n/hu/BambuStudio.mo
#	resources/i18n/nl/BambuStudio.mo
#	resources/i18n/sv/BambuStudio.mo
#	resources/i18n/zh_cn/BambuStudio.mo
#	resources/profiles/BBL.json
#	resources/profiles/Creality.json
#	resources/profiles/Voron.json
#	src/libslic3r/PrintConfig.cpp
#	src/libslic3r/TreeSupport.cpp
#	src/slic3r/GUI/DeviceManager.cpp
#	src/slic3r/GUI/ReleaseNote.cpp
#	version.inc
2022-12-31 15:15:58 +08:00
SoftFever
913c4976a1 cn translation
Signed-off-by: SoftFever <103989404+SoftFever@users.noreply.github.com>
2022-12-31 01:26:10 +08:00
lane.wei
3871dfa03e ENH: update translation
Change-Id: Ibe4bbb671b08ae0e94506d629b711963a58907b5
2022-12-26 05:31:54 -05:00
Stone Li
aff6fb934c ENH: sync po files with localazy
Change-Id: I1d4b821cb0b681bd0f8c87be942d71365372ddae
Signed-off-by: Stone Li <stone.li@bambulab.com>
2022-12-26 05:31:54 -05:00
tao.jin
629e68f4a0 ENH: add chinese translation
Change-Id: Ib0ced81990d5f34190775ae38861538bdbba71db
2022-12-26 05:31:54 -05:00
SoftFever
a688719e72 Revert "Merge branch 'SoftFever' into feature/calib"
This reverts commit f5b28201fe, reversing
changes made to d9e9fb2206.

# Conflicts:
#	version.inc
2022-12-25 12:39:45 +08:00
SoftFever
d733ab7e7b Merge branch 'master' into SoftFever
Signed-off-by: SoftFever <103989404+SoftFever@users.noreply.github.com>

# Conflicts:
#	resources/i18n/zh_cn/BambuStudio.mo
#	src/libslic3r/TreeSupport.cpp
#	version.inc
2022-12-21 16:54:14 +08:00
salt.wei
aae57b32e4 ENH: po change for translating
Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: I5bc92aad6647dc9cc2cf94e25bec2f4322940ad2
2022-12-19 06:13:10 -05:00
SoftFever
bf8a9fee1f Merge branch 'master' into SoftFever
# Conflicts:
#	bbl/i18n/zh_cn/BambuStudio_zh_CN.po
#	resources/i18n/de/BambuStudio.mo
#	resources/i18n/en/BambuStudio.mo
#	resources/i18n/es/BambuStudio.mo
#	resources/i18n/fr/BambuStudio.mo
#	resources/i18n/hu/BambuStudio.mo
#	resources/i18n/nl/BambuStudio.mo
#	resources/i18n/sv/BambuStudio.mo
#	resources/i18n/zh_cn/BambuStudio.mo
#	resources/profiles/Creality.json
#	resources/profiles/Voron.json
#	resources/web/guide/3/index.html
#	src/libslic3r/AppConfig.cpp
#	src/libslic3r/GCode.cpp
#	src/libslic3r/GCode/GCodeProcessor.cpp
#	src/libslic3r/LayerRegion.cpp
#	src/libslic3r/Preset.cpp
#	src/libslic3r/Print.cpp
#	src/libslic3r/PrintConfig.cpp
#	src/libslic3r/PrintConfig.hpp
#	src/libslic3r/PrintObject.cpp
#	src/slic3r/GUI/AboutDialog.cpp
#	src/slic3r/GUI/BBLTopbar.cpp
#	src/slic3r/GUI/ConfigManipulation.cpp
#	src/slic3r/GUI/ConfigWizard.cpp
#	src/slic3r/GUI/GCodeViewer.cpp
#	src/slic3r/GUI/GUI_App.cpp
#	src/slic3r/GUI/GUI_Factories.cpp
#	src/slic3r/GUI/MainFrame.cpp
#	src/slic3r/GUI/Plater.cpp
#	src/slic3r/GUI/Tab.cpp
#	version.inc
2022-12-16 13:59:30 +08:00
lane.wei
13a1dc03c1 ENH: sync the different codes
especially for the translation files

Change-Id: I940578ff6e22b0939d42eeed2209bfeddb0eb191
2022-12-15 04:38:15 -05:00
chunmao.guo
dcb105c605 FIX: update po/mo
Change-Id: Ib2234356f9a17eec4f26791327151dde64f4e4bb
2022-12-15 04:38:15 -05:00
chunmao.guo
30bdc1c116 FIX: po texts
Change-Id: I3d0a04a849003c93484133563c7e79316c7e8998
2022-12-15 04:38:15 -05:00
tao.jin
1428a6bec7 ENH:add chinese translation
Change-Id: Id2d238e3e2918229c88dd986ed41848ea932abcf
2022-12-15 04:38:15 -05:00