From ef2b6c7edb930d3da246d6646c9eb8543a7c1306 Mon Sep 17 00:00:00 2001 From: BenJule Date: Thu, 21 May 2026 10:52:51 +0200 Subject: [PATCH 1/5] ci: trigger 'Build all' workflow on pushes to master branch The upstream build_all.yml only listed 'main' as a push trigger. BenJule/BambuStudio uses 'master' as its default branch, so CI never fired on fork-local pushes. Adding 'master' alongside 'main' makes the full multi-platform build run when master is updated. --- .github/workflows/build_all.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build_all.yml b/.github/workflows/build_all.yml index 83b6e0465f..06fb27a603 100644 --- a/.github/workflows/build_all.yml +++ b/.github/workflows/build_all.yml @@ -3,6 +3,7 @@ name: Build all on: push: branches: + - master - main paths: - 'deps/**' From 7b7b27a40040238dd6ea889093599c40a0eb5b3a Mon Sep 17 00:00:00 2001 From: BenJule Date: Thu, 21 May 2026 10:54:13 +0200 Subject: [PATCH 2/5] ci: remove 'main' from push trigger, keep only 'master' --- .github/workflows/build_all.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build_all.yml b/.github/workflows/build_all.yml index 06fb27a603..f1d1fef97f 100644 --- a/.github/workflows/build_all.yml +++ b/.github/workflows/build_all.yml @@ -4,7 +4,6 @@ on: push: branches: - master - - main paths: - 'deps/**' - 'src/**' From 5a760e3a57e11f126766a886a911319e575b6024 Mon Sep 17 00:00:00 2001 From: BenJule Date: Wed, 20 May 2026 16:05:43 +0200 Subject: [PATCH 3/5] =?UTF-8?q?feat(fila=5Fmanager):=20add=20i18n=20suppor?= =?UTF-8?q?t=20=E2=80=94=20replace=20hardcoded=20Chinese=20with=20locale?= =?UTF-8?q?=20files?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The fila_manager web page was hardcoded in Chinese (lang="zh") with no internationalization support. This commit adds a lightweight i18n system: - Add locales/en.json and locales/zh_CN.json with all UI strings - Add t(key) / tf(key, n) translation helpers loaded at startup - Apply translations via data-i18n / data-i18n-placeholder attributes in HTML - Replace all hardcoded Chinese strings in index.js with t() calls - Language is resolved from the ?lang= URL parameter passed by C++ --- linux.d/debian | 16 +- resources/web/fila_manager/index.html | 212 +++++++++--------- resources/web/fila_manager/index.js | 133 +++++++---- resources/web/fila_manager/locales/en.json | 124 ++++++++++ resources/web/fila_manager/locales/zh_CN.json | 124 ++++++++++ 5 files changed, 463 insertions(+), 146 deletions(-) create mode 100644 resources/web/fila_manager/locales/en.json create mode 100644 resources/web/fila_manager/locales/zh_CN.json diff --git a/linux.d/debian b/linux.d/debian index f76d5e0acc..a8eb2df13e 100644 --- a/linux.d/debian +++ b/linux.d/debian @@ -35,7 +35,21 @@ REQUIRED_DEV_PACKAGES=( if [[ -n "$UPDATE_LIB" ]] then - REQUIRED_DEV_PACKAGES+=(libwebkit2gtk-4.1-dev) + # Detect distro and version to pick correct webkit package + DISTRO_ID="$(grep '^ID=' /etc/os-release | cut -d= -f2 | tr -d '"')" + VERSION_MAJOR="$(grep VERSION_ID /etc/os-release | cut -d "=" -f 2 | cut -d "." -f 1 | tr -d '\"')" + # Debian 13+ and Ubuntu 24+ ship libwebkit2gtk-4.1-dev + if [ "$DISTRO_ID" = "debian" ] && [ "$VERSION_MAJOR" -ge "13" ] 2>/dev/null; then + REQUIRED_DEV_PACKAGES+=(libwebkit2gtk-4.1-dev curl libfuse-dev libssl-dev libcurl4-openssl-dev m4) + elif [ "$VERSION_MAJOR" = "22" ] || [ "$VERSION_MAJOR" = "23" ] + then + REQUIRED_DEV_PACKAGES+=(libwebkit2gtk-4.0-dev curl libfuse-dev libssl-dev libcurl4-openssl-dev m4) + elif [ "$VERSION_MAJOR" = "24" ] + then + REQUIRED_DEV_PACKAGES+=(libwebkit2gtk-4.1-dev) + else + REQUIRED_DEV_PACKAGES+=(libwebkit2gtk-4.1-dev) + fi if [[ -n "$BUILD_DEBUG" ]] then REQUIRED_DEV_PACKAGES+=(libssl-dev libcurl4-openssl-dev) diff --git a/resources/web/fila_manager/index.html b/resources/web/fila_manager/index.html index 5dcf37501d..1e25b04528 100644 --- a/resources/web/fila_manager/index.html +++ b/resources/web/fila_manager/index.html @@ -1,9 +1,9 @@ - + - 耗材管理 + Filament Manager @@ -14,15 +14,15 @@ @@ -35,19 +35,19 @@
$ 0
-
总价值+20%同比上月
+
Total Value+20%vs. last month
0
-
总耗材数-20%同比上月
+
Total Spools-20%vs. last month
0
-
耗材颜色+20%同比上月
+
Colors+20%vs. last month
-
耗材详情
+
Filament Details
@@ -55,27 +55,27 @@
-
提醒事项
+
Reminders
-
低余量
-
需烘干
-
已用尽
+
Low Stock
+
Needs Drying
+
Empty
-
耗材使用
+
Filament Usage
-
耗材消耗情况
+
Filament Consumption
-
消耗量
+
Consumption
@@ -86,34 +86,34 @@
-
全部
-
收藏
+
All
+
Favorites
AMS
-
品牌
-
类型
-
系列
-
状态
+
Brand
+
Type
+
Series
+
Status
- +
@@ -129,11 +129,11 @@ - 耗材 - 余量 - 状态 - 单价 (/kg) - 操作 + Filament + Remaining + Status + Unit Price (/kg) + Actions @@ -147,7 +147,7 @@ -

暂无数据

+

No data

@@ -159,18 +159,18 @@ @@ -333,14 +333,14 @@

添加耗材

diff --git a/resources/web/fila_manager/index.js b/resources/web/fila_manager/index.js index 1e5f2aae32..2601cffeb4 100644 --- a/resources/web/fila_manager/index.js +++ b/resources/web/fila_manager/index.js @@ -1,5 +1,56 @@ /* Filament Manager — index.js */ +/* ===== i18n ===== */ +var g_i18n = {}; + +function t(key) { + return g_i18n[key] !== undefined ? g_i18n[key] : key; +} + +function tf(key, n) { + return t(key).replace("%d", n); +} + +function applyTranslations() { + document.querySelectorAll("[data-i18n]").forEach(function(el) { + var key = el.getAttribute("data-i18n"); + var text = t(key); + if (el.tagName === "TITLE" || el.children.length === 0) { + el.textContent = text; + } else { + var firstText = el.childNodes[0]; + if (firstText && firstText.nodeType === 3) firstText.textContent = text; + } + }); + document.querySelectorAll("[data-i18n-placeholder]").forEach(function(el) { + el.placeholder = t(el.getAttribute("data-i18n-placeholder")); + }); +} + +function loadLocale(lang, callback) { + var supported = ["zh_CN", "en", "de_DE", "fr_FR", "es_ES", "it_IT", + "ja_JP", "ko_KR", "pl_PL", "pt_BR", "ru_RU", + "cs_CZ", "hu_HU", "nl_NL", "sv_SE", "tr_TR", "uk_UA"]; + var locale = "en"; + if (lang) { + var normalized = lang.replace("-", "_"); + if (supported.indexOf(normalized) !== -1) locale = normalized; + else if (supported.indexOf(normalized.split("_")[0]) !== -1) locale = normalized.split("_")[0]; + else if (normalized.indexOf("zh") === 0) locale = "zh_CN"; + } + var xhr = new XMLHttpRequest(); + xhr.open("GET", "locales/" + locale + ".json", true); + xhr.onload = function() { + if (xhr.status === 200) { + try { g_i18n = JSON.parse(xhr.responseText); } catch(e) { g_i18n = {}; } + } + applyTranslations(); + if (callback) callback(); + }; + xhr.onerror = function() { applyTranslations(); if (callback) callback(); }; + xhr.send(); +} + var g_spools = []; var g_view = "my"; var g_tab = "all"; @@ -123,7 +174,7 @@ function onMachineListResponse(code, data) { if (code !== 0) { deviceArea.style.display = "none"; emptyArea.style.display = "flex"; - if (emptyText) emptyText.textContent = "获取设备列表失败，请重试"; + if (emptyText) emptyText.textContent = t("ams_error_list"); document.getElementById("dialog-body").style.display = "none"; console.error("[FM] get_machine_list failed, code=" + code); return; @@ -134,7 +185,7 @@ function onMachineListResponse(code, data) { if (machines.length === 0) { deviceArea.style.display = "none"; emptyArea.style.display = "flex"; - if (emptyText) emptyText.textContent = "未发现可用打印机，请确保已登录并绑定设备"; + if (emptyText) emptyText.textContent = t("ams_no_printers"); document.getElementById("dialog-body").style.display = "none"; return; } @@ -149,7 +200,7 @@ function onMachineListResponse(code, data) { var opt = document.createElement("option"); opt.value = m.dev_id; opt.textContent = m.dev_name || m.dev_id; - if (m.is_online) opt.textContent += " (在线)"; + if (m.is_online) opt.textContent += " (" + t("ams_online") + ")"; sel.appendChild(opt); if (!firstOnlineId && m.is_online) firstOnlineId = m.dev_id; }); @@ -161,7 +212,7 @@ function onMachineListResponse(code, data) { g_ams_selected_slot = null; document.getElementById("ams-unit-icons").innerHTML = ""; document.getElementById("ams-slots").innerHTML = - '
正在加载 AMS 数据…
'; + '
' + t("ams_loading_data") + '
'; sendRequest("get_ams_data", { dev_id: defaultId }, onAmsDataResponse); } @@ -170,7 +221,7 @@ function onAmsDataResponse(code, data) { console.error("[FM] get_ams_data failed, code=" + code); document.getElementById("ams-unit-icons").innerHTML = ""; document.getElementById("ams-slots").innerHTML = - '
获取 AMS 数据失败
'; + '
' + t("ams_error_data") + '
'; document.getElementById("dialog-body").style.display = "none"; return; } @@ -181,7 +232,7 @@ function onAmsDataResponse(code, data) { console.error("[FM] renderAmsSection error:", e); document.getElementById("ams-unit-icons").innerHTML = ""; document.getElementById("ams-slots").innerHTML = - '
渲染错误: ' + e.message + '
'; + '
' + t("ams_render_error") + e.message + '
'; document.getElementById("dialog-body").style.display = "none"; } } @@ -267,11 +318,11 @@ function refresh() { function getStatusTags(s) { var tags = []; var remain = s.remain_percent || 0; - if (remain === 0) tags.push({text: "已用尽", cls: "status-empty"}); - else if (remain < 20) tags.push({text: "低余量", cls: "status-low"}); + if (remain === 0) tags.push({text: t("status_empty"), cls: "status-empty"}); + else if (remain < 20) tags.push({text: t("status_low"), cls: "status-low"}); if (s.dry_reminder_days > 0 && s.dry_date) { var diff = (Date.now() - new Date(s.dry_date).getTime()) / 86400000; - if (diff >= s.dry_reminder_days) tags.push({text: "需烘干", cls: "status-dry"}); + if (diff >= s.dry_reminder_days) tags.push({text: t("status_dry"), cls: "status-dry"}); } return tags; } @@ -382,7 +433,7 @@ function createRow(s) { '
' + '' + ''+esc(nameParts||"—")+'' + - '' + + '' + '
' + '
'+diam+' mm | '+esc(s.color_name||"—")+'
' + '' + @@ -394,9 +445,9 @@ function createRow(s) { '
'+tagsHtml+'
' + ''+formatPrice(s.unit_price, s.price_currency)+'' + '
' + - '' + - '' + - '' + + '' + + '' + + '' + '
'; return tr; } @@ -414,7 +465,8 @@ function renderPagination(total) { else html += ''; }); html += ''; - html += ''; + var pp = t("per_page"); + html += ''; el.innerHTML = html; } @@ -456,7 +508,7 @@ function toggleFav(id) { sendRequest("toggle_favorite", { spool_id: id }, onSpoo function archiveOrDelete(id) { if (g_view === "archived") { - if (confirm("确定删除这条耗材记录？")) sendRequest("remove_spool", { spool_id: id }, onSpoolsUpdated); + if (confirm(t("confirm_delete"))) sendRequest("remove_spool", { spool_id: id }, onSpoolsUpdated); } else { sendRequest("archive_spool", { spool_id: id }, onSpoolsUpdated); } @@ -470,7 +522,7 @@ function openFilterDropdown(btn, filterKey) { g_spools.forEach(function(s) { if (s[filterKey]) vals[s[filterKey]] = true; }); var items = Object.keys(vals).sort(); - list.innerHTML = '
全部
'; + list.innerHTML = '
' + t("filter_all") + '
'; items.forEach(function(v) { list.innerHTML += '
'+esc(v)+'
'; }); @@ -486,8 +538,8 @@ function openFilterDropdown(btn, filterKey) { /* ===== Dialog ===== */ function openDialog(spool) { var isEdit = !!spool; - document.getElementById("dialog-title").textContent = isEdit ? "编辑耗材" : "添加耗材"; - document.getElementById("dialog-confirm").textContent = isEdit ? "保存" : "添加"; + document.getElementById("dialog-title").textContent = isEdit ? t("dialog_edit_title") : t("dialog_add_title"); + document.getElementById("dialog-confirm").textContent = isEdit ? t("btn_confirm_save") : t("btn_confirm_add"); document.getElementById("quantity-control").style.display = isEdit ? "none" : "flex"; g_quantity = 1; document.getElementById("qty-value").textContent = "1"; @@ -554,7 +606,7 @@ function switchDialogMode(mode) { document.getElementById("ams-device-area").style.display = "none"; document.getElementById("ams-empty").style.display = "flex"; var emptyText = document.querySelector(".ams-empty-text"); - if (emptyText) emptyText.textContent = "正在获取设备信息…"; + if (emptyText) emptyText.textContent = t("ams_loading"); sendRequest("get_machine_list", {}, onMachineListResponse); } } @@ -632,7 +684,7 @@ function selectColor(c) { /* ===== Helpers ===== */ function populateDropdowns() { var brands = g_preset_vendors.map(function(v) { return v.name; }).sort(); - fillSelect("form-brand", brands, "选择品牌"); + fillSelect("form-brand", brands, t("placeholder_brand")); populateTypeDropdown(); } @@ -655,7 +707,7 @@ function populateTypeDropdown() { var typeObjs = getTypesForBrand(brand); var names = typeObjs.map(function(t) { return t.name; }).sort(); var prev = getVal("form-type"); - fillSelect("form-type", names, "选择类型"); + fillSelect("form-type", names, t("placeholder_type")); if (names.indexOf(prev) !== -1) setVal("form-type", prev); populateSeriesDropdown(); } @@ -676,7 +728,7 @@ function populateSeriesDropdown() { seriesList.sort(); var prev = getVal("form-series"); - fillSelect("form-series", seriesList, "选择系列"); + fillSelect("form-series", seriesList, t("placeholder_series")); if (seriesList.indexOf(prev) !== -1) setVal("form-series", prev); } @@ -727,7 +779,7 @@ function openDetail(id) { icon.style.setProperty("--spool-color", s.color_code || "#888"); icon.innerHTML = buildSpoolSvg(s.color_code) + '
'; var entryTag = document.getElementById("det-entry-tag"); - var entryMap = {manual:"手动", ams_sync:"自动", rfid:"RFID"}; + var entryMap = {manual: t("entry_manual"), ams_sync: t("entry_ams"), rfid: t("entry_rfid")}; entryTag.textContent = entryMap[s.entry_method] || ""; document.getElementById("det-spool-sub").textContent = (s.diameter || 1.75) + " mm｜" + (s.color_name || "—"); @@ -744,7 +796,7 @@ function openDetail(id) { var alertMap = {0:"—", 10:"≦ 10g", 20:"≦ 20g", 30:"≦ 30g", 50:"≦ 50g"}; document.getElementById("det-v-remain-alert").textContent = alertMap[s.remain_alert_pct] || "—"; document.getElementById("det-v-dry-date").textContent = s.dry_date || "—"; - var dryMap = {0:"—", 7:"每周", 14:"每两周", 30:"每月", 60:"每两月"}; + var dryMap = {0:"—", 7: t("dry_weekly"), 14: t("dry_biweekly"), 30: t("dry_monthly"), 60: t("dry_bimonthly")}; document.getElementById("det-v-dry-reminder").textContent = dryMap[s.dry_reminder_days] || "—"; var priceStr = "—"; if (s.unit_price) { @@ -826,7 +878,7 @@ function renderAmsSection() { if (units.length === 0) { document.getElementById("ams-unit-icons").innerHTML = ""; document.getElementById("ams-slots").innerHTML = - '
该设备未识别到 AMS
'; + '
' + t("ams_no_ams") + '
'; document.getElementById("dialog-body").style.display = "none"; return; } @@ -896,7 +948,7 @@ function renderAmsSlots(amsUnit) { '
' + label + '
' + '
' + '
' + buildSmallSpoolSvg("#555") + '
' + - '
空
' + + '
' + t("ams_slot_empty") + '
' + '
'; } container.appendChild(div); @@ -1028,7 +1080,7 @@ document.addEventListener("DOMContentLoaded", function() { document.getElementById("btn-delete").addEventListener("click", function() { var ids = Object.keys(g_selected_ids); if (!ids.length) return; - if (confirm("确定删除选中的 " + ids.length + " 条记录？")) { + if (confirm(tf("confirm_batch_delete", ids.length))) { sendRequest("batch_remove", { spool_ids: ids }, onSpoolsUpdated); g_selected_ids = {}; } @@ -1109,7 +1161,7 @@ document.addEventListener("DOMContentLoaded", function() { g_ams_selected_slot = null; document.getElementById("ams-unit-icons").innerHTML = ""; document.getElementById("ams-slots").innerHTML = - '
正在加载 AMS 数据…
'; + '
' + t("ams_loading_data") + '
'; document.getElementById("dialog-body").style.display = "none"; sendRequest("get_ams_data", { dev_id: devId }, onAmsDataResponse); }); @@ -1199,14 +1251,17 @@ document.addEventListener("DOMContentLoaded", function() { hmSel.addEventListener("change", function() { renderHeatmap(); }); } - // Init: single request, C++ responds with theme + spools + presets - sendRequest("init", {}, function(code, data) { - if (code !== 0) return; - var theme = (data && data.theme) || "dark"; - document.documentElement.dataset.theme = theme; - g_spools = (data && data.spools) || []; - g_preset_vendors = (data && data.presets && data.presets.vendors) || []; - refresh(); + // Init: load locale first, then request data from C++ + var urlLang = new URLSearchParams(window.location.search).get("lang") || "en"; + loadLocale(urlLang, function() { + sendRequest("init", {}, function(code, data) { + if (code !== 0) return; + var theme = (data && data.theme) || "dark"; + document.documentElement.dataset.theme = theme; + g_spools = (data && data.spools) || []; + g_preset_vendors = (data && data.presets && data.presets.vendors) || []; + refresh(); + }); }); }); @@ -1240,7 +1295,7 @@ function renderStats() { function countByColor(arr) { var map = {}; arr.forEach(function(s) { - var name = s.color_name || "其他"; + var name = s.color_name || t("other"); if (!map[name]) map[name] = {count: 0, color: s.color_code || "#888"}; map[name].count++; }); @@ -1253,7 +1308,7 @@ function countByColor(arr) { function countBy(arr, key) { var map = {}; arr.forEach(function(s) { - var v = s[key] || "其他"; + var v = s[key] || t("other"); map[v] = (map[v] || 0) + 1; }); var result = []; @@ -1312,7 +1367,7 @@ function renderReminderList(tab) { filtered = spools.filter(function(s) { return (s.remain_percent||0) === 0; }); } if (filtered.length === 0) { - list.innerHTML = '
暂无提醒
'; + list.innerHTML = '
' + t("no_reminders") + '
'; return; } list.innerHTML = ""; diff --git a/resources/web/fila_manager/locales/en.json b/resources/web/fila_manager/locales/en.json new file mode 100644 index 0000000000..fe332c3a8f --- /dev/null +++ b/resources/web/fila_manager/locales/en.json @@ -0,0 +1,124 @@ +{ + "title": "Filament Manager", + "nav_list": "Filament List", + "nav_stats": "Statistics", + "nav_archive": "Archive", + "stat_total_value": "Total Value", + "stat_vs_last_month": "vs. last month", + "stat_total_count": "Total Spools", + "stat_color_count": "Colors", + "stat_details": "Filament Details", + "stat_reminders": "Reminders", + "reminder_low": "Low Stock", + "reminder_dry": "Needs Drying", + "reminder_empty": "Empty", + "stat_usage": "Filament Usage", + "stat_consumption": "Filament Consumption", + "stat_consumption_bar": "Consumption", + "last_7_days": "Last 7 days", + "last_30_days": "Last 30 days", + "tab_all": "All", + "tab_favorite": "Favorites", + "filter_brand": "Brand", + "filter_type": "Type", + "filter_series": "Series", + "filter_status": "Status", + "search_placeholder": "Search filament type", + "btn_delete": "Delete", + "btn_group": "Group", + "btn_add": "Add Filament", + "col_filament": "Filament", + "col_remain": "Remaining", + "col_status": "Status", + "col_price": "Unit Price (/kg)", + "col_actions": "Actions", + "empty_state": "No data", + "dialog_add_title": "Add Filament", + "dialog_edit_title": "Edit Filament", + "dialog_tab_manual": "Manual", + "dialog_tab_ams": "Read from AMS", + "select_device": "Select Device", + "section_filament_info": "Filament Info", + "label_brand": "Brand", + "placeholder_brand": "Select brand", + "label_type": "Type", + "placeholder_type": "Select type", + "label_series": "Series", + "placeholder_series": "Select series", + "label_color": "Color", + "placeholder_color_name": "Color name", + "section_weight": "Weight", + "label_total_weight": "Total Weight", + "label_spool_weight": "Spool Weight", + "label_net_weight": "Net Weight", + "advanced_settings": "Advanced Settings", + "section_basic_params": "Basic Parameters", + "section_status_reminders": "Status Reminders", + "label_remain_alert": "Low Stock Alert", + "placeholder_remain_alert": "Select threshold", + "label_dry_date": "Last Dry Date", + "label_dry_reminder": "Dry Reminder", + "placeholder_dry_reminder": "Select dry reminder interval", + "dry_weekly": "Weekly", + "dry_biweekly": "Every 2 weeks", + "dry_monthly": "Monthly", + "dry_bimonthly": "Every 2 months", + "section_other": "Other", + "label_price": "Price", + "placeholder_currency": "Select currency", + "placeholder_price": "Enter unit price", + "label_note": "Notes", + "placeholder_note": "Enter notes", + "qty_unit": "spool(s)", + "btn_cancel": "Cancel", + "btn_confirm_add": "Add", + "btn_confirm_save": "Save", + "detail_title": "Filament Details", + "detail_prev": "Previous", + "detail_next": "Next", + "detail_tab_info": "Filament Info", + "detail_tab_usage": "Usage History", + "detail_label_brand": "Brand", + "detail_label_type": "Type", + "detail_label_series": "Series", + "detail_label_color": "Color", + "detail_total_weight": "Total Weight", + "detail_spool_weight": "Spool Weight", + "detail_net_weight": "Net Weight", + "detail_section_basic": "Basic Info", + "detail_label_param1": "Parameter 1", + "detail_section_reminders": "Status Reminders", + "detail_label_remain_alert": "Low Stock Alert", + "detail_label_dry_date": "Last Dry Date", + "detail_label_dry_reminder": "Dry Reminder", + "detail_section_other": "Other", + "detail_label_price": "Price", + "detail_label_note": "Notes", + "no_usage_records": "No usage history", + "btn_edit_spool": "Edit Filament", + "ams_loading": "Loading device info…", + "ams_loading_data": "Loading AMS data…", + "ams_error_list": "Failed to get device list, please retry", + "ams_no_printers": "No printers found. Please make sure you are logged in and have a device bound.", + "ams_error_data": "Failed to get AMS data", + "ams_no_ams": "No AMS detected on this device", + "ams_render_error": "Render error: ", + "ams_slot_empty": "Empty", + "ams_online": "online", + "status_empty": "Empty", + "status_low": "Low Stock", + "status_dry": "Needs Drying", + "confirm_delete": "Are you sure you want to delete this filament record?", + "confirm_batch_delete": "Are you sure you want to delete %d selected records?", + "filter_all": "All", + "entry_manual": "Manual", + "entry_ams": "Auto", + "entry_rfid": "RFID", + "no_reminders": "No reminders", + "other": "Other", + "remain_10": "≦ 10g", + "remain_20": "≦ 20g", + "remain_30": "≦ 30g", + "remain_50": "≦ 50g", + "per_page": "/page" +} diff --git a/resources/web/fila_manager/locales/zh_CN.json b/resources/web/fila_manager/locales/zh_CN.json new file mode 100644 index 0000000000..bc81329d91 --- /dev/null +++ b/resources/web/fila_manager/locales/zh_CN.json @@ -0,0 +1,124 @@ +{ + "title": "耗材管理", + "nav_list": "耗材列表", + "nav_stats": "统计", + "nav_archive": "存档", + "stat_total_value": "总价值", + "stat_vs_last_month": "同比上月", + "stat_total_count": "总耗材数", + "stat_color_count": "耗材颜色", + "stat_details": "耗材详情", + "stat_reminders": "提醒事项", + "reminder_low": "低余量", + "reminder_dry": "需烘干", + "reminder_empty": "已用尽", + "stat_usage": "耗材使用", + "stat_consumption": "耗材消耗情况", + "stat_consumption_bar": "消耗量", + "last_7_days": "过去7天", + "last_30_days": "过去30天", + "tab_all": "全部", + "tab_favorite": "收藏", + "filter_brand": "品牌", + "filter_type": "类型", + "filter_series": "系列", + "filter_status": "状态", + "search_placeholder": "搜索耗材类型", + "btn_delete": "删除", + "btn_group": "分组", + "btn_add": "添加耗材", + "col_filament": "耗材", + "col_remain": "余量", + "col_status": "状态", + "col_price": "单价 (/kg)", + "col_actions": "操作", + "empty_state": "暂无数据", + "dialog_add_title": "添加耗材", + "dialog_edit_title": "编辑耗材", + "dialog_tab_manual": "手动添加", + "dialog_tab_ams": "从 AMS 上读取", + "select_device": "选择设备", + "section_filament_info": "耗材信息", + "label_brand": "品牌", + "placeholder_brand": "选择品牌", + "label_type": "类型", + "placeholder_type": "选择类型", + "label_series": "系列", + "placeholder_series": "选择系列", + "label_color": "颜色", + "placeholder_color_name": "颜色名称", + "section_weight": "重量", + "label_total_weight": "总重量", + "label_spool_weight": "料盘重量", + "label_net_weight": "净重", + "advanced_settings": "高级设置", + "section_basic_params": "基础参数", + "section_status_reminders": "状态提醒", + "label_remain_alert": "余量提醒", + "placeholder_remain_alert": "选择余量", + "label_dry_date": "最近一次烘干日期", + "label_dry_reminder": "烘干提醒", + "placeholder_dry_reminder": "选择烘干提醒周期", + "dry_weekly": "每周", + "dry_biweekly": "每两周", + "dry_monthly": "每月", + "dry_bimonthly": "每两月", + "section_other": "其他", + "label_price": "价格", + "placeholder_currency": "选择币种", + "placeholder_price": "输入单价", + "label_note": "备注", + "placeholder_note": "输入备注", + "qty_unit": "卷", + "btn_cancel": "取消", + "btn_confirm_add": "添加", + "btn_confirm_save": "保存", + "detail_title": "耗材详情", + "detail_prev": "上一个", + "detail_next": "下一个", + "detail_tab_info": "耗材信息", + "detail_tab_usage": "使用记录", + "detail_label_brand": "品牌", + "detail_label_type": "类型", + "detail_label_series": "系列", + "detail_label_color": "颜色", + "detail_total_weight": "总重量", + "detail_spool_weight": "料盘重量", + "detail_net_weight": "净重", + "detail_section_basic": "基础信息", + "detail_label_param1": "参数1", + "detail_section_reminders": "状态提醒", + "detail_label_remain_alert": "余量提醒", + "detail_label_dry_date": "最近一次烘干日期", + "detail_label_dry_reminder": "烘干提醒", + "detail_section_other": "其他", + "detail_label_price": "价格", + "detail_label_note": "备注", + "no_usage_records": "暂无使用记录", + "btn_edit_spool": "编辑耗材信息", + "ams_loading": "正在获取设备信息…", + "ams_loading_data": "正在加载 AMS 数据…", + "ams_error_list": "获取设备列表失败，请重试", + "ams_no_printers": "未发现可用打印机，请确保已登录并绑定设备", + "ams_error_data": "获取 AMS 数据失败", + "ams_no_ams": "该设备未识别到 AMS", + "ams_render_error": "渲染错误: ", + "ams_slot_empty": "空", + "ams_online": "在线", + "status_empty": "已用尽", + "status_low": "低余量", + "status_dry": "需烘干", + "confirm_delete": "确定删除这条耗材记录？", + "confirm_batch_delete": "确定删除选中的 %d 条记录？", + "filter_all": "全部", + "entry_manual": "手动", + "entry_ams": "自动", + "entry_rfid": "RFID", + "no_reminders": "暂无提醒", + "other": "其他", + "remain_10": "≦ 10g", + "remain_20": "≦ 20g", + "remain_30": "≦ 30g", + "remain_50": "≦ 50g", + "per_page": "/页" +} From 2a7820e4875ce91ebd4f3bb99b23b171b75a4cb6 Mon Sep 17 00:00:00 2001 From: BenJule Date: Wed, 20 May 2026 16:17:42 +0200 Subject: [PATCH 4/5] fix: correct 'percision' typo to 'precision' in motion calibration UI strings Two printer status strings shown during calibration used the misspelling "percision" instead of "precision". Also fix lang="zh-CN" in NozzleListTable.html (the table content is set by C++ at runtime). All .po and .pot msgid entries updated to match the corrected source strings. --- bbl/i18n/BambuStudio.pot | 4 ++-- bbl/i18n/cs/BambuStudio_cs.po | 4 ++-- bbl/i18n/de/BambuStudio_de.po | 4 ++-- bbl/i18n/en/BambuStudio_en.po | 4 ++-- bbl/i18n/es/BambuStudio_es.po | 4 ++-- bbl/i18n/fr/BambuStudio_fr.po | 4 ++-- bbl/i18n/hu/BambuStudio_hu.po | 4 ++-- bbl/i18n/it/BambuStudio_it.po | 4 ++-- bbl/i18n/ja/BambuStudio_ja.po | 4 ++-- bbl/i18n/ko/BambuStudio_ko.po | 4 ++-- bbl/i18n/nl/BambuStudio_nl.po | 4 ++-- bbl/i18n/pl/BambuStudio_pl.po | 4 ++-- bbl/i18n/pt_BR/BambuStudio_pt_BR.po | 4 ++-- bbl/i18n/ru/BambuStudio_ru.po | 4 ++-- bbl/i18n/sv/BambuStudio_sv.po | 4 ++-- bbl/i18n/tr/BambuStudio_tr.po | 4 ++-- bbl/i18n/uk/BambuStudio_uk.po | 4 ++-- bbl/i18n/zh_CN/BambuStudio_zh_CN.po | 4 ++-- bbl/i18n/zh_TW/BambuStudio_zh_TW.po | 4 ++-- resources/web/flush/NozzleListTable.html | 2 +- src/slic3r/GUI/DeviceManager.cpp | 4 ++-- 21 files changed, 41 insertions(+), 41 deletions(-) diff --git a/bbl/i18n/BambuStudio.pot b/bbl/i18n/BambuStudio.pot index 4248a440ed..0fb7d641ca 100644 --- a/bbl/i18n/BambuStudio.pot +++ b/bbl/i18n/BambuStudio.pot @@ -4239,10 +4239,10 @@ msgstr "" msgid "Pause (nozzle clog)" msgstr "" -msgid "Measuring motion percision" +msgid "Measuring motion precision" msgstr "" -msgid "Enhancing motion percision" +msgid "Enhancing motion precision" msgstr "" msgid "Measure motion accuracy" diff --git a/bbl/i18n/cs/BambuStudio_cs.po b/bbl/i18n/cs/BambuStudio_cs.po index 243c74c1dd..adcfcc3335 100644 --- a/bbl/i18n/cs/BambuStudio_cs.po +++ b/bbl/i18n/cs/BambuStudio_cs.po @@ -4412,10 +4412,10 @@ msgstr "Pozastavení (chyba první vrstvy)" msgid "Pause (nozzle clog)" msgstr "Pozastavení (ucpání trysky)" -msgid "Measuring motion percision" +msgid "Measuring motion precision" msgstr "Měření přesnosti pohybu" -msgid "Enhancing motion percision" +msgid "Enhancing motion precision" msgstr "Zvyšování přesnosti pohybu" msgid "Measure motion accuracy" diff --git a/bbl/i18n/de/BambuStudio_de.po b/bbl/i18n/de/BambuStudio_de.po index 09ca1aa021..18347a350d 100644 --- a/bbl/i18n/de/BambuStudio_de.po +++ b/bbl/i18n/de/BambuStudio_de.po @@ -4354,10 +4354,10 @@ msgstr "" msgid "Pause (nozzle clog)" msgstr "" -msgid "Measuring motion percision" +msgid "Measuring motion precision" msgstr "" -msgid "Enhancing motion percision" +msgid "Enhancing motion precision" msgstr "" msgid "Measure motion accuracy" diff --git a/bbl/i18n/en/BambuStudio_en.po b/bbl/i18n/en/BambuStudio_en.po index 8582804a20..dbd0de8e60 100644 --- a/bbl/i18n/en/BambuStudio_en.po +++ b/bbl/i18n/en/BambuStudio_en.po @@ -4310,10 +4310,10 @@ msgstr "" msgid "Pause (nozzle clog)" msgstr "" -msgid "Measuring motion percision" +msgid "Measuring motion precision" msgstr "" -msgid "Enhancing motion percision" +msgid "Enhancing motion precision" msgstr "" msgid "Measure motion accuracy" diff --git a/bbl/i18n/es/BambuStudio_es.po b/bbl/i18n/es/BambuStudio_es.po index e87fd23138..93772bfbe8 100644 --- a/bbl/i18n/es/BambuStudio_es.po +++ b/bbl/i18n/es/BambuStudio_es.po @@ -4352,10 +4352,10 @@ msgstr "" msgid "Pause (nozzle clog)" msgstr "" -msgid "Measuring motion percision" +msgid "Measuring motion precision" msgstr "" -msgid "Enhancing motion percision" +msgid "Enhancing motion precision" msgstr "" msgid "Measure motion accuracy" diff --git a/bbl/i18n/fr/BambuStudio_fr.po b/bbl/i18n/fr/BambuStudio_fr.po index 9d52cc365a..4bcb67fd55 100644 --- a/bbl/i18n/fr/BambuStudio_fr.po +++ b/bbl/i18n/fr/BambuStudio_fr.po @@ -4341,10 +4341,10 @@ msgstr "Pause (erreur première couche)" msgid "Pause (nozzle clog)" msgstr "Pause (buse bouchée)" -msgid "Measuring motion percision" +msgid "Measuring motion precision" msgstr "Mesurer la précision des mouvements" -msgid "Enhancing motion percision" +msgid "Enhancing motion precision" msgstr "Améliorer la précision des mouvements" msgid "Measure motion accuracy" diff --git a/bbl/i18n/hu/BambuStudio_hu.po b/bbl/i18n/hu/BambuStudio_hu.po index 5f916f73b8..a7ef70fe36 100644 --- a/bbl/i18n/hu/BambuStudio_hu.po +++ b/bbl/i18n/hu/BambuStudio_hu.po @@ -4350,10 +4350,10 @@ msgstr "Szünet (első réteg hibája)" msgid "Pause (nozzle clog)" msgstr "Szünet (fúvóka eltömődése)" -msgid "Measuring motion percision" +msgid "Measuring motion precision" msgstr "Mozgás pontosságának mérése" -msgid "Enhancing motion percision" +msgid "Enhancing motion precision" msgstr "Mozgás pontosságának javítása" msgid "Measure motion accuracy" diff --git a/bbl/i18n/it/BambuStudio_it.po b/bbl/i18n/it/BambuStudio_it.po index 62236a56ff..03bd61d5f3 100644 --- a/bbl/i18n/it/BambuStudio_it.po +++ b/bbl/i18n/it/BambuStudio_it.po @@ -4355,10 +4355,10 @@ msgstr "" msgid "Pause (nozzle clog)" msgstr "" -msgid "Measuring motion percision" +msgid "Measuring motion precision" msgstr "" -msgid "Enhancing motion percision" +msgid "Enhancing motion precision" msgstr "" msgid "Measure motion accuracy" diff --git a/bbl/i18n/ja/BambuStudio_ja.po b/bbl/i18n/ja/BambuStudio_ja.po index 4b88e9f772..f0e3714f85 100644 --- a/bbl/i18n/ja/BambuStudio_ja.po +++ b/bbl/i18n/ja/BambuStudio_ja.po @@ -4330,10 +4330,10 @@ msgstr "一時停止（1層目のエラー）" msgid "Pause (nozzle clog)" msgstr "一時停止 (ノズル詰まり)" -msgid "Measuring motion percision" +msgid "Measuring motion precision" msgstr "動作精度の測定" -msgid "Enhancing motion percision" +msgid "Enhancing motion precision" msgstr "動作精度の向上" msgid "Measure motion accuracy" diff --git a/bbl/i18n/ko/BambuStudio_ko.po b/bbl/i18n/ko/BambuStudio_ko.po index 3e9bf2cb93..c2dada4a65 100644 --- a/bbl/i18n/ko/BambuStudio_ko.po +++ b/bbl/i18n/ko/BambuStudio_ko.po @@ -4344,10 +4344,10 @@ msgstr "일시 중지 (첫 레이어 오류)" msgid "Pause (nozzle clog)" msgstr "일시 중지 (노즐 막힘)" -msgid "Measuring motion percision" +msgid "Measuring motion precision" msgstr "모션 정확도 측정중" -msgid "Enhancing motion percision" +msgid "Enhancing motion precision" msgstr "모션 정확도 향상" msgid "Measure motion accuracy" diff --git a/bbl/i18n/nl/BambuStudio_nl.po b/bbl/i18n/nl/BambuStudio_nl.po index 06e236975e..4a5773b419 100644 --- a/bbl/i18n/nl/BambuStudio_nl.po +++ b/bbl/i18n/nl/BambuStudio_nl.po @@ -4350,10 +4350,10 @@ msgstr "" msgid "Pause (nozzle clog)" msgstr "" -msgid "Measuring motion percision" +msgid "Measuring motion precision" msgstr "" -msgid "Enhancing motion percision" +msgid "Enhancing motion precision" msgstr "" msgid "Measure motion accuracy" diff --git a/bbl/i18n/pl/BambuStudio_pl.po b/bbl/i18n/pl/BambuStudio_pl.po index 9c24063cc2..a32e789af6 100644 --- a/bbl/i18n/pl/BambuStudio_pl.po +++ b/bbl/i18n/pl/BambuStudio_pl.po @@ -4355,10 +4355,10 @@ msgstr "Wstrzymano (błąd pierwszej warstwy)" msgid "Pause (nozzle clog)" msgstr "Wstrzymano (zatkanie dyszy)" -msgid "Measuring motion percision" +msgid "Measuring motion precision" msgstr "Pomiar precyzji ruchu" -msgid "Enhancing motion percision" +msgid "Enhancing motion precision" msgstr "Poprawa percyzji ruchu" msgid "Measure motion accuracy" diff --git a/bbl/i18n/pt_BR/BambuStudio_pt_BR.po b/bbl/i18n/pt_BR/BambuStudio_pt_BR.po index 841eaa0dae..7dcd04a513 100644 --- a/bbl/i18n/pt_BR/BambuStudio_pt_BR.po +++ b/bbl/i18n/pt_BR/BambuStudio_pt_BR.po @@ -4353,10 +4353,10 @@ msgstr "Pausa (erro na primeira camada)" msgid "Pause (nozzle clog)" msgstr "Pausa (bico entupido)" -msgid "Measuring motion percision" +msgid "Measuring motion precision" msgstr "Medindo a precisão do movimento" -msgid "Enhancing motion percision" +msgid "Enhancing motion precision" msgstr "Melhorando a precisão do movimento" msgid "Measure motion accuracy" diff --git a/bbl/i18n/ru/BambuStudio_ru.po b/bbl/i18n/ru/BambuStudio_ru.po index 1c8f59ac05..12c95ed025 100644 --- a/bbl/i18n/ru/BambuStudio_ru.po +++ b/bbl/i18n/ru/BambuStudio_ru.po @@ -4407,10 +4407,10 @@ msgstr "" msgid "Pause (nozzle clog)" msgstr "" -msgid "Measuring motion percision" +msgid "Measuring motion precision" msgstr "" -msgid "Enhancing motion percision" +msgid "Enhancing motion precision" msgstr "" msgid "Measure motion accuracy" diff --git a/bbl/i18n/sv/BambuStudio_sv.po b/bbl/i18n/sv/BambuStudio_sv.po index 9eb438111c..b43a73e95d 100644 --- a/bbl/i18n/sv/BambuStudio_sv.po +++ b/bbl/i18n/sv/BambuStudio_sv.po @@ -4347,10 +4347,10 @@ msgstr "Paus (fel på första lagret)" msgid "Pause (nozzle clog)" msgstr "Paus (igensatt nozzle)" -msgid "Measuring motion percision" +msgid "Measuring motion precision" msgstr "Mäter rörelse precision" -msgid "Enhancing motion percision" +msgid "Enhancing motion precision" msgstr "Förbättra rörelseprecisionen" msgid "Measure motion accuracy" diff --git a/bbl/i18n/tr/BambuStudio_tr.po b/bbl/i18n/tr/BambuStudio_tr.po index 23a24a30a7..d2d4150eb2 100644 --- a/bbl/i18n/tr/BambuStudio_tr.po +++ b/bbl/i18n/tr/BambuStudio_tr.po @@ -4339,10 +4339,10 @@ msgstr "Duraklat (ilk katman hatası)" msgid "Pause (nozzle clog)" msgstr "Duraklatma (nozul tıkanıklığı)" -msgid "Measuring motion percision" +msgid "Measuring motion precision" msgstr "Hareket hassasiyetinin ölçülmesi" -msgid "Enhancing motion percision" +msgid "Enhancing motion precision" msgstr "Hareket hassasiyetini artırma" msgid "Measure motion accuracy" diff --git a/bbl/i18n/uk/BambuStudio_uk.po b/bbl/i18n/uk/BambuStudio_uk.po index b707944293..d7488e9970 100644 --- a/bbl/i18n/uk/BambuStudio_uk.po +++ b/bbl/i18n/uk/BambuStudio_uk.po @@ -4331,10 +4331,10 @@ msgstr "" msgid "Pause (nozzle clog)" msgstr "" -msgid "Measuring motion percision" +msgid "Measuring motion precision" msgstr "" -msgid "Enhancing motion percision" +msgid "Enhancing motion precision" msgstr "" msgid "Measure motion accuracy" diff --git a/bbl/i18n/zh_CN/BambuStudio_zh_CN.po b/bbl/i18n/zh_CN/BambuStudio_zh_CN.po index 10ae14158b..cd83b0d43d 100644 --- a/bbl/i18n/zh_CN/BambuStudio_zh_CN.po +++ b/bbl/i18n/zh_CN/BambuStudio_zh_CN.po @@ -4319,10 +4319,10 @@ msgstr "暂停（首层扫描异常）" msgid "Pause (nozzle clog)" msgstr "暂停（堵头）" -msgid "Measuring motion percision" +msgid "Measuring motion precision" msgstr "检查运动精度" -msgid "Enhancing motion percision" +msgid "Enhancing motion precision" msgstr "运动精度增强" msgid "Measure motion accuracy" diff --git a/bbl/i18n/zh_TW/BambuStudio_zh_TW.po b/bbl/i18n/zh_TW/BambuStudio_zh_TW.po index 01f679ed71..71d6d990ce 100644 --- a/bbl/i18n/zh_TW/BambuStudio_zh_TW.po +++ b/bbl/i18n/zh_TW/BambuStudio_zh_TW.po @@ -4320,10 +4320,10 @@ msgstr "暫停（首層掃描異常）" msgid "Pause (nozzle clog)" msgstr "暫停（堵頭）" -msgid "Measuring motion percision" +msgid "Measuring motion precision" msgstr "檢查運動精度" -msgid "Enhancing motion percision" +msgid "Enhancing motion precision" msgstr "運動精度增強" msgid "Measure motion accuracy" diff --git a/resources/web/flush/NozzleListTable.html b/resources/web/flush/NozzleListTable.html index 6c7cd29c7d..06b106866f 100644 --- a/resources/web/flush/NozzleListTable.html +++ b/resources/web/flush/NozzleListTable.html @@ -1,5 +1,5 @@ - + diff --git a/src/slic3r/GUI/DeviceManager.cpp b/src/slic3r/GUI/DeviceManager.cpp index dbadf5af5f..c84abf1509 100644 --- a/src/slic3r/GUI/DeviceManager.cpp +++ b/src/slic3r/GUI/DeviceManager.cpp @@ -159,9 +159,9 @@ wxString Slic3r::get_stage_string(int stage) case 35: return _L("Pause (nozzle clog)"); case 36: - return _L("Measuring motion percision"); + return _L("Measuring motion precision"); case 37: - return _L("Enhancing motion percision"); + return _L("Enhancing motion precision"); case 38: return _L("Measure motion accuracy"); case 39: From a1ab267c3484a17c6aeac4154c8b0b304fe892e5 Mon Sep 17 00:00:00 2001 From: BenJule Date: Wed, 20 May 2026 16:54:26 +0200 Subject: [PATCH 5/5] fix: correct grammar and punctuation in English UI strings MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 'Problem occured' → 'Problem occurred' (MediaPlayCtrl.cpp) - 'When enable spiral vase mode' → 'When enabling ...' (SelectMachine.cpp, SyncAmsInfoDialog.cpp) - 'connectors is out of object' → 'connectors are out of object' (GLGizmoAdvancedCut.cpp) - 'Error:Detecting ...' → 'Error: Detecting ...' with spacing fixes (GLGizmoText.cpp) Update all corresponding msgid entries in BambuStudio.pot and all 18 .po locale files. --- bbl/i18n/BambuStudio.pot | 8 ++++---- bbl/i18n/cs/BambuStudio_cs.po | 8 ++++---- bbl/i18n/de/BambuStudio_de.po | 8 ++++---- bbl/i18n/en/BambuStudio_en.po | 8 ++++---- bbl/i18n/es/BambuStudio_es.po | 8 ++++---- bbl/i18n/fr/BambuStudio_fr.po | 8 ++++---- bbl/i18n/hu/BambuStudio_hu.po | 8 ++++---- bbl/i18n/it/BambuStudio_it.po | 8 ++++---- bbl/i18n/ja/BambuStudio_ja.po | 8 ++++---- bbl/i18n/ko/BambuStudio_ko.po | 8 ++++---- bbl/i18n/nl/BambuStudio_nl.po | 8 ++++---- bbl/i18n/pl/BambuStudio_pl.po | 8 ++++---- bbl/i18n/pt_BR/BambuStudio_pt_BR.po | 8 ++++---- bbl/i18n/ru/BambuStudio_ru.po | 8 ++++---- bbl/i18n/sv/BambuStudio_sv.po | 8 ++++---- bbl/i18n/tr/BambuStudio_tr.po | 8 ++++---- bbl/i18n/uk/BambuStudio_uk.po | 8 ++++---- bbl/i18n/zh_CN/BambuStudio_zh_CN.po | 8 ++++---- bbl/i18n/zh_TW/BambuStudio_zh_TW.po | 8 ++++---- src/slic3r/GUI/Gizmos/GLGizmoAdvancedCut.cpp | 2 +- src/slic3r/GUI/Gizmos/GLGizmoText.cpp | 2 +- src/slic3r/GUI/MediaPlayCtrl.cpp | 2 +- src/slic3r/GUI/SelectMachine.cpp | 4 ++-- src/slic3r/GUI/SyncAmsInfoDialog.cpp | 2 +- 24 files changed, 82 insertions(+), 82 deletions(-) diff --git a/bbl/i18n/BambuStudio.pot b/bbl/i18n/BambuStudio.pot index 0fb7d641ca..eddfbc0852 100644 --- a/bbl/i18n/BambuStudio.pot +++ b/bbl/i18n/BambuStudio.pot @@ -1088,7 +1088,7 @@ msgstr "" msgid "connector is out of object" msgstr "" -msgid "connectors is out of object" +msgid "connectors are out of object" msgstr "" msgid "Some connectors are overlapped" @@ -1538,7 +1538,7 @@ msgstr "" msgid "Warning:old matrix has at least two parameters: mirroring, scaling, and rotation. If you continue editing, it may not be correct. Please dragging text or cancel using current pose, save and reedit again." msgstr "" -msgid "Error:Detecting an incorrect mesh id or an unknown error, regenerating text may result in incorrect outcomes.Please drag text,save it then reedit it again." +msgid "Error: Detecting an incorrect mesh id or an unknown error, regenerating text may result in incorrect outcomes. Please drag text, save it then reedit it again." msgstr "" msgid "Warning:Due to functional upgrade, rotation information cannot be restored. Please drag or modify text,save it and reedit it will ok." @@ -5836,7 +5836,7 @@ msgstr "" msgid "Printer camera is malfunctioning." msgstr "" -msgid "Problem occured. Please update the printer firmware and try again." +msgid "Problem occurred. Please update the printer firmware and try again." msgstr "" msgid "LAN Only Liveview is off. Please turn on the liveview on printer screen." @@ -8799,7 +8799,7 @@ msgstr "" msgid "The selected printer (%s) is incompatible with the print file configuration (%s). Please adjust the printer preset in the prepare page or choose a compatible printer on this page." msgstr "" -msgid "When enable spiral vase mode, machines with I3 structure will not generate timelapse videos." +msgid "When enabling spiral vase mode, machines with I3 structure will not generate timelapse videos." msgstr "" msgid "The current printer does not support timelapse in Traditional Mode when printing By-Object." diff --git a/bbl/i18n/cs/BambuStudio_cs.po b/bbl/i18n/cs/BambuStudio_cs.po index adcfcc3335..d300399554 100644 --- a/bbl/i18n/cs/BambuStudio_cs.po +++ b/bbl/i18n/cs/BambuStudio_cs.po @@ -1087,7 +1087,7 @@ msgstr "konektory jsou mimo řeznou konturu" msgid "connector is out of object" msgstr "konektor je mimo objekt" -msgid "connectors is out of object" +msgid "connectors are out of object" msgstr "konektory jsou mimo objekt" msgid "Some connectors are overlapped" @@ -1559,7 +1559,7 @@ msgstr "Varování: Aktuální rozestupy textu nejsou příliš vhodné. Pokud b msgid "Warning:old matrix has at least two parameters: mirroring, scaling, and rotation. If you continue editing, it may not be correct. Please dragging text or cancel using current pose, save and reedit again." msgstr "Varování: Stará matice obsahuje alespoň dva parametry: zrcadlení, škálování a rotaci. Pokud budete pokračovat v úpravách, výsledek nemusí být správný. Přetáhněte text nebo zrušte použití aktuální polohy, uložte změny a poté upravujte znovu." -msgid "Error:Detecting an incorrect mesh id or an unknown error, regenerating text may result in incorrect outcomes.Please drag text,save it then reedit it again." +msgid "Error: Detecting an incorrect mesh id or an unknown error, regenerating text may result in incorrect outcomes. Please drag text, save it then reedit it again." msgstr "Chyba: Bylo zjištěno nesprávné ID sítě nebo došlo k neznámé chybě. Opětovné generování textu může vést k nesprávným výsledkům. Přetáhněte text, uložte jej a poté jej znovu upravte." msgid "Warning:Due to functional upgrade, rotation information cannot be restored. Please drag or modify text,save it and reedit it will ok." @@ -6036,7 +6036,7 @@ msgstr "Tiskárna právě stahuje data. Zkuste to prosím znovu po dokončení." msgid "Printer camera is malfunctioning." msgstr "Kamera tiskárny nefunguje správně." -msgid "Problem occured. Please update the printer firmware and try again." +msgid "Problem occurred. Please update the printer firmware and try again." msgstr "Došlo k problému. Aktualizujte firmware tiskárny a zkuste to znovu." msgid "LAN Only Liveview is off. Please turn on the liveview on printer screen." @@ -9132,7 +9132,7 @@ msgstr "Filament neodpovídá filamentu ve slotu AMS. Aktualizujte firmware tisk msgid "The selected printer (%s) is incompatible with the print file configuration (%s). Please adjust the printer preset in the prepare page or choose a compatible printer on this page." msgstr "Vybraná tiskárna (%s) není kompatibilní s konfigurací tiskového souboru (%s). Upravte prosím předvolbu tiskárny na stránce Příprava nebo na této stránce zvolte kompatibilní tiskárnu." -msgid "When enable spiral vase mode, machines with I3 structure will not generate timelapse videos." +msgid "When enabling spiral vase mode, machines with I3 structure will not generate timelapse videos." msgstr "Při zapnutí režimu spirálové vázy nebudou tiskárny s konstrukcí I3 generovat časosběrná videa." msgid "The current printer does not support timelapse in Traditional Mode when printing By-Object." diff --git a/bbl/i18n/de/BambuStudio_de.po b/bbl/i18n/de/BambuStudio_de.po index 18347a350d..2a1682ba1f 100644 --- a/bbl/i18n/de/BambuStudio_de.po +++ b/bbl/i18n/de/BambuStudio_de.po @@ -1085,7 +1085,7 @@ msgstr "Die Verbinder befinden sich außerhalb der Schnittkontur" msgid "connector is out of object" msgstr "Verbinder ist außerhalb des Objekts" -msgid "connectors is out of object" +msgid "connectors are out of object" msgstr "Die Verbinder müssen sich auf der Oberfläche des Objekts befinden." msgid "Some connectors are overlapped" @@ -1549,7 +1549,7 @@ msgstr "Warnung: Der aktuelle Textabstand ist nicht sehr sinnvoll. Wenn Sie mit msgid "Warning:old matrix has at least two parameters: mirroring, scaling, and rotation. If you continue editing, it may not be correct. Please dragging text or cancel using current pose, save and reedit again." msgstr "Warnung: Die alte Matrix hat mindestens zwei Parameter: Spiegelung, Skalierung und Drehung. Wenn Sie mit der Bearbeitung fortfahren, ist sie möglicherweise nicht korrekt. Bitte ziehen Sie den Text oder brechen Sie die Bearbeitung mit der aktuellen Position ab, speichern Sie und bearbeiten Sie erneut." -msgid "Error:Detecting an incorrect mesh id or an unknown error, regenerating text may result in incorrect outcomes.Please drag text,save it then reedit it again." +msgid "Error: Detecting an incorrect mesh id or an unknown error, regenerating text may result in incorrect outcomes. Please drag text, save it then reedit it again." msgstr "Fehler: Bei Erkennung einer falschen Netz-ID oder eines unbekannten Fehlers kann die Neuerstellung von Text zu falschen Ergebnissen führen. Bitte ziehen Sie den Text, speichern Sie ihn und bearbeiten Sie ihn erneut." msgid "Warning:Due to functional upgrade, rotation information cannot be restored. Please drag or modify text,save it and reedit it will ok." @@ -5971,7 +5971,7 @@ msgstr "Der Drucker ist gerade mit dem Herunterladen beschäftigt. Bitte versuch msgid "Printer camera is malfunctioning." msgstr "Die Druckerkamera funktioniert nicht richtig." -msgid "Problem occured. Please update the printer firmware and try again." +msgid "Problem occurred. Please update the printer firmware and try again." msgstr "Es ist ein Problem aufgetreten. Bitte aktualisieren Sie die Druckerfirmware und versuchen Sie es erneut." msgid "LAN Only Liveview is off. Please turn on the liveview on printer screen." @@ -9040,7 +9040,7 @@ msgstr "Filament stimmt nicht mit dem Filament in AMS-Slot überein. Bitte aktua msgid "The selected printer (%s) is incompatible with the print file configuration (%s). Please adjust the printer preset in the prepare page or choose a compatible printer on this page." msgstr "Der ausgewählte Drucker (%s) ist mit der Konfiguration der Druckdatei (%s) nicht kompatibel. Passen Sie das Druckerprofil auf der Vorbereitungsseite an oder wählen Sie auf dieser Seite einen kompatiblen Drucker aus." -msgid "When enable spiral vase mode, machines with I3 structure will not generate timelapse videos." +msgid "When enabling spiral vase mode, machines with I3 structure will not generate timelapse videos." msgstr "When spiral vase mode is enabled, machines with I3 structure will not generate timelapse videos." msgid "The current printer does not support timelapse in Traditional Mode when printing By-Object." diff --git a/bbl/i18n/en/BambuStudio_en.po b/bbl/i18n/en/BambuStudio_en.po index dbd0de8e60..3950e597dd 100644 --- a/bbl/i18n/en/BambuStudio_en.po +++ b/bbl/i18n/en/BambuStudio_en.po @@ -1082,7 +1082,7 @@ msgstr "connectors are out of cut contour" msgid "connector is out of object" msgstr "connector is out of object" -msgid "connectors is out of object" +msgid "connectors are out of object" msgstr "Connectors must be on object surface." msgid "Some connectors are overlapped" @@ -1540,7 +1540,7 @@ msgstr "" msgid "Warning:old matrix has at least two parameters: mirroring, scaling, and rotation. If you continue editing, it may not be correct. Please dragging text or cancel using current pose, save and reedit again." msgstr "" -msgid "Error:Detecting an incorrect mesh id or an unknown error, regenerating text may result in incorrect outcomes.Please drag text,save it then reedit it again." +msgid "Error: Detecting an incorrect mesh id or an unknown error, regenerating text may result in incorrect outcomes. Please drag text, save it then reedit it again." msgstr "" msgid "Warning:Due to functional upgrade, rotation information cannot be restored. Please drag or modify text,save it and reedit it will ok." @@ -5919,7 +5919,7 @@ msgstr "The printer is currently busy downloading. Please try again after it fin msgid "Printer camera is malfunctioning." msgstr "Printer camera is malfunctioning." -msgid "Problem occured. Please update the printer firmware and try again." +msgid "Problem occurred. Please update the printer firmware and try again." msgstr "A problem occurred. Please update the printer firmware and try again." msgid "LAN Only Liveview is off. Please turn on the liveview on printer screen." @@ -8923,7 +8923,7 @@ msgstr "Filament does not match the filament in AMS slot. Please update the prin msgid "The selected printer (%s) is incompatible with the print file configuration (%s). Please adjust the printer preset in the prepare page or choose a compatible printer on this page." msgstr "" -msgid "When enable spiral vase mode, machines with I3 structure will not generate timelapse videos." +msgid "When enabling spiral vase mode, machines with I3 structure will not generate timelapse videos." msgstr "When spiral vase mode is enabled, machines with I3 structure will not generate timelapse videos." msgid "The current printer does not support timelapse in Traditional Mode when printing By-Object." diff --git a/bbl/i18n/es/BambuStudio_es.po b/bbl/i18n/es/BambuStudio_es.po index 93772bfbe8..121138ad6f 100644 --- a/bbl/i18n/es/BambuStudio_es.po +++ b/bbl/i18n/es/BambuStudio_es.po @@ -1085,7 +1085,7 @@ msgstr "los conectores están fuera del contorno de corte" msgid "connector is out of object" msgstr "el conector está fuera de objeto" -msgid "connectors is out of object" +msgid "connectors are out of object" msgstr "Los conectores deben estar en la superficie del objeto." msgid "Some connectors are overlapped" @@ -1549,7 +1549,7 @@ msgstr "Advertencia: el espaciado actual del texto no es muy razonable. Si conti msgid "Warning:old matrix has at least two parameters: mirroring, scaling, and rotation. If you continue editing, it may not be correct. Please dragging text or cancel using current pose, save and reedit again." msgstr "Advertencia: la matriz anterior tiene al menos dos parámetros: reflejo, escala y rotación. Si continúa editando, puede que no sea correcto. Arrastra el texto o cancela usando la postura actual, guárdalo y vuelve a editarlo." -msgid "Error:Detecting an incorrect mesh id or an unknown error, regenerating text may result in incorrect outcomes.Please drag text,save it then reedit it again." +msgid "Error: Detecting an incorrect mesh id or an unknown error, regenerating text may result in incorrect outcomes. Please drag text, save it then reedit it again." msgstr "Error: si se detecta una identificación de malla incorrecta o un error desconocido, la regeneración del texto puede generar resultados incorrectos. Arrastre el texto, guárdelo y vuelva a editarlo." msgid "Warning:Due to functional upgrade, rotation information cannot be restored. Please drag or modify text,save it and reedit it will ok." @@ -5971,7 +5971,7 @@ msgstr "La impresora está actualmente ocupada descargando. Inténtelo de nuevo msgid "Printer camera is malfunctioning." msgstr "La cámara de la impresora funciona mal." -msgid "Problem occured. Please update the printer firmware and try again." +msgid "Problem occurred. Please update the printer firmware and try again." msgstr "Se ha producido un problema. Actualice el firmware de la impresora e inténtelo de nuevo." msgid "LAN Only Liveview is off. Please turn on the liveview on printer screen." @@ -9041,7 +9041,7 @@ msgstr "El filamento no coincide con el filamento de la ranura AMS. Actualice el msgid "The selected printer (%s) is incompatible with the print file configuration (%s). Please adjust the printer preset in the prepare page or choose a compatible printer on this page." msgstr "La impresora seleccionada (%s) no es compatible con la configuración del archivo de impresión (%s). Ajuste el ajuste preestablecido de la impresora en la página de preparación o seleccione una impresora compatible en esta página." -msgid "When enable spiral vase mode, machines with I3 structure will not generate timelapse videos." +msgid "When enabling spiral vase mode, machines with I3 structure will not generate timelapse videos." msgstr "When spiral vase mode is enabled, machines with I3 structure will not generate timelapse videos." msgid "The current printer does not support timelapse in Traditional Mode when printing By-Object." diff --git a/bbl/i18n/fr/BambuStudio_fr.po b/bbl/i18n/fr/BambuStudio_fr.po index 4bcb67fd55..9c9192ae42 100644 --- a/bbl/i18n/fr/BambuStudio_fr.po +++ b/bbl/i18n/fr/BambuStudio_fr.po @@ -1085,7 +1085,7 @@ msgstr "les connecteurs sont hors du contour de la coupe" msgid "connector is out of object" msgstr "le connecteur est hors de l'objet" -msgid "connectors is out of object" +msgid "connectors are out of object" msgstr "Les connecteurs doivent se trouver sur la surface de l'objet." msgid "Some connectors are overlapped" @@ -1549,7 +1549,7 @@ msgstr "Avertissement : l’espacement actuel du texte n’est pas très appropr msgid "Warning:old matrix has at least two parameters: mirroring, scaling, and rotation. If you continue editing, it may not be correct. Please dragging text or cancel using current pose, save and reedit again." msgstr "Attention : l'ancienne matrice comporte au moins deux paramètres : l'effet miroir, la mise à l'échelle et la rotation. Si vous continuez l'édition, il se peut qu'elle ne soit pas correcte. Veuillez déplacer le texte ou annuler en utilisant la pose actuelle, sauvegarder et rééditer." -msgid "Error:Detecting an incorrect mesh id or an unknown error, regenerating text may result in incorrect outcomes.Please drag text,save it then reedit it again." +msgid "Error: Detecting an incorrect mesh id or an unknown error, regenerating text may result in incorrect outcomes. Please drag text, save it then reedit it again." msgstr "Erreur:Détection d’un identifiant de maille incorrect ou une erreur inconnue, la régénération du texte peut aboutir à des résultats incorrects." msgid "Warning:Due to functional upgrade, rotation information cannot be restored. Please drag or modify text,save it and reedit it will ok." @@ -5958,7 +5958,7 @@ msgstr "L'imprimante est actuellement occupée à télécharger. Veuillez réess msgid "Printer camera is malfunctioning." msgstr "La caméra de l'imprimante ne fonctionne pas correctement." -msgid "Problem occured. Please update the printer firmware and try again." +msgid "Problem occurred. Please update the printer firmware and try again." msgstr "Un problème est survenu. Mettez à jour le firmware de l'imprimante et réessayez." msgid "LAN Only Liveview is off. Please turn on the liveview on printer screen." @@ -9020,7 +9020,7 @@ msgstr "Le filament ne correspond pas au filament du slot AMS. Veuillez mettre msgid "The selected printer (%s) is incompatible with the print file configuration (%s). Please adjust the printer preset in the prepare page or choose a compatible printer on this page." msgstr "L'imprimante sélectionnée (%s) est incompatible avec la configuration du fichier d'impression (%s). Veuillez ajuster le préréglage de l'imprimante dans la page de préparation ou choisir une imprimante compatible sur cette page." -msgid "When enable spiral vase mode, machines with I3 structure will not generate timelapse videos." +msgid "When enabling spiral vase mode, machines with I3 structure will not generate timelapse videos." msgstr "When spiral vase mode is enabled, machines with I3 structure will not generate timelapse videos." msgid "The current printer does not support timelapse in Traditional Mode when printing By-Object." diff --git a/bbl/i18n/hu/BambuStudio_hu.po b/bbl/i18n/hu/BambuStudio_hu.po index a7ef70fe36..a6dc941a76 100644 --- a/bbl/i18n/hu/BambuStudio_hu.po +++ b/bbl/i18n/hu/BambuStudio_hu.po @@ -1085,7 +1085,7 @@ msgstr "az összekötők kívül esnek a vágás kontúrján" msgid "connector is out of object" msgstr "az összekötő tárgyon kívül van" -msgid "connectors is out of object" +msgid "connectors are out of object" msgstr "az összekötők a tárgyon kívül vannak" msgid "Some connectors are overlapped" @@ -1549,7 +1549,7 @@ msgstr "Figyelmeztetés: a jelenlegi betűköz nem túl megfelelő. Ha folytatod msgid "Warning:old matrix has at least two parameters: mirroring, scaling, and rotation. If you continue editing, it may not be correct. Please dragging text or cancel using current pose, save and reedit again." msgstr "Figyelmeztetés: a régi mátrixnak legalább két paramétere van: tükrözés, skálázás és forgatás. Ha folytatod a szerkesztést, lehet, hogy nem lesz helyes. Kérjük, húzd odébb a szöveget vagy töröld az aktuális beállítás, mentsd és szerkeszd újra." -msgid "Error:Detecting an incorrect mesh id or an unknown error, regenerating text may result in incorrect outcomes.Please drag text,save it then reedit it again." +msgid "Error: Detecting an incorrect mesh id or an unknown error, regenerating text may result in incorrect outcomes. Please drag text, save it then reedit it again." msgstr "Hiba: Helytelen hálóazonosító vagy ismeretlen hiba esetén a szöveg újraszerkesztése hibás eredményt eredményezhet. Kérjük, húzd odébb a szöveget, mentsd el, majd szerkeszd újra." msgid "Warning:Due to functional upgrade, rotation information cannot be restored. Please drag or modify text,save it and reedit it will ok." @@ -5969,7 +5969,7 @@ msgstr "A nyomtató a letöltéssel van elfoglalva. Kérjük, várd meg, amíg a msgid "Printer camera is malfunctioning." msgstr "A nyomtató kamerája hibásan működik." -msgid "Problem occured. Please update the printer firmware and try again." +msgid "Problem occurred. Please update the printer firmware and try again." msgstr "Probléma merült fel. Kérjük, frissítsd a nyomtató firmware-ét, és próbáld meg újra." msgid "LAN Only Liveview is off. Please turn on the liveview on printer screen." @@ -9030,7 +9030,7 @@ msgstr "A filament típusa nem egyezik az AMS-férőhelyben találhatóval. Kér msgid "The selected printer (%s) is incompatible with the print file configuration (%s). Please adjust the printer preset in the prepare page or choose a compatible printer on this page." msgstr "A kiválasztott nyomtató (%s) nem kompatibilis a nyomtatási fájl konfigurációjával (%s). Kérjük, válaszd ki a megfelel nyomtatóbeállítást az előkészítés oldalon, vagy válassz egy kompatibilis nyomtatót ezen az oldalon." -msgid "When enable spiral vase mode, machines with I3 structure will not generate timelapse videos." +msgid "When enabling spiral vase mode, machines with I3 structure will not generate timelapse videos." msgstr "When spiral vase mode is enabled, machines with I3 structure will not generate timelapse videos." msgid "The current printer does not support timelapse in Traditional Mode when printing By-Object." diff --git a/bbl/i18n/it/BambuStudio_it.po b/bbl/i18n/it/BambuStudio_it.po index 03bd61d5f3..c97d1dd618 100644 --- a/bbl/i18n/it/BambuStudio_it.po +++ b/bbl/i18n/it/BambuStudio_it.po @@ -1085,7 +1085,7 @@ msgstr "Connettori fuori dal contorno" msgid "connector is out of object" msgstr "Connettore fuori dall'oggetto" -msgid "connectors is out of object" +msgid "connectors are out of object" msgstr "I connettori devono trovarsi sulla superficie dell'oggetto." msgid "Some connectors are overlapped" @@ -1549,7 +1549,7 @@ msgstr "Attenzione: la spaziatura del testo attuale non è ottimale. Continuando msgid "Warning:old matrix has at least two parameters: mirroring, scaling, and rotation. If you continue editing, it may not be correct. Please dragging text or cancel using current pose, save and reedit again." msgstr "Attenzione: La vecchia matrice ha almeno due parametri: mirroring, scaling e rotazione. Se continui a modificare, potrebbe non essere corretto. Per favore, trascina il testo o annulla l'uso della posizione attuale, salvalo e rieditalo di nuovo." -msgid "Error:Detecting an incorrect mesh id or an unknown error, regenerating text may result in incorrect outcomes.Please drag text,save it then reedit it again." +msgid "Error: Detecting an incorrect mesh id or an unknown error, regenerating text may result in incorrect outcomes. Please drag text, save it then reedit it again." msgstr "Errore: rilevato un ID mesh non corretto o un errore sconosciuto. La rigenerazione del testo potrebbe produrre risultati errati. Prova a spostare il testo, salvarlo e poi modificarlo nuovamente." msgid "Warning:Due to functional upgrade, rotation information cannot be restored. Please drag or modify text,save it and reedit it will ok." @@ -5968,7 +5968,7 @@ msgstr "La stampante è in fase di download. Attendi il completamento." msgid "Printer camera is malfunctioning." msgstr "La fotocamera della stampante non funziona correttamente." -msgid "Problem occured. Please update the printer firmware and try again." +msgid "Problem occurred. Please update the printer firmware and try again." msgstr "Si è verificato un problema. Aggiorna il firmware stampante e riprova." msgid "LAN Only Liveview is off. Please turn on the liveview on printer screen." @@ -9030,7 +9030,7 @@ msgstr "Il filamento non corrisponde al filamento nello slot AMS. Aggiorna il fi msgid "The selected printer (%s) is incompatible with the print file configuration (%s). Please adjust the printer preset in the prepare page or choose a compatible printer on this page." msgstr "La stampante selezionata (%s) è incompatibile con la configurazione del file di stampa (%s). Per favore, regola il preset della stampante nella pagina di preparazione o scegli una stampante compatibile in questa pagina." -msgid "When enable spiral vase mode, machines with I3 structure will not generate timelapse videos." +msgid "When enabling spiral vase mode, machines with I3 structure will not generate timelapse videos." msgstr "Quando si attiva la modalità vaso a spirale, le macchine con struttura I3 non genereranno video timelapse." msgid "The current printer does not support timelapse in Traditional Mode when printing By-Object." diff --git a/bbl/i18n/ja/BambuStudio_ja.po b/bbl/i18n/ja/BambuStudio_ja.po index f0e3714f85..a842ad3028 100644 --- a/bbl/i18n/ja/BambuStudio_ja.po +++ b/bbl/i18n/ja/BambuStudio_ja.po @@ -1085,7 +1085,7 @@ msgstr "コネクタがカット輪郭の外にあります。" msgid "connector is out of object" msgstr "コネクタがオブジェクトの外にあります。" -msgid "connectors is out of object" +msgid "connectors are out of object" msgstr "コネクタはオブジェクトの表面に配置する必要があります。" msgid "Some connectors are overlapped" @@ -1548,7 +1548,7 @@ msgstr "警告：現在の文字間隔は最適ではありません。編集を msgid "Warning:old matrix has at least two parameters: mirroring, scaling, and rotation. If you continue editing, it may not be correct. Please dragging text or cancel using current pose, save and reedit again." msgstr "警告: 古いマトリックスには少なくとも2つのパラメータ（反転、スケーリング、回転）が含まれています。編集を続けると、正しくない可能性があります。テキストをドラッグするか、現在のポーズをキャンセルして保存後、再編集してください。" -msgid "Error:Detecting an incorrect mesh id or an unknown error, regenerating text may result in incorrect outcomes.Please drag text,save it then reedit it again." +msgid "Error: Detecting an incorrect mesh id or an unknown error, regenerating text may result in incorrect outcomes. Please drag text, save it then reedit it again." msgstr "エラー: 不正なメッシュIDの検出または不明なエラーが発生しました。テキストを再生成すると、正しく処理されない可能性があります。テキストをドラッグし、保存してから再編集してください。" msgid "Warning:Due to functional upgrade, rotation information cannot be restored. Please drag or modify text,save it and reedit it will ok." @@ -5940,7 +5940,7 @@ msgstr "プリンターは現在ダウンロード中です。終了後、再度 msgid "Printer camera is malfunctioning." msgstr "プリンタのカメラが正常に動作していません。" -msgid "Problem occured. Please update the printer firmware and try again." +msgid "Problem occurred. Please update the printer firmware and try again." msgstr "問題が発生しました。プリンタのファームウェアを更新し、再試行してください。" msgid "LAN Only Liveview is off. Please turn on the liveview on printer screen." @@ -8985,7 +8985,7 @@ msgstr "フィラメントがAMSスロットのフィラメントと一致して msgid "The selected printer (%s) is incompatible with the print file configuration (%s). Please adjust the printer preset in the prepare page or choose a compatible printer on this page." msgstr "選択されたプリンタ(%s)は、印刷ファイル設定(%s)と互換性がありません。準備ページでプリンタのプリセットを調整するか、このページで互換性のあるプリンタを選択してください。" -msgid "When enable spiral vase mode, machines with I3 structure will not generate timelapse videos." +msgid "When enabling spiral vase mode, machines with I3 structure will not generate timelapse videos." msgstr "スパイラルベースモードが有効な場合、I3構造のマシンではタイムラプス動画が生成されません。" msgid "The current printer does not support timelapse in Traditional Mode when printing By-Object." diff --git a/bbl/i18n/ko/BambuStudio_ko.po b/bbl/i18n/ko/BambuStudio_ko.po index c2dada4a65..f2782e28d4 100644 --- a/bbl/i18n/ko/BambuStudio_ko.po +++ b/bbl/i18n/ko/BambuStudio_ko.po @@ -1085,7 +1085,7 @@ msgstr "커넥터가 절단 윤곽에서 벗어남" msgid "connector is out of object" msgstr "커넥터가 객체에서 벗어남" -msgid "connectors is out of object" +msgid "connectors are out of object" msgstr "커넥터는 객체 표면에 있어야 합니다." msgid "Some connectors are overlapped" @@ -1549,7 +1549,7 @@ msgstr "경고: 현재 텍스트 간격이 적절하지 않습니다. 편집을 msgid "Warning:old matrix has at least two parameters: mirroring, scaling, and rotation. If you continue editing, it may not be correct. Please dragging text or cancel using current pose, save and reedit again." msgstr "경고: 이전 매트릭스에는 미러링, 크기 조정 및 회전이라는 두 가지 이상의 매개변수가 있습니다. 계속 편집하면 올바르지 않을 수 있습니다. 텍스트를 드래그하거나 현재 포즈를 사용하여 취소하고 저장한 후 다시 편집하세요." -msgid "Error:Detecting an incorrect mesh id or an unknown error, regenerating text may result in incorrect outcomes.Please drag text,save it then reedit it again." +msgid "Error: Detecting an incorrect mesh id or an unknown error, regenerating text may result in incorrect outcomes. Please drag text, save it then reedit it again." msgstr "오류: 잘못된 메시 ID 또는 알 수 없는 오류를 감지하여 텍스트를 다시 생성하면 잘못된 결과가 발생할 수 있으므로 텍스트를 드래그하여 저장한 후 다시 편집하세요." msgid "Warning:Due to functional upgrade, rotation information cannot be restored. Please drag or modify text,save it and reedit it will ok." @@ -5961,7 +5961,7 @@ msgstr "프린터가 현재 다운로드 중입니다. 다운로드가 완료된 msgid "Printer camera is malfunctioning." msgstr "프린터 카메라가 오작동합니다." -msgid "Problem occured. Please update the printer firmware and try again." +msgid "Problem occurred. Please update the printer firmware and try again." msgstr "문제가 발생했습니다. 프린터 펌웨어를 업데이트하고 다시 시도하세요." msgid "LAN Only Liveview is off. Please turn on the liveview on printer screen." @@ -9026,7 +9026,7 @@ msgstr "필라멘트가 AMS 슬롯의 필라멘트와 일치하지 않습니다. msgid "The selected printer (%s) is incompatible with the print file configuration (%s). Please adjust the printer preset in the prepare page or choose a compatible printer on this page." msgstr "선택한 프린터(%s)가 출력 파일 구성(%s)과 호환되지 않습니다. 준비 페이지에서 프린터 사전 설정을 조정하거나 이 페이지에서 호환되는 프린터를 선택하세요." -msgid "When enable spiral vase mode, machines with I3 structure will not generate timelapse videos." +msgid "When enabling spiral vase mode, machines with I3 structure will not generate timelapse videos." msgstr "나선형 꽃병 모드가 활성화되면 I3 구조의 머신은 타임랩스 동영상을 생성하지 않습니다." msgid "The current printer does not support timelapse in Traditional Mode when printing By-Object." diff --git a/bbl/i18n/nl/BambuStudio_nl.po b/bbl/i18n/nl/BambuStudio_nl.po index 4a5773b419..7597e51005 100644 --- a/bbl/i18n/nl/BambuStudio_nl.po +++ b/bbl/i18n/nl/BambuStudio_nl.po @@ -1085,7 +1085,7 @@ msgstr "connectors zijn buiten de snijcontour" msgid "connector is out of object" msgstr "connector is buiten het object" -msgid "connectors is out of object" +msgid "connectors are out of object" msgstr "Verbindingen moeten zich op het objectoppervlak bevinden." msgid "Some connectors are overlapped" @@ -1549,7 +1549,7 @@ msgstr "Waarschuwing: de huidige tekstruimte is niet erg redelijk. Als je doorga msgid "Warning:old matrix has at least two parameters: mirroring, scaling, and rotation. If you continue editing, it may not be correct. Please dragging text or cancel using current pose, save and reedit again." msgstr "Waarschuwing: oude matrix heeft minstens twee parameters: spiegeling, schaling en rotatie. Als je doorgaat met bewerken, is deze mogelijk niet correct. Sleep tekst of annuleer met de huidige houding, sla op en bewerk opnieuw." -msgid "Error:Detecting an incorrect mesh id or an unknown error, regenerating text may result in incorrect outcomes.Please drag text,save it then reedit it again." +msgid "Error: Detecting an incorrect mesh id or an unknown error, regenerating text may result in incorrect outcomes. Please drag text, save it then reedit it again." msgstr "Fout: Als een onjuist mesh-id of een onbekende fout wordt gedetecteerd, kan het opnieuw genereren van tekst onjuiste resultaten opleveren. Sleep tekst, sla deze op en bewerk deze opnieuw." msgid "Warning:Due to functional upgrade, rotation information cannot be restored. Please drag or modify text,save it and reedit it will ok." @@ -5969,7 +5969,7 @@ msgstr "De printer is momenteel bezig met downloaden. Probeer het opnieuw nadat msgid "Printer camera is malfunctioning." msgstr "De printercamera werkt niet goed." -msgid "Problem occured. Please update the printer firmware and try again." +msgid "Problem occurred. Please update the printer firmware and try again." msgstr "Er heeft zich een probleem voorgedaan. Werk de printerfirmware bij en probeer het opnieuw." msgid "LAN Only Liveview is off. Please turn on the liveview on printer screen." @@ -9033,7 +9033,7 @@ msgstr "Het filament komt niet overeen met het filament in de AMS-sleuf. Update msgid "The selected printer (%s) is incompatible with the print file configuration (%s). Please adjust the printer preset in the prepare page or choose a compatible printer on this page." msgstr "De geselecteerde printer (%s) is niet compatibel met de printbestandsconfiguratie (%s). Pas de printervoorkeuze aan op de voorwerkpagina of kies een compatibele printer op deze pagina." -msgid "When enable spiral vase mode, machines with I3 structure will not generate timelapse videos." +msgid "When enabling spiral vase mode, machines with I3 structure will not generate timelapse videos." msgstr "When spiral vase mode is enabled, machines with I3 structure will not generate timelapse videos." msgid "The current printer does not support timelapse in Traditional Mode when printing By-Object." diff --git a/bbl/i18n/pl/BambuStudio_pl.po b/bbl/i18n/pl/BambuStudio_pl.po index a32e789af6..ac6c6432f7 100644 --- a/bbl/i18n/pl/BambuStudio_pl.po +++ b/bbl/i18n/pl/BambuStudio_pl.po @@ -1085,7 +1085,7 @@ msgstr "łączniki są poza konturem cięcia" msgid "connector is out of object" msgstr "łącznik jest poza obiektem" -msgid "connectors is out of object" +msgid "connectors are out of object" msgstr "łączniki muszą znajdować się na powierzchni obiektu" msgid "Some connectors are overlapped" @@ -1549,7 +1549,7 @@ msgstr "Ostrzeżenie: obecne odstępy między znakami nie są optymalne. Kontynu msgid "Warning:old matrix has at least two parameters: mirroring, scaling, and rotation. If you continue editing, it may not be correct. Please dragging text or cancel using current pose, save and reedit again." msgstr "Ostrzeżenie: Stara macierz zawiera co najmniej dwa parametry: lustrzane odbicie, skalowanie i rotację. Kontynuowanie edycji może prowadzić do błędów. Przeciągnij tekst lub anuluj obecną pozycję, zapisz i edytuj ponownie." -msgid "Error:Detecting an incorrect mesh id or an unknown error, regenerating text may result in incorrect outcomes.Please drag text,save it then reedit it again." +msgid "Error: Detecting an incorrect mesh id or an unknown error, regenerating text may result in incorrect outcomes. Please drag text, save it then reedit it again." msgstr "Błąd: Wykryto niepoprawny identyfikator siatki lub nieznany błąd. Ponowne wygenerowanie tekstu może prowadzić do błędnych wyników. Proszę przeciągnąć tekst, zapisać go, a następnie ponownie edytować." msgid "Warning:Due to functional upgrade, rotation information cannot be restored. Please drag or modify text,save it and reedit it will ok." @@ -5976,7 +5976,7 @@ msgstr "Drukarka aktualnie pobiera dane. Proszę spróbować ponownie po zakońc msgid "Printer camera is malfunctioning." msgstr "Kamera drukarki jest uszkodzona." -msgid "Problem occured. Please update the printer firmware and try again." +msgid "Problem occurred. Please update the printer firmware and try again." msgstr "Wystąpił problem. Proszę zaktualizować oprogramowanie drukarki i spróbować ponownie." msgid "LAN Only Liveview is off. Please turn on the liveview on printer screen." @@ -9047,7 +9047,7 @@ msgstr "Filament nie pasuje do filamentu w gnieździe AMS. Zaktualizuj oprogramo msgid "The selected printer (%s) is incompatible with the print file configuration (%s). Please adjust the printer preset in the prepare page or choose a compatible printer on this page." msgstr "Wybrana drukarka (%s) jest niezgodna z konfiguracją pliku druku (%s). Dostosuj profil drukarki na stronie przygotowania lub wybierz kompatybilną drukarkę na tej stronie." -msgid "When enable spiral vase mode, machines with I3 structure will not generate timelapse videos." +msgid "When enabling spiral vase mode, machines with I3 structure will not generate timelapse videos." msgstr "W trybie wazy, maszyny o strukturze I3 nie generują wideo timelapse." msgid "The current printer does not support timelapse in Traditional Mode when printing By-Object." diff --git a/bbl/i18n/pt_BR/BambuStudio_pt_BR.po b/bbl/i18n/pt_BR/BambuStudio_pt_BR.po index 7dcd04a513..b2b5ed6992 100644 --- a/bbl/i18n/pt_BR/BambuStudio_pt_BR.po +++ b/bbl/i18n/pt_BR/BambuStudio_pt_BR.po @@ -1089,7 +1089,7 @@ msgstr "os conectores estão fora do contorno cortado" msgid "connector is out of object" msgstr "o conector está fora do objeto" -msgid "connectors is out of object" +msgid "connectors are out of object" msgstr "Os conectores devem estar na superfície do objeto." msgid "Some connectors are overlapped" @@ -1553,7 +1553,7 @@ msgstr "Aviso: o espaçamento atual do texto não é muito razoável. Se você c msgid "Warning:old matrix has at least two parameters: mirroring, scaling, and rotation. If you continue editing, it may not be correct. Please dragging text or cancel using current pose, save and reedit again." msgstr "" -msgid "Error:Detecting an incorrect mesh id or an unknown error, regenerating text may result in incorrect outcomes.Please drag text,save it then reedit it again." +msgid "Error: Detecting an incorrect mesh id or an unknown error, regenerating text may result in incorrect outcomes. Please drag text, save it then reedit it again." msgstr "Erro: Ao detectar uma ID de malha incorreta ou um erro desconhecido, a regeneração do texto pode resultar em resultados incorretos. Arraste o texto, salve-o e edite-o novamente." msgid "Warning:Due to functional upgrade, rotation information cannot be restored. Please drag or modify text,save it and reedit it will ok." @@ -5972,7 +5972,7 @@ msgstr "A impressora está ocupada fazendo o download. Aguarde o término do dow msgid "Printer camera is malfunctioning." msgstr "A câmera da impressora está com defeito." -msgid "Problem occured. Please update the printer firmware and try again." +msgid "Problem occurred. Please update the printer firmware and try again." msgstr "Ocorreu um problema. Atualize o firmware da impressora e tente novamente." msgid "LAN Only Liveview is off. Please turn on the liveview on printer screen." @@ -9040,7 +9040,7 @@ msgstr "O filamento não corresponde ao filamento no slot AMS. Atualize o firmwa msgid "The selected printer (%s) is incompatible with the print file configuration (%s). Please adjust the printer preset in the prepare page or choose a compatible printer on this page." msgstr "A impressora selecionada (%s) é incompatível com a configuração do arquivo de impressão (%s). Ajuste a predefinição da impressora na página de preparação ou escolha uma impressora compatível nesta página." -msgid "When enable spiral vase mode, machines with I3 structure will not generate timelapse videos." +msgid "When enabling spiral vase mode, machines with I3 structure will not generate timelapse videos." msgstr "Ao ativar o modo de vaso espiral, as máquinas com estrutura I3 não geram vídeos em timelapse." msgid "The current printer does not support timelapse in Traditional Mode when printing By-Object." diff --git a/bbl/i18n/ru/BambuStudio_ru.po b/bbl/i18n/ru/BambuStudio_ru.po index 12c95ed025..4dd89b1916 100644 --- a/bbl/i18n/ru/BambuStudio_ru.po +++ b/bbl/i18n/ru/BambuStudio_ru.po @@ -1106,7 +1106,7 @@ msgstr " соединения выходят за контур модели." msgid "connector is out of object" msgstr " соединение находится за пределами модели." -msgid "connectors is out of object" +msgid "connectors are out of object" msgstr " соединения находятся за пределами модели." msgid "Some connectors are overlapped" @@ -1579,7 +1579,7 @@ msgstr "" msgid "Warning:old matrix has at least two parameters: mirroring, scaling, and rotation. If you continue editing, it may not be correct. Please dragging text or cancel using current pose, save and reedit again." msgstr "" -msgid "Error:Detecting an incorrect mesh id or an unknown error, regenerating text may result in incorrect outcomes.Please drag text,save it then reedit it again." +msgid "Error: Detecting an incorrect mesh id or an unknown error, regenerating text may result in incorrect outcomes. Please drag text, save it then reedit it again." msgstr "" msgid "Warning:Due to functional upgrade, rotation information cannot be restored. Please drag or modify text,save it and reedit it will ok." @@ -6051,7 +6051,7 @@ msgstr "Сейчас идёт загрузка. Пожалуйста, повто msgid "Printer camera is malfunctioning." msgstr "Камера принтера неисправна." -msgid "Problem occured. Please update the printer firmware and try again." +msgid "Problem occurred. Please update the printer firmware and try again." msgstr "Возникла проблема. Пожалуйста, обновите прошивку принтера и повторите попытку." msgid "LAN Only Liveview is off. Please turn on the liveview on printer screen." @@ -9154,7 +9154,7 @@ msgstr "Материал не соответствует материалу в msgid "The selected printer (%s) is incompatible with the print file configuration (%s). Please adjust the printer preset in the prepare page or choose a compatible printer on this page." msgstr "Выбранный принтер (%s) несовместим с конфигурацией файла печати (%s). Пожалуйста, измените профиль принтера на странице подготовки или выберите совместимый принтер на этой странице." -msgid "When enable spiral vase mode, machines with I3 structure will not generate timelapse videos." +msgid "When enabling spiral vase mode, machines with I3 structure will not generate timelapse videos." msgstr "При включении режима «Спиральная ваза» принтеры с кинематикой I3 не будут писать таймлапс." msgid "The current printer does not support timelapse in Traditional Mode when printing By-Object." diff --git a/bbl/i18n/sv/BambuStudio_sv.po b/bbl/i18n/sv/BambuStudio_sv.po index b43a73e95d..64da979632 100644 --- a/bbl/i18n/sv/BambuStudio_sv.po +++ b/bbl/i18n/sv/BambuStudio_sv.po @@ -1082,7 +1082,7 @@ msgstr "kontakterna är utanför skuren kontur" msgid "connector is out of object" msgstr "kontakten är utanför objektet" -msgid "connectors is out of object" +msgid "connectors are out of object" msgstr "Kontakterna måste vara på objektets yta." msgid "Some connectors are overlapped" @@ -1546,7 +1546,7 @@ msgstr "Varning: nuvarande textavstånd är inte rimligt. Om du fortsätter redi msgid "Warning:old matrix has at least two parameters: mirroring, scaling, and rotation. If you continue editing, it may not be correct. Please dragging text or cancel using current pose, save and reedit again." msgstr "Varning:gammal matris har minst två parametrar: spegling, skalning och rotation. Om du fortsätter att redigera kanske det inte är korrekt. Dra text eller avbryt med den aktuella ställningen, spara och redigera om igen." -msgid "Error:Detecting an incorrect mesh id or an unknown error, regenerating text may result in incorrect outcomes.Please drag text,save it then reedit it again." +msgid "Error: Detecting an incorrect mesh id or an unknown error, regenerating text may result in incorrect outcomes. Please drag text, save it then reedit it again." msgstr "Fel:Om du upptäcker ett felaktigt nät-ID eller ett okänt fel kan återgenerering av text resultera i felaktiga resultat. Dra texten, spara den och redigera den sedan igen." msgid "Warning:Due to functional upgrade, rotation information cannot be restored. Please drag or modify text,save it and reedit it will ok." @@ -5966,7 +5966,7 @@ msgstr "Printern är upptagen med att ladda ner. Vänta tills nedladdningen är msgid "Printer camera is malfunctioning." msgstr "Printerns kamera fungerar inte som den ska." -msgid "Problem occured. Please update the printer firmware and try again." +msgid "Problem occurred. Please update the printer firmware and try again." msgstr "Ett problem har uppstått. Uppdatera printerns programvara och försök igen." msgid "LAN Only Liveview is off. Please turn on the liveview on printer screen." @@ -9028,7 +9028,7 @@ msgstr "Filamentet matchar inte filamentet i AMS-facket. Uppdatera skrivarens pr msgid "The selected printer (%s) is incompatible with the print file configuration (%s). Please adjust the printer preset in the prepare page or choose a compatible printer on this page." msgstr "Den valda printern (%s) är inte kompatibel med konfigurationen av utskrifts filen (%s). Vänligen justera printer inställningen på sidan Förbered eller välj en kompatibel skrivare på den här sidan." -msgid "When enable spiral vase mode, machines with I3 structure will not generate timelapse videos." +msgid "When enabling spiral vase mode, machines with I3 structure will not generate timelapse videos." msgstr "When spiral vase mode is enabled, machines with I3 structure will not generate timelapse videos." msgid "The current printer does not support timelapse in Traditional Mode when printing By-Object." diff --git a/bbl/i18n/tr/BambuStudio_tr.po b/bbl/i18n/tr/BambuStudio_tr.po index d2d4150eb2..bbc666e195 100644 --- a/bbl/i18n/tr/BambuStudio_tr.po +++ b/bbl/i18n/tr/BambuStudio_tr.po @@ -1085,7 +1085,7 @@ msgstr "konektörler kesim konturunun dışında" msgid "connector is out of object" msgstr "konektör nesnenin dışında" -msgid "connectors is out of object" +msgid "connectors are out of object" msgstr "konektörler nesne dışı" msgid "Some connectors are overlapped" @@ -1549,7 +1549,7 @@ msgstr "Uyarı: mevcut metin aralığı çok uygun değildir. Düzenlemeye devam msgid "Warning:old matrix has at least two parameters: mirroring, scaling, and rotation. If you continue editing, it may not be correct. Please dragging text or cancel using current pose, save and reedit again." msgstr "Uyarı:eski matrisin en az iki parametresi vardır: yansıtma, ölçekleme ve döndürme. Düzenlemeye devam ederseniz, doğru olmayabilir. Lütfen metni sürükleyin veya mevcut pozu kullanarak iptal edin, kaydedin ve yeniden düzenleyin." -msgid "Error:Detecting an incorrect mesh id or an unknown error, regenerating text may result in incorrect outcomes.Please drag text,save it then reedit it again." +msgid "Error: Detecting an incorrect mesh id or an unknown error, regenerating text may result in incorrect outcomes. Please drag text, save it then reedit it again." msgstr "Hata: Yanlış bir ağ kimliği veya bilinmeyen bir hata algılandığında, metnin yeniden oluşturulması yanlış sonuçlara neden olabilir, lütfen metni sürükleyin, kaydedin ve tekrar düzenleyin." msgid "Warning:Due to functional upgrade, rotation information cannot be restored. Please drag or modify text,save it and reedit it will ok." @@ -5954,7 +5954,7 @@ msgstr "Yazıcı şu anda indirme işlemiyle meşgul. Lütfen bittikten sonra te msgid "Printer camera is malfunctioning." msgstr "Yazıcı kamerası arızalı." -msgid "Problem occured. Please update the printer firmware and try again." +msgid "Problem occurred. Please update the printer firmware and try again." msgstr "Sorun meydana geldi. Lütfen yazıcı aygıt yazılımını güncelleyin ve tekrar deneyin." msgid "LAN Only Liveview is off. Please turn on the liveview on printer screen." @@ -8988,7 +8988,7 @@ msgstr "Filament, AMS yuvasındaki filamentle eşleşmiyor. AMS yuvası ataması msgid "The selected printer (%s) is incompatible with the print file configuration (%s). Please adjust the printer preset in the prepare page or choose a compatible printer on this page." msgstr "Seçilen yazıcı (%s), baskı dosyası yapılandırmasıyla (%s) uyumlu değil. Lütfen hazırlık sayfasında yazıcı ön ayarını düzenleyin veya bu sayfada uyumlu bir yazıcı seçin." -msgid "When enable spiral vase mode, machines with I3 structure will not generate timelapse videos." +msgid "When enabling spiral vase mode, machines with I3 structure will not generate timelapse videos." msgstr "Spiral vazo modu etkinleştirildiğinde, I3 yapısına sahip makineler zaman atlamalı videolar oluşturmayacaktır." msgid "The current printer does not support timelapse in Traditional Mode when printing By-Object." diff --git a/bbl/i18n/uk/BambuStudio_uk.po b/bbl/i18n/uk/BambuStudio_uk.po index d7488e9970..7c52131c85 100644 --- a/bbl/i18n/uk/BambuStudio_uk.po +++ b/bbl/i18n/uk/BambuStudio_uk.po @@ -1085,7 +1085,7 @@ msgstr "роз'єми виходять за контур вирізу" msgid "connector is out of object" msgstr "роз'єм поза об'єктом" -msgid "connectors is out of object" +msgid "connectors are out of object" msgstr "з’єднання відсутні в об'єкті" msgid "Some connectors are overlapped" @@ -1546,7 +1546,7 @@ msgstr "" msgid "Warning:old matrix has at least two parameters: mirroring, scaling, and rotation. If you continue editing, it may not be correct. Please dragging text or cancel using current pose, save and reedit again." msgstr "" -msgid "Error:Detecting an incorrect mesh id or an unknown error, regenerating text may result in incorrect outcomes.Please drag text,save it then reedit it again." +msgid "Error: Detecting an incorrect mesh id or an unknown error, regenerating text may result in incorrect outcomes. Please drag text, save it then reedit it again." msgstr "" msgid "Warning:Due to functional upgrade, rotation information cannot be restored. Please drag or modify text,save it and reedit it will ok." @@ -5940,7 +5940,7 @@ msgstr "Принтер зараз зайнятий завантаженням. msgid "Printer camera is malfunctioning." msgstr "Камера принтера несправна." -msgid "Problem occured. Please update the printer firmware and try again." +msgid "Problem occurred. Please update the printer firmware and try again." msgstr "Виникла проблема. Будь ласка, оновіть прошивку принтера і спробуйте знову." msgid "LAN Only Liveview is off. Please turn on the liveview on printer screen." @@ -8956,7 +8956,7 @@ msgstr "Філамент не відповідає філаменту в сло msgid "The selected printer (%s) is incompatible with the print file configuration (%s). Please adjust the printer preset in the prepare page or choose a compatible printer on this page." msgstr "" -msgid "When enable spiral vase mode, machines with I3 structure will not generate timelapse videos." +msgid "When enabling spiral vase mode, machines with I3 structure will not generate timelapse videos." msgstr "При увімкненні режиму спіралі для вази машини з I3 структурою не будуть створювати відео в режимі таймлапсу." msgid "The current printer does not support timelapse in Traditional Mode when printing By-Object." diff --git a/bbl/i18n/zh_CN/BambuStudio_zh_CN.po b/bbl/i18n/zh_CN/BambuStudio_zh_CN.po index cd83b0d43d..0a731f0f67 100644 --- a/bbl/i18n/zh_CN/BambuStudio_zh_CN.po +++ b/bbl/i18n/zh_CN/BambuStudio_zh_CN.po @@ -1087,7 +1087,7 @@ msgstr "个连接件超出了切割面范围" msgid "connector is out of object" msgstr "个连接件穿透了模型" -msgid "connectors is out of object" +msgid "connectors are out of object" msgstr "个连接件穿透了模型" msgid "Some connectors are overlapped" @@ -1546,7 +1546,7 @@ msgstr "警告：当前文本间距不够合理。如果继续编辑，将生成 msgid "Warning:old matrix has at least two parameters: mirroring, scaling, and rotation. If you continue editing, it may not be correct. Please dragging text or cancel using current pose, save and reedit again." msgstr "警告：旧矩阵至少有两个参数：镜像、缩放和旋转。如果继续编辑，则可能不正确。请拖动文本或取消使用当前姿势，保存并重新编辑。" -msgid "Error:Detecting an incorrect mesh id or an unknown error, regenerating text may result in incorrect outcomes.Please drag text,save it then reedit it again." +msgid "Error: Detecting an incorrect mesh id or an unknown error, regenerating text may result in incorrect outcomes. Please drag text, save it then reedit it again." msgstr "错误：检测到不正确的网格id或未知错误，重新生成文本可能会导致不正确的结果。请拖动文本，保存，然后重新编辑。" msgid "Warning:Due to functional upgrade, rotation information cannot be restored. Please drag or modify text,save it and reedit it will ok." @@ -5934,7 +5934,7 @@ msgstr "打印机正在忙于下载，请等下载完成后再尝试。" msgid "Printer camera is malfunctioning." msgstr "打印机摄像头异常。" -msgid "Problem occured. Please update the printer firmware and try again." +msgid "Problem occurred. Please update the printer firmware and try again." msgstr "出现了一些问题。请更新打印机固件后重试。" msgid "LAN Only Liveview is off. Please turn on the liveview on printer screen." @@ -8978,7 +8978,7 @@ msgstr "材料编号和AMS槽位中的耗材丝材质不匹配，请更新打印 msgid "The selected printer (%s) is incompatible with the print file configuration (%s). Please adjust the printer preset in the prepare page or choose a compatible printer on this page." msgstr "当前选择的打印机（%s）与打印文件配置（%s）不兼容，请前往准备界面重新选择打印机预设，或在此页面选择兼容的打印机。" -msgid "When enable spiral vase mode, machines with I3 structure will not generate timelapse videos." +msgid "When enabling spiral vase mode, machines with I3 structure will not generate timelapse videos." msgstr "启用螺旋花瓶模式时，具有I3结构的机器将不会生成延时视频。" msgid "The current printer does not support timelapse in Traditional Mode when printing By-Object." diff --git a/bbl/i18n/zh_TW/BambuStudio_zh_TW.po b/bbl/i18n/zh_TW/BambuStudio_zh_TW.po index 71d6d990ce..015785cc09 100644 --- a/bbl/i18n/zh_TW/BambuStudio_zh_TW.po +++ b/bbl/i18n/zh_TW/BambuStudio_zh_TW.po @@ -1088,7 +1088,7 @@ msgstr "個連線件超出了切割面範圍" msgid "connector is out of object" msgstr "個連線件穿透了模型" -msgid "connectors is out of object" +msgid "connectors are out of object" msgstr "個連線件穿透了模型" msgid "Some connectors are overlapped" @@ -1547,7 +1547,7 @@ msgstr "警告：當前文字間距不夠合理。如果繼續編輯，將生成 msgid "Warning:old matrix has at least two parameters: mirroring, scaling, and rotation. If you continue editing, it may not be correct. Please dragging text or cancel using current pose, save and reedit again." msgstr "警告：舊矩陣至少有兩個引數：映象、縮放和旋轉。如果繼續編輯，則可能不正確。請拖動文字或取消使用當前姿勢，儲存並重新編輯。" -msgid "Error:Detecting an incorrect mesh id or an unknown error, regenerating text may result in incorrect outcomes.Please drag text,save it then reedit it again." +msgid "Error: Detecting an incorrect mesh id or an unknown error, regenerating text may result in incorrect outcomes. Please drag text, save it then reedit it again." msgstr "錯誤：檢測到不正確的網格id或未知錯誤，重新生成文字可能會導致不正確的結果。請拖動文字，儲存，然後重新編輯。" msgid "Warning:Due to functional upgrade, rotation information cannot be restored. Please drag or modify text,save it and reedit it will ok." @@ -5937,7 +5937,7 @@ msgstr "印表機正在忙於下載，請等下載完成後再嘗試。" msgid "Printer camera is malfunctioning." msgstr "印表機攝像頭異常。" -msgid "Problem occured. Please update the printer firmware and try again." +msgid "Problem occurred. Please update the printer firmware and try again." msgstr "出現了一些問題。請更新印表機韌體後重試。" msgid "LAN Only Liveview is off. Please turn on the liveview on printer screen." @@ -8983,7 +8983,7 @@ msgstr "材料編號和AMS槽位中的耗材絲材質不匹配，請更新印表 msgid "The selected printer (%s) is incompatible with the print file configuration (%s). Please adjust the printer preset in the prepare page or choose a compatible printer on this page." msgstr "當前選擇的印表機（%s）與列印檔案配置（%s）不相容，請前往準備介面重新選擇印表機預設，或在此頁面選擇相容的印表機。" -msgid "When enable spiral vase mode, machines with I3 structure will not generate timelapse videos." +msgid "When enabling spiral vase mode, machines with I3 structure will not generate timelapse videos." msgstr "啟用螺旋花瓶模式時，具有I3結構的機器將不會生成延時影片。" msgid "The current printer does not support timelapse in Traditional Mode when printing By-Object." diff --git a/src/slic3r/GUI/Gizmos/GLGizmoAdvancedCut.cpp b/src/slic3r/GUI/Gizmos/GLGizmoAdvancedCut.cpp index da93146d16..01e191f26f 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoAdvancedCut.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoAdvancedCut.cpp @@ -2795,7 +2795,7 @@ void GLGizmoAdvancedCut::render_input_window_warning() const (m_info_stats.outside_cut_contour == 1 ? _L("connector is out of cut contour") : _L("connectors are out of cut contour")); if (m_info_stats.outside_bb > size_t(0)) out += "\n - " + std::to_string(m_info_stats.outside_bb) + - (m_info_stats.outside_bb == 1 ? _L("connector is out of object") : _L("connectors is out of object")); + (m_info_stats.outside_bb == 1 ? _L("connector is out of object") : _L("connectors are out of object")); if (m_info_stats.is_overlap) out += "\n - " + _L("Some connectors are overlapped"); m_imgui->warning_text(out); diff --git a/src/slic3r/GUI/Gizmos/GLGizmoText.cpp b/src/slic3r/GUI/Gizmos/GLGizmoText.cpp index f197a12137..671fb02833 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoText.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoText.cpp @@ -2433,7 +2433,7 @@ void GLGizmoText::on_render_input_window(float x, float y, float bottom_limit) } if (m_show_warning_error_mesh) { m_imgui->warning_text_wrapped( - _L("Error:Detecting an incorrect mesh id or an unknown error, regenerating text may result in incorrect outcomes.Please drag text,save it then reedit it again."), + _L("Error: Detecting an incorrect mesh id or an unknown error, regenerating text may result in incorrect outcomes. Please drag text, save it then reedit it again."), full_width); m_parent.request_extra_frame(); } diff --git a/src/slic3r/GUI/MediaPlayCtrl.cpp b/src/slic3r/GUI/MediaPlayCtrl.cpp index d9de4c18ce..dbd79e5d25 100644 --- a/src/slic3r/GUI/MediaPlayCtrl.cpp +++ b/src/slic3r/GUI/MediaPlayCtrl.cpp @@ -348,7 +348,7 @@ void MediaPlayCtrl::Play() if (m_lan_proto <= MachineObject::LVL_Disable && (m_lan_mode || !m_remote_proto)) { Stop(m_lan_proto == MachineObject::LVL_None - ? _L("Problem occured. Please update the printer firmware and try again.") + ? _L("Problem occurred. Please update the printer firmware and try again.") : _L("LAN Only Liveview is off. Please turn on the liveview on printer screen.")); return; } diff --git a/src/slic3r/GUI/SelectMachine.cpp b/src/slic3r/GUI/SelectMachine.cpp index 777737f24d..2b3f21a031 100644 --- a/src/slic3r/GUI/SelectMachine.cpp +++ b/src/slic3r/GUI/SelectMachine.cpp @@ -1846,7 +1846,7 @@ void SelectMachineDialog::show_status(PrintDialogStatus status, std::vectorget_slice_result()->warnings) { if (warning.msg == NOT_GENERATE_TIMELAPSE) { if (warning.error_code == "10014001") { - msg_text = _L("When enable spiral vase mode, machines with I3 structure will not generate timelapse videos."); + msg_text = _L("When enabling spiral vase mode, machines with I3 structure will not generate timelapse videos."); } else if (warning.error_code == "10014002") { msg_text = _L("The current printer does not support timelapse in Traditional Mode when printing By-Object."); @@ -4140,7 +4140,7 @@ bool SelectMachineDialog::has_timelapse_warning(wxString &msg_text) for (auto warning : plate->get_slice_result()->warnings) { if (warning.msg == NOT_GENERATE_TIMELAPSE) { if (warning.error_code == "10014001") { - msg_text = _L("When enable spiral vase mode, machines with I3 structure will not generate timelapse videos."); + msg_text = _L("When enabling spiral vase mode, machines with I3 structure will not generate timelapse videos."); } else if (warning.error_code == "10014002") { msg_text = _L("The current printer does not support timelapse in Traditional Mode when printing By-Object."); } diff --git a/src/slic3r/GUI/SyncAmsInfoDialog.cpp b/src/slic3r/GUI/SyncAmsInfoDialog.cpp index 8639ae895a..ae09f01fa2 100644 --- a/src/slic3r/GUI/SyncAmsInfoDialog.cpp +++ b/src/slic3r/GUI/SyncAmsInfoDialog.cpp @@ -1807,7 +1807,7 @@ void SyncAmsInfoDialog::show_status(PrintDialogStatus status, std::vectorget_slice_result()->warnings) { if (warning.msg == NOT_GENERATE_TIMELAPSE) { if (warning.error_code == "10014001") { - msg_text = _L("When enable spiral vase mode, machines with I3 structure will not generate timelapse videos."); + msg_text = _L("When enabling spiral vase mode, machines with I3 structure will not generate timelapse videos."); } else if (warning.error_code == "10014002") { msg_text = _L("Timelapse is not supported because Print sequence is set to \"By object\"."); }