From 37c54aa4f663f81a8fcf5516406cf811b7946fb5 Mon Sep 17 00:00:00 2001 From: SoftFever Date: Wed, 9 Aug 2023 13:06:58 +0800 Subject: [PATCH] clean up --- .github/workflows/build_linux.yml | 4 +- .github/workflows/build_mac_arm64.yml | 4 +- .github/workflows/build_mac_x64.yml | 4 +- .github/workflows/build_win.yml | 4 +- .gitignore | 2 - BambuStudio.sublime-project | 103 --- BuildLinux.sh | 2 +- CMakeLists.txt | 6 +- Containerfile | 71 -- DockerBuild.sh | 15 - DockerRun.sh | 25 - Dockerfile | 94 --- bbs_test_tools/CMakeLists.txt | 4 - .../bbs_gcode_checker/CMakeLists.txt | 6 - .../bbs_gcode_checker/GCodeChecker.cpp | 702 ------------------ .../bbs_gcode_checker/GCodeChecker.h | 222 ------ bbs_test_tools/bbs_gcode_checker/main.cpp | 24 - build_relwithdebinfo.bat | 23 - build_win.bat | 495 ------------ cmake/modules/MacOSXBundleInfo.plist.in | 6 +- deps/Blosc/Blosc.cmake | 4 +- deps/CGAL/CGAL.cmake | 2 +- deps/CMakeLists.txt | 4 +- deps/CURL/CURL.cmake | 2 +- deps/Cereal/Cereal.cmake | 2 +- deps/EXPAT/EXPAT.cmake | 2 +- deps/FREETYPE/FREETYPE.cmake | 2 +- deps/GLEW/GLEW.cmake | 2 +- deps/GLFW/GLFW.cmake | 2 +- deps/JPEG/JPEG.cmake | 2 +- deps/NLopt/NLopt.cmake | 2 +- deps/OCCT/OCCT.cmake | 2 +- deps/OpenCSG/OpenCSG.cmake | 2 +- deps/OpenEXR/OpenEXR.cmake | 2 +- deps/OpenVDB/OpenVDB.cmake | 2 +- deps/PNG/PNG.cmake | 4 +- deps/Qhull/Qhull.cmake | 2 +- deps/TBB/TBB.cmake | 2 +- deps/TIFF/TIFF.cmake | 4 +- deps/ZLIB/ZLIB.cmake | 2 +- deps/wxWidgets/wxWidgets.cmake | 2 +- doc/Localization_guide.md | 24 +- localazy.json | 22 +- {bbl => localization}/i18n/OrcaSlicer.pot | 2 +- .../i18n/cs/OrcaSlicer_cs.po | 4 +- .../i18n/de/OrcaSlicer_de.po | 82 +- .../i18n/en/OrcaSlicer_en.po | 96 +-- .../i18n/es/OrcaSlicer_es.po | 80 +- .../i18n/fr/OrcaSlicer_fr.po | 86 +-- .../i18n/hu/OrcaSlicer_hu.po | 76 +- .../i18n/it/OrcaSlicer_it.po | 90 +-- .../i18n/ja/OrcaSlicer_ja.po | 124 ++-- .../i18n/ko/OrcaSlicer_ko.po | 74 +- {bbl => localization}/i18n/list.txt | 0 .../i18n/nl/OrcaSlicer_nl.po | 96 +-- .../i18n/ru/OrcaSlicer_ru.po | 4 +- .../i18n/sv/OrcaSlicer_sv.po | 88 +-- .../i18n/uk/OrcaSlicer_uk.po | 4 +- .../i18n/zh_cn/OrcaSlicer_zh_CN.po | 94 +-- resources/images/BambuStudio.png | Bin 21898 -> 0 bytes resources/images/BambuStudio_192px.png | Bin 12805 -> 0 bytes resources/images/BambuStudio_32px.png | Bin 1433 -> 0 bytes ...mac_128px.png => OrcaSlicer-mac_128px.png} | Bin ...mac_256px.ico => OrcaSlicer-mac_256px.ico} | Bin .../{BambuStudio.icns => OrcaSlicer.icns} | Bin .../{BambuStudio.svg => OrcaSlicer.svg} | 0 ...mbuStudioTitle.ico => OrcaSlicerTitle.ico} | Bin ...mbuStudioTitle.png => OrcaSlicerTitle.png} | Bin ...uStudio_128px.png => OrcaSlicer_128px.png} | Bin ...BambuStudio_154.png => OrcaSlicer_154.png} | Bin ...154_title.png => OrcaSlicer_154_title.png} | Bin ...ale.png => OrcaSlicer_192px_grayscale.png} | Bin ...t.png => OrcaSlicer_192px_transparent.png} | Bin .../{BambuStudio_64.png => OrcaSlicer_64.png} | Bin ...uStudio_about.svg => OrcaSlicer_about.svg} | 0 resources/web/data/text.js | 4 +- run_gettext.bat | 8 +- run_gettext.sh | 8 +- sandboxes/opencsg/main.cpp | 2 +- src/CMakeLists.txt | 8 +- src/{BambuStudio.cpp => OrcaSlicer.cpp} | 6 +- src/{BambuStudio.hpp => OrcaSlicer.hpp} | 0 ...o_app_msvc.cpp => OrcaSlicer_app_msvc.cpp} | 0 src/libslic3r/Config.cpp | 2 +- src/libslic3r/GCode/GCodeProcessor.cpp | 18 +- src/libslic3r/GCode/GCodeProcessor.hpp | 2 +- src/libslic3r/PrintConfig.cpp | 2 +- src/libslic3r/libslic3r.h | 4 +- src/libslic3r/utils.cpp | 2 +- .../{README-Bambu.txt => README-Prusa.txt} | 4 +- src/platform/msw/OrcaSlicer-gcodeviewer.rc.in | 2 +- src/platform/osx/Info.plist.in | 8 +- src/platform/unix/BambuGcodeviewer.desktop | 2 +- src/platform/unix/OrcaSlicer.desktop | 2 +- src/slic3r/GUI/AboutDialog.cpp | 8 +- src/slic3r/GUI/AmsMappingPopup.cpp | 2 +- src/slic3r/GUI/BindDialog.cpp | 4 +- src/slic3r/GUI/Calibration.cpp | 2 +- src/slic3r/GUI/ConfigWizard.cpp | 2 +- src/slic3r/GUI/DesktopIntegrationDialog.cpp | 22 +- src/slic3r/GUI/DownloadProgressDialog.cpp | 2 +- src/slic3r/GUI/GUI_App.cpp | 12 +- src/slic3r/GUI/GUI_App.hpp | 8 +- src/slic3r/GUI/InstanceCheckMac.mm | 14 +- src/slic3r/GUI/KBShortcutsDialog.cpp | 2 +- src/slic3r/GUI/MainFrame.cpp | 22 +- src/slic3r/GUI/MediaPlayCtrl.cpp | 2 +- src/slic3r/GUI/ModelMall.cpp | 2 +- src/slic3r/GUI/MsgDialog.cpp | 4 +- src/slic3r/GUI/ParamsPanel.cpp | 2 +- src/slic3r/GUI/PlateSettingsDialog.cpp | 2 +- src/slic3r/GUI/Plater.cpp | 2 +- src/slic3r/GUI/Preferences.cpp | 2 +- src/slic3r/GUI/PrintOptionsDialog.cpp | 2 +- src/slic3r/GUI/Printer/gstbambusrc.c | 4 +- src/slic3r/GUI/PrivacyUpdateDialog.cpp | 2 +- src/slic3r/GUI/PublishDialog.cpp | 2 +- src/slic3r/GUI/RecenterDialog.cpp | 2 +- src/slic3r/GUI/ReleaseNote.cpp | 18 +- src/slic3r/GUI/SavePresetDialog.cpp | 2 +- src/slic3r/GUI/SelectMachine.cpp | 4 +- src/slic3r/GUI/SendSystemInfoDialog.cpp | 4 +- src/slic3r/GUI/SendToPrinter.cpp | 2 +- src/slic3r/GUI/UnsavedChangesDialog.cpp | 2 +- src/slic3r/GUI/UpdateDialogs.cpp | 4 +- src/slic3r/GUI/wxMediaCtrl2.cpp | 2 +- src/slic3r/GUI/wxMediaCtrl2.mm | 2 +- tests/cpp17/main.cpp | 6 +- 128 files changed, 692 insertions(+), 2478 deletions(-) delete mode 100644 BambuStudio.sublime-project delete mode 100644 Containerfile delete mode 100755 DockerBuild.sh delete mode 100755 DockerRun.sh delete mode 100644 Dockerfile delete mode 100644 bbs_test_tools/CMakeLists.txt delete mode 100644 bbs_test_tools/bbs_gcode_checker/CMakeLists.txt delete mode 100644 bbs_test_tools/bbs_gcode_checker/GCodeChecker.cpp delete mode 100644 bbs_test_tools/bbs_gcode_checker/GCodeChecker.h delete mode 100644 bbs_test_tools/bbs_gcode_checker/main.cpp delete mode 100644 build_relwithdebinfo.bat delete mode 100644 build_win.bat rename {bbl => localization}/i18n/OrcaSlicer.pot (99%) rename {bbl => localization}/i18n/cs/OrcaSlicer_cs.po (99%) mode change 100755 => 100644 rename {bbl => localization}/i18n/de/OrcaSlicer_de.po (99%) rename {bbl => localization}/i18n/en/OrcaSlicer_en.po (99%) rename {bbl => localization}/i18n/es/OrcaSlicer_es.po (99%) rename {bbl => localization}/i18n/fr/OrcaSlicer_fr.po (99%) rename {bbl => localization}/i18n/hu/OrcaSlicer_hu.po (99%) rename {bbl => localization}/i18n/it/OrcaSlicer_it.po (99%) rename {bbl => localization}/i18n/ja/OrcaSlicer_ja.po (98%) rename {bbl => localization}/i18n/ko/OrcaSlicer_ko.po (99%) rename {bbl => localization}/i18n/list.txt (100%) rename {bbl => localization}/i18n/nl/OrcaSlicer_nl.po (99%) rename {bbl => localization}/i18n/ru/OrcaSlicer_ru.po (99%) rename {bbl => localization}/i18n/sv/OrcaSlicer_sv.po (99%) rename {bbl => localization}/i18n/uk/OrcaSlicer_uk.po (99%) rename {bbl => localization}/i18n/zh_cn/OrcaSlicer_zh_CN.po (99%) delete mode 100644 resources/images/BambuStudio.png delete mode 100644 resources/images/BambuStudio_192px.png delete mode 100644 resources/images/BambuStudio_32px.png rename resources/images/{BambuStudio-mac_128px.png => OrcaSlicer-mac_128px.png} (100%) rename resources/images/{BambuStudio-mac_256px.ico => OrcaSlicer-mac_256px.ico} (100%) rename resources/images/{BambuStudio.icns => OrcaSlicer.icns} (100%) rename resources/images/{BambuStudio.svg => OrcaSlicer.svg} (100%) rename resources/images/{BambuStudioTitle.ico => OrcaSlicerTitle.ico} (100%) rename resources/images/{BambuStudioTitle.png => OrcaSlicerTitle.png} (100%) rename resources/images/{BambuStudio_128px.png => OrcaSlicer_128px.png} (100%) rename resources/images/{BambuStudio_154.png => OrcaSlicer_154.png} (100%) rename resources/images/{BambuStudio_154_title.png => OrcaSlicer_154_title.png} (100%) rename resources/images/{BambuStudio_192px_grayscale.png => OrcaSlicer_192px_grayscale.png} (100%) rename resources/images/{BambuStudio_192px_transparent.png => OrcaSlicer_192px_transparent.png} (100%) rename resources/images/{BambuStudio_64.png => OrcaSlicer_64.png} (100%) rename resources/images/{BambuStudio_about.svg => OrcaSlicer_about.svg} (100%) rename src/{BambuStudio.cpp => OrcaSlicer.cpp} (99%) rename src/{BambuStudio.hpp => OrcaSlicer.hpp} (100%) rename src/{BambuStudio_app_msvc.cpp => OrcaSlicer_app_msvc.cpp} (100%) rename src/miniz/{README-Bambu.txt => README-Prusa.txt} (88%) diff --git a/.github/workflows/build_linux.yml b/.github/workflows/build_linux.yml index 651d992984b..ef5b81ccd8e 100644 --- a/.github/workflows/build_linux.yml +++ b/.github/workflows/build_linux.yml @@ -8,7 +8,7 @@ on: - 'src/**' - '**/CMakeLists.txt' - 'version.inc' - - 'bbl/**' + - 'localization/**' - 'resources/**' pull_request: @@ -18,7 +18,7 @@ on: - 'src/**' - '**/CMakeLists.txt' - 'version.inc' - - 'bbl/**' + - 'localization/**' - 'resources/**' jobs: diff --git a/.github/workflows/build_mac_arm64.yml b/.github/workflows/build_mac_arm64.yml index 392d056964e..85ac0b53670 100644 --- a/.github/workflows/build_mac_arm64.yml +++ b/.github/workflows/build_mac_arm64.yml @@ -8,7 +8,7 @@ on: - 'src/**' - '**/CMakeLists.txt' - 'version.inc' - - 'bbl/**' + - 'localization/**' - 'resources/**' pull_request: @@ -18,7 +18,7 @@ on: - 'src/**' - '**/CMakeLists.txt' - 'version.inc' - - 'bbl/**' + - 'localization/**' - 'resources/**' jobs: diff --git a/.github/workflows/build_mac_x64.yml b/.github/workflows/build_mac_x64.yml index b7663ed830e..15d884c85a9 100644 --- a/.github/workflows/build_mac_x64.yml +++ b/.github/workflows/build_mac_x64.yml @@ -8,7 +8,7 @@ on: - 'src/**' - '**/CMakeLists.txt' - 'version.inc' - - 'bbl/**' + - 'localization/**' - 'resources/**' pull_request: @@ -18,7 +18,7 @@ on: - 'src/**' - '**/CMakeLists.txt' - 'version.inc' - - 'bbl/**' + - 'localization/**' - 'resources/**' jobs: diff --git a/.github/workflows/build_win.yml b/.github/workflows/build_win.yml index 68b196f0b44..0e409409f5e 100644 --- a/.github/workflows/build_win.yml +++ b/.github/workflows/build_win.yml @@ -8,7 +8,7 @@ on: - 'src/**' - '**/CMakeLists.txt' - 'version.inc' - - 'bbl/**' + - 'localization/**' - 'resources/**' - '.github/workflows/build_win.yml' @@ -19,7 +19,7 @@ on: - 'src/**' - '**/CMakeLists.txt' - 'version.inc' - - 'bbl/**' + - 'localization/**' - 'resources/**' - '.github/workflows/build_win.yml' diff --git a/.gitignore b/.gitignore index 1a0dee043a6..078d9483700 100644 --- a/.gitignore +++ b/.gitignore @@ -25,6 +25,4 @@ build_*/ SVG src/OrcaSlicer-doc/ .idea/ -bbl/i18n/es/OrcaSlicer_es.mo -bbl/i18n/es/OrcaSlicer.mo /.cache/ \ No newline at end of file diff --git a/BambuStudio.sublime-project b/BambuStudio.sublime-project deleted file mode 100644 index 785dddba416..00000000000 --- a/BambuStudio.sublime-project +++ /dev/null @@ -1,103 +0,0 @@ -{ - "build_systems": - [ - { - "name": "List", - //"file_regex": " at ([^-\\s]*) line ([0-9]*)", -// "file_regex": " at (D\\:\\/src\\/Slic3r\\/.*?) line ([0-9]*)", - "shell_cmd": "ls -l" - }, - { - "name": "Run", - "working_dir": "$project_path", - "file_regex": " at (.*?) line ([0-9]*)", -// "shell_cmd": "chdir & perl slic3r.pl --DataDir \"C:\\Users\\Public\\Documents\\Prusa3D\\Slic3r settings MK2\" --gui \"..\\Slic3r-tests\\gap fill torture 20 -rt.stl\"" - "shell_cmd": "chdir & perl slic3r.pl" - }, - { - "name": "full", - "file_regex": "^(..[^:]*):([0-9]+):?([0-9]+)?:? (.*)$", - "shell_cmd": "chdir & perl Build.pl" - }, - { - "name": "xs", - "working_dir": "$project_path/build", - // for Visual Studio: - "file_regex": "^(..[^:]*)\\(([0-9]+)\\)(.*)$", - // For GCC: -// "file_regex": "^(..[^:]*):([0-9]+):?([0-9]+)?:? (.*)$", - "shell_cmd": "chdir & ninja -j 6 -v", - "env": { -// "PATH": "C:\\Program Files (x86)\\MSBuild\\12.0\\bin\\amd64;C:\\Program Files (x86)\\Microsoft Visual Studio 12.0\\VC\\BIN\\amd64;C:\\Program Files (x86)\\Microsoft Visual Studio 12.0\\Common7\\IDE;C:\\Program Files (x86)\\Microsoft Visual Studio 12.0\\Common7\\Tools;%PATH%;c:\\wperl64d\\site\\bin;c:\\wperl64d\\bin", -// "PERL_CPANM_HOME": "c:\\wperl64d\\cpanm", -// "WXDIR": "D:\\src-perl\\wxWidgets-3.0.3-beta1", -// "BOOST_DIR": "D:\\src-perl\\boost_1_61_0", -// "BOOST_INCLUDEDIR": "D:\\src-perl\\boost_1_61_0", -// "BOOST_LIBRARYDIR": "D:\\src-perl\\boost_1_61_0\\stage\\x64\\lib", -// "SLIC3R_STATIC": "1" - } - }, - { - "name": "xs & run", - "working_dir": "$project_path/build", - "file_regex": "^(..[^:]*):([0-9]+):?([0-9]+)?:? (.*)$", - "shell_cmd": "chdir & ninja -j 6 & cd .. & perl slic3r.pl --gui \"..\\Slic3r-tests\\star3-big2.stl\"" - }, - { - "name": "Slic3r - clean", - "working_dir": "$project_path/build", - "file_regex": "^(..[^:]*)(?::|\\()([0-9]+)(?::|\\))(?:([0-9]+):)?\\s*(.*)", - "shell_cmd": ["chdir & ninja clean"] - }, - { - "name": "run tests", - "working_dir": "$project_path/build", - // for Visual Studio: - "file_regex": "^(..[^:]*)\\(([0-9]+)\\)(.*)$", - "shell_cmd": "chdir & ctest --verbose" - }, - { - "name": "Clean & Configure", - "working_dir": "$project_path", - // for Visual Studio: - "file_regex": "^(..[^:]*)(?::|\\()([0-9]+)(?::|\\))(?:([0-9]+):)?\\s*(.*)", - "shell_cmd": "chdir & rmdir /S /Q build & mkdir build & cd build & cmake -G Ninja .. -DCMAKE_COLOR_MAKEFILE=OFF -DCMAKE_RULE_PROGRESS=OFF -DCMAKE_RULE_MESSAGES=OFF -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo" - }, - { - "name": "Configure", - "working_dir": "$project_path/build", - // for Visual Studio: - "file_regex": "^(..[^:]*)(?::|\\()([0-9]+)(?::|\\))(?:([0-9]+):)?\\s*(.*)", - "shell_cmd": "cmake -G Ninja .. -DCMAKE_COLOR_MAKEFILE=OFF -DCMAKE_RULE_PROGRESS=OFF -DCMAKE_RULE_MESSAGES=OFF -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo" - } - ], - "folders": - [ - { - "path": ".", -// "folder_exclude_patterns": [".svn", "._d", ".metadata", ".settings"], - "file_exclude_patterns": ["XS.c", "*.pch", "*.ilk", "*.js" ] - } - ], - - "settings": - { - "sublimegdb_workingdir": "${folder:${project_path:run}}", - // NOTE: You MUST provide --interpreter=mi for the plugin to work -// "sublimegdb_commandline": "D:\\Qt\\Tools\\mingw492_32\\bin\\gdb.exe --interpreter=mi -ex 'target localhost:2345'", -// "sublimegdb_commandline": "D:\\Qt\\Tools\\mingw492_32\\bin\\gdb.exe --interpreter=mi perl --args perl slic3r.pl", -// "sublimegdb_commandline": "D:\\Qt\\Tools\\mingw492_32\\bin\\gdb.exe --interpreter=mi perl --args slic3r.pl ", -// "sublimegdb_commandline": "D:\\Qt\\Tools\\mingw492_32\\bin\\gdb.exe --interpreter=mi -e C:\\Strawberry\\perl\\bin\\perl.exe -s C:\\Strawberry\\perl\\site\\lib\\auto\\Slic3r\\XS\\XS.xs.dll --args perl slic3r.pl -j 1 --gui D:\\src\\Slic3r-tests\\star3-big.stl", - "sublimegdb_commandline": "D:\\Qt\\Tools\\mingw492_32\\bin\\gdb.exe --interpreter=mi perl.exe --args perl slic3r.pl -j 1 --gui", // D:\\src\\Slic3r-tests\\star3-big.stl", -// "sublimegdb_commandline": "D:\\Qt\\Tools\\mingw492_32\\bin\\gdb.exe --interpreter=mi -x slic3r.gdb", -// "arguments": "slic3r -j 1 --gui ../Slic3r-tests/star3-big.stl", -// "arguments": "../slic3r.pl -j 1 --gui", -// "sublimegdb_exec_cmd": "-exec-continue", - - // Add "pending breakpoints" for symbols that are dynamically loaded from - // external shared libraries - "debug_ext" : true, - "run_after_init": false, - "close_views": false - } -} diff --git a/BuildLinux.sh b/BuildLinux.sh index cf04c53c590..5676b4fc1d1 100755 --- a/BuildLinux.sh +++ b/BuildLinux.sh @@ -87,7 +87,7 @@ then mkdir build fi -# Addtional Dev packages for BambuStudio +# Addtional Dev packages for OrcaSlicer export REQUIRED_DEV_PACKAGES="libmspack-dev libgstreamerd-3-dev libsecret-1-dev libwebkit2gtk-4.0-dev libosmesa6-dev libssl-dev libcurl4-openssl-dev eglexternalplatform-dev libudev-dev libdbus-1-dev extra-cmake-modules" # libwebkit2gtk-4.1-dev ?? export DEV_PACKAGES_COUNT=$(echo ${REQUIRED_DEV_PACKAGES} | wc -w) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5fb93c5bf31..12f7e321b60 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -510,7 +510,7 @@ endif () # l10n set(L10N_DIR "${SLIC3R_RESOURCES_DIR}/i18n") -set(BBL_L18N_DIR "${CMAKE_CURRENT_SOURCE_DIR}/bbl/i18n") +set(BBL_L18N_DIR "${CMAKE_CURRENT_SOURCE_DIR}/localization/i18n") add_custom_target(gettext_make_pot COMMAND xgettext --keyword=L --keyword=_L --keyword=_u8L --keyword=L_CONTEXT:1,2c --keyword=_L_PLURAL:1,2 --add-comments=TRN --from-code=UTF-8 --no-location --debug --boost -f "${BBL_L18N_DIR}/list.txt" @@ -708,8 +708,8 @@ elseif (SLIC3R_FHS) ) install(FILES src/platform/unix/OrcaSlicer.desktop DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications) foreach(SIZE 32 128 192) - install(FILES ${SLIC3R_RESOURCES_DIR}/images/BambuStudio_${SIZE}px.png - DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/${SIZE}x${SIZE}/apps RENAME BambuStudio.png + install(FILES ${SLIC3R_RESOURCES_DIR}/images/OrcaSlicer_${SIZE}px.png + DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/${SIZE}x${SIZE}/apps RENAME OrcaSlicer.png ) endforeach() elseif (CMAKE_MACOSX_BUNDLE) diff --git a/Containerfile b/Containerfile deleted file mode 100644 index 42937d8a740..00000000000 --- a/Containerfile +++ /dev/null @@ -1,71 +0,0 @@ -# Build Bambu Slicer in a container -# -# Build an AppImage using rootless Podman (refer to https://github.com/containers/podman/blob/main/docs/tutorials/rootless_tutorial.md): -# rm -rf build; podman build . -t orca-slicer-builder && podman run --rm localhost/orca-slicer-builder /bin/bash -c 'tar -c $(find build | grep ubu64.AppImage | head -1)' | tar -xv -# -# Troubleshooting the build container: -# podman run -it --name orca-slicer-builder localhost/orca-slicer-builder /bin/bash -# -# Debugging the resulting AppImage: -# 1) Install `gdb` -# 2) In a terminal in the same directory as the AppImage, start it with following: -# echo -e "run\nbt\nquit" | gdb ./BambuStudio_ubu64.AppImage -# 3) Find related issue using backtrace output for clues and add backtrace to it on github -# -# Docker alternative AppImage build syntax (use this if you can't install podman): -# rm -rf build; docker build . --file Containerfile -t orca-slicer-builder; docker run --rm orca-slicer-builder /bin/bash -c 'tar -c $(find build | grep ubu64.AppImage | head -1)' | tar -xv -# -# -# TODO: bind mount OrcaSlicer to inside the container instead of COPY to enable faster rebuilds during dev work. - -FROM docker.io/ubuntu:20.04 -LABEL maintainer "DeftDawg " - -# Disable interactive package configuration -RUN apt-get update && \ - echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections - -# Add a deb-src -RUN echo deb-src http://archive.ubuntu.com/ubuntu \ - $(cat /etc/*release | grep VERSION_CODENAME | cut -d= -f2) main universe>> /etc/apt/sources.list - -RUN apt-get update && apt-get install -y \ - git \ - build-essential \ - autoconf pkgconf m4 \ - cmake extra-cmake-modules \ - libglu1-mesa-dev libglu1-mesa-dev \ - libwayland-dev libxkbcommon-dev wayland-protocols \ - eglexternalplatform-dev libglew-dev \ - libgtk-3-dev \ - libdbus-1-dev \ - libcairo2-dev \ - libgtk-3-dev libwebkit2gtk-4.0-dev \ - libsoup2.4-dev \ - libgstreamer1.0-dev libgstreamer-plugins-good1.0-dev libgstreamer-plugins-base1.0-dev libgstreamerd-3-dev \ - libmspack-dev \ - libosmesa6-dev \ - libssl-dev libcurl4-openssl-dev libsecret-1-dev \ - libudev-dev \ - curl \ - wget \ - file \ - sudo - -COPY ./ OrcaSlicer - -WORKDIR OrcaSlicer - -# These can run together, but we run them seperate for podman caching -# Update System dependencies -RUN ./BuildLinux.sh -u - -# Build dependencies in ./deps -RUN ./BuildLinux.sh -d - -# Build slic3r -RUN ./BuildLinux.sh -s - -# Build AppImage -ENV container podman -RUN ./BuildLinux.sh -i diff --git a/DockerBuild.sh b/DockerBuild.sh deleted file mode 100755 index 3546bf2b83d..00000000000 --- a/DockerBuild.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash -PROJECT_ROOT=$(cd -P -- "$(dirname -- "$0")" && printf '%s\n' "$(pwd -P)") - -set -x - -# Wishlist hint: For developers, creating a Docker Compose -# setup with persistent volumes for the build & deps directories -# would speed up recompile times significantly. For end users, -# the simplicity of a single Docker image and a one-time compilation -# seems better. -docker build -t bambustudio \ - --build-arg USER=$USER \ - --build-arg UID=$(id -u) \ - --build-arg GID=$(id -g) \ - $PROJECT_ROOT diff --git a/DockerRun.sh b/DockerRun.sh deleted file mode 100755 index 0e2d98330b9..00000000000 --- a/DockerRun.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash -set -x -# Just in case, here's some other things that might help: -# Force the container's hostname to be the same as your workstation -# -h $HOSTNAME \ -# If there's problems with the X display, try this -# -v /tmp/.X11-unix:/tmp/.X11-unix \ -docker run \ - `# Use the hosts networking. Printer wifi and also dbus communication` \ - --net=host \ - `# Some X installs will not have permissions to talk to sockets for shared memory` \ - --ipc host \ - `# Run as your workstations username to keep permissions the same` \ - -u $USER \ - `# Bind mount your home directory into the container for loading/saving files` \ - -v $HOME:/home/$USER \ - `# Pass the X display number to the container` \ - -e DISPLAY=$DISPLAY \ - `# It seems that libGL and dbus things need privileged mode` \ - --privileged=true \ - `# Attach tty for running bambu with command line things` \ - -ti \ - `# Pass all parameters from this script to the bambu ENTRYPOINT binary` \ - bambustudio $* - diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index 90e0cbf1792..00000000000 --- a/Dockerfile +++ /dev/null @@ -1,94 +0,0 @@ -FROM docker.io/ubuntu:20.04 -LABEL maintainer "DeftDawg " - -# Disable interactive package configuration -RUN apt-get update && \ - echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections - -# Add a deb-src -RUN echo deb-src http://archive.ubuntu.com/ubuntu \ - $(cat /etc/*release | grep VERSION_CODENAME | cut -d= -f2) main universe>> /etc/apt/sources.list - -RUN apt-get update && apt-get install -y \ - autoconf \ - build-essential \ - cmake \ - curl \ - eglexternalplatform-dev \ - extra-cmake-modules \ - file \ - git \ - gstreamer1.0-plugins-bad \ - gstreamer1.0-libav \ - libcairo2-dev \ - libcurl4-openssl-dev \ - libdbus-1-dev \ - libglew-dev \ - libglu1-mesa-dev \ - libglu1-mesa-dev \ - libgstreamer1.0-dev \ - libgstreamerd-3-dev \ - libgstreamer-plugins-base1.0-dev \ - libgstreamer-plugins-good1.0-dev \ - libgtk-3-dev \ - libgtk-3-dev \ - libmspack-dev \ - libosmesa6-dev \ - libsecret-1-dev \ - libsoup2.4-dev \ - libssl-dev \ - libudev-dev \ - libwayland-dev \ - libwebkit2gtk-4.0-dev \ - libxkbcommon-dev \ - locales \ - locales-all \ - m4 \ - pkgconf \ - sudo \ - wayland-protocols \ - wget - -# Change your locale here if you want. See the output -# of `locale -a` to pick the correct string formatting. -ENV LC_ALL=en_US.utf8 -RUN locale-gen $LC_ALL - -# Set this so that Orca Slicer doesn't complain about -# the CA cert path on every startup -ENV SSL_CERT_FILE=/etc/ssl/certs/ca-certificates.crt - -COPY ./ BambuStudio - -WORKDIR BambuStudio - -# These can run together, but we run them seperate for podman caching -# Update System dependencies -RUN ./BuildLinux.sh -u - -# Build dependencies in ./deps -RUN ./BuildLinux.sh -d - -# Build slic3r -RUN ./BuildLinux.sh -s - -# Build AppImage -ENV container podman -RUN ./BuildLinux.sh -i - -# It's easier to run Orca Slicer as the same username, -# UID and GID as your workstation. Since we bind mount -# your home directory into the container, it's handy -# to keep permissions the same. Just in case, defaults -# are root. -SHELL ["/bin/bash", "-l", "-c"] -ARG USER=root -ARG UID=0 -ARG GID=0 -RUN [[ "$UID" != "0" ]] \ - && groupadd -g $GID $USER \ - && useradd -u $UID -g $GID $USER - -# Using an entrypoint instead of CMD because the binary -# accepts several command line arguments. -ENTRYPOINT ["/BambuStudio/build/package/bin/orca-slicer"] diff --git a/bbs_test_tools/CMakeLists.txt b/bbs_test_tools/CMakeLists.txt deleted file mode 100644 index 046394f69ea..00000000000 --- a/bbs_test_tools/CMakeLists.txt +++ /dev/null @@ -1,4 +0,0 @@ -# Add individual tools as executables in separate directories -add_subdirectory(bbs_gcode_checker) - -install(TARGETS bbs_gcode_checker RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}") diff --git a/bbs_test_tools/bbs_gcode_checker/CMakeLists.txt b/bbs_test_tools/bbs_gcode_checker/CMakeLists.txt deleted file mode 100644 index 7460ad3ecf6..00000000000 --- a/bbs_test_tools/bbs_gcode_checker/CMakeLists.txt +++ /dev/null @@ -1,6 +0,0 @@ -cmake_minimum_required (VERSION 3.8) - -project ("bbs_gcode_checker") - -add_executable (bbs_gcode_checker "main.cpp" "GCodeChecker.cpp" "GCodeChecker.h" ) - diff --git a/bbs_test_tools/bbs_gcode_checker/GCodeChecker.cpp b/bbs_test_tools/bbs_gcode_checker/GCodeChecker.cpp deleted file mode 100644 index aad8a1a5767..00000000000 --- a/bbs_test_tools/bbs_gcode_checker/GCodeChecker.cpp +++ /dev/null @@ -1,702 +0,0 @@ -#include "GCodeChecker.h" -#include -#include -#include -#include -namespace BambuStudio { - -//BBS: only check wodth when dE is longer than this value -const double CHECK_WIDTH_E_THRESHOLD = 0.0025; -const double WIDTH_THRESHOLD = 0.02; -const double RADIUS_THRESHOLD = 0.005; - -const double filament_diameter = 1.75; -const double Pi = 3.14159265358979323846; - -const std::string Extrusion_Role_Tag = " FEATURE: "; -const std::string Width_Tag = " LINE_WIDTH: "; -const std::string Wipe_Start_Tag = " WIPE_START"; -const std::string Wipe_End_Tag = " WIPE_END"; -const std::string Layer_Change_Tag = " CHANGE_LAYER"; -const std::string Height_Tag = " LAYER_HEIGHT: "; -const std::string filament_flow_ratio_tag = " filament_flow_ratio"; -const std::string nozzle_temperature_Tag = " nozzle_temperature ="; -const std::string nozzle_temperature_initial_layer_Tag = " nozzle_temperature_initial_layer"; -const std::string Z_HEIGHT_TAG = " Z_HEIGHT: "; -const std::string Initial_Layer_Ptint_Height_Tag = " initial_layer_print_height ="; - -GCodeCheckResult GCodeChecker::parse_file(const std::string& path) -{ - std::ifstream file(path); - if (file.fail()) { - std::cout << "Failed to open file " << path << std::endl; - return GCodeCheckResult::ParseFailed; - } - std::string line_raw; - std::string line; - while (std::getline(file, line_raw)) { - const char *c = line_raw.c_str(); - c = skip_whitespaces(c); - if (std::toupper(*c) == 'N') - c = skip_word(c); - c = skip_whitespaces(c); - line = c; - if (parse_line(line) != GCodeCheckResult::Success) { - std::cout << "Failed to parse line " << line_raw << std::endl; - return GCodeCheckResult::ParseFailed; - } - } - - if (m_layer_num == 0) { - std::cout << "Invalid gcode file without layer change comment" << std::endl; - return GCodeCheckResult::ParseFailed; - } - - return GCodeCheckResult::Success; -} - -bool GCodeChecker::include_chinese(const char* str) -{ - char c; - while(1) - { - c=*str++; - if (is_end_of_line(c)) - break; - if ((c & 0x80) && (*str & 0x80)) - return true; - } - return false; -} - -GCodeCheckResult GCodeChecker::parse_line(const std::string& line) -{ - // update start position - m_start_position = m_end_position; - - GCodeCheckResult ret; - const char *c = skip_whitespaces(line.c_str()); - if (include_chinese(c)) { - //chinese is forbidden - return GCodeCheckResult::ParseFailed; - } if (is_end_of_line(*c)) { - //BBS: skip empty line - return GCodeCheckResult::Success; - } else if (is_comment_line(*c)) { - GCodeLine gcode_line; - gcode_line.m_raw = c; - ret = parse_comment(gcode_line); - if (ret != GCodeCheckResult::Success) - return ret; - } else { - GCodeLine gcode_line; - gcode_line.m_raw = c; - ret = parse_command(gcode_line); - if (ret != GCodeCheckResult::Success) - return ret; - ret = check_line_width(gcode_line); - if (ret != GCodeCheckResult::Success) - return ret; - } - - return GCodeCheckResult::Success; -} - -GCodeCheckResult GCodeChecker::parse_comment(GCodeLine& line) -{ - const char *c = line.m_raw.c_str(); - c++; - std::string comment = c; - // extrusion role tag - if (starts_with(comment, Extrusion_Role_Tag)) { - m_role = string_to_role(comment.substr(Extrusion_Role_Tag.length())); - if (m_role == erExternalPerimeter) { - - if (z_height == initial_layer_height && nozzle_temp != nozzle_temperature_initial_layer[filament_id]) { - std::cout << "invalid filament nozzle initial layer temperature comment with invalid value!" << std::endl; - return GCodeCheckResult::ParseFailed; - } - - if (z_height != initial_layer_height && nozzle_temp != nozzle_temperature[filament_id]) { - std::cout << "invalid filament nozzle temperature comment with invalid value!" << std::endl; - return GCodeCheckResult::ParseFailed; - } - } - - } else if (starts_with(comment, Wipe_Start_Tag)) { - m_wiping = true; - } else if (starts_with(comment, Wipe_End_Tag)) { - m_wiping = false; - } else if (starts_with(comment, Height_Tag)) { - std::string str = comment.substr(Height_Tag.size()); - if (!parse_double_from_str(str, m_height)) { - std::cout << "invalid height comment with invalid value!" << std::endl; - return GCodeCheckResult::ParseFailed; - } - } else if (starts_with(comment, Width_Tag)) { - std::string str = comment.substr(Width_Tag.size()); - if (!parse_double_from_str(str, m_width)) { - std::cout << "invalid width comment with invalid value!" << std::endl; - return GCodeCheckResult::ParseFailed; - } - } else if (starts_with(comment, Layer_Change_Tag)) { - m_layer_num++; - } else if (starts_with(comment, filament_flow_ratio_tag)) - { - std::string str = comment.substr(filament_flow_ratio_tag.size()+3); - if (!parse_double_from_str(str, filament_flow_ratio)) - { - std::cout << "invalid filament flow ratio comment with invalid value!" << std::endl; - return GCodeCheckResult::ParseFailed; - } - } - else if (starts_with(comment, nozzle_temperature_Tag)) { - std::string str = comment.substr(nozzle_temperature_Tag.size() + 1); - if (!parse_double_from_str(str, nozzle_temperature)) { - std::cout << "invalid nozzle temperature comment with invalid value!" << std::endl; - return GCodeCheckResult::ParseFailed; - } - } - else if (starts_with(comment, nozzle_temperature_initial_layer_Tag)) { - std::string str = comment.substr(nozzle_temperature_initial_layer_Tag.size() + 3); - if (!parse_double_from_str(str, nozzle_temperature_initial_layer)) { - std::cout << "invalid nozzle temperature initial layer comment with invalid value!" << std::endl; - return GCodeCheckResult::ParseFailed; - } - } else if (starts_with(comment, Z_HEIGHT_TAG)) { - std::string str = comment.substr(Z_HEIGHT_TAG.size()); - if (!parse_double_from_str(str, z_height)) { - std::cout << "invalid z height comment with invalid value!" << std::endl; - return GCodeCheckResult::ParseFailed; - } - } else if (starts_with(comment, Initial_Layer_Ptint_Height_Tag)) { - std::string str = comment.substr(Initial_Layer_Ptint_Height_Tag.size()); - if (!parse_double_from_str(str, initial_layer_height)) { - std::cout << "invalid initial layer height comment with invalid value!" << std::endl; - return GCodeCheckResult::ParseFailed; - } - } - - return GCodeCheckResult::Success; -} - -GCodeCheckResult GCodeChecker::parse_command(GCodeLine& gcode_line) -{ - const std::string cmd = gcode_line.cmd(); - GCodeCheckResult ret = GCodeCheckResult::Success; - switch (::toupper(cmd[0])) { - case 'G': - { - switch (::atoi(&cmd[1])) - { - case 0: - case 1: { ret = parse_G0_G1(gcode_line); break; } // Move - case 2: - case 3: { ret = parse_G2_G3(gcode_line); break; } // Move - case 90: { ret = parse_G90(gcode_line); break; } // Set to Absolute Positioning - case 91: { ret = parse_G91(gcode_line); break; } // Set to Relative Positioning - case 92: { ret = parse_G92(gcode_line); break; } // Set Position - default: { break; } - } - break; - } - case 'M':{ - switch (::atoi(&cmd[1])) - { - case 82: { ret = parse_M82(gcode_line); break; } // Set to Absolute extrusion - case 83: { ret = parse_M83(gcode_line); break; } // Set to Relative extrusion - case 104: { - ret = parse_M104_M109(gcode_line); - break; - } // Set to nozzle temperature - case 109: { - ret = parse_M104_M109(gcode_line); - break; - } // Set to nozzle temperature - default: { break; } - } - break; - } - case 'T':{ - - int pt = ::atoi(&cmd[1]); - if (pt == 1000 || pt == 1100 || pt == 255) { - break; - } - - if (pt < 0 || pt > 254 || pt >= filament_flow_ratio.size()) { - std::cout << "Invalid T command"<& source, - const std::array& target, - double e, double height, bool is_bridge) const -{ - double volume = (e / flow_ratio) * Pi * (filament_diameter / 2.0f) * (filament_diameter / 2.0f); - std::array delta = { target[0] - source[0], - target[1] - source[1], - target[2] - source[2] }; - double length = sqrt(delta[0] * delta[0] + delta[1] * delta[1] + delta[2] * delta[2]); - double mm3_per_mm = volume / length; - return is_bridge? 2 * sqrt(mm3_per_mm/Pi) : - (mm3_per_mm / height) + height * (1 - 0.25 * Pi); -} - -double GCodeChecker::calculate_G2_G3_width(const std::array& source, - const std::array& target, - const std::array& center, - bool is_ccw, double e, double height, - bool is_bridge) const -{ - std::array v1 = { source[0] - center[0], source[1] - center[1] }; - std::array v2 = { target[0] - center[0], target[1] - center[1] }; - - double dot = v1[0] * v2[0] + v1[1] * v2[1]; - double cross = v1[0] * v2[1] - v1[1] * v2[0]; - double radian = atan2(cross, dot); - radian = is_ccw ? - (radian < 0 ? 2 * Pi + radian : radian) : - (radian < 0 ? -radian : 2 * Pi - radian); - double radius = sqrt(v1[0] * v1[0] + v1[1] * v1[1]); - double length = radius * radian; - double volume = (e / flow_ratio) * Pi * (filament_diameter / 2) * (filament_diameter / 2); - double mm3_per_mm = volume / length; - - return is_bridge? 2 * sqrt(mm3_per_mm/Pi) : - (mm3_per_mm / height) + height * (1 - 0.25 * Pi); -} - -GCodeCheckResult GCodeChecker::check_line_width(const GCodeLine& gcode_line) -{ - //BBS: don't need to check extrusion before first layer - if (m_layer_num <= 0) { - return GCodeCheckResult::Success; - } - - GCodeCheckResult ret = GCodeCheckResult::Success; - //BBS: only need to handle G0 G1 G2 G3 - const std::string cmd = gcode_line.cmd(); - int cmd_id = ::atoi(&cmd[1]); - if (::toupper(cmd[0]) == 'G') - switch (::atoi(&cmd[1])) - { - case 0: - case 1: { ret = check_G0_G1_width(gcode_line); break; } - case 2: - case 3: { ret = check_G2_G3_width(gcode_line); break; } - default: { break; } - } - - return ret; -} - -GCodeCheckResult GCodeChecker::check_G0_G1_width(const GCodeLine& line) -{ - auto absolute_position = [this](Axis axis, const GCodeLine& lineG1) { - bool is_relative = (m_global_positioning_type == EPositioningType::Relative); - if (axis == E) - is_relative |= (m_e_local_positioning_type == EPositioningType::Relative); - - if (lineG1.has(Axis(axis))) { - double ret = lineG1.get(Axis(axis)); - return is_relative ? m_start_position[axis] + ret : m_origin[axis] + ret; - } else - return m_start_position[axis]; - }; - - auto move_type = [this](const std::array& delta_pos) { - EMoveType type = EMoveType::Noop; - - if (m_wiping) - type = EMoveType::Wipe; - else if (delta_pos[E] < 0.0f) - type = (delta_pos[X] != 0.0f || delta_pos[Y] != 0.0f || delta_pos[Z] != 0.0f) ? EMoveType::Travel : EMoveType::Retract; - else if (delta_pos[E] > 0.0f) { - if (delta_pos[X] == 0.0f && delta_pos[Y] == 0.0f) - type = (delta_pos[Z] == 0.0f) ? EMoveType::Unretract : EMoveType::Travel; - else if (delta_pos[X] != 0.0f || delta_pos[Y] != 0.0f) - type = EMoveType::Extrude; - } - else if (delta_pos[X] != 0.0f || delta_pos[Y] != 0.0f || delta_pos[Z] != 0.0f) - type = EMoveType::Travel; - - return type; - }; - - for (unsigned char a = X; a <= E; ++a) { - m_end_position[a] = absolute_position((Axis)a, line); - } - - // calculates movement deltas - std::array delta_pos; - for (unsigned char a = X; a <= E; ++a) - delta_pos[a] = m_end_position[a] - m_start_position[a]; - - // Todo: currently, for precision, there alwasy has possible to generate - // such gcode because of decimal truncation - /*if (line.has(Axis(E)) && delta_pos[E] == 0.0 && !m_wiping) { - std::cout << "Invalid GCode because has E axis but 0 extrusion" << std::endl; - return GCodeCheckResult::CheckFailed; - }*/ - - EMoveType type = move_type(delta_pos); - if (type == EMoveType::Extrude && m_end_position[Z] == 0.0f) - type = EMoveType::Travel; - - //BBS: calculate line width and compare. - //Don't need to check gap fill which has verious width - if (type == EMoveType::Extrude && - m_role != erGapFill && - delta_pos[E] > CHECK_WIDTH_E_THRESHOLD) { - std::array source = { m_start_position[X], m_start_position[Y], m_start_position[Z] }; - std::array target = { m_end_position[X], m_end_position[Y], m_end_position[Z] }; - - bool is_bridge = m_role == erOverhangPerimeter || m_role == erBridgeInfill; - if (!is_bridge) { - double width_real = calculate_G1_width(source, target, delta_pos[E], m_height, is_bridge); - if (fabs(width_real - m_width) > WIDTH_THRESHOLD) { - std::cout << "Invalid G0_G1 because has abnormal line width." << std::endl; - std::cout << "Width: " << m_width << " Width_real: " << width_real << std::endl; - return GCodeCheckResult::CheckFailed; - } - } - - } - - return GCodeCheckResult::Success; -} - -GCodeCheckResult GCodeChecker::check_G2_G3_width(const GCodeLine& line) -{ - auto absolute_position = [this](Axis axis, const GCodeLine& lineG2_3) { - bool is_relative = (m_global_positioning_type == EPositioningType::Relative); - if (axis == E) - is_relative |= (m_e_local_positioning_type == EPositioningType::Relative); - - if (lineG2_3.has(Axis(axis))) { - double ret = lineG2_3.get(Axis(axis)); - if (axis == I) - return m_start_position[X] + ret; - else if (axis == J) - return m_start_position[Y] + ret; - else - return is_relative ? m_start_position[axis] + ret : m_origin[axis] + ret; - } else { - if (axis == I) - return m_start_position[X]; - else if (axis == J) - return m_start_position[Y]; - else - return m_start_position[axis]; - } - }; - - auto move_type = [this](const double& delta_E) { - EMoveType type = EMoveType::Noop; - - if (m_wiping) - type = EMoveType::Wipe; - else if (delta_E < 0.0f || delta_E == 0.0f) - type = EMoveType::Travel; - else - type = EMoveType::Extrude; - - return type; - }; - - for (unsigned char a = X; a <= E; ++a) { - m_end_position[a] = absolute_position((Axis)a, line); - } - std::array source = { m_start_position[X], m_start_position[Y] }; - std::array target = { m_end_position[X], m_end_position[Y] }; - std::array center = { absolute_position(I, line),absolute_position(J, line) }; - const std::string& cmd = line.cmd(); - bool is_ccw = (::atoi(&cmd[1]) == 2) ? false : true; - double delta_e = m_end_position[E] - m_start_position[E]; - EMoveType type = move_type(delta_e); - - //BBS: judge whether is normal arc by radius - double radius1 = sqrt(pow((source[0] - center[0]), 2) + pow((source[1] - center[1]), 2)); - double radius2 = sqrt(pow((target[0] - center[0]), 2) + pow((target[1] - center[1]), 2)); - if (fabs(radius2 - radius1) > RADIUS_THRESHOLD) { - std::cout << "Invalid G2_G3 because of abnormal radius." << std::endl; - std::cout << "radius1: " << radius1 << " radius2: " << radius2 << std::endl; - return GCodeCheckResult::CheckFailed; - } - - //BBS: calculate line width and compare - //Don't need to check gap fill which has verious width - if (type == EMoveType::Extrude && - m_role != erGapFill && - delta_e > CHECK_WIDTH_E_THRESHOLD) { - bool is_bridge = m_role == erOverhangPerimeter || m_role == erBridgeInfill; - - if (!is_bridge) { - double width_real = calculate_G2_G3_width(source, target, center, is_ccw, delta_e, m_height, is_bridge); - if (fabs(width_real - m_width) > WIDTH_THRESHOLD) { - std::cout << "Invalid G2_G3 because has abnormal line width." << std::endl; - std::cout << "Width: " << m_width << " Width_real: " << width_real << std::endl; - return GCodeCheckResult::CheckFailed; - } - } - - } - - return GCodeCheckResult::Success; -} - -const std::map string_to_role_map = { - { "Inner wall", erPerimeter }, - { "Outer wall", erExternalPerimeter }, - { "Overhang wall", erOverhangPerimeter }, - { "Sparse infill", erInternalInfill }, - { "Internal solid infill", erSolidInfill }, - { "Top surface", erTopSolidInfill }, - { "Bottom surface", erBottomSurface }, - { "Ironing", erIroning }, - { "Bridge", erBridgeInfill }, - { "Gap infill", erGapFill }, - { "Skirt", erSkirt }, - { "Brim", erBrim }, - { "Support", erSupportMaterial }, - { "Support interface", erSupportMaterialInterface }, - { "Support transition", erSupportTransition }, - { "Prime tower", erWipeTower }, - { "Custom", erCustom }, - { "Mixed", erMixed } -}; - -ExtrusionRole GCodeChecker::string_to_role(const std::string &role) -{ - for (auto it = string_to_role_map.begin(); it != string_to_role_map.end(); it++) { - if (role == it->first) - return it->second; - } - return erNone; -} - -} - - diff --git a/bbs_test_tools/bbs_gcode_checker/GCodeChecker.h b/bbs_test_tools/bbs_gcode_checker/GCodeChecker.h deleted file mode 100644 index f908ebfb894..00000000000 --- a/bbs_test_tools/bbs_gcode_checker/GCodeChecker.h +++ /dev/null @@ -1,222 +0,0 @@ -#ifndef _GCodeChecker_H_ -#define _GCodeChecker_H_ - -#include -#include -#include -#include - -namespace BambuStudio { - -enum class GCodeCheckResult : unsigned char -{ - Success, - ParseFailed, - CheckFailed, - Count -}; - -enum class EMoveType : unsigned char -{ - Noop, - Retract, - Unretract, - Tool_change, - Color_change, - Pause_Print, - Custom_GCode, - Travel, - Wipe, - Extrude, - Count -}; - -enum Axis { - X=0, - Y, - Z, - E, - F, - I, - J, - P, - NUM_AXES, - UNKNOWN_AXIS = NUM_AXES, -}; - -enum ExtrusionRole : uint8_t { - erNone, - erPerimeter, - erExternalPerimeter, - erOverhangPerimeter, - erInternalInfill, - erSolidInfill, - erTopSolidInfill, - erBottomSurface, - erIroning, - erBridgeInfill, - erGapFill, - erSkirt, - erBrim, - erSupportMaterial, - erSupportMaterialInterface, - erSupportTransition, - erWipeTower, - erCustom, - // Extrusion role for a collection with multiple extrusion roles. - erMixed, - erCount -}; - -class GCodeChecker { -public: - class GCodeLine { - public: - GCodeLine() {} - const std::string cmd() const { - const char *cmd = GCodeChecker::skip_whitespaces(m_raw.c_str()); - return std::string(cmd, GCodeChecker::skip_word(cmd) - cmd); - } - - bool has(Axis axis) const { return (m_mask & (1 << int(axis))) != 0; } - double get(Axis axis) const { return m_axis[int(axis)]; } - - std::string m_raw; - double m_axis[NUM_AXES] = { 0.0f }; - uint32_t m_mask = 0; - }; - - enum class EPositioningType : unsigned char - { - Absolute, - Relative - }; - - GCodeChecker() {} - GCodeCheckResult parse_file(const std::string& path); - -private: - bool include_chinese(const char* str); - GCodeCheckResult parse_line(const std::string& line); - - GCodeCheckResult parse_command(GCodeLine& gcode_line); - GCodeCheckResult parse_axis(GCodeLine& gcode_line); - GCodeCheckResult parse_G0_G1(GCodeLine& gcode_line); - GCodeCheckResult parse_G2_G3(GCodeLine& gcode_line); - GCodeCheckResult parse_G90(const GCodeLine& gcode_line); - GCodeCheckResult parse_G91(const GCodeLine& gcode_line); - GCodeCheckResult parse_G92(GCodeLine& gcode_line); - GCodeCheckResult parse_M82(const GCodeLine& gcode_line); - GCodeCheckResult parse_M83(const GCodeLine& gcode_line); - GCodeCheckResult parse_M104_M109(const GCodeLine &gcode_line); - - GCodeCheckResult parse_comment(GCodeLine& gcode_line); - - GCodeCheckResult check_line_width(const GCodeLine& gcode_line); - GCodeCheckResult check_G0_G1_width(const GCodeLine& gcode_line); - GCodeCheckResult check_G2_G3_width(const GCodeLine& gcode_line); - - double calculate_G1_width(const std::array& source, - const std::array& target, - double e, double height, bool is_bridge) const; - double calculate_G2_G3_width(const std::array& source, - const std::array& target, - const std::array& center, - bool is_ccw, double e, double height, bool is_bridge) const; - -public: - static bool is_whitespace(char c) { return c == ' ' || c == '\t'; } - static bool is_end_of_line(char c) { return c == '\r' || c == '\n' || c == 0; } - static bool is_comment_line(char c) { return c == ';'; } - static bool is_end_of_gcode_line(char c) { return is_comment_line(c) || is_end_of_line(c); } - static bool is_end_of_word(char c) { return is_whitespace(c) || is_end_of_gcode_line(c); } - static const char* skip_word(const char *c) { - for (; ! is_end_of_word(*c); ++ c) - ; // silence -Wempty-body - return c; - } - static const char* skip_whitespaces(const char *c) { - for (; is_whitespace(*c); ++ c) - ; // silence -Wempty-body - return c; - } - static bool is_single_gcode_word(const char* c) { - c = skip_word(c); - c = skip_whitespaces(c); - return is_end_of_gcode_line(*c); - } - static bool starts_with(const std::string &comment, const std::string &tag) { - size_t tag_len = tag.size(); - return comment.size() >= tag_len && comment.substr(0, tag_len) == tag; - } - static ExtrusionRole string_to_role(const std::string& role); - //BBS: Returns true if the number was parsed correctly into out and the number spanned the whole input string. - static bool parse_double_from_str(const std::string& input, double& out) { - size_t read = 0; - try { - out = std::stod(input, &read); - return input.size() == read; - } catch (...) { - return false; - } - } - - static bool parse_double_from_str(const std::string &input, std::vector &out) - { - - std::string cmd=input; - size_t read = 0; - - while (cmd.size() >= 5) - { - int pt = 0; - for (pt = 0; pt < cmd.size(); pt++) { - char temp = cmd[pt]; - if (temp == ',') - { - try { - double num = std::stod(cmd.substr(0, pt), &read); - - out.push_back(num); - cmd = cmd.substr(pt+1); - break; - } catch (...) { - return false; - } - } - } - } - - double num = std::stod(cmd, &read); - out.push_back(num); - - return true; - } - -private: - EPositioningType m_global_positioning_type = EPositioningType::Absolute; - EPositioningType m_e_local_positioning_type = EPositioningType::Absolute; - - std::array m_start_position = { 0.0, 0.0, 0.0, 0.0 }; - std::array m_end_position = { 0.0, 0.0, 0.0, 0.0 }; - std::array m_origin = { 0.0, 0.0, 0.0, 0.0 }; - - //BBS: use these value to save information from comment - ExtrusionRole m_role = erNone; - bool m_wiping = false; - int m_layer_num = 0; - double m_height = 0.0; - double m_width = 0.0; - double z_height=0.0f; - double initial_layer_height=0.0f; - int filament_id; - double flow_ratio = 0; - double nozzle_temp = 0.0f; - std::vector filament_flow_ratio; - std::vector nozzle_temperature; - std::vector nozzle_temperature_initial_layer; -}; - -} - -#endif diff --git a/bbs_test_tools/bbs_gcode_checker/main.cpp b/bbs_test_tools/bbs_gcode_checker/main.cpp deleted file mode 100644 index f855a1489e3..00000000000 --- a/bbs_test_tools/bbs_gcode_checker/main.cpp +++ /dev/null @@ -1,24 +0,0 @@ -#include "GCodeChecker.h" - -using namespace std; -using namespace BambuStudio; - -int main(int argc, char *argv[]) -{ - if (argc != 2) { - cout << "Invalid input arguments" << endl; - return -1; - } - string path(argv[1]); - cout << "Start to check file " << path << endl; - GCodeChecker checker; - - //BBS: parse and check whether has invalid gcode - if (checker.parse_file(path) != GCodeCheckResult::Success) { - cout << "Failed to parse and check file " << path << endl; - return -1; - } - - cout << "Success to parse and check file" << path << endl; - return 0; -} diff --git a/build_relwithdebinfo.bat b/build_relwithdebinfo.bat deleted file mode 100644 index 8264da1c142..00000000000 --- a/build_relwithdebinfo.bat +++ /dev/null @@ -1,23 +0,0 @@ -set WP=%CD% -cd deps -mkdir build -cd build -set DEPS=%CD%/OrcaSlicer_dep -if "%1"=="studio" ( - GOTO :studio -) -echo "building deps.." -cmake ../ -G "Visual Studio 16 2019" -DDESTDIR="%CD%/OrcaSlicer_dep" -DCMAKE_BUILD_TYPE=Release -cmake --build . --config Release --target ALL_BUILD -- -m - -if "%1"=="deps" exit /b 0 - -:studio -echo "building studio..." -cd %WP% -mkdir build -cd build - -cmake .. -G "Visual Studio 16 2019" -DBBL_RELEASE_TO_PUBLIC=1 -DCMAKE_PREFIX_PATH="%DEPS%/usr/local" -DCMAKE_INSTALL_PREFIX="./OrcaSlicer" -DCMAKE_BUILD_TYPE=Release -DWIN10SDK_PATH="C:/Program Files (x86)/Windows Kits/10/Include/10.0.19041.0" -cmake --build . --config RelWithDebInfo --target ALL_BUILD -- -m -@REM cmake --build . --target install --config RelWithDebInfo \ No newline at end of file diff --git a/build_win.bat b/build_win.bat deleted file mode 100644 index 29ee7f09e74..00000000000 --- a/build_win.bat +++ /dev/null @@ -1,495 +0,0 @@ -@setlocal disableDelayedExpansion enableExtensions -@IF "%PS_ECHO_ON%" NEQ "" (echo on) ELSE (echo off) -@GOTO :MAIN -:HELP -@ECHO. -@ECHO Performs initial build or rebuild of the app (build) and deps (build/deps). -@ECHO Default options are determined from build directories and system state. -@ECHO. -@ECHO Usage: build_win [-ARCH ^] [-CONFIG ^] [-VERSION ^] -@ECHO [-PRODUCT ^] [-DESTDIR ^] -@ECHO [-STEPS ^] -@ECHO [-RUN ^] -@ECHO. -@ECHO -a -ARCH Target processor architecture -@ECHO Default: %PS_ARCH_HOST% -@ECHO -c -CONFIG MSVC project config -@ECHO Default: %PS_CONFIG_DEFAULT% -@ECHO -v -VERSION Major version number of MSVC installation to use for build -@ECHO Default: %PS_VERSION_SUPPORTED% -@ECHO -p -PRODUCT Product ID of MSVC installation to use for build -@ECHO Default: %PS_PRODUCT_DEFAULT% -@ECHO -s -STEPS Performs only the specified build steps: -@ECHO all - clean and build deps and app -@ECHO all-dirty - build deps and app without cleaning -@ECHO app - clean and build main applications -@ECHO app-dirty - build main applications without cleaning -@ECHO deps - clean and build deps -@ECHO deps-dirty - build deps without cleaning -@ECHO Default: %PS_STEPS_DEFAULT% -@ECHO -r -RUN Specifies what to perform at the run step: -@ECHO console - run and wait on orca-slicer-console.exe -@ECHO custom - run and wait on your custom build/%PS_CUSTOM_RUN_FILE% -@ECHO ide - open project in Visual Studio if not open (no wait) -@ECHO none - run step does nothing -@ECHO viewer - run bambu-gcodeviewer.exe (no wait) -@ECHO window - run orca-slicer.exe (no wait) -@ECHO Default: none -@ECHO -d -DESTDIR Deps destination directory -@ECHO Warning: Changing destdir path will not delete the old destdir. -@ECHO Default: %PS_DESTDIR_DEFAULT_MSG% -@ECHO. -@ECHO Examples: -@ECHO. -@ECHO Initial build: build_win -d "c:\src\BambuSlicer-deps" -@ECHO Build post deps change: build_win -s all -@ECHO App dirty build: build_win -@ECHO App dirty build ^& run: build_win -r console -@ECHO All clean build ^& run: build_win -s all -r console -d "deps\build\out_deps" -@ECHO. -GOTO :END - -:MAIN -REM Script constants -SET START_TIME=%TIME% -SET PS_START_DIR=%CD% -SET PS_SOLUTION_NAME=BambuStudio -SET PS_CHOICE_TIMEOUT=30 -SET PS_CUSTOM_RUN_FILE=custom_run.bat -SET PS_DEPS_PATH_FILE_NAME=.DEPS_PATH.txt -SET PS_DEPS_PATH_FILE=%~dp0deps\build\%PS_DEPS_PATH_FILE_NAME% -SET PS_CONFIG_LIST="Debug;MinSizeRel;Release;RelWithDebInfo" - -REM The officially supported toolchain version is 16 (Visual Studio 2019) -REM TODO: Update versions after Boost gets rolled to 1.78 or later -SET PS_VERSION_SUPPORTED=16 -SET PS_VERSION_EXCEEDED=17 -SET VSWHERE=%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe -IF NOT EXIST "%VSWHERE%" SET VSWHERE=%ProgramFiles%\Microsoft Visual Studio\Installer\vswhere.exe -FOR /F "tokens=4 USEBACKQ delims=." %%I IN (`"%VSWHERE%" -nologo -property productId`) DO SET PS_PRODUCT_DEFAULT=%%I -IF "%PS_PRODUCT_DEFAULT%" EQU "" ( - SET EXIT_STATUS=-1 - @ECHO ERROR: No Visual Studio installation found. 1>&2 - GOTO :HELP -) -REM Default to the latest supported version if multiple are available -FOR /F "tokens=1 USEBACKQ delims=." %%I IN ( - `^""%VSWHERE%" -version "[%PS_VERSION_SUPPORTED%,%PS_VERSION_EXCEEDED%)" -latest -nologo -property catalog_buildVersion^"` -) DO SET PS_VERSION_SUPPORTED=%%I - -REM Probe build directories and system state for reasonable default arguments -pushd %~dp0 -SET PS_CONFIG=RelWithDebInfo -SET PS_ARCH=%PROCESSOR_ARCHITECTURE:amd64=x64% -CALL :TOLOWER PS_ARCH -SET PS_RUN=none -SET PS_DESTDIR= -SET PS_VERSION= -SET PS_PRODUCT=%PS_PRODUCT_DEFAULT% -CALL :RESOLVE_DESTDIR_CACHE - -REM Set up parameters used by help menu -SET EXIT_STATUS=0 -SET PS_CONFIG_DEFAULT=%PS_CONFIG% -SET PS_ARCH_HOST=%PS_ARCH% -(echo " -help /help -h /h -? /? ")| findstr /I /C:" %~1 ">nul && GOTO :HELP - -REM Parse arguments -SET EXIT_STATUS=1 -SET PS_CURRENT_STEP=arguments -SET PARSER_STATE= -SET PARSER_FAIL= -FOR %%I in (%*) DO CALL :PARSE_OPTION "ARCH CONFIG DESTDIR STEPS RUN VERSION PRODUCT" PARSER_STATE "%%~I" -IF "%PARSER_FAIL%" NEQ "" ( - @ECHO ERROR: Invalid switch: %PARSER_FAIL% 1>&2 - GOTO :HELP -)ELSE IF "%PARSER_STATE%" NEQ "" ( - @ECHO ERROR: Missing parameter for: %PARSER_STATE% 1>&2 - GOTO :HELP -) - -REM Validate arguments -SET PS_ASK_TO_CONTINUE= -CALL :TOLOWER PS_ARCH -SET PS_ARCH=%PS_ARCH:amd64=x64% -CALL :PARSE_OPTION_VALUE %PS_CONFIG_LIST:;= % PS_CONFIG -IF "%PS_CONFIG%" EQU "" GOTO :HELP -REM RESOLVE_DESTDIR_CACHE must go after PS_ARCH and PS_CONFIG, but before PS STEPS -CALL :RESOLVE_DESTDIR_CACHE -IF "%PS_STEPS%" EQU "" SET PS_STEPS=%PS_STEPS_DEFAULT% -CALL :PARSE_OPTION_VALUE "all all-dirty deps-dirty deps app-dirty app app-cmake" PS_STEPS -IF "%PS_STEPS%" EQU "" GOTO :HELP -(echo %PS_STEPS%)| findstr /I /C:"dirty">nul && SET PS_STEPS_DIRTY=1 || SET PS_STEPS_DIRTY= -IF "%PS_STEPS%" EQU "app-cmake" SET PS_STEPS_DIRTY=1 -IF "%PS_DESTDIR%" EQU "" SET PS_DESTDIR=%PS_DESTDIR_CACHED% -IF "%PS_DESTDIR%" EQU "" ( - @ECHO ERROR: Parameter required: -DESTDIR 1>&2 - GOTO :HELP -) -CALL :CANONICALIZE_PATH PS_DESTDIR "%PS_START_DIR%" -IF "%PS_DESTDIR%" NEQ "%PS_DESTDIR_CACHED%" ( - (echo "all deps all-dirty deps-dirty")| findstr /I /C:"%PS_STEPS%">nul || ( - IF EXIST "%PS_DESTDIR%" ( - @ECHO WARNING: DESTDIR does not match cache: 1>&2 - @ECHO WARNING: new: %PS_DESTDIR% 1>&2 - @ECHO WARNING: old: %PS_DESTDIR_CACHED% 1>&2 - SET PS_ASK_TO_CONTINUE=1 - ) ELSE ( - @ECHO ERROR: Invalid parameter: DESTDIR=%PS_DESTDIR% 1>&2 - GOTO :HELP - ) - ) -) -SET PS_DESTDIR_DEFAULT_MSG= -CALL :PARSE_OPTION_VALUE "console custom ide none viewer window" PS_RUN -IF "%PS_RUN%" EQU "" GOTO :HELP -IF "%PS_RUN%" NEQ "none" IF "%PS_STEPS:~0,4%" EQU "deps" ( - @ECHO ERROR: RUN=%PS_RUN% specified with STEPS=%PS_STEPS% - @ECHO ERROR: RUN=none is the only valid option for STEPS "deps" or "deps-dirty" - GOTO :HELP -) -IF DEFINED PS_VERSION ( - SET /A PS_VERSION_EXCEEDED=%PS_VERSION% + 1 -) ELSE SET PS_VERSION=%PS_VERSION_SUPPORTED% -SET MSVC_FILTER=-products Microsoft.VisualStudio.Product.%PS_PRODUCT% -version "[%PS_VERSION%,%PS_VERSION_EXCEEDED%)" -FOR /F "tokens=* USEBACKQ" %%I IN (`^""%VSWHERE%" %MSVC_FILTER% -nologo -property installationPath^"`) DO SET MSVC_DIR=%%I -IF NOT EXIST "%MSVC_DIR%" ( - @ECHO ERROR: Compatible Visual Studio installation not found. 1>&2 - GOTO :HELP -) -REM Give the user a chance to cancel if we found something odd. -IF "%PS_ASK_TO_CONTINUE%" EQU "" GOTO :BUILD_ENV -@ECHO. -@ECHO Unexpected parameters detected. Build paused for %PS_CHOICE_TIMEOUT% seconds. -choice /T %PS_CHOICE_TIMEOUT% /C YN /D N /M "Continue" -IF %ERRORLEVEL% NEQ 1 GOTO :HELP - -REM Set up MSVC environment -:BUILD_ENV -SET EXIT_STATUS=2 -SET PS_CURRENT_STEP=environment -@ECHO ********************************************************************** -@ECHO ** Build Config: %PS_CONFIG% -@ECHO ** Target Arch: %PS_ARCH% -@ECHO ** Build Steps: %PS_STEPS% -@ECHO ** Run App: %PS_RUN% -@ECHO ** Deps path: %PS_DESTDIR% -@ECHO ** Using Microsoft Visual Studio installation found at: -@ECHO ** %MSVC_DIR% -CALL "%MSVC_DIR%\Common7\Tools\vsdevcmd.bat" -arch=%PS_ARCH% -host_arch=%PS_ARCH_HOST% -app_platform=Desktop -IF %ERRORLEVEL% NEQ 0 GOTO :END -REM Need to reset the echo state after vsdevcmd.bat clobbers it. -@IF "%PS_ECHO_ON%" NEQ "" (echo on) ELSE (echo off) -IF "%PS_DRY_RUN_ONLY%" NEQ "" ( - @ECHO Script terminated early because PS_DRY_RUN_ONLY is set. 1>&2 - GOTO :END -) -IF /I "%PS_STEPS:~0,3%" EQU "app" GOTO :BUILD_APP - -REM Build deps -:BUILD_DEPS -SET EXIT_STATUS=3 -SET PS_CURRENT_STEP=deps -IF "%PS_STEPS_DIRTY%" EQU "" ( - CALL :MAKE_OR_CLEAN_DIRECTORY deps\build "%PS_DEPS_PATH_FILE_NAME%" .vs - CALL :MAKE_OR_CLEAN_DIRECTORY "%PS_DESTDIR%" -) -cd deps\build || GOTO :END -cmake.exe .. -DDESTDIR="%PS_DESTDIR%" -IF %ERRORLEVEL% NEQ 0 IF "%PS_STEPS_DIRTY%" NEQ "" ( - (del CMakeCache.txt && cmake.exe .. -DDESTDIR="%PS_DESTDIR%") || GOTO :END -) ELSE GOTO :END -(echo %PS_DESTDIR%)> "%PS_DEPS_PATH_FILE%" -msbuild /m ALL_BUILD.vcxproj /p:Configuration=%PS_CONFIG% /v:quiet || GOTO :END -cd ..\.. -IF /I "%PS_STEPS:~0,4%" EQU "deps" GOTO :RUN_APP - -REM Build app -:BUILD_APP -SET EXIT_STATUS=4 -SET PS_CURRENT_STEP=app -IF "%PS_STEPS_DIRTY%" EQU "" CALL :MAKE_OR_CLEAN_DIRECTORY build "%PS_CUSTOM_RUN_FILE%" .vs -cd build || GOTO :END -REM Make sure we have a custom batch file skeleton for the run stage -set PS_CUSTOM_BAT=%PS_CUSTOM_RUN_FILE% -CALL :CANONICALIZE_PATH PS_CUSTOM_BAT -IF NOT EXIST %PS_CUSTOM_BAT% CALL :WRITE_CUSTOM_SCRIPT_SKELETON %PS_CUSTOM_BAT% -SET PS_PROJECT_IS_OPEN= -FOR /F "tokens=2 delims=," %%I in ( - 'tasklist /V /FI "IMAGENAME eq devenv.exe " /NH /FO CSV ^| find "%PS_SOLUTION_NAME%"' -) do SET PS_PROJECT_IS_OPEN=%%~I -cmake.exe .. -DCMAKE_PREFIX_PATH="%PS_DESTDIR%\usr\local" -DCMAKE_CONFIGURATION_TYPES=%PS_CONFIG_LIST% -IF %ERRORLEVEL% NEQ 0 IF "%PS_STEPS_DIRTY%" NEQ "" ( - (del CMakeCache.txt && cmake.exe .. -DCMAKE_PREFIX_PATH="%PS_DESTDIR%\usr\local" -DCMAKE_CONFIGURATION_TYPES=%PS_CONFIG_LIST%) || GOTO :END -) ELSE GOTO :END -REM Skip the build step if we're using the undocumented app-cmake to regenerate the full config from inside devenv -IF "%PS_STEPS%" NEQ "app-cmake" msbuild /m ALL_BUILD.vcxproj /p:Configuration=%PS_CONFIG% /v:quiet || GOTO :END -(echo %PS_DESTDIR%)> "%PS_DEPS_PATH_FILE_FOR_CONFIG%" - -REM Run app -:RUN_APP -REM All build steps complete. -CALL :DIFF_TIME ELAPSED_TIME %START_TIME% %TIME% -IF "%PS_CURRENT_STEP%" NEQ "arguments" ( - @ECHO. - @ECHO Total Build Time Elapsed %ELAPSED_TIME% -) -SET EXIT_STATUS=5 -SET PS_CURRENT_STEP=run -IF "%PS_RUN%" EQU "none" GOTO :PROLOGUE -cd src\%PS_CONFIG% || GOTO :END -SET PS_PROJECT_IS_OPEN= -FOR /F "tokens=2 delims=," %%I in ( - 'tasklist /V /FI "IMAGENAME eq devenv.exe " /NH /FO CSV ^| find "%PS_SOLUTION_NAME%"' -) do SET PS_PROJECT_IS_OPEN=%%~I -@ECHO. -@ECHO Running %PS_RUN% application... -@REM icacls below is just a hack for file-not-found error handling -IF "%PS_RUN%" EQU "console" ( - icacls orca-slicer-console.exe >nul || GOTO :END - start /wait /b orca-slicer-console.exe -) ELSE IF "%PS_RUN%" EQU "window" ( - icacls orca-slicer.exe >nul || GOTO :END - start orca-slicer.exe -) ELSE IF "%PS_RUN%" EQU "viewer" ( - icacls bambu-gcodeviewer.exe >nul || GOTO :END - start bambu-gcodeviewer.exe -) ELSE IF "%PS_RUN%" EQU "custom" ( - icacls %PS_CUSTOM_BAT% >nul || GOTO :END - CALL %PS_CUSTOM_BAT% -) ELSE IF "%PS_RUN%" EQU "ide" ( - IF "%PS_PROJECT_IS_OPEN%" NEQ "" ( - @ECHO WARNING: Solution is already open in Visual Studio. Skipping ide run step. 1>&2 - ) ELSE ( - @ECHO Preparing to run Visual Studio... - cd ..\.. || GOTO :END - REM This hack generates a single config for MSVS, guaranteeing it gets set as the active config. - cmake.exe .. -DCMAKE_PREFIX_PATH="%PS_DESTDIR%\usr\local" -DCMAKE_CONFIGURATION_TYPES=%PS_CONFIG% > nul 2> nul || GOTO :END - REM Now launch devenv with the single config (setting it active) and a /command switch to re-run cmake and generate the full config list - start devenv.exe %PS_SOLUTION_NAME%.sln /command ^"shell /o ^^^"%~f0^^^" -d ^^^"%PS_DESTDIR%^^^" -c %PS_CONFIG% -a %PS_ARCH% -r none -s app-cmake^" - REM If devenv fails to launch just directly regenerate the full config list. - IF %ERRORLEVEL% NEQ 0 ( - cmake.exe .. -DCMAKE_PREFIX_PATH="%PS_DESTDIR%\usr\local" -DCMAKE_CONFIGURATION_TYPES=%PS_CONFIG_LIST% 2> nul 1> nul || GOTO :END - ) - ) -) - -@REM ********** DON'T ADD ANY CODE BETWEEN THESE TWO SECTIONS ********** -@REM RUN_APP may hand off control, so let exit codes fall through to PROLOGUE. - -:PROLOGUE -SET EXIT_STATUS=%ERRORLEVEL% -:END -@IF "%PS_ECHO_ON%%PS_DRY_RUN_ONLY%" NEQ "" ( - @ECHO ********************************************************************** - @ECHO ** Script Parameters: - @ECHO ********************************************************************** - @SET PS_ -) -IF "%EXIT_STATUS%" NEQ "0" ( - IF "%PS_CURRENT_STEP%" NEQ "arguments" ( - @ECHO. - @ECHO ERROR: *** Build process failed at %PS_CURRENT_STEP% step. *** 1>&2 - ) -) ELSE ( - @ECHO All steps completed successfully. -) -popd -exit /B %EXIT_STATUS% - -GOTO :EOF -REM Functions and stubs start here. - -:RESOLVE_DESTDIR_CACHE -@REM Resolves all DESTDIR cache values and sets PS_STEPS_DEFAULT -@REM Note: This just sets global variables, so it doesn't use setlocal. -SET PS_DEPS_PATH_FILE_FOR_CONFIG=%~dp0build\.vs\%PS_ARCH%\%PS_CONFIG%\%PS_DEPS_PATH_FILE_NAME% -mkdir "%~dp0build\.vs\%PS_ARCH%\%PS_CONFIG%" > nul 2> nul -REM Copy a legacy file if we don't have one in the proper location. -echo f|xcopy /D "%~dp0build\%PS_ARCH%\%PS_CONFIG%\%PS_DEPS_PATH_FILE_NAME%" "%PS_DEPS_PATH_FILE_FOR_CONFIG%" > nul 2> nul -CALL :CANONICALIZE_PATH PS_DEPS_PATH_FILE_FOR_CONFIG -IF EXIST "%PS_DEPS_PATH_FILE_FOR_CONFIG%" ( - FOR /F "tokens=* USEBACKQ" %%I IN ("%PS_DEPS_PATH_FILE_FOR_CONFIG%") DO ( - SET PS_DESTDIR_CACHED=%%I - SET PS_DESTDIR_DEFAULT_MSG=%%I - ) - SET PS_STEPS_DEFAULT=app-dirty -) ELSE IF EXIST "%PS_DEPS_PATH_FILE%" ( - FOR /F "tokens=* USEBACKQ" %%I IN ("%PS_DEPS_PATH_FILE%") DO ( - SET PS_DESTDIR_CACHED=%%I - SET PS_DESTDIR_DEFAULT_MSG=%%I - ) - SET PS_STEPS_DEFAULT=app -) ELSE ( - SET PS_DESTDIR_CACHED= - SET PS_DESTDIR_DEFAULT_MSG=Cache missing. Argument required. - SET PS_STEPS_DEFAULT=all -) -GOTO :EOF - -:PARSE_OPTION -@REM Argument parser called for each argument -@REM %1 - Valid option list -@REM %2 - Variable name for parser state; must be unset when parsing finished -@REM %3 - Current argument value -@REM PARSER_FAIL will be set on an error -@REM Note: Must avoid delayed expansion since filenames may contain ! character -setlocal disableDelayedExpansion -IF "%PARSER_FAIL%" NEQ "" GOTO :EOF -CALL SET LAST_ARG=%%%2%% -IF "%LAST_ARG%" EQU "" ( - CALL :PARSE_OPTION_NAME %1 %~2 %~3 1 - SET ARG_TYPE=NAME -) ELSE ( - SET PS_SET_COMMAND=SET PS_%LAST_ARG%=%~3 - SET ARG_TYPE=LAST_ARG - SET %~2= -) -CALL SET LAST_ARG=%%%2%% -IF "%LAST_ARG%%ARG_TYPE%" EQU "NAME" SET PARSER_FAIL=%~3 -( - endlocal - SET PARSER_FAIL=%PARSER_FAIL% - SET %~2=%LAST_ARG% - %PS_SET_COMMAND% -) -GOTO :EOF - -:PARSE_OPTION_VALUE -setlocal disableDelayedExpansion -@REM Parses value and verifies it is within the supplied list -@REM %1 - Valid option list -@REM %2 - In/out variable name; unset on error -CALL SET NAME=%~2 -CALL SET SAVED_VALUE=%%%NAME%%% -CALL :PARSE_OPTION_NAME %1 %NAME% -%SAVED_VALUE% -CALL SET NEW_VALUE=%%%NAME%%% -IF "%NEW_VALUE%" EQU "" ( - @ECHO ERROR: Invalid parameter: %NAME:~3%=%SAVED_VALUE% 1>&2 -) -endlocal & SET %NAME%=%NEW_VALUE% -GOTO :EOF - -:PARSE_OPTION_NAME -@REM Parses an option name -@REM %1 - Valid option list -@REM %2 - Out variable name; unset on error -@REM %3 - Current argument value -@REM %4 - Boolean indicating single character switches are valid -@REM Note: Delayed expansion safe because ! character is invalid in option name -setlocal enableDelayedExpansion -IF "%4" NEQ "" FOR %%I IN (%~1) DO @( - SET SHORT_NAME=%%~I - SET SHORT_ARG_!SHORT_NAME:~0,1!=%%~I -) -@SET OPTION_NAME=%~3 -@(echo %OPTION_NAME%)| findstr /R /C:"[-/]..*">nul || GOTO :PARSE_OPTION_NAME_FAIL -@SET OPTION_NAME=%OPTION_NAME:~1% -IF "%4" NEQ "" ( - IF "%OPTION_NAME%" EQU "%OPTION_NAME:~0,1%" ( - IF "!SHORT_ARG_%OPTION_NAME:~0,1%!" NEQ "" SET OPTION_NAME=!SHORT_ARG_%OPTION_NAME:~0,1%! - ) -) -@(echo %OPTION_NAME%)| findstr /R /C:".[ ][ ]*.">nul && GOTO :PARSE_OPTION_NAME_FAIL -@(echo %~1 )| findstr /I /C:" %OPTION_NAME% ">nul || GOTO :PARSE_OPTION_NAME_FAIL -FOR %%I IN (%~1) DO SET OPTION_NAME=!OPTION_NAME:%%~I=%%~I! -endlocal & SET %~2=%OPTION_NAME% -GOTO :EOF -:PARSE_OPTION_NAME_FAIL -endlocal & SET %~2= -GOTO :EOF - -:MAKE_OR_CLEAN_DIRECTORY -@REM Create directory if it doesn't exist or clean it if it does -@REM %1 - Directory path to clean or create -@REM %* - Optional list of files/dirs to keep (in the base directory only) -setlocal disableDelayedExpansion -IF NOT EXIST "%~1" ( - @ECHO Creating %~1 - mkdir "%~1" && ( - endlocal - GOTO :EOF - ) -) -@ECHO Cleaning %~1 ... -SET KEEP_LIST= -:MAKE_OR_CLEAN_DIRECTORY_ARG_LOOP -IF "%~2" NEQ "" ( - SET KEEP_LIST=%KEEP_LIST% "%~2" - SHIFT /2 - GOTO :MAKE_OR_CLEAN_DIRECTORY_ARG_LOOP -) -for /F "usebackq delims=" %%I in (`dir /a /b "%~1"`) do ( - (echo %KEEP_LIST%)| findstr /I /L /C:"\"%%I\"">nul || ( - rmdir /s /q "%~1\%%I" 2>nul ) || del /q /f "%~1\%%I" -) -endlocal -GOTO :EOF - -:TOLOWER -@REM Converts supplied environment variable to lowercase -@REM %1 - Input/output variable name -@REM Note: This is slow on very long strings, but is used only on very short ones -setlocal disableDelayedExpansion -@FOR %%b IN (a b c d e f g h i j k l m n o p q r s t u v w x y z) DO @CALL set %~1=%%%1:%%b=%%b%% -@CALL SET OUTPUT=%%%~1%% -endlocal & SET %~1=%OUTPUT% -GOTO :EOF - -:CANONICALIZE_PATH -@REM Canonicalizes the path in the supplied variable -@REM %1 - Input/output variable containing path to canonicalize -@REM %2 - Optional base directory -setlocal -CALL :CANONICALIZE_PATH_INNER %1 %%%~1%% %2 -endlocal & SET %~1=%OUTPUT% -GOTO :EOF -:CANONICALIZE_PATH_INNER -if "%~3" NEQ "" (pushd %3 || GOTO :EOF) -SET OUTPUT=%~f2 -if "%~3" NEQ "" popd -GOTO :EOF - -:DIFF_TIME -@REM Calculates elapsed time between two timestamps (TIME environment variable format) -@REM %1 - Output variable -@REM %2 - Start time -@REM %3 - End time -setlocal EnableDelayedExpansion -set START_ARG=%2 -set END_ARG=%3 -set END=!END_ARG:%TIME:~8,1%=%%100)*100+1! -set START=!START_ARG:%TIME:~8,1%=%%100)*100+1! -set /A DIFF=((((10!END:%TIME:~2,1%=%%100)*60+1!%%100)-((((10!START:%TIME:~2,1%=%%100)*60+1!%%100), DIFF-=(DIFF^>^>31)*24*60*60*100 -set /A CC=DIFF%%100+100,DIFF/=100,SS=DIFF%%60+100,DIFF/=60,MM=DIFF%%60+100,HH=DIFF/60+100 -@endlocal & set %1=%HH:~1%%TIME:~2,1%%MM:~1%%TIME:~2,1%%SS:~1%%TIME:~8,1%%CC:~1% -@GOTO :EOF - -:WRITE_CUSTOM_SCRIPT_SKELETON -@REM Writes the following text to the supplied file -@REM %1 - Output filename -setlocal -@( -ECHO @ECHO. -ECHO @ECHO ******************************************************************************** -ECHO @ECHO ** This is a custom run script skeleton. -ECHO @ECHO ******************************************************************************** -ECHO @ECHO. -ECHO @ECHO ******************************************************************************** -ECHO @ECHO ** The working directory is: -ECHO @ECHO ******************************************************************************** -ECHO dir -ECHO @ECHO. -ECHO @ECHO ******************************************************************************** -ECHO @ECHO ** The environment is: -ECHO @ECHO ******************************************************************************** -ECHO set -ECHO @ECHO. -ECHO @ECHO ******************************************************************************** -ECHO @ECHO ** Edit or replace this script to run custom steps after a successful build: -ECHO @ECHO ** %~1 -ECHO @ECHO ******************************************************************************** -ECHO @ECHO. -) > "%~1" -endlocal -GOTO :EOF diff --git a/cmake/modules/MacOSXBundleInfo.plist.in b/cmake/modules/MacOSXBundleInfo.plist.in index 40c8e7c3a02..13e53179cf9 100644 --- a/cmake/modules/MacOSXBundleInfo.plist.in +++ b/cmake/modules/MacOSXBundleInfo.plist.in @@ -52,7 +52,7 @@ OBJ CFBundleTypeIconFile - BambuStudio.icns + OrcaSlicer.icns CFBundleTypeName STL CFBundleTypeRole @@ -69,7 +69,7 @@ AMF CFBundleTypeIconFile - BambuStudio.icns + OrcaSlicer.icns CFBundleTypeName AMF CFBundleTypeRole @@ -86,7 +86,7 @@ 3MF CFBundleTypeIconFile - BambuStudio.icns + OrcaSlicer.icns CFBundleTypeName 3MF CFBundleTypeRole diff --git a/deps/Blosc/Blosc.cmake b/deps/Blosc/Blosc.cmake index bc5aa94a807..af4f015e5fc 100644 --- a/deps/Blosc/Blosc.cmake +++ b/deps/Blosc/Blosc.cmake @@ -7,7 +7,7 @@ else() endif() if(IS_CROSS_COMPILE AND APPLE) - bambustudio_add_cmake_project(Blosc + orcaslicer_add_cmake_project(Blosc #URL https://github.com/Blosc/c-blosc/archive/refs/tags/v1.17.0.zip #URL_HASH SHA256=7463a1df566704f212263312717ab2c36b45d45cba6cd0dccebf91b2cc4b4da9 URL https://github.com/tamasmeszaros/c-blosc/archive/refs/heads/v1.17.0_tm.zip @@ -26,7 +26,7 @@ if(IS_CROSS_COMPILE AND APPLE) -DDEACTIVATE_AVX2=ON ) else() - bambustudio_add_cmake_project(Blosc + orcaslicer_add_cmake_project(Blosc #URL https://github.com/Blosc/c-blosc/archive/refs/tags/v1.17.0.zip #URL_HASH SHA256=7463a1df566704f212263312717ab2c36b45d45cba6cd0dccebf91b2cc4b4da9 URL https://github.com/tamasmeszaros/c-blosc/archive/refs/heads/v1.17.0_tm.zip diff --git a/deps/CGAL/CGAL.cmake b/deps/CGAL/CGAL.cmake index d9738375713..39514e465d3 100644 --- a/deps/CGAL/CGAL.cmake +++ b/deps/CGAL/CGAL.cmake @@ -1,4 +1,4 @@ -bambustudio_add_cmake_project( +orcaslicer_add_cmake_project( CGAL GIT_REPOSITORY https://github.com/CGAL/cgal.git GIT_TAG caacd806dc55c61cc68adaad99f2240f00493b29 # releases/CGAL-5.3 diff --git a/deps/CMakeLists.txt b/deps/CMakeLists.txt index a828bfef5ef..52e6022451e 100644 --- a/deps/CMakeLists.txt +++ b/deps/CMakeLists.txt @@ -85,7 +85,7 @@ if (NOT _is_multi AND NOT CMAKE_BUILD_TYPE) message(STATUS "Forcing CMAKE_BUILD_TYPE to Release as it was not specified.") endif () -function(bambustudio_add_cmake_project projectname) +function(orcaslicer_add_cmake_project projectname) cmake_parse_arguments(P_ARGS "" "INSTALL_DIR;BUILD_COMMAND;INSTALL_COMMAND" "CMAKE_ARGS" ${ARGN}) set(_configs_line -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}) @@ -145,7 +145,7 @@ else() endif() -endfunction(bambustudio_add_cmake_project) +endfunction(orcaslicer_add_cmake_project) if (MSVC) diff --git a/deps/CURL/CURL.cmake b/deps/CURL/CURL.cmake index b369caed216..4c82a12f7d1 100644 --- a/deps/CURL/CURL.cmake +++ b/deps/CURL/CURL.cmake @@ -55,7 +55,7 @@ else() set(_curl_static ON) endif() -bambustudio_add_cmake_project(CURL +orcaslicer_add_cmake_project(CURL # GIT_REPOSITORY https://github.com/curl/curl.git # GIT_TAG curl-7_75_0 URL https://github.com/curl/curl/archive/refs/tags/curl-7_75_0.zip diff --git a/deps/Cereal/Cereal.cmake b/deps/Cereal/Cereal.cmake index 4651bab85de..6f4c9a1d924 100644 --- a/deps/Cereal/Cereal.cmake +++ b/deps/Cereal/Cereal.cmake @@ -1,4 +1,4 @@ -bambustudio_add_cmake_project(Cereal +orcaslicer_add_cmake_project(Cereal URL "https://github.com/USCiLab/cereal/archive/v1.2.2.tar.gz" URL_HASH SHA256=1921f26d2e1daf9132da3c432e2fd02093ecaedf846e65d7679ddf868c7289c4 CMAKE_ARGS diff --git a/deps/EXPAT/EXPAT.cmake b/deps/EXPAT/EXPAT.cmake index 91924219173..fd5c4c5c4d3 100644 --- a/deps/EXPAT/EXPAT.cmake +++ b/deps/EXPAT/EXPAT.cmake @@ -1,4 +1,4 @@ -bambustudio_add_cmake_project(EXPAT +orcaslicer_add_cmake_project(EXPAT # GIT_REPOSITORY https://github.com/nigels-com/glew.git # GIT_TAG 3a8eff7 # 2.1.0 SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR}/expat diff --git a/deps/FREETYPE/FREETYPE.cmake b/deps/FREETYPE/FREETYPE.cmake index 714df28cff3..f30671ff2c3 100644 --- a/deps/FREETYPE/FREETYPE.cmake +++ b/deps/FREETYPE/FREETYPE.cmake @@ -10,7 +10,7 @@ else() set(_ft_disable_zlib "-D FT_DISABLE_ZLIB=TRUE") endif() -bambustudio_add_cmake_project(FREETYPE +orcaslicer_add_cmake_project(FREETYPE URL https://mirror.ossplanet.net/nongnu/freetype/freetype-2.12.1.tar.gz URL_HASH SHA256=efe71fd4b8246f1b0b1b9bfca13cfff1c9ad85930340c27df469733bbb620938 #DEPENDS ${ZLIB_PKG} diff --git a/deps/GLEW/GLEW.cmake b/deps/GLEW/GLEW.cmake index c2673d6fb65..cef56e72e22 100644 --- a/deps/GLEW/GLEW.cmake +++ b/deps/GLEW/GLEW.cmake @@ -2,7 +2,7 @@ set(OpenGL_GL_PREFERENCE "LEGACY") # to prevent a nasty warning by cmake find_package(OpenGL QUIET REQUIRED) -bambustudio_add_cmake_project( +orcaslicer_add_cmake_project( GLEW SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR}/glew ) diff --git a/deps/GLFW/GLFW.cmake b/deps/GLFW/GLFW.cmake index d6a7384d1fd..81967910339 100644 --- a/deps/GLFW/GLFW.cmake +++ b/deps/GLFW/GLFW.cmake @@ -12,7 +12,7 @@ else() set(_glfw_use_wayland "-DGLFW_USE_WAYLAND=FF") endif() -bambustudio_add_cmake_project(GLFW +orcaslicer_add_cmake_project(GLFW URL https://github.com/glfw/glfw/archive/refs/tags/3.3.7.zip URL_HASH SHA256=e02d956935e5b9fb4abf90e2c2e07c9a0526d7eacae8ee5353484c69a2a76cd0 #DEPENDS dep_Boost diff --git a/deps/JPEG/JPEG.cmake b/deps/JPEG/JPEG.cmake index bf7c6d32774..6fe081b5659 100644 --- a/deps/JPEG/JPEG.cmake +++ b/deps/JPEG/JPEG.cmake @@ -11,7 +11,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Linux") endif () endif() -bambustudio_add_cmake_project(JPEG +orcaslicer_add_cmake_project(JPEG URL https://github.com/libjpeg-turbo/libjpeg-turbo/archive/refs/tags/2.0.6.zip URL_HASH SHA256=017bdc33ff3a72e11301c0feb4657cb27719d7f97fa67a78ed506c594218bbf1 DEPENDS ${ZLIB_PKG} diff --git a/deps/NLopt/NLopt.cmake b/deps/NLopt/NLopt.cmake index daa7ac7facc..fdd6341f2b0 100644 --- a/deps/NLopt/NLopt.cmake +++ b/deps/NLopt/NLopt.cmake @@ -1,4 +1,4 @@ -bambustudio_add_cmake_project(NLopt +orcaslicer_add_cmake_project(NLopt URL "https://github.com/stevengj/nlopt/archive/v2.5.0.tar.gz" URL_HASH SHA256=c6dd7a5701fff8ad5ebb45a3dc8e757e61d52658de3918e38bab233e7fd3b4ae CMAKE_ARGS diff --git a/deps/OCCT/OCCT.cmake b/deps/OCCT/OCCT.cmake index b1b4fd3ef8c..541412b1cab 100644 --- a/deps/OCCT/OCCT.cmake +++ b/deps/OCCT/OCCT.cmake @@ -8,7 +8,7 @@ endif() # get relative path of CMAKE_BINARY_DIR against root source directory file(RELATIVE_PATH BINARY_DIR_REL ${CMAKE_SOURCE_DIR}/.. ${CMAKE_BINARY_DIR}) -bambustudio_add_cmake_project(OCCT +orcaslicer_add_cmake_project(OCCT URL https://github.com/Open-Cascade-SAS/OCCT/archive/refs/tags/V7_6_0.zip URL_HASH SHA256=28334f0e98f1b1629799783e9b4d21e05349d89e695809d7e6dfa45ea43e1dbc #PATCH_COMMAND ${PATCH_CMD} ${CMAKE_CURRENT_LIST_DIR}/0001-OCCT-fix.patch diff --git a/deps/OpenCSG/OpenCSG.cmake b/deps/OpenCSG/OpenCSG.cmake index 477d50fa038..2181ba09556 100644 --- a/deps/OpenCSG/OpenCSG.cmake +++ b/deps/OpenCSG/OpenCSG.cmake @@ -1,5 +1,5 @@ -bambustudio_add_cmake_project(OpenCSG +orcaslicer_add_cmake_project(OpenCSG # GIT_REPOSITORY https://github.com/floriankirsch/OpenCSG.git # GIT_TAG 83e274457b46c9ad11a4ee599203250b1618f3b9 #v1.4.2 URL https://github.com/floriankirsch/OpenCSG/archive/refs/tags/opencsg-1-4-2-release.zip diff --git a/deps/OpenEXR/OpenEXR.cmake b/deps/OpenEXR/OpenEXR.cmake index 8caf0d978d6..6aea12b1f27 100644 --- a/deps/OpenEXR/OpenEXR.cmake +++ b/deps/OpenEXR/OpenEXR.cmake @@ -36,7 +36,7 @@ else () set(_patch_cmd "") endif () -bambustudio_add_cmake_project(OpenEXR +orcaslicer_add_cmake_project(OpenEXR # GIT_REPOSITORY https://github.com/openexr/openexr.git URL https://github.com/AcademySoftwareFoundation/openexr/archive/refs/tags/v2.5.5.zip URL_HASH SHA256=0307a3d7e1fa1e77e9d84d7e9a8694583fbbbfd50bdc6884e2c96b8ef6b902de diff --git a/deps/OpenVDB/OpenVDB.cmake b/deps/OpenVDB/OpenVDB.cmake index 3622d3c9d78..7080b8b5d5f 100644 --- a/deps/OpenVDB/OpenVDB.cmake +++ b/deps/OpenVDB/OpenVDB.cmake @@ -6,7 +6,7 @@ else() set(_build_static ON) endif() -bambustudio_add_cmake_project(OpenVDB +orcaslicer_add_cmake_project(OpenVDB # support vs2022, update to 8.2 URL https://github.com/tamasmeszaros/openvdb/archive/a68fd58d0e2b85f01adeb8b13d7555183ab10aa5.zip URL_HASH SHA256=f353e7b99bd0cbfc27ac9082de51acf32a8bc0b3e21ff9661ecca6f205ec1d81 diff --git a/deps/PNG/PNG.cmake b/deps/PNG/PNG.cmake index 5009317305a..313a147bab7 100644 --- a/deps/PNG/PNG.cmake +++ b/deps/PNG/PNG.cmake @@ -7,7 +7,7 @@ endif () if(APPLE AND IS_CROSS_COMPILE) # TODO: check if it doesn't create problem when compiling from arm to x86_64 - bambustudio_add_cmake_project(PNG + orcaslicer_add_cmake_project(PNG GIT_REPOSITORY https://github.com/glennrp/libpng.git GIT_TAG v1.6.35 DEPENDS ${ZLIB_PKG} @@ -26,7 +26,7 @@ set(_patch_step "") if (APPLE) set(_patch_step PATCH_COMMAND ${PATCH_CMD} ${CMAKE_CURRENT_LIST_DIR}/PNG.patch) endif () - bambustudio_add_cmake_project(PNG + orcaslicer_add_cmake_project(PNG # GIT_REPOSITORY https://github.com/glennrp/libpng.git # GIT_TAG v1.6.35 URL https://github.com/glennrp/libpng/archive/refs/tags/v1.6.35.zip diff --git a/deps/Qhull/Qhull.cmake b/deps/Qhull/Qhull.cmake index 497eb4b7cb1..9376700428f 100644 --- a/deps/Qhull/Qhull.cmake +++ b/deps/Qhull/Qhull.cmake @@ -1,5 +1,5 @@ include(GNUInstallDirs) -bambustudio_add_cmake_project(Qhull +orcaslicer_add_cmake_project(Qhull URL "https://github.com/qhull/qhull/archive/v8.0.1.zip" URL_HASH SHA256=5287f5edd6a0372588f5d6640799086a4033d89d19711023ef8229dd9301d69b CMAKE_ARGS diff --git a/deps/TBB/TBB.cmake b/deps/TBB/TBB.cmake index 87b76828a8a..6bf28ca2ec6 100644 --- a/deps/TBB/TBB.cmake +++ b/deps/TBB/TBB.cmake @@ -1,4 +1,4 @@ -bambustudio_add_cmake_project( +orcaslicer_add_cmake_project( TBB URL "https://github.com/oneapi-src/oneTBB/archive/refs/tags/v2021.5.0.zip" URL_HASH SHA256=83ea786c964a384dd72534f9854b419716f412f9d43c0be88d41874763e7bb47 diff --git a/deps/TIFF/TIFF.cmake b/deps/TIFF/TIFF.cmake index bdc91e54648..b9c004d65b4 100644 --- a/deps/TIFF/TIFF.cmake +++ b/deps/TIFF/TIFF.cmake @@ -2,7 +2,7 @@ find_package(OpenGL QUIET REQUIRED) if (APPLE) message(STATUS "Compiling TIFF for macos ${CMAKE_SYSTEM_VERSION}.") - bambustudio_add_cmake_project(TIFF + orcaslicer_add_cmake_project(TIFF URL https://gitlab.com/libtiff/libtiff/-/archive/v4.3.0/libtiff-v4.3.0.zip URL_HASH SHA256=4fca1b582c88319f3ad6ecd5b46320eadaf5eb4ef6f6c32d44caaae4a03d0726 DEPENDS ${ZLIB_PKG} ${PNG_PKG} dep_JPEG @@ -14,7 +14,7 @@ if (APPLE) -Dpixarlog:BOOL=OFF ) else() - bambustudio_add_cmake_project(TIFF + orcaslicer_add_cmake_project(TIFF URL https://gitlab.com/libtiff/libtiff/-/archive/v4.1.0/libtiff-v4.1.0.zip URL_HASH SHA256=c56edfacef0a60c0de3e6489194fcb2f24c03dbb550a8a7de5938642d045bd32 DEPENDS ${ZLIB_PKG} ${PNG_PKG} dep_JPEG diff --git a/deps/ZLIB/ZLIB.cmake b/deps/ZLIB/ZLIB.cmake index 14da43c72ed..63002f94608 100644 --- a/deps/ZLIB/ZLIB.cmake +++ b/deps/ZLIB/ZLIB.cmake @@ -1,4 +1,4 @@ -bambustudio_add_cmake_project(ZLIB +orcaslicer_add_cmake_project(ZLIB # GIT_REPOSITORY https://github.com/madler/zlib.git # GIT_TAG v1.2.11 URL https://github.com/madler/zlib/archive/refs/tags/v1.2.11.zip diff --git a/deps/wxWidgets/wxWidgets.cmake b/deps/wxWidgets/wxWidgets.cmake index 7af0d602c17..82c0f9f8658 100644 --- a/deps/wxWidgets/wxWidgets.cmake +++ b/deps/wxWidgets/wxWidgets.cmake @@ -26,7 +26,7 @@ if (CMAKE_SYSTEM_NAME STREQUAL "Linux") set(_patch_cmd ${PATCH_CMD} ${CMAKE_CURRENT_LIST_DIR}/0001-wxWidget-fix.patch) endif () -bambustudio_add_cmake_project( +orcaslicer_add_cmake_project( wxWidgets GIT_REPOSITORY "https://github.com/wxWidgets/wxWidgets" GIT_TAG ${_wx_git_tag} diff --git a/doc/Localization_guide.md b/doc/Localization_guide.md index cf398b24188..5949de03db6 100644 --- a/doc/Localization_guide.md +++ b/doc/Localization_guide.md @@ -12,24 +12,24 @@ Full manual for GNUgettext can be seen here: http://www.gnu.org/software/gettext ### Scenario 1. How do I add a translation or fix an existing translation -1. Get PO-file 'BambuStudio_xx.pot' from corresponding sub-folder here: -https://github.com/bambulab/BambuStudio/tree/master/bbl/i18n +1. Get PO-file 'OrcaSlicer_xx.pot' from corresponding sub-folder here: +https://github.com/softfever/OrcaSlicer/tree/master/localization/i18n 2. Open this file in PoEdit as "Edit a translation" 3. Apply your corrections to the translation -4. Push changed BambuStudio_xx.po into the original folder -5. copy BambuStudio_xx.mo into resources/i18n/xx and rename it to BambuStudio.mo, then push the changed file. +4. Push changed OrcaSlicer_xx.po into the original folder +5. copy OrcaSlicer_xx.mo into resources/i18n/xx and rename it to OrcaSlicer.mo, then push the changed file. ### Scenario 2. How do I add a new language support -1. Get file BambuStudio.pot here : -https://github.com/bambulab/BambuStudio/tree/master/bbl/i18n +1. Get file OrcaSlicer.pot here : +https://github.com/softfever/OrcaSlicer/tree/master/localization/i18n 2. Open it in PoEdit for "Create new translation" 3. Select Translation Language (for example French). 4. As a result you will have fr.po - the file containing translation to French. Notice. When the translation is complete you need to: - - Rename the file to BambuStudio_fr.po - - Click "Save file" button. BambuStudio_fr.mo will be created immediately - - Bambu_Studio_fr.po needs to be copied into the sub-folder fr of https://github.com/bambulab/BambuStudio/tree/master/bbl/i18n, and be pushed - - copy BambuStudio_xx.mo into resources/i18n/xx and rename it to BambuStudio.mo, then push the changed file. + - Rename the file to OrcaSlicer_fr.po + - Click "Save file" button. OrcaSlicer_fr.mo will be created immediately + - Bambu_Studio_fr.po needs to be copied into the sub-folder fr of https://github.com/softfever/OrcaSlicer/tree/master/localization/i18n, and be pushed + - copy OrcaSlicer_xx.mo into resources/i18n/xx and rename it to OrcaSlicer.mo, then push the changed file. ( name of folder "fr" means "French" - the translation language). ### Scenario 3. How do I add a new text resource when implementing a feature to Orca Slicer @@ -43,11 +43,11 @@ If you add new file resource, add it to the list of files containing macro `L()` ### Scenario 4. How do I use GNUgettext to localize my own application taking Orca Slicer as an example 1. For convenience create a list of files with this macro `L(s)`. We have -https://github.com/bambulab/BambuStudio/blob/master/bbl/i18n/list.txt. +https://github.com/softfever/OrcaSlicer/blob/master/localization/i18n/list.txt. 2. Create template file(*.POT) with GNUgettext command: ``` - xgettext --keyword=L --add-comments=TRN --from-code=UTF-8 --debug -o BambuStudio.pot -f list.txt + xgettext --keyword=L --add-comments=TRN --from-code=UTF-8 --debug -o OrcaSlicer.pot -f list.txt ``` Use flag `--from-code=UTF-8` to specify that the source strings are in UTF-8 encoding diff --git a/localazy.json b/localazy.json index ee618c80a0f..7bd86e4f84b 100644 --- a/localazy.json +++ b/localazy.json @@ -6,58 +6,58 @@ "files": [ { "type": "po", - "pattern": "bbl/i18n/en/OrcaSlicer_en.po", + "pattern": "localization/i18n/en/OrcaSlicer_en.po", "lang": "en" }, { "type": "po", - "pattern": "bbl/i18n/fr/OrcaSlicer_fr.po", + "pattern": "localization/i18n/fr/OrcaSlicer_fr.po", "lang": "fr" }, { "type": "po", - "pattern": "bbl/i18n/de/OrcaSlicer_de.po", + "pattern": "localization/i18n/de/OrcaSlicer_de.po", "lang": "de" }, { "type": "po", - "pattern": "bbl/i18n/sv/OrcaSlicer_sv.po", + "pattern": "localization/i18n/sv/OrcaSlicer_sv.po", "lang": "sv" }, { "type": "po", - "pattern": "bbl/i18n/es/OrcaSlicer_es.po", + "pattern": "localization/i18n/es/OrcaSlicer_es.po", "lang": "es" }, { "type": "po", - "pattern": "bbl/i18n/nl/OrcaSlicer_nl.po", + "pattern": "localization/i18n/nl/OrcaSlicer_nl.po", "lang": "nl" }, { "type": "po", - "pattern": "bbl/i18n/hu/OrcaSlicer_hu.po", + "pattern": "localization/i18n/hu/OrcaSlicer_hu.po", "lang": "hu" }, { "type": "po", - "pattern": "bbl/i18n/ja/OrcaSlicer_ja.po", + "pattern": "localization/i18n/ja/OrcaSlicer_ja.po", "lang": "ja" }, { "type": "po", - "pattern": "bbl/i18n/ko/OrcaSlicer_ko.po", + "pattern": "localization/i18n/ko/OrcaSlicer_ko.po", "lang": "ko" }, { "type": "po", - "pattern": "bbl/i18n/ru/OrcaSlicer_ru.po", + "pattern": "localization/i18n/ru/OrcaSlicer_ru.po", "lang": "ru" } ] }, "download": { - "folder": "bbl/i18n", + "folder": "localization/i18n", "includeSourceLang" : "true", "files": { "output": "${lang}/OrcaSlicer_${lang}.po" diff --git a/bbl/i18n/OrcaSlicer.pot b/localization/i18n/OrcaSlicer.pot similarity index 99% rename from bbl/i18n/OrcaSlicer.pot rename to localization/i18n/OrcaSlicer.pot index 2a010939bfe..fa64204b2c8 100644 --- a/bbl/i18n/OrcaSlicer.pot +++ b/localization/i18n/OrcaSlicer.pot @@ -3369,7 +3369,7 @@ msgstr "" msgid "" "Another virtual camera is running.\n" -"Bambu Studio supports only a single virtual camera.\n" +"Bambulab printer supports only a single virtual camera.\n" "Do you want to stop this virtual camera?" msgstr "" diff --git a/bbl/i18n/cs/OrcaSlicer_cs.po b/localization/i18n/cs/OrcaSlicer_cs.po old mode 100755 new mode 100644 similarity index 99% rename from bbl/i18n/cs/OrcaSlicer_cs.po rename to localization/i18n/cs/OrcaSlicer_cs.po index aba1e864cca..5316a3b9376 --- a/bbl/i18n/cs/OrcaSlicer_cs.po +++ b/localization/i18n/cs/OrcaSlicer_cs.po @@ -3580,11 +3580,11 @@ msgstr "Stahování nástrojů virtuální kamery" msgid "" "Another virtual camera is running.\n" -"Bambu Studio supports only a single virtual camera.\n" +"Bambulab printer supports only a single virtual camera.\n" "Do you want to stop this virtual camera?" msgstr "" "Je spuštěna další virtuální kamera.\n" -"Bambu Studio podporuje pouze jednu virtuální kameru.\n" +"Orca Slicer podporuje pouze jednu virtuální kameru.\n" "Chcete zastavit tuto virtuální kameru?" #, c-format, boost-format diff --git a/bbl/i18n/de/OrcaSlicer_de.po b/localization/i18n/de/OrcaSlicer_de.po similarity index 99% rename from bbl/i18n/de/OrcaSlicer_de.po rename to localization/i18n/de/OrcaSlicer_de.po index 27c2d88f27e..0d554b99cd9 100644 --- a/bbl/i18n/de/OrcaSlicer_de.po +++ b/localization/i18n/de/OrcaSlicer_de.po @@ -3657,11 +3657,11 @@ msgstr "Herunterladen des virtuellen Kameratools" msgid "" "Another virtual camera is running.\n" -"Bambu Studio supports only a single virtual camera.\n" +"Bambulab printer supports only a single virtual camera.\n" "Do you want to stop this virtual camera?" msgstr "" "Eine weitere virtuelle Kamera wird verwendet.\n" -"Bambu Studio unterstützt nur eine einzige virtuelle Kamera.\n" +"Orca Slicer unterstützt nur eine einzige virtuelle Kamera.\n" "Möchten Sie diese virtuelle Kamera stoppen?" #, c-format, boost-format @@ -4696,7 +4696,7 @@ msgid "" "on Orca Slicer(windows) or CAD softwares." msgstr "" "Die Funktion \"Modell reparieren\" ist derzeit nur unter Windows verfügbar. " -"Bitte reparieren Sie das Modell in Bambu Studio (Windows) oder CAD-Software." +"Bitte reparieren Sie das Modell in Orca Slicer (Windows) oder CAD-Software." #, c-format, boost-format msgid "" @@ -10418,7 +10418,7 @@ msgstr "" "Ein Teil subtrahieren\n" "Wussten Sie, dass Sie mit dem \"negatives Teil Modifikator\" ein Netz von " "einem anderen subtrahieren können? Auf diese Weise können Sie z.B. leicht " -"veränderbare Löcher direkt in Bambu Studio erstellen. Lesen Sie mehr dazu in " +"veränderbare Löcher direkt in Orca Slicer erstellen. Lesen Sie mehr dazu in " "der Dokumentation." #: resources/data/hints.ini: [hint:STEP] @@ -10432,7 +10432,7 @@ msgstr "" "STEP\n" "Wussten Sie, dass Sie Ihre Druckqualität verbessern können, indem Sie eine " "STEP-Datei anstelle einer STL-Datei slicen?\n" -"Bambu Studio unterstützt das Slicen von STEP-Dateien und liefert glattere " +"Orca Slicer unterstützt das Slicen von STEP-Dateien und liefert glattere " "Ergebnisse als eine STL mit geringerer Auflösung. Probiere es aus!" #: resources/data/hints.ini: [hint:Z seam location] @@ -10578,14 +10578,14 @@ msgid "Internal Version" msgstr "Interne Version" msgid "" -"BambuStudio will terminate because of running out of memory.It may be a bug. " +"OrcaSlicer will terminate because of running out of memory.It may be a bug. " "It will be appreciated if you report the issue to our team." msgstr "" "BambuStudio wird wegen Arbeitsspeichermangels beendet, was ein Bug sein " "kann. Bitte melden Sie diesen Fehler dem technischen Support." msgid "" -"BambuStudio will terminate because of a localization error. It will be " +"OrcaSlicer will terminate because of a localization error. It will be " "appreciated if you report the specific scenario this issue happened." msgstr "BambuStudio wird aufgrund eines Lokalisierungsfehlers beendet." @@ -10601,14 +10601,14 @@ msgstr "" "nicht geladen werden. Bitte löschen Sie die Datei und versuchen Sie es " "erneut." -msgid "The Bambu Studio needs an upgrade" -msgstr "Bambu Studio benötigt ein Upgrade" +msgid "The Orca Slicer needs an upgrade" +msgstr "Orca Slicer benötigt ein Upgrade" msgid "Choose one file (gcode/.gco/.g/.ngc/ngc):" msgstr "Wählen Sie eine Datei (gcode/.gco/.g/.ngc/ngc):" -msgid "Bambu Studio GUI initialization failed" -msgstr "Initialisierung der Bambu Studio GUI ist fehlgeschlagen" +msgid "Orca Slicer GUI initialization failed" +msgstr "Initialisierung der Orca Slicer GUI ist fehlgeschlagen" msgid "Bambu Cube" msgstr "" @@ -10715,25 +10715,25 @@ msgstr "" msgid "Successfully sent. Will automatically jump to the next page in %ss" msgstr "" -msgid "Bambu Studio is licensed under " -msgstr "Bambu Studio ist lizenziert unter " +msgid "Orca Slicer is licensed under " +msgstr "Orca Slicer ist lizenziert unter " msgid "" -"Bambu Studio is based on PrusaSlicer by Prusa Research, which is from Slic3r " +"Orca Slicer is based on PrusaSlicer by Prusa Research, which is from Slic3r " "by Alessandro Ranellucci and the RepRap community" msgstr "" -"Bambu Studio basiert auf PrusaSlicer von Prusa Research, das von Slic3r von " +"Orca Slicer basiert auf PrusaSlicer von Prusa Research, das von Slic3r von " "Alessandro Ranellucci und der RepRap Community stammt." msgid "" -"Bambu Studio is based on PrusaSlicer by PrusaResearch and SuperSlicer by " +"Orca Slicer is based on PrusaSlicer by PrusaResearch and SuperSlicer by " "Merill(supermerill)." msgstr "" -"Bambu Studio basiert auf PrusaSlicer von PrusaResearch und SuperSlicer von " +"Orca Slicer basiert auf PrusaSlicer von PrusaResearch und SuperSlicer von " "Merill(supermerill)." -msgid "Bambu Studio also referenced some ideas from Cura by Ultimaker." -msgstr "Bambu Studio bezog sich auch auf einige Ideen aus Cura von Ultimaker." +msgid "Orca Slicer also referenced some ideas from Cura by Ultimaker." +msgstr "Orca Slicer bezog sich auch auf einige Ideen aus Cura von Ultimaker." msgid "" "There many parts of the software that come from community contributions, so " @@ -10853,7 +10853,7 @@ msgid "Failed to parse model infomations." msgstr "Modellinformationen konnten nicht analysiert werden" msgid "" -"The .gcode.3mf file contains no G-code data.Please slice it whthBambu Studio " +"The .gcode.3mf file contains no G-code data.Please slice it whthOrca Slicer " "and export a new .gcode.3mf file." msgstr "" @@ -10879,27 +10879,27 @@ msgstr "" msgid "" "There are some unknown or uncompatible filaments mapped to generic preset. " -"Please update Bambu Studio or restart Bambu Studio to check if there is an " +"Please update Orca Slicer or restart Orca Slicer to check if there is an " "update to system presets." msgstr "" -msgid "The 3mf is generated by old Bambu Studio, load geometry data only." +msgid "The 3mf is generated by old Orca Slicer, load geometry data only." msgstr "" -"Die 3mf wurde mit einer alten Version von Bambu Studio erzeugt, nur " +"Die 3mf wurde mit einer alten Version von Orca Slicer erzeugt, nur " "Geometriedaten werden geladen." msgid "" "\"Fix Model\" feature is currently only on Windows. Please repair the model " -"on Bambu Studio(windows) or CAD softwares." +"on Orca Slicer(windows) or CAD softwares." msgstr "" "Die Funktion \"Modell reparieren\" ist derzeit nur unter Windows verfügbar. " -"Bitte reparieren Sie das Modell in Bambu Studio (Windows) oder CAD-Software." +"Bitte reparieren Sie das Modell in Orca Slicer (Windows) oder CAD-Software." msgid "Associate files to BambuStudio" msgstr "Dateien mit BambuStudio verknüpfen" msgid "Associate .3mf files to BambuStudio" -msgstr ".3mf-Dateien mit Bambu Studio verknüpfen" +msgstr ".3mf-Dateien mit Orca Slicer verknüpfen" msgid "If enabled, sets BambuStudio as default application to open .3mf files" msgstr "" @@ -10987,8 +10987,8 @@ msgstr "" msgid "Automatic flow calibration using Micro Lidar" msgstr "" -msgid "The printer is required to be in the same LAN as Bambu Studio." -msgstr "Der Drucker muss sich im selben LAN befinden wie Bambu Studio." +msgid "The printer is required to be in the same LAN as Orca Slicer." +msgstr "Der Drucker muss sich im selben LAN befinden wie Orca Slicer." msgid "Failed to create socket" msgstr "Socket konnte nicht erstellt werden" @@ -11085,18 +11085,18 @@ msgid "Cool Plate / PLA Plate" msgstr "Cool Plate / PLA Plate" msgid "" -"Click OK to update the Network plug-in when Bambu Studio launches next time." +"Click OK to update the Network plug-in when Orca Slicer launches next time." msgstr "" "Klicken Sie auf OK, um das Netzwerk-Plugin beim nächsten Start von Bambu " "Studio zu aktualisieren." -msgid "New version of Bambu Studio" -msgstr "Neue Version von Bambu Studio" +msgid "New version of Orca Slicer" +msgstr "Neue Version von Orca Slicer" msgid "" -"Step 1, please confirm Bambu Studio and your printer are in the same LAN." +"Step 1, please confirm Orca Slicer and your printer are in the same LAN." msgstr "" -"Schritt 1: Vergewissern Sie sich, dass Bambu Studio und Ihr Drucker sich im " +"Schritt 1: Vergewissern Sie sich, dass Orca Slicer und Ihr Drucker sich im " "selben LAN befinden." #, boost-format @@ -11684,12 +11684,12 @@ msgid "" "Subtract a Part\n" "Did you know that you can subtract one mesh from another using the Negative " "part modifier? That way you can, for example, create easily resizable holes " -"directly in Bambu Studio. Read more in the documentation." +"directly in Orca Slicer. Read more in the documentation." msgstr "" "Ein Teil subtrahieren\n" "Wussten Sie, dass Sie mit dem \"negatives Teil Modifikator\" ein Netz von " "einem anderen subtrahieren können? Auf diese Weise können Sie z.B. leicht " -"veränderbare Löcher direkt in Bambu Studio erstellen. Lesen Sie mehr dazu in " +"veränderbare Löcher direkt in Orca Slicer erstellen. Lesen Sie mehr dazu in " "der Dokumentation." #: resources/data/hints.ini: [hint:STEP] @@ -11697,13 +11697,13 @@ msgid "" "STEP\n" "Did you know that you can improve your print quality by slicing a STEP file " "instead of an STL?\n" -"Bambu Studio supports slicing STEP files, providing smoother results than a " +"Orca Slicer supports slicing STEP files, providing smoother results than a " "lower resolution STL. Give it a try!" msgstr "" "STEP\n" "Wussten Sie, dass Sie Ihre Druckqualität verbessern können, indem Sie eine " "STEP-Datei anstelle einer STL-Datei slicen?\n" -"Bambu Studio unterstützt das Slicen von STEP-Dateien und liefert glattere " +"Orca Slicer unterstützt das Slicen von STEP-Dateien und liefert glattere " "Ergebnisse als eine STL mit geringerer Auflösung. Probiere es aus!" #~ msgid "ERROR:" @@ -11915,11 +11915,11 @@ msgstr "" #~ "der linken Abbildung aus und tragen Sie diese in die Eingabefelder ein." #~ msgid "" -#~ "Cannot detect the LAN IP address of %s. Are %s and Bambu Studio in the " +#~ "Cannot detect the LAN IP address of %s. Are %s and Orca Slicer in the " #~ "same LAN?" #~ msgstr "" #~ "Die LAN-IP-Adresse von %s kann nicht erkannt werden. Befinden sich %s und " -#~ "Bambu Studio im selben LAN?" +#~ "Orca Slicer im selben LAN?" #~ msgid "Choose one or more files (3mf/step/stl/obj/amf):" #~ msgstr "Wählen Sie eine oder mehrere Dateien aus (3mf/step/stl/obj/amf):" @@ -12734,11 +12734,11 @@ msgstr "" #~ msgid "" #~ "There are some unknown filaments mapped to generic preset. Please update " -#~ "Bambu Studio or restart Bambu Studio to check if there is an update to " +#~ "Orca Slicer or restart Orca Slicer to check if there is an update to " #~ "system presets." #~ msgstr "" #~ "Es gibt einige unbekannte Filamente, die generischen Profilen zugewiesen " -#~ "sind. Bitte aktualisieren Sie Bambu Studio oder starten Sie Bambu Studio " +#~ "sind. Bitte aktualisieren Sie Orca Slicer oder starten Sie Orca Slicer " #~ "neu, um zu prüfen, ob es ein Update der Systemvorgaben gibt." #~ msgid "" diff --git a/bbl/i18n/en/OrcaSlicer_en.po b/localization/i18n/en/OrcaSlicer_en.po similarity index 99% rename from bbl/i18n/en/OrcaSlicer_en.po rename to localization/i18n/en/OrcaSlicer_en.po index 249a95e8d77..aefca3fcc68 100644 --- a/bbl/i18n/en/OrcaSlicer_en.po +++ b/localization/i18n/en/OrcaSlicer_en.po @@ -3507,11 +3507,11 @@ msgstr "Downloading Virtual Camera Tools" msgid "" "Another virtual camera is running.\n" -"Bambu Studio supports only a single virtual camera.\n" +"Bambulab printer supports only a single virtual camera.\n" "Do you want to stop this virtual camera?" msgstr "" "Another virtual camera is running.\n" -"Bambu Studio supports only a single virtual camera.\n" +"Bambulab printer supports only a single virtual camera.\n" "Do you want to stop this virtual camera?" #, c-format, boost-format @@ -6116,7 +6116,7 @@ msgid "" msgstr "" "The firmware version is abnormal. Repairing and updating are required before " "printing. Do you want to update now? You can also update later on the " -"printer or update next time you start Bambu Studio." +"printer or update next time you start Orca Slicer." msgid "Extension Board" msgstr "Extension Board" @@ -9998,11 +9998,11 @@ msgstr "" msgid "Internal Version" msgstr "Internal Version" -msgid "The Bambu Studio needs an upgrade" -msgstr "Bambu Studio needs an update" +msgid "The Orca Slicer needs an upgrade" +msgstr "Orca Slicer needs an update" -msgid "Bambu Studio GUI initialization failed" -msgstr "Bambu Studio GUI initialization failed" +msgid "Orca Slicer GUI initialization failed" +msgstr "Orca Slicer GUI initialization failed" msgid "Bambu Cube" msgstr "" @@ -10104,25 +10104,25 @@ msgstr "" msgid "Successfully sent. Will automatically jump to the next page in %ss" msgstr "" -msgid "Bambu Studio is licensed under " -msgstr "Bambu Studio is licensed under " +msgid "Orca Slicer is licensed under " +msgstr "Orca Slicer is licensed under " msgid "" -"Bambu Studio is based on PrusaSlicer by Prusa Research, which is from Slic3r " +"Orca Slicer is based on PrusaSlicer by Prusa Research, which is from Slic3r " "by Alessandro Ranellucci and the RepRap community" msgstr "" -"Bambu Studio is based on PrusaSlicer by Prusa Research, which is based on " +"Orca Slicer is based on PrusaSlicer by Prusa Research, which is based on " "Slic3r by Alessandro Ranellucci and the RepRap community" msgid "" -"Bambu Studio is based on PrusaSlicer by PrusaResearch and SuperSlicer by " +"Orca Slicer is based on PrusaSlicer by PrusaResearch and SuperSlicer by " "Merill(supermerill)." msgstr "" -"Bambu Studio is based on PrusaSlicer by PrusaResearch and SuperSlicer by " +"Orca Slicer is based on PrusaSlicer by PrusaResearch and SuperSlicer by " "Merill(supermerill)." -msgid "Bambu Studio also referenced some ideas from Cura by Ultimaker." -msgstr "Bambu Studio also referenced some ideas from Cura by Ultimaker." +msgid "Orca Slicer also referenced some ideas from Cura by Ultimaker." +msgstr "Orca Slicer also referenced some ideas from Cura by Ultimaker." msgid "" "There many parts of the software that come from community contributions, so " @@ -10234,7 +10234,7 @@ msgid "Failed to parse model infomations." msgstr "Failed to parse model infomation" msgid "" -"The .gcode.3mf file contains no G-code data.Please slice it whthBambu Studio " +"The .gcode.3mf file contains no G-code data.Please slice it whthOrca Slicer " "and export a new .gcode.3mf file." msgstr "" @@ -10259,47 +10259,47 @@ msgstr "" msgid "" "There are some unknown or uncompatible filaments mapped to generic preset. " -"Please update Bambu Studio or restart Bambu Studio to check if there is an " +"Please update Orca Slicer or restart Orca Slicer to check if there is an " "update to system presets." msgstr "" -msgid "The 3mf is generated by old Bambu Studio, load geometry data only." +msgid "The 3mf is generated by old Orca Slicer, load geometry data only." msgstr "" -"The 3mf was generated by an old version of Bambu Studio, loading geometry " +"The 3mf was generated by an old version of Orca Slicer, loading geometry " "data only." msgid "" "\"Fix Model\" feature is currently only on Windows. Please repair the model " -"on Bambu Studio(windows) or CAD softwares." +"on Orca Slicer(windows) or CAD softwares." msgstr "" "The \"Fix Model\" feature is currently only on Windows. Please repair the " -"model in Bambu Studio (Windows) or CAD software." +"model in Orca Slicer (Windows) or CAD software." msgid "Associate files to BambuStudio" -msgstr "Associate files to Bambu Studio" +msgstr "Associate files to Orca Slicer" msgid "Associate .3mf files to BambuStudio" -msgstr "Associate .3mf files to Bambu Studio" +msgstr "Associate .3mf files to Orca Slicer" msgid "If enabled, sets BambuStudio as default application to open .3mf files" msgstr "" -"If enabled, this sets Bambu Studio as the default application to open .3mf " +"If enabled, this sets Orca Slicer as the default application to open .3mf " "files." msgid "Associate .stl files to BambuStudio" -msgstr "Associate .stl files to Bambu Studio" +msgstr "Associate .stl files to Orca Slicer" msgid "If enabled, sets BambuStudio as default application to open .stl files" msgstr "" -"If enabled, this sets Bambu Studio as the default application to open .stl " +"If enabled, this sets Orca Slicer as the default application to open .stl " "files." msgid "Associate .step/.stp files to BambuStudio" -msgstr "Associate .step/.stp files to Bambu Studio" +msgstr "Associate .step/.stp files to Orca Slicer" msgid "If enabled, sets BambuStudio as default application to open .step files" msgstr "" -"If enabled, this sets Bambu Studio as the default application to open .step " +"If enabled, this sets Orca Slicer as the default application to open .step " "files." msgid "Online Models" @@ -10365,8 +10365,8 @@ msgstr "" msgid "Automatic flow calibration using Micro Lidar" msgstr "" -msgid "The printer is required to be in the same LAN as Bambu Studio." -msgstr "The printer is required to be on the same LAN as Bambu Studio." +msgid "The printer is required to be in the same LAN as Orca Slicer." +msgstr "The printer is required to be on the same LAN as Orca Slicer." msgid "Failed to create socket" msgstr "Failed to create socket" @@ -10462,17 +10462,17 @@ msgid "Cool Plate / PLA Plate" msgstr "Cool Plate / PLA Plate" msgid "" -"Click OK to update the Network plug-in when Bambu Studio launches next time." +"Click OK to update the Network plug-in when Orca Slicer launches next time." msgstr "" -"Click OK to update the Network plug-in the next time Bambu Studio launches." +"Click OK to update the Network plug-in the next time Orca Slicer launches." -msgid "New version of Bambu Studio" -msgstr "New version of Bambu Studio" +msgid "New version of Orca Slicer" +msgstr "New version of Orca Slicer" msgid "" -"Step 1, please confirm Bambu Studio and your printer are in the same LAN." +"Step 1, please confirm Orca Slicer and your printer are in the same LAN." msgstr "" -"Step 1, please confirm that Bambu Studio and your printer are on the same " +"Step 1, please confirm that Orca Slicer and your printer are on the same " "LAN." msgid "" @@ -10583,7 +10583,7 @@ msgid "" msgstr "" "This connects a sparse infill line to an internal perimeter with a short " "segment of an additional perimeter. If expressed as percentage (example: " -"15%) it is calculated over sparse infill line width. Bambu Studio tries to " +"15%) it is calculated over sparse infill line width. Orca Slicer tries to " "connect two close infill lines to a short perimeter segment. If no such " "perimeter segment shorter than infill_anchor_max is found, the infill line " "is connected to a perimeter segment at just one side and the length of the " @@ -10606,7 +10606,7 @@ msgid "" msgstr "" "This connects a sparse infill line to an internal perimeter with a short " "segment of an additional perimeter. If expressed as percentage (example: " -"15%) it is calculated over sparse infill line width. Bambu Studio tries to " +"15%) it is calculated over sparse infill line width. Orca Slicer tries to " "connect two close infill lines to a short perimeter segment. If no such " "perimeter segment shorter than this parameter is found, the infill line is " "connected to a perimeter segment at just one side and the length of the " @@ -11045,25 +11045,25 @@ msgid "" "Subtract a Part\n" "Did you know that you can subtract one mesh from another using the Negative " "part modifier? That way you can, for example, create easily resizable holes " -"directly in Bambu Studio. Read more in the documentation." +"directly in Orca Slicer. Read more in the documentation." msgstr "" "Subtract a Part\n" "Did you know that you can subtract one mesh from another using the Negative " "part modifier? That way you can, for example, create easily resizable holes " -"directly in Bambu Studio. Read more in the documentation." +"directly in Orca Slicer. Read more in the documentation." #: resources/data/hints.ini: [hint:STEP] msgid "" "STEP\n" "Did you know that you can improve your print quality by slicing a STEP file " "instead of an STL?\n" -"Bambu Studio supports slicing STEP files, providing smoother results than a " +"Orca Slicer supports slicing STEP files, providing smoother results than a " "lower resolution STL. Give it a try!" msgstr "" "STEP\n" "Did you know that you can improve your print quality by slicing a STEP file " "instead of an STL?\n" -"Bambu Studio supports slicing STEP files, providing smoother results than a " +"Orca Slicer supports slicing STEP files, providing smoother results than a " "lower resolution STL. Give it a try!" #~ msgid "Ams filament backup" @@ -11193,14 +11193,14 @@ msgstr "" #~ "Slicer." #~ msgid "" -#~ "BambuStudio will terminate because of running out of memory.It may be a " +#~ "OrcaSlicer will terminate because of running out of memory.It may be a " #~ "bug. It will be appreciated if you report the issue to our team." #~ msgstr "" #~ "Orca Slicer has run out of memory and will close. This may be a bug. " #~ "Please report this error to Technical Support." #~ msgid "" -#~ "BambuStudio will terminate because of a localization error. It will be " +#~ "OrcaSlicer will terminate because of a localization error. It will be " #~ "appreciated if you report the specific scenario this issue happened." #~ msgstr "A localization error has occurred, and Orca Slicer will close. " @@ -11941,10 +11941,10 @@ msgstr "" #~ "figure and fill them in the input boxes." #~ msgid "" -#~ "Cannot detect the LAN IP address of %s. Are %s and Bambu Studio in the " +#~ "Cannot detect the LAN IP address of %s. Are %s and Orca Slicer in the " #~ "same LAN?" #~ msgstr "" -#~ "Cannot detect the LAN IP address of %s. Are %s and Bambu Studio in the " +#~ "Cannot detect the LAN IP address of %s. Are %s and Orca Slicer in the " #~ "same LAN?" #~ msgid "Choose save directory" @@ -12233,11 +12233,11 @@ msgstr "" #~ msgid "" #~ "There are some unknown filaments mapped to generic preset. Please update " -#~ "Bambu Studio or restart Bambu Studio to check if there is an update to " +#~ "Orca Slicer or restart Orca Slicer to check if there is an update to " #~ "system presets." #~ msgstr "" #~ "There are some unknown filaments mapped to generic presets. Please update " -#~ "Bambu Studio or restart Bambu Studio to check if there is an update to " +#~ "Orca Slicer or restart Orca Slicer to check if there is an update to " #~ "system presets." #~ msgid "Timelapse without toolhead" diff --git a/bbl/i18n/es/OrcaSlicer_es.po b/localization/i18n/es/OrcaSlicer_es.po similarity index 99% rename from bbl/i18n/es/OrcaSlicer_es.po rename to localization/i18n/es/OrcaSlicer_es.po index f2ad854c3cb..3b3a603c85c 100644 --- a/bbl/i18n/es/OrcaSlicer_es.po +++ b/localization/i18n/es/OrcaSlicer_es.po @@ -3631,11 +3631,11 @@ msgstr "Descargando Herramientas de Cámara Virtual" msgid "" "Another virtual camera is running.\n" -"Bambu Studio supports only a single virtual camera.\n" +"Bambulab printer supports only a single virtual camera.\n" "Do you want to stop this virtual camera?" msgstr "" "Otra cámara virtual se está ejecutando.\n" -"Bambu Studio solo soporta una cámara virtual.\n" +"Orca Slicer solo soporta una cámara virtual.\n" "¿Desea detener esta cámara virtual?" #, c-format, boost-format @@ -10513,14 +10513,14 @@ msgid "Internal Version" msgstr "Versión interna" msgid "" -"BambuStudio will terminate because of running out of memory.It may be a bug. " +"OrcaSlicer will terminate because of running out of memory.It may be a bug. " "It will be appreciated if you report the issue to our team." msgstr "" "BambuStudio terminará porque se está quedando sin memoria. Le agradeceremos " "que comunique el problema a nuestro equipo." msgid "" -"BambuStudio will terminate because of a localization error. It will be " +"OrcaSlicer will terminate because of a localization error. It will be " "appreciated if you report the specific scenario this issue happened." msgstr "" "BambuStudio terminará debido a un error de localización. Le agradeceremos " @@ -10538,14 +10538,14 @@ msgstr "" "El archivo de configuración de BambuStudio puede estar dañado y no puede ser " "procesado." -msgid "The Bambu Studio needs an upgrade" -msgstr "Bambu Studio necesita una actualización" +msgid "The Orca Slicer needs an upgrade" +msgstr "Orca Slicer necesita una actualización" msgid "Choose one file (gcode/.gco/.g/.ngc/ngc):" msgstr "Elija un archivo (gcode/.gco/.g/.ngc/ngc):" -msgid "Bambu Studio GUI initialization failed" -msgstr "Ha fallado la inicialización de la interfaz gráfica de Bambu Studio" +msgid "Orca Slicer GUI initialization failed" +msgstr "Ha fallado la inicialización de la interfaz gráfica de Orca Slicer" msgid "Bambu Cube" msgstr "" @@ -10647,26 +10647,26 @@ msgstr "" msgid "Successfully sent. Will automatically jump to the next page in %ss" msgstr "" -msgid "Bambu Studio is licensed under " -msgstr "Bambu Studio tiene licencia bajo " +msgid "Orca Slicer is licensed under " +msgstr "Orca Slicer tiene licencia bajo " msgid "" -"Bambu Studio is based on PrusaSlicer by Prusa Research, which is from Slic3r " +"Orca Slicer is based on PrusaSlicer by Prusa Research, which is from Slic3r " "by Alessandro Ranellucci and the RepRap community" msgstr "" -"Bambu Studio se basa en PrusaSlicer de Prusa Research, que proviene de " +"Orca Slicer se basa en PrusaSlicer de Prusa Research, que proviene de " "Slic3r de Alessandro Ranellucci y la comunidad RepRap" msgid "" -"Bambu Studio is based on PrusaSlicer by PrusaResearch and SuperSlicer by " +"Orca Slicer is based on PrusaSlicer by PrusaResearch and SuperSlicer by " "Merill(supermerill)." msgstr "" -"Bambu Studio está basado en PrusaSlicer de PrusaResearch y SuperSlicer de " +"Orca Slicer está basado en PrusaSlicer de PrusaResearch y SuperSlicer de " "Merill (supermerill)." -msgid "Bambu Studio also referenced some ideas from Cura by Ultimaker." +msgid "Orca Slicer also referenced some ideas from Cura by Ultimaker." msgstr "" -"Bambu Studio también hace referencia a algunas ideas de Cura de Ultimaker." +"Orca Slicer también hace referencia a algunas ideas de Cura de Ultimaker." msgid "" "There many parts of the software that come from community contributions, so " @@ -10778,7 +10778,7 @@ msgid "Failed to parse model infomations." msgstr "Failed to parse model infomation" msgid "" -"The .gcode.3mf file contains no G-code data.Please slice it whthBambu Studio " +"The .gcode.3mf file contains no G-code data.Please slice it whthOrca Slicer " "and export a new .gcode.3mf file." msgstr "" @@ -10803,21 +10803,21 @@ msgstr "" msgid "" "There are some unknown or uncompatible filaments mapped to generic preset. " -"Please update Bambu Studio or restart Bambu Studio to check if there is an " +"Please update Orca Slicer or restart Orca Slicer to check if there is an " "update to system presets." msgstr "" -msgid "The 3mf is generated by old Bambu Studio, load geometry data only." +msgid "The 3mf is generated by old Orca Slicer, load geometry data only." msgstr "" -"3mf generado con versión antigua de Bambu Studio, se cargan datos de " +"3mf generado con versión antigua de Orca Slicer, se cargan datos de " "geometría unicamente." msgid "" "\"Fix Model\" feature is currently only on Windows. Please repair the model " -"on Bambu Studio(windows) or CAD softwares." +"on Orca Slicer(windows) or CAD softwares." msgstr "" "Actualmente, la función «Fix Model» solo está disponible en Windows. Repare " -"el modelo en Bambu Studio (Windows) o en el software CAD." +"el modelo en Orca Slicer (Windows) o en el software CAD." msgid "Associate files to BambuStudio" msgstr "Asociar archivos a BambuStudio" @@ -10909,8 +10909,8 @@ msgstr "" msgid "Automatic flow calibration using Micro Lidar" msgstr "" -msgid "The printer is required to be in the same LAN as Bambu Studio." -msgstr "La impresora debe estar en la misma LAN que Bambu Studio." +msgid "The printer is required to be in the same LAN as Orca Slicer." +msgstr "La impresora debe estar en la misma LAN que Orca Slicer." msgid "Failed to create socket" msgstr "Failed to create socket" @@ -11006,18 +11006,18 @@ msgid "Cool Plate / PLA Plate" msgstr "Cool Plate / PLA Plate" msgid "" -"Click OK to update the Network plug-in when Bambu Studio launches next time." +"Click OK to update the Network plug-in when Orca Slicer launches next time." msgstr "" "Haga clic en Aceptar para actualizar el complemento de red la próxima vez " -"que se inicie Bambu Studio." +"que se inicie Orca Slicer." -msgid "New version of Bambu Studio" -msgstr "Nueva versión de Bambu Studio" +msgid "New version of Orca Slicer" +msgstr "Nueva versión de Orca Slicer" msgid "" -"Step 1, please confirm Bambu Studio and your printer are in the same LAN." +"Step 1, please confirm Orca Slicer and your printer are in the same LAN." msgstr "" -"Paso 1: confirme que Bambu Studio y su impresora estén en la misma LAN." +"Paso 1: confirme que Orca Slicer y su impresora estén en la misma LAN." msgid "" "The following object(s) have empty initial layer and can't be printed. " @@ -11127,7 +11127,7 @@ msgid "" msgstr "" "This connects a sparse infill line to an internal perimeter with a short " "segment of an additional perimeter. If expressed as percentage (example: " -"15%) it is calculated over sparse infill line width. Bambu Studio tries to " +"15%) it is calculated over sparse infill line width. Orca Slicer tries to " "connect two close infill lines to a short perimeter segment. If no such " "perimeter segment shorter than infill_anchor_max is found, the infill line " "is connected to a perimeter segment at just one side and the length of the " @@ -11150,7 +11150,7 @@ msgid "" msgstr "" "This connects a sparse infill line to an internal perimeter with a short " "segment of an additional perimeter. If expressed as percentage (example: " -"15%) it is calculated over sparse infill line width. Bambu Studio tries to " +"15%) it is calculated over sparse infill line width. Orca Slicer tries to " "connect two close infill lines to a short perimeter segment. If no such " "perimeter segment shorter than this parameter is found, the infill line is " "connected to a perimeter segment at just one side and the length of the " @@ -11589,12 +11589,12 @@ msgid "" "Subtract a Part\n" "Did you know that you can subtract one mesh from another using the Negative " "part modifier? That way you can, for example, create easily resizable holes " -"directly in Bambu Studio. Read more in the documentation." +"directly in Orca Slicer. Read more in the documentation." msgstr "" "Restar una parte\n" "¿Sabías que puedes sustraer una malla de otra utilizando el modificador de " "pieza negativa? De esta forma puedes, por ejemplo, crear agujeros fácilmente " -"redimensionables directamente en Bambu Studio. Más información en la " +"redimensionables directamente en Orca Slicer. Más información en la " "documentación." #: resources/data/hints.ini: [hint:STEP] @@ -11602,13 +11602,13 @@ msgid "" "STEP\n" "Did you know that you can improve your print quality by slicing a STEP file " "instead of an STL?\n" -"Bambu Studio supports slicing STEP files, providing smoother results than a " +"Orca Slicer supports slicing STEP files, providing smoother results than a " "lower resolution STL. Give it a try!" msgstr "" "STEP\n" "¿Sabías que puedes mejorar la calidad de impresión cortando un archivo STEP " "en lugar de un STL?\n" -"Bambu Studio admite el corte de archivos STEP, lo que proporciona resultados " +"Orca Slicer admite el corte de archivos STEP, lo que proporciona resultados " "más suaves que un archivo STL de menor resolución. ¡Pruébalo!" #~ msgid "HRC" @@ -12409,10 +12409,10 @@ msgstr "" #~ "izquierda y rellénelos en las casillas de entrada." #~ msgid "" -#~ "Cannot detect the LAN IP address of %s. Are %s and Bambu Studio in the " +#~ "Cannot detect the LAN IP address of %s. Are %s and Orca Slicer in the " #~ "same LAN?" #~ msgstr "" -#~ "No se puede detectar la dirección IP LAN de %s. ¿Están %s y Bambu Studio " +#~ "No se puede detectar la dirección IP LAN de %s. ¿Están %s y Orca Slicer " #~ "en la misma LAN?" #~ msgid "Choose save directory" @@ -12732,11 +12732,11 @@ msgstr "" #~ msgid "" #~ "There are some unknown filaments mapped to generic preset. Please update " -#~ "Bambu Studio or restart Bambu Studio to check if there is an update to " +#~ "Orca Slicer or restart Orca Slicer to check if there is an update to " #~ "system presets." #~ msgstr "" #~ "Hay algunos filamentos desconocidos mapeados en ajustes preestablecidos " -#~ "genéricos. Actualice Bambu Studio o reinicie Bambu Studio para comprobar " +#~ "genéricos. Actualice Orca Slicer o reinicie Orca Slicer para comprobar " #~ "si hay alguna actualización en los ajustes preestablecidos del sistema." #~ msgid "Timelapse without toolhead" diff --git a/bbl/i18n/fr/OrcaSlicer_fr.po b/localization/i18n/fr/OrcaSlicer_fr.po similarity index 99% rename from bbl/i18n/fr/OrcaSlicer_fr.po rename to localization/i18n/fr/OrcaSlicer_fr.po index 20e99a2899d..96a38996388 100644 --- a/bbl/i18n/fr/OrcaSlicer_fr.po +++ b/localization/i18n/fr/OrcaSlicer_fr.po @@ -689,7 +689,7 @@ msgid "" "The version of Bambu studio is too low and needs to be updated to the latest " "version before it can be used normally" msgstr "" -"La version de Bambu Studio est trop ancienne et doit être mise à jour vers " +"La version de Orca Slicer est trop ancienne et doit être mise à jour vers " "la dernière version afin qu’il puisse être utilisé normalement" msgid "Login information expired. Please login again." @@ -1852,7 +1852,7 @@ msgid "" "by Prusa Research. PrusaSlicer is from Slic3r by Alessandro Ranellucci and " "the RepRap community" msgstr "" -"Orca Slicer est basé sur Bambu Studio de Bambulab qui a été développé sur la " +"Orca Slicer est basé sur Orca Slicer de Bambulab qui a été développé sur la " "base de PrusaSlicer de Prusa Research, qui est lui même développé sur la " "base de Slic3r par Alessandro Ranelucci et la communauté RepRap" @@ -1877,7 +1877,7 @@ msgid "OrcaSlicer is based on BambuStudio, PrusaSlicer, and SuperSlicer." msgstr "Orca Slicer est basé sur BambuStudio, PrusaSlicer, et SuperSlicer." msgid "BambuStudio is originally based on PrusaSlicer by PrusaResearch." -msgstr "Bambu Studio est basé sur PrusaSlicer de PrusaResearch." +msgstr "Orca Slicer est basé sur PrusaSlicer de PrusaResearch." msgid "PrusaSlicer is originally based on Slic3r by Alessandro Ranellucci." msgstr "PrusaSlicer est à l'origine basé sur Slic3r d'Alessandro Ranellucci." @@ -3636,11 +3636,11 @@ msgstr "Téléchargement de Virtual Camera Tools" msgid "" "Another virtual camera is running.\n" -"Bambu Studio supports only a single virtual camera.\n" +"Bambulab printer supports only a single virtual camera.\n" "Do you want to stop this virtual camera?" msgstr "" "Une autre caméra virtuelle est en cours d'exécution.\n" -"Bambu Studio ne prend en charge qu'une seule caméra virtuelle.\n" +"Orca Slicer ne prend en charge qu'une seule caméra virtuelle.\n" "Voulez-vous arrêter cette caméra virtuelle ?" #, c-format, boost-format @@ -6375,7 +6375,7 @@ msgstr "" "La version du firmware est anormale. Une réparation et une mise à jour sont " "nécessaires avant l'impression. Voulez-vous mettre à jour maintenant ? Vous " "pouvez également mettre à jour plus tard via l'imprimante ou au prochain " -"démarrage de Bambu Studio." +"démarrage de Orca Slicer." msgid "Extension Board" msgstr "Carte d'extension" @@ -10559,7 +10559,7 @@ msgid "Internal Version" msgstr "Version Interne" msgid "" -"BambuStudio will terminate because of running out of memory.It may be a bug. " +"OrcaSlicer will terminate because of running out of memory.It may be a bug. " "It will be appreciated if you report the issue to our team." msgstr "" "BambuStudio va se terminer à cause d'un manque de mémoire. Il peut s'agir " @@ -10567,7 +10567,7 @@ msgstr "" "équipe." msgid "" -"BambuStudio will terminate because of a localization error. It will be " +"OrcaSlicer will terminate because of a localization error. It will be " "appreciated if you report the specific scenario this issue happened." msgstr "" "BambuStudio va s'arrêter à cause d'une erreur de localisation. Il sera " @@ -10585,14 +10585,14 @@ msgstr "" "Le fichier de configuration de BambuStudio est peut-être corrompu et ne peut " "pas être analysé. Veuillez supprimer le fichier et réessayer." -msgid "The Bambu Studio needs an upgrade" -msgstr "Le Bambu Studio a besoin d'une mise à niveau" +msgid "The Orca Slicer needs an upgrade" +msgstr "Le Orca Slicer a besoin d'une mise à niveau" msgid "Choose one file (gcode/.gco/.g/.ngc/ngc):" msgstr "Choisissez un fichier (gcode/.gco/.g/.ngc/ngc) :" -msgid "Bambu Studio GUI initialization failed" -msgstr "L'initialisation de l'interface de Bambu Studio a échoué" +msgid "Orca Slicer GUI initialization failed" +msgstr "L'initialisation de l'interface de Orca Slicer a échoué" msgid "Bambu Cube" msgstr "" @@ -10699,27 +10699,27 @@ msgstr "" msgid "Successfully sent. Will automatically jump to the next page in %ss" msgstr "" -msgid "Bambu Studio is licensed under " -msgstr "Bambu Studio est sous licence " +msgid "Orca Slicer is licensed under " +msgstr "Orca Slicer est sous licence " msgid "" -"Bambu Studio is based on PrusaSlicer by Prusa Research, which is from Slic3r " +"Orca Slicer is based on PrusaSlicer by Prusa Research, which is from Slic3r " "by Alessandro Ranellucci and the RepRap community" msgstr "" -"Bambu Studio a été développé sur la base de PrusaSlicer de Prusa Research, " +"Orca Slicer a été développé sur la base de PrusaSlicer de Prusa Research, " "qui est lui même développé sur la base de Slic3r par Alessandro Ranelucci et " "la communauté RepRap" msgid "" -"Bambu Studio is based on PrusaSlicer by PrusaResearch and SuperSlicer by " +"Orca Slicer is based on PrusaSlicer by PrusaResearch and SuperSlicer by " "Merill(supermerill)." msgstr "" -"Bambu Studio est basé sur PrusaSlicer de PrusaResearch et SuperSlicer de " +"Orca Slicer est basé sur PrusaSlicer de PrusaResearch et SuperSlicer de " "Merill (supermerill)." -msgid "Bambu Studio also referenced some ideas from Cura by Ultimaker." +msgid "Orca Slicer also referenced some ideas from Cura by Ultimaker." msgstr "" -"Bambu Studio a également fait référence à certaines idées de Cura par " +"Orca Slicer a également fait référence à certaines idées de Cura par " "Ultimaker." msgid "" @@ -10839,7 +10839,7 @@ msgid "Failed to parse model infomations." msgstr "Impossible d'analyser les informations du modèle" msgid "" -"The .gcode.3mf file contains no G-code data.Please slice it whthBambu Studio " +"The .gcode.3mf file contains no G-code data.Please slice it whthOrca Slicer " "and export a new .gcode.3mf file." msgstr "" @@ -10864,21 +10864,21 @@ msgstr "" msgid "" "There are some unknown or uncompatible filaments mapped to generic preset. " -"Please update Bambu Studio or restart Bambu Studio to check if there is an " +"Please update Orca Slicer or restart Orca Slicer to check if there is an " "update to system presets." msgstr "" -msgid "The 3mf is generated by old Bambu Studio, load geometry data only." +msgid "The 3mf is generated by old Orca Slicer, load geometry data only." msgstr "" -"Le 3mf a été généré par une ancienne version de Bambu Studio, chargement des " +"Le 3mf a été généré par une ancienne version de Orca Slicer, chargement des " "données géométriques uniquement." msgid "" "\"Fix Model\" feature is currently only on Windows. Please repair the model " -"on Bambu Studio(windows) or CAD softwares." +"on Orca Slicer(windows) or CAD softwares." msgstr "" "La fonctionnalité « Fix Model » n'est actuellement disponible que sous " -"Windows. Réparez le modèle dans Bambu Studio (Windows) ou dans un logiciel " +"Windows. Réparez le modèle dans Orca Slicer (Windows) ou dans un logiciel " "de CAO." msgid "Associate files to BambuStudio" @@ -10901,7 +10901,7 @@ msgstr "" "fichiers .stl" msgid "Associate .step/.stp files to BambuStudio" -msgstr "Lier les fichiers .step/.stp à Bambu Studio" +msgstr "Lier les fichiers .step/.stp à Orca Slicer" msgid "If enabled, sets BambuStudio as default application to open .step files" msgstr "" @@ -10972,9 +10972,9 @@ msgstr "" msgid "Automatic flow calibration using Micro Lidar" msgstr "" -msgid "The printer is required to be in the same LAN as Bambu Studio." +msgid "The printer is required to be in the same LAN as Orca Slicer." msgstr "" -"L'imprimante doit se trouver sur le même réseau local que Bambu Studio." +"L'imprimante doit se trouver sur le même réseau local que Orca Slicer." msgid "Failed to create socket" msgstr "Échec de la création du socket" @@ -11079,18 +11079,18 @@ msgid "Cool Plate / PLA Plate" msgstr "Cool Plate / PLA Plate" msgid "" -"Click OK to update the Network plug-in when Bambu Studio launches next time." +"Click OK to update the Network plug-in when Orca Slicer launches next time." msgstr "" "Cliquez sur OK pour mettre à jour le plug-in réseau lors du prochain " -"lancement de Bambu Studio." +"lancement de Orca Slicer." -msgid "New version of Bambu Studio" -msgstr "Nouvelle version de Bambu Studio" +msgid "New version of Orca Slicer" +msgstr "Nouvelle version de Orca Slicer" msgid "" -"Step 1, please confirm Bambu Studio and your printer are in the same LAN." +"Step 1, please confirm Orca Slicer and your printer are in the same LAN." msgstr "" -"Étape 1, confirmez que Bambu Studio et votre imprimante se trouvent sur le " +"Étape 1, confirmez que Orca Slicer et votre imprimante se trouvent sur le " "même réseau local." #, boost-format @@ -11679,12 +11679,12 @@ msgid "" "Subtract a Part\n" "Did you know that you can subtract one mesh from another using the Negative " "part modifier? That way you can, for example, create easily resizable holes " -"directly in Bambu Studio. Read more in the documentation." +"directly in Orca Slicer. Read more in the documentation." msgstr "" "Soustraire une pièce\n" "Saviez-vous que vous pouvez soustraire un maillage d'un autre à l'aide du " "modificateur de partie négative ? Ainsi, vous pouvez par exemple créer des " -"trous facilement redimensionnables directement dans Bambu Studio. Pour en " +"trous facilement redimensionnables directement dans Orca Slicer. Pour en " "savoir plus, consultez la documentation." #: resources/data/hints.ini: [hint:STEP] @@ -11692,13 +11692,13 @@ msgid "" "STEP\n" "Did you know that you can improve your print quality by slicing a STEP file " "instead of an STL?\n" -"Bambu Studio supports slicing STEP files, providing smoother results than a " +"Orca Slicer supports slicing STEP files, providing smoother results than a " "lower resolution STL. Give it a try!" msgstr "" "ÉTAPE\n" "Saviez-vous que vous pouvez améliorer la qualité d'impression en tranchant " "un fichier STEP au lieu d'un fichier STL ?\n" -"Bambu Studio prend en charge le tranchage des fichiers STEP, ce qui permet " +"Orca Slicer prend en charge le tranchage des fichiers STEP, ce qui permet " "d'obtenir des résultats plus fluides qu'un fichier STL à résolution " "inférieure. Essayez-le !" @@ -11740,7 +11740,7 @@ msgstr "" #~ "when the sparse infill density is low.This value determines the thickness " #~ "of the support loops. 0 means disable this feature" #~ msgstr "" -#~ "Si cette option est activée, Bambu Studio génère des boucles de support " +#~ "Si cette option est activée, Orca Slicer génère des boucles de support " #~ "sous les contours des ponts internes. Ces boucles de support peuvent " #~ "empêcher les ponts internes de s'extruder dans le vide et améliorer la " #~ "qualité de la surface supérieure, en particulier lorsque la densité de " @@ -11903,7 +11903,7 @@ msgstr "" #~ "de gauche et remplissez-les dans les zones de saisie." #~ msgid "" -#~ "Cannot detect the LAN IP address of %s. Are %s and Bambu Studio in the " +#~ "Cannot detect the LAN IP address of %s. Are %s and Orca Slicer in the " #~ "same LAN?" #~ msgstr "" #~ "Impossible de détecter l'adresse IP du réseau local de %s. %s et Bambu " @@ -12730,11 +12730,11 @@ msgstr "" #~ msgid "" #~ "There are some unknown filaments mapped to generic preset. Please update " -#~ "Bambu Studio or restart Bambu Studio to check if there is an update to " +#~ "Orca Slicer or restart Orca Slicer to check if there is an update to " #~ "system presets." #~ msgstr "" #~ "Certains filaments inconnus sont associés à des préréglages génériques. " -#~ "Veuillez mettre à jour ou redémarrer Bambu Studio pour vérifier s'il " +#~ "Veuillez mettre à jour ou redémarrer Orca Slicer pour vérifier s'il " #~ "existe une mise à jour des préréglages du système." #~ msgid "" diff --git a/bbl/i18n/hu/OrcaSlicer_hu.po b/localization/i18n/hu/OrcaSlicer_hu.po similarity index 99% rename from bbl/i18n/hu/OrcaSlicer_hu.po rename to localization/i18n/hu/OrcaSlicer_hu.po index d6a5418edce..40bdf54bd6f 100644 --- a/bbl/i18n/hu/OrcaSlicer_hu.po +++ b/localization/i18n/hu/OrcaSlicer_hu.po @@ -619,7 +619,7 @@ msgid "Click to download new version in default browser: %s" msgstr "Kattints az új verzió letöltéséhez az alapértelmezett böngészőben: %s" msgid "The Orca Slicer needs an upgrade" -msgstr "A Bambu Studiot frissíteni kell" +msgstr "A Orca Slicert frissíteni kell" msgid "This is the newest version." msgstr "Ez a legújabb verzió." @@ -3535,11 +3535,11 @@ msgstr "Virtuális kameraeszközök letöltése" msgid "" "Another virtual camera is running.\n" -"Bambu Studio supports only a single virtual camera.\n" +"Bambulab printer supports only a single virtual camera.\n" "Do you want to stop this virtual camera?" msgstr "" "Már fut egy másik virtuális kamera.\n" -"A Bambu Studio csak egy virtuális kamerát támogat.\n" +"A Orca Slicer csak egy virtuális kamerát támogat.\n" "Leállítod ezt a virtuális kamerát?" #, c-format, boost-format @@ -6171,7 +6171,7 @@ msgid "" msgstr "" "A firmware verziója rendellenes. A nyomtatás előtt javításra és frissítésre " "van szükség. Szeretnél frissíteni most? A frissítés később is elvégezhető a " -"Bambu Studio következő indításakor." +"Orca Slicer következő indításakor." msgid "Extension Board" msgstr "Bővítőpanel" @@ -10092,11 +10092,11 @@ msgstr "" msgid "Internal Version" msgstr "Belső verzió" -msgid "The Bambu Studio needs an upgrade" -msgstr "A Bambu Studiot frissíteni kell" +msgid "The Orca Slicer needs an upgrade" +msgstr "A Orca Slicert frissíteni kell" -msgid "Bambu Studio GUI initialization failed" -msgstr "Nem sikerült a Bambu Studio GUI inicializálása" +msgid "Orca Slicer GUI initialization failed" +msgstr "Nem sikerült a Orca Slicer GUI inicializálása" msgid "Bambu Cube" msgstr "" @@ -10198,26 +10198,26 @@ msgstr "" msgid "Successfully sent. Will automatically jump to the next page in %ss" msgstr "" -msgid "Bambu Studio is licensed under " -msgstr "A Bambu Studio a következő licencet használja " +msgid "Orca Slicer is licensed under " +msgstr "A Orca Slicer a következő licencet használja " msgid "" -"Bambu Studio is based on PrusaSlicer by Prusa Research, which is from Slic3r " +"Orca Slicer is based on PrusaSlicer by Prusa Research, which is from Slic3r " "by Alessandro Ranellucci and the RepRap community" msgstr "" -"A Bambu Studio a Prusa Research által készített PrusaSliceren alapul, amely " +"A Orca Slicer a Prusa Research által készített PrusaSliceren alapul, amely " "az Alessandro Ranellucci és a RepRap közösség által készített Slic3r-ből " "származik" msgid "" -"Bambu Studio is based on PrusaSlicer by PrusaResearch and SuperSlicer by " +"Orca Slicer is based on PrusaSlicer by PrusaResearch and SuperSlicer by " "Merill(supermerill)." msgstr "" -"A Bambu Studio a PrusaResearch által készített PrusaSlicer és Merill " +"A Orca Slicer a PrusaResearch által készített PrusaSlicer és Merill " "(supermerill) által készített SuperSlicer alapján készült." -msgid "Bambu Studio also referenced some ideas from Cura by Ultimaker." -msgstr "A Bambu Studio az Ultimaker Cura néhány ötletére is támaszkodott." +msgid "Orca Slicer also referenced some ideas from Cura by Ultimaker." +msgstr "A Orca Slicer az Ultimaker Cura néhány ötletére is támaszkodott." msgid "Factors of Flow Dynamics Calibration" msgstr "" @@ -10320,7 +10320,7 @@ msgid "Failed to parse model infomations." msgstr "Failed to parse model infomation" msgid "" -"The .gcode.3mf file contains no G-code data.Please slice it whthBambu Studio " +"The .gcode.3mf file contains no G-code data.Please slice it whthOrca Slicer " "and export a new .gcode.3mf file." msgstr "" @@ -10345,18 +10345,18 @@ msgstr "" msgid "" "There are some unknown or uncompatible filaments mapped to generic preset. " -"Please update Bambu Studio or restart Bambu Studio to check if there is an " +"Please update Orca Slicer or restart Orca Slicer to check if there is an " "update to system presets." msgstr "" -msgid "The 3mf is generated by old Bambu Studio, load geometry data only." +msgid "The 3mf is generated by old Orca Slicer, load geometry data only." msgstr "" -"A 3mf a Bambu Studio egy régebbi verziójával lett létrehozva, csak a " +"A 3mf a Orca Slicer egy régebbi verziójával lett létrehozva, csak a " "geometriai adatok kerülnek betöltésre." msgid "" "\"Fix Model\" feature is currently only on Windows. Please repair the model " -"on Bambu Studio(windows) or CAD softwares." +"on Orca Slicer(windows) or CAD softwares." msgstr "" "A „Modelljavítás” funkció jelenleg csak Windows rendszeren érhető el. " "Javítsd meg a modellt a Bambu Studióban (Windows) vagy más CAD szoftverben." @@ -10451,7 +10451,7 @@ msgstr "" msgid "Automatic flow calibration using Micro Lidar" msgstr "" -msgid "The printer is required to be in the same LAN as Bambu Studio." +msgid "The printer is required to be in the same LAN as Orca Slicer." msgstr "" "A nyomtatónak ugyanazon a hálózaton kell lennie, mint a Bambu Studiónak." @@ -10549,18 +10549,18 @@ msgid "Cool Plate / PLA Plate" msgstr "Cool Plate / PLA Plate" msgid "" -"Click OK to update the Network plug-in when Bambu Studio launches next time." +"Click OK to update the Network plug-in when Orca Slicer launches next time." msgstr "" -"Kattints az OK gombra a hálózati bővítmény frissítéséhez a Bambu Studio " +"Kattints az OK gombra a hálózati bővítmény frissítéséhez a Orca Slicer " "következő indításakor." -msgid "New version of Bambu Studio" -msgstr "A Bambu Studio új verziója" +msgid "New version of Orca Slicer" +msgstr "A Orca Slicer új verziója" msgid "" -"Step 1, please confirm Bambu Studio and your printer are in the same LAN." +"Step 1, please confirm Orca Slicer and your printer are in the same LAN." msgstr "" -"1. lépés: Ellenőrizd, hogy a Bambu Studio és a nyomtató ugyanazon a helyi " +"1. lépés: Ellenőrizd, hogy a Orca Slicer és a nyomtató ugyanazon a helyi " "hálózaton van." msgid "" @@ -10671,7 +10671,7 @@ msgid "" msgstr "" "This connects a sparse infill line to an internal perimeter with a short " "segment of an additional perimeter. If expressed as percentage (example: " -"15%) it is calculated over sparse infill line width. Bambu Studio tries to " +"15%) it is calculated over sparse infill line width. Orca Slicer tries to " "connect two close infill lines to a short perimeter segment. If no such " "perimeter segment shorter than infill_anchor_max is found, the infill line " "is connected to a perimeter segment at just one side and the length of the " @@ -10694,7 +10694,7 @@ msgid "" msgstr "" "This connects a sparse infill line to an internal perimeter with a short " "segment of an additional perimeter. If expressed as percentage (example: " -"15%) it is calculated over sparse infill line width. Bambu Studio tries to " +"15%) it is calculated over sparse infill line width. Orca Slicer tries to " "connect two close infill lines to a short perimeter segment. If no such " "perimeter segment shorter than this parameter is found, the infill line is " "connected to a perimeter segment at just one side and the length of the " @@ -11133,7 +11133,7 @@ msgid "" "Subtract a Part\n" "Did you know that you can subtract one mesh from another using the Negative " "part modifier? That way you can, for example, create easily resizable holes " -"directly in Bambu Studio. Read more in the documentation." +"directly in Orca Slicer. Read more in the documentation." msgstr "" "Tárgy kivonása\n" "Tudtad, hogy a negatív módosító segítségével kivonhatsz egy tárgyat a " @@ -11146,13 +11146,13 @@ msgid "" "STEP\n" "Did you know that you can improve your print quality by slicing a STEP file " "instead of an STL?\n" -"Bambu Studio supports slicing STEP files, providing smoother results than a " +"Orca Slicer supports slicing STEP files, providing smoother results than a " "lower resolution STL. Give it a try!" msgstr "" "STEP\n" "Tudtad, hogy javíthatod a nyomtatási minőséget azáltal, hogy STL helyett " "STEP fájlt használsz?\n" -"A Bambu Studio képes a STEP fájlokat közvetlenül szeletelni, ami simább " +"A Orca Slicer képes a STEP fájlokat közvetlenül szeletelni, ami simább " "eredményt biztosít, mint egy alacsonyabb felbontású STL fájl. Próbáld ki!" #~ msgid "Ams filament backup" @@ -11285,14 +11285,14 @@ msgstr "" #~ "generálták." #~ msgid "" -#~ "BambuStudio will terminate because of running out of memory.It may be a " +#~ "OrcaSlicer will terminate because of running out of memory.It may be a " #~ "bug. It will be appreciated if you report the issue to our team." #~ msgstr "" #~ "A OrcaSlicer leáll, mert elfogy a memória. Lehet, hogy ez egy hiba. " #~ "Örülnénk, ha jelentenéd a problémát a csapatunknak." #~ msgid "" -#~ "BambuStudio will terminate because of a localization error. It will be " +#~ "OrcaSlicer will terminate because of a localization error. It will be " #~ "appreciated if you report the specific scenario this issue happened." #~ msgstr "" #~ "A OrcaSlicer lokalizációs hiba miatt leáll. Nagyra értékelnénk, ha " @@ -12084,10 +12084,10 @@ msgstr "" #~ "ábra szerint, és add meg őket a beviteli mezőkben." #~ msgid "" -#~ "Cannot detect the LAN IP address of %s. Are %s and Bambu Studio in the " +#~ "Cannot detect the LAN IP address of %s. Are %s and Orca Slicer in the " #~ "same LAN?" #~ msgstr "" -#~ "Nem sikerült észlelni %s LAN IP-címét. Biztos, hogy %s és a Bambu Studio " +#~ "Nem sikerült észlelni %s LAN IP-címét. Biztos, hogy %s és a Orca Slicer " #~ "ugyanazon a hálózaton vannak?" #~ msgid "Choose save directory" @@ -12379,7 +12379,7 @@ msgstr "" #~ msgid "" #~ "There are some unknown filaments mapped to generic preset. Please update " -#~ "Bambu Studio or restart Bambu Studio to check if there is an update to " +#~ "Orca Slicer or restart Orca Slicer to check if there is an update to " #~ "system presets." #~ msgstr "" #~ "Van néhány ismeretlen filament, amelyekhez általános beállítások vannak " diff --git a/bbl/i18n/it/OrcaSlicer_it.po b/localization/i18n/it/OrcaSlicer_it.po similarity index 99% rename from bbl/i18n/it/OrcaSlicer_it.po rename to localization/i18n/it/OrcaSlicer_it.po index 4a5824b9480..19e4907056e 100644 --- a/bbl/i18n/it/OrcaSlicer_it.po +++ b/localization/i18n/it/OrcaSlicer_it.po @@ -3527,11 +3527,11 @@ msgstr "Scaricare strumenti telecamera virtuale" msgid "" "Another virtual camera is running.\n" -"Bambu Studio supports only a single virtual camera.\n" +"Bambulab printer supports only a single virtual camera.\n" "Do you want to stop this virtual camera?" msgstr "" "È in funzione un'altra telecamera virtuale.\n" -"Bambu Studio supporta solo una singola telecamera virtuale.\n" +"Orca Slicer supporta solo una singola telecamera virtuale.\n" "Si desidera interrompere questa telecamera virtuale?" #, c-format, boost-format @@ -6153,7 +6153,7 @@ msgstr "" "La versione firmware è anomala. Prima di stampare, è necessario eseguire la " "riparazione e l'aggiornamento. Si desidera aggiornare ora? È possibile " "eseguire l'aggiornamento anche in un secondo momento sulla stampante o al " -"prossimo avvio di Bambu Studio." +"prossimo avvio di Orca Slicer." msgid "Extension Board" msgstr "Scheda di estensione" @@ -10067,11 +10067,11 @@ msgstr "" msgid "Internal Version" msgstr "Versione interna" -msgid "The Bambu Studio needs an upgrade" -msgstr "Bambu Studio necessita di aggiornamento" +msgid "The Orca Slicer needs an upgrade" +msgstr "Orca Slicer necessita di aggiornamento" -msgid "Bambu Studio GUI initialization failed" -msgstr "Inizializzazione della GUI di Bambu Studio non riuscita" +msgid "Orca Slicer GUI initialization failed" +msgstr "Inizializzazione della GUI di Orca Slicer non riuscita" msgid "Bambu Cube" msgstr "" @@ -10173,26 +10173,26 @@ msgstr "" msgid "Successfully sent. Will automatically jump to the next page in %ss" msgstr "" -msgid "Bambu Studio is licensed under " -msgstr "Bambu Studio è concesso in licenza sotto" +msgid "Orca Slicer is licensed under " +msgstr "Orca Slicer è concesso in licenza sotto" msgid "" -"Bambu Studio is based on PrusaSlicer by Prusa Research, which is from Slic3r " +"Orca Slicer is based on PrusaSlicer by Prusa Research, which is from Slic3r " "by Alessandro Ranellucci and the RepRap community" msgstr "" -"Bambu Studio è basato su PrusaSlicer di Prusa Research, che si basa su " +"Orca Slicer è basato su PrusaSlicer di Prusa Research, che si basa su " "Slic3r di Alessandro Ranellucci e sulla community RepRap" msgid "" -"Bambu Studio is based on PrusaSlicer by PrusaResearch and SuperSlicer by " +"Orca Slicer is based on PrusaSlicer by PrusaResearch and SuperSlicer by " "Merill(supermerill)." msgstr "" -"Bambu Studio è basato su PrusaSlicer di PrusaResearch e SuperSlicer di " +"Orca Slicer è basato su PrusaSlicer di PrusaResearch e SuperSlicer di " "Merill (supermerill)." -msgid "Bambu Studio also referenced some ideas from Cura by Ultimaker." +msgid "Orca Slicer also referenced some ideas from Cura by Ultimaker." msgstr "" -"Bambu Studio ha anche fatto riferimento ad alcune idee di Cura by Ultimaker." +"Orca Slicer ha anche fatto riferimento ad alcune idee di Cura by Ultimaker." msgid "" "There many parts of the software that come from community contributions, so " @@ -10305,7 +10305,7 @@ msgid "Failed to parse model infomations." msgstr "Analisi delle informazioni sul modello non riuscita" msgid "" -"The .gcode.3mf file contains no G-code data.Please slice it whthBambu Studio " +"The .gcode.3mf file contains no G-code data.Please slice it whthOrca Slicer " "and export a new .gcode.3mf file." msgstr "" @@ -10330,47 +10330,47 @@ msgstr "" msgid "" "There are some unknown or uncompatible filaments mapped to generic preset. " -"Please update Bambu Studio or restart Bambu Studio to check if there is an " +"Please update Orca Slicer or restart Orca Slicer to check if there is an " "update to system presets." msgstr "" -msgid "The 3mf is generated by old Bambu Studio, load geometry data only." +msgid "The 3mf is generated by old Orca Slicer, load geometry data only." msgstr "" -"Il 3mf è stato generato da una vecchia versione di Bambu Studio, caricando " +"Il 3mf è stato generato da una vecchia versione di Orca Slicer, caricando " "solo i dati geometrici." msgid "" "\"Fix Model\" feature is currently only on Windows. Please repair the model " -"on Bambu Studio(windows) or CAD softwares." +"on Orca Slicer(windows) or CAD softwares." msgstr "" "La funzione \"Correggi modello\" è attualmente disponibile solo su Windows. " -"Si prega di riparare il modello su Bambu Studio (Windows) o su software CAD." +"Si prega di riparare il modello su Orca Slicer (Windows) o su software CAD." msgid "Associate files to BambuStudio" -msgstr "Associa i file a Bambu Studio" +msgstr "Associa i file a Orca Slicer" msgid "Associate .3mf files to BambuStudio" -msgstr "Associa i file .3mf a Bambu Studio" +msgstr "Associa i file .3mf a Orca Slicer" msgid "If enabled, sets BambuStudio as default application to open .3mf files" msgstr "" -"Se abilitata, imposta Bambu Studio come applicazione predefinita per aprire " +"Se abilitata, imposta Orca Slicer come applicazione predefinita per aprire " "i file .3mf." msgid "Associate .stl files to BambuStudio" -msgstr "Associa i file .stl a Bambu Studio" +msgstr "Associa i file .stl a Orca Slicer" msgid "If enabled, sets BambuStudio as default application to open .stl files" msgstr "" -"Se abilitata, imposta Bambu Studio come applicazione predefinita per aprire " +"Se abilitata, imposta Orca Slicer come applicazione predefinita per aprire " "i file .stl." msgid "Associate .step/.stp files to BambuStudio" -msgstr "Associa i file .step/.stp a Bambu Studio" +msgstr "Associa i file .step/.stp a Orca Slicer" msgid "If enabled, sets BambuStudio as default application to open .step files" msgstr "" -"Se abilitata, imposta Bambu Studio come applicazione predefinita per aprire " +"Se abilitata, imposta Orca Slicer come applicazione predefinita per aprire " "i file .step." msgid "Online Models" @@ -10436,8 +10436,8 @@ msgstr "" msgid "Automatic flow calibration using Micro Lidar" msgstr "" -msgid "The printer is required to be in the same LAN as Bambu Studio." -msgstr "La stampante deve essere sulla stessa LAN di Bambu Studio." +msgid "The printer is required to be in the same LAN as Orca Slicer." +msgstr "La stampante deve essere sulla stessa LAN di Orca Slicer." msgid "Failed to create socket" msgstr "Impossibile creare il socket" @@ -10537,18 +10537,18 @@ msgid "Cool Plate / PLA Plate" msgstr "Cool Plate / PLA Plate" msgid "" -"Click OK to update the Network plug-in when Bambu Studio launches next time." +"Click OK to update the Network plug-in when Orca Slicer launches next time." msgstr "" "Clicca su OK per aggiornare il plug-in di rete al prossimo avvio di Bambu " "Studio." -msgid "New version of Bambu Studio" -msgstr "Nuova versione di Bambu Studio" +msgid "New version of Orca Slicer" +msgstr "Nuova versione di Orca Slicer" msgid "" -"Step 1, please confirm Bambu Studio and your printer are in the same LAN." +"Step 1, please confirm Orca Slicer and your printer are in the same LAN." msgstr "" -"Step 1, conferma che Bambu Studio e la tua stampante siano sulla stessa LAN." +"Step 1, conferma che Orca Slicer e la tua stampante siano sulla stessa LAN." msgid "" "The following object(s) have empty initial layer and can't be printed. " @@ -11125,12 +11125,12 @@ msgid "" "Subtract a Part\n" "Did you know that you can subtract one mesh from another using the Negative " "part modifier? That way you can, for example, create easily resizable holes " -"directly in Bambu Studio. Read more in the documentation." +"directly in Orca Slicer. Read more in the documentation." msgstr "" "Sottrarre una parte\n" "Sapevi che è possibile sottrarre una mesh da un'altra utilizzando il " "modificatore Parte negativa? In questo modo è possibile, ad esempio, creare " -"fori facilmente ridimensionabili direttamente in Bambu Studio. Per saperne " +"fori facilmente ridimensionabili direttamente in Orca Slicer. Per saperne " "di più, consulta la documentazione." #: resources/data/hints.ini: [hint:STEP] @@ -11138,13 +11138,13 @@ msgid "" "STEP\n" "Did you know that you can improve your print quality by slicing a STEP file " "instead of an STL?\n" -"Bambu Studio supports slicing STEP files, providing smoother results than a " +"Orca Slicer supports slicing STEP files, providing smoother results than a " "lower resolution STL. Give it a try!" msgstr "" "STEP\n" "Sapevi che puoi migliorare la qualità di stampa elaborando un file STEP " "anziché un file STL?\n" -"Bambu Studio supporta la suddivisione in sezioni di file STEP, fornendo " +"Orca Slicer supporta la suddivisione in sezioni di file STEP, fornendo " "risultati più fluidi rispetto a un STL a risoluzione inferiore. Provalo!" #~ msgid "Ams filament backup" @@ -11275,14 +11275,14 @@ msgstr "" #~ "Slicer." #~ msgid "" -#~ "BambuStudio will terminate because of running out of memory.It may be a " +#~ "OrcaSlicer will terminate because of running out of memory.It may be a " #~ "bug. It will be appreciated if you report the issue to our team." #~ msgstr "" #~ "Orca Slicer has run out of memory and will close. This may be a bug. " #~ "Please report this error to Technical Support." #~ msgid "" -#~ "BambuStudio will terminate because of a localization error. It will be " +#~ "OrcaSlicer will terminate because of a localization error. It will be " #~ "appreciated if you report the specific scenario this issue happened." #~ msgstr "A localization error has occurred, and Orca Slicer will close. " @@ -12063,10 +12063,10 @@ msgstr "" #~ "sinistra e inseriscili nelle caselle." #~ msgid "" -#~ "Cannot detect the LAN IP address of %s. Are %s and Bambu Studio in the " +#~ "Cannot detect the LAN IP address of %s. Are %s and Orca Slicer in the " #~ "same LAN?" #~ msgstr "" -#~ "Impossibile rilevare l'indirizzo IP LAN di %s. %s e Bambu Studio sono " +#~ "Impossibile rilevare l'indirizzo IP LAN di %s. %s e Orca Slicer sono " #~ "nella stessa LAN?" #~ msgid "Choose save directory" @@ -12371,11 +12371,11 @@ msgstr "" #~ msgid "" #~ "There are some unknown filaments mapped to generic preset. Please update " -#~ "Bambu Studio or restart Bambu Studio to check if there is an update to " +#~ "Orca Slicer or restart Orca Slicer to check if there is an update to " #~ "system presets." #~ msgstr "" #~ "Esistono alcuni filamenti sconosciuti mappati su preset generici. " -#~ "Aggiorna Bambu Studio o riavvia Bambu Studio per verificare se è " +#~ "Aggiorna Orca Slicer o riavvia Orca Slicer per verificare se è " #~ "disponibile un aggiornamento ai preset di sistema." #~ msgid "Timelapse without toolhead" diff --git a/bbl/i18n/ja/OrcaSlicer_ja.po b/localization/i18n/ja/OrcaSlicer_ja.po similarity index 98% rename from bbl/i18n/ja/OrcaSlicer_ja.po rename to localization/i18n/ja/OrcaSlicer_ja.po index d63e06190d2..19aec804280 100644 --- a/bbl/i18n/ja/OrcaSlicer_ja.po +++ b/localization/i18n/ja/OrcaSlicer_ja.po @@ -661,7 +661,7 @@ msgid "" "The version of Bambu studio is too low and needs to be updated to the latest " "version before it can be used normally" msgstr "" -"現在のBambu Studioはバージョンが古いため使用できません、アップデートしてくだ" +"現在のOrca Slicerはバージョンが古いため使用できません、アップデートしてくだ" "さい。" msgid "Login information expired. Please login again." @@ -1775,7 +1775,7 @@ msgid "License" msgstr "ライセンス" msgid "Orca Slicer is licensed under " -msgstr "Bambu Studioのライセンス" +msgstr "Orca Slicerのライセンス" msgid "GNU Affero General Public License, version 3" msgstr "GNU Affero General Public License, version 3" @@ -3463,7 +3463,7 @@ msgstr "バーチャルカメラツールをダウンロード" msgid "" "Another virtual camera is running.\n" -"Bambu Studio supports only a single virtual camera.\n" +"Bambulab printer supports only a single virtual camera.\n" "Do you want to stop this virtual camera?" msgstr "" "別のバーチャルカメラを作動しています為、もう一個が起動できません。\n" @@ -4068,7 +4068,7 @@ msgid "" "There are some unknown filaments mapped to generic preset. Please update " "Orca Slicer or restart Orca Slicer to check if there is an update to system " "presets." -msgstr "不明なフィラメントがあります、Bambu Studioを更新してください。" +msgstr "不明なフィラメントがあります、Orca Slicerを更新してください。" #, boost-format msgid "Do you want to save changes to \"%1%\"?" @@ -4121,7 +4121,7 @@ msgstr "構成を読込めませんでした" msgid "The 3mf is generated by old Orca Slicer, load geometry data only." msgstr "" -"3mfは古いバージョンのBambu Studioで作成されています、ジオメトリーデータのみ読" +"3mfは古いバージョンのOrca Slicerで作成されています、ジオメトリーデータのみ読" "込みます。" #, c-format, boost-format @@ -4569,25 +4569,25 @@ msgid "Clear my choice on the unsaved presets." msgstr "Clear my choice on the unsaved presets." msgid "Associate files to OrcaSlicer" -msgstr "ファイルをBambu Studioに関連付ける" +msgstr "ファイルをOrca Slicerに関連付ける" msgid "Associate .3mf files to OrcaSlicer" -msgstr ".3mfファイルをBambu Studioに関連付けます。" +msgstr ".3mfファイルをOrca Slicerに関連付けます。" msgid "If enabled, sets OrcaSlicer as default application to open .3mf files" -msgstr "デフォルトで.3mfファイルをBambu Studioで開く" +msgstr "デフォルトで.3mfファイルをOrca Slicerで開く" msgid "Associate .stl files to OrcaSlicer" -msgstr ".stlファイルをBambu Studioに関連付けます。" +msgstr ".stlファイルをOrca Slicerに関連付けます。" msgid "If enabled, sets OrcaSlicer as default application to open .stl files" -msgstr "デフォルトで.stlファイルをBambu Studioで開く" +msgstr "デフォルトで.stlファイルをOrca Slicerで開く" msgid "Associate .step/.stp files to OrcaSlicer" -msgstr ".step/.stpファイルをBambu Studioに関連付けます。" +msgstr ".step/.stpファイルをOrca Slicerに関連付けます。" msgid "If enabled, sets OrcaSlicer as default application to open .step files" -msgstr "デフォルトで.step/.stpファイルをBambu Studioで開く" +msgstr "デフォルトで.step/.stpファイルをOrca Slicerで開く" msgid "Maximum recent projects" msgstr "Maximum recent projects" @@ -5067,7 +5067,7 @@ msgstr "" msgid "The printer is required to be in the same LAN as Orca Slicer." msgstr "" -"このプリンターを使用するには、Bambu Studioを同一のLANで使用してください。" +"このプリンターを使用するには、Orca Slicerを同一のLANで使用してください。" msgid "The printer does not support sending to printer SD card." msgstr "このプリンターはSDカードに送信することができません" @@ -5626,7 +5626,7 @@ msgid "Exit %s" msgstr "%s を終了" msgid "the Configuration package is incompatible with current APP." -msgstr "構成パッケージは、このバージョンのBambu Studioに適用できません" +msgstr "構成パッケージは、このバージョンのOrca Slicerに適用できません" msgid "Configuration updates" msgstr "構成の更新" @@ -5965,7 +5965,7 @@ msgstr "LAN接続失敗 (造形ファイル送信)" msgid "" "Step 1, please confirm Orca Slicer and your printer are in the same LAN." msgstr "" -"１Bambu Studioとプリンターが同一のLANに繋いでいること確認してください。" +"１Orca Slicerとプリンターが同一のLANに繋いでいること確認してください。" msgid "" "Step 2, if the IP and Access Code below are different from the actual values " @@ -9751,10 +9751,10 @@ msgstr "" "強度の向上\n" "壁面層数やインフィルの充填密度を増やして造形強度を向上できます。" -msgid "The Bambu Studio needs an upgrade" -msgstr "Bambu Studio をアップデートする必要があります" +msgid "The Orca Slicer needs an upgrade" +msgstr "Orca Slicer をアップデートする必要があります" -msgid "Bambu Studio GUI initialization failed" +msgid "Orca Slicer GUI initialization failed" msgstr "GUI初期化に失敗した" msgid "Bambu Cube" @@ -9857,25 +9857,25 @@ msgstr "" msgid "Successfully sent. Will automatically jump to the next page in %ss" msgstr "" -msgid "Bambu Studio is licensed under " -msgstr "Bambu Studioのライセンス" +msgid "Orca Slicer is licensed under " +msgstr "Orca Slicerのライセンス" msgid "" -"Bambu Studio is based on PrusaSlicer by Prusa Research, which is from Slic3r " +"Orca Slicer is based on PrusaSlicer by Prusa Research, which is from Slic3r " "by Alessandro Ranellucci and the RepRap community" msgstr "" -"Bambu StudioはPrusa Research社のPrusaSlicerをベースとして開発され、" +"Orca SlicerはPrusa Research社のPrusaSlicerをベースとして開発され、" "Alessandro RanellucciさんのSlic3rとRepRapを特別に感謝します。" msgid "" -"Bambu Studio is based on PrusaSlicer by PrusaResearch and SuperSlicer by " +"Orca Slicer is based on PrusaSlicer by PrusaResearch and SuperSlicer by " "Merill(supermerill)." msgstr "" -"Bambu StudioはPrusaResearch製のPrusaSlicerとMerill製のSuperSlicerに基づいて作" +"Orca SlicerはPrusaResearch製のPrusaSlicerとMerill製のSuperSlicerに基づいて作" "られています。" -msgid "Bambu Studio also referenced some ideas from Cura by Ultimaker." -msgstr "Bambu StudioはUltimaker製のCuraも参考しています" +msgid "Orca Slicer also referenced some ideas from Cura by Ultimaker." +msgstr "Orca SlicerはUltimaker製のCuraも参考しています" msgid "Factors of Flow Dynamics Calibration" msgstr "" @@ -9977,7 +9977,7 @@ msgid "Failed to parse model infomations." msgstr "Failed to parse model infomation" msgid "" -"The .gcode.3mf file contains no G-code data.Please slice it whthBambu Studio " +"The .gcode.3mf file contains no G-code data.Please slice it whthOrca Slicer " "and export a new .gcode.3mf file." msgstr "" @@ -10002,42 +10002,42 @@ msgstr "" msgid "" "There are some unknown or uncompatible filaments mapped to generic preset. " -"Please update Bambu Studio or restart Bambu Studio to check if there is an " +"Please update Orca Slicer or restart Orca Slicer to check if there is an " "update to system presets." msgstr "" -msgid "The 3mf is generated by old Bambu Studio, load geometry data only." +msgid "The 3mf is generated by old Orca Slicer, load geometry data only." msgstr "" -"3mfは古いバージョンのBambu Studioで作成されています、ジオメトリーデータのみ読" +"3mfは古いバージョンのOrca Slicerで作成されています、ジオメトリーデータのみ読" "込みます。" msgid "" "\"Fix Model\" feature is currently only on Windows. Please repair the model " -"on Bambu Studio(windows) or CAD softwares." +"on Orca Slicer(windows) or CAD softwares." msgstr "" -"「モデル修復」はWindowsのみご利用できます。Bambu Studio (Windows)か他のCADソ" +"「モデル修復」はWindowsのみご利用できます。Orca Slicer (Windows)か他のCADソ" "フトウェアで修復してください。" msgid "Associate files to BambuStudio" -msgstr "ファイルをBambu Studioに関連付ける" +msgstr "ファイルをOrca Slicerに関連付ける" msgid "Associate .3mf files to BambuStudio" -msgstr ".3mfファイルをBambu Studioに関連付けます。" +msgstr ".3mfファイルをOrca Slicerに関連付けます。" msgid "If enabled, sets BambuStudio as default application to open .3mf files" -msgstr "デフォルトで.3mfファイルをBambu Studioで開く" +msgstr "デフォルトで.3mfファイルをOrca Slicerで開く" msgid "Associate .stl files to BambuStudio" -msgstr ".stlファイルをBambu Studioに関連付けます。" +msgstr ".stlファイルをOrca Slicerに関連付けます。" msgid "If enabled, sets BambuStudio as default application to open .stl files" -msgstr "デフォルトで.stlファイルをBambu Studioで開く" +msgstr "デフォルトで.stlファイルをOrca Slicerで開く" msgid "Associate .step/.stp files to BambuStudio" -msgstr ".step/.stpファイルをBambu Studioに関連付けます。" +msgstr ".step/.stpファイルをOrca Slicerに関連付けます。" msgid "If enabled, sets BambuStudio as default application to open .step files" -msgstr "デフォルトで.step/.stpファイルをBambu Studioで開く" +msgstr "デフォルトで.step/.stpファイルをOrca Slicerで開く" msgid "Online Models" msgstr "Online Models" @@ -10099,9 +10099,9 @@ msgstr "" msgid "Automatic flow calibration using Micro Lidar" msgstr "" -msgid "The printer is required to be in the same LAN as Bambu Studio." +msgid "The printer is required to be in the same LAN as Orca Slicer." msgstr "" -"このプリンターを使用するには、Bambu Studioを同一のLANで使用してください。" +"このプリンターを使用するには、Orca Slicerを同一のLANで使用してください。" msgid "Failed to create socket" msgstr "Failed to create socket" @@ -10197,18 +10197,18 @@ msgid "Cool Plate / PLA Plate" msgstr "Cool Plate / PLA Plate" msgid "" -"Click OK to update the Network plug-in when Bambu Studio launches next time." +"Click OK to update the Network plug-in when Orca Slicer launches next time." msgstr "" -"OK をクリックすると、次回 Bambu Studio を起動したときにネットワークプラグイン" +"OK をクリックすると、次回 Orca Slicer を起動したときにネットワークプラグイン" "が更新されます。" -msgid "New version of Bambu Studio" +msgid "New version of Orca Slicer" msgstr "新バージョン" msgid "" -"Step 1, please confirm Bambu Studio and your printer are in the same LAN." +"Step 1, please confirm Orca Slicer and your printer are in the same LAN." msgstr "" -"１Bambu Studioとプリンターが同一のLANに繋いでいること確認してください。" +"１Orca Slicerとプリンターが同一のLANに繋いでいること確認してください。" msgid "" "The following object(s) have empty initial layer and can't be printed. " @@ -10305,7 +10305,7 @@ msgid "" msgstr "" "This connects a sparse infill line to an internal perimeter with a short " "segment of an additional perimeter. If expressed as percentage (example: " -"15%) it is calculated over sparse infill line width. Bambu Studio tries to " +"15%) it is calculated over sparse infill line width. Orca Slicer tries to " "connect two close infill lines to a short perimeter segment. If no such " "perimeter segment shorter than infill_anchor_max is found, the infill line " "is connected to a perimeter segment at just one side and the length of the " @@ -10328,7 +10328,7 @@ msgid "" msgstr "" "This connects a sparse infill line to an internal perimeter with a short " "segment of an additional perimeter. If expressed as percentage (example: " -"15%) it is calculated over sparse infill line width. Bambu Studio tries to " +"15%) it is calculated over sparse infill line width. Orca Slicer tries to " "connect two close infill lines to a short perimeter segment. If no such " "perimeter segment shorter than this parameter is found, the infill line is " "connected to a perimeter segment at just one side and the length of the " @@ -10764,7 +10764,7 @@ msgid "" "Subtract a Part\n" "Did you know that you can subtract one mesh from another using the Negative " "part modifier? That way you can, for example, create easily resizable holes " -"directly in Bambu Studio. Read more in the documentation." +"directly in Orca Slicer. Read more in the documentation." msgstr "" "パーツをサブストラクト\n" "マイナスパーツでモデルからメッシュを引くことができます。" @@ -10774,7 +10774,7 @@ msgid "" "STEP\n" "Did you know that you can improve your print quality by slicing a STEP file " "instead of an STL?\n" -"Bambu Studio supports slicing STEP files, providing smoother results than a " +"Orca Slicer supports slicing STEP files, providing smoother results than a " "lower resolution STL. Give it a try!" msgstr "" "STEP\n" @@ -10944,20 +10944,20 @@ msgstr "" #~ msgid "" #~ "The configuration may be generated by a newer version of BambuStudio." #~ msgstr "" -#~ "構成データは、これより新しいBambu Studioで作成された可能性があります" +#~ "構成データは、これより新しいOrca Slicerで作成された可能性があります" #~ msgid "" -#~ "BambuStudio will terminate because of running out of memory.It may be a " +#~ "OrcaSlicer will terminate because of running out of memory.It may be a " #~ "bug. It will be appreciated if you report the issue to our team." #~ msgstr "" #~ "メモリの割り当てに異常がありました、間も無く終了いたします。弊社サポート" #~ "チームへご連絡ください。" #~ msgid "" -#~ "BambuStudio will terminate because of a localization error. It will be " +#~ "OrcaSlicer will terminate because of a localization error. It will be " #~ "appreciated if you report the specific scenario this issue happened." #~ msgstr "" -#~ "エラーが発生しました、Bambu Studioを再開してください。(Localization)" +#~ "エラーが発生しました、Orca Slicerを再開してください。(Localization)" #, boost-format #~ msgid "BambuStudio got an unhandled exception: %1%" @@ -10977,18 +10977,18 @@ msgstr "" #~ "Orca Slicer is based on PrusaSlicer by Prusa Research, which is from " #~ "Slic3r by Alessandro Ranellucci and the RepRap community" #~ msgstr "" -#~ "Bambu StudioはPrusa Research社のPrusaSlicerをベースとして開発され、" +#~ "Orca SlicerはPrusa Research社のPrusaSlicerをベースとして開発され、" #~ "Alessandro RanellucciさんのSlic3rとRepRapを特別に感謝します。" #~ msgid "" #~ "Orca Slicer is based on PrusaSlicer by PrusaResearch and SuperSlicer by " #~ "Merill(supermerill)." #~ msgstr "" -#~ "Bambu StudioはPrusaResearch製のPrusaSlicerとMerill製のSuperSlicerに基づい" +#~ "Orca SlicerはPrusaResearch製のPrusaSlicerとMerill製のSuperSlicerに基づい" #~ "て作られています。" #~ msgid "Orca Slicer also referenced some ideas from Cura by Ultimaker." -#~ msgstr "Bambu StudioはUltimaker製のCuraも参考しています" +#~ msgstr "Orca SlicerはUltimaker製のCuraも参考しています" #~ msgid "" #~ "There many parts of the software that come from community contributions, " @@ -11170,7 +11170,7 @@ msgstr "" #~ "Cannot detect the LAN IP address of %s. Are %s and Orca Slicer in the " #~ "same LAN?" #~ msgstr "" -#~ "%s のIPアドレスを検出できませんでした。Bambu Studioと同じネットワークに繋" +#~ "%s のIPアドレスを検出できませんでした。Orca Slicerと同じネットワークに繋" #~ "いでいますか？" #~ msgid "Choose one or more files (3mf/step/stl/obj/amf):" @@ -11900,10 +11900,10 @@ msgstr "" #~ msgstr "Auto refill" #~ msgid "" -#~ "Cannot detect the LAN IP address of %s. Are %s and Bambu Studio in the " +#~ "Cannot detect the LAN IP address of %s. Are %s and Orca Slicer in the " #~ "same LAN?" #~ msgstr "" -#~ "%s のIPアドレスを検出できませんでした。Bambu Studioと同じネットワークに繋" +#~ "%s のIPアドレスを検出できませんでした。Orca Slicerと同じネットワークに繋" #~ "いでいますか？" #~ msgid "Edit plate setitngs" @@ -11930,9 +11930,9 @@ msgstr "" #~ msgid "" #~ "There are some unknown filaments mapped to generic preset. Please update " -#~ "Bambu Studio or restart Bambu Studio to check if there is an update to " +#~ "Orca Slicer or restart Orca Slicer to check if there is an update to " #~ "system presets." -#~ msgstr "不明なフィラメントがあります、Bambu Studioを更新してください。" +#~ msgstr "不明なフィラメントがあります、Orca Slicerを更新してください。" #~ msgid "" #~ "When the current material run out,the printer will continue to print in " diff --git a/bbl/i18n/ko/OrcaSlicer_ko.po b/localization/i18n/ko/OrcaSlicer_ko.po similarity index 99% rename from bbl/i18n/ko/OrcaSlicer_ko.po rename to localization/i18n/ko/OrcaSlicer_ko.po index d6612f9a3c8..dea31e4c7f0 100644 --- a/bbl/i18n/ko/OrcaSlicer_ko.po +++ b/localization/i18n/ko/OrcaSlicer_ko.po @@ -3527,11 +3527,11 @@ msgstr "가상 카메라 도구 다운로드" msgid "" "Another virtual camera is running.\n" -"Bambu Studio supports only a single virtual camera.\n" +"Bambulab printer supports only a single virtual camera.\n" "Do you want to stop this virtual camera?" msgstr "" "다른 가상 카메라가 실행 중입니다.\n" -"Bambu Studio는 하나의 가상 카메라만 지원합니다.\n" +"Orca Slicer는 하나의 가상 카메라만 지원합니다.\n" "이 가상 카메라를 중지하시겠습니까?" #, c-format, boost-format @@ -10093,16 +10093,16 @@ msgid "Internal Version" msgstr "내부 버전" msgid "" -"BambuStudio will terminate because of running out of memory.It may be a bug. " +"OrcaSlicer will terminate because of running out of memory.It may be a bug. " "It will be appreciated if you report the issue to our team." msgstr "" -"Bambu Studio의 메모리가 부족하여 종료됩니다. 버그일 수 있습니다. 이 오류를 기" +"Orca Slicer의 메모리가 부족하여 종료됩니다. 버그일 수 있습니다. 이 오류를 기" "술 지원팀에 보고하십시오." msgid "" -"BambuStudio will terminate because of a localization error. It will be " +"OrcaSlicer will terminate because of a localization error. It will be " "appreciated if you report the specific scenario this issue happened." -msgstr "현지화 오류가 발생하여 Bambu Studio가 종료됩니다. " +msgstr "현지화 오류가 발생하여 Orca Slicer가 종료됩니다. " #, boost-format msgid "BambuStudio got an unhandled exception: %1%" @@ -10112,16 +10112,16 @@ msgid "" "BambuStudio configuration file may be corrupted and is not abled to be " "parsed.Please delete the file and try again." msgstr "" -"Bambu Studio 설정 파일을 구문 분석할 수 없으며 손상되었을 수 있습니다. 파일" +"Orca Slicer 설정 파일을 구문 분석할 수 없으며 손상되었을 수 있습니다. 파일" "을 삭제하고 다시 시도하십시오." -msgid "The Bambu Studio needs an upgrade" -msgstr "Bambu Studio에 업데이트가 필요합니다" +msgid "The Orca Slicer needs an upgrade" +msgstr "Orca Slicer에 업데이트가 필요합니다" msgid "Choose one file (gcode/.gco/.g/.ngc/ngc):" msgstr "하나의 파일 선택(.gcode/.gco/.g/.ngc/ngc):" -msgid "Bambu Studio GUI initialization failed" +msgid "Orca Slicer GUI initialization failed" msgstr "뱀부 스튜디오 GUI 초기화 실패" msgid "Bambu Cube" @@ -10222,26 +10222,26 @@ msgstr "" msgid "Successfully sent. Will automatically jump to the next page in %ss" msgstr "" -msgid "Bambu Studio is licensed under " +msgid "Orca Slicer is licensed under " msgstr "뱀부 스튜디오의 라이센스는 다음과 같습니다." msgid "" -"Bambu Studio is based on PrusaSlicer by Prusa Research, which is from Slic3r " +"Orca Slicer is based on PrusaSlicer by Prusa Research, which is from Slic3r " "by Alessandro Ranellucci and the RepRap community" msgstr "" "뱀부 스튜디오는 프루사 리서치의 PrusaSlicer를 기반으로 하며, PrusaSlicer는 " "Alessandro Ranellucci와 RepRap 커뮤니티의 Slic3r을 기반으로 합니다. " msgid "" -"Bambu Studio is based on PrusaSlicer by PrusaResearch and SuperSlicer by " +"Orca Slicer is based on PrusaSlicer by PrusaResearch and SuperSlicer by " "Merill(supermerill)." msgstr "" "뱀부 스튜디오는 프루사 리서치의 프루사 슬라이서와 메릴(슈퍼메릴)의 슈퍼슬라이" "서를 기반으로 합니다." -msgid "Bambu Studio also referenced some ideas from Cura by Ultimaker." +msgid "Orca Slicer also referenced some ideas from Cura by Ultimaker." msgstr "" -"Bambu Studio는 또한 Ultimaker의 Cura에서 얻은 일부 아이디어를 참조했습니다." +"Orca Slicer는 또한 Ultimaker의 Cura에서 얻은 일부 아이디어를 참조했습니다." msgid "" "There many parts of the software that come from community contributions, so " @@ -10358,7 +10358,7 @@ msgid "Failed to parse model infomations." msgstr "모델 정보를 해석하지 못했습니다." msgid "" -"The .gcode.3mf file contains no G-code data.Please slice it whthBambu Studio " +"The .gcode.3mf file contains no G-code data.Please slice it whthOrca Slicer " "and export a new .gcode.3mf file." msgstr "" @@ -10383,17 +10383,17 @@ msgstr "" msgid "" "There are some unknown or uncompatible filaments mapped to generic preset. " -"Please update Bambu Studio or restart Bambu Studio to check if there is an " +"Please update Orca Slicer or restart Orca Slicer to check if there is an " "update to system presets." msgstr "" -msgid "The 3mf is generated by old Bambu Studio, load geometry data only." +msgid "The 3mf is generated by old Orca Slicer, load geometry data only." msgstr "" -"3mf는 이전 버전의 Bambu Studio에서 생성되었습니다. 형상 데이터만 불러옵니다." +"3mf는 이전 버전의 Orca Slicer에서 생성되었습니다. 형상 데이터만 불러옵니다." msgid "" "\"Fix Model\" feature is currently only on Windows. Please repair the model " -"on Bambu Studio(windows) or CAD softwares." +"on Orca Slicer(windows) or CAD softwares." msgstr "" "“모델 수정” 기능은 현재 Windows에서만 사용할 수 있습니다. 뱀부 스튜디오 " "(Windows) 또는 CAD 소프트웨어로 모델을 복구하십시오." @@ -10485,8 +10485,8 @@ msgstr "" msgid "Automatic flow calibration using Micro Lidar" msgstr "" -msgid "The printer is required to be in the same LAN as Bambu Studio." -msgstr "프린터는 Bambu Studio와 동일한 LAN에 있어야 합니다." +msgid "The printer is required to be in the same LAN as Orca Slicer." +msgstr "프린터는 Orca Slicer와 동일한 LAN에 있어야 합니다." msgid "Failed to create socket" msgstr "소켓 생성 실패" @@ -10579,18 +10579,18 @@ msgid "Cool Plate / PLA Plate" msgstr "쿨 플레이트 / PLA 플레이트" msgid "" -"Click OK to update the Network plug-in when Bambu Studio launches next time." +"Click OK to update the Network plug-in when Orca Slicer launches next time." msgstr "" -"다음 번 Bambu Studio를 시작할 때 네트워크 플러그인을 업데이트하려면 확인을 클" +"다음 번 Orca Slicer를 시작할 때 네트워크 플러그인을 업데이트하려면 확인을 클" "릭합니다." -msgid "New version of Bambu Studio" +msgid "New version of Orca Slicer" msgstr "뱀부 스튜디오의 새 버전" msgid "" -"Step 1, please confirm Bambu Studio and your printer are in the same LAN." +"Step 1, please confirm Orca Slicer and your printer are in the same LAN." msgstr "" -"1단계, Bambu Studio와 프린터가 동일한 인터넷 망에 연결되어 있는지 확인하십시" +"1단계, Orca Slicer와 프린터가 동일한 인터넷 망에 연결되어 있는지 확인하십시" "오." #, boost-format @@ -10695,7 +10695,7 @@ msgid "" "single infill line." msgstr "" "이렇게 하면 내부채움 선을 내부둘레와 짧은 추가둘레로 연결합니다. 백분율(예: " -"15%)로 표시되는 경우 내부채움 선폭을 기준으로 계산됩니다. Bambu Studio는 두 " +"15%)로 표시되는 경우 내부채움 선폭을 기준으로 계산됩니다. Orca Slicer는 두 " "개의 가까운 내부채움 선을 짧은 둘레 세그먼트에 연결하려고 시도합니다. " "infill_anchor_max보다 짧은 둘레 세그먼트가 발견되지 않으면 내부채움 라인은 한" "쪽에만 둘레 세그먼트에 연결되며 이때 사용되는 둘레 세그먼트의 길이는 이 매개" @@ -10717,7 +10717,7 @@ msgid "" "this parameter to zero to disable anchoring." msgstr "" "이렇게 하면 내부채움 선을 내부둘레와 짧은 추가둘레로 연결합니다. 백분율(예: " -"15%)로 표시되는 경우 내부채움 선폭을 기준으로 계산됩니다. Bambu Studio는 두 " +"15%)로 표시되는 경우 내부채움 선폭을 기준으로 계산됩니다. Orca Slicer는 두 " "개의 가까운 내부채움 선을 짧은 둘레 세그먼트에 연결하려고 시도합니다. 이 매개" "변수보다 짧은 둘레 세그먼트가 발견되지 않으면 내부채움 라인은 한쪽에만 둘레 " "세그먼트에 연결되며 이때 사용되는 둘레 세그먼트의 길이는 infill_anchor로 제한" @@ -11161,11 +11161,11 @@ msgid "" "Subtract a Part\n" "Did you know that you can subtract one mesh from another using the Negative " "part modifier? That way you can, for example, create easily resizable holes " -"directly in Bambu Studio. Read more in the documentation." +"directly in Orca Slicer. Read more in the documentation." msgstr "" "부품 빼기\n" "네거티브 부품 수정자를 사용하여 한 메쉬를 다른 메쉬로부터 뺄 수 있다는 것을 " -"알고 계셨나요? 이렇게 하면 예를 들어 Bambu Studio에서 직접 크기를 조정할 수 " +"알고 계셨나요? 이렇게 하면 예를 들어 Orca Slicer에서 직접 크기를 조정할 수 " "있는 구멍을 만들 수 있습니다. 자세한 내용은 설명서를 참조하십시오." #: resources/data/hints.ini: [hint:STEP] @@ -11173,7 +11173,7 @@ msgid "" "STEP\n" "Did you know that you can improve your print quality by slicing a STEP file " "instead of an STL?\n" -"Bambu Studio supports slicing STEP files, providing smoother results than a " +"Orca Slicer supports slicing STEP files, providing smoother results than a " "lower resolution STL. Give it a try!" msgstr "" "STEP\n" @@ -11375,10 +11375,10 @@ msgstr "" #~ "자에 기입하십시오.." #~ msgid "" -#~ "Cannot detect the LAN IP address of %s. Are %s and Bambu Studio in the " +#~ "Cannot detect the LAN IP address of %s. Are %s and Orca Slicer in the " #~ "same LAN?" #~ msgstr "" -#~ "%s의 LAN IP 주소를 찾을 수 없습니다. %s과 Bambu Studio가 같은 LAN에 있습니" +#~ "%s의 LAN IP 주소를 찾을 수 없습니다. %s과 Orca Slicer가 같은 LAN에 있습니" #~ "까?" #~ msgid "Choose one or more files (3mf/step/stl/obj/amf):" @@ -12146,11 +12146,11 @@ msgstr "" #~ msgid "" #~ "There are some unknown filaments mapped to generic preset. Please update " -#~ "Bambu Studio or restart Bambu Studio to check if there is an update to " +#~ "Orca Slicer or restart Orca Slicer to check if there is an update to " #~ "system presets." #~ msgstr "" -#~ "일반 프리셋에 매핑된 알려지지 않은 필라멘트가 몇 개 있습니다. Bambu Studio" -#~ "를 업데이트하거나 Bambu Studio를 다시 시작하여 시스템 프리셋에 대한 업데이" +#~ "일반 프리셋에 매핑된 알려지지 않은 필라멘트가 몇 개 있습니다. Orca Slicer" +#~ "를 업데이트하거나 Orca Slicer를 다시 시작하여 시스템 프리셋에 대한 업데이" #~ "트가 있는지 확인하십시오." #~ msgid "" diff --git a/bbl/i18n/list.txt b/localization/i18n/list.txt similarity index 100% rename from bbl/i18n/list.txt rename to localization/i18n/list.txt diff --git a/bbl/i18n/nl/OrcaSlicer_nl.po b/localization/i18n/nl/OrcaSlicer_nl.po similarity index 99% rename from bbl/i18n/nl/OrcaSlicer_nl.po rename to localization/i18n/nl/OrcaSlicer_nl.po index f586a42d44c..56f94afb298 100644 --- a/bbl/i18n/nl/OrcaSlicer_nl.po +++ b/localization/i18n/nl/OrcaSlicer_nl.po @@ -3554,11 +3554,11 @@ msgstr "Hulpmiddelen voor virtuele camera's downloaden" msgid "" "Another virtual camera is running.\n" -"Bambu Studio supports only a single virtual camera.\n" +"Bambulab printer supports only a single virtual camera.\n" "Do you want to stop this virtual camera?" msgstr "" "Er draait nog een virtuele camera.\n" -"Bambu Studio ondersteunt slechts één virtuele camera.\n" +"Orca Slicer ondersteunt slechts één virtuele camera.\n" "Wil je deze virtuele camera stoppen?" #, c-format, boost-format @@ -6240,7 +6240,7 @@ msgid "" msgstr "" "De firmwareversie is abnormaal. Repareren en bijwerken is vereist voor het " "afdrukken. Wil je nu updaten? Je kunt ook later op de printer updaten of " -"updaten wanneer je Bambu Studio de volgende keer start." +"updaten wanneer je Orca Slicer de volgende keer start." msgid "Extension Board" msgstr "Extension Board" @@ -10201,11 +10201,11 @@ msgstr "" msgid "Internal Version" msgstr "Interne versie" -msgid "The Bambu Studio needs an upgrade" -msgstr "Bambu Studio heeft een upgrade nodig" +msgid "The Orca Slicer needs an upgrade" +msgstr "Orca Slicer heeft een upgrade nodig" -msgid "Bambu Studio GUI initialization failed" -msgstr "Initialisatie van Bambu Studio GUI is mislukt" +msgid "Orca Slicer GUI initialization failed" +msgstr "Initialisatie van Orca Slicer GUI is mislukt" msgid "Bambu Cube" msgstr "" @@ -10307,25 +10307,25 @@ msgstr "" msgid "Successfully sent. Will automatically jump to the next page in %ss" msgstr "" -msgid "Bambu Studio is licensed under " -msgstr "Bambu Studio is gelicentieerd onder " +msgid "Orca Slicer is licensed under " +msgstr "Orca Slicer is gelicentieerd onder " msgid "" -"Bambu Studio is based on PrusaSlicer by Prusa Research, which is from Slic3r " +"Orca Slicer is based on PrusaSlicer by Prusa Research, which is from Slic3r " "by Alessandro Ranellucci and the RepRap community" msgstr "" -"Bambu Studio is gebaseerd op PrusaSlicer van Prusa Research, welke is " +"Orca Slicer is gebaseerd op PrusaSlicer van Prusa Research, welke is " "afgeleid van Slic3r van Alessandro Ranellucci en de RepRap gemeenschap" msgid "" -"Bambu Studio is based on PrusaSlicer by PrusaResearch and SuperSlicer by " +"Orca Slicer is based on PrusaSlicer by PrusaResearch and SuperSlicer by " "Merill(supermerill)." msgstr "" -"Bambu Studio is gebaseerd op PrusaSlicer van PrusaResearch en SuperSlicer " +"Orca Slicer is gebaseerd op PrusaSlicer van PrusaResearch en SuperSlicer " "van Merill (supermerill)." -msgid "Bambu Studio also referenced some ideas from Cura by Ultimaker." -msgstr "Bambu Studio verwees ook naar enkele ideeën van Cura by Ultimaker." +msgid "Orca Slicer also referenced some ideas from Cura by Ultimaker." +msgstr "Orca Slicer verwees ook naar enkele ideeën van Cura by Ultimaker." msgid "" "There many parts of the software that come from community contributions, so " @@ -10437,7 +10437,7 @@ msgid "Failed to parse model infomations." msgstr "Failed to parse model infomation" msgid "" -"The .gcode.3mf file contains no G-code data.Please slice it whthBambu Studio " +"The .gcode.3mf file contains no G-code data.Please slice it whthOrca Slicer " "and export a new .gcode.3mf file." msgstr "" @@ -10462,47 +10462,47 @@ msgstr "" msgid "" "There are some unknown or uncompatible filaments mapped to generic preset. " -"Please update Bambu Studio or restart Bambu Studio to check if there is an " +"Please update Orca Slicer or restart Orca Slicer to check if there is an " "update to system presets." msgstr "" -msgid "The 3mf is generated by old Bambu Studio, load geometry data only." +msgid "The 3mf is generated by old Orca Slicer, load geometry data only." msgstr "" -"De 3mf is gegenereerd door een oude versie van Bambu Studio, enkel de " +"De 3mf is gegenereerd door een oude versie van Orca Slicer, enkel de " "geometriegegevens werden geladen." msgid "" "\"Fix Model\" feature is currently only on Windows. Please repair the model " -"on Bambu Studio(windows) or CAD softwares." +"on Orca Slicer(windows) or CAD softwares." msgstr "" "De \"Fix Model\" functie is momenteel alleen op Windows. Repareer het model " -"in Bambu Studio (Windows) of CAD-software." +"in Orca Slicer (Windows) of CAD-software." msgid "Associate files to BambuStudio" -msgstr "Koppel bestanden aan Bambu Studio" +msgstr "Koppel bestanden aan Orca Slicer" msgid "Associate .3mf files to BambuStudio" -msgstr "Koppel .3mf-bestanden aan Bambu Studio" +msgstr "Koppel .3mf-bestanden aan Orca Slicer" msgid "If enabled, sets BambuStudio as default application to open .3mf files" msgstr "" -"Indien ingeschakeld, wordt Bambu Studio ingesteld als de standaardtoepassing " +"Indien ingeschakeld, wordt Orca Slicer ingesteld als de standaardtoepassing " "om .3mf-bestanden te openen" msgid "Associate .stl files to BambuStudio" -msgstr "Koppel .stl-bestanden aan Bambu Studio" +msgstr "Koppel .stl-bestanden aan Orca Slicer" msgid "If enabled, sets BambuStudio as default application to open .stl files" msgstr "" -"Indien ingeschakeld, wordt Bambu Studio ingesteld als de standaardtoepassing " +"Indien ingeschakeld, wordt Orca Slicer ingesteld als de standaardtoepassing " "om .stl-bestanden te openen" msgid "Associate .step/.stp files to BambuStudio" -msgstr "Koppel .step/.stp bestanden aan Bambu Studio" +msgstr "Koppel .step/.stp bestanden aan Orca Slicer" msgid "If enabled, sets BambuStudio as default application to open .step files" msgstr "" -"Indien ingeschakeld, wordt Bambu Studio ingesteld als de standaardtoepassing " +"Indien ingeschakeld, wordt Orca Slicer ingesteld als de standaardtoepassing " "om .step-bestanden te openen" msgid "Online Models" @@ -10568,8 +10568,8 @@ msgstr "" msgid "Automatic flow calibration using Micro Lidar" msgstr "" -msgid "The printer is required to be in the same LAN as Bambu Studio." -msgstr "De printer moet zich in hetzelfde LAN bevinden als Bambu Studio." +msgid "The printer is required to be in the same LAN as Orca Slicer." +msgstr "De printer moet zich in hetzelfde LAN bevinden als Orca Slicer." msgid "Failed to create socket" msgstr "Failed to create socket" @@ -10665,18 +10665,18 @@ msgid "Cool Plate / PLA Plate" msgstr "Cool Plate / PLA Plate" msgid "" -"Click OK to update the Network plug-in when Bambu Studio launches next time." +"Click OK to update the Network plug-in when Orca Slicer launches next time." msgstr "" -"Klik op OK om de netwerkplug-in bij te werken wanneer Bambu Studio de " +"Klik op OK om de netwerkplug-in bij te werken wanneer Orca Slicer de " "volgende keer wordt gestart." -msgid "New version of Bambu Studio" -msgstr "Nieuwe versie van Bambu Studio" +msgid "New version of Orca Slicer" +msgstr "Nieuwe versie van Orca Slicer" msgid "" -"Step 1, please confirm Bambu Studio and your printer are in the same LAN." +"Step 1, please confirm Orca Slicer and your printer are in the same LAN." msgstr "" -"Stap 1, bevestig dat Bambu Studio en uw printer zich in hetzelfde LAN " +"Stap 1, bevestig dat Orca Slicer en uw printer zich in hetzelfde LAN " "bevinden." msgid "" @@ -10787,7 +10787,7 @@ msgid "" msgstr "" "This connects a sparse infill line to an internal perimeter with a short " "segment of an additional perimeter. If expressed as percentage (example: " -"15%) it is calculated over sparse infill line width. Bambu Studio tries to " +"15%) it is calculated over sparse infill line width. Orca Slicer tries to " "connect two close infill lines to a short perimeter segment. If no such " "perimeter segment shorter than infill_anchor_max is found, the infill line " "is connected to a perimeter segment at just one side and the length of the " @@ -10810,7 +10810,7 @@ msgid "" msgstr "" "This connects a sparse infill line to an internal perimeter with a short " "segment of an additional perimeter. If expressed as percentage (example: " -"15%) it is calculated over sparse infill line width. Bambu Studio tries to " +"15%) it is calculated over sparse infill line width. Orca Slicer tries to " "connect two close infill lines to a short perimeter segment. If no such " "perimeter segment shorter than this parameter is found, the infill line is " "connected to a perimeter segment at just one side and the length of the " @@ -11249,25 +11249,25 @@ msgid "" "Subtract a Part\n" "Did you know that you can subtract one mesh from another using the Negative " "part modifier? That way you can, for example, create easily resizable holes " -"directly in Bambu Studio. Read more in the documentation." +"directly in Orca Slicer. Read more in the documentation." msgstr "" "Een onderdeel aftrekken\n" "Wist je dat je de ene mesh van het andere kunt aftrekken met behulp van de " "Negative part modifier? Op die manier kun je bijvoorbeeld gemakkelijk " -"aanpasbare gaten direct in Bambu Studio maken. Lees meer in de documentatie." +"aanpasbare gaten direct in Orca Slicer maken. Lees meer in de documentatie." #: resources/data/hints.ini: [hint:STEP] msgid "" "STEP\n" "Did you know that you can improve your print quality by slicing a STEP file " "instead of an STL?\n" -"Bambu Studio supports slicing STEP files, providing smoother results than a " +"Orca Slicer supports slicing STEP files, providing smoother results than a " "lower resolution STL. Give it a try!" msgstr "" "STEP\n" "Wist u dat u uw afdrukkwaliteit kunt verbeteren door een STEP-bestand te " "slicen in plaats van een STL?\n" -"Bambu Studio ondersteunt het slicen van STEP-bestanden, waardoor de " +"Orca Slicer ondersteunt het slicen van STEP-bestanden, waardoor de " "resultaten vloeiender zijn dan die van een STL met een lagere resolutie. " "Probeer het eens!" @@ -11399,14 +11399,14 @@ msgstr "" #~ "BambuStudio." #~ msgid "" -#~ "BambuStudio will terminate because of running out of memory.It may be a " +#~ "OrcaSlicer will terminate because of running out of memory.It may be a " #~ "bug. It will be appreciated if you report the issue to our team." #~ msgstr "" #~ "Orca Slicer wordt beëindigd omdat het geheugen bijna vol is. Het kan een " #~ "bug zijn. Meldt dit probleem alstublieft bij support." #~ msgid "" -#~ "BambuStudio will terminate because of a localization error. It will be " +#~ "OrcaSlicer will terminate because of a localization error. It will be " #~ "appreciated if you report the specific scenario this issue happened." #~ msgstr "" #~ "Er is een lokalisatiefout opgetreden en Orca Slicer wordt afgesloten." @@ -12156,10 +12156,10 @@ msgstr "" #~ "vul ze in de invoervakken in." #~ msgid "" -#~ "Cannot detect the LAN IP address of %s. Are %s and Bambu Studio in the " +#~ "Cannot detect the LAN IP address of %s. Are %s and Orca Slicer in the " #~ "same LAN?" #~ msgstr "" -#~ "Kan het LAN IP-adres van %s niet detecteren. Zijn %s en Bambu Studio in " +#~ "Kan het LAN IP-adres van %s niet detecteren. Zijn %s en Orca Slicer in " #~ "hetzelfde LAN aanwezig?" #~ msgid "Choose save directory" @@ -12460,11 +12460,11 @@ msgstr "" #~ msgid "" #~ "There are some unknown filaments mapped to generic preset. Please update " -#~ "Bambu Studio or restart Bambu Studio to check if there is an update to " +#~ "Orca Slicer or restart Orca Slicer to check if there is an update to " #~ "system presets." #~ msgstr "" #~ "Er zijn enkele onbekende filamenten toegewezen aan generieke " -#~ "voorinstellingen. Werk Bambu Studio bij of start Bambu Studio opnieuw op " +#~ "voorinstellingen. Werk Orca Slicer bij of start Orca Slicer opnieuw op " #~ "om te controleren of er een update is voor systeemvoorinstellingen." #~ msgid "Timelapse without toolhead" diff --git a/bbl/i18n/ru/OrcaSlicer_ru.po b/localization/i18n/ru/OrcaSlicer_ru.po similarity index 99% rename from bbl/i18n/ru/OrcaSlicer_ru.po rename to localization/i18n/ru/OrcaSlicer_ru.po index 66079f6bdca..2e38dc49a73 100644 --- a/bbl/i18n/ru/OrcaSlicer_ru.po +++ b/localization/i18n/ru/OrcaSlicer_ru.po @@ -3623,11 +3623,11 @@ msgstr "Загрузка инструментов виртуальной кам msgid "" "Another virtual camera is running.\n" -"Bambu Studio supports only a single virtual camera.\n" +"Bambulab printer supports only a single virtual camera.\n" "Do you want to stop this virtual camera?" msgstr "" "Запущена другая виртуальная камера.\n" -"Bambu Studio поддерживает только одну виртуальную камеру.\n" +"Orca Slicer поддерживает только одну виртуальную камеру.\n" "Вы хотите остановить эту виртуальную камеру?" #, c-format, boost-format diff --git a/bbl/i18n/sv/OrcaSlicer_sv.po b/localization/i18n/sv/OrcaSlicer_sv.po similarity index 99% rename from bbl/i18n/sv/OrcaSlicer_sv.po rename to localization/i18n/sv/OrcaSlicer_sv.po index ae6564b27d8..7b4d8eb361b 100644 --- a/bbl/i18n/sv/OrcaSlicer_sv.po +++ b/localization/i18n/sv/OrcaSlicer_sv.po @@ -3520,11 +3520,11 @@ msgstr "Ladda ner Virtuella Kamerans Verktyg" msgid "" "Another virtual camera is running.\n" -"Bambu Studio supports only a single virtual camera.\n" +"Bambulab printer supports only a single virtual camera.\n" "Do you want to stop this virtual camera?" msgstr "" "En annan virtuell kamera körs.\n" -"Bambu Studio stöder endast en virtuell kamera.\n" +"Orca Slicer stöder endast en virtuell kamera.\n" "Vill du stoppa den här virtuella kameran?" #, c-format, boost-format @@ -6139,7 +6139,7 @@ msgid "" msgstr "" "Firmware versionen är onormal. Reparation och uppdatering krävs före " "utskrift. Vill du uppdatera nu? Du kan också uppdatera senare på skrivaren " -"eller uppdatera nästa gång du startar Bambu Studio." +"eller uppdatera nästa gång du startar Orca Slicer." msgid "Extension Board" msgstr "Utöknings enhet" @@ -10009,11 +10009,11 @@ msgstr "" msgid "Internal Version" msgstr "Intern version" -msgid "The Bambu Studio needs an upgrade" -msgstr "Bambu Studio behöver uppdateras" +msgid "The Orca Slicer needs an upgrade" +msgstr "Orca Slicer behöver uppdateras" -msgid "Bambu Studio GUI initialization failed" -msgstr "Bambu Studio GUI-initiering misslyckades" +msgid "Orca Slicer GUI initialization failed" +msgstr "Orca Slicer GUI-initiering misslyckades" msgid "Bambu Cube" msgstr "" @@ -10117,25 +10117,25 @@ msgstr "" msgid "Successfully sent. Will automatically jump to the next page in %ss" msgstr "" -msgid "Bambu Studio is licensed under " -msgstr "Bambu Studio är licensierad under " +msgid "Orca Slicer is licensed under " +msgstr "Orca Slicer är licensierad under " msgid "" -"Bambu Studio is based on PrusaSlicer by Prusa Research, which is from Slic3r " +"Orca Slicer is based on PrusaSlicer by Prusa Research, which is from Slic3r " "by Alessandro Ranellucci and the RepRap community" msgstr "" -"Bambu Studio är baserad på PrusaSlicer av Prusa Research, som är från Slic3r " +"Orca Slicer är baserad på PrusaSlicer av Prusa Research, som är från Slic3r " "av Alessandro Ranellucci och RepRap-communityn" msgid "" -"Bambu Studio is based on PrusaSlicer by PrusaResearch and SuperSlicer by " +"Orca Slicer is based on PrusaSlicer by PrusaResearch and SuperSlicer by " "Merill(supermerill)." msgstr "" -"Bambu Studio är baserad på PrusaSlicer av PrusaResearch och SuperSlicer av " +"Orca Slicer är baserad på PrusaSlicer av PrusaResearch och SuperSlicer av " "Merill (supermerill)." -msgid "Bambu Studio also referenced some ideas from Cura by Ultimaker." -msgstr "Bambu Studio refererar även några idéer från Cura av Ultimaker." +msgid "Orca Slicer also referenced some ideas from Cura by Ultimaker." +msgstr "Orca Slicer refererar även några idéer från Cura av Ultimaker." msgid "" "There many parts of the software that come from community contributions, so " @@ -10247,7 +10247,7 @@ msgid "Failed to parse model infomations." msgstr "Det gick inte att analysera modellinformation" msgid "" -"The .gcode.3mf file contains no G-code data.Please slice it whthBambu Studio " +"The .gcode.3mf file contains no G-code data.Please slice it whthOrca Slicer " "and export a new .gcode.3mf file." msgstr "" @@ -10272,42 +10272,42 @@ msgstr "" msgid "" "There are some unknown or uncompatible filaments mapped to generic preset. " -"Please update Bambu Studio or restart Bambu Studio to check if there is an " +"Please update Orca Slicer or restart Orca Slicer to check if there is an " "update to system presets." msgstr "" -msgid "The 3mf is generated by old Bambu Studio, load geometry data only." +msgid "The 3mf is generated by old Orca Slicer, load geometry data only." msgstr "" -"3mf-filen genererades i en gammal version av Bambu Studio laddar endast " +"3mf-filen genererades i en gammal version av Orca Slicer laddar endast " "geometri data." msgid "" "\"Fix Model\" feature is currently only on Windows. Please repair the model " -"on Bambu Studio(windows) or CAD softwares." +"on Orca Slicer(windows) or CAD softwares." msgstr "" "Funktionen ”Fix Model” är för närvarande bara på Windows. Reparera modellen " -"i Bambu Studio (Windows) eller CAD-program." +"i Orca Slicer (Windows) eller CAD-program." msgid "Associate files to BambuStudio" -msgstr "Associerade filer till Bambu Studio" +msgstr "Associerade filer till Orca Slicer" msgid "Associate .3mf files to BambuStudio" -msgstr "Associerade .3mf files till Bambu Studio" +msgstr "Associerade .3mf files till Orca Slicer" msgid "If enabled, sets BambuStudio as default application to open .3mf files" -msgstr "Om aktiverad, väljs Bambu Studio som standard att öppna .3mf filer" +msgstr "Om aktiverad, väljs Orca Slicer som standard att öppna .3mf filer" msgid "Associate .stl files to BambuStudio" -msgstr "Associerade .stl filer till Bambu Studio" +msgstr "Associerade .stl filer till Orca Slicer" msgid "If enabled, sets BambuStudio as default application to open .stl files" -msgstr "Om aktiverad, väljs Bambu Studio som standard att öppna .stl filer" +msgstr "Om aktiverad, väljs Orca Slicer som standard att öppna .stl filer" msgid "Associate .step/.stp files to BambuStudio" msgstr "Associera .step/.stp-filer till BambuStudio" msgid "If enabled, sets BambuStudio as default application to open .step files" -msgstr "Om aktiverad, väljs Bambu Studio som standard att öppna .step filer" +msgstr "Om aktiverad, väljs Orca Slicer som standard att öppna .step filer" msgid "Online Models" msgstr "Online modeller" @@ -10372,8 +10372,8 @@ msgstr "" msgid "Automatic flow calibration using Micro Lidar" msgstr "" -msgid "The printer is required to be in the same LAN as Bambu Studio." -msgstr "Skrivaren måste finnas på samma LAN som Bambu Studio." +msgid "The printer is required to be in the same LAN as Orca Slicer." +msgstr "Skrivaren måste finnas på samma LAN som Orca Slicer." msgid "Failed to create socket" msgstr "Det gick inte att skapa uttaget" @@ -10472,17 +10472,17 @@ msgid "Cool Plate / PLA Plate" msgstr "Cool Plate / PLA Platta" msgid "" -"Click OK to update the Network plug-in when Bambu Studio launches next time." +"Click OK to update the Network plug-in when Orca Slicer launches next time." msgstr "" "Klicka på OK för att uppdatera Nätverks plugin programmet nästa gång Bambu " "Studio startar." -msgid "New version of Bambu Studio" -msgstr "Ny version av Bambu Studio" +msgid "New version of Orca Slicer" +msgstr "Ny version av Orca Slicer" msgid "" -"Step 1, please confirm Bambu Studio and your printer are in the same LAN." -msgstr "Steg 1: Bekräfta att Bambu Studio och din skrivare finns på samma LAN." +"Step 1, please confirm Orca Slicer and your printer are in the same LAN." +msgstr "Steg 1: Bekräfta att Orca Slicer och din skrivare finns på samma LAN." msgid "" "The following object(s) have empty initial layer and can't be printed. " @@ -11057,25 +11057,25 @@ msgid "" "Subtract a Part\n" "Did you know that you can subtract one mesh from another using the Negative " "part modifier? That way you can, for example, create easily resizable holes " -"directly in Bambu Studio. Read more in the documentation." +"directly in Orca Slicer. Read more in the documentation." msgstr "" "Subtrahera en del\n" "Visste du att du kan subtrahera ett mesh från ett annat mesh med hjälp av " "modifikationen Negativ del? På så sätt kan du till exempel skapa lätt " -"justerbara hål direkt i Bambu Studio. Läs mer i dokumentationen." +"justerbara hål direkt i Orca Slicer. Läs mer i dokumentationen." #: resources/data/hints.ini: [hint:STEP] msgid "" "STEP\n" "Did you know that you can improve your print quality by slicing a STEP file " "instead of an STL?\n" -"Bambu Studio supports slicing STEP files, providing smoother results than a " +"Orca Slicer supports slicing STEP files, providing smoother results than a " "lower resolution STL. Give it a try!" msgstr "" "STEG\n" "Visste du att du kan förbättra utskriftskvaliteten genom att bereda en STEP-" "fil i stället för en STL-fil?\n" -"Bambu Studio stöder beredningen av STEP-filer, vilket ger jämnare resultat " +"Orca Slicer stöder beredningen av STEP-filer, vilket ger jämnare resultat " "än en STL-fil med lägre upplösning. Prova det!" #~ msgid "Ams filament backup" @@ -11203,14 +11203,14 @@ msgstr "" #~ msgstr "Konfigurationen kan skapas av en nyare version av Orca Slicer." #~ msgid "" -#~ "BambuStudio will terminate because of running out of memory.It may be a " +#~ "OrcaSlicer will terminate because of running out of memory.It may be a " #~ "bug. It will be appreciated if you report the issue to our team." #~ msgstr "" #~ "Orca Slicer har slut på minne och kommer att stängas. Det kan vara en " #~ "bug. Rapportera problemet till Bambu Lab Teamet." #~ msgid "" -#~ "BambuStudio will terminate because of a localization error. It will be " +#~ "OrcaSlicer will terminate because of a localization error. It will be " #~ "appreciated if you report the specific scenario this issue happened." #~ msgstr "" #~ "Ett lokaliserings fel uppstod, Orca Slicer stängs ner. Rapportera till " @@ -11948,10 +11948,10 @@ msgstr "" #~ "inmatningsrutorna." #~ msgid "" -#~ "Cannot detect the LAN IP address of %s. Are %s and Bambu Studio in the " +#~ "Cannot detect the LAN IP address of %s. Are %s and Orca Slicer in the " #~ "same LAN?" #~ msgstr "" -#~ "Kan inte identifiera LAN-IP-adressen för %s. Är %s och Bambu Studio i " +#~ "Kan inte identifiera LAN-IP-adressen för %s. Är %s och Orca Slicer i " #~ "samma LAN?" #~ msgid "Choose save directory" @@ -12243,11 +12243,11 @@ msgstr "" #~ msgid "" #~ "There are some unknown filaments mapped to generic preset. Please update " -#~ "Bambu Studio or restart Bambu Studio to check if there is an update to " +#~ "Orca Slicer or restart Orca Slicer to check if there is an update to " #~ "system presets." #~ msgstr "" #~ "Det finns några okända filament som är kopplade till generiska " -#~ "inställningar. Uppdatera Bambu Studio eller starta om Bambu Studio för " +#~ "inställningar. Uppdatera Orca Slicer eller starta om Orca Slicer för " #~ "att kontrollera om det finns en uppdatering av system inställningarna." #~ msgid "Timelapse without toolhead" diff --git a/bbl/i18n/uk/OrcaSlicer_uk.po b/localization/i18n/uk/OrcaSlicer_uk.po similarity index 99% rename from bbl/i18n/uk/OrcaSlicer_uk.po rename to localization/i18n/uk/OrcaSlicer_uk.po index b2438d61448..cee3191cbed 100644 --- a/bbl/i18n/uk/OrcaSlicer_uk.po +++ b/localization/i18n/uk/OrcaSlicer_uk.po @@ -3616,11 +3616,11 @@ msgstr "Завантаження інструментів віртуальної msgid "" "Another virtual camera is running.\n" -"Bambu Studio supports only a single virtual camera.\n" +"Bambulab printer supports only a single virtual camera.\n" "Do you want to stop this virtual camera?" msgstr "" "Запущено іншу віртуальну камеру.\n" -"Bambu Studio підтримує лише одну віртуальну камеру.\n" +"Orca Slicer підтримує лише одну віртуальну камеру.\n" "Ви хочете зупинити цю віртуальну камеру?" #, c-format, boost-format diff --git a/bbl/i18n/zh_cn/OrcaSlicer_zh_CN.po b/localization/i18n/zh_cn/OrcaSlicer_zh_CN.po similarity index 99% rename from bbl/i18n/zh_cn/OrcaSlicer_zh_CN.po rename to localization/i18n/zh_cn/OrcaSlicer_zh_CN.po index cefae53f980..791eb92153a 100644 --- a/bbl/i18n/zh_cn/OrcaSlicer_zh_CN.po +++ b/localization/i18n/zh_cn/OrcaSlicer_zh_CN.po @@ -3443,7 +3443,7 @@ msgstr "正在下载“虚拟摄像头工具包”" msgid "" "Another virtual camera is running.\n" -"Bambu Studio supports only a single virtual camera.\n" +"Bambulab printer supports only a single virtual camera.\n" "Do you want to stop this virtual camera?" msgstr "" "另一个虚拟摄像头正在工作。\n" @@ -9631,11 +9631,11 @@ msgstr "" "提高强度\n" "你知道吗？你可以使用更多的墙层数和更高的疏散填充密度来提高模型的强度。" -msgid "The Bambu Studio needs an upgrade" -msgstr "Bambu Studio需要进行升级" +msgid "The Orca Slicer needs an upgrade" +msgstr "Orca Slicer需要进行升级" -msgid "Bambu Studio GUI initialization failed" -msgstr "Bambu Studio图形界面初始化失败" +msgid "Orca Slicer GUI initialization failed" +msgstr "Orca Slicer图形界面初始化失败" msgid "Bambu Cube" msgstr "Bambu方块" @@ -9726,25 +9726,25 @@ msgstr "无法将打印文件上传至FTP。请检查网络状态并重试。" msgid "Successfully sent. Will automatically jump to the next page in %ss" msgstr "已成功发送。将自动跳转到%ss中的下一页。" -msgid "Bambu Studio is licensed under " -msgstr "Bambu Studio是在" +msgid "Orca Slicer is licensed under " +msgstr "Orca Slicer是在" msgid "" -"Bambu Studio is based on PrusaSlicer by Prusa Research, which is from Slic3r " +"Orca Slicer is based on PrusaSlicer by Prusa Research, which is from Slic3r " "by Alessandro Ranellucci and the RepRap community" msgstr "" -"Bambu Studio是基于Prusa Research的PrusaSlicer开发的，而PrusaSlicer是基于来自" +"Orca Slicer是基于Prusa Research的PrusaSlicer开发的，而PrusaSlicer是基于来自" "Alessandro Ranellucci和RepRap社区的Slic3r开发的" msgid "" -"Bambu Studio is based on PrusaSlicer by PrusaResearch and SuperSlicer by " +"Orca Slicer is based on PrusaSlicer by PrusaResearch and SuperSlicer by " "Merill(supermerill)." msgstr "" -"Bambu Studio是以PrusaResearch的PrusaSlicer和Merill(supermerill)的SuperSlicer" +"Orca Slicer是以PrusaResearch的PrusaSlicer和Merill(supermerill)的SuperSlicer" "为基础的。" -msgid "Bambu Studio also referenced some ideas from Cura by Ultimaker." -msgstr "Bambu Studio还参考了Ultimaker的Cura中的一些想法。" +msgid "Orca Slicer also referenced some ideas from Cura by Ultimaker." +msgstr "Orca Slicer还参考了Ultimaker的Cura中的一些想法。" msgid "Factors of Flow Dynamics Calibration" msgstr "动态流量校准系数" @@ -9846,10 +9846,10 @@ msgid "Failed to parse model infomations." msgstr "解析模型信息失败。" msgid "" -"The .gcode.3mf file contains no G-code data.Please slice it whthBambu Studio " +"The .gcode.3mf file contains no G-code data.Please slice it whthOrca Slicer " "and export a new .gcode.3mf file." msgstr "" -".gcode.3mf文件中不包含G-code数据。请使用Bambu Studio进行切片并导出新的." +".gcode.3mf文件中不包含G-code数据。请使用Orca Slicer进行切片并导出新的." "gcode.3mf文件。" msgid "Not supported on the current printer version." @@ -9873,42 +9873,42 @@ msgstr " 盘 %1%: " msgid "" "There are some unknown or uncompatible filaments mapped to generic preset. " -"Please update Bambu Studio or restart Bambu Studio to check if there is an " +"Please update Orca Slicer or restart Orca Slicer to check if there is an " "update to system presets." msgstr "" -"有一些未知或不兼容的填料映射到通用预设中。请更新Bambu Studio或重新启动Bambu " +"有一些未知或不兼容的填料映射到通用预设中。请更新Orca Slicer或重新启动Bambu " "Studio，以检查是否有系统预设的更新。" -msgid "The 3mf is generated by old Bambu Studio, load geometry data only." -msgstr "该3mf文件来自旧版本的Bambu Studio，将只加载几何数据。" +msgid "The 3mf is generated by old Orca Slicer, load geometry data only." +msgstr "该3mf文件来自旧版本的Orca Slicer，将只加载几何数据。" msgid "" "\"Fix Model\" feature is currently only on Windows. Please repair the model " -"on Bambu Studio(windows) or CAD softwares." +"on Orca Slicer(windows) or CAD softwares." msgstr "" -"\"修复模型\"功能目前仅适用于Windows。请在Bambu Studio(windows)或CAD软件上修复" +"\"修复模型\"功能目前仅适用于Windows。请在Orca Slicer(windows)或CAD软件上修复" "模型。" msgid "Associate files to BambuStudio" -msgstr "Bambu Studio文件关联" +msgstr "Orca Slicer文件关联" msgid "Associate .3mf files to BambuStudio" -msgstr "使用Bambu Studio打开.3mf文件" +msgstr "使用Orca Slicer打开.3mf文件" msgid "If enabled, sets BambuStudio as default application to open .3mf files" -msgstr "开启后，将缺省使用Bambu Studio打开.3mf文件" +msgstr "开启后，将缺省使用Orca Slicer打开.3mf文件" msgid "Associate .stl files to BambuStudio" -msgstr "使用Bambu Studio打开.stl文件" +msgstr "使用Orca Slicer打开.stl文件" msgid "If enabled, sets BambuStudio as default application to open .stl files" -msgstr "开启后，将缺省使用Bambu Studio打开.stl文件" +msgstr "开启后，将缺省使用Orca Slicer打开.stl文件" msgid "Associate .step/.stp files to BambuStudio" -msgstr "使用Bambu Studio打开.step/.stp文件" +msgstr "使用Orca Slicer打开.step/.stp文件" msgid "If enabled, sets BambuStudio as default application to open .step files" -msgstr "开启后，将缺省使用Bambu Studio打开.step文件" +msgstr "开启后，将缺省使用Orca Slicer打开.step文件" msgid "Online Models" msgstr "在线模型" @@ -9970,8 +9970,8 @@ msgstr "小心使用！纹理PEI板上的流量校准可能会因表面散射而 msgid "Automatic flow calibration using Micro Lidar" msgstr "使用微型激光雷达进行自动流量校准" -msgid "The printer is required to be in the same LAN as Bambu Studio." -msgstr "打印机需要与Bambu Studio在同一个局域网内。" +msgid "The printer is required to be in the same LAN as Orca Slicer." +msgstr "打印机需要与Orca Slicer在同一个局域网内。" msgid "Failed to create socket" msgstr "" @@ -10060,15 +10060,15 @@ msgid "Cool Plate / PLA Plate" msgstr "低温打印板 / PLA打印板" msgid "" -"Click OK to update the Network plug-in when Bambu Studio launches next time." -msgstr "点击\"确定\"，将在Bambu Studio下次启动之后自动升级网络插件" +"Click OK to update the Network plug-in when Orca Slicer launches next time." +msgstr "点击\"确定\"，将在Orca Slicer下次启动之后自动升级网络插件" -msgid "New version of Bambu Studio" -msgstr "新版本的Bambu Studio" +msgid "New version of Orca Slicer" +msgstr "新版本的Orca Slicer" msgid "" -"Step 1, please confirm Bambu Studio and your printer are in the same LAN." -msgstr "第1步，请确认Bambu Studio和您的打印机在同一个LAN上。" +"Step 1, please confirm Orca Slicer and your printer are in the same LAN." +msgstr "第1步，请确认Orca Slicer和您的打印机在同一个LAN上。" msgid "" "The following object(s) have empty initial layer and can't be printed. " @@ -10691,23 +10691,23 @@ msgid "" "Subtract a Part\n" "Did you know that you can subtract one mesh from another using the Negative " "part modifier? That way you can, for example, create easily resizable holes " -"directly in Bambu Studio. Read more in the documentation." +"directly in Orca Slicer. Read more in the documentation." msgstr "" "减去部分几何体\n" "您知道吗，您可以使用负零件从另一个几何体中减去另一个几何体。例如，可以直接在" -"Bambu Studio中创建可轻松调整大小的孔。" +"Orca Slicer中创建可轻松调整大小的孔。" #: resources/data/hints.ini: [hint:STEP] msgid "" "STEP\n" "Did you know that you can improve your print quality by slicing a STEP file " "instead of an STL?\n" -"Bambu Studio supports slicing STEP files, providing smoother results than a " +"Orca Slicer supports slicing STEP files, providing smoother results than a " "lower resolution STL. Give it a try!" msgstr "" "STEP文件\n" "您知道吗，通过切片STEP文件而不是STL文件可以提高打印质量。\n" -"Bambu Studio支持切片STEP文件，提供比低分辨率STL更平滑的结果。试试看！" +"Orca Slicer支持切片STEP文件，提供比低分辨率STL更平滑的结果。试试看！" #~ msgid "Ams filament backup" #~ msgstr "AMS耗材丝备份" @@ -10847,14 +10847,14 @@ msgstr "" #~ msgstr "此配置可能由新版本的逆戟鲸生成。" #~ msgid "" -#~ "BambuStudio will terminate because of running out of memory.It may be a " +#~ "OrcaSlicer will terminate because of running out of memory.It may be a " #~ "bug. It will be appreciated if you report the issue to our team." #~ msgstr "" #~ "系统内存耗尽，逆戟鲸即将终止运行。这可能是个缺陷，希望您可以报告此问题，我" #~ "们将非常感激。" #~ msgid "" -#~ "BambuStudio will terminate because of a localization error. It will be " +#~ "OrcaSlicer will terminate because of a localization error. It will be " #~ "appreciated if you report the specific scenario this issue happened." #~ msgstr "" #~ "遇到本地化错误，逆戟鲸即将终止运行。希望您可以报告发生此问题的具体场景，我" @@ -15185,10 +15185,10 @@ msgstr "" #~ msgid "" #~ "There are some unknown filaments mapped to generic preset. Please update " -#~ "Bambu Studio or restart Bambu Studio to check if there is an update to " +#~ "Orca Slicer or restart Orca Slicer to check if there is an update to " #~ "system presets." #~ msgstr "" -#~ "有一些未知型号的材料，映射到通用预设。请更新或者重启 Bambu Studio，以检查" +#~ "有一些未知型号的材料，映射到通用预设。请更新或者重启 Orca Slicer，以检查" #~ "系统预设有没有更新。" #~ msgid "" @@ -15269,10 +15269,10 @@ msgstr "" #~ msgstr "擦料塔" #~ msgid "Associate .step files to BambuStudio" -#~ msgstr "使用Bambu Studio打开.step文件" +#~ msgstr "使用Orca Slicer打开.step文件" -#~ msgid "Bambu Studio initialization failed" -#~ msgstr "Bambu Studio初始化失败" +#~ msgid "Orca Slicer initialization failed" +#~ msgstr "Orca Slicer初始化失败" #~ msgid "Blacklisted libraries loaded into BambuStudio process:" #~ msgstr "已加载黑名单库到BambuStudio进程中:" diff --git a/resources/images/BambuStudio.png b/resources/images/BambuStudio.png deleted file mode 100644 index 8c3fea0de5621b26b143f5569eb64484f296f4d5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 21898 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

o4s{aVz)< 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 diff --git a/resources/images/BambuStudio-mac_128px.png b/resources/images/OrcaSlicer-mac_128px.png similarity index 100% rename from resources/images/BambuStudio-mac_128px.png rename to resources/images/OrcaSlicer-mac_128px.png diff --git a/resources/images/BambuStudio-mac_256px.ico b/resources/images/OrcaSlicer-mac_256px.ico similarity index 100% rename from resources/images/BambuStudio-mac_256px.ico rename to resources/images/OrcaSlicer-mac_256px.ico diff --git a/resources/images/BambuStudio.icns b/resources/images/OrcaSlicer.icns similarity index 100% rename from resources/images/BambuStudio.icns rename to resources/images/OrcaSlicer.icns diff --git a/resources/images/BambuStudio.svg b/resources/images/OrcaSlicer.svg similarity index 100% rename from resources/images/BambuStudio.svg rename to resources/images/OrcaSlicer.svg diff --git a/resources/images/BambuStudioTitle.ico b/resources/images/OrcaSlicerTitle.ico similarity index 100% rename from resources/images/BambuStudioTitle.ico rename to resources/images/OrcaSlicerTitle.ico diff --git a/resources/images/BambuStudioTitle.png b/resources/images/OrcaSlicerTitle.png similarity index 100% rename from resources/images/BambuStudioTitle.png rename to resources/images/OrcaSlicerTitle.png diff --git a/resources/images/BambuStudio_128px.png b/resources/images/OrcaSlicer_128px.png similarity index 100% rename from resources/images/BambuStudio_128px.png rename to resources/images/OrcaSlicer_128px.png diff --git a/resources/images/BambuStudio_154.png b/resources/images/OrcaSlicer_154.png similarity index 100% rename from resources/images/BambuStudio_154.png rename to resources/images/OrcaSlicer_154.png diff --git a/resources/images/BambuStudio_154_title.png b/resources/images/OrcaSlicer_154_title.png similarity index 100% rename from resources/images/BambuStudio_154_title.png rename to resources/images/OrcaSlicer_154_title.png diff --git a/resources/images/BambuStudio_192px_grayscale.png b/resources/images/OrcaSlicer_192px_grayscale.png similarity index 100% rename from resources/images/BambuStudio_192px_grayscale.png rename to resources/images/OrcaSlicer_192px_grayscale.png diff --git a/resources/images/BambuStudio_192px_transparent.png b/resources/images/OrcaSlicer_192px_transparent.png similarity index 100% rename from resources/images/BambuStudio_192px_transparent.png rename to resources/images/OrcaSlicer_192px_transparent.png diff --git a/resources/images/BambuStudio_64.png b/resources/images/OrcaSlicer_64.png similarity index 100% rename from resources/images/BambuStudio_64.png rename to resources/images/OrcaSlicer_64.png diff --git a/resources/images/BambuStudio_about.svg b/resources/images/OrcaSlicer_about.svg similarity index 100% rename from resources/images/BambuStudio_about.svg rename to resources/images/OrcaSlicer_about.svg diff --git a/resources/web/data/text.js b/resources/web/data/text.js index 208bb9fc153..26f6b7ce5e1 100644 --- a/resources/web/data/text.js +++ b/resources/web/data/text.js @@ -398,7 +398,7 @@ var LangText={ "t50":"Se déconnecter", "t52":"Passer", "t53":"Rejoindre", - "t54":"Dans la communauté de l'impression 3D, nous apprenons des succès et des échecs des uns et des autres pour ajuster nos propres paramètres et paramètres de découpage. Bambu Studio suit le même principe et utilise l'apprentissage automatique pour améliorer ses performances à partir des succès et des échecs du grand nombre d'impressions de nos utilisateurs. Nous formons Bambu Studio à être plus intelligent en leur fournissant les données du monde réel. Si vous le souhaitez, ce service accédera aux informations de vos journaux d'erreurs et de vos journaux d'utilisation, qui peuvent inclure des informations décrites dans ", + "t54":"Dans la communauté de l'impression 3D, nous apprenons des succès et des échecs des uns et des autres pour ajuster nos propres paramètres et paramètres de découpage. Orca Slicer suit le même principe et utilise l'apprentissage automatique pour améliorer ses performances à partir des succès et des échecs du grand nombre d'impressions de nos utilisateurs. Nous formons Orca Slicer à être plus intelligent en leur fournissant les données du monde réel. Si vous le souhaitez, ce service accédera aux informations de vos journaux d'erreurs et de vos journaux d'utilisation, qui peuvent inclure des informations décrites dans ", "t55":"Politique de confidentialité", "t56":". Nous ne collecterons aucune donnée personnelle par laquelle un individu peut être identifié directement ou indirectement, y compris, sans s'y limiter, les noms, adresses, informations de paiement ou numéros de téléphone. En activant ce service, vous acceptez ces conditions et la déclaration sur la politique de confidentialité.", "t57":"", @@ -454,7 +454,7 @@ var LangText={ "wk13":"Format STEP", "wk14":"Par rapport au format STL, le format STEP apporte des informations plus efficaces. Grâce à la grande précision de ce format, de nombreuses trajectoires d'extrusion peuvent être générées sous forme d'arcs. Il inclut également la relation d'assemblage de chaque pièce d'un modèle, qui peut être utilisée pour restaurer la vue d'assemblage après la coupe d'un modèle.", "wk15":"Texte 3D", - "wk16":"Avec l'outil Texte 3D, les utilisateurs peuvent facilement créer diverses formes de texte 3D dans le projet, ce qui rend le modèle plus personnalisé. Bambu Studio fournit des dizaines de polices et prend en charge les styles gras et italique pour donner au texte une plus grande flexibilité." + "wk16":"Avec l'outil Texte 3D, les utilisateurs peuvent facilement créer diverses formes de texte 3D dans le projet, ce qui rend le modèle plus personnalisé. Orca Slicer fournit des dizaines de polices et prend en charge les styles gras et italique pour donner au texte une plus grande flexibilité." }, "zh_CN":{ "t1":"欢迎使用Orca Slicer", diff --git a/run_gettext.bat b/run_gettext.bat index 20d825d5c54..a767997b0fc 100644 --- a/run_gettext.bat +++ b/run_gettext.bat @@ -1,15 +1,15 @@ @echo off REM OrcaSlicer gettext REM Created by SoftFever on 27/5/23. -xgettext --keyword=L --keyword=_L --keyword=_u8L --keyword=L_CONTEXT:1,2c --keyword=_L_PLURAL:1,2 --add-comments=TRN --from-code=UTF-8 --no-location --debug --boost -f ./bbl/i18n/list.txt -o ./bbl/i18n/OrcaSlicer.pot -build\src\hints\Release\hintsToPot ./resources ./bbl/i18n +xgettext --keyword=L --keyword=_L --keyword=_u8L --keyword=L_CONTEXT:1,2c --keyword=_L_PLURAL:1,2 --add-comments=TRN --from-code=UTF-8 --no-location --debug --boost -f ./localization/i18n/list.txt -o ./localization/i18n/OrcaSlicer.pot +build\src\hints\Release\hintsToPot ./resources ./localization/i18n REM Print the current directory echo %cd% -set pot_file="./bbl/i18n/OrcaSlicer.pot" +set pot_file="./localization/i18n/OrcaSlicer.pot" REM Run the script for each .po file -for /r "./bbl/i18n/" %%f in (*.po) do ( +for /r "./localization/i18n/" %%f in (*.po) do ( call :processFile "%%f" ) goto :eof diff --git a/run_gettext.sh b/run_gettext.sh index 1862ccd39b2..77d518c9541 100755 --- a/run_gettext.sh +++ b/run_gettext.sh @@ -3,13 +3,13 @@ # OrcaSlicer gettext # Created by SoftFever on 27/5/23. # -xgettext --keyword=L --keyword=_L --keyword=_u8L --keyword=L_CONTEXT:1,2c --keyword=_L_PLURAL:1,2 --add-comments=TRN --from-code=UTF-8 --no-location --debug --boost -f ./bbl/i18n/list.txt -o ./bbl/i18n/OrcaSlicer.pot -./build_arm64/src/hints/Release/hintsToPot.app/Contents/MacOS/hintsToPot ./resources ./bbl/i18n +xgettext --keyword=L --keyword=_L --keyword=_u8L --keyword=L_CONTEXT:1,2c --keyword=_L_PLURAL:1,2 --add-comments=TRN --from-code=UTF-8 --no-location --debug --boost -f ./localization/i18n/list.txt -o ./localization/i18n/OrcaSlicer.pot +./build_arm64/src/hints/Release/hintsToPot.app/Contents/MacOS/hintsToPot ./resources ./localization/i18n echo $PWD -pot_file="./bbl/i18n/OrcaSlicer.pot" -for dir in ./bbl/i18n/*/ +pot_file="./localization/i18n/OrcaSlicer.pot" +for dir in ./localization/i18n/*/ do dir=${dir%*/} # remove the trailing "/" lang=${dir##*/} # extract the language identifier diff --git a/sandboxes/opencsg/main.cpp b/sandboxes/opencsg/main.cpp index c63e669ab6e..2bef9628b68 100644 --- a/sandboxes/opencsg/main.cpp +++ b/sandboxes/opencsg/main.cpp @@ -335,7 +335,7 @@ class App : public wxApp { bool is_play = parser.Found("play", &m_fname); - m_frame = new MyFrame("BambuStudio OpenCSG Demo", wxDefaultPosition, wxSize(1024, 768), parser); + m_frame = new MyFrame("OrcaSlicer OpenCSG Demo", wxDefaultPosition, wxSize(1024, 768), parser); if (is_play) { Bind(wxEVT_IDLE, &App::Play, this); diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 0fc1206eed4..8d92d64b93f 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -108,9 +108,9 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/platform/msw/OrcaSlicer.rc.in ${CMAKE configure_file(${CMAKE_CURRENT_SOURCE_DIR}/platform/msw/OrcaSlicer.manifest.in ${CMAKE_CURRENT_BINARY_DIR}/OrcaSlicer.manifest @ONLY) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/platform/osx/Info.plist.in ${CMAKE_CURRENT_BINARY_DIR}/Info.plist @ONLY) if (WIN32) - add_library(OrcaSlicer SHARED BambuStudio.cpp BambuStudio.hpp BaseException.cpp BaseException.h StackWalker.cpp StackWalker.h) + add_library(OrcaSlicer SHARED OrcaSlicer.cpp OrcaSlicer.hpp BaseException.cpp BaseException.h StackWalker.cpp StackWalker.h) else () - add_executable(OrcaSlicer BambuStudio.cpp BambuStudio.hpp) + add_executable(OrcaSlicer OrcaSlicer.cpp OrcaSlicer.hpp) endif () if (MINGW) @@ -132,7 +132,7 @@ if (APPLE) # -liconv: boost links to libiconv by default target_link_libraries(OrcaSlicer "-liconv -framework IOKit" "-framework CoreFoundation" "-framework AVFoundation" "-framework AVKit" "-framework CoreMedia" "-framework VideoToolbox" -lc++) elseif (MSVC) - # Manifest is provided through BambuStudio.rc, don't generate your own. + # Manifest is provided through OrcaSlicer.rc, don't generate your own. set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /MANIFEST:NO") else () # Boost on Raspberry-Pi does not link to pthreads explicitely. @@ -167,7 +167,7 @@ if (WIN32) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -municode") endif() - add_executable(OrcaSlicer_app_gui WIN32 BambuStudio_app_msvc.cpp ${CMAKE_CURRENT_BINARY_DIR}/OrcaSlicer.rc) + add_executable(OrcaSlicer_app_gui WIN32 OrcaSlicer_app_msvc.cpp ${CMAKE_CURRENT_BINARY_DIR}/OrcaSlicer.rc) # Generate debug symbols even in release mode. if(MSVC) target_link_options(OrcaSlicer_app_gui PUBLIC "$<$:/DEBUG>") diff --git a/src/BambuStudio.cpp b/src/OrcaSlicer.cpp similarity index 99% rename from src/BambuStudio.cpp rename to src/OrcaSlicer.cpp index 72f58a1355c..6dfcc686de9 100644 --- a/src/BambuStudio.cpp +++ b/src/OrcaSlicer.cpp @@ -66,7 +66,7 @@ using namespace nlohmann; #include "libslic3r/Orient.hpp" -#include "BambuStudio.hpp" +#include "OrcaSlicer.hpp" //BBS: add exception handler for win32 #include #ifdef WIN32 @@ -2749,9 +2749,9 @@ bool CLI::setup(int argc, char **argv) std::wstring text = L"Following DLLs have been injected into the OrcaSlicer process:\n\n"; text += BlacklistedLibraryCheck::get_instance().get_blacklisted_string(); text += L"\n\n" - L"BambuStudio is known to not run correctly with these DLLs injected. " + L"OrcaSlicer is known to not run correctly with these DLLs injected. " L"We suggest stopping or uninstalling these services if you experience " - L"crashes or unexpected behaviour while using BambuStudio.\n" + L"crashes or unexpected behaviour while using OrcaSlicer.\n" L"For example, ASUS Sonic Studio injects a Nahimic driver, which makes OrcaSlicer " L"to crash on a secondary monitor"; MessageBoxW(NULL, text.c_str(), L"Warning"/*L"Incopatible library found"*/, MB_OK); diff --git a/src/BambuStudio.hpp b/src/OrcaSlicer.hpp similarity index 100% rename from src/BambuStudio.hpp rename to src/OrcaSlicer.hpp diff --git a/src/BambuStudio_app_msvc.cpp b/src/OrcaSlicer_app_msvc.cpp similarity index 100% rename from src/BambuStudio_app_msvc.cpp rename to src/OrcaSlicer_app_msvc.cpp diff --git a/src/libslic3r/Config.cpp b/src/libslic3r/Config.cpp index 346665a1352..629d8778d5a 100644 --- a/src/libslic3r/Config.cpp +++ b/src/libslic3r/Config.cpp @@ -1220,7 +1220,7 @@ ConfigSubstitutions ConfigBase::load_from_gcode_file(const std::string &file, Fo bool has_delimiters = true; { //BBS - std::string bambuslicer_gcode_header = "; BambuStudio"; + std::string bambuslicer_gcode_header = "; OrcaSlicer"; std::string orcaslicer_gcode_header = std::string("; generated by "); orcaslicer_gcode_header += SLIC3R_APP_NAME; diff --git a/src/libslic3r/GCode/GCodeProcessor.cpp b/src/libslic3r/GCode/GCodeProcessor.cpp index 6621ca79974..09c6cdf607f 100644 --- a/src/libslic3r/GCode/GCodeProcessor.cpp +++ b/src/libslic3r/GCode/GCodeProcessor.cpp @@ -849,10 +849,10 @@ void GCodeProcessorResult::reset() { const std::vector> GCodeProcessor::Producers = { //BBS: OrcaSlicer is also "bambu". Otherwise the time estimation didn't work. //FIXME: Workaround and should be handled when do removing-bambu - { EProducer::BambuStudio, SLIC3R_APP_NAME }, - { EProducer::BambuStudio, "generated by OrcaSlicer" }, - { EProducer::BambuStudio, "generated by BambuStudio" }, - { EProducer::BambuStudio, "BambuStudio" } + { EProducer::OrcaSlicer, SLIC3R_APP_NAME }, + { EProducer::OrcaSlicer, "generated by OrcaSlicer" }, + { EProducer::OrcaSlicer, "generated by BambuStudio" }, + { EProducer::OrcaSlicer, "BambuStudio" } //{ EProducer::Slic3rPE, "generated by Slic3r Bambu Edition" }, //{ EProducer::Slic3r, "generated by Slic3r" }, //{ EProducer::SuperSlicer, "generated by SuperSlicer" }, @@ -1393,12 +1393,12 @@ void GCodeProcessor::process_file(const std::string& filename, std::functionadd("single_instance", coBool); def->label = L("Single instance mode"); - def->tooltip = L("If enabled, the command line arguments are sent to an existing instance of GUI BambuStudio, " + def->tooltip = L("If enabled, the command line arguments are sent to an existing instance of GUI OrcaSlicer, " "or an existing OrcaSlicer window is activated. " "Overrides the \"single_instance\" configuration value from application preferences.");*/ diff --git a/src/libslic3r/libslic3r.h b/src/libslic3r/libslic3r.h index 303ab7a18b7..9cf0c959fab 100644 --- a/src/libslic3r/libslic3r.h +++ b/src/libslic3r/libslic3r.h @@ -3,8 +3,8 @@ #include "libslic3r_version.h" #define SLIC3R_APP_FULL_NAME "Orca Slicer" -#define GCODEVIEWER_APP_NAME "BambuStudio G-code Viewer" -#define GCODEVIEWER_APP_KEY "BambuStudioGcodeViewer" +#define GCODEVIEWER_APP_NAME "OrcaSlicer G-code Viewer" +#define GCODEVIEWER_APP_KEY "OrcaSlicerGcodeViewer" #define GCODEVIEWER_BUILD_ID std::string("OrcaSlicer G-code Viewer-") + std::string(SLIC3R_VERSION) + std::string("-RC") // this needs to be included early for MSVC (listing it in Build.PL is not enough) diff --git a/src/libslic3r/utils.cpp b/src/libslic3r/utils.cpp index 5c4c6844a06..f5915175c71 100644 --- a/src/libslic3r/utils.cpp +++ b/src/libslic3r/utils.cpp @@ -305,7 +305,7 @@ void set_log_path_and_level(const std::string& file, unsigned int level) } #endif - //BBS log file at C:\\Users\\[yourname]\\AppData\\Roaming\\BambuStudio\\log\\[log_filename].log + //BBS log file at C:\\Users\\[yourname]\\AppData\\Roaming\\OrcaSlicer\\log\\[log_filename].log auto log_folder = boost::filesystem::path(g_data_dir) / "log"; if (!boost::filesystem::exists(log_folder)) { boost::filesystem::create_directory(log_folder); diff --git a/src/miniz/README-Bambu.txt b/src/miniz/README-Prusa.txt similarity index 88% rename from src/miniz/README-Bambu.txt rename to src/miniz/README-Prusa.txt index bd115a15d90..83b72cda3a4 100644 --- a/src/miniz/README-Bambu.txt +++ b/src/miniz/README-Prusa.txt @@ -2,7 +2,7 @@ This library is based on miniz 2.1.0 - amalgamated version. ---------------------------------------------------------------- -BambuStudio homebrewed the following: +PrusaResearch (Vojtech) homebrewed the following: mz_zip_writer_add_staged_open(), mz_zip_writer_add_staged_data() and mz_zip_writer_add_staged_finish() were derived from mz_zip_writer_add_read_buf_callback() by splitting it and passing a new @@ -16,7 +16,7 @@ knowing the size of the file up front. Vojtech made the following comments to the pull request above: -The pull request looks good to me in general. We need such a functionality so we are going to merge it into our project. Namely, we are exporting potentially huge model files, which are XML encoded, thus the compression ration is quite high and keeping the XML encoded model file in memory is not really practical. +The pull request looks good to me in general. We need such a functionality at https://github.com/prusa3d/PrusaSlicer so we are going to merge it into our project. Namely, we are exporting potentially huge model files, which are XML encoded, thus the compression ration is quite high and keeping the XML encoded model file in memory is not really practical. I am a bit uneasy about two things though: diff --git a/src/platform/msw/OrcaSlicer-gcodeviewer.rc.in b/src/platform/msw/OrcaSlicer-gcodeviewer.rc.in index 9fbb8aa5bfc..f4dc576364b 100644 --- a/src/platform/msw/OrcaSlicer-gcodeviewer.rc.in +++ b/src/platform/msw/OrcaSlicer-gcodeviewer.rc.in @@ -21,5 +21,5 @@ PRODUCTVERSION @SLIC3R_VERSION@ VALUE "Translation", 0x409, 1252 } } -2 ICON "@SLIC3R_RESOURCES_DIR@/images/BambuStudio-gcodeviewer.ico" +2 ICON "@SLIC3R_RESOURCES_DIR@/images/OrcaSlicer-gcodeviewer.ico" 1 24 "OrcaSlicer.manifest" diff --git a/src/platform/osx/Info.plist.in b/src/platform/osx/Info.plist.in index be52fe1e9dd..4e12fe46566 100644 --- a/src/platform/osx/Info.plist.in +++ b/src/platform/osx/Info.plist.in @@ -7,7 +7,7 @@ CFBundleGetInfoString @SLIC3R_APP_NAME@ Copyright(C) 2021-2023 Lunkuo All Rights Reserved CFBundleIconFile - BambuStudio.icns + OrcaSlicer.icns CFBundleName @SLIC3R_APP_KEY@ CFBundleShortVersionString @@ -48,7 +48,7 @@ OBJ CFBundleTypeIconFile - BambuStudio.icns + OrcaSlicer.icns CFBundleTypeName STL CFBundleTypeRole @@ -65,7 +65,7 @@ AMF CFBundleTypeIconFile - BambuStudio.icns + OrcaSlicer.icns CFBundleTypeName AMF CFBundleTypeRole @@ -82,7 +82,7 @@ 3MF CFBundleTypeIconFile - BambuStudio.icns + OrcaSlicer.icns CFBundleTypeName 3MF CFBundleTypeRole diff --git a/src/platform/unix/BambuGcodeviewer.desktop b/src/platform/unix/BambuGcodeviewer.desktop index 0cdfed6ed49..dcfe87153d6 100644 --- a/src/platform/unix/BambuGcodeviewer.desktop +++ b/src/platform/unix/BambuGcodeviewer.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Name=Bambu GCode viewer Exec=orca-slicer --gcodeviewer %F -Icon=BambuStudio-gcodeviewer +Icon=OrcaSlicer-gcodeviewer Terminal=false Type=Application MimeType=text/x.gcode; diff --git a/src/platform/unix/OrcaSlicer.desktop b/src/platform/unix/OrcaSlicer.desktop index 5db121b901c..c61b4088854 100644 --- a/src/platform/unix/OrcaSlicer.desktop +++ b/src/platform/unix/OrcaSlicer.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Name=OrcaSlicer GenericName=3D Printing Software -Icon=BambuStudio +Icon=OrcaSlicer Exec=orca-slicer %F Terminal=false Type=Application diff --git a/src/slic3r/GUI/AboutDialog.cpp b/src/slic3r/GUI/AboutDialog.cpp index 1e82f950c8a..74f5efbe6ec 100644 --- a/src/slic3r/GUI/AboutDialog.cpp +++ b/src/slic3r/GUI/AboutDialog.cpp @@ -17,7 +17,7 @@ AboutDialogLogo::AboutDialogLogo(wxWindow* parent) : wxPanel(parent, wxID_ANY, wxDefaultPosition, wxDefaultSize) { this->SetBackgroundColour(*wxWHITE); - this->logo = ScalableBitmap(this, Slic3r::var("BambuStudio_192px.png"), wxBITMAP_TYPE_PNG); + this->logo = ScalableBitmap(this, Slic3r::var("OrcaSlicer_192px.png"), wxBITMAP_TYPE_PNG); this->SetMinSize(this->logo.GetBmpSize()); this->Bind(wxEVT_PAINT, &AboutDialogLogo::onRepaint, this); @@ -49,7 +49,7 @@ CopyrightsDialog::CopyrightsDialog() this->SetFont(wxGetApp().normal_font()); this->SetBackgroundColour(*wxWHITE); - std::string icon_path = (boost::format("%1%/images/BambuStudioTitle.ico") % resources_dir()).str(); + std::string icon_path = (boost::format("%1%/images/OrcaSlicerTitle.ico") % resources_dir()).str(); SetIcon(wxIcon(encode_path(icon_path.c_str()), wxBITMAP_TYPE_ICO)); wxStaticLine *staticline1 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); @@ -214,7 +214,7 @@ AboutDialog::AboutDialog() SetFont(wxGetApp().normal_font()); SetBackgroundColour(*wxWHITE); - std::string icon_path = (boost::format("%1%/images/BambuStudioTitle.ico") % resources_dir()).str(); + std::string icon_path = (boost::format("%1%/images/OrcaSlicerTitle.ico") % resources_dir()).str(); SetIcon(wxIcon(encode_path(icon_path.c_str()), wxBITMAP_TYPE_ICO)); wxPanel *m_panel = new wxPanel(this, wxID_ANY, wxDefaultPosition, wxSize(FromDIP(560), FromDIP(237)), wxTAB_TRAVERSAL); @@ -231,7 +231,7 @@ AboutDialog::AboutDialog() main_sizer->Add(ver_sizer, 0, wxEXPAND | wxALL, 0); // logo - m_logo_bitmap = ScalableBitmap(this, "BambuStudio_about", 250); + m_logo_bitmap = ScalableBitmap(this, "OrcaSlicer_about", 250); m_logo = new wxStaticBitmap(this, wxID_ANY, m_logo_bitmap.bmp(), wxDefaultPosition,wxDefaultSize, 0); m_logo->SetSizer(vesizer); diff --git a/src/slic3r/GUI/AmsMappingPopup.cpp b/src/slic3r/GUI/AmsMappingPopup.cpp index d4f75e20d41..f0014ddeabd 100644 --- a/src/slic3r/GUI/AmsMappingPopup.cpp +++ b/src/slic3r/GUI/AmsMappingPopup.cpp @@ -1130,7 +1130,7 @@ void AmsReplaceMaterialDialog::create() SetMaxSize(wxSize(FromDIP(376), -1)); // set icon for dialog - std::string icon_path = (boost::format("%1%/images/BambuStudioTitle.ico") % resources_dir()).str(); + std::string icon_path = (boost::format("%1%/images/OrcaSlicerTitle.ico") % resources_dir()).str(); SetIcon(wxIcon(encode_path(icon_path.c_str()), wxBITMAP_TYPE_ICO)); SetSizeHints(wxDefaultSize, wxDefaultSize); diff --git a/src/slic3r/GUI/BindDialog.cpp b/src/slic3r/GUI/BindDialog.cpp index 74748938734..4bde0fa19f1 100644 --- a/src/slic3r/GUI/BindDialog.cpp +++ b/src/slic3r/GUI/BindDialog.cpp @@ -18,7 +18,7 @@ namespace GUI { BindMachineDialog::BindMachineDialog(Plater *plater /*= nullptr*/) : DPIDialog(static_cast(wxGetApp().mainframe), wxID_ANY, _L("Log in printer"), wxDefaultPosition, wxDefaultSize, wxCAPTION) { - std::string icon_path = (boost::format("%1%/images/BambuStudioTitle.ico") % resources_dir()).str(); + std::string icon_path = (boost::format("%1%/images/OrcaSlicerTitle.ico") % resources_dir()).str(); SetIcon(wxIcon(encode_path(icon_path.c_str()), wxBITMAP_TYPE_ICO)); SetBackgroundColour(*wxWHITE); @@ -299,7 +299,7 @@ void BindMachineDialog::on_show(wxShowEvent &event) UnBindMachineDialog::UnBindMachineDialog(Plater *plater /*= nullptr*/) : DPIDialog(static_cast(wxGetApp().mainframe), wxID_ANY, _L("Log out printer"), wxDefaultPosition, wxDefaultSize, wxCAPTION) { - std::string icon_path = (boost::format("%1%/images/BambuStudioTitle.ico") % resources_dir()).str(); + std::string icon_path = (boost::format("%1%/images/OrcaSlicerTitle.ico") % resources_dir()).str(); SetIcon(wxIcon(encode_path(icon_path.c_str()), wxBITMAP_TYPE_ICO)); SetBackgroundColour(*wxWHITE); diff --git a/src/slic3r/GUI/Calibration.cpp b/src/slic3r/GUI/Calibration.cpp index cdb4e521ee0..f6e9a3b146f 100644 --- a/src/slic3r/GUI/Calibration.cpp +++ b/src/slic3r/GUI/Calibration.cpp @@ -20,7 +20,7 @@ CalibrationDialog::CalibrationDialog(Plater *plater) : DPIDialog(static_cast(wxGetApp().mainframe), wxID_ANY, _L("Calibration"), wxDefaultPosition, wxDefaultSize, wxCAPTION | wxCLOSE_BOX) { this->SetDoubleBuffered(true); - std::string icon_path = (boost::format("%1%/images/BambuStudioTitle.ico") % resources_dir()).str(); + std::string icon_path = (boost::format("%1%/images/OrcaSlicerTitle.ico") % resources_dir()).str(); SetIcon(wxIcon(encode_path(icon_path.c_str()), wxBITMAP_TYPE_ICO)); SetBackgroundColour(*wxWHITE); diff --git a/src/slic3r/GUI/ConfigWizard.cpp b/src/slic3r/GUI/ConfigWizard.cpp index 24bf3a06eda..167d8273eee 100644 --- a/src/slic3r/GUI/ConfigWizard.cpp +++ b/src/slic3r/GUI/ConfigWizard.cpp @@ -1487,7 +1487,7 @@ void PageTemperatures::apply_custom_config(DynamicPrintConfig& config) ConfigWizardIndex::ConfigWizardIndex(wxWindow *parent) : wxPanel(parent) - , bg(ScalableBitmap(parent, "BambuStudio_192px_transparent.png", 192)) + , bg(ScalableBitmap(parent, "OrcaSlicer_192px_transparent.png", 192)) , bullet_black(ScalableBitmap(parent, "bullet_black.png")) , bullet_blue(ScalableBitmap(parent, "bullet_blue.png")) , bullet_white(ScalableBitmap(parent, "bullet_white.png")) diff --git a/src/slic3r/GUI/DesktopIntegrationDialog.cpp b/src/slic3r/GUI/DesktopIntegrationDialog.cpp index e5758f86c79..05bedf536f8 100644 --- a/src/slic3r/GUI/DesktopIntegrationDialog.cpp +++ b/src/slic3r/GUI/DesktopIntegrationDialog.cpp @@ -209,7 +209,7 @@ bool DesktopIntegrationDialog::is_integrated() if (path.empty()) return false; - // confirmation that BambuStudio.desktop exists + // confirmation that OrcaSlicer.desktop exists struct stat buffer; return (stat (path.c_str(), &buffer) == 0); } @@ -290,11 +290,11 @@ void DesktopIntegrationDialog::perform_desktop_integration() // slicer icon // iterate thru target_candidates to find icons folder for (size_t i = 0; i < target_candidates.size(); ++i) { - // Copy icon BambuStudio.png from resources_dir()/icons to target_dir_icons/icons/ + // Copy icon OrcaSlicer.png from resources_dir()/icons to target_dir_icons/icons/ if (contains_path_dir(target_candidates[i], "images")) { target_dir_icons = target_candidates[i]; - std::string icon_path = GUI::format("%1%/images/BambuStudio.png",resources_dir()); - std::string dest_path = GUI::format("%1%/images/%2%BambuStudio%3%.png", target_dir_icons, icon_theme_path, version_suffix); + std::string icon_path = GUI::format("%1%/images/OrcaSlicer.png",resources_dir()); + std::string dest_path = GUI::format("%1%/images/%2%OrcaSlicer%3%.png", target_dir_icons, icon_theme_path, version_suffix); if (copy_icon(icon_path, dest_path)) break; // success else @@ -305,8 +305,8 @@ void DesktopIntegrationDialog::perform_desktop_integration() create_path(boost::nowide::narrow(wxFileName::GetHomeDir()), ".local/share/icons" + icon_theme_dirs); // copy icon target_dir_icons = GUI::format("%1%/.local/share",wxFileName::GetHomeDir()); - std::string icon_path = GUI::format("%1%/images/BambuStudio.png",resources_dir()); - std::string dest_path = GUI::format("%1%/images/%2%BambuStudio%3%.png", target_dir_icons, icon_theme_path, version_suffix); + std::string icon_path = GUI::format("%1%/images/OrcaSlicer.png",resources_dir()); + std::string dest_path = GUI::format("%1%/images/%2%OrcaSlicer%3%.png", target_dir_icons, icon_theme_path, version_suffix); if (!contains_path_dir(target_dir_icons, "images") || !copy_icon(icon_path, dest_path)) { // every attempt failed - icon wont be present @@ -319,7 +319,7 @@ void DesktopIntegrationDialog::perform_desktop_integration() BOOST_LOG_TRIVIAL(error) << "Copying OrcaSlicer icon to icons directory failed."; } else // save path to icon - app_config->set("desktop_integration_icon_slicer_path", GUI::format("%1%/images/%2%BambuStudio%3%.png", target_dir_icons, icon_theme_path, version_suffix)); + app_config->set("desktop_integration_icon_slicer_path", GUI::format("%1%/images/%2%OrcaSlicer%3%.png", target_dir_icons, icon_theme_path, version_suffix)); // desktop file // iterate thru target_candidates to find applications folder @@ -332,7 +332,7 @@ void DesktopIntegrationDialog::perform_desktop_integration() "[Desktop Entry]\n" "Name=OrcaSlicer%1%\n" "GenericName=3D Printing Software\n" - "Icon=BambuStudio%2%\n" + "Icon=OrcaSlicer%2%\n" "Exec=\"%3%\" %%F\n" "Terminal=false\n" "Type=Application\n" @@ -387,8 +387,8 @@ void DesktopIntegrationDialog::perform_desktop_integration() // Icon if (!target_dir_icons.empty()) { - std::string icon_path = GUI::format("%1%/images/BambuStudio-gcodeviewer_192px.png",resources_dir()); - std::string dest_path = GUI::format("%1%/images/%2%BambuStudio-gcodeviewer%3%.png", target_dir_icons, icon_theme_path, version_suffix); + std::string icon_path = GUI::format("%1%/images/OrcaSlicer-gcodeviewer_192px.png",resources_dir()); + std::string dest_path = GUI::format("%1%/images/%2%OrcaSlicer-gcodeviewer%3%.png", target_dir_icons, icon_theme_path, version_suffix); if (copy_icon(icon_path, dest_path)) // save path to icon app_config->set("desktop_integration_icon_viewer_path", dest_path); @@ -401,7 +401,7 @@ void DesktopIntegrationDialog::perform_desktop_integration() "[Desktop Entry]\n" "Name=Bambu Gcode Viewer%1%\n" "GenericName=3D Printing Software\n" - "Icon=BambuStudio-gcodeviewer%2%\n" + "Icon=OrcaSlicer-gcodeviewer%2%\n" "Exec=\"%3%\" --gcodeviewer %%F\n" "Terminal=false\n" "Type=Application\n" diff --git a/src/slic3r/GUI/DownloadProgressDialog.cpp b/src/slic3r/GUI/DownloadProgressDialog.cpp index 1674771acc3..ad5276c83a6 100644 --- a/src/slic3r/GUI/DownloadProgressDialog.cpp +++ b/src/slic3r/GUI/DownloadProgressDialog.cpp @@ -38,7 +38,7 @@ DownloadProgressDialog::DownloadProgressDialog(wxString title) wxString install_failed_msg = _L("Failed to install the plug-in. Please check whether it is blocked or deleted by anti-virus software."); - std::string icon_path = (boost::format("%1%/images/BambuStudioTitle.ico") % resources_dir()).str(); + std::string icon_path = (boost::format("%1%/images/OrcaSlicerTitle.ico") % resources_dir()).str(); SetIcon(wxIcon(encode_path(icon_path.c_str()), wxBITMAP_TYPE_ICO)); SetBackgroundColour(*wxWHITE); diff --git a/src/slic3r/GUI/GUI_App.cpp b/src/slic3r/GUI/GUI_App.cpp index e4b50d18bcd..178ea71dc98 100644 --- a/src/slic3r/GUI/GUI_App.cpp +++ b/src/slic3r/GUI/GUI_App.cpp @@ -1005,8 +1005,8 @@ void GUI_App::post_init() if (this->init_params->input_files.size() == 1 && - boost::starts_with(this->init_params->input_files.front(), "bambustudio://open")) { - auto input_str_arr = split_str(this->init_params->input_files.front(), "bambustudio://open/?file="); + boost::starts_with(this->init_params->input_files.front(), "orcaslicer://open")) { + auto input_str_arr = split_str(this->init_params->input_files.front(), "orcaslicer://open/?file="); std::string download_origin_url; for (auto input_str:input_str_arr) { @@ -1273,7 +1273,7 @@ GUI_App::GUI_App() , m_removable_drive_manager(std::make_unique()) //, m_other_instance_message_handler(std::make_unique()) { - //app config initializes early becasuse it is used in instance checking in BambuStudio.cpp + //app config initializes early becasuse it is used in instance checking in OrcaSlicer.cpp this->init_app_config(); this->init_download_path(); @@ -1968,7 +1968,7 @@ static boost::optional parse_semver_from_ini(std::string path) std::string body = buffer.str(); size_t start = body.find("OrcaSlicer "); if (start == std::string::npos) { - start = body.find("BambuStudio "); + start = body.find("OrcaSlicer "); if (start == std::string::npos) return boost::none; } @@ -5598,8 +5598,8 @@ void GUI_App::MacOpenURL(const wxString& url) { BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << "get mac url " << url; - if (!url.empty() && boost::starts_with(url, "bambustudioopen://")) { - auto input_str_arr = split_str(url.ToStdString(), "bambustudioopen://"); + if (!url.empty() && boost::starts_with(url, "orcasliceropen://")) { + auto input_str_arr = split_str(url.ToStdString(), "orcasliceropen://"); std::string download_origin_url; for (auto input_str : input_str_arr) { diff --git a/src/slic3r/GUI/GUI_App.hpp b/src/slic3r/GUI/GUI_App.hpp index 5a64c735b42..4b6a418f83e 100644 --- a/src/slic3r/GUI/GUI_App.hpp +++ b/src/slic3r/GUI/GUI_App.hpp @@ -115,9 +115,9 @@ enum ConfigMenuIDs { ConfigMenuCnt, }; -enum BambuStudioMenuIDs { - BambuStudioMenuAbout, - BambuStudioMenuPreferences, +enum OrcaSlicerMenuIDs { + OrcaSlicerMenuAbout, + OrcaSlicerMenuPreferences, }; enum CameraMenuIDs { @@ -314,7 +314,7 @@ class GUI_App : public wxApp bool is_editor() const { return m_app_mode == EAppMode::Editor; } bool is_gcode_viewer() const { return m_app_mode == EAppMode::GCodeViewer; } bool is_recreating_gui() const { return m_is_recreating_gui; } - std::string logo_name() const { return is_editor() ? "OrcaSlicer" : "BambuStudio-gcodeviewer"; } + std::string logo_name() const { return is_editor() ? "OrcaSlicer" : "OrcaSlicer-gcodeviewer"; } // SoftFever bool show_gcode_window() const { return m_show_gcode_window; } diff --git a/src/slic3r/GUI/InstanceCheckMac.mm b/src/slic3r/GUI/InstanceCheckMac.mm index c0709281e53..b28935401b7 100644 --- a/src/slic3r/GUI/InstanceCheckMac.mm +++ b/src/slic3r/GUI/InstanceCheckMac.mm @@ -12,10 +12,10 @@ -(instancetype) init -(void)add_observer:(NSString *)version_hash { //NSLog(@"adding observer"); - //NSString *nsver = @"OtherBambuStudioInstanceMessage" + version_hash; - NSString *nsver = [NSString stringWithFormat: @"%@%@", @"OtherBambuStudioInstanceMessage", version_hash]; + //NSString *nsver = @"OtherOrcaSlicerInstanceMessage" + version_hash; + NSString *nsver = [NSString stringWithFormat: @"%@%@", @"OtherOrcaSlicerInstanceMessage", version_hash]; [[NSDistributedNotificationCenter defaultCenter] addObserver:self selector:@selector(message_update:) name:nsver object:nil suspensionBehavior:NSNotificationSuspensionBehaviorDeliverImmediately]; - NSString *nsver2 = [NSString stringWithFormat: @"%@%@", @"OtherBambuStudioInstanceClosing", version_hash]; + NSString *nsver2 = [NSString stringWithFormat: @"%@%@", @"OtherOrcaSlicerInstanceClosing", version_hash]; [[NSDistributedNotificationCenter defaultCenter] addObserver:self selector:@selector(closing_update:) name:nsver2 object:nil suspensionBehavior:NSNotificationSuspensionBehaviorDeliverImmediately]; } @@ -54,18 +54,18 @@ -(void) bring_forward void send_message_mac(const std::string &msg, const std::string &version) { NSString *nsmsg = [NSString stringWithCString:msg.c_str() encoding:[NSString defaultCStringEncoding]]; - //NSString *nsver = @"OtherBambuStudioInstanceMessage" + [NSString stringWithCString:version.c_str() encoding:[NSString defaultCStringEncoding]]; + //NSString *nsver = @"OtherOrcaSlicerInstanceMessage" + [NSString stringWithCString:version.c_str() encoding:[NSString defaultCStringEncoding]]; NSString *nsver = [NSString stringWithCString:version.c_str() encoding:[NSString defaultCStringEncoding]]; - NSString *notifname = [NSString stringWithFormat: @"%@%@", @"OtherBambuStudioInstanceMessage", nsver]; + NSString *notifname = [NSString stringWithFormat: @"%@%@", @"OtherOrcaSlicerInstanceMessage", nsver]; [[NSDistributedNotificationCenter defaultCenter] postNotificationName:notifname object:nil userInfo:[NSDictionary dictionaryWithObject:nsmsg forKey:@"data"] deliverImmediately:YES]; } void send_message_mac_closing(const std::string &msg, const std::string &version) { NSString *nsmsg = [NSString stringWithCString:msg.c_str() encoding:[NSString defaultCStringEncoding]]; - //NSString *nsver = @"OtherBambuStudioInstanceMessage" + [NSString stringWithCString:version.c_str() encoding:[NSString defaultCStringEncoding]]; + //NSString *nsver = @"OtherOrcaSlicerInstanceMessage" + [NSString stringWithCString:version.c_str() encoding:[NSString defaultCStringEncoding]]; NSString *nsver = [NSString stringWithCString:version.c_str() encoding:[NSString defaultCStringEncoding]]; - NSString *notifname = [NSString stringWithFormat: @"%@%@", @"OtherBambuStudioInstanceClosing", nsver]; + NSString *notifname = [NSString stringWithFormat: @"%@%@", @"OtherOrcaSlicerInstanceClosing", nsver]; [[NSDistributedNotificationCenter defaultCenter] postNotificationName:notifname object:nil userInfo:[NSDictionary dictionaryWithObject:nsmsg forKey:@"data"] deliverImmediately:YES]; } diff --git a/src/slic3r/GUI/KBShortcutsDialog.cpp b/src/slic3r/GUI/KBShortcutsDialog.cpp index b07f6c48ee9..4d7443723b6 100644 --- a/src/slic3r/GUI/KBShortcutsDialog.cpp +++ b/src/slic3r/GUI/KBShortcutsDialog.cpp @@ -25,7 +25,7 @@ KBShortcutsDialog::KBShortcutsDialog() const wxFont& bold_font = wxGetApp().bold_font(); SetFont(font); - std::string icon_path = (boost::format("%1%/images/BambuStudioTitle.ico") % resources_dir()).str(); + std::string icon_path = (boost::format("%1%/images/OrcaSlicerTitle.ico") % resources_dir()).str(); SetIcon(wxIcon(encode_path(icon_path.c_str()), wxBITMAP_TYPE_ICO)); this->SetSizeHints(wxDefaultSize, wxDefaultSize); diff --git a/src/slic3r/GUI/MainFrame.cpp b/src/slic3r/GUI/MainFrame.cpp index aa66abea4b3..a6b3c3fa5b7 100644 --- a/src/slic3r/GUI/MainFrame.cpp +++ b/src/slic3r/GUI/MainFrame.cpp @@ -93,10 +93,10 @@ enum class ERescaleTarget }; #ifdef __APPLE__ -class BambuStudioTaskBarIcon : public wxTaskBarIcon +class OrcaSlicerTaskBarIcon : public wxTaskBarIcon { public: - BambuStudioTaskBarIcon(wxTaskBarIconType iconType = wxTBI_DEFAULT_TYPE) : wxTaskBarIcon(iconType) {} + OrcaSlicerTaskBarIcon(wxTaskBarIconType iconType = wxTBI_DEFAULT_TYPE) : wxTaskBarIcon(iconType) {} wxMenu *CreatePopupMenu() override { wxMenu *menu = new wxMenu; //if (wxGetApp().app_config->get("single_instance") == "false") { @@ -147,7 +147,7 @@ static wxIcon main_frame_icon(GUI_App::EAppMode app_mode) } return wxIcon(path, wxBITMAP_TYPE_ICO); #else // _WIN32 - return wxIcon(Slic3r::var("BambuStudio_128px.png"), wxBITMAP_TYPE_PNG); + return wxIcon(Slic3r::var("OrcaSlicer_128px.png"), wxBITMAP_TYPE_PNG); #endif // _WIN32 } @@ -244,8 +244,8 @@ DPIFrame(NULL, wxID_ANY, "", wxDefaultPosition, wxDefaultSize, BORDERLESS_FRAME_ switch (wxGetApp().get_app_mode()) { default: case GUI_App::EAppMode::Editor: - m_taskbar_icon = std::make_unique(wxTBI_DOCK); - m_taskbar_icon->SetIcon(wxIcon(Slic3r::var("BambuStudio-mac_256px.ico"), wxBITMAP_TYPE_ICO), "BambuStudio"); + m_taskbar_icon = std::make_unique(wxTBI_DOCK); + m_taskbar_icon->SetIcon(wxIcon(Slic3r::var("OrcaSlicer-mac_256px.ico"), wxBITMAP_TYPE_ICO), "OrcaSlicer"); break; case GUI_App::EAppMode::GCodeViewer: break; @@ -1976,7 +1976,7 @@ static wxMenu* generate_help_menu() }); // Report a bug - //append_menu_item(helpMenu, wxID_ANY, _L("Report Bug(TODO)"), _L("Report a bug of BambuStudio"), + //append_menu_item(helpMenu, wxID_ANY, _L("Report Bug(TODO)"), _L("Report a bug of OrcaSlicer"), // [](wxCommandEvent&) { // //TODO // }); @@ -2459,7 +2459,7 @@ void MainFrame::init_menubar_as_editor() #ifdef __APPLE__ wxWindowID bambu_studio_id_base = wxWindow::NewControlId(int(2)); wxMenu* parent_menu = m_menubar->OSXGetAppleMenu(); - //auto preference_item = new wxMenuItem(parent_menu, BambuStudioMenuPreferences + bambu_studio_id_base, _L("Preferences") + "\tCtrl+,", ""); + //auto preference_item = new wxMenuItem(parent_menu, OrcaSlicerMenuPreferences + bambu_studio_id_base, _L("Preferences") + "\tCtrl+,", ""); #else wxMenu* parent_menu = m_topbar->GetTopMenu(); auto preference_item = new wxMenuItem(parent_menu, ConfigMenuPreferences + config_id_base, _L("Preferences") + "\t" + ctrl + "P", ""); @@ -2534,13 +2534,13 @@ void MainFrame::init_menubar_as_editor() #ifdef __APPLE__ wxString about_title = wxString::Format(_L("&About %s"), SLIC3R_APP_FULL_NAME); - //auto about_item = new wxMenuItem(parent_menu, BambuStudioMenuAbout + bambu_studio_id_base, about_title, ""); + //auto about_item = new wxMenuItem(parent_menu, OrcaSlicerMenuAbout + bambu_studio_id_base, about_title, ""); //parent_menu->Bind(wxEVT_MENU, [this, bambu_studio_id_base](wxEvent& event) { // switch (event.GetId() - bambu_studio_id_base) { - // case BambuStudioMenuAbout: + // case OrcaSlicerMenuAbout: // Slic3r::GUI::about(); // break; - // case BambuStudioMenuPreferences: + // case OrcaSlicerMenuPreferences: // CallAfter([this] { // PreferencesDialog dlg(this); // dlg.ShowModal(); @@ -3566,7 +3566,7 @@ SettingsDialog::SettingsDialog(MainFrame* mainframe) SetIcon(wxIcon(szExeFileName, wxBITMAP_TYPE_ICO)); } #else - SetIcon(wxIcon(var("BambuStudio_128px.png"), wxBITMAP_TYPE_PNG)); + SetIcon(wxIcon(var("OrcaSlicer_128px.png"), wxBITMAP_TYPE_PNG)); #endif // _WIN32 //just hide the Frame on closing diff --git a/src/slic3r/GUI/MediaPlayCtrl.cpp b/src/slic3r/GUI/MediaPlayCtrl.cpp index f639d6e6479..0ac642e3c03 100644 --- a/src/slic3r/GUI/MediaPlayCtrl.cpp +++ b/src/slic3r/GUI/MediaPlayCtrl.cpp @@ -330,7 +330,7 @@ void MediaPlayCtrl::ToggleStream() } } if (!url.empty() && wxGetApp().app_config->get("not_show_vcamera_stop_prev") != "1") { - MessageDialog dlg(this->GetParent(), _L("Another virtual camera is running.\nBambu Studio supports only a single virtual camera.\nDo you want to stop this virtual camera?"), _L("Warning"), + MessageDialog dlg(this->GetParent(), _L("Another virtual camera is running.\nBambulab printer supports only a single virtual camera.\nDo you want to stop this virtual camera?"), _L("Warning"), wxYES | wxCANCEL | wxICON_INFORMATION); dlg.show_dsa_button(); auto res = dlg.ShowModal(); diff --git a/src/slic3r/GUI/ModelMall.cpp b/src/slic3r/GUI/ModelMall.cpp index 8fabd073e40..f14de1ebf0b 100644 --- a/src/slic3r/GUI/ModelMall.cpp +++ b/src/slic3r/GUI/ModelMall.cpp @@ -17,7 +17,7 @@ namespace GUI { :DPIFrame(nullptr, wxID_ANY, _L("3D Models"), wxDefaultPosition, wxDefaultSize, wxCLOSE_BOX|wxDEFAULT_DIALOG_STYLE|wxMAXIMIZE_BOX|wxMINIMIZE_BOX|wxRESIZE_BORDER) { // icon - std::string icon_path = (boost::format("%1%/images/BambuStudioTitle.ico") % resources_dir()).str(); + std::string icon_path = (boost::format("%1%/images/OrcaSlicerTitle.ico") % resources_dir()).str(); SetIcon(wxIcon(encode_path(icon_path.c_str()), wxBITMAP_TYPE_ICO)); SetSize(MODEL_MALL_PAGE_SIZE); diff --git a/src/slic3r/GUI/MsgDialog.cpp b/src/slic3r/GUI/MsgDialog.cpp index 6e705f4c06e..594d6a099ef 100644 --- a/src/slic3r/GUI/MsgDialog.cpp +++ b/src/slic3r/GUI/MsgDialog.cpp @@ -226,7 +226,7 @@ void MsgDialog::apply_style(long style) logo->SetBitmap( create_scaled_bitmap(style & wxAPPLY ? "completed" : style & wxICON_WARNING ? "obj_warning" : style & wxICON_INFORMATION ? "info" : - style & wxICON_QUESTION ? "question" : "BambuStudio", this, 64, style & wxICON_ERROR)); + style & wxICON_QUESTION ? "question" : "OrcaSlicer", this, 64, style & wxICON_ERROR)); } void MsgDialog::finalize() @@ -330,7 +330,7 @@ ErrorDialog::ErrorDialog(wxWindow *parent, const wxString &msg, bool monospaced_ add_msg_content(this, content_sizer, msg, monospaced_font); // Use a small bitmap with monospaced font, as the error text will not be wrapped. - logo->SetBitmap(create_scaled_bitmap("BambuStudio_192px_grayscale.png", this, monospaced_font ? 48 : /*1*/84)); + logo->SetBitmap(create_scaled_bitmap("OrcaSlicer_192px_grayscale.png", this, monospaced_font ? 48 : /*1*/84)); SetMaxSize(wxSize(-1, CONTENT_MAX_HEIGHT*wxGetApp().em_unit())); diff --git a/src/slic3r/GUI/ParamsPanel.cpp b/src/slic3r/GUI/ParamsPanel.cpp index bfbb6fd9f6a..05aec072821 100644 --- a/src/slic3r/GUI/ParamsPanel.cpp +++ b/src/slic3r/GUI/ParamsPanel.cpp @@ -28,7 +28,7 @@ TipsDialog::TipsDialog(wxWindow *parent, const wxString &title, const wxString & m_app_key(app_key) { SetBackgroundColour(*wxWHITE); - std::string icon_path = (boost::format("%1%/images/BambuStudioTitle.ico") % resources_dir()).str(); + std::string icon_path = (boost::format("%1%/images/OrcaSlicerTitle.ico") % resources_dir()).str(); SetIcon(wxIcon(encode_path(icon_path.c_str()), wxBITMAP_TYPE_ICO)); wxBoxSizer *m_sizer_main = new wxBoxSizer(wxVERTICAL); diff --git a/src/slic3r/GUI/PlateSettingsDialog.cpp b/src/slic3r/GUI/PlateSettingsDialog.cpp index c23d3bd3540..62f2847df5c 100644 --- a/src/slic3r/GUI/PlateSettingsDialog.cpp +++ b/src/slic3r/GUI/PlateSettingsDialog.cpp @@ -8,7 +8,7 @@ wxDEFINE_EVENT(EVT_SET_BED_TYPE_CONFIRM, wxCommandEvent); PlateSettingsDialog::PlateSettingsDialog(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style) :DPIDialog(parent, id, title, pos, size, style) { - std::string icon_path = (boost::format("%1%/images/BambuStudioTitle.ico") % resources_dir()).str(); + std::string icon_path = (boost::format("%1%/images/OrcaSlicerTitle.ico") % resources_dir()).str(); SetIcon(wxIcon(encode_path(icon_path.c_str()), wxBITMAP_TYPE_ICO)); SetBackgroundColour(*wxWHITE); diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp index 6d64666327b..721b30847e2 100644 --- a/src/slic3r/GUI/Plater.cpp +++ b/src/slic3r/GUI/Plater.cpp @@ -8877,7 +8877,7 @@ ProjectDropDialog::ProjectDropDialog(const std::string &filename) SetBackgroundColour(m_def_color); // icon - std::string icon_path = (boost::format("%1%/images/BambuStudioTitle.ico") % resources_dir()).str(); + std::string icon_path = (boost::format("%1%/images/OrcaSlicerTitle.ico") % resources_dir()).str(); SetIcon(wxIcon(encode_path(icon_path.c_str()), wxBITMAP_TYPE_ICO)); wxBoxSizer *m_sizer_main = new wxBoxSizer(wxVERTICAL); diff --git a/src/slic3r/GUI/Preferences.cpp b/src/slic3r/GUI/Preferences.cpp index bcf4f35a742..4b298ba639b 100644 --- a/src/slic3r/GUI/Preferences.cpp +++ b/src/slic3r/GUI/Preferences.cpp @@ -799,7 +799,7 @@ void PreferencesDialog::create() m_backup_interval_time = app_config->get("backup_interval"); // set icon for dialog - std::string icon_path = (boost::format("%1%/images/BambuStudioTitle.ico") % resources_dir()).str(); + std::string icon_path = (boost::format("%1%/images/OrcaSlicerTitle.ico") % resources_dir()).str(); SetIcon(wxIcon(encode_path(icon_path.c_str()), wxBITMAP_TYPE_ICO)); SetSizeHints(wxDefaultSize, wxDefaultSize); diff --git a/src/slic3r/GUI/PrintOptionsDialog.cpp b/src/slic3r/GUI/PrintOptionsDialog.cpp index 68b9f7e385b..1f71f7cef97 100644 --- a/src/slic3r/GUI/PrintOptionsDialog.cpp +++ b/src/slic3r/GUI/PrintOptionsDialog.cpp @@ -12,7 +12,7 @@ PrintOptionsDialog::PrintOptionsDialog(wxWindow* parent) : DPIDialog(parent, wxID_ANY, _L("Print Options"), wxDefaultPosition, wxDefaultSize, wxCAPTION | wxCLOSE_BOX) { this->SetDoubleBuffered(true); - std::string icon_path = (boost::format("%1%/images/BambuStudioTitle.ico") % resources_dir()).str(); + std::string icon_path = (boost::format("%1%/images/OrcaSlicerTitle.ico") % resources_dir()).str(); SetIcon(wxIcon(encode_path(icon_path.c_str()), wxBITMAP_TYPE_ICO)); SetBackgroundColour(*wxWHITE); diff --git a/src/slic3r/GUI/Printer/gstbambusrc.c b/src/slic3r/GUI/Printer/gstbambusrc.c index 0759119a2ac..16e01491336 100644 --- a/src/slic3r/GUI/Printer/gstbambusrc.c +++ b/src/slic3r/GUI/Printer/gstbambusrc.c @@ -585,7 +585,7 @@ void gstbambusrc_register() return; did_register = 1; - gst_plugin_register_static(GST_VERSION_MAJOR, GST_VERSION_MINOR, "bambusrc", "Bambu Lab source", gstbambusrc_init, "0.0.1", "GPL", "OrcaSlicer", "OrcaSlicer", "https://github.com/bambulab/BambuStudio"); + gst_plugin_register_static(GST_VERSION_MAJOR, GST_VERSION_MINOR, "bambusrc", "Bambu Lab source", gstbambusrc_init, "0.0.1", "GPL", "OrcaSlicer", "OrcaSlicer", "https://github.com/bambulab/OrcaSlicer"); } #else @@ -594,6 +594,6 @@ void gstbambusrc_register() #define PACKAGE "bambusrc" #endif -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, GST_VERSION_MINOR, bambusrc, "Bambu Lab source", gstbambusrc_init, "0.0.1", "GPL", "OrcaSlicer", "https://github.com/bambulab/BambuStudio") +GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, GST_VERSION_MINOR, bambusrc, "Bambu Lab source", gstbambusrc_init, "0.0.1", "GPL", "OrcaSlicer", "https://github.com/bambulab/OrcaSlicer") #endif diff --git a/src/slic3r/GUI/PrivacyUpdateDialog.cpp b/src/slic3r/GUI/PrivacyUpdateDialog.cpp index ed2fa37f33b..ad856392d6b 100644 --- a/src/slic3r/GUI/PrivacyUpdateDialog.cpp +++ b/src/slic3r/GUI/PrivacyUpdateDialog.cpp @@ -34,7 +34,7 @@ static std::string url_encode(const std::string& value) { PrivacyUpdateDialog::PrivacyUpdateDialog(wxWindow* parent, wxWindowID id, const wxString& title, enum ButtonStyle btn_style, const wxPoint& pos, const wxSize& size, long style) :DPIDialog(parent, id, title, pos, size, style) { - std::string icon_path = (boost::format("%1%/images/BambuStudioTitle.ico") % resources_dir()).str(); + std::string icon_path = (boost::format("%1%/images/OrcaSlicerTitle.ico") % resources_dir()).str(); SetIcon(wxIcon(encode_path(icon_path.c_str()), wxBITMAP_TYPE_ICO)); SetBackgroundColour(*wxWHITE); diff --git a/src/slic3r/GUI/PublishDialog.cpp b/src/slic3r/GUI/PublishDialog.cpp index c1075ef5771..1c0c3439b4b 100644 --- a/src/slic3r/GUI/PublishDialog.cpp +++ b/src/slic3r/GUI/PublishDialog.cpp @@ -31,7 +31,7 @@ PublishDialog::PublishDialog(Plater *plater) , m_plater(plater) { - std::string icon_path = (boost::format("%1%/images/BambuStudioTitle.ico") % resources_dir()).str(); + std::string icon_path = (boost::format("%1%/images/OrcaSlicerTitle.ico") % resources_dir()).str(); SetIcon(wxIcon(encode_path(icon_path.c_str()), wxBITMAP_TYPE_ICO)); this->SetSize(wxSize(FromDIP(540),FromDIP(400))); diff --git a/src/slic3r/GUI/RecenterDialog.cpp b/src/slic3r/GUI/RecenterDialog.cpp index ae09f660e9e..69477638904 100644 --- a/src/slic3r/GUI/RecenterDialog.cpp +++ b/src/slic3r/GUI/RecenterDialog.cpp @@ -14,7 +14,7 @@ namespace Slic3r { namespace GUI { RecenterDialog::RecenterDialog(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style) : DPIDialog(parent, id, _L("Confirm"), pos, size, style) { - std::string icon_path = (boost::format("%1%/images/BambuStudioTitle.ico") % resources_dir()).str(); + std::string icon_path = (boost::format("%1%/images/OrcaSlicerTitle.ico") % resources_dir()).str(); SetIcon(wxIcon(encode_path(icon_path.c_str()), wxBITMAP_TYPE_ICO)); hint1 = _L("Please home all axes (click "); diff --git a/src/slic3r/GUI/ReleaseNote.cpp b/src/slic3r/GUI/ReleaseNote.cpp index 81d8f0c63ee..ad345168afb 100644 --- a/src/slic3r/GUI/ReleaseNote.cpp +++ b/src/slic3r/GUI/ReleaseNote.cpp @@ -35,7 +35,7 @@ wxDEFINE_EVENT(EVT_CHECK_IP_ADDRESS_FAILED, wxCommandEvent); ReleaseNoteDialog::ReleaseNoteDialog(Plater *plater /*= nullptr*/) : DPIDialog(static_cast(wxGetApp().mainframe), wxID_ANY, _L("Release Note"), wxDefaultPosition, wxDefaultSize, wxCAPTION | wxCLOSE_BOX) { - std::string icon_path = (boost::format("%1%/images/BambuStudioTitle.ico") % resources_dir()).str(); + std::string icon_path = (boost::format("%1%/images/OrcaSlicerTitle.ico") % resources_dir()).str(); SetIcon(wxIcon(encode_path(icon_path.c_str()), wxBITMAP_TYPE_ICO)); SetBackgroundColour(*wxWHITE); @@ -49,7 +49,7 @@ ReleaseNoteDialog::ReleaseNoteDialog(Plater *plater /*= nullptr*/) m_sizer_body->Add(0, 0, 0, wxLEFT, FromDIP(38)); - auto sm = create_scaled_bitmap("BambuStudio", nullptr, 70); + auto sm = create_scaled_bitmap("OrcaSlicer", nullptr, 70); auto brand = new wxStaticBitmap(this, wxID_ANY, sm, wxDefaultPosition, wxSize(FromDIP(70), FromDIP(70))); m_sizer_body->Add(brand, 0, wxALL, 0); @@ -108,7 +108,7 @@ void ReleaseNoteDialog::update_release_note(wxString release_note, std::string v UpdatePluginDialog::UpdatePluginDialog(wxWindow* parent /*= nullptr*/) : DPIDialog(static_cast(wxGetApp().mainframe), wxID_ANY, _L("Network plug-in update"), wxDefaultPosition, wxDefaultSize, wxCAPTION | wxCLOSE_BOX) { - std::string icon_path = (boost::format("%1%/images/BambuStudioTitle.ico") % resources_dir()).str(); + std::string icon_path = (boost::format("%1%/images/OrcaSlicerTitle.ico") % resources_dir()).str(); SetIcon(wxIcon(encode_path(icon_path.c_str()), wxBITMAP_TYPE_ICO)); SetBackgroundColour(*wxWHITE); @@ -122,7 +122,7 @@ UpdatePluginDialog::UpdatePluginDialog(wxWindow* parent /*= nullptr*/) - auto sm = create_scaled_bitmap("BambuStudio", nullptr, 55); + auto sm = create_scaled_bitmap("OrcaSlicer", nullptr, 55); auto brand = new wxStaticBitmap(this, wxID_ANY, sm, wxDefaultPosition, wxSize(FromDIP(55), FromDIP(55))); wxBoxSizer* m_sizer_right = new wxBoxSizer(wxVERTICAL); @@ -257,7 +257,7 @@ void UpdatePluginDialog::update_info(std::string json_path) UpdateVersionDialog::UpdateVersionDialog(wxWindow *parent) : DPIDialog(parent, wxID_ANY, _L("New version of Orca Slicer"), wxDefaultPosition, wxDefaultSize, wxCAPTION | wxCLOSE_BOX | wxRESIZE_BORDER) { - std::string icon_path = (boost::format("%1%/images/BambuStudioTitle.ico") % resources_dir()).str(); + std::string icon_path = (boost::format("%1%/images/OrcaSlicerTitle.ico") % resources_dir()).str(); SetIcon(wxIcon(encode_path(icon_path.c_str()), wxBITMAP_TYPE_ICO)); SetBackgroundColour(*wxWHITE); @@ -271,7 +271,7 @@ UpdateVersionDialog::UpdateVersionDialog(wxWindow *parent) - auto sm = create_scaled_bitmap("BambuStudio", nullptr, 70); + auto sm = create_scaled_bitmap("OrcaSlicer", nullptr, 70); m_brand = new wxStaticBitmap(this, wxID_ANY, sm, wxDefaultPosition, wxSize(FromDIP(70), FromDIP(70))); @@ -521,7 +521,7 @@ void UpdateVersionDialog::update_version_info(wxString release_note, wxString ve SecondaryCheckDialog::SecondaryCheckDialog(wxWindow* parent, wxWindowID id, const wxString& title, enum ButtonStyle btn_style, const wxPoint& pos, const wxSize& size, long style, bool not_show_again_check) :DPIFrame(parent, id, title, pos, size, style) { - std::string icon_path = (boost::format("%1%/images/BambuStudioTitle.ico") % resources_dir()).str(); + std::string icon_path = (boost::format("%1%/images/OrcaSlicerTitle.ico") % resources_dir()).str(); SetIcon(wxIcon(encode_path(icon_path.c_str()), wxBITMAP_TYPE_ICO)); SetBackgroundColour(*wxWHITE); @@ -765,7 +765,7 @@ void SecondaryCheckDialog::rescale() ConfirmBeforeSendDialog::ConfirmBeforeSendDialog(wxWindow* parent, wxWindowID id, const wxString& title, enum ButtonStyle btn_style, const wxPoint& pos, const wxSize& size, long style, bool not_show_again_check) :DPIDialog(parent, id, title, pos, size, style) { - std::string icon_path = (boost::format("%1%/images/BambuStudioTitle.ico") % resources_dir()).str(); + std::string icon_path = (boost::format("%1%/images/OrcaSlicerTitle.ico") % resources_dir()).str(); SetIcon(wxIcon(encode_path(icon_path.c_str()), wxBITMAP_TYPE_ICO)); SetBackgroundColour(*wxWHITE); @@ -963,7 +963,7 @@ void ConfirmBeforeSendDialog::rescale() InputIpAddressDialog::InputIpAddressDialog(wxWindow* parent) :DPIDialog(static_cast(wxGetApp().mainframe), wxID_ANY, _L("LAN Connection Failed (Sending print file)"), wxDefaultPosition, wxDefaultSize, wxCAPTION | wxCLOSE_BOX) { - std::string icon_path = (boost::format("%1%/images/BambuStudioTitle.ico") % resources_dir()).str(); + std::string icon_path = (boost::format("%1%/images/OrcaSlicerTitle.ico") % resources_dir()).str(); SetIcon(wxIcon(encode_path(icon_path.c_str()), wxBITMAP_TYPE_ICO)); SetBackgroundColour(*wxWHITE); diff --git a/src/slic3r/GUI/SavePresetDialog.cpp b/src/slic3r/GUI/SavePresetDialog.cpp index e3994b4813a..f4c25493a89 100644 --- a/src/slic3r/GUI/SavePresetDialog.cpp +++ b/src/slic3r/GUI/SavePresetDialog.cpp @@ -321,7 +321,7 @@ void SavePresetDialog::build(std::vector types, std::string suffix SetFont(wxGetApp().normal_font()); // icon - std::string icon_path = (boost::format("%1%/images/BambuStudioTitle.ico") % resources_dir()).str(); + std::string icon_path = (boost::format("%1%/images/OrcaSlicerTitle.ico") % resources_dir()).str(); SetIcon(wxIcon(encode_path(icon_path.c_str()), wxBITMAP_TYPE_ICO)); if (suffix.empty()) suffix = _CTX_utf8(L_CONTEXT("Copy", "PresetName"), "PresetName"); diff --git a/src/slic3r/GUI/SelectMachine.cpp b/src/slic3r/GUI/SelectMachine.cpp index 64d4d279d7d..c8169659a59 100644 --- a/src/slic3r/GUI/SelectMachine.cpp +++ b/src/slic3r/GUI/SelectMachine.cpp @@ -967,7 +967,7 @@ SelectMachineDialog::SelectMachineDialog(Plater *plater) SetFont(wxGetApp().normal_font()); // icon - std::string icon_path = (boost::format("%1%/images/BambuStudioTitle.ico") % resources_dir()).str(); + std::string icon_path = (boost::format("%1%/images/OrcaSlicerTitle.ico") % resources_dir()).str(); SetIcon(wxIcon(encode_path(icon_path.c_str()), wxBITMAP_TYPE_ICO)); Freeze(); @@ -3423,7 +3423,7 @@ void SelectMachineDialog::update_lan_machine_list() EditDevNameDialog::EditDevNameDialog(Plater *plater /*= nullptr*/) : DPIDialog(static_cast(wxGetApp().mainframe), wxID_ANY, _L("Modifying the device name"), wxDefaultPosition, wxDefaultSize, wxCAPTION | wxCLOSE_BOX) { - std::string icon_path = (boost::format("%1%/images/BambuStudioTitle.ico") % resources_dir()).str(); + std::string icon_path = (boost::format("%1%/images/OrcaSlicerTitle.ico") % resources_dir()).str(); SetIcon(wxIcon(encode_path(icon_path.c_str()), wxBITMAP_TYPE_ICO)); SetBackgroundColour(*wxWHITE); diff --git a/src/slic3r/GUI/SendSystemInfoDialog.cpp b/src/slic3r/GUI/SendSystemInfoDialog.cpp index df736bcfdae..5f192f36359 100644 --- a/src/slic3r/GUI/SendSystemInfoDialog.cpp +++ b/src/slic3r/GUI/SendSystemInfoDialog.cpp @@ -402,7 +402,7 @@ static std::string generate_system_info_json() namespace pt = boost::property_tree; pt::ptree data_node; - data_node.put("BambuStudioVersion", SLIC3R_VERSION); + data_node.put("OrcaSlicerVersion", SLIC3R_VERSION); data_node.put("BuildID", SLIC3R_BUILD_ID); data_node.put("UniqueID", unique_id); data_node.put("Platform", platform_to_string(platform())); @@ -608,7 +608,7 @@ SendSystemInfoDialog::SendSystemInfoDialog(wxWindow* parent) wxString html = GUI::format_wxstr( "" "
" - "" + "" "" + text0 + "

" + text1 + "

" diff --git a/src/slic3r/GUI/SendToPrinter.cpp b/src/slic3r/GUI/SendToPrinter.cpp index c800df5fb5b..2d6936f7f2d 100644 --- a/src/slic3r/GUI/SendToPrinter.cpp +++ b/src/slic3r/GUI/SendToPrinter.cpp @@ -172,7 +172,7 @@ SendToPrinterDialog::SendToPrinterDialog(Plater *plater) SetFont(wxGetApp().normal_font()); // icon - std::string icon_path = (boost::format("%1%/images/BambuStudioTitle.ico") % resources_dir()).str(); + std::string icon_path = (boost::format("%1%/images/OrcaSlicerTitle.ico") % resources_dir()).str(); SetIcon(wxIcon(encode_path(icon_path.c_str()), wxBITMAP_TYPE_ICO)); Freeze(); diff --git a/src/slic3r/GUI/UnsavedChangesDialog.cpp b/src/slic3r/GUI/UnsavedChangesDialog.cpp index 0dfa42a153b..663557f843e 100644 --- a/src/slic3r/GUI/UnsavedChangesDialog.cpp +++ b/src/slic3r/GUI/UnsavedChangesDialog.cpp @@ -839,7 +839,7 @@ void UnsavedChangesDialog::build(Preset::Type type, PresetCollection *dependent_ { SetBackgroundColour(*wxWHITE); // icon - std::string icon_path = (boost::format("%1%/images/BambuStudioTitle.ico") % resources_dir()).str(); + std::string icon_path = (boost::format("%1%/images/OrcaSlicerTitle.ico") % resources_dir()).str(); SetIcon(wxIcon(encode_path(icon_path.c_str()), wxBITMAP_TYPE_ICO)); wxBoxSizer *m_sizer_main = new wxBoxSizer(wxVERTICAL); diff --git a/src/slic3r/GUI/UpdateDialogs.cpp b/src/slic3r/GUI/UpdateDialogs.cpp index 16d137de593..1ff4a56fe07 100644 --- a/src/slic3r/GUI/UpdateDialogs.cpp +++ b/src/slic3r/GUI/UpdateDialogs.cpp @@ -100,7 +100,7 @@ MsgUpdateConfig::MsgUpdateConfig(const std::vector &updates, bool force_ auto title = force_before_wizard ? _L("Configuration update") : _L("Configuration update"); SetTitle(title); - std::string icon_path = (boost::format("%1%/images/BambuStudioTitle.ico") % resources_dir()).str(); + std::string icon_path = (boost::format("%1%/images/OrcaSlicerTitle.ico") % resources_dir()).str(); SetIcon(wxIcon(encode_path(icon_path.c_str()), wxBITMAP_TYPE_ICO)); SetBackgroundColour(*wxWHITE); @@ -114,7 +114,7 @@ MsgUpdateConfig::MsgUpdateConfig(const std::vector &updates, bool force_ m_sizer_body->Add(0, 0, 0, wxLEFT, FromDIP(38)); - auto sm = create_scaled_bitmap("BambuStudio", nullptr, 70); + auto sm = create_scaled_bitmap("OrcaSlicer", nullptr, 70); auto brand = new wxStaticBitmap(this, wxID_ANY, sm, wxDefaultPosition, wxSize(FromDIP(70), FromDIP(70))); m_sizer_body->Add(brand, 0, wxALL, 0); diff --git a/src/slic3r/GUI/wxMediaCtrl2.cpp b/src/slic3r/GUI/wxMediaCtrl2.cpp index 3450a384546..d81b905c21e 100644 --- a/src/slic3r/GUI/wxMediaCtrl2.cpp +++ b/src/slic3r/GUI/wxMediaCtrl2.cpp @@ -133,7 +133,7 @@ void wxMediaCtrl2::Load(wxURI url) if (!hasplugins) { CallAfter([] { - wxMessageBox(_L("Your system is missing H.264 codecs for GStreamer, which are required to play video. (Try installing the gstreamer1.0-plugins-bad or gstreamer1.0-libav packages, then restart Bambu Studio?)"), _L("Error"), wxOK); + wxMessageBox(_L("Your system is missing H.264 codecs for GStreamer, which are required to play video. (Try installing the gstreamer1.0-plugins-bad or gstreamer1.0-libav packages, then restart Orca Slicer?)"), _L("Error"), wxOK); }); m_error = 101; wxMediaEvent event(wxEVT_MEDIA_STATECHANGED); diff --git a/src/slic3r/GUI/wxMediaCtrl2.mm b/src/slic3r/GUI/wxMediaCtrl2.mm index bb78fe535ec..f9985896f31 100644 --- a/src/slic3r/GUI/wxMediaCtrl2.mm +++ b/src/slic3r/GUI/wxMediaCtrl2.mm @@ -1,6 +1,6 @@ // // wxMediaCtrl2.m -// BambuStudio +// OrcaSlicer // // Created by cmguo on 2021/12/7. // diff --git a/tests/cpp17/main.cpp b/tests/cpp17/main.cpp index 6a65f4472bd..0de2b5a61f5 100644 --- a/tests/cpp17/main.cpp +++ b/tests/cpp17/main.cpp @@ -10,7 +10,7 @@ #include // Test for nested namespace definition -namespace BambuStudio::Cpp17 { +namespace OrcaSlicer::Cpp17 { template class Foo { @@ -20,7 +20,7 @@ template class Foo explicit Foo(T &&arg): m_arg{arg} {} }; -} // namespace BambuStudio::Cpp17 +} // namespace OrcaSlicer::Cpp17 template std::string get_type(const T &v); @@ -34,7 +34,7 @@ int main() // Template argument deduction for class templates // ///////////////////////////////////////////////////////////////////////// - auto foo = BambuStudio::Cpp17::Foo{1.f}; + auto foo = OrcaSlicer::Cpp17::Foo{1.f}; // ///////////////////////////////////////////////////////////////////////// // Structured bindings: