From d6876d6e67fd339da0de95becfafb3c0dd699feb Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 29 Oct 2026 00:58:23 +0000 Subject: [PATCH] Regenerate generated files and fold pending files [skip ci] --- assets/locales/ar.json | 2 + assets/locales/de.json | 2 + assets/locales/en-GB.json | 2 + assets/locales/en.json | 2 + assets/locales/he.json | 2 + assets/locales/ja.json | 2 + assets/locales/ko.json | 2 + assets/locales/nl.json | 2 + .../pending/sketch-conflict-colour.json | 42 ------------------- assets/locales/vi.json | 2 + assets/locales/zh.json | 2 + 11 files changed, 20 insertions(+), 42 deletions(-) delete mode 100644 assets/locales/pending/sketch-conflict-colour.json diff --git a/assets/locales/ar.json b/assets/locales/ar.json index b50e97ba0..ae3c24692 100644 --- a/assets/locales/ar.json +++ b/assets/locales/ar.json @@ -1867,6 +1867,8 @@ "prefs.shift_add_ctrl_toggle": "Shift يضيف فقط، وCtrl / Cmd يبدّل", "prefs.shift_add_note": "عند التشغيل: Shift يضيف، وCtrl / Cmd يبدّل. عند الإيقاف (الافتراضي): كلاهما يبدّل.", "prefs.shortcuts": "الاختصارات", + "prefs.sketch_conflict_colour": "الهندسة المتعارضة بلون التعارض", + "prefs.sketch_conflict_colour_note": "عندما تتعارض قيود الرسم، تُرسم المنحنيات والنقاط التي يمسكها قيد فاشل بلون التعارض أيضًا، لا رمزه أو بُعده فقط. عند الإيقاف: تحتفظ بألوانها المعتادة.", "prefs.sketch_exit_view": "عند انتهاء الرسم", "prefs.sketch_exit_view.keep": "إبقاء العرض الحالي", "prefs.sketch_exit_view.previous": "العودة إلى العرض السابق", diff --git a/assets/locales/de.json b/assets/locales/de.json index e99b19ef1..ca91136ba 100644 --- a/assets/locales/de.json +++ b/assets/locales/de.json @@ -1805,6 +1805,8 @@ "prefs.origin_plane_names_note": "Namen in Browser, Dialogen und Listen. {top} ist XY, {front} ist XZ und {right} ist YZ, mit Z nach oben. Befehle, Skripte und gespeicherte Konstruktionen behalten XY, XZ und YZ.", "prefs.search": "Einstellungen suchen", "prefs.search_empty": "Keine passenden Einstellungen", + "prefs.sketch_conflict_colour": "Widersprüchliche Geometrie in der Konfliktfarbe", + "prefs.sketch_conflict_colour_note": "Solange die Bedingungen einer Skizze im Konflikt stehen, werden auch die Kurven und Punkte, die eine nicht erfüllte Bedingung hält, in der Konfliktfarbe gezeichnet, nicht nur ihr Symbol oder ihre Bemaßung. Aus: Sie behalten ihre üblichen Farben.", "prefs.sketch_state_icons": "Skizzensymbole in der Farbe ihres Zustands", "prefs.sketch_state_icons_note": "Im Verlauf und im Browser nimmt das Symbol einer Skizze die Farbe ihres Zustands an (unterbestimmt, vollständig bestimmt oder im Konflikt), und ihr Tooltip nennt den Zustand. Aus: Alle Skizzen haben dasselbe Symbol.", "prefs.sketch_tab_always": "Registerkarte Skizze immer zeigen", diff --git a/assets/locales/en-GB.json b/assets/locales/en-GB.json index 5c2992c5a..4288af039 100644 --- a/assets/locales/en-GB.json +++ b/assets/locales/en-GB.json @@ -24,6 +24,8 @@ "prefs.max_file_size_step": "STEP and import files", "prefs.max_file_size_web": "The web app opens STEP and import files up to 512 MB and designs up to 256 MB: a browser tab can't hold larger files. The desktop app can raise these limits.", "prefs.megabytes": "MB", + "prefs.sketch_conflict_colour": "Conflicting geometry in the conflict colour", + "prefs.sketch_conflict_colour_note": "While a sketch's constraints conflict, the curves and points a failing constraint holds are drawn in the conflict colour too, not only its glyph or dimension. Off: they keep their usual colours.", "prefs.sketch_state_icons": "Sketch icons in the colour of their state", "prefs.sketch_state_icons_note": "In History and the browser, a sketch's icon takes the colour of its state (under constrained, fully constrained or conflicting) and its tooltip names the state. Off: every sketch has the same icon.", "prefs.sketch_tracking_guides": "Centre and midpoint alignment guides", diff --git a/assets/locales/en.json b/assets/locales/en.json index bc39224d0..312b39997 100644 --- a/assets/locales/en.json +++ b/assets/locales/en.json @@ -1867,6 +1867,8 @@ "prefs.shift_add_ctrl_toggle": "Shift adds only; Ctrl / Cmd toggles", "prefs.shift_add_note": "On: Shift adds, Ctrl / Cmd toggles. Off (default): both toggle.", "prefs.shortcuts": "Shortcuts", + "prefs.sketch_conflict_colour": "Conflicting geometry in the conflict color", + "prefs.sketch_conflict_colour_note": "While a sketch's constraints conflict, the curves and points a failing constraint holds are drawn in the conflict color too, not only its glyph or dimension. Off: they keep their usual colors.", "prefs.sketch_exit_view": "When a sketch ends", "prefs.sketch_exit_view.keep": "Keep the current view", "prefs.sketch_exit_view.previous": "Return to the previous view", diff --git a/assets/locales/he.json b/assets/locales/he.json index 0fbc3e310..ec5cda0c5 100644 --- a/assets/locales/he.json +++ b/assets/locales/he.json @@ -1867,6 +1867,8 @@ "prefs.shift_add_ctrl_toggle": "Shift מוסיף בלבד; Ctrl / Cmd מחליף מצב", "prefs.shift_add_note": "כשפועל: Shift מוסיף, Ctrl / Cmd מחליף מצב. כשכבוי (ברירת מחדל): שניהם מחליפים מצב.", "prefs.shortcuts": "קיצורים", + "prefs.sketch_conflict_colour": "גאומטריה סותרת בצבע הסתירה", + "prefs.sketch_conflict_colour_note": "כשאילוצי סקיצה סותרים, העקומות והנקודות שאילוץ כושל מחזיק מצוירות גם הן בצבע הסתירה, לא רק הסמל או המידה שלו. כבוי: הן שומרות על צבעיהן הרגילים.", "prefs.sketch_exit_view": "בסיום סקיצה", "prefs.sketch_exit_view.keep": "שמירה על התצוגה הנוכחית", "prefs.sketch_exit_view.previous": "חזרה לתצוגה הקודמת", diff --git a/assets/locales/ja.json b/assets/locales/ja.json index 72a559baa..4ce366a35 100644 --- a/assets/locales/ja.json +++ b/assets/locales/ja.json @@ -1867,6 +1867,8 @@ "prefs.shift_add_ctrl_toggle": "Shift は追加のみ、Ctrl / Cmd は選択を切り替え", "prefs.shift_add_note": "オン:Shift は追加、Ctrl / Cmd は選択を切り替えます。オフ(既定):どちらも選択を切り替えます。", "prefs.shortcuts": "ショートカット", + "prefs.sketch_conflict_colour": "競合するジオメトリを競合色で表示", + "prefs.sketch_conflict_colour_note": "スケッチの拘束が競合している間、満たされない拘束のグリフや寸法だけでなく、その拘束が保持する曲線と点も競合色で描画します。オフ: 通常の色のままです。", "prefs.sketch_exit_view": "スケッチ終了時のビュー", "prefs.sketch_exit_view.keep": "現在のビューを維持", "prefs.sketch_exit_view.previous": "前のビューに戻る", diff --git a/assets/locales/ko.json b/assets/locales/ko.json index d5c233dcc..baf01afdc 100644 --- a/assets/locales/ko.json +++ b/assets/locales/ko.json @@ -1577,6 +1577,8 @@ "prefs.shift_add_ctrl_toggle": "Shift는 추가만, Ctrl / Cmd는 토글", "prefs.shift_add_note": "켬: Shift는 추가, Ctrl / Cmd는 토글. 끔(기본값): 둘 다 토글.", "prefs.shortcuts": "단축키", + "prefs.sketch_conflict_colour": "충돌하는 기하를 충돌 색상으로 표시", + "prefs.sketch_conflict_colour_note": "스케치의 구속 조건이 충돌하는 동안 실패한 구속 조건의 글리프나 치수뿐 아니라 그 구속 조건이 잡고 있는 곡선과 점도 충돌 색상으로 그립니다. 끄기: 평소 색상을 유지합니다.", "prefs.sketch_selection": "스케치 및 선택", "prefs.sketch_selection_heading": "스케치 및 선택", "prefs.sketch_selection_note": "스케치가 스냅되는 방식과 클릭으로 선택하는 방식입니다.", diff --git a/assets/locales/nl.json b/assets/locales/nl.json index 87ede3c22..42baae097 100644 --- a/assets/locales/nl.json +++ b/assets/locales/nl.json @@ -1849,6 +1849,8 @@ "prefs.shift_add_ctrl_toggle": "Shift voegt alleen toe; Ctrl / Cmd schakelt om", "prefs.shift_add_note": "Aan: Shift voegt toe, Ctrl / Cmd schakelt om. Uit (standaard): beide schakelen om.", "prefs.shortcuts": "Sneltoetsen", + "prefs.sketch_conflict_colour": "Conflicterende geometrie in de conflictkleur", + "prefs.sketch_conflict_colour_note": "Zolang de beperkingen van een schets conflicteren, worden ook de curven en punten die een niet-vervulde beperking vasthoudt in de conflictkleur getekend, niet alleen het symbool of de maat ervan. Uit: ze houden hun gewone kleuren.", "prefs.sketch_exit_view": "Wanneer een schets eindigt", "prefs.sketch_exit_view.keep": "De huidige weergave behouden", "prefs.sketch_exit_view.previous": "Terug naar de vorige weergave", diff --git a/assets/locales/pending/sketch-conflict-colour.json b/assets/locales/pending/sketch-conflict-colour.json deleted file mode 100644 index 0c8581f34..000000000 --- a/assets/locales/pending/sketch-conflict-colour.json +++ /dev/null @@ -1,42 +0,0 @@ -{ - "en": { - "prefs.sketch_conflict_colour": "Conflicting geometry in the conflict color", - "prefs.sketch_conflict_colour_note": "While a sketch's constraints conflict, the curves and points a failing constraint holds are drawn in the conflict color too, not only its glyph or dimension. Off: they keep their usual colors." - }, - "en-GB": { - "prefs.sketch_conflict_colour": "Conflicting geometry in the conflict colour", - "prefs.sketch_conflict_colour_note": "While a sketch's constraints conflict, the curves and points a failing constraint holds are drawn in the conflict colour too, not only its glyph or dimension. Off: they keep their usual colours." - }, - "de": { - "prefs.sketch_conflict_colour": "Widersprüchliche Geometrie in der Konfliktfarbe", - "prefs.sketch_conflict_colour_note": "Solange die Bedingungen einer Skizze im Konflikt stehen, werden auch die Kurven und Punkte, die eine nicht erfüllte Bedingung hält, in der Konfliktfarbe gezeichnet, nicht nur ihr Symbol oder ihre Bemaßung. Aus: Sie behalten ihre üblichen Farben." - }, - "ja": { - "prefs.sketch_conflict_colour": "競合するジオメトリを競合色で表示", - "prefs.sketch_conflict_colour_note": "スケッチの拘束が競合している間、満たされない拘束のグリフや寸法だけでなく、その拘束が保持する曲線と点も競合色で描画します。オフ: 通常の色のままです。" - }, - "ko": { - "prefs.sketch_conflict_colour": "충돌하는 기하를 충돌 색상으로 표시", - "prefs.sketch_conflict_colour_note": "스케치의 구속 조건이 충돌하는 동안 실패한 구속 조건의 글리프나 치수뿐 아니라 그 구속 조건이 잡고 있는 곡선과 점도 충돌 색상으로 그립니다. 끄기: 평소 색상을 유지합니다." - }, - "nl": { - "prefs.sketch_conflict_colour": "Conflicterende geometrie in de conflictkleur", - "prefs.sketch_conflict_colour_note": "Zolang de beperkingen van een schets conflicteren, worden ook de curven en punten die een niet-vervulde beperking vasthoudt in de conflictkleur getekend, niet alleen het symbool of de maat ervan. Uit: ze houden hun gewone kleuren." - }, - "zh": { - "prefs.sketch_conflict_colour": "以冲突颜色显示冲突的几何图形", - "prefs.sketch_conflict_colour_note": "草图约束冲突时,不仅失败约束的符号或尺寸,该约束所约束的曲线和点也以冲突颜色绘制。关闭:它们保持平常的颜色。" - }, - "ar": { - "prefs.sketch_conflict_colour": "الهندسة المتعارضة بلون التعارض", - "prefs.sketch_conflict_colour_note": "عندما تتعارض قيود الرسم، تُرسم المنحنيات والنقاط التي يمسكها قيد فاشل بلون التعارض أيضًا، لا رمزه أو بُعده فقط. عند الإيقاف: تحتفظ بألوانها المعتادة." - }, - "he": { - "prefs.sketch_conflict_colour": "גאומטריה סותרת בצבע הסתירה", - "prefs.sketch_conflict_colour_note": "כשאילוצי סקיצה סותרים, העקומות והנקודות שאילוץ כושל מחזיק מצוירות גם הן בצבע הסתירה, לא רק הסמל או המידה שלו. כבוי: הן שומרות על צבעיהן הרגילים." - }, - "vi": { - "prefs.sketch_conflict_colour": "Hình học xung đột theo màu xung đột", - "prefs.sketch_conflict_colour_note": "Khi các ràng buộc của bản phác xung đột, các đường cong và điểm mà một ràng buộc lỗi giữ cũng được vẽ bằng màu xung đột, không chỉ ký hiệu hay kích thước của nó. Tắt: chúng giữ màu thường." - } -} diff --git a/assets/locales/vi.json b/assets/locales/vi.json index d52f1b36f..10098da24 100644 --- a/assets/locales/vi.json +++ b/assets/locales/vi.json @@ -1867,6 +1867,8 @@ "prefs.shift_add_ctrl_toggle": "Shift chỉ thêm; Ctrl / Cmd đảo trạng thái chọn", "prefs.shift_add_note": "Bật: Shift để thêm vào vùng chọn, Ctrl / Cmd để đảo chọn. Tắt (mặc định): cả hai đều đảo trạng thái chọn.", "prefs.shortcuts": "Phím tắt", + "prefs.sketch_conflict_colour": "Hình học xung đột theo màu xung đột", + "prefs.sketch_conflict_colour_note": "Khi các ràng buộc của bản phác xung đột, các đường cong và điểm mà một ràng buộc lỗi giữ cũng được vẽ bằng màu xung đột, không chỉ ký hiệu hay kích thước của nó. Tắt: chúng giữ màu thường.", "prefs.sketch_exit_view": "Khi kết thúc phác thảo", "prefs.sketch_exit_view.keep": "Giữ góc nhìn hiện tại", "prefs.sketch_exit_view.previous": "Trở về góc nhìn trước đó", diff --git a/assets/locales/zh.json b/assets/locales/zh.json index e098bd8a8..395b7e6c3 100644 --- a/assets/locales/zh.json +++ b/assets/locales/zh.json @@ -1867,6 +1867,8 @@ "prefs.shift_add_ctrl_toggle": "Shift 仅添加;Ctrl / Cmd 切换选择", "prefs.shift_add_note": "开启:Shift 添加,Ctrl / Cmd 切换选择。关闭(默认):两者均切换选择。", "prefs.shortcuts": "快捷键", + "prefs.sketch_conflict_colour": "以冲突颜色显示冲突的几何图形", + "prefs.sketch_conflict_colour_note": "草图约束冲突时,不仅失败约束的符号或尺寸,该约束所约束的曲线和点也以冲突颜色绘制。关闭:它们保持平常的颜色。", "prefs.sketch_exit_view": "草图结束时的视图", "prefs.sketch_exit_view.keep": "保持当前视图", "prefs.sketch_exit_view.previous": "返回之前的视图",