rename merge/isolate

src/kiri/app/platform.js

@@ -172,14 +172,14 @@ function update_size(updateDark = true) {
            space.platform.setGrid(gridMajor, gridMinor, scheme.grid.major, scheme.grid.minor);
            space.platform.opacity(0.05);
            space.sky.set({ color: 0, ambient: { intensity: 0.6 } });
-           document.documentElement.classList.add('dark');
+           document.documentElement.setAttribute('data-theme', 'dark');
        } else {
            space.platform.set({ light: 0.08 });
            space.platform.setFont({rulerColor:'#333333'});
            space.platform.setGrid(gridMajor, gridMinor, scheme.grid.major, scheme.grid.minor);
            space.platform.opacity(0.2);
            space.sky.set({ color: 0xffffff, ambient: { intensity: 1.1 } });
-           document.documentElement.classList.remove('dark');
+           document.documentElement.setAttribute('data-theme', 'light');
        }
        space.platform.setSize();
     }

web/kiri/index.html

@@ -22,13 +22,7 @@
         function setDarkLight(isDark) {
             const dde = document.documentElement;
             dde.setAttribute('data-theme', isDark ? 'dark' : 'light');
-            if (isDark) {
+            dde.style.background = isDark ? '#000000' : '#ffffff';
-                dde.classList.add('dark');
-                dde.style.background = '#000000';
-            } else {
-                dde.classList.remove('dark');
-                dde.style.background = '#ffffff';
-            }
         }
         setDarkLight(isDark);
     </script>

web/kiri/lang/da.js

@@ -90,8 +90,8 @@ self.lang['da-dk'] = {
     rc_xobj:        "eksporter OBJ",
     rc_xstl:        "eksporter STL",
     sb_info:        ["print hastighed","i mm/s"],
-    rc_merg:        "flet objekt meshes",
+    rc_merg:        "flet objekter",
-    rc_splt:        "isoler legemer",
+    rc_splt:        "isoler objekter",
 
     // DEVICE MENU and related dialogs
     dm_sldt:        "vælg en enhedstype",

web/kiri/lang/de-de.js

@@ -91,8 +91,8 @@ self.lang['de-de'] = {
     rc_xobj:        "Als OBJ exportieren",
     rc_xstl:        "Als STL exportieren",
     sb_info:        ["Druckgeschwindigkeit","in mm/s"],
-    rc_merg:        "Objekt-Meshes zusammenführen",
+    rc_merg:        "Objekte zusammenführen",
-    rc_splt:        "Körper isolieren",
+    rc_splt:        "Objekte isolieren",
 
     // DEVICE MENU and related dialogs
     dm_sldt:        "Wähle einen Geräte-Typ aus",

web/kiri/lang/en.js

@@ -92,8 +92,8 @@ self.lang['en-us'] = {
     rc_xobj:        "export OBJ",
     rc_xstl:        "export STL",
     sb_info:        ["print speed","in mm/s"],
-    rc_merg:        "merge object meshes",
+    rc_merg:        "merge objects",
-    rc_splt:        "isolate bodies",
+    rc_splt:        "isolate objects",
 
     // DEVICE MENU and related dialogs
     dm_sldt:        "select a device type",

web/kiri/lang/es-es.js

@@ -91,8 +91,8 @@ self.lang['es-es'] = {
     rc_xobj:        "exportar OBJ",
     rc_xstl:        "exportar STL",
     sb_info:        ["velocidad de impresión","en mm/s"],
-    rc_merg:        "fusionar mallas de objeto",
+    rc_merg:        "fusionar objetos",
-    rc_splt:        "aislar cuerpos",
+    rc_splt:        "aislar objetos",
 
     // DEVICE MENU and related dialogs
     dm_sldt:        "seleccionar un tipo de dispositivo",

web/kiri/lang/fr.js

@@ -91,8 +91,8 @@ self.lang['fr-fr'] = {
     rc_xobj:        "exporter OBJ",
     rc_xstl:        "exporter STL",
     sb_info:        ["vitesse d'impression","en mm/s"],
-    rc_merg:        "fusionner les maillages d'objets",
+    rc_merg:        "fusionner les objets",
-    rc_splt:        "isoler les corps",
+    rc_splt:        "isoler les objets",
 
     // DEVICE MENU and related dialogs
     dm_sldt:        "sélectionner un type d'appareil",

web/kiri/lang/pl-pl.js

@@ -90,8 +90,8 @@ self.lang['pl-pl'] = {
     rc_xobj:        "eksportuj OBJ",
     rc_xstl:        "eksportuj STL",
     sb_info:        ["prędkość druku","w mm/s"],
-    rc_merg:        "połącz siatki obiektu",
+    rc_merg:        "połącz obiekty",
-    rc_splt:        "wyizoluj bryły",
+    rc_splt:        "wyizoluj obiekty",
 
     // DEVICE MENU and related dialogs
     dm_sldt:        "wybierz typ urządzenia",

web/kiri/lang/pt.js

@@ -91,8 +91,8 @@ self.lang['pt-pt'] = {
     rc_xobj:        "exportar OBJ",
     rc_xstl:        "exportar STL",
     sb_info:        ["velocidade de impressão","em mm/s"],
-    rc_merg:        "fundir malhas de objecto",
+    rc_merg:        "fundir objectos",
-    rc_splt:        "isolar corpos",
+    rc_splt:        "isolar objectos",
 
     // DEVICE MENU and related dialogs
     dm_sldt:        "seleccione um tipo de dispositivo",

web/kiri/lang/zh.js

@@ -85,8 +85,8 @@ self.lang['zh'] = {
     rc_xobj:        "导出OBJ",
     rc_xstl:        "导出STL",
     sb_info:        ["打印速度","单位：毫米/秒"],
-    rc_merg:        "合并对象网格",
+    rc_merg:        "合并对象",
-    rc_splt:        "分离实体",
+    rc_splt:        "分离对象",
 
     // 设备菜单及相关对话框
     dm_sldt:        "选择设备类型",