Merge branch 'master' into feature/postgresql-export-bytea

Add support for base64 image source from binary object
Enhance binary data handling in modifyRow function to support ArrayBuffer conversion to base64
2025-11-13 13:44:11 +01:00 · 2025-11-13 13:37:33 +01:00 · 2025-11-13 13:12:51 +01:00 · 2025-11-13 10:26:12 +01:00 · 2025-11-13 10:10:33 +01:00 · 2025-11-13 09:40:05 +01:00
140 changed files with 3701 additions and 1274 deletions
@@ -109,6 +109,7 @@ jobs:
      - name: Fix YML hashes
        if: matrix.os == 'windows-2022'
        run: |
+
          yarn run fixYmlHashes
      - name: Copy artifacts
        run: |
@@ -105,6 +105,7 @@ jobs:
      - name: Fix YML hashes
        if: matrix.os == 'windows-2022'
        run: |
+
          yarn run fixYmlHashes
      - name: Copy artifacts
        run: |
@@ -43,7 +43,7 @@ jobs:
          repository: dbgate/dbgate-pro
          token: ${{ secrets.GH_TOKEN }}
          path: dbgate-pro
-          ref: 6195e103e1d45e4f59bade60df5dd1784f4e6c77
+          ref: f27a03d4aff5b00a009643df146a9c17bdbf7801
      - name: Merge dbgate/dbgate-pro
        run: |
          mkdir ../dbgate-pro
@@ -135,13 +135,16 @@ jobs:
          endpoint: https://wus3.codesigning.azure.net/
          trusted-signing-account-name: DbGate
          certificate-profile-name: DbGate-Release
-          files-folder: app/dist
+          files-folder: ../dbgate-merged/app/dist
          files-folder-filter: exe
          timestamp-rfc3161: http://timestamp.acs.microsoft.com
          timestamp-digest: SHA256
      - name: Fix YML hashes
        if: matrix.os == 'windows-2022'
        run: |
+          cd ..
+          cd dbgate-merged
+
          yarn run fixYmlHashes
      - name: Copy artifacts
        run: |
@@ -43,7 +43,7 @@ jobs:
          repository: dbgate/dbgate-pro
          token: ${{ secrets.GH_TOKEN }}
          path: dbgate-pro
-          ref: 6195e103e1d45e4f59bade60df5dd1784f4e6c77
+          ref: f27a03d4aff5b00a009643df146a9c17bdbf7801
      - name: Merge dbgate/dbgate-pro
        run: |
          mkdir ../dbgate-pro
@@ -135,13 +135,16 @@ jobs:
          endpoint: https://wus3.codesigning.azure.net/
          trusted-signing-account-name: DbGate
          certificate-profile-name: DbGate-Release
-          files-folder: app/dist
+          files-folder: ../dbgate-merged/app/dist
          files-folder-filter: exe
          timestamp-rfc3161: http://timestamp.acs.microsoft.com
          timestamp-digest: SHA256
      - name: Fix YML hashes
        if: matrix.os == 'windows-2022'
        run: |
+          cd ..
+          cd dbgate-merged
+
          yarn run fixYmlHashes
      - name: Copy artifacts
        run: |
@@ -108,6 +108,7 @@ jobs:
      - name: Fix YML hashes
        if: matrix.os == 'windows-2022'
        run: |
+
          yarn run fixYmlHashes
      - name: Copy artifacts
        run: |
@@ -39,7 +39,7 @@ jobs:
          repository: dbgate/dbgate-pro
          token: ${{ secrets.GH_TOKEN }}
          path: dbgate-pro
-          ref: 6195e103e1d45e4f59bade60df5dd1784f4e6c77
+          ref: f27a03d4aff5b00a009643df146a9c17bdbf7801
      - name: Merge dbgate/dbgate-pro
        run: |
          mkdir ../dbgate-pro
@@ -44,7 +44,7 @@ jobs:
          repository: dbgate/dbgate-pro
          token: ${{ secrets.GH_TOKEN }}
          path: dbgate-pro
-          ref: 6195e103e1d45e4f59bade60df5dd1784f4e6c77
+          ref: f27a03d4aff5b00a009643df146a9c17bdbf7801
      - name: Merge dbgate/dbgate-pro
        run: |
          mkdir ../dbgate-pro
@@ -35,7 +35,7 @@ jobs:
          repository: dbgate/dbgate-pro
          token: ${{ secrets.GH_TOKEN }}
          path: dbgate-pro
-          ref: 6195e103e1d45e4f59bade60df5dd1784f4e6c77
+          ref: f27a03d4aff5b00a009643df146a9c17bdbf7801
      - name: Merge dbgate/dbgate-pro
        run: |
          mkdir ../dbgate-pro
@@ -26,7 +26,7 @@ jobs:
          repository: dbgate/dbgate-pro
          token: ${{ secrets.GH_TOKEN }}
          path: dbgate-pro
-          ref: 6195e103e1d45e4f59bade60df5dd1784f4e6c77
+          ref: f27a03d4aff5b00a009643df146a9c17bdbf7801
      - name: Merge dbgate/dbgate-pro
        run: |
          mkdir ../dbgate-pro
@@ -8,6 +8,19 @@ Builds:
 - linux - application for linux
 - win - application for Windows

+## 6.6.11
+- FIXED: Fixed theming on application startup
+- CHANGED: Improved licensing page
+
+## 6.6.10
+- FIXED: License from environment variable is not refreshed #1245
+- FIXED: connection closing / reconnecting #1237
+- ADDED: retain history across multiple queries #1236
+- ADDED: load CSVs to temp tables #1235
+- FIXED: Not possible to scroll the data view horizontally by pressing shift and scroll mouse middle button on Mac #453
+- FIXED: Expired trial workflow (Premium)
+- ADDED: Column name collision resolving #1234 (MySQL)
+ 
 ## 6.6.8
 - CHANGED: Windows executable now uses Azure trusted signing certificate
 - CHANGED: NPM packages now use GitHub OIDC provenance signing for better security
@@ -128,7 +128,7 @@
  "devDependencies": {
    "copyfiles": "^2.2.0",
    "cross-env": "^6.0.3",
-    "electron": "30.0.2",
+    "electron": "38.6.0",
    "electron-builder": "25.1.8"
  }
 }
@@ -85,7 +85,7 @@ function formatKeyText(keyText) {
  return keyText.replace('CtrlOrCommand+', 'Ctrl+');
 }

-function commandItem(item) {
+function commandItem(item, disableAll = false) {
  const id = item.command;
  const command = commands[id];
  if (item.skipInApp) {
@@ -95,7 +95,7 @@ function commandItem(item) {
    id,
    label: command ? command.menuName || command.toolbarName || command.name : id,
    accelerator: formatKeyText(command ? command.keyText : undefined),
-    enabled: command ? command.enabled : false,
+    enabled: command ? command.enabled && !disableAll : false,
    click() {
      if (mainWindow) {
        mainWindow.webContents.send('run-command', id);
@@ -107,14 +107,14 @@ function commandItem(item) {
  };
 }

-function buildMenu() {
+function buildMenu(disableAll = false) {
  let template = _cloneDeepWith(mainMenuDefinition({ editMenu: true, isMac: isMac() }), item => {
    if (item.divider) {
      return { type: 'separator' };
    }

    if (item.command) {
-      return commandItem(item);
+      return commandItem(item, disableAll);
    }
  });

@@ -129,7 +129,7 @@ function buildMenu() {
      {
        label: 'DbGate',
        submenu: [
-          commandItem({ command: 'about.show' }),
+          commandItem({ command: 'about.show' }, disableAll),
          { role: 'services' },
          { role: 'hide' },
          { role: 'hideOthers' },
@@ -145,7 +145,10 @@ function buildMenu() {
 }

 ipcMain.on('update-commands', async (event, arg) => {
-  commands = JSON.parse(arg);
+  const parsed = JSON.parse(arg);
+  commands = parsed.commands;
+  const isModalOpened = parsed.isModalOpened;
+  const dbgatePage = parsed.dbgatePage;
  for (const key of Object.keys(commands)) {
    const menu = mainMenu.getMenuItemById(key);
    if (!menu) continue;
@@ -153,14 +156,14 @@ ipcMain.on('update-commands', async (event, arg) => {

    // rebuild menu
    if (menu.label != command.text || menu.accelerator != command.keyText) {
-      mainMenu = buildMenu();
+      mainMenu = buildMenu(isModalOpened || !!dbgatePage);

      Menu.setApplicationMenu(mainMenu);
      // mainWindow.setMenu(mainMenu);
      return;
    }

-    menu.enabled = command.enabled;
+    menu.enabled = command.enabled && !isModalOpened && !dbgatePage;
  }
 });
 ipcMain.on('quit-app', async (event, arg) => {
@@ -16,9 +16,9 @@
    ajv-keywords "^3.4.1"

 "@electron/asar@^3.2.7":
-  version "3.2.17"
-  resolved "https://registry.yarnpkg.com/@electron/asar/-/asar-3.2.17.tgz#91d28087aad80d1a1c8cc4e667c6476edf50f949"
-  integrity sha512-OcWImUI686w8LkghQj9R2ynZ2ME693Ek6L1SiaAgqGKzBaTIZw3fHDqN82Rcl+EU1Gm9EgkJ5KLIY/q5DCRbbA==
+  version "3.4.1"
+  resolved "https://registry.yarnpkg.com/@electron/asar/-/asar-3.4.1.tgz#4e9196a4b54fba18c56cd8d5cac67c5bdc588065"
+  integrity sha512-i4/rNPRS84t0vSRa2HorerGRXWyF4vThfHesw0dmcWHp+cspK743UanA0suA5Q5y8kzY2y6YKrvbIUn69BCAiA==
  dependencies:
    commander "^5.0.0"
    glob "^7.1.6"
@@ -98,6 +98,18 @@
  resolved "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.3.tgz#555193ab2e3bb3b6adc3d551c9c030d9e860daf6"
  integrity sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==

+"@isaacs/balanced-match@^4.0.1":
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/@isaacs/balanced-match/-/balanced-match-4.0.1.tgz#3081dadbc3460661b751e7591d7faea5df39dd29"
+  integrity sha512-yzMTt9lEb8Gv7zRioUilSglI0c0smZ9k5D65677DLWLtWJaXIS3CqcGyUFByYKlnUj6TkjLVs54fBl6+TiGQDQ==
+
+"@isaacs/brace-expansion@^5.0.0":
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/@isaacs/brace-expansion/-/brace-expansion-5.0.0.tgz#4b3dabab7d8e75a429414a96bd67bf4c1d13e0f3"
+  integrity sha512-ZT55BDLV0yv0RBm2czMiZ+SqCGO7AvmOM3G/w2xhVPH+te0aKgFjmBvGlL1dH+ql2tgGO3MVrbb3jCKyvpgnxA==
+  dependencies:
+    "@isaacs/balanced-match" "^4.0.1"
+
 "@isaacs/cliui@^8.0.2":
  version "8.0.2"
  resolved "https://registry.yarnpkg.com/@isaacs/cliui/-/cliui-8.0.2.tgz#b37667b7bc181c168782259bab42474fbf52b550"
@@ -202,16 +214,23 @@
    "@types/node" "*"

 "@types/ms@*":
-  version "0.7.34"
-  resolved "https://registry.yarnpkg.com/@types/ms/-/ms-0.7.34.tgz#10964ba0dee6ac4cd462e2795b6bebd407303433"
-  integrity sha512-nG96G3Wp6acyAgJqGasjODb+acrI7KltPiRxzHPXnP3NgI28bpQDRv53olbqGXbfcgF5aiiHmO3xpwEpS5Ld9g==
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/@types/ms/-/ms-2.1.0.tgz#052aa67a48eccc4309d7f0191b7e41434b90bb78"
+  integrity sha512-GsCCIZDE/p3i96vtEqx+7dBUGXrc7zeSK3wwPHIaRThS+9OhWIXRqzs4d6k1SVU8g91DrNRWxWUGhp5KXQb2VA==

-"@types/node@*", "@types/node@^20.9.0":
-  version "20.12.10"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.12.10.tgz#8f0c3f12b0f075eee1fe20c1afb417e9765bef76"
-  integrity sha512-Eem5pH9pmWBHoGAT8Dr5fdc5rYA+4NAovdM4EktRPVAAiJhmWWfQrA0cFhAbOsQdSfIHjAud6YdkbL69+zSKjw==
+"@types/node@*":
+  version "24.10.0"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-24.10.0.tgz#6b79086b0dfc54e775a34ba8114dcc4e0221f31f"
+  integrity sha512-qzQZRBqkFsYyaSWXuEHc2WR9c0a0CXwiE5FWUvn7ZM+vdy1uZLfCunD38UzhuB7YN/J11ndbDBcTmOdxJo9Q7A==
  dependencies:
-    undici-types "~5.26.4"
+    undici-types "~7.16.0"
+
+"@types/node@^22.7.7":
+  version "22.19.0"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-22.19.0.tgz#849606ef3920850583a4e7ee0930987c35ad80be"
+  integrity sha512-xpr/lmLPQEj+TUnHmR+Ab91/glhJvsqcjB+yY0Ix9GO70H6Lb4FHH5GeqdOE5btAx7eIMwuHkp4H2MSkLcqWbA==
+  dependencies:
+    undici-types "~6.21.0"

 "@types/plist@^3.0.1":
  version "3.0.5"
@@ -229,9 +248,9 @@
    "@types/node" "*"

 "@types/verror@^1.10.3":
-  version "1.10.10"
-  resolved "https://registry.yarnpkg.com/@types/verror/-/verror-1.10.10.tgz#d5a4b56abac169bfbc8b23d291363a682e6fa087"
-  integrity sha512-l4MM0Jppn18hb9xmM6wwD1uTdShpf9Pn80aXTStnK1C94gtPvJcV2FrDmbOQUAQfJ1cKZHktkQUDwEqaAKXMMg==
+  version "1.10.11"
+  resolved "https://registry.yarnpkg.com/@types/verror/-/verror-1.10.11.tgz#d3d6b418978c8aa202d41e5bb3483227b6ecc1bb"
+  integrity sha512-RlDm9K7+o5stv0Co8i8ZRGxDbrTxhJtgjqjFyVh/tXQyl/rYtTKlnTvZ88oSTeYREWurwx20Js4kTuKCsFkUtg==

 "@types/yauzl@^2.9.1":
  version "2.10.3"
@@ -241,9 +260,9 @@
    "@types/node" "*"

 "@xmldom/xmldom@^0.8.8":
-  version "0.8.10"
-  resolved "https://registry.yarnpkg.com/@xmldom/xmldom/-/xmldom-0.8.10.tgz#a1337ca426aa61cef9fe15b5b28e340a72f6fa99"
-  integrity sha512-2WALfTl4xo2SkGCYRt6rDTFfk9R1czmBvUQy12gK2KuRKIpWEhcbbzy8EZXtz/jkRqHX8bFEc6FC1HjX4TUWYw==
+  version "0.8.11"
+  resolved "https://registry.yarnpkg.com/@xmldom/xmldom/-/xmldom-0.8.11.tgz#b79de2d67389734c57c52595f7a7305e30c2d608"
+  integrity sha512-cQzWCtO6C8TQiYl1ruKNn2U6Ao4o4WBBcbL61yJl84x+j5sOWWFU9X7DpND8XZG3daDppSsigMdfAIl2upQBRw==

 "@yarnpkg/lockfile@^1.1.0":
  version "1.1.0"
@@ -263,14 +282,14 @@ agent-base@6, agent-base@^6.0.2:
    debug "4"

 agent-base@^7.1.0, agent-base@^7.1.2:
-  version "7.1.3"
-  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-7.1.3.tgz#29435eb821bc4194633a5b89e5bc4703bafc25a1"
-  integrity sha512-jRR5wdylq8CkOe6hei19GGZnxM6rBGwFl3Bg0YItGDimvjGtAvdZk4Pu6Cl4u4Igsws4a1fd1Vq3ezrhn4KmFw==
+  version "7.1.4"
+  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-7.1.4.tgz#e3cd76d4c548ee895d3c3fd8dc1f6c5b9032e7a8"
+  integrity sha512-MnA+YT8fwfJPgBx3m60MNqakm30XOkyIoH1y6huTQvC0PwZG7ki8NacLBcrPbNoo8vEZy7Jpuk7+jMO+CUovTQ==

 agentkeepalive@^4.2.1:
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-4.5.0.tgz#2673ad1389b3c418c5a20c5d7364f93ca04be923"
-  integrity sha512-5GG/5IbQQpC9FpkRGsSvZI5QYeSCzlJHdpBQntCsuTOxhKD8lqKhrleg2Yi7yvMIf82Ycmmqln9U8V9qwEiJew==
+  version "4.6.0"
+  resolved "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-4.6.0.tgz#35f73e94b3f40bf65f105219c623ad19c136ea6a"
+  integrity sha512-kja8j7PjmncONqaTsB8fQ+wE2mSU2DJ9D4XKoJ5PFWIdRMa6SLSN1ff4mOr4jCbfRSsxR4keIiySJU0N9T5hIQ==
  dependencies:
    humanize-ms "^1.2.1"

@@ -303,9 +322,9 @@ ansi-regex@^5.0.1:
  integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==

 ansi-regex@^6.0.1:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-6.1.0.tgz#95ec409c69619d6cb1b8b34f14b660ef28ebd654"
-  integrity sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==
+  version "6.2.2"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-6.2.2.tgz#60216eea464d864597ce2832000738a0589650c1"
+  integrity sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg==

 ansi-styles@^4.0.0, ansi-styles@^4.1.0:
  version "4.3.0"
@@ -315,9 +334,9 @@ ansi-styles@^4.0.0, ansi-styles@^4.1.0:
    color-convert "^2.0.1"

 ansi-styles@^6.1.0:
-  version "6.2.1"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-6.2.1.tgz#0e62320cf99c21afff3b3012192546aacbfb05c5"
-  integrity sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==
+  version "6.2.3"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-6.2.3.tgz#c044d5dcc521a076413472597a1acb1f103c4041"
+  integrity sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg==

 app-builder-bin@5.0.0-alpha.10:
  version "5.0.0-alpha.10"
@@ -363,9 +382,9 @@ app-builder-lib@25.1.8:
    temp-file "^3.4.0"

 "aproba@^1.0.3 || ^2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/aproba/-/aproba-2.0.0.tgz#52520b8ae5b569215b354efc0caa3fe1e45a8adc"
-  integrity sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/aproba/-/aproba-2.1.0.tgz#75500a190313d95c64e871e7e4284c6ac219f0b1"
+  integrity sha512-tLIEcj5GuR2RSTnxNKdkK0dJ/GrC7P38sUkiDmDuHfsHmbagTFAxDVIBltoklXEVIQ/f14IL8IMJ5pn9Hez1Ew==

 are-we-there-yet@^3.0.0:
  version "3.0.1"
@@ -395,10 +414,10 @@ async-exit-hook@^2.0.1:
  resolved "https://registry.yarnpkg.com/async-exit-hook/-/async-exit-hook-2.0.1.tgz#8bd8b024b0ec9b1c01cccb9af9db29bd717dfaf3"
  integrity sha512-NW2cX8m1Q7KPA7a5M2ULQeZ2wR5qI5PAbw5L0UOMxdioVk9PMZ0h1TmyZEkPYrCvYjDlFICusOu1dlEKAAeXBw==

-async@^3.2.3:
-  version "3.2.5"
-  resolved "https://registry.yarnpkg.com/async/-/async-3.2.5.tgz#ebd52a8fdaf7a2289a24df399f8d8485c8a46b66"
-  integrity sha512-baNZyqaaLhyLVKm/DlvdW051MSgO6b8eVfIezl9E5PqWxFgzLm/wQntEW4zOytVburDEr0JlALEpdOFwvErLsg==
+async@^3.2.6:
+  version "3.2.6"
+  resolved "https://registry.yarnpkg.com/async/-/async-3.2.6.tgz#1b0728e14929d51b85b449b7f06e27c1145e38ce"
+  integrity sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA==

 asynckit@^0.4.0:
  version "0.4.0"
@@ -447,33 +466,33 @@ boolean@^3.0.1:
  integrity sha512-d0II/GO9uf9lfUHH2BQsjxzRJZBdsjgsBiW4BvhWk/3qoKwQFjIDVN19PfX8F2D/r9PCMTtLWjYVCFrpeYUzsw==

 brace-expansion@^1.1.7:
-  version "1.1.11"
-  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
-  integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==
+  version "1.1.12"
+  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.12.tgz#ab9b454466e5a8cc3a187beaad580412a9c5b843"
+  integrity sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==
  dependencies:
    balanced-match "^1.0.0"
    concat-map "0.0.1"

 brace-expansion@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-2.0.1.tgz#1edc459e0f0c548486ecf9fc99f2221364b9a0ae"
-  integrity sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-2.0.2.tgz#54fc53237a613d854c7bd37463aad17df87214e7"
+  integrity sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==
  dependencies:
    balanced-match "^1.0.0"

-braces@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
-  integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
+braces@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.3.tgz#490332f40919452272d55a8480adc0c441358789"
+  integrity sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==
  dependencies:
-    fill-range "^7.0.1"
+    fill-range "^7.1.1"

 buffer-crc32@~0.2.3:
  version "0.2.13"
  resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"
  integrity sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==

-buffer-equal-constant-time@1.0.1:
+buffer-equal-constant-time@^1.0.1:
  version "1.0.1"
  resolved "https://registry.yarnpkg.com/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz#f8e71132f7ffe6e01a5c9697a4c6f3e48d5cc819"
  integrity sha512-zRpUiDwd/xk6ADqPMATG8vc9VPrkck7T07OIx0gnjmJAnHnTVXNQG3vfvWNuiZIkwu9KrKdA1iJKfsfTVxE6NA==
@@ -499,10 +518,10 @@ builder-util-runtime@9.2.10:
    debug "^4.3.4"
    sax "^1.2.4"

-builder-util-runtime@9.2.5:
-  version "9.2.5"
-  resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-9.2.5.tgz#0afdffa0adb5c84c14926c7dd2cf3c6e96e9be83"
-  integrity sha512-HjIDfhvqx/8B3TDN4GbABQcgpewTU4LMRTQPkVpKYV3lsuxEJoIfvg09GyWTNmfVNSUAYf+fbTN//JX4TH20pg==
+builder-util-runtime@9.3.1:
+  version "9.3.1"
+  resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-9.3.1.tgz#0daedde0f6d381f2a00a50a407b166fe7dca1a67"
+  integrity sha512-2/egrNDDnRaxVwK3A+cJq6UOlqOdedGA7JPqCeJjN2Zjk1/QB/6QUi3b714ScIGS7HafFXTyzJEOr5b44I3kvQ==
  dependencies:
    debug "^4.3.4"
    sax "^1.2.4"
@@ -571,7 +590,15 @@ cacheable-request@^7.0.2:
    normalize-url "^6.0.1"
    responselike "^2.0.0"

-chalk@^4.0.0, chalk@^4.0.2, chalk@^4.1.0, chalk@^4.1.2:
+call-bind-apply-helpers@^1.0.1, call-bind-apply-helpers@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz#4b5428c222be985d79c3d82657479dbe0b59b2d6"
+  integrity sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==
+  dependencies:
+    es-errors "^1.3.0"
+    function-bind "^1.1.2"
+
+chalk@^4.0.0, chalk@^4.1.0, chalk@^4.1.2:
  version "4.1.2"
  resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01"
  integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==
@@ -744,9 +771,9 @@ cross-env@^6.0.3:
    cross-spawn "^7.0.0"

 cross-spawn@^6.0.5:
-  version "6.0.5"
-  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
-  integrity sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==
+  version "6.0.6"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.6.tgz#30d0efa0712ddb7eb5a76e1e8721bffafa6b5d57"
+  integrity sha512-VqCUuhcd1iB+dsv8gxPttb5iZh/D0iubSP21g36KXdEuf6I5JiioesUVjpCdHV9MZRUfVFlvwtIUyPfxo5trtw==
  dependencies:
    nice-try "^1.0.4"
    path-key "^2.0.1"
@@ -754,26 +781,19 @@ cross-spawn@^6.0.5:
    shebang-command "^1.2.0"
    which "^1.2.9"

-cross-spawn@^7.0.0, cross-spawn@^7.0.1, cross-spawn@^7.0.3:
-  version "7.0.3"
-  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
-  integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==
+cross-spawn@^7.0.0, cross-spawn@^7.0.1, cross-spawn@^7.0.3, cross-spawn@^7.0.6:
+  version "7.0.6"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.6.tgz#8a58fe78f00dcd70c370451759dfbfaf03e8ee9f"
+  integrity sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==
  dependencies:
    path-key "^3.1.0"
    shebang-command "^2.0.0"
    which "^2.0.1"

-debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.4:
-  version "4.3.4"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
-  integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
-  dependencies:
-    ms "2.1.2"
-
-debug@^4.3.3:
-  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-4.4.0.tgz#2b3f2aea2ffeb776477460267377dc8710faba8a"
-  integrity sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==
+debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.3, debug@^4.3.4:
+  version "4.4.3"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.4.3.tgz#c6ae432d9bd9662582fce08709b038c58e9e3d6a"
+  integrity sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==
  dependencies:
    ms "^2.1.3"

@@ -825,9 +845,9 @@ delegates@^1.0.0:
  integrity sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==

 detect-libc@^2.0.1:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-2.0.3.tgz#f0cd503b40f9939b894697d19ad50895e30cf700"
-  integrity sha512-bwy0MGW55bG41VqxxypOsdSdGqLwXPI/focwgTYCFMbdUiBAxLg9CFzG08sz2aqzknwiX7Hkl0bQENjg8iLByw==
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-2.1.2.tgz#689c5dcdc1900ef5583a4cb9f6d7b473742074ad"
+  integrity sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ==

 detect-node@^2.0.4:
  version "2.1.0"
@@ -878,9 +898,18 @@ dotenv-expand@^11.0.6:
    dotenv "^16.4.5"

 dotenv@^16.4.5:
-  version "16.4.7"
-  resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-16.4.7.tgz#0e20c5b82950140aa99be360a8a5f52335f53c26"
-  integrity sha512-47qPchRCykZC03FhkYAhrvwU4xDBFIj1QPqaarj6mdM/hgUzfPHcpkHJOn3mJAufFeeAxAzeGsr5X0M4k6fLZQ==
+  version "16.6.1"
+  resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-16.6.1.tgz#773f0e69527a8315c7285d5ee73c4459d20a8020"
+  integrity sha512-uBq4egWHTcTt33a72vpSG0z3HnPuIl6NqYcTrKEg2azoEyl2hpW0zqlxysq2pK9HlDIHyHyakeYaYnSAwd8bow==
+
+dunder-proto@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/dunder-proto/-/dunder-proto-1.0.1.tgz#d7ae667e1dc83482f8b70fd0f6eefc50da30f58a"
+  integrity sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==
+  dependencies:
+    call-bind-apply-helpers "^1.0.1"
+    es-errors "^1.3.0"
+    gopd "^1.2.0"

 eastasianwidth@^0.2.0:
  version "0.2.0"
@@ -936,11 +965,11 @@ electron-publish@25.1.7:
    mime "^2.5.2"

 electron-updater@^6.3.4:
-  version "6.3.4"
-  resolved "https://registry.yarnpkg.com/electron-updater/-/electron-updater-6.3.4.tgz#3934bc89875bb524c2cbbd11041114e97c0c2496"
-  integrity sha512-uZUo7p1Y53G4tl6Cgw07X1yF8Jlz6zhaL7CQJDZ1fVVkOaBfE2cWtx80avwDVi8jHp+I/FWawrMgTAeCCNIfAg==
+  version "6.6.2"
+  resolved "https://registry.yarnpkg.com/electron-updater/-/electron-updater-6.6.2.tgz#3e65e044f1a99b00d61e200e24de8e709c69ce99"
+  integrity sha512-Cr4GDOkbAUqRHP5/oeOmH/L2Bn6+FQPxVLZtPbcmKZC63a1F3uu5EefYOssgZXG3u/zBlubbJ5PJdITdMVggbw==
  dependencies:
-    builder-util-runtime "9.2.5"
+    builder-util-runtime "9.3.1"
    fs-extra "^10.1.0"
    js-yaml "^4.1.0"
    lazy-val "^1.0.5"
@@ -949,13 +978,13 @@ electron-updater@^6.3.4:
    semver "^7.6.3"
    tiny-typed-emitter "^2.1.0"

-electron@30.0.2:
-  version "30.0.2"
-  resolved "https://registry.yarnpkg.com/electron/-/electron-30.0.2.tgz#95ba019216bf8be9f3097580123e33ea37497733"
-  integrity sha512-zv7T+GG89J/hyWVkQsLH4Y/rVEfqJG5M/wOBIGNaDdqd8UV9/YZPdS7CuFeaIj0H9LhCt95xkIQNpYB/3svOkQ==
+electron@38.6.0:
+  version "38.6.0"
+  resolved "https://registry.yarnpkg.com/electron/-/electron-38.6.0.tgz#c862bff41d42776e307bf5cc92503dda23612339"
+  integrity sha512-68OFNxJlrEStA+t8k5atzf4frJddvRR1N1oalr49Ll8YZ0+0nEsDhw4UNhTCoZKTjSYcxFF/4rt+sco+OlnB3g==
  dependencies:
    "@electron/get" "^2.0.0"
-    "@types/node" "^20.9.0"
+    "@types/node" "^22.7.7"
    extract-zip "^2.0.1"

 emoji-regex@^8.0.0:
@@ -976,9 +1005,9 @@ encoding@^0.1.13:
    iconv-lite "^0.6.2"

 end-of-stream@^1.1.0:
-  version "1.4.4"
-  resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0"
-  integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==
+  version "1.4.5"
+  resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.5.tgz#7344d711dea40e0b74abc2ed49778743ccedb08c"
+  integrity sha512-ooEGc6HP26xXq/N+GCGOT0JKCLDGrq2bQUZrQ7gyrJiZANJ/8YDTxTpQBXGMn+WbIQXNVpyWymm7KYVICQnyOg==
  dependencies:
    once "^1.4.0"

@@ -992,27 +1021,42 @@ err-code@^2.0.2:
  resolved "https://registry.yarnpkg.com/err-code/-/err-code-2.0.3.tgz#23c2f3b756ffdfc608d30e27c9a941024807e7f9"
  integrity sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==

-es-define-property@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/es-define-property/-/es-define-property-1.0.0.tgz#c7faefbdff8b2696cf5f46921edfb77cc4ba3845"
-  integrity sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==
-  dependencies:
-    get-intrinsic "^1.2.4"
+es-define-property@^1.0.0, es-define-property@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/es-define-property/-/es-define-property-1.0.1.tgz#983eb2f9a6724e9303f61addf011c72e09e0b0fa"
+  integrity sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==

 es-errors@^1.3.0:
  version "1.3.0"
  resolved "https://registry.yarnpkg.com/es-errors/-/es-errors-1.3.0.tgz#05f75a25dab98e4fb1dcd5e1472c0546d5057c8f"
  integrity sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==

+es-object-atoms@^1.0.0, es-object-atoms@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/es-object-atoms/-/es-object-atoms-1.1.1.tgz#1c4f2c4837327597ce69d2ca190a7fdd172338c1"
+  integrity sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==
+  dependencies:
+    es-errors "^1.3.0"
+
+es-set-tostringtag@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz#f31dbbe0c183b00a6d26eb6325c810c0fd18bd4d"
+  integrity sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==
+  dependencies:
+    es-errors "^1.3.0"
+    get-intrinsic "^1.2.6"
+    has-tostringtag "^1.0.2"
+    hasown "^2.0.2"
+
 es6-error@^4.1.1:
  version "4.1.1"
  resolved "https://registry.yarnpkg.com/es6-error/-/es6-error-4.1.1.tgz#9e3af407459deed47e9a91f9b885a84eb05c561d"
  integrity sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==

 escalade@^3.1.1:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.2.tgz#54076e9ab29ea5bf3d8f1ed62acffbb88272df27"
-  integrity sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.2.0.tgz#011a3f69856ba189dffa7dc8fcce99d2a87903e5"
+  integrity sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==

 escape-string-regexp@^4.0.0:
  version "4.0.0"
@@ -1020,9 +1064,9 @@ escape-string-regexp@^4.0.0:
  integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==

 exponential-backoff@^3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/exponential-backoff/-/exponential-backoff-3.1.1.tgz#64ac7526fe341ab18a39016cd22c787d01e00bf6"
-  integrity sha512-dX7e/LHVJ6W3DE1MHWi9S1EYzDESENfLrYohG2G++ovZrYOkm4Knwa0mc1cn84xJOR4KEU0WSchhLbd0UklbHw==
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/exponential-backoff/-/exponential-backoff-3.1.3.tgz#51cf92c1c0493c766053f9d3abee4434c244d2f6"
+  integrity sha512-ZgEeZXj30q+I0EN+CbSSpIyPaJ5HVQD18Z1m+u1FXbAeT94mr1zw50q4q6jiiC447Nl/YTcIYSAftiGqetwXCA==

 extract-zip@^2.0.1:
  version "2.0.1"
@@ -1064,10 +1108,10 @@ filelist@^1.0.4:
  dependencies:
    minimatch "^5.0.1"

-fill-range@^7.0.1:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40"
-  integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==
+fill-range@^7.1.1:
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.1.1.tgz#44265d3cac07e3ea7dc247516380643754a05292"
+  integrity sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==
  dependencies:
    to-regex-range "^5.0.1"

@@ -1079,20 +1123,22 @@ find-yarn-workspace-root@^2.0.0:
    micromatch "^4.0.2"

 foreground-child@^3.1.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/foreground-child/-/foreground-child-3.3.0.tgz#0ac8644c06e431439f8561db8ecf29a7b5519c77"
-  integrity sha512-Ld2g8rrAyMYFXBhEqMz8ZAHBi4J4uS1i/CxGMDnjyFWddMXLVcDp051DZfu+t7+ab7Wv6SMqpWmyFIj5UbfFvg==
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/foreground-child/-/foreground-child-3.3.1.tgz#32e8e9ed1b68a3497befb9ac2b6adf92a638576f"
+  integrity sha512-gIXjKqtFuWEgzFRJA9WCQeSJLZDjgJUOMCMzxtvFq/37KojM1BFGufqsCy0r4qSQmYLsZYMeyRqzIWOMup03sw==
  dependencies:
-    cross-spawn "^7.0.0"
+    cross-spawn "^7.0.6"
    signal-exit "^4.0.1"

 form-data@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.0.tgz#93919daeaf361ee529584b9b31664dc12c9fa452"
-  integrity sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.4.tgz#784cdcce0669a9d68e94d11ac4eea98088edd2c4"
+  integrity sha512-KrGhL9Q4zjj0kiUt5OO4Mr/A/jlI2jDYs5eHBpYHPcBEVSiipAvn2Ko2HnPe20rmcuuvMHNdZFp+4IlGTMF0Ow==
  dependencies:
    asynckit "^0.4.0"
    combined-stream "^1.0.8"
+    es-set-tostringtag "^2.1.0"
+    hasown "^2.0.2"
    mime-types "^2.1.12"

 fs-extra@^10.0.0, fs-extra@^10.1.0:
@@ -1105,9 +1151,9 @@ fs-extra@^10.0.0, fs-extra@^10.1.0:
    universalify "^2.0.0"

 fs-extra@^11.1.1:
-  version "11.2.0"
-  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-11.2.0.tgz#e70e17dfad64232287d01929399e0ea7c86b0e5b"
-  integrity sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==
+  version "11.3.2"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-11.3.2.tgz#c838aeddc6f4a8c74dd15f85e11fe5511bfe02a4"
+  integrity sha512-Xr9F6z6up6Ws+NjzMCZc6WXg2YFRlrLP9NQDO3VQrWrfiojdhS56TzueT88ze0uBdCTwEIhQ3ptnmKeWGFAe0A==
  dependencies:
    graceful-fs "^4.2.0"
    jsonfile "^6.0.1"
@@ -1168,16 +1214,29 @@ get-caller-file@^2.0.5:
  resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
  integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==

-get-intrinsic@^1.1.3, get-intrinsic@^1.2.4:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.4.tgz#e385f5a4b5227d449c3eabbad05494ef0abbeadd"
-  integrity sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==
+get-intrinsic@^1.2.6:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.3.0.tgz#743f0e3b6964a93a5491ed1bffaae054d7f98d01"
+  integrity sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==
  dependencies:
+    call-bind-apply-helpers "^1.0.2"
+    es-define-property "^1.0.1"
    es-errors "^1.3.0"
+    es-object-atoms "^1.1.1"
    function-bind "^1.1.2"
-    has-proto "^1.0.1"
-    has-symbols "^1.0.3"
-    hasown "^2.0.0"
+    get-proto "^1.0.1"
+    gopd "^1.2.0"
+    has-symbols "^1.1.0"
+    hasown "^2.0.2"
+    math-intrinsics "^1.1.0"
+
+get-proto@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/get-proto/-/get-proto-1.0.1.tgz#150b3f2743869ef3e851ec0c49d15b1d14d00ee1"
+  integrity sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==
+  dependencies:
+    dunder-proto "^1.0.1"
+    es-object-atoms "^1.0.0"

 get-stream@^5.1.0:
  version "5.2.0"
@@ -1241,12 +1300,10 @@ globalthis@^1.0.1:
    define-properties "^1.2.1"
    gopd "^1.0.1"

-gopd@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/gopd/-/gopd-1.0.1.tgz#29ff76de69dac7489b7c0918a5788e56477c332c"
-  integrity sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==
-  dependencies:
-    get-intrinsic "^1.1.3"
+gopd@^1.0.1, gopd@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/gopd/-/gopd-1.2.0.tgz#89f56b8217bdbc8802bd299df6d7f1081d7e51a1"
+  integrity sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==

 got@^11.7.0, got@^11.8.5:
  version "11.8.6"
@@ -1282,22 +1339,24 @@ has-property-descriptors@^1.0.0:
  dependencies:
    es-define-property "^1.0.0"

-has-proto@^1.0.1:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/has-proto/-/has-proto-1.0.3.tgz#b31ddfe9b0e6e9914536a6ab286426d0214f77fd"
-  integrity sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==
+has-symbols@^1.0.3, has-symbols@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.1.0.tgz#fc9c6a783a084951d0b971fe1018de813707a338"
+  integrity sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==

-has-symbols@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.3.tgz#bb7b2c4349251dce87b125f7bdf874aa7c8b39f8"
-  integrity sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==
+has-tostringtag@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/has-tostringtag/-/has-tostringtag-1.0.2.tgz#2cdc42d40bef2e5b4eeab7c01a73c54ce7ab5abc"
+  integrity sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==
+  dependencies:
+    has-symbols "^1.0.3"

 has-unicode@^2.0.1:
  version "2.0.1"
  resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
  integrity sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==

-hasown@^2.0.0:
+hasown@^2.0.2:
  version "2.0.2"
  resolved "https://registry.yarnpkg.com/hasown/-/hasown-2.0.2.tgz#003eaf91be7adc372e84ec59dc37252cedb80003"
  integrity sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==
@@ -1312,9 +1371,9 @@ hosted-git-info@^4.1.0:
    lru-cache "^6.0.0"

 http-cache-semantics@^4.0.0, http-cache-semantics@^4.1.0:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz#abe02fcb2985460bf0323be664436ec3476a6d5a"
-  integrity sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.2.0.tgz#205f4db64f8562b76a4ff9235aa5279839a09dd5"
+  integrity sha512-dTxcvPXqPvXBQpq5dUr6mEMJX4oIEFv6bwom3FDwKRDsuIjjJGANqhBuoAn9c1RQJIdAKav33ED65E2ys+87QQ==

 http-proxy-agent@^5.0.0:
  version "5.0.0"
@@ -1412,13 +1471,10 @@ inherits@2, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.1,
  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
  integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==

-ip-address@^9.0.5:
-  version "9.0.5"
-  resolved "https://registry.yarnpkg.com/ip-address/-/ip-address-9.0.5.tgz#117a960819b08780c3bd1f14ef3c1cc1d3f3ea5a"
-  integrity sha512-zHtQzGojZXTwZTHQqra+ETKd4Sn3vgi7uBmlPoXVWZqYvuKmtI0l/VZTjqGmJY9x88GGOaZ9+G9ES8hC4T4X8g==
-  dependencies:
-    jsbn "1.1.0"
-    sprintf-js "^1.1.3"
+ip-address@^10.0.1:
+  version "10.1.0"
+  resolved "https://registry.yarnpkg.com/ip-address/-/ip-address-10.1.0.tgz#d8dcffb34d0e02eb241427444a6e23f5b0595aa4"
+  integrity sha512-XXADHxXmvT9+CRxhXg56LJovE+bmWnEWB78LB83VZTprKTmaC5QfruXocxzTZ2Kl0DNwKuBdlIhjL8LeY8Sf8Q==

 is-ci@^2.0.0:
  version "2.0.0"
@@ -1487,9 +1543,9 @@ isbinaryfile@^4.0.8:
  integrity sha512-iHrqe5shvBUcFbmZq9zOQHBoeOhZJu6RQGrDpBgenUm/Am+F3JM2MgQj+rK3Z601fzrL5gLZWtAPH2OBaSVcyw==

 isbinaryfile@^5.0.0:
-  version "5.0.4"
-  resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-5.0.4.tgz#2a2edefa76cafa66613fe4c1ea52f7f031017bdf"
-  integrity sha512-YKBKVkKhty7s8rxddb40oOkuP0NbaeXrQvLin6QMHL7Ypiy2RW9LwOVrVgZRyOrhQlayMd9t+D8yDy8MKFTSDQ==
+  version "5.0.6"
+  resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-5.0.6.tgz#01eac28867aeffaebaee7eaf21d1dd3a67d7c0c7"
+  integrity sha512-I+NmIfBHUl+r2wcDd6JwE9yWje/PIVY/R5/CmV8dXLZd5K+L9X2klAOwfAHNnondLXkbHyTAleQAWonpTJBTtw==

 isexe@^2.0.0:
  version "2.0.0"
@@ -1506,14 +1562,13 @@ jackspeak@^3.1.2:
    "@pkgjs/parseargs" "^0.11.0"

 jake@^10.8.5:
-  version "10.9.1"
-  resolved "https://registry.yarnpkg.com/jake/-/jake-10.9.1.tgz#8dc96b7fcc41cb19aa502af506da4e1d56f5e62b"
-  integrity sha512-61btcOHNnLnsOdtLgA5efqQWjnSi/vow5HbI7HMdKKWqvrKR1bLK3BPlJn9gcSaP2ewuamUSMB5XEy76KUIS2w==
+  version "10.9.4"
+  resolved "https://registry.yarnpkg.com/jake/-/jake-10.9.4.tgz#d626da108c63d5cfb00ab5c25fadc7e0084af8e6"
+  integrity sha512-wpHYzhxiVQL+IV05BLE2Xn34zW1S223hvjtqk0+gsPrwd/8JNLXJgZZM/iPFsYc1xyphF+6M6EvdE5E9MBGkDA==
  dependencies:
-    async "^3.2.3"
-    chalk "^4.0.2"
+    async "^3.2.6"
    filelist "^1.0.4"
-    minimatch "^3.1.2"
+    picocolors "^1.1.1"

 js-yaml@^4.1.0:
  version "4.1.0"
@@ -1522,11 +1577,6 @@ js-yaml@^4.1.0:
  dependencies:
    argparse "^2.0.1"

-jsbn@1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-1.1.0.tgz#b01307cb29b618a1ed26ec79e911f803c4da0040"
-  integrity sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A==
-
 json-buffer@3.0.1:
  version "3.0.1"
  resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.1.tgz#9338802a30d3b6605fbe0613e094008ca8c05a13"
@@ -1555,9 +1605,9 @@ jsonfile@^4.0.0:
    graceful-fs "^4.1.6"

 jsonfile@^6.0.1:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.1.0.tgz#bc55b2634793c679ec6403094eb13698a6ec0aae"
-  integrity sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.2.0.tgz#7c265bd1b65de6977478300087c99f1c84383f62"
+  integrity sha512-FGuPw30AdOIUTRMC2OMRtQV+jkVj2cfPqSeWXv1NEAJ1qZ5zb1X6z1mFhbfOB/iy3ssJCD+3KuZ8r8C3uVFlAg==
  dependencies:
    universalify "^2.0.0"
  optionalDependencies:
@@ -1580,11 +1630,11 @@ jsonwebtoken@^9.0.2:
    semver "^7.5.4"

 jwa@^1.4.1:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/jwa/-/jwa-1.4.1.tgz#743c32985cb9e98655530d53641b66c8645b039a"
-  integrity sha512-qiLX/xhEEFKUAJ6FiBMbes3w9ATzyk5W7Hvzpa/SLYdxNtng+gcurvrI7TbACjIXlsJyr05/S1oUhZrc63evQA==
+  version "1.4.2"
+  resolved "https://registry.yarnpkg.com/jwa/-/jwa-1.4.2.tgz#16011ac6db48de7b102777e57897901520eec7b9"
+  integrity sha512-eeH5JO+21J78qMvTIDdBXidBd6nG2kZjg5Ohz/1fpa28Z4CcsWUzJ1ZZyFq/3z3N17aZy+ZuBoHljASbL1WfOw==
  dependencies:
-    buffer-equal-constant-time "1.0.1"
+    buffer-equal-constant-time "^1.0.1"
    ecdsa-sig-formatter "1.0.11"
    safe-buffer "^5.0.1"

@@ -1729,12 +1779,17 @@ matcher@^3.0.0:
  dependencies:
    escape-string-regexp "^4.0.0"

+math-intrinsics@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/math-intrinsics/-/math-intrinsics-1.1.0.tgz#a0dd74be81e2aa5c2f27e65ce283605ee4e2b7f9"
+  integrity sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==
+
 micromatch@^4.0.2:
-  version "4.0.5"
-  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz#bc8999a7cbbf77cdc89f132f6e467051b49090c6"
-  integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==
+  version "4.0.8"
+  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.8.tgz#d66fa18f3a47076789320b9b1af32bd86d9fa202"
+  integrity sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==
  dependencies:
-    braces "^3.0.2"
+    braces "^3.0.3"
    picomatch "^2.3.1"

 mime-db@1.52.0:
@@ -1770,13 +1825,13 @@ mimic-response@^3.1.0:
  integrity sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==

 minimatch@^10.0.0:
-  version "10.0.1"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-10.0.1.tgz#ce0521856b453c86e25f2c4c0d03e6ff7ddc440b"
-  integrity sha512-ethXTt3SGGR+95gudmqJ1eNhRO7eGEGIgYA9vnPatK4/etz2MEVDno5GMCibdMTuBMyElzIlgxMna3K94XDIDQ==
+  version "10.1.1"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-10.1.1.tgz#e6e61b9b0c1dcab116b5a7d1458e8b6ae9e73a55"
+  integrity sha512-enIvLvRAFZYXJzkCYG5RKmPfrFArdLv+R+lbQ53BmIMLIry74bjKzX6iHAm8WYamJkhSSEabrWN5D97XnKObjQ==
  dependencies:
-    brace-expansion "^2.0.1"
+    "@isaacs/brace-expansion" "^5.0.0"

-minimatch@^3.0.3, minimatch@^3.0.4, minimatch@^3.0.5, minimatch@^3.1.1, minimatch@^3.1.2:
+minimatch@^3.0.3, minimatch@^3.0.4, minimatch@^3.0.5, minimatch@^3.1.1:
  version "3.1.2"
  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
  integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
@@ -1871,11 +1926,6 @@ mkdirp@^1.0.3, mkdirp@^1.0.4:
  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
  integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==

-ms@2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
-  integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
-
 ms@^2.0.0, ms@^2.1.1, ms@^2.1.3:
  version "2.1.3"
  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
@@ -1892,9 +1942,9 @@ nice-try@^1.0.4:
  integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==

 node-abi@^3.45.0:
-  version "3.71.0"
-  resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.71.0.tgz#52d84bbcd8575efb71468fbaa1f9a49b2c242038"
-  integrity sha512-SZ40vRiy/+wRTf21hxkkEjPJZpARzUMVcJoQse2EF8qkUWbbO2z7vd5oA/H6bVH6SZQ5STGcu0KRDS7biNRfxw==
+  version "3.80.0"
+  resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.80.0.tgz#d7390951f27caa129cceeec01e1c20fc9f07581c"
+  integrity sha512-LyPuZJcI9HVwzXK1GPxWNzrr+vr8Hp/3UqlmWxxh8p54U1ZbclOqbSog9lWHaCX+dBaiGi6n/hIX+mKu74GmPA==
  dependencies:
    semver "^7.3.5"

@@ -1904,9 +1954,9 @@ node-addon-api@^1.6.3:
  integrity sha512-ibPK3iA+vaY1eEjESkQkM0BbCqFOaZMiXRTtdB0u7b4djtY6JnsjvPdUHVMg6xQt3B8fpTTWHI9A+ADjM9frzg==

 node-api-version@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/node-api-version/-/node-api-version-0.2.0.tgz#5177441da2b1046a4d4547ab9e0972eed7b1ac1d"
-  integrity sha512-fthTTsi8CxaBXMaBAD7ST2uylwvsnYxh2PfaScwpMhos6KlSFajXQPcM4ogNE1q2s3Lbz9GCGqeIHC+C6OZnKg==
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/node-api-version/-/node-api-version-0.2.1.tgz#19bad54f6d65628cbee4e607a325e4488ace2de9"
+  integrity sha512-2xP/IGGMmmSQpI1+O/k72jF/ykvZ89JeuKX3TLJAYPDVLUalrshrLHkeVcCCZqG/eEa635cr8IBYzgnDvM2O8Q==
  dependencies:
    semver "^7.3.5"

@@ -2081,6 +2131,11 @@ pend@~1.2.0:
  resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50"
  integrity sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==

+picocolors@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.1.1.tgz#3d321af3eab939b083c8f929a1d12cda81c26b6b"
+  integrity sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==
+
 picomatch@^2.3.1:
  version "2.3.1"
  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42"
@@ -2119,9 +2174,9 @@ promise-retry@^2.0.1:
    retry "^0.12.0"

 pump@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64"
-  integrity sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.3.tgz#151d979f1a29668dc0025ec589a455b53282268d"
+  integrity sha512-todwxLMY7/heScKmntwQG8CXVkWUOdYxIvY2s0VWAAMh/nd8SoYiRaKjlr7+iCs984f2P8zvrfWcDDYVb73NfA==
  dependencies:
    end-of-stream "^1.1.0"
    once "^1.3.1"
@@ -2261,9 +2316,9 @@ sanitize-filename@^1.6.3:
    truncate-utf8-bytes "^1.0.0"

 sax@^1.2.4:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/sax/-/sax-1.3.0.tgz#a5dbe77db3be05c9d1ee7785dbd3ea9de51593d0"
-  integrity sha512-0s+oAmw9zLl1V1cS9BtZN7JAd0cW5e0QH4W3LWEK6a4LaLEA2OTpGYWDY+6XasBLtz6wkm3u1xRw95mRuJ59WA==
+  version "1.4.3"
+  resolved "https://registry.yarnpkg.com/sax/-/sax-1.4.3.tgz#fcebae3b756cdc8428321805f4b70f16ec0ab5db"
+  integrity sha512-yqYn1JhPczigF94DMS+shiDMjDowYO6y9+wB/4WgO0Y19jWYk0lQ4tuG5KI7kj4FTp1wxPj5IFfcrz/s1c3jjQ==

 semver-compare@^1.0.0:
  version "1.0.0"
@@ -2280,15 +2335,10 @@ semver@^6.2.0:
  resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
  integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==

-semver@^7.3.2:
-  version "7.6.1"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.1.tgz#60bfe090bf907a25aa8119a72b9f90ef7ca281b2"
-  integrity sha512-f/vbBsu+fOiYt+lmwZV0rVwJScl46HppnOA1ZvIuBWKOTlllpyJ3bfVax76/OrhCH38dyxoDIA8K7uB963IYgA==
-
-semver@^7.3.5, semver@^7.3.8, semver@^7.5.3, semver@^7.5.4, semver@^7.6.3:
-  version "7.6.3"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.3.tgz#980f7b5550bc175fb4dc09403085627f9eb33143"
-  integrity sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==
+semver@^7.3.2, semver@^7.3.5, semver@^7.3.8, semver@^7.5.3, semver@^7.5.4, semver@^7.6.3:
+  version "7.7.3"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.7.3.tgz#4b5f4143d007633a8dc671cd0a6ef9147b8bb946"
+  integrity sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==

 serialize-error@^7.0.1:
  version "7.0.1"
@@ -2372,11 +2422,11 @@ socks-proxy-agent@^7.0.0:
    socks "^2.6.2"

 socks@^2.6.2:
-  version "2.8.3"
-  resolved "https://registry.yarnpkg.com/socks/-/socks-2.8.3.tgz#1ebd0f09c52ba95a09750afe3f3f9f724a800cb5"
-  integrity sha512-l5x7VUUWbjVFbafGLxPWkYsHIhEvmF85tbIeFZWc8ZPtoMyybuEhL7Jye/ooC4/d48FgOjSJXgsF/AJPYCW8Zw==
+  version "2.8.7"
+  resolved "https://registry.yarnpkg.com/socks/-/socks-2.8.7.tgz#e2fb1d9a603add75050a2067db8c381a0b5669ea"
+  integrity sha512-HLpt+uLy/pxB+bum/9DzAgiKS8CX1EvbWxI4zlmgGCExImLdiad2iCwXT5Z4c9c3Eq8rP2318mPW2c+QbtjK8A==
  dependencies:
-    ip-address "^9.0.5"
+    ip-address "^10.0.1"
    smart-buffer "^4.2.0"

 source-map-support@^0.5.19:
@@ -2392,7 +2442,7 @@ source-map@^0.6.0:
  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
  integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==

-sprintf-js@^1.1.2, sprintf-js@^1.1.3:
+sprintf-js@^1.1.2:
  version "1.1.3"
  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.3.tgz#4914b903a2f8b685d17fdf78a70e917e872e444a"
  integrity sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==
@@ -2454,9 +2504,9 @@ string_decoder@~1.1.1:
    ansi-regex "^5.0.1"

 strip-ansi@^7.0.1:
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.1.0.tgz#d5b6568ca689d8561370b0707685d22434faff45"
-  integrity sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==
+  version "7.1.2"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.1.2.tgz#132875abde678c7ea8d691533f2e7e22bb744dba"
+  integrity sha512-gmBGslpoQJtgnMAvOVqGZpEz9dyoKTCzy2nfz/n8aIFhN/jCE/rCmcxabB6jOOHV+0WNnylOxaxBQPSvcWklhA==
  dependencies:
    ansi-regex "^6.0.1"

@@ -2522,9 +2572,9 @@ tmp@^0.0.33:
    os-tmpdir "~1.0.2"

 tmp@^0.2.0:
-  version "0.2.3"
-  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.2.3.tgz#eb783cc22bc1e8bebd0671476d46ea4eb32a79ae"
-  integrity sha512-nZD7m9iCPC5g0pYmcaxogYKggSfLsdxl8of3Q/oIbqCqLLIO9IAF0GWjX1z9NZRHPiXv8Wex4yDCaZsgEw0Y8w==
+  version "0.2.5"
+  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.2.5.tgz#b06bcd23f0f3c8357b426891726d16015abfd8f8"
+  integrity sha512-voyz6MApa1rQGUxT3E+BK7/ROe8itEx7vD8/HEvt4xwXucvQ5G5oeEiHkmHZJuBO21RpOf+YYm9MOivj709jow==

 to-regex-range@^5.0.1:
  version "5.0.1"
@@ -2546,14 +2596,19 @@ type-fest@^0.13.1:
  integrity sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg==

 typescript@^5.4.3:
-  version "5.7.2"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.7.2.tgz#3169cf8c4c8a828cde53ba9ecb3d2b1d5dd67be6"
-  integrity sha512-i5t66RHxDvVN40HfDd1PsEThGNnlMCMT3jMUuoh9/0TaqWevNontacunWyN02LA9/fIbEWlcHZcgTKb9QoaLfg==
+  version "5.9.3"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.9.3.tgz#5b4f59e15310ab17a216f5d6cf53ee476ede670f"
+  integrity sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==

-undici-types@~5.26.4:
-  version "5.26.5"
-  resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.26.5.tgz#bcd539893d00b56e964fd2657a4866b221a65617"
-  integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==
+undici-types@~6.21.0:
+  version "6.21.0"
+  resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-6.21.0.tgz#691d00af3909be93a7faa13be61b3a5b50ef12cb"
+  integrity sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==
+
+undici-types@~7.16.0:
+  version "7.16.0"
+  resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-7.16.0.tgz#ffccdff36aea4884cbfce9a750a0580224f58a46"
+  integrity sha512-Zz+aZWSj8LE6zoxD+xrjh4VfkIG8Ya6LvYkZqtUQGJPZjYl53ypCaUwWqo7eI0x66KBGeRo+mlBEkMSeSZ38Nw==

 unique-filename@^2.0.0:
  version "2.0.1"
@@ -2592,9 +2647,9 @@ uri-js@^4.2.2:
    punycode "^2.1.0"

 utf8-byte-length@^1.0.1:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/utf8-byte-length/-/utf8-byte-length-1.0.4.tgz#f45f150c4c66eee968186505ab93fcbb8ad6bf61"
-  integrity sha512-4+wkEYLBbWxqTahEsWrhxepcoVOJ+1z5PGIjPZxRkytcdSUaNjIjBM7Xn8E+pdSuV7SzvWovBFA54FO0JSoqhA==
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/utf8-byte-length/-/utf8-byte-length-1.0.5.tgz#f9f63910d15536ee2b2d5dd4665389715eac5c1e"
+  integrity sha512-Xn0w3MtiQ6zoz2vFyUVruaCL53O/DwUvkEeOvj+uulMm0BkUGYWmBYVyElqZaSLhY6ZD0ulfU3aBra2aVT4xfA==

 util-deprecate@^1.0.1, util-deprecate@~1.0.1:
  version "1.0.2"
@@ -6,7 +6,7 @@ const { getFiles } = require('./helpers');

 const readFilePromise = promisify(fs.readFile);

-const translationRegex = /_t\(\s*['"]([^'"]+)['"]\s*,\s*\{\s*defaultMessage\s*:\s*['"]([^'"]+)['"]\s*\}/g;
+const translationRegex = /_t\(\s*['"]([^'"]+)['"]\s*,\s*\{\s*defaultMessage\s*:\s*(?:'([^'\\]*(?:\\.[^'\\]*)*)'|"([^"\\]*(?:\\.[^"\\]*)*)"|\`([^`\\]*(?:\\.[^`\\]*)*(?:\{[^}]*\}[^`\\]*(?:\\.[^`\\]*)*)*)\`)(?:\s*,\s*[^}]*)*\s*\}/g;

 /**
 * @param {string} file
@@ -20,7 +20,8 @@ async function extractTranslationsFromFile(file) {
  let match;

  while ((match = translationRegex.exec(content)) !== null) {
-    const [_, key, defaultText] = match;
+    const [_, key, singleQuotedText, doubleQuotedText, templateLiteral] = match;
+    const defaultText = singleQuotedText || doubleQuotedText || templateLiteral;
    translations[key] = defaultText;
  }

@@ -49,6 +49,32 @@ class StreamHandler {
  }
 }

+class BinaryTestStreamHandler {
+  constructor(resolve, reject, expectedValue) {
+    this.resolve = resolve;
+    this.reject = reject;
+    this.expectedValue = expectedValue;
+    this.rowsReceived = [];
+  }
+  row(row) {
+    try {
+      this.rowsReceived.push(row);
+      if (this.expectedValue) {
+        expect(row).toEqual(this.expectedValue);
+      }
+    } catch (error) {
+      this.reject(error);
+      return;
+    }
+  }
+  recordset(columns) {}
+  done(result) {
+    this.resolve(this.rowsReceived);
+  }
+  info(msg) {}
+}
+
+
 function executeStreamItem(driver, conn, sql) {
  return new Promise(resolve => {
    const handler = new StreamHandler(resolve);
@@ -223,4 +249,51 @@ describe('Query', () => {
      expect(row[keys[0]] == 1).toBeTruthy();
    })
  );
+
+  test.each(engines.filter(x => x.binaryDataType).map(engine => [engine.label, engine]))(
+    'Binary - %s',
+    testWrapper(async (dbhan, driver, engine) => {
+      await runCommandOnDriver(dbhan, driver, dmp =>
+        dmp.createTable({
+          pureName: 't1',
+          columns: [
+            { columnName: 'id', dataType: 'int', notNull: true, autoIncrement: true },
+            { columnName: 'val', dataType: engine.binaryDataType },
+          ],
+          primaryKey: {
+            columns: [{ columnName: 'id' }],
+          },
+        })
+      );
+      const structure = await driver.analyseFull(dbhan);
+      const table = structure.tables.find(x => x.pureName == 't1');
+
+      const dmp = driver.createDumper();
+      dmp.putCmd("INSERT INTO ~t1 (~val) VALUES (%v)", {
+        $binary: { base64: 'iVBORw0KWgo=' },
+      });
+      await driver.query(dbhan, dmp.s, {discardResult: true});
+      
+      const dmp2 = driver.createDumper();
+      dmp2.put('SELECT ~val FROM ~t1');
+      const res = await driver.query(dbhan, dmp2.s);
+      
+      const row = res.rows[0];
+      const keys = Object.keys(row);
+      expect(keys.length).toEqual(1);
+      expect(row[keys[0]]).toEqual({$binary: {base64: 'iVBORw0KWgo='}});
+
+      const res2 = await driver.readQuery(dbhan, dmp2.s);
+      const rows = await Array.fromAsync(res2);
+      const rowsVal = rows.filter(r => r.val != null);
+
+      expect(rowsVal.length).toEqual(1);
+      expect(rowsVal[0].val).toEqual({$binary: {base64: 'iVBORw0KWgo='}});
+
+      const res3 = await new Promise((resolve, reject) => {
+        const handler = new BinaryTestStreamHandler(resolve, reject, {val: {$binary: {base64: 'iVBORw0KWgo='}}});
+        driver.stream(dbhan, dmp2.s, handler);
+      });
+    })
+  );
 });
@@ -44,6 +44,7 @@ const mysqlEngine = {
  supportRenameSqlObject: false,
  dbSnapshotBySeconds: true,
  dumpFile: 'data/chinook-mysql.sql',
+  binaryDataType: 'blob',
  dumpChecks: [
    {
      sql: 'select count(*) as res from genre',
@@ -216,6 +217,7 @@ const postgreSqlEngine = {
  supportSchemas: true,
  supportRenameSqlObject: true,
  defaultSchemaName: 'public',
+  binaryDataType: 'bytea',
  dumpFile: 'data/chinook-postgre.sql',
  dumpChecks: [
    {
@@ -446,6 +448,7 @@ const sqlServerEngine = {
  supportTableComments: true,
  supportColumnComments: true,
  // skipSeparateSchemas: true,
+  binaryDataType: 'varbinary(100)',
  triggers: [
    {
      testName: 'triggers before each row',
@@ -506,6 +509,7 @@ const sqliteEngine = {
      },
    },
  ],
+  binaryDataType: 'blob',
 };

 const libsqlFileEngine = {
@@ -619,6 +623,7 @@ const oracleEngine = {
      },
    },
  ],
+  binaryDataType: 'blob',
 };

 /** @type {import('dbgate-types').TestEngineInfo} */
@@ -752,18 +757,18 @@ const enginesOnCi = [
 const enginesOnLocal = [
  // all engines, which would be run on local test
  // cassandraEngine,
-  // mysqlEngine,
+  //mysqlEngine,
  // mariaDbEngine,
-  // postgreSqlEngine,
-  // sqlServerEngine,
-  // sqliteEngine,
+  //postgreSqlEngine,
+  //sqlServerEngine,
+  sqliteEngine,
  // cockroachDbEngine,
  // clickhouseEngine,
  // libsqlFileEngine,
  // libsqlWsEngine,
-  // oracleEngine,
+  //oracleEngine,
  // duckdbEngine,
-  firebirdEngine,
+  //firebirdEngine,
 ];

 /** @type {import('dbgate-types').TestEngineInfo[] & Record<string, import('dbgate-types').TestEngineInfo>} */
@@ -1,6 +1,6 @@
 {
  "private": true,
-  "version": "6.6.8",
+  "version": "6.6.12-premium-beta.5",
  "name": "dbgate-all",
  "workspaces": [
    "packages/*",
@@ -2,7 +2,7 @@ DEVMODE=1
 SHELL_SCRIPTING=1
 ALLOW_DBGATE_PRIVATE_CLOUD=1
 DEVWEB=1 
-LOCAL_AUTH_PROXY=1
+# LOCAL_AUTH_PROXY=1
 # LOCAL_AI_GATEWAY=true

 # REDIRECT_TO_DBGATE_CLOUD_LOGIN=1
@@ -29,7 +29,17 @@ const generateDeploySql = require('../shell/generateDeploySql');
 const { createTwoFilesPatch } = require('diff');
 const diff2htmlPage = require('../utility/diff2htmlPage');
 const processArgs = require('../utility/processArgs');
-const { testConnectionPermission, hasPermission, loadPermissionsFromRequest, loadTablePermissionsFromRequest, getTablePermissionRole, loadDatabasePermissionsFromRequest, getDatabasePermissionRole, getTablePermissionRoleLevelIndex, testDatabaseRolePermission } = require('../utility/hasPermission');
+const {
+  testConnectionPermission,
+  hasPermission,
+  loadPermissionsFromRequest,
+  loadTablePermissionsFromRequest,
+  getTablePermissionRole,
+  loadDatabasePermissionsFromRequest,
+  getDatabasePermissionRole,
+  getTablePermissionRoleLevelIndex,
+  testDatabaseRolePermission,
+} = require('../utility/hasPermission');
 const { MissingCredentialsError } = require('../utility/exceptions');
 const pipeForkLogs = require('../utility/pipeForkLogs');
 const crypto = require('crypto');
@@ -100,7 +110,7 @@ module.exports = {
    socket.emitChanged(`database-status-changed`, { conid, database });
  },

-  handle_ping() { },
+  handle_ping() {},

  // session event handlers

@@ -256,23 +266,24 @@ module.exports = {
        auditLogger:
          auditLogSessionGroup && select?.from?.name?.pureName
            ? response => {
-              sendToAuditLog(req, {
-                category: 'dbop',
-                component: 'DatabaseConnectionsController',
-                event: 'sql.select',
-                action: 'select',
-                severity: 'info',
-                conid,
-                database,
-                schemaName: select?.from?.name?.schemaName,
-                pureName: select?.from?.name?.pureName,
-                sumint1: response?.rows?.length,
-                sessionParam: `${conid}::${database}::${select?.from?.name?.schemaName || '0'}::${select?.from?.name?.pureName
+                sendToAuditLog(req, {
+                  category: 'dbop',
+                  component: 'DatabaseConnectionsController',
+                  event: 'sql.select',
+                  action: 'select',
+                  severity: 'info',
+                  conid,
+                  database,
+                  schemaName: select?.from?.name?.schemaName,
+                  pureName: select?.from?.name?.pureName,
+                  sumint1: response?.rows?.length,
+                  sessionParam: `${conid}::${database}::${select?.from?.name?.schemaName || '0'}::${
+                    select?.from?.name?.pureName
                  }`,
-                sessionGroup: auditLogSessionGroup,
-                message: `Loaded table data from ${select?.from?.name?.pureName}`,
-              });
-            }
+                  sessionGroup: auditLogSessionGroup,
+                  message: `Loaded table data from ${select?.from?.name?.pureName}`,
+                });
+              }
            : null,
      }
    );
@@ -335,21 +346,21 @@ module.exports = {
        auditLogger:
          auditLogSessionGroup && options?.pureName
            ? response => {
-              sendToAuditLog(req, {
-                category: 'dbop',
-                component: 'DatabaseConnectionsController',
-                event: 'nosql.collectionData',
-                action: 'select',
-                severity: 'info',
-                conid,
-                database,
-                pureName: options?.pureName,
-                sumint1: response?.result?.rows?.length,
-                sessionParam: `${conid}::${database}::${options?.pureName}`,
-                sessionGroup: auditLogSessionGroup,
-                message: `Loaded collection data ${options?.pureName}`,
-              });
-            }
+                sendToAuditLog(req, {
+                  category: 'dbop',
+                  component: 'DatabaseConnectionsController',
+                  event: 'nosql.collectionData',
+                  action: 'select',
+                  severity: 'info',
+                  conid,
+                  database,
+                  pureName: options?.pureName,
+                  sumint1: response?.result?.rows?.length,
+                  sessionParam: `${conid}::${database}::${options?.pureName}`,
+                  sessionGroup: auditLogSessionGroup,
+                  message: `Loaded collection data ${options?.pureName}`,
+                });
+              }
            : null,
      }
    );
@@ -455,10 +466,18 @@ module.exports = {
      [changeSet.inserts, 'create_update_delete'],
      [changeSet.deletes, 'create_update_delete'],
      [changeSet.updates, 'update_only'],
-    ]
+    ];
    for (const [operations, requiredRole] of fieldsAndRoles) {
      for (const operation of operations) {
-        const role = getTablePermissionRole(conid, database, 'tables', operation.schemaName, operation.pureName, tablePermissions, databasePermissions);
+        const role = getTablePermissionRole(
+          conid,
+          database,
+          'tables',
+          operation.schemaName,
+          operation.pureName,
+          tablePermissions,
+          databasePermissions
+        );
        if (getTablePermissionRoleLevelIndex(role) < getTablePermissionRoleLevelIndex(requiredRole)) {
          throw new Error('DBGM-00262 Permission not granted');
        }
@@ -628,7 +647,15 @@ module.exports = {
      function applyTablePermissionRole(list, objectTypeField) {
        const res = [];
        for (const item of list ?? []) {
-          const tablePermissionRole = getTablePermissionRole(conid, database, objectTypeField, item.schemaName, item.pureName, tablePermissions, databasePermissionRole);
+          const tablePermissionRole = getTablePermissionRole(
+            conid,
+            database,
+            objectTypeField,
+            item.schemaName,
+            item.pureName,
+            tablePermissions,
+            databasePermissionRole
+          );
          if (tablePermissionRole != 'deny') {
            res.push({
              ...item,
@@ -647,7 +674,7 @@ module.exports = {
        functions: applyTablePermissionRole(opened.structure.functions, 'functions'),
        triggers: applyTablePermissionRole(opened.structure.triggers, 'triggers'),
        collections: applyTablePermissionRole(opened.structure.collections, 'collections'),
-      }
+      };
      return res;
    }

@@ -881,17 +908,17 @@ module.exports = {
    return {
      ...(command == 'backup'
        ? driver.backupDatabaseCommand(
-          connection,
-          { outputFile, database, options, selectedTables, skippedTables, argsFormat },
-          // @ts-ignore
-          externalTools
-        )
+            connection,
+            { outputFile, database, options, selectedTables, skippedTables, argsFormat },
+            // @ts-ignore
+            externalTools
+          )
        : driver.restoreDatabaseCommand(
-          connection,
-          { inputFile, database, options, argsFormat },
-          // @ts-ignore
-          externalTools
-        )),
+            connection,
+            { inputFile, database, options, argsFormat },
+            // @ts-ignore
+            externalTools
+          )),
      transformMessage: driver.transformNativeCommandMessage
        ? message => driver.transformNativeCommandMessage(message, command)
        : null,
@@ -990,7 +1017,10 @@ module.exports = {
  async executeSessionQuery({ sesid, conid, database, sql }, req) {
    await testConnectionPermission(conid, req);
    logger.info({ sesid, sql }, 'DBGM-00010 Processing query');
-    sessions.dispatchMessage(sesid, 'Query execution started');
+    sessions.dispatchMessage(sesid, {
+      message: 'Query execution started',
+      sql,
+    });

    const opened = await this.ensureOpened(conid, database);
    opened.subprocess.send({ msgtype: 'executeSessionQuery', sql, sesid });
@@ -83,6 +83,16 @@ module.exports = {
    socket.emit(`session-recordset-${sesid}`, { jslid, resultIndex });
  },

+  handle_endrecordset(sesid, props) {
+    const { jslid, rowCount, durationMs } = props;
+    this.dispatchMessage(sesid, {
+      message: `Query returned ${rowCount} rows in ${durationMs} ms`,
+      rowCount,
+      durationMs,
+      jslid,
+    });
+  },
+
  handle_stats(sesid, stats) {
    jsldata.notifyChangedStats(stats);
  },
@@ -97,6 +107,12 @@ module.exports = {
    socket.emit(`session-initialize-file-${jslid}`);
  },

+  handle_changedCurrentDatabase(sesid, props) {
+    const { database } = props;
+    this.dispatchMessage(sesid, `Current database changed to ${database}`);
+    socket.emit(`session-changedb-${sesid}`, { database });
+  },
+
  handle_ping() {},

  create_meta: true,
@@ -182,7 +198,10 @@ module.exports = {
    });

    logger.info({ sesid, sql }, 'DBGM-00019 Processing query');
-    this.dispatchMessage(sesid, 'Query execution started');
+    this.dispatchMessage(sesid, {
+      message: 'Query execution started',
+      sql,
+    });
    session.subprocess.send({
      msgtype: 'executeQuery',
      sql,
@@ -283,6 +283,7 @@ async function updatePremiumPromoWidget() {
    `${DBGATE_CLOUD_URL}/premium-promo-widget?identifier=${promoWidgetData?.identifier ?? 'empty'}&tags=${tags}`,
    {
      headers: {
+        ...getLicenseHttpHeaders(),
        ...(await getCloudInstanceHeaders()),
        'x-app-version': currentVersion.version,
      },
@@ -308,7 +309,8 @@ async function refreshPublicFiles(isRefresh) {
  } catch (err) {
    logger.error(extractErrorLogData(err), 'DBGM-00166 Error updating cloud files');
  }
-  if (!isProApp()) {
+  const configSettings = await config.get();
+  if (!isProApp() || configSettings?.trialDaysLeft != null) {
    await updatePremiumPromoWidget();
  }
 }
@@ -14,9 +14,10 @@ class QueryStreamTableWriter {
    this.currentChangeIndex = 1;
    this.initializedFile = false;
    this.sesid = sesid;
+    this.started = new Date().getTime();
  }

-  initializeFromQuery(structure, resultIndex, chartDefinition, autoDetectCharts = false) {
+  initializeFromQuery(structure, resultIndex, chartDefinition, autoDetectCharts = false, options = {}) {
    this.jslid = crypto.randomUUID();
    this.currentFile = path.join(jsldir(), `${this.jslid}.jsonl`);
    fs.writeFileSync(
@@ -24,6 +25,7 @@ class QueryStreamTableWriter {
      JSON.stringify({
        ...structure,
        __isStreamHeader: true,
+        ...options
      }) + '\n'
    );
    this.currentStream = fs.createWriteStream(this.currentFile, { flags: 'a' });
@@ -118,6 +120,13 @@ class QueryStreamTableWriter {
              this.chartProcessor = null;
            }
          }
+          process.send({
+            msgtype: 'endrecordset',
+            jslid: this.jslid,
+            rowCount: this.currentRowCount,
+            sesid: this.sesid,
+            durationMs: new Date().getTime() - this.started,
+          });
          resolve();
        });
      } else {
@@ -148,6 +157,7 @@ class StreamHandler {
    // this.error = this.error.bind(this);
    this.done = this.done.bind(this);
    this.info = this.info.bind(this);
+    this.changedCurrentDatabase = this.changedCurrentDatabase.bind(this);

    // use this for cancelling - not implemented
    // this.stream = null;
@@ -166,7 +176,11 @@ class StreamHandler {
    }
  }

-  recordset(columns) {
+  changedCurrentDatabase(database) {
+    process.send({ msgtype: 'changedCurrentDatabase', database, sesid: this.sesid });
+  }
+
+  recordset(columns, options) {
    if (this.rowsLimitOverflow) {
      return;
    }
@@ -176,7 +190,8 @@ class StreamHandler {
      Array.isArray(columns) ? { columns } : columns,
      this.queryStreamInfoHolder.resultIndex,
      this.frontMatter?.[`chart-${this.queryStreamInfoHolder.resultIndex + 1}`],
-      this.autoDetectCharts
+      this.autoDetectCharts,
+      options
    );
    this.queryStreamInfoHolder.resultIndex += 1;
    this.rowCounter = 0;
@@ -103,11 +103,11 @@ export class TableGridDisplay extends GridDisplay {
          isChecked: this.isColumnChecked(col),
          hintColumnNames:
            this.getFkDictionaryDescription(col.isForeignKeyUnique ? col.foreignKey : null)?.columns?.map(columnName =>
-              shortenIdentifier(`hint_${col.uniqueName}_${columnName}`, this.driver.dialect.maxIdentifierLength)
+              shortenIdentifier(`hint_${col.uniqueName}_${columnName}`, this.driver?.dialect?.maxIdentifierLength)
            ) || null,
          hintColumnDelimiter: this.getFkDictionaryDescription(col.isForeignKeyUnique ? col.foreignKey : null)
            ?.delimiter,
-          uniqueNameShorten: shortenIdentifier(col.uniqueName, this.driver.dialect.maxIdentifierLength),
+          uniqueNameShorten: shortenIdentifier(col.uniqueName, this.driver?.dialect?.maxIdentifierLength),
          isExpandable: !!col.foreignKey,
        })) || []
    );
@@ -118,7 +118,7 @@ export class TableGridDisplay extends GridDisplay {
      if (this.isExpandedColumn(column.uniqueName)) {
        const table = this.getFkTarget(column);
        if (table) {
-          const childAlias = shortenIdentifier(`${column.uniqueName}_ref`, this.driver.dialect.maxIdentifierLength);
+          const childAlias = shortenIdentifier(`${column.uniqueName}_ref`, this.driver?.dialect?.maxIdentifierLength);
          const subcolumns = this.getDisplayColumns(table, column.uniquePath);

          this.addReferenceToSelect(select, parentAlias, column);
@@ -131,7 +131,7 @@ export class TableGridDisplay extends GridDisplay {
  }

  addReferenceToSelect(select: Select, parentAlias: string, column: DisplayColumn) {
-    const childAlias = shortenIdentifier(`${column.uniqueName}_ref`, this.driver.dialect.maxIdentifierLength);
+    const childAlias = shortenIdentifier(`${column.uniqueName}_ref`, this.driver?.dialect?.maxIdentifierLength);
    if ((select.from.relations || []).find(x => x.alias == childAlias)) return;
    const table = this.getFkTarget(column);
    if (table && table.primaryKey) {
@@ -196,11 +196,11 @@ export class TableGridDisplay extends GridDisplay {
            this.addReferenceToSelect(
              select,
              parentUniqueName
-                ? shortenIdentifier(`${parentUniqueName}_ref`, this.driver.dialect.maxIdentifierLength)
+                ? shortenIdentifier(`${parentUniqueName}_ref`, this.driver?.dialect?.maxIdentifierLength)
                : 'basetbl',
              column
            );
-            const childAlias = shortenIdentifier(`${column.uniqueName}_ref`, this.driver.dialect.maxIdentifierLength);
+            const childAlias = shortenIdentifier(`${column.uniqueName}_ref`, this.driver?.dialect?.maxIdentifierLength);
            select.columns.push(
              ...hintDescription.columns.map(
                columnName =>
@@ -209,7 +209,7 @@ export class TableGridDisplay extends GridDisplay {
                    columnName,
                    alias: shortenIdentifier(
                      `hint_${column.uniqueName}_${columnName}`,
-                      this.driver.dialect.maxIdentifierLength
+                      this.driver?.dialect?.maxIdentifierLength
                    ),
                    source: { alias: childAlias },
                  } as ColumnRefExpression)
@@ -1,4 +1,4 @@
-import { arrayToHexString, evalFilterBehaviour, isTypeDateTime } from 'dbgate-tools';
+import { arrayToHexString, base64ToHex, evalFilterBehaviour, isTypeDateTime } from 'dbgate-tools';
 import { format, toDate } from 'date-fns';
 import _isString from 'lodash/isString';
 import _cloneDeepWith from 'lodash/cloneDeepWith';
@@ -24,7 +24,9 @@ export function getFilterValueExpression(value, dataType?) {
  if (value.type == 'Buffer' && Array.isArray(value.data)) {
    return '0x' + arrayToHexString(value.data);
  }
-
+  if (value?.$binary?.base64) {
+    return base64ToHex(value.$binary.base64);
+  }
  return `="${value}"`;
 }

@@ -2,7 +2,7 @@ import P from 'parsimmon';
 import moment from 'moment';
 import { Condition } from 'dbgate-sqltree';
 import { interpretEscapes, token, word, whitespace } from './common';
-import { hexStringToArray, parseNumberSafe } from 'dbgate-tools';
+import { hexToBase64, parseNumberSafe } from 'dbgate-tools';
 import { FilterBehaviour, TransformType } from 'dbgate-types';

 const binaryCondition =
@@ -385,10 +385,7 @@ const createParser = (filterBehaviour: FilterBehaviour) => {

    hexstring: () =>
      token(P.regexp(/0x(([0-9a-fA-F][0-9a-fA-F])+)/, 1))
-        .map(x => ({
-          type: 'Buffer',
-          data: hexStringToArray(x),
-        }))
+        .map(x => ({ $binary: { base64: hexToBase64(x) } }))
        .desc('hex string'),

    noQuotedString: () => P.regexp(/[^\s^,^'^"]+/).desc('string unquoted'),
@@ -78,6 +78,14 @@ export class SqlDumper implements AlterProcessor {
    else if (_isNumber(value)) this.putRaw(value.toString());
    else if (_isDate(value)) this.putStringValue(new Date(value).toISOString());
    else if (value?.type == 'Buffer' && _isArray(value?.data)) this.putByteArrayValue(value?.data);
+    else if (value?.$binary?.base64) {
+      const binary = atob(value.$binary.base64);
+      const bytes = new Array(binary.length);
+      for (let i = 0; i < binary.length; i++) {
+        bytes[i] = binary.charCodeAt(i);
+      }
+      this.putByteArrayValue(bytes);
+    }
    else if (value?.$bigint) this.putRaw(value?.$bigint);
    else if (_isPlainObject(value) || _isArray(value)) this.putStringValue(JSON.stringify(value));
    else this.put('^null');
@@ -47,6 +47,7 @@ export const mongoFilterBehaviour: FilterBehaviour = {
  allowStringToken: true,
  allowNumberDualTesting: true,
  allowObjectIdTesting: true,
+  allowHexString: true,
 };

 export const evalFilterBehaviour: FilterBehaviour = {
@@ -1,4 +1,5 @@
 import _cloneDeep from 'lodash/cloneDeep';
+import _uniq from 'lodash/uniq';
 import _isString from 'lodash/isString';
 import type {
  ColumnInfo,
@@ -75,9 +76,27 @@ export function findForeignKeyForColumn(table: TableInfo, column: ColumnInfo | s
  return (table.foreignKeys || []).find(fk => fk.columns.find(col => col.columnName == column.columnName));
 }

+export function getConflictingColumnNames(columns: ColumnInfo[]): Set<string> {
+  const conflictingNames = new Set(
+    _uniq(columns.map(x => x.columnName).filter((item, index, arr) => arr.indexOf(item) !== index))
+  );
+  return conflictingNames;
+}
+
 export function makeUniqueColumnNames(res: ColumnInfo[]) {
  const usedNames = new Set();
+  const conflictingNames = getConflictingColumnNames(res);
  for (let i = 0; i < res.length; i++) {
+    if (
+      conflictingNames.has(res[i].columnName) &&
+      res[i].pureName &&
+      !usedNames.has(`${res[i].pureName}_${res[i].columnName}`)
+    ) {
+      res[i].columnName = `${res[i].pureName}_${res[i].columnName}`;
+      usedNames.add(res[i].columnName);
+      continue;
+    }
+
    if (usedNames.has(res[i].columnName)) {
      let suffix = 2;
      while (usedNames.has(`${res[i].columnName}${suffix}`)) suffix++;
@@ -43,6 +43,19 @@ export function hexStringToArray(inputString) {
  return res;
 }

+export function base64ToHex(base64String) {
+  const binaryString = atob(base64String);
+  const hexString = Array.from(binaryString, c =>
+    c.charCodeAt(0).toString(16).padStart(2, '0')
+  ).join('');
+  return '0x' + hexString.toUpperCase();
+};
+
+export function hexToBase64(hexString) {
+  const binaryString = hexString.match(/.{1,2}/g).map(byte => String.fromCharCode(parseInt(byte, 16))).join('');
+  return btoa(binaryString);
+}
+
 export function parseCellValue(value, editorTypes?: DataEditorTypesBehaviour) {
  if (!_isString(value)) return value;

@@ -54,9 +67,10 @@ export function parseCellValue(value, editorTypes?: DataEditorTypesBehaviour) {
    const mHex = value.match(/^0x([0-9a-fA-F][0-9a-fA-F])+$/);
    if (mHex) {
      return {
-        type: 'Buffer',
-        data: hexStringToArray(value.substring(2)),
-      };
+        $binary: {
+          base64: hexToBase64(value.substring(2))
+        }
+      }
    }
  }

@@ -230,11 +244,19 @@ export function stringifyCellValue(
  if (value === true) return { value: 'true', gridStyle: 'valueCellStyle' };
  if (value === false) return { value: 'false', gridStyle: 'valueCellStyle' };

-  if (editorTypes?.parseHexAsBuffer) {
-    if (value?.type == 'Buffer' && _isArray(value.data)) {
-      return { value: '0x' + arrayToHexString(value.data), gridStyle: 'valueCellStyle' };
-    }
+  if (value?.$binary?.base64) {
+    return {
+      value: base64ToHex(value.$binary.base64),
+      gridStyle: 'valueCellStyle',
+    };
  }
+
+  if (editorTypes?.parseHexAsBuffer) {
+    // if (value?.type == 'Buffer' && _isArray(value.data)) {
+    //   return { value: '0x' + arrayToHexString(value.data), gridStyle: 'valueCellStyle' };
+    // }
+  }
+  
  if (editorTypes?.parseObjectIdAsDollar) {
    if (value?.$oid) {
      switch (intent) {
@@ -482,6 +504,9 @@ export function getAsImageSrc(obj) {
  if (obj?.type == 'Buffer' && _isArray(obj?.data)) {
    return `data:image/png;base64, ${arrayBufferToBase64(obj?.data)}`;
  }
+  if (obj?.$binary?.base64) {
+    return `data:image/png;base64, ${obj.$binary.base64}`;
+  }

  if (_isString(obj) && (obj.startsWith('http://') || obj.startsWith('https://'))) {
    return obj;
@@ -21,6 +21,7 @@ export interface StreamOptions {
  error?: (error) => void;
  done?: (result) => void;
  info?: (info) => void;
+  changedCurrentDatabase?: (database: string) => void;
 }

 export type CollectionOperationInfo =
@@ -96,4 +96,6 @@ export type TestEngineInfo = {
  }>;

  objects?: Array<TestObjectInfo>;
+
+  binaryDataType?: string;
 };
@@ -26,12 +26,23 @@

    <script lang="javascript">
      window.dbgate_page = '{{page}}';
-    </script>

+      if (localStorage.getItem('currentThemeType') == 'dark') {
+        document.documentElement.style.setProperty('--theme-background', '#111');
+        document.documentElement.style.setProperty('--theme-foreground', '#e3e3e3');
+      } else {
+        document.documentElement.style.setProperty('--theme-background', '#fff');
+        document.documentElement.style.setProperty('--theme-foreground', '#262626');
+      }
+    </script>

    <script defer src="build/bundle.js"></script>

    <style>
+      body {
+        background-color: var(--theme-background);
+      }
+
      .lds-ellipsis {
        display: inline-block;
        position: relative;
@@ -44,7 +55,7 @@
        width: 13px;
        height: 13px;
        border-radius: 50%;
-        background: #000;
+        background: var(--theme-foreground);
        animation-timing-function: cubic-bezier(0, 1, 1, 0);
      }
      .lds-ellipsis div:nth-child(1) {
@@ -27,7 +27,7 @@
  import SettingsListener from './utility/SettingsListener.svelte';
  import { handleAuthOnStartup } from './clientAuth';
  import { initializeAppUpdates } from './utility/appUpdate';
-  import { _t } from './translations';
+  import { _t, saveSelectedLanguageToCache } from './translations';
  import { installCloudListeners } from './utility/cloudListeners';

  export let isAdminPage = false;
@@ -61,6 +61,7 @@
        initializeAppUpdates();
        installCloudListeners();
        refreshPublicCloudFiles();
+        saveSelectedLanguageToCache();
      }

      loadedApi = loadedApiValue;
@@ -14,6 +14,7 @@
  import ErrorInfo from './elements/ErrorInfo.svelte';
  import { isOneOfPage } from './utility/pageDefs';
  import { openWebLink } from './utility/simpleTools';
+  import FontIcon from './icons/FontIcon.svelte';

  const config = useConfig();
  const values = writable({ amoid: null, databaseServer: null });
@@ -22,17 +23,15 @@
  $: trialDaysLeft = $config?.trialDaysLeft;

  let errorMessage = '';
-  let expiredMessageSet = false;

-  $: if (isExpired && !expiredMessageSet) {
-    errorMessage = 'Your license is expired';
-    expiredMessageSet = true;
-  }
+  let isInsertingLicense = false;
+
+  $: trialButtonAvailable = !isExpired && trialDaysLeft == null;

  // $: console.log('CONFIG', $config);

  $: {
-    if ($config?.isLicenseValid) {
+    if ($config?.isLicenseValid && trialDaysLeft == null) {
      internalRedirectTo(isOneOfPage('admin-license') ? '/admin.html' : '/index.html');
    }
  }
@@ -41,83 +40,124 @@
 <FormProviderCore {values}>
  <SpecialPageLayout>
    {#if getElectron() || ($config?.storageDatabase && hasPermission('admin/license'))}
-      <div class="heading">License</div>
-      <FormTextAreaField label="Enter your license key" name="licenseKey" rows={5} />
+      <div class="heading">Thank you for using DbGate!</div>

-      <div class="submit">
-        <FormSubmit
-          value="Save license"
-          on:click={async e => {
-            sessionStorage.setItem('continueTrialConfirmed', '1');
-            const { licenseKey } = e.detail;
-            const resp = await apiCall('config/save-license-key', { licenseKey, tryToRenew: true });
-            if (resp?.status == 'ok') {
-              internalRedirectTo(isOneOfPage('admin-license') ? '/admin.html' : '/index.html');
-            } else {
-              errorMessage = resp?.errorMessage || 'Error saving license key';
-            }
-          }}
-        />
-      </div>
+      {#if isExpired}
+        <div class="infotext"><FontIcon icon="img warn" /> Your license has expired. Please insert new license.</div>
+      {:else if trialDaysLeft > 0}
+        <div class="infotext">
+          <FontIcon icon="img warn" /> Your trial period will expire in {trialDaysLeft} day{trialDaysLeft != 1
+            ? 's'
+            : ''}.
+        </div>
+      {:else}
+        <div class="infotext">
+          <FontIcon icon="img info" /> Proceed by selecting a licensing option or providing your license key.
+        </div>
+      {/if}

-      {#if !isExpired && trialDaysLeft == null}
+      {#if isInsertingLicense}
+        <FormTextAreaField label="Enter your license key" name="licenseKey" rows={5} />
+
+        <div class="submit">
+          <div class="flex flex1">
+            <div class="col-6 flex">
+              <FormSubmit
+                value="Save license"
+                on:click={async e => {
+                  sessionStorage.setItem('continueTrialConfirmed', '1');
+                  const { licenseKey } = e.detail;
+                  const resp = await apiCall('config/save-license-key', { licenseKey, tryToRenew: true });
+                  if (resp?.status == 'ok') {
+                    internalRedirectTo(isOneOfPage('admin-license') ? '/admin.html' : '/index.html');
+                  } else {
+                    errorMessage = resp?.errorMessage || 'Error saving license key';
+                  }
+                }}
+              />
+            </div>
+            <div class="col-6 flex">
+              <FormStyledButton
+                value="Cancel"
+                on:click={() => {
+                  isInsertingLicense = false;
+                  errorMessage = '';
+                }}
+              />
+            </div>
+          </div>
+        </div>
+      {/if}
+
+      {#if !isInsertingLicense}
        <div class="submit">
          <FormStyledButton
-            value="Start 30-day trial"
-            on:click={async e => {
-              errorMessage = '';
-              const license = await apiCall('config/start-trial');
-              if (license?.status == 'ok') {
+            value="Insert license key"
+            on:click={() => {
+              isInsertingLicense = true;
+            }}
+          />
+        </div>
+
+        {#if trialButtonAvailable}
+          <div class="submit">
+            <FormStyledButton
+              value="Start 30-day trial"
+              on:click={async e => {
+                errorMessage = '';
+                const license = await apiCall('config/start-trial');
+                if (license?.status == 'ok') {
+                  sessionStorage.setItem('continueTrialConfirmed', '1');
+                  internalRedirectTo(isOneOfPage('admin-license') ? '/admin.html' : '/index.html');
+                } else {
+                  errorMessage = license?.errorMessage || 'Error starting trial';
+                }
+              }}
+            />
+          </div>
+        {/if}
+
+        {#if trialDaysLeft > 0}
+          <div class="submit">
+            <FormStyledButton
+              value={`Continue trial (${trialDaysLeft} days left)`}
+              on:click={async e => {
                sessionStorage.setItem('continueTrialConfirmed', '1');
                internalRedirectTo(isOneOfPage('admin-license') ? '/admin.html' : '/index.html');
-              } else {
-                errorMessage = license?.errorMessage || 'Error starting trial';
-              }
-            }}
-          />
-        </div>
-      {/if}
+              }}
+            />
+          </div>
+        {/if}

-      {#if trialDaysLeft > 0}
        <div class="submit">
          <FormStyledButton
-            value={`Continue trial (${trialDaysLeft} days left)`}
+            value="Purchase DbGate Premium"
            on:click={async e => {
-              sessionStorage.setItem('continueTrialConfirmed', '1');
-              internalRedirectTo(isOneOfPage('admin-license') ? '/admin.html' : '/index.html');
+              // openWebLink(
+              //   `https://auth.dbgate.eu/create-checkout-session-simple?source=trial-${isExpired ? 'expired' : (trialDaysLeft ?? 'no')}`
+              // );
+
+              // openWebLink(
+              //   `https://auth-proxy.dbgate.udolni.net/redirect-to-purchase?product=${getElectron() ? 'premium' : 'teram-premium'}&source=trial-${isExpired ? 'expired' : (trialDaysLeft ?? 'no')}`
+              // );
+
+              openWebLink(
+                `https://auth.dbgate.eu/redirect-to-purchase?product=${getElectron() ? 'premium' : 'team-premium'}&source=trial-${isExpired ? 'expired' : (trialDaysLeft ?? 'no')}`
+              );
            }}
          />
        </div>
-      {/if}

-      <div class="submit">
-        <FormStyledButton
-          value="Purchase DbGate Premium"
-          on:click={async e => {
-            // openWebLink(
-            //   `https://auth.dbgate.eu/create-checkout-session-simple?source=trial-${isExpired ? 'expired' : (trialDaysLeft ?? 'no')}`
-            // );
-
-            // openWebLink(
-            //   `https://auth-proxy.dbgate.udolni.net/redirect-to-purchase?product=${getElectron() ? 'premium' : 'teram-premium'}&source=trial-${isExpired ? 'expired' : (trialDaysLeft ?? 'no')}`
-            // );
-
-            openWebLink(
-              `https://auth.dbgate.eu/redirect-to-purchase?product=${getElectron() ? 'premium' : 'team-premium'}&source=trial-${isExpired ? 'expired' : (trialDaysLeft ?? 'no')}`
-            );
-          }}
-        />
-      </div>
-
-      {#if getElectron()}
-        <div class="submit">
-          <FormStyledButton
-            value="Exit"
-            on:click={e => {
-              getElectron().send('quit-app');
-            }}
-          />
-        </div>
+        {#if getElectron()}
+          <div class="submit">
+            <FormStyledButton
+              value="Exit"
+              on:click={e => {
+                getElectron().send('quit-app');
+              }}
+            />
+          </div>
+        {/if}
      {/if}

      {#if errorMessage}
@@ -141,6 +181,10 @@
    font-size: xx-large;
  }

+  .infotext {
+    margin: 1em;
+  }
+
  .submit {
    margin: var(--dim-large-form-margin);
    display: flex;
@@ -16,7 +16,7 @@
  <div class="heading">Configuration error</div>
  {#if $config?.checkedLicense?.status == 'error'}
    <ErrorInfo
-      message={`Invalid license. Please contact sales@dbgate.io for more details. ${$config?.checkedLicense?.error}`}
+      message={`Invalid license. Please contact sales@dbgate.io for more details. ${$config?.checkedLicense?.error || ''}`}
    />
  {:else if $config?.configurationError}
    <ErrorInfo message={$config?.configurationError} />
@@ -8,6 +8,7 @@
  import Link from '../elements/Link.svelte';
  import { focusedConnectionOrDatabase } from '../stores';
  import { tick } from 'svelte';
+  import { _val } from '../translations';

  export let list;
  export let module;
@@ -38,8 +39,19 @@

  $: matcher = module.createMatcher && module.createMatcher(filter, passProps?.searchSettings);

+  $: listTranslated = (list || []).map(data => ({
+    ...data,
+    group: data?.group && _val(data.group),
+    title: data?.title && _val(data.title),
+    description: data?.description && _val(data.description),
+    args: (data?.args || []).map(x => ({
+      ...x,
+      label: x?.label && _val(x.label),
+    })),
+  }));
+
  $: dataLabeled = _.compact(
-    (list || []).map(data => {
+    (listTranslated || []).map(data => {
      const matchResult = matcher ? matcher(data) : true;

      let isMatched = true;
@@ -102,7 +114,8 @@

  $: groups = groupFunc ? extendGroups(_.groupBy(dataLabeled, 'group'), emptyGroupNames) : null;

-  $: listLimited = isExpandedBySearch && !expandLimited ? filtered.slice(0, filter.trim().length < 3 ? 1 : 3) : list;
+  $: listLimited =
+    isExpandedBySearch && !expandLimited ? filtered.slice(0, filter.trim().length < 3 ? 1 : 3) : listTranslated;
  $: isListLimited = isExpandedBySearch && listLimited.length < filtered.length;
  $: listMissingItems = isListLimited ? filtered.slice(listLimited.length) : [];

@@ -446,8 +446,7 @@ await dbgateApi.executeQuery(${JSON.stringify(
        driver?.databaseEngineTypes?.includes('document') && {
          onClick: handleNewCollection,
          text: _t('database.newCollection', {
-            defaultMessage: 'New {collectionLabel}',
-            values: { collectionLabel: driver?.collectionSingularLabel ?? 'collection/container' },
+            defaultMessage: 'New collection/container'
          }),
        },
      hasPermission(`dbops/query`) &&
@@ -1,5 +1,6 @@
 <script lang="ts" context="module">
  import { copyTextToClipboard } from '../utility/clipboard';
+  import { _t, _val } from '../translations';

  export const extractKey = ({ schemaName, pureName }) => (schemaName ? `${schemaName}.${pureName}` : pureName);
  export const createMatcher =
@@ -69,13 +70,13 @@

  function createScriptTemplatesSubmenu(objectTypeField) {
    return {
-      label: 'SQL template',
+      label: _t('dbObject.sqlTemplate', { defaultMessage: 'SQL template' }),
      submenu: getSupportedScriptTemplates(objectTypeField),
    };
  }

  interface DbObjMenuItem {
-    label?: string;
+    label?: string | (() => string);
    tab?: string;
    forceNewTab?: boolean;
    initialData?: any;
@@ -113,19 +114,19 @@
            divider: true,
          },
          isProApp() && {
-            label: 'Design query',
+            label: _t('dbObject.designQuery', { defaultMessage: 'Design query' }),
            isQueryDesigner: true,
            requiresWriteAccess: true,
          },
          isProApp() && {
-            label: 'Design perspective query',
+            label: _t('dbObject.designPerspectiveQuery', { defaultMessage: 'Design perspective query' }),
            tab: 'PerspectiveTab',
            forceNewTab: true,
            icon: 'img perspective',
          },
          createScriptTemplatesSubmenu('tables'),
          {
-            label: 'SQL generator',
+            label: _t('dbObject.sqlGenerator', { defaultMessage: 'SQL generator' }),
            submenu: [
              {
                label: 'CREATE TABLE',
@@ -154,33 +155,33 @@
            divider: true,
          },
          hasPermission('dbops/model/edit') && {
-            label: 'Drop table',
+            label: _t('dbObject.dropTable', { defaultMessage: 'Drop table' }),
            isDrop: true,
            requiresWriteAccess: true,
          },
          hasPermission('dbops/table/rename') &&
            !driver?.dialect.disableRenameTable && {
-              label: 'Rename table',
+              label: _t('dbObject.renameTable', { defaultMessage: 'Rename table' }),
              isRename: true,
              requiresWriteAccess: true,
            },
          hasPermission('dbops/table/truncate') && {
-            label: 'Truncate table',
+            label: _t('dbObject.truncateTable', { defaultMessage: 'Truncate table' }),
            isTruncate: true,
            requiresWriteAccess: true,
          },
          {
-            label: 'Copy table name',
+            label: _t('dbObject.copyTableName', { defaultMessage: 'Copy table name' }),
            isCopyTableName: true,
            requiresWriteAccess: false,
          },
          hasPermission('dbops/table/backup') && {
-            label: 'Create table backup',
+            label: _t('dbObject.createTableBackup', { defaultMessage: 'Create table backup' }),
            isDuplicateTable: true,
            requiresWriteAccess: true,
          },
          hasPermission('dbops/model/view') && {
-            label: 'Show diagram',
+            label: _t('dbObject.showDiagram', { defaultMessage: 'Show diagram' }),
            isDiagram: true,
          },
          {
@@ -204,18 +205,18 @@
            divider: true,
          },
          isProApp() && {
-            label: 'Design query',
+            label: _t('dbObject.designQuery', { defaultMessage: 'Design query' }),
            isQueryDesigner: true,
          },
          isProApp() && {
-            label: 'Design perspective query',
+            label: _t('dbObject.designPerspectiveQuery', { defaultMessage: 'Design perspective query' }),
            tab: 'PerspectiveTab',
            forceNewTab: true,
            icon: 'img perspective',
          },
          createScriptTemplatesSubmenu('views'),
          {
-            label: 'SQL generator',
+            label: _t('dbObject.sqlGenerator', { defaultMessage: 'SQL generator' }),
            submenu: [
              {
                label: 'CREATE VIEW',
@@ -235,12 +236,12 @@
            divider: true,
          },
          hasPermission('dbops/model/edit') && {
-            label: 'Drop view',
+            label: _t('dbObject.dropView', { defaultMessage: 'Drop view' }),
            isDrop: true,
            requiresWriteAccess: true,
          },
          hasPermission('dbops/model/edit') && {
-            label: 'Rename view',
+            label: _t('dbObject.renameView', { defaultMessage: 'Rename view' }),
            isRename: true,
            requiresWriteAccess: true,
          },
@@ -260,12 +261,12 @@
            divider: true,
          },
          hasPermission('dbops/model/edit') && {
-            label: 'Drop view',
+            label: _t('dbObject.dropView', { defaultMessage: 'Drop view' }),
            isDrop: true,
            requiresWriteAccess: true,
          },
          hasPermission('dbops/model/edit') && {
-            label: 'Rename view',
+            label: _t('dbObject.renameView', { defaultMessage: 'Rename view' }),
            isRename: true,
            requiresWriteAccess: true,
          },
@@ -273,12 +274,12 @@
            divider: true,
          },
          {
-            label: 'Query designer',
+            label: _t('dbObject.queryDesigner', { defaultMessage: 'Query designer' }),
            isQueryDesigner: true,
          },
          createScriptTemplatesSubmenu('matviews'),
          {
-            label: 'SQL generator',
+            label: _t('dbObject.sqlGenerator', { defaultMessage: 'SQL generator' }),
            submenu: [
              {
                label: 'CREATE MATERIALIZED VIEW',
@@ -306,7 +307,7 @@
      case 'queries':
        return [
          {
-            label: 'Open data',
+            label: _t('dbObject.openData', { defaultMessage: 'Open data' }),
            tab: 'QueryDataTab',
            forceNewTab: true,
          },
@@ -318,18 +319,18 @@
            divider: true,
          },
          hasPermission('dbops/model/edit') && {
-            label: 'Drop procedure',
+            label: _t('dbObject.dropProcedure', { defaultMessage: 'Drop procedure' }),
            isDrop: true,
            requiresWriteAccess: true,
          },
          hasPermission('dbops/model/edit') && {
-            label: 'Rename procedure',
+            label: _t('dbObject.renameProcedure', { defaultMessage: 'Rename procedure' }),
            isRename: true,
            requiresWriteAccess: true,
          },
          createScriptTemplatesSubmenu('procedures'),
          {
-            label: 'SQL generator',
+            label: _t('dbObject.sqlGenerator', { defaultMessage: 'SQL generator' }),
            submenu: [
              {
                label: 'CREATE PROCEDURE',
@@ -352,7 +353,7 @@
        return [
          ...defaultDatabaseObjectAppObjectActions['triggers'],
          hasPermission('dbops/model/edit') && {
-            label: 'Drop trigger',
+            label: _t('dbObject.dropTrigger', { defaultMessage: 'Drop trigger' }),
            isDrop: true,
            requiresWriteAccess: true,
          },
@@ -360,7 +361,7 @@
            divider: true,
          },
          {
-            label: 'SQL generator',
+            label: _t('dbObject.sqlGenerator', { defaultMessage: 'SQL generator' }),
            submenu: [
              {
                label: 'CREATE TRIGGER',
@@ -384,7 +385,7 @@
            divider: true,
          },
          isProApp() && {
-            label: 'Design perspective query',
+            label: _t('dbObject.designPerspectiveQuery', { defaultMessage: 'Design perspective query' }),
            tab: 'PerspectiveTab',
            forceNewTab: true,
            icon: 'img perspective',
@@ -395,17 +396,17 @@
            functionName: 'tableReader',
          },
          hasPermission('dbops/model/edit') && {
-            label: `Drop ${driver?.collectionSingularLabel ?? 'collection/container'}`,
+            label: _t('dbObject.dropCollection', { defaultMessage: 'Drop collection/container'}),
            isDropCollection: true,
            requiresWriteAccess: true,
          },
          hasPermission('dbops/table/rename') && {
-            label: `Rename ${driver?.collectionSingularLabel ?? 'collection/container'}`,
+            label: _t('dbObject.renameCollection', { defaultMessage: 'Rename collection/container'}),
            isRenameCollection: true,
            requiresWriteAccess: true,
          },
          hasPermission('dbops/table/backup') && {
-            label: `Create ${driver?.collectionSingularLabel ?? 'collection/container'} backup`,
+            label: _t('dbObject.createCollectionBackup', { defaultMessage: 'Create collection/container backup'}),
            isDuplicateCollection: true,
            requiresWriteAccess: true,
          },
@@ -418,7 +419,7 @@
        const menu: DbObjMenuItem[] = [
          ...defaultDatabaseObjectAppObjectActions['schedulerEvents'],
          hasPermission('dbops/model/edit') && {
-            label: 'Drop event',
+            label: _t('dbObject.dropEvent', { defaultMessage: 'Drop event' }),
            isDrop: true,
            requiresWriteAccess: true,
          },
@@ -426,12 +427,12 @@

        if (data?.status === 'ENABLED') {
          menu.push({
-            label: 'Disable',
+            label: _t('dbObject.disable', { defaultMessage: 'Disable' }),
            isDisableEvent: true,
          });
        } else {
          menu.push({
-            label: 'Enable',
+            label: _t('dbObject.enable', { defaultMessage: 'Enable' }),
            isEnableEvent: true,
          });
        }
@@ -441,7 +442,7 @@
            divider: true,
          },
          {
-            label: 'SQL generator',
+            label: _t('dbObject.sqlGenerator', { defaultMessage: 'SQL generator' }),
            submenu: [
              {
                label: 'CREATE SCHEDULER EVENT',
@@ -474,7 +475,7 @@
    if (menu.isQueryDesigner) {
      openNewTab(
        {
-          title: 'Query #',
+          title: _t('dbObject.query', { defaultMessage: 'Query #' }),
          icon: 'img query-design',
          tabComponent: 'QueryDesignTab',
          focused: true,
@@ -499,7 +500,7 @@
    } else if (menu.isDiagram) {
      openNewTab(
        {
-          title: 'Diagram #',
+          title: _t('dbObject.diagram', { defaultMessage: 'Diagram #' }),
          icon: 'img diagram',
          tabComponent: 'DiagramTab',
          props: {
@@ -589,7 +590,7 @@
      });
    } else if (menu.isDropCollection) {
      showModal(ConfirmModal, {
-        message: `Really drop collection ${data.pureName}?`,
+        message: _t('dbObject.confirmDropCollection', { defaultMessage: 'Really drop collection {name}?', values: { name: data.pureName } }),
        onConfirm: async () => {
          const dbid = _.pick(data, ['conid', 'database']);
          runOperationOnDatabase(dbid, {
@@ -603,8 +604,8 @@
    } else if (menu.isRenameCollection) {
      const driver = await getDriver();
      showModal(InputTextModal, {
-        label: `New ${driver?.collectionSingularLabel ?? 'collection/container'} name`,
-        header: `Rename ${driver?.collectionSingularLabel ?? 'collection/container'}`,
+        label: _t('dbObject.newCollectionName', { defaultMessage: 'New collection/container name' }),
+        header: _t('dbObject.renameCollection', { defaultMessage: 'Rename collection/container' }),
        value: data.pureName,
        onConfirm: async newName => {
          const dbid = _.pick(data, ['conid', 'database']);
@@ -620,7 +621,7 @@
      const driver = await getDriver();

      showModal(ConfirmModal, {
-        message: `Really create ${driver?.collectionSingularLabel ?? 'collection/container'} copy named ${newName}?`,
+        message: _t('dbObject.confirmCloneCollection', { defaultMessage: 'Really create collection/container copy named {name}?', values: { name: newName } }),
        onConfirm: async () => {
          const dbid = _.pick(data, ['conid', 'database']);
          runOperationOnDatabase(dbid, {
@@ -718,7 +719,7 @@

    const filteredSumenus = coreMenus.map(item => {
      if (!item.submenu) {
-        return item;
+        return { ...item , label: _val(item.label)};
      }
      return {
        ...item,
@@ -768,7 +769,7 @@
    openNewTab(
      {
        // title: getObjectTitle(connection, schemaName, pureName),
-        title: tabComponent ? getObjectTitle(connection, schemaName, pureName) : 'Query #',
+        title: tabComponent ? getObjectTitle(connection, schemaName, pureName) : _t('dbObject.query', { defaultMessage: 'Query #' }),
        focused: tabComponent == null,
        tooltip,
        icon:
@@ -1,3 +1,4 @@
+import { __t } from '../translations';
 export function matchDatabaseObjectAppObject(obj1, obj2) {
  return (
    obj1?.objectTypeField == obj2?.objectTypeField &&
@@ -11,12 +12,12 @@ export function matchDatabaseObjectAppObject(obj1, obj2) {
 function getTableLikeActions(dataTab) {
  return [
    {
-      label: 'Open data',
+      label: __t('dbObject.openData', { defaultMessage: 'Open data' }),
      tab: dataTab,
      defaultActionId: 'openTable',
    },
    {
-      label: 'Open raw data',
+      label: __t('dbObject.openRawData', { defaultMessage: 'Open raw data' }),
      tab: dataTab,
      defaultActionId: 'openRawTable',
      isRawMode: true,
@@ -33,13 +34,13 @@ function getTableLikeActions(dataTab) {
    //   defaultActionId: 'openForm',
    // },
    {
-      label: 'Open structure',
+      label: __t('dbObject.openStructure', { defaultMessage: 'Open structure' }),
      tab: 'TableStructureTab',
      icon: 'img table-structure',
      defaultActionId: 'openStructure',
    },
    {
-      label: 'Show SQL',
+      label: __t('dbObject.showSql', { defaultMessage: 'Show SQL' }),
      tab: 'SqlObjectTab',
      defaultActionId: 'showSql',
      icon: 'img sql-file',
@@ -53,7 +54,7 @@ export const defaultDatabaseObjectAppObjectActions = {
  matviews: getTableLikeActions('ViewDataTab'),
  procedures: [
    {
-      label: 'Show SQL',
+      label: __t('dbObject.showSql', { defaultMessage: 'Show SQL' }),
      tab: 'SqlObjectTab',
      defaultActionId: 'showSql',
      icon: 'img sql-file',
@@ -61,7 +62,7 @@ export const defaultDatabaseObjectAppObjectActions = {
  ],
  functions: [
    {
-      label: 'Show SQL',
+      label: __t('dbObject.showSql', { defaultMessage: 'Show SQL' }),
      tab: 'SqlObjectTab',
      defaultActionId: 'showSql',
      icon: 'img sql-file',
@@ -69,7 +70,7 @@ export const defaultDatabaseObjectAppObjectActions = {
  ],
  triggers: [
    {
-      label: 'Show SQL',
+      label: __t('dbObject.showSql', { defaultMessage: 'Show SQL' }),
      tab: 'SqlObjectTab',
      defaultActionId: 'showSql',
      icon: 'img sql-file',
@@ -77,12 +78,12 @@ export const defaultDatabaseObjectAppObjectActions = {
  ],
  collections: [
    {
-      label: 'Open data',
+      label: __t('dbObject.openData', { defaultMessage: 'Open data' }),
      tab: 'CollectionDataTab',
      defaultActionId: 'openTable',
    },
    {
-      label: 'Open JSON',
+      label: __t('dbObject.openJson', { defaultMessage: 'Open JSON' }),
      tab: 'CollectionDataTab',
      defaultActionId: 'openJson',
      initialData: {
@@ -94,7 +95,7 @@ export const defaultDatabaseObjectAppObjectActions = {
  ],
  schedulerEvents: [
    {
-      label: 'Show SQL',
+      label: __t('dbObject.showSql', { defaultMessage: 'Show SQL' }),
      tab: 'SqlObjectTab',
      defaultActionId: 'showSql',
      icon: 'img sql-file',
@@ -102,7 +103,7 @@ export const defaultDatabaseObjectAppObjectActions = {
  ],
  queries: [
    {
-      label: 'Show query',
+      label: __t('dbObject.showQuery', { defaultMessage: 'Show query' }),
      tab: 'QueryDataTab',
      defaultActionId: 'showAppQuery',
      icon: 'img app-query',
@@ -1,6 +1,7 @@
 <script lang="ts">
  import FontIcon from '../icons/FontIcon.svelte';
  import { isProApp } from '../utility/proTools';
+  import { _t } from '../translations';

  export let icon;
  export let title;
@@ -21,7 +22,7 @@
  data-testid={$$props['data-testid']}
  title={disabled
    ? isProFeature && !isProApp()
-      ? 'This feature is available only in DbGate Premium'
+      ? _t('common.featurePremium', { defaultMessage: 'This feature is available only in DbGate Premium' })
      : disabledMessage
    : undefined}
 >
@@ -1,6 +1,6 @@
 <script context="module">
  function getCommandTitle(command) {
-    let res = command.text;
+    let res = _val(command.text);
    if (command.keyText || command.keyTextFromGroup) {
      res += ` (${formatKeyText(command.keyText || command.keyTextFromGroup)})`;
    }
@@ -12,6 +12,8 @@
  import { commandsCustomized } from '../stores';
  import { formatKeyText } from '../utility/common';
  import ToolStripButton from './ToolStripButton.svelte';
+  import _ from 'lodash';
+  import { _val } from '../translations';

  export let command;
  export let component = ToolStripButton;
@@ -32,6 +34,6 @@
    {iconAfter}
    {...$$restProps}
  >
-    {buttonLabel || cmd.toolbarName || cmd.name}
+    {(_val(buttonLabel) || _val(cmd?.toolbarName) || _val(cmd?.name))}
  </svelte:component>
 {/if}
@@ -23,7 +23,8 @@
  import hasPermission from '../utility/hasPermission';
  import ToolStripCommandButton from './ToolStripCommandButton.svelte';
  import ToolStripDropDownButton from './ToolStripDropDownButton.svelte';
-
+  import _ from 'lodash';
+  import { _val } from '../translations';
  export let quickExportHandlerRef = null;
  export let command = 'sqlDataGrid.export';
  export let label = 'Export';
@@ -39,7 +40,7 @@

 {#if hasPermission('dbops/export')}
  {#if quickExportHandlerRef}
-    <ToolStripDropDownButton menu={getExportMenu} {label} icon="icon export" />
+    <ToolStripDropDownButton menu={getExportMenu} label={_val(label)} icon="icon export" />
  {:else}
    <ToolStripCommandButton {command} />
  {/if}
@@ -10,6 +10,9 @@
      if (value?.type == 'Buffer' && _.isArray(value?.data)) {
        return 'data:image/png;base64, ' + btoa(String.fromCharCode.apply(null, value?.data));
      }
+      if (value?.$binary?.base64) {
+        return 'data:image/png;base64, ' + value.$binary.base64;
+      }
      return null;
    } catch (err) {
      console.log('Error showing picture', err);
@@ -1,9 +1,9 @@
 <script context="module">
  registerCommand({
    id: 'commandPalette.show',
-    category: 'Command palette',
-    name: 'Show',
-    toolbarName: 'Command palette',
+    category: __t('command.commandPalette', { defaultMessage: 'Command palette' }),
+    name: __t('command.commandPalette.show', { defaultMessage: 'Show' }),
+    toolbarName: __t('command.commandPalette', { defaultMessage: 'Command palette' }),
    toolbarOrder: 0,
    keyText: 'F1',
    toolbar: true,
@@ -15,9 +15,9 @@

  registerCommand({
    id: 'database.search',
-    category: 'Database',
-    toolbarName: 'Database search',
-    name: 'Search',
+    category: __t('command.database', { defaultMessage: 'Database' }),
+    toolbarName: __t('command.database.databaseSearch', { defaultMessage: 'Database search' }),
+    name: __t('command.database.search', { defaultMessage: 'Search' }),
    keyText: isElectronAvailable() ? 'CtrlOrCommand+P' : 'F3',
    onClick: () => visibleCommandPalette.set('database'),
    testEnabled: () => getVisibleCommandPalette() != 'database',
@@ -81,6 +81,7 @@
  import { getLocalStorage } from '../utility/storageCache';
  import registerCommand from './registerCommand';
  import { formatKeyText, switchCurrentDatabase } from '../utility/common';
+  import { _val, __t } from '../translations';

  let domInput;
  let filter = '';
@@ -117,7 +118,7 @@
        : sortedComands
      ).filter(x => !x.isGroupCommand),
      {
-        extract: x => x.text,
+        extract: x => _val(x.text),
        pre: '<b>',
        post: '</b>',
      }
@@ -4,11 +4,12 @@ import getElectron from '../utility/getElectron';
 import registerCommand from './registerCommand';
 import { apiCall } from '../utility/api';
 import { switchCurrentDatabase } from '../utility/common';
+import { __t } from '../translations';

 registerCommand({
  id: 'database.changeState',
-  category: 'Database',
-  name: 'Change status',
+  category: __t('command.database', { defaultMessage: 'Database' }),
+  name: __t('command.database.changeStatus', { defaultMessage: 'Change status' }),
  getSubCommands: () => {
    const current = getCurrentDatabase();
    if (!current) return [];
@@ -3,6 +3,7 @@ import { recentDatabases, currentDatabase, getRecentDatabases } from '../stores'
 import registerCommand from './registerCommand';
 import { getConnectionLabel } from 'dbgate-tools';
 import { switchCurrentDatabase } from '../utility/common';
+import { __t } from '../translations';

 currentDatabase.subscribe(value => {
  if (!value) return;
@@ -24,8 +25,8 @@ function switchDatabaseCommand(db) {

 registerCommand({
  id: 'database.switch',
-  category: 'Database',
-  name: 'Change to recent',
+  category: __t('command.database', { defaultMessage: 'Database' }),
+  name: __t('command.database.changeRecent', { defaultMessage: 'Change to recent' }),
  menuName: 'Switch recent database',
  keyText: 'CtrlOrCommand+D',
  getSubCommands: () => getRecentDatabases().map(switchDatabaseCommand),
@@ -1,5 +1,7 @@
 import { commands } from '../stores';
 import { invalidateCommandDefinitions } from './invalidateCommands';
+import _ from 'lodash';
+import { _val } from '../translations';

 export interface SubCommand {
  text: string;
@@ -8,10 +10,10 @@ export interface SubCommand {

 export interface GlobalCommand {
  id: string;
-  category: string; // null for group commands
+  category: string | (() => string); // null for group commands
  isGroupCommand?: boolean;
-  name: string;
-  text?: string /* category: name */;
+  name: string | (() => string);
+  text?: string | (() => string);
  keyText?: string;
  keyTextFromGroup?: string; // automatically filled from group
  group?: string;
@@ -23,11 +25,11 @@ export interface GlobalCommand {
  toolbar?: boolean;
  enabled?: boolean;
  showDisabled?: boolean;
-  toolbarName?: string;
+  toolbarName?: string | (() => string);
  menuName?: string;
  toolbarOrder?: number;
  disableHandleKeyText?: string;
-  isRelatedToTab?: boolean,
+  isRelatedToTab?: boolean;
  systemCommand?: boolean;
 }

@@ -41,7 +43,10 @@ export default function registerCommand(command: GlobalCommand) {
    return {
      ...x,
      [command.id]: {
-        text: `${command.category}: ${command.name}`,
+        text:
+          _.isFunction(command.category) || _.isFunction(command.name)
+            ? () => `${_val(command.category)}: ${_val(command.name)}`
+            : `${command.category}: ${command.name}`,
        ...command,
        enabled: !testEnabled,
      },
@@ -52,6 +52,7 @@ import { openWebLink } from '../utility/simpleTools';
 import { _t } from '../translations';
 import ExportImportConnectionsModal from '../modals/ExportImportConnectionsModal.svelte';
 import { getBoolSettingsValue } from '../settings/settingsTools';
+import { __t } from '../translations';

 // function themeCommand(theme: ThemeDefinition) {
 //   return {
@@ -69,42 +70,42 @@ import { getBoolSettingsValue } from '../settings/settingsTools';

 registerCommand({
  id: 'theme.changeTheme',
-  category: 'Theme',
-  name: 'Change',
-  toolbarName: 'Change theme',
+  category: __t('command.theme', { defaultMessage: 'Theme' }),
+  name: __t('command.theme.change', { defaultMessage: 'Change' }),
+  toolbarName: __t('command.theme.changeToolbar', { defaultMessage: 'Change theme' }),
  onClick: () => showModal(SettingsModal, { selectedTab: 'theme' }),
  // getSubCommands: () => get(extensions).themes.map(themeCommand),
 });

 registerCommand({
  id: 'toolbar.show',
-  category: 'Toolbar',
-  name: 'Show',
+  category: __t('command.toolbar', { defaultMessage: 'Toolbar' }),
+  name: __t('command.toolbar.show', { defaultMessage: 'Show' }),
  onClick: () => visibleToolbar.set(true),
  testEnabled: () => !getVisibleToolbar(),
 });

 registerCommand({
  id: 'toolbar.hide',
-  category: 'Toolbar',
-  name: 'Hide',
+  category: __t('command.toolbar', { defaultMessage: 'Toolbar' }),
+  name: __t('command.toolbar.hide', { defaultMessage: 'Hide' }),
  onClick: () => visibleToolbar.set(false),
  testEnabled: () => getVisibleToolbar(),
 });

 registerCommand({
  id: 'about.show',
-  category: 'About',
-  name: 'Show',
-  toolbarName: 'About',
+  category: __t('command.about', { defaultMessage: 'About' }),
+  name: __t('command.about.show', { defaultMessage: 'Show' }),
+  toolbarName: __t('command.about.toolbar', { defaultMessage: 'About' }),
  onClick: () => showModal(AboutModal),
 });

 registerCommand({
  id: 'toggle.sidebar',
-  category: 'Sidebar',
-  name: 'Show',
-  toolbarName: 'Toggle sidebar',
+  category: __t('command.sidebar', { defaultMessage: 'Sidebar' }),
+  name: __t('command.sidebar.show', { defaultMessage: 'Show' }),
+  toolbarName: __t('command.sidebar.toggleToolbar', { defaultMessage: 'Toggle sidebar' }),
  keyText: 'CtrlOrCommand+B',
  onClick: () => visibleWidgetSideBar.update(x => !x),
 });
@@ -113,10 +114,10 @@ registerCommand({
  id: 'new.connection',
  toolbar: true,
  icon: 'icon new-connection',
-  toolbarName: 'Add connection',
-  category: 'New',
+  toolbarName: __t('command.new.connection', { defaultMessage: 'Add connection' }),
+  category: __t('command.new', { defaultMessage: 'New'}),
  toolbarOrder: 1,
-  name: 'Connection',
+  name: __t('command.new.connection', { defaultMessage: 'Connection' }),
  testEnabled: () => !getCurrentConfig()?.runAsPortal && !getCurrentConfig()?.storageDatabase,
  onClick: () => {
    openNewTab({
@@ -131,10 +132,10 @@ registerCommand({
  id: 'new.connectionOnCloud',
  toolbar: true,
  icon: 'img cloud-connection',
-  toolbarName: 'Add connection',
-  category: 'New',
+  toolbarName: __t('command.new.connection', { defaultMessage: 'Add connection' }),
+  category: __t('command.new', { defaultMessage: 'New' }),
  toolbarOrder: 1,
-  name: 'Connection on Cloud',
+  name: __t('command.new.connectionCloud', { defaultMessage: 'Connection on Cloud' }),
  testEnabled: () =>
    !getCurrentConfig()?.runAsPortal && !getCurrentConfig()?.storageDatabase && !!getCloudSigninTokenHolder(),
  onClick: () => {
@@ -153,10 +154,10 @@ registerCommand({
  id: 'new.connection.folder',
  toolbar: true,
  icon: 'icon add-folder',
-  toolbarName: 'Add connection folder',
-  category: 'New',
+  toolbarName: __t('command.new.connectionFolderToolbar', { defaultMessage: 'Add connection folder' }),
+  category: __t('command.new', { defaultMessage: 'New' }),
  toolbarOrder: 1,
-  name: 'Connection folder',
+  name: __t('command.new.connectionFolder', { defaultMessage: 'Connection folder' }),
  testEnabled: () => !getCurrentConfig()?.runAsPortal,
  onClick: () => {
    showModal(InputTextModal, {
@@ -176,21 +177,21 @@ registerCommand({

 registerCommand({
  id: 'new.query',
-  category: 'New',
+  category: __t('command.new', { defaultMessage: 'New' }),
  icon: 'icon file',
  toolbar: true,
  toolbarOrder: 2,
-  name: 'Query',
-  toolbarName: 'New query',
+  name: __t('command.new.query', { defaultMessage: 'Query' }),
+  toolbarName: __t('command.new.queryToolbar', { defaultMessage: 'New query' }),
  keyText: 'CtrlOrCommand+T',
  onClick: () => newQuery(),
 });

 registerCommand({
  id: 'new.shell',
-  category: 'New',
+  category: __t('command.new', { defaultMessage: 'New' }),
  icon: 'img shell',
-  name: 'JavaScript Shell',
+  name: __t('command.new.shell', { defaultMessage: 'JavaScript Shell' }),
  menuName: 'New JavaScript shell',
  onClick: () => {
    openNewTab({
@@ -204,9 +205,9 @@ registerCommand({
 if (isProApp()) {
  registerCommand({
    id: 'new.queryDesign',
-    category: 'New',
+    category: __t('command.new', { defaultMessage: 'New' }),
    icon: 'img query-design',
-    name: 'Query design',
+    name: __t('command.new.queryDesign', { defaultMessage: 'Query design' }),
    menuName: 'New query design',
    onClick: () => newQueryDesign(),
    testEnabled: () =>
@@ -218,9 +219,9 @@ if (isProApp()) {
 if (isProApp()) {
  registerCommand({
    id: 'new.modelTransform',
-    category: 'New',
+    category: __t('command.new', { defaultMessage: 'New' }),
    icon: 'img transform',
-    name: 'Model transform',
+    name: __t('command.new.modelTransform', { defaultMessage: 'Model transform' }),
    menuName: 'New model transform',
    onClick: () => {
      openNewTab(
@@ -262,9 +263,9 @@ if (isProApp()) {
 if (isProApp()) {
  registerCommand({
    id: 'new.perspective',
-    category: 'New',
+    category: __t('command.new', { defaultMessage: 'New' }),
    icon: 'img perspective',
-    name: 'Perspective',
+    name: __t('command.new.perspective', { defaultMessage: 'Perspective' }),
    menuName: 'New perspective',
    onClick: () => newPerspective(),
  });
@@ -273,9 +274,9 @@ if (isProApp()) {
 if (isProApp()) {
  registerCommand({
    id: 'new.application',
-    category: 'New',
+    category: __t('command.new', { defaultMessage: 'New' }),
    icon: 'img app',
-    name: 'Application',
+    name: __t('command.new.application', { defaultMessage: 'Application' }),
    menuName: 'New application',
    onClick: () => {
      openNewTab({
@@ -289,9 +290,9 @@ if (isProApp()) {

 registerCommand({
  id: 'new.diagram',
-  category: 'New',
+  category: __t('command.new', { defaultMessage: 'New' }),
  icon: 'img diagram',
-  name: 'ER Diagram',
+  name: __t('command.new.diagram', { defaultMessage: 'ER Diagram' }),
  menuName: 'New ER diagram',
  testEnabled: () =>
    getCurrentDatabase() &&
@@ -301,9 +302,9 @@ registerCommand({

 registerCommand({
  id: 'new.archiveFolder',
-  category: 'New',
+  category: __t('command.new', { defaultMessage: 'New' }),
  icon: 'img archive',
-  name: 'Archive folder',
+  name: __t('command.new.archiveFolder', { defaultMessage: 'Archive folder' }),
  onClick: () => {
    showModal(InputTextModal, {
      value: '',
@@ -335,11 +336,11 @@ registerCommand({

 registerCommand({
  id: 'new.table',
-  category: 'New',
+  category: __t('command.new', { defaultMessage: 'New' }),
  icon: 'icon table',
-  name: 'Table',
+  name: __t('command.new.table', { defaultMessage: 'Table' }),
  toolbar: true,
-  toolbarName: 'New table',
+  toolbarName: __t('command.new.tableToolbar', { defaultMessage: 'New table' }),
  testEnabled: () => {
    if (!hasPermission('dbops/model/edit')) return false;
    const driver = findEngineDriver(get(currentDatabase)?.connection, getExtensions());
@@ -355,11 +356,11 @@ registerCommand({

 registerCommand({
  id: 'new.collection',
-  category: 'New',
+  category: __t('command.new', { defaultMessage: 'New' }),
  icon: 'icon table',
-  name: 'Collection',
+  name: __t('command.new.collection', { defaultMessage: 'Collection' }),
  toolbar: true,
-  toolbarName: 'New collection/container',
+  toolbarName: __t('command.new.collectionToolbar', { defaultMessage: 'New collection/container' }),
  testEnabled: () => {
    const driver = findEngineDriver(get(currentDatabase)?.connection, getExtensions());
    return !!get(currentDatabase) && driver?.databaseEngineTypes?.includes('document');
@@ -381,9 +382,9 @@ registerCommand({

 registerCommand({
  id: 'new.markdown',
-  category: 'New',
+  category: __t('command.new', { defaultMessage: 'New' }),
  icon: 'img markdown',
-  name: 'Markdown page',
+  name: __t('command.new.markdown', { defaultMessage: 'Markdown page' }),
  onClick: () => {
    openNewTab({
      title: 'Page #',
@@ -396,9 +397,9 @@ registerCommand({
 if (isProApp()) {
  registerCommand({
    id: 'new.modelCompare',
-    category: 'New',
+    category: __t('command.new', { defaultMessage: 'New' }),
    icon: 'icon compare',
-    name: 'Compare DB',
+    name: __t('command.new.modelCompare', { defaultMessage: 'Compare DB' }),
    toolbar: true,
    onClick: () => {
      openNewTab({
@@ -412,9 +413,9 @@ if (isProApp()) {

 registerCommand({
  id: 'new.jsonl',
-  category: 'New',
+  category: __t('command.new', { defaultMessage: 'New' }),
  icon: 'img archive',
-  name: 'JSON Lines',
+  name: __t('command.new.jsonl', { defaultMessage: 'JSON Lines' }),
  menuName: 'New JSON lines file',
  onClick: () => {
    openNewTab(
@@ -432,9 +433,9 @@ registerCommand({

 registerCommand({
  id: 'new.sqliteDatabase',
-  category: 'New',
+  category: __t('command.new', { defaultMessage: 'New' }),
  icon: 'img sqlite-database',
-  name: 'SQLite database',
+  name: __t('command.new.sqliteDatabase', { defaultMessage: 'SQLite database' }),
  menuName: _t('command.new.sqliteDatabase', { defaultMessage: 'New SQLite database' }),
  onClick: () => {
    showModal(InputTextModal, {
@@ -452,9 +453,9 @@ registerCommand({

 registerCommand({
  id: 'new.duckdbDatabase',
-  category: 'New',
+  category: __t('command.new', { defaultMessage: 'New' }),
  icon: 'img sqlite-database',
-  name: 'DuckDB database',
+  name: __t('command.new.duckdbDatabase', { defaultMessage: 'DuckDB database' }),
  menuName: _t('command.new.duckdbDatabase', { defaultMessage: 'New DuckDB database' }),
  onClick: () => {
    showModal(InputTextModal, {
@@ -472,8 +473,8 @@ registerCommand({

 registerCommand({
  id: 'tabs.changelog',
-  category: 'Tabs',
-  name: 'Changelog',
+  category: __t('command.tabs', { defaultMessage: 'Tabs' }),
+  name: __t('command.tabs.changelog', { defaultMessage: 'Changelog' }),
  onClick: () => {
    openNewTab({
      title: 'ChangeLog',
@@ -488,7 +489,7 @@ registerCommand({
  id: 'group.save',
  category: null,
  isGroupCommand: true,
-  name: 'Save',
+  name: __t('command.save', { defaultMessage: 'Save' }),
  keyText: 'CtrlOrCommand+S',
  group: 'save',
 });
@@ -497,7 +498,7 @@ registerCommand({
  id: 'group.saveAs',
  category: null,
  isGroupCommand: true,
-  name: 'Save As',
+  name: __t('command.saveAs', { defaultMessage: 'Save As' }),
  keyText: 'CtrlOrCommand+Shift+S',
  group: 'saveAs',
 });
@@ -506,7 +507,7 @@ registerCommand({
  id: 'group.undo',
  category: null,
  isGroupCommand: true,
-  name: 'Undo',
+  name: __t('command.undo', { defaultMessage: 'Undo' }),
  keyText: 'CtrlOrCommand+Z',
  group: 'undo',
 });
@@ -515,15 +516,15 @@ registerCommand({
  id: 'group.redo',
  category: null,
  isGroupCommand: true,
-  name: 'Redo',
+  name: __t('command.redo', { defaultMessage: 'Redo' }),
  keyText: 'CtrlOrCommand+Y',
  group: 'redo',
 });

 registerCommand({
  id: 'file.open',
-  category: 'File',
-  name: 'Open',
+  category: __t('command.file', { defaultMessage: 'File' }),
+  name: __t('command.file.open', { defaultMessage: 'Open' }),
  keyText: 'CtrlOrCommand+O',
  testEnabled: () => getElectron() != null,
  onClick: openElectronFile,
@@ -531,36 +532,36 @@ registerCommand({

 registerCommand({
  id: 'file.openArchive',
-  category: 'File',
-  name: 'Open DB Model/Archive',
+  category: __t('command.file', { defaultMessage: 'File' }),
+  name: __t('command.file.openArchive', { defaultMessage: 'Open DB Model/Archive' }),
  testEnabled: () => getElectron() != null,
  onClick: openArchiveFolder,
 });

 registerCommand({
  id: 'folder.showLogs',
-  category: 'Folder',
-  name: 'Open logs',
+  category: __t('command.folder', { defaultMessage: 'Folder' }),
+  name: __t('command.folder.openLogs', { defaultMessage: 'Open logs' }),
  testEnabled: () => getElectron() != null,
  onClick: () => electron.showItemInFolder(getCurrentConfig().logsFilePath),
 });

 registerCommand({
  id: 'folder.showData',
-  category: 'Folder',
-  name: 'Open data folder',
+  category: __t('command.folder', { defaultMessage: 'Folder' }),
+  name: __t('command.folder.openData', { defaultMessage: 'Open data folder' }),
  testEnabled: () => getElectron() != null,
  onClick: () => electron.showItemInFolder(getCurrentConfig().connectionsFilePath),
 });

 registerCommand({
  id: 'app.resetSettings',
-  category: 'File',
-  name: 'Reset layout data & settings',
+  category: __t('command.file', { defaultMessage: 'File' }),
+  name: __t('command.file.resetLayout', { defaultMessage: 'Reset layout data & settings' }),
  testEnabled: () => true,
  onClick: () => {
    showModal(ConfirmModal, {
-      message: `Really reset layout data? All opened tabs, settings and layout data will be lost. Connections and saved files will be preserved. After this, restart DbGate for applying changes.`,
+      message: _t('command.file.resetLayoutConfirm', { defaultMessage: 'Really reset layout data? All opened tabs, settings and layout data will be lost. Connections and saved files will be preserved. After this, restart DbGate for applying changes.' }),
      onConfirm: async () => {
        await apiCall('config/delete-settings');
        localStorage.clear();
@@ -577,8 +578,8 @@ registerCommand({

 registerCommand({
  id: 'app.exportConnections',
-  category: 'Settings',
-  name: 'Export connections',
+  category: __t('command.settings', { defaultMessage: 'Settings' }),
+  name: __t('command.settings.exportConnections', { defaultMessage: 'Export connections' }),
  testEnabled: () => !getCurrentConfig()?.runAsPortal && !getCurrentConfig()?.storageDatabase,
  onClick: () => {
    showModal(ExportImportConnectionsModal, {
@@ -589,8 +590,8 @@ registerCommand({

 registerCommand({
  id: 'app.importConnections',
-  category: 'Settings',
-  name: 'Import connections',
+  category: __t('command.settings', { defaultMessage: 'Settings' }),
+  name: __t('command.settings.importConnections', { defaultMessage: 'Import connections' }),
  testEnabled: () => !getCurrentConfig()?.runAsPortal && !getCurrentConfig()?.storageDatabase,
  onClick: async () => {
    const files = await electron.showOpenDialog({
@@ -615,8 +616,8 @@ registerCommand({

 registerCommand({
  id: 'file.import',
-  category: 'File',
-  name: 'Import data',
+  category: __t('command.file', { defaultMessage: 'File' }),
+  name: __t('command.file.import', { defaultMessage: 'Import data' }),
  toolbar: true,
  icon: 'icon import',
  onClick: () =>
@@ -636,8 +637,8 @@ registerCommand({

 registerCommand({
  id: 'view.reset',
-  category: 'View',
-  name: 'Reset view',
+  category: __t('command.view', { defaultMessage: 'View' }),
+  name: __t('command.view.reset', { defaultMessage: 'Reset view' }),
  onClick: () => {
    const keys = [
      'leftPanelWidth',
@@ -664,14 +665,14 @@ registerCommand({
      'currentArchive',
    ];
    for (const key of keys) removeLocalStorage(key);
-    showSnackbarSuccess('Restart DbGate (or reload on web) for applying changes');
+    showSnackbarSuccess(_t('command.view.restart', { defaultMessage: 'Restart DbGate (or reload on web) for applying changes' }));
  },
 });

 registerCommand({
  id: 'sql.generator',
-  category: 'SQL',
-  name: 'SQL Generator',
+  category: __t('command.sql', { defaultMessage: 'SQL' }),
+  name: __t('command.sql.generator', { defaultMessage: 'SQL Generator' }),
  toolbar: true,
  icon: 'icon sql-generator',
  testEnabled: () =>
@@ -687,8 +688,8 @@ registerCommand({

 registerCommand({
  id: 'database.export',
-  category: 'Database',
-  name: 'Export database',
+  category: __t('command.database', { defaultMessage: 'Database' }),
+  name: __t('command.database.export', { defaultMessage: 'Export database' }),
  toolbar: true,
  icon: 'icon export',
  testEnabled: () => getCurrentDatabase() != null && hasPermission(`dbops/export`) && isProApp(),
@@ -705,8 +706,8 @@ registerCommand({
 if (isProApp()) {
  registerCommand({
    id: 'database.compare',
-    category: 'Database',
-    name: 'Compare databases',
+    category: __t('command.database', { defaultMessage: 'Database' }),
+    name: __t('command.database.compare', { defaultMessage: 'Compare databases' }),
    toolbar: true,
    icon: 'icon compare',
    testEnabled: () =>
@@ -738,8 +739,8 @@ if (isProApp()) {

  registerCommand({
    id: 'database.chat',
-    category: 'Database',
-    name: 'Database chat',
+    category: __t('command.database', { defaultMessage: 'Database' }),
+    name: __t('command.database.chat', { defaultMessage: 'Database chat' }),
    toolbar: true,
    icon: 'icon ai',
    testEnabled: () =>
@@ -763,11 +764,11 @@ if (isProApp()) {
 if (hasPermission('settings/change')) {
  registerCommand({
    id: 'settings.commands',
-    category: 'Settings',
-    name: 'Keyboard shortcuts',
+    category: __t('command.settings', { defaultMessage: 'Settings' }),
+    name: __t('command.settings.shortcuts', { defaultMessage: 'Keyboard shortcuts' }),
    onClick: () => {
      openNewTab({
-        title: 'Keyboard Shortcuts',
+        title: _t('command.settings.shortcuts', { defaultMessage: 'Keyboard shortcuts' }),
        icon: 'icon keyboard',
        tabComponent: 'CommandListTab',
        props: {},
@@ -778,9 +779,9 @@ if (hasPermission('settings/change')) {

  registerCommand({
    id: 'settings.show',
-    category: 'Settings',
-    name: 'Change',
-    toolbarName: 'Settings',
+    category: __t('command.settings', { defaultMessage: 'Settings' }),
+    name: __t('command.settings.change', { defaultMessage: 'Change' }),
+    toolbarName: __t('command.settings', { defaultMessage: 'Settings' }),
    onClick: () => showModal(SettingsModal),
    testEnabled: () => hasPermission('settings/change'),
  });
@@ -788,8 +789,8 @@ if (hasPermission('settings/change')) {

 registerCommand({
  id: 'cloud.logout',
-  category: 'Cloud',
-  name: 'Logout',
+  category: __t('command.cloud', { defaultMessage: 'Cloud' }),
+  name: __t('command.cloud.logout', { defaultMessage: 'Logout' }),
  onClick: () => {
    cloudSigninTokenHolder.set(null);
  },
@@ -797,8 +798,8 @@ registerCommand({

 registerCommand({
  id: 'file.exit',
-  category: 'File',
-  name: isMac() ? 'Quit' : 'Exit',
+  category: __t('command.file', { defaultMessage: 'File' }),
+  name: isMac() ? __t('command.file.quit', { defaultMessage: 'Quit' }) : __t('command.file.exit', { defaultMessage: 'Exit' }),
  // keyText: isMac() ? 'Command+Q' : null,
  testEnabled: () => getElectron() != null,
  onClick: () => getElectron().send('quit-app'),
@@ -806,16 +807,16 @@ registerCommand({

 registerCommand({
  id: 'app.logout',
-  category: 'App',
-  name: 'Logout',
+  category: __t('command.application', { defaultMessage: 'Application' }),
+  name: __t('command.app.logout', { defaultMessage: 'Logout' }),
  testEnabled: () => getCurrentConfig()?.isUserLoggedIn,
  onClick: doLogout,
 });

 registerCommand({
  id: 'app.loggedUserCommands',
-  category: 'App',
-  name: 'Logged user',
+  category: __t('command.application', { defaultMessage: 'Application' }),
+  name: __t('command.app.loggedUser', { defaultMessage: 'Logged user' }),
  getSubCommands: () => {
    const config = getCurrentConfig();
    if (!config) return [];
@@ -832,16 +833,16 @@ registerCommand({

 registerCommand({
  id: 'app.disconnect',
-  category: 'App',
-  name: 'Disconnect',
+  category: __t('command.application', { defaultMessage: 'Application' }),
+  name: __t('command.app.disconnect', { defaultMessage: 'Disconnect' }),
  testEnabled: () => getCurrentConfig()?.singleConnection != null && !getCurrentConfig()?.isUserLoggedIn,
  onClick: () => disconnectServerConnection(getCurrentConfig()?.singleConnection?._id),
 });

 registerCommand({
-  id: 'file.checkForUpdates',
-  category: 'App',
-  name: 'Check for updates',
+  id: 'app.checkForUpdates',
+  category: __t('command.application', { defaultMessage: 'Application' }),
+  name: __t('command.app.checkForUpdates', { defaultMessage: 'Check for updates' }),
  // testEnabled: () => true,
  testEnabled: () => getAppUpdaterActive(),
  onClick: () => getElectron().send('check-for-updates'),
@@ -867,7 +868,7 @@ export function registerFileCommands({
      id: idPrefix + '.save',
      group: 'save',
      category,
-      name: 'Save',
+      name: __t('command.save', { defaultMessage: 'Save' }),
      // keyText: 'CtrlOrCommand+S',
      icon: 'icon save',
      toolbar: true,
@@ -879,14 +880,14 @@ export function registerFileCommands({
      id: idPrefix + '.saveAs',
      group: 'saveAs',
      category,
-      name: 'Save As',
+      name: __t('command.saveAs', { defaultMessage: 'Save As' }),
      testEnabled: () => getCurrentEditor() != null,
      onClick: () => saveTabFile(getCurrentEditor(), 'save-as', folder, format, fileExtension),
    });
    registerCommand({
      id: idPrefix + '.saveToDisk',
      category,
-      name: 'Save to disk',
+      name: __t('command.saveToDisk', { defaultMessage: 'Save to disk' }),
      testEnabled: () => getCurrentEditor() != null && getElectron() != null,
      onClick: () => saveTabFile(getCurrentEditor(), 'save-to-disk', folder, format, fileExtension),
    });
@@ -896,7 +897,7 @@ export function registerFileCommands({
    registerCommand({
      id: idPrefix + '.execute',
      category,
-      name: 'Execute',
+      name: __t('command.execute', { defaultMessage: 'Execute' }),
      icon: 'icon run',
      toolbar: true,
      isRelatedToTab: true,
@@ -910,7 +911,7 @@ export function registerFileCommands({
    registerCommand({
      id: idPrefix + '.kill',
      category,
-      name: 'Kill',
+      name: __t('command.kill', { defaultMessage: 'Kill' }),
      icon: 'icon close',
      toolbar: true,
      isRelatedToTab: true,
@@ -923,7 +924,7 @@ export function registerFileCommands({
    registerCommand({
      id: idPrefix + '.toggleComment',
      category,
-      name: 'Toggle comment',
+      name: __t('command.toggleComment', { defaultMessage: 'Toggle comment' }),
      keyText: 'CtrlOrCommand+/',
      disableHandleKeyText: 'CtrlOrCommand+/',
      testEnabled: () => getCurrentEditor() != null,
@@ -935,7 +936,7 @@ export function registerFileCommands({
    registerCommand({
      id: idPrefix + '.copy',
      category,
-      name: 'Copy',
+      name: __t('command.copy', { defaultMessage: 'Copy' }),
      disableHandleKeyText: 'CtrlOrCommand+C',
      testEnabled: () => getCurrentEditor() != null,
      onClick: () => getCurrentEditor().copy(),
@@ -943,7 +944,7 @@ export function registerFileCommands({
    registerCommand({
      id: idPrefix + '.paste',
      category,
-      name: 'Paste',
+      name: __t('command.paste', { defaultMessage: 'Paste' }),
      disableHandleKeyText: 'CtrlOrCommand+V',
      testEnabled: () => getCurrentEditor() != null,
      onClick: () => getCurrentEditor().paste(),
@@ -954,7 +955,7 @@ export function registerFileCommands({
    registerCommand({
      id: idPrefix + '.find',
      category,
-      name: 'Find',
+      name: __t('command.find', { defaultMessage: 'Find' }),
      keyText: 'CtrlOrCommand+F',
      testEnabled: () => getCurrentEditor() != null,
      onClick: () => getCurrentEditor().find(),
@@ -963,7 +964,7 @@ export function registerFileCommands({
      id: idPrefix + '.replace',
      category,
      keyText: isMac() ? 'Alt+Command+F' : 'CtrlOrCommand+H',
-      name: 'Replace',
+      name: __t('command.replace', { defaultMessage: 'Replace' }),
      testEnabled: () => getCurrentEditor() != null,
      onClick: () => getCurrentEditor().replace(),
    });
@@ -972,7 +973,7 @@ export function registerFileCommands({
    registerCommand({
      id: idPrefix + '.undo',
      category,
-      name: 'Undo',
+      name: __t('command.undo', { defaultMessage: 'Undo' }),
      group: 'undo',
      icon: 'icon undo',
      testEnabled: () => getCurrentEditor()?.canUndo(),
@@ -982,7 +983,7 @@ export function registerFileCommands({
      id: idPrefix + '.redo',
      category,
      group: 'redo',
-      name: 'Redo',
+      name: __t('command.redo', { defaultMessage: 'Redo' }),
      icon: 'icon redo',
      testEnabled: () => getCurrentEditor()?.canRedo(),
      onClick: () => getCurrentEditor().redo(),
@@ -992,24 +993,24 @@ export function registerFileCommands({

 registerCommand({
  id: 'app.minimize',
-  category: 'Application',
-  name: 'Minimize',
+  category: __t('command.application', { defaultMessage: 'Application' }),
+  name: __t('command.application.minimize', { defaultMessage: 'Minimize' }),
  testEnabled: () => getElectron() != null,
  onClick: () => getElectron().send('window-action', 'minimize'),
 });

 registerCommand({
  id: 'app.maximize',
-  category: 'Application',
-  name: 'Maximize',
+  category: __t('command.application', { defaultMessage: 'Application' }),
+  name: __t('command.application.maximize', { defaultMessage: 'Maximize' }),
  testEnabled: () => getElectron() != null,
  onClick: () => getElectron().send('window-action', 'maximize'),
 });

 registerCommand({
  id: 'app.toggleFullScreen',
-  category: 'Application',
-  name: 'Toggle full screen',
+  category: __t('command.application', { defaultMessage: 'Application' }),
+  name: __t('command.application.toggleFullScreen', { defaultMessage: 'Toggle full screen' }),
  keyText: 'F11',
  testEnabled: () => getElectron() != null,
  onClick: async () => {
@@ -1023,45 +1024,45 @@ registerCommand({

 registerCommand({
  id: 'app.toggleDevTools',
-  category: 'Application',
-  name: 'Toggle Dev Tools',
+  category: __t('command.application', { defaultMessage: 'Application' }),
+  name: __t('command.application.toggleDevTools', { defaultMessage: 'Toggle Dev Tools' }),
  testEnabled: () => getElectron() != null,
  onClick: () => getElectron().send('window-action', 'devtools'),
 });

 registerCommand({
  id: 'app.reload',
-  category: 'Application',
-  name: 'Reload',
+  category: __t('command.application', { defaultMessage: 'Application' }),
+  name: __t('command.application.reload', { defaultMessage: 'Reload' }),
  testEnabled: () => getElectron() != null,
  onClick: () => getElectron().send('window-action', 'reload'),
 });

 registerCommand({
  id: 'app.openDocs',
-  category: 'Application',
-  name: 'Documentation',
+  category: __t('command.application', { defaultMessage: 'Application' }),
+  name: __t('command.application.documentation', { defaultMessage: 'Documentation' }),
  onClick: () => openWebLink('https://docs.dbgate.io/'),
 });

 registerCommand({
  id: 'app.openWeb',
-  category: 'Application',
-  name: 'DbGate web',
+  category: __t('command.application', { defaultMessage: 'Application' }),
+  name: __t('command.application.web', { defaultMessage: 'DbGate web' }),
  onClick: () => openWebLink('https://www.dbgate.io/'),
 });

 registerCommand({
  id: 'app.openIssue',
-  category: 'Application',
-  name: 'Report problem or feature request',
+  category: __t('command.application', { defaultMessage: 'Application' }),
+  name: __t('command.application.openIssue', { defaultMessage: 'Report problem or feature request' }),
  onClick: () => openWebLink('https://github.com/dbgate/dbgate/issues/new'),
 });

 registerCommand({
  id: 'app.openSponsoring',
-  category: 'Application',
-  name: 'Become sponsor',
+  category: __t('command.application', { defaultMessage: 'Application' }),
+  name: __t('command.application.becomeSponsor', { defaultMessage: 'Become sponsor' }),
  testEnabled: () => !isProApp(),
  onClick: () => openWebLink('https://opencollective.com/dbgate'),
 });
@@ -1075,8 +1076,8 @@ registerCommand({

 registerCommand({
  id: 'app.zoomIn',
-  category: 'Application',
-  name: 'Zoom in',
+  category: __t('command.application', { defaultMessage: 'Application' }),
+  name: __t('command.application.zoomIn', { defaultMessage: 'Zoom in' }),
  keyText: 'CtrlOrCommand+=',
  testEnabled: () => getElectron() != null,
  onClick: () => getElectron().send('window-action', 'zoomin'),
@@ -1084,8 +1085,8 @@ registerCommand({

 registerCommand({
  id: 'app.zoomOut',
-  category: 'Application',
-  name: 'Zoom out',
+  category: __t('command.application', { defaultMessage: 'Application' }),
+  name: __t('command.application.zoomOut', { defaultMessage: 'Zoom out' }),
  keyText: 'CtrlOrCommand+-',
  testEnabled: () => getElectron() != null,
  onClick: () => getElectron().send('window-action', 'zoomout'),
@@ -1093,16 +1094,16 @@ registerCommand({

 registerCommand({
  id: 'app.zoomReset',
-  category: 'Application',
-  name: 'Reset zoom',
+  category: __t('command.application', { defaultMessage: 'Application' }),
+  name: __t('command.application.zoomReset', { defaultMessage: 'Reset zoom' }),
  testEnabled: () => getElectron() != null,
  onClick: () => getElectron().send('window-action', 'zoomreset'),
 });

 registerCommand({
  id: 'edit.undo',
-  category: 'Edit',
-  name: 'Undo',
+  category: __t('command.edit', { defaultMessage: 'Edit' }),
+  name: __t('command.edit.undo', { defaultMessage: 'Undo' }),
  keyText: 'CtrlOrCommand+Z',
  systemCommand: true,
  testEnabled: () => getElectron() != null,
@@ -1111,8 +1112,8 @@ registerCommand({

 registerCommand({
  id: 'edit.redo',
-  category: 'Edit',
-  name: 'Redo',
+  category: __t('command.edit', { defaultMessage: 'Edit' }),
+  name: __t('command.edit.redo', { defaultMessage: 'Redo' }),
  systemCommand: true,
  testEnabled: () => getElectron() != null,
  onClick: () => getElectron().send('window-action', 'redo'),
@@ -1120,8 +1121,8 @@ registerCommand({

 registerCommand({
  id: 'edit.cut',
-  category: 'Edit',
-  name: 'Cut',
+  category: __t('command.edit', { defaultMessage: 'Edit' }),
+  name: __t('command.edit.cut', { defaultMessage: 'Cut' }),
  keyText: 'CtrlOrCommand+X',
  systemCommand: true,
  testEnabled: () => getElectron() != null,
@@ -1130,8 +1131,8 @@ registerCommand({

 registerCommand({
  id: 'edit.copy',
-  category: 'Edit',
-  name: 'Copy',
+  category: __t('command.edit', { defaultMessage: 'Edit' }),
+  name: __t('command.edit.copy', { defaultMessage: 'Copy' }),
  keyText: 'CtrlOrCommand+C',
  systemCommand: true,
  testEnabled: () => getElectron() != null,
@@ -1140,8 +1141,8 @@ registerCommand({

 registerCommand({
  id: 'edit.paste',
-  category: 'Edit',
-  name: 'Paste',
+  category: __t('command.edit', { defaultMessage: 'Edit' }),
+  name: __t('command.edit.paste', { defaultMessage: 'Paste' }),
  keyText: 'CtrlOrCommand+V',
  systemCommand: true,
  testEnabled: () => getElectron() != null,
@@ -1150,8 +1151,8 @@ registerCommand({

 registerCommand({
  id: 'edit.selectAll',
-  category: 'Edit',
-  name: 'Select All',
+  category: __t('command.edit', { defaultMessage: 'Edit' }),
+  name: __t('command.edit.selectAll', { defaultMessage: 'Select All' }),
  keyText: 'CtrlOrCommand+A',
  systemCommand: true,
  testEnabled: () => getElectron() != null,
@@ -1160,8 +1161,8 @@ registerCommand({

 registerCommand({
  id: 'app.unsetCurrentDatabase',
-  category: 'Application',
-  name: 'Unset current database',
+  category: __t('command.application', { defaultMessage: 'Application' }),
+  name: __t('command.application.unsetCurrentDatabase', { defaultMessage: 'Unset current database' }),
  testEnabled: () => getCurrentDatabase() != null,
  onClick: () => currentDatabase.set(null),
 });
@@ -1170,8 +1171,8 @@ let loadedCampaignList = [];

 registerCommand({
  id: 'internal.loadCampaigns',
-  category: 'Internal',
-  name: 'Load campaign list',
+  category: __t('command.internal', { defaultMessage: 'Internal' }),
+  name: __t('command.internal.loadCampaigns', { defaultMessage: 'Load campaign list' }),
  testEnabled: () => getBoolSettingsValue('internal.showCampaigns', false),
  onClick: async () => {
    const resp = await apiCall('cloud/promo-widget-list', {});
@@ -1181,8 +1182,8 @@ registerCommand({

 registerCommand({
  id: 'internal.showCampaigns',
-  category: 'Internal',
-  name: 'Show campaigns',
+  category: __t('command.internal', { defaultMessage: 'Internal' }),
+  name: __t('command.internal.showCampaigns', { defaultMessage: 'Show campaigns' }),
  testEnabled: () => getBoolSettingsValue('internal.showCampaigns', false) && loadedCampaignList?.length > 0,
  getSubCommands: () => {
    return loadedCampaignList.map(campaign => ({
@@ -3,16 +3,16 @@

  registerCommand({
    id: 'collectionDataGrid.openQuery',
-    category: 'Data grid',
-    name: 'Open query',
+    category: __t('command.dataGrid', { defaultMessage: 'Data grid' }),
+    name: __t('command.dataGrid.openQuery', { defaultMessage: 'Open query' }),
    testEnabled: () => getCurrentEditor() != null,
    onClick: () => getCurrentEditor().openQuery(),
  });

  registerCommand({
    id: 'collectionDataGrid.export',
-    category: 'Data grid',
-    name: 'Export',
+    category: __t('command.dataGrid', { defaultMessage: 'Data grid' }),
+    name: __t('command.dataGrid.export', { defaultMessage: 'Export' }),
    keyText: 'CtrlOrCommand+E',
    icon: 'icon export',
    testEnabled: () => getCurrentEditor() != null,
@@ -140,6 +140,7 @@
  import LoadingDataGridCore from './LoadingDataGridCore.svelte';
  import { mongoFilterBehaviour, standardFilterBehaviours } from 'dbgate-tools';
  import { openImportExportTab } from '../utility/importExportTools';
+  import { __t } from '../translations';

  export let conid;
  export let display;
@@ -3,8 +3,8 @@

  registerCommand({
    id: 'dataGrid.switchToForm',
-    category: 'Data grid',
-    name: 'Switch to form',
+    category: __t('command.datagrid', { defaultMessage: 'Data grid' }),
+    name: __t('command.datagrid.switchToform', { defaultMessage: 'Switch to form' }),
    icon: 'icon form',
    keyText: 'F4',
    testEnabled: () => getCurrentEditor()?.switchViewEnabled('form'),
@@ -13,8 +13,8 @@

  registerCommand({
    id: 'dataGrid.switchToJson',
-    category: 'Data grid',
-    name: 'Switch to JSON',
+    category: __t('command.datagrid', { defaultMessage: 'Data grid' }),
+    name: __t('command.datagrid.switchToJSON', { defaultMessage: 'Switch to JSON' }),
    icon: 'icon json',
    keyText: 'F4',
    testEnabled: () => getCurrentEditor()?.switchViewEnabled('json'),
@@ -23,8 +23,8 @@

  registerCommand({
    id: 'dataGrid.switchToTable',
-    category: 'Data grid',
-    name: 'Switch to table',
+    category: __t('command.datagrid', { defaultMessage: 'Data grid' }),
+    name: __t('command.datagrid.witchToTable', { defaultMessage: 'Switch to table'}),
    icon: 'icon table',
    keyText: 'F4',
    testEnabled: () => getCurrentEditor()?.switchViewEnabled('table'),
@@ -33,8 +33,8 @@

  registerCommand({
    id: 'dataGrid.toggleLeftPanel',
-    category: 'Data grid',
-    name: 'Toggle left panel',
+    category: __t('command.datagrid', { defaultMessage: 'Data grid' }),
+    name: __t('command.datagrid.toggleLeftPanel', { defaultMessage: 'Toggle left panel' }),
    keyText: 'CtrlOrCommand+L',
    testEnabled: () => getCurrentEditor()?.canShowLeftPanel(),
    onClick: () => getCurrentEditor().toggleLeftPanel(),
@@ -68,6 +68,7 @@
  import registerCommand from '../commands/registerCommand';
  import { registerMenu } from '../utility/contextMenu';
  import { getLocalStorage, setLocalStorage } from '../utility/storageCache';
+  import { __t, _t } from '../translations';
  import { isProApp } from '../utility/proTools';

  export let config;
@@ -174,7 +175,7 @@
  <div class="left" slot="1">
    <WidgetColumnBar>
      <WidgetColumnBarItem
-        title="Columns"
+        title={_t('dataGrid.columns', { defaultMessage: 'Columns' })}
        name="columns"
        height="45%"
        skip={isFormView}
@@ -184,7 +185,7 @@
      </WidgetColumnBarItem>

      <WidgetColumnBarItem
-        title="Filters"
+        title={_t('dataGrid.filters', { defaultMessage: 'Filters' })}
        name="filters"
        height={showReferences && display?.hasReferences && !isFormView ? '15%' : '30%'}
        skip={!display?.filterable}
@@ -202,7 +203,7 @@
      </WidgetColumnBarItem>

      <WidgetColumnBarItem
-        title="References"
+        title={_t('dataGrid.references', { defaultMessage: 'References' })}
        name="references"
        height="30%"
        collapsed={isDetailView}
@@ -213,7 +214,7 @@
      </WidgetColumnBarItem>

      <WidgetColumnBarItem
-        title="Macros"
+        title={_t('dataGrid.macros', { defaultMessage: 'Macros' })}
        name="macros"
        skip={!(showMacros && isProApp())}
        collapsed={!expandMacros}
@@ -3,8 +3,8 @@

  registerCommand({
    id: 'dataGrid.refresh',
-    category: 'Data grid',
-    name: _t('common.refresh', { defaultMessage: 'Refresh' }),
+    category: __t('command.datagrid', { defaultMessage: 'Data grid' }),
+    name: __t('common.refresh', { defaultMessage: 'Refresh' }),
    keyText: 'F5 | CtrlOrCommand+R',
    toolbar: true,
    isRelatedToTab: true,
@@ -15,8 +15,8 @@

  registerCommand({
    id: 'dataGrid.deepRefresh',
-    category: 'Data grid',
-    name: 'Refresh with structure',
+    category: __t('command.datagrid', { defaultMessage: 'Data grid' }),
+    name: __t('common.datagrid.deepRefresh', { defaultMessage: 'Refresh with structure' }),
    keyText: 'Ctrl+F5',
    toolbar: true,
    isRelatedToTab: true,
@@ -27,8 +27,8 @@

  registerCommand({
    id: 'dataGrid.revertRowChanges',
-    category: 'Data grid',
-    name: _t('command.datagrid.revertRowChanges', { defaultMessage: 'Revert row changes' }),
+    category: __t('command.datagrid', { defaultMessage: 'Data grid' }),
+    name: __t('command.datagrid.revertRowChanges', { defaultMessage: 'Revert row changes' }),
    keyText: 'CtrlOrCommand+U',
    testEnabled: () => getCurrentDataGrid()?.getGrider()?.containsChanges,
    onClick: () => getCurrentDataGrid().revertRowChanges(),
@@ -36,9 +36,9 @@

  registerCommand({
    id: 'dataGrid.revertAllChanges',
-    category: 'Data grid',
-    name: _t('command.datagrid.revertAllChanges', { defaultMessage: 'Revert all changes' }),
-    toolbarName: _t('command.datagrid.revertAllChanges.toolbar', { defaultMessage: 'Revert all' }),
+    category: __t('command.datagrid', { defaultMessage: 'Data grid' }),
+    name: __t('command.datagrid.revertAllChanges', { defaultMessage: 'Revert all changes' }),
+    toolbarName: __t('command.datagrid.revertAllChanges.toolbar', { defaultMessage: 'Revert all' }),
    icon: 'icon undo',
    testEnabled: () => getCurrentDataGrid()?.getGrider()?.containsChanges,
    onClick: () => getCurrentDataGrid().revertAllChanges(),
@@ -46,9 +46,9 @@

  registerCommand({
    id: 'dataGrid.deleteSelectedRows',
-    category: 'Data grid',
-    name: _t('command.datagrid.deleteSelectedRows', { defaultMessage: 'Delete selected rows' }),
-    toolbarName: _t('command.datagrid.deleteSelectedRows.toolbar', { defaultMessage: 'Delete row(s)' }),
+    category: __t('command.datagrid', { defaultMessage: 'Data grid' }),
+    name: __t('command.datagrid.deleteSelectedRows', { defaultMessage: 'Delete selected rows' }),
+    toolbarName: __t('command.datagrid.deleteSelectedRows.toolbar', { defaultMessage: 'Delete row(s)' }),
    keyText: isMac() ? 'Command+Backspace' : 'CtrlOrCommand+Delete',
    icon: 'icon minus',
    testEnabled: () => getCurrentDataGrid()?.getGrider()?.editable,
@@ -57,9 +57,9 @@

  registerCommand({
    id: 'dataGrid.insertNewRow',
-    category: 'Data grid',
-    name: _t('command.datagrid.insertNewRow', { defaultMessage: 'Insert new row' }),
-    toolbarName: _t('command.datagrid.insertNewRow.toolbar', { defaultMessage: 'New row' }),
+    category: __t('command.datagrid', { defaultMessage: 'Data grid' }),
+    name: __t('command.datagrid.insertNewRow', { defaultMessage: 'Insert new row' }),
+    toolbarName: __t('command.datagrid.insertNewRow.toolbar', { defaultMessage: 'New row' }),
    icon: 'icon add',
    keyText: isMac() ? 'Command+I' : 'Insert',
    testEnabled: () => getCurrentDataGrid()?.getGrider()?.editable,
@@ -68,9 +68,9 @@

  registerCommand({
    id: 'dataGrid.addNewColumn',
-    category: 'Data grid',
-    name: _t('command.datagrid.addNewColumn', { defaultMessage: 'Add new column' }),
-    toolbarName: _t('command.datagrid.addNewColumn.toolbar', { defaultMessage: 'New column' }),
+    category: __t('command.datagrid', { defaultMessage: 'Data grid' }),
+    name: __t('command.datagrid.addNewColumn', { defaultMessage: 'Add new column' }),
+    toolbarName: __t('command.datagrid.addNewColumn.toolbar', { defaultMessage: 'New column' }),
    icon: 'icon add-column',
    testEnabled: () => getCurrentDataGrid()?.addNewColumnEnabled(),
    onClick: () => getCurrentDataGrid().addNewColumn(),
@@ -78,9 +78,9 @@

  registerCommand({
    id: 'dataGrid.cloneRows',
-    category: 'Data grid',
-    name: _t('command.datagrid.cloneRows', { defaultMessage: 'Clone rows' }),
-    toolbarName: _t('command.datagrid.cloneRows.toolbar', { defaultMessage: 'Clone row(s)' }),
+    category: __t('command.datagrid', { defaultMessage: 'Data grid' }),
+    name: __t('command.datagrid.cloneRows', { defaultMessage: 'Clone rows' }),
+    toolbarName: __t('command.datagrid.cloneRows.toolbar', { defaultMessage: 'Clone row(s)' }),
    keyText: 'CtrlOrCommand+Shift+C',
    testEnabled: () => getCurrentDataGrid()?.getGrider()?.editable,
    onClick: () => getCurrentDataGrid().cloneRows(),
@@ -88,8 +88,8 @@

  registerCommand({
    id: 'dataGrid.setNull',
-    category: 'Data grid',
-    name: _t('command.datagrid.setNull', { defaultMessage: 'Set NULL' }),
+    category: __t('command.datagrid', { defaultMessage: 'Data grid' }),
+    name: __t('command.datagrid.setNull', { defaultMessage: 'Set NULL' }),
    keyText: 'CtrlOrCommand+0',
    testEnabled: () =>
      getCurrentDataGrid()?.getGrider()?.editable && !getCurrentDataGrid()?.getEditorTypes()?.supportFieldRemoval,
@@ -98,8 +98,8 @@

  registerCommand({
    id: 'dataGrid.removeField',
-    category: 'Data grid',
-    name: _t('command.datagrid.removeField', { defaultMessage: 'Remove field' }),
+    category: __t('command.datagrid', { defaultMessage: 'Data grid' }),
+    name: __t('command.datagrid.removeField', { defaultMessage: 'Remove field' }),
    keyText: 'CtrlOrCommand+0',
    testEnabled: () =>
      getCurrentDataGrid()?.getGrider()?.editable && getCurrentDataGrid()?.getEditorTypes()?.supportFieldRemoval,
@@ -108,8 +108,8 @@

  registerCommand({
    id: 'dataGrid.undo',
-    category: 'Data grid',
-    name: _t('command.datagrid.undo', { defaultMessage: 'Undo' }),
+    category: __t('command.datagrid', { defaultMessage: 'Data grid' }),
+    name: __t('command.datagrid.undo', { defaultMessage: 'Undo' }),
    group: 'undo',
    icon: 'icon undo',
    toolbar: true,
@@ -120,8 +120,8 @@

  registerCommand({
    id: 'dataGrid.redo',
-    category: 'Data grid',
-    name: _t('command.datagrid.redo', { defaultMessage: 'Redo' }),
+    category: __t('command.datagrid', { defaultMessage: 'Data grid' }),
+    name: __t('command.datagrid.redo', { defaultMessage: 'Redo' }),
    group: 'redo',
    icon: 'icon redo',
    toolbar: true,
@@ -132,16 +132,16 @@

  registerCommand({
    id: 'dataGrid.reconnect',
-    category: 'Data grid',
-    name: _t('command.datagrid.reconnect', { defaultMessage: 'Reconnect' }),
+    category: __t('command.datagrid', { defaultMessage: 'Data grid' }),
+    name: __t('command.datagrid.reconnect', { defaultMessage: 'Reconnect' }),
    testEnabled: () => getCurrentDataGrid() != null,
    onClick: () => getCurrentDataGrid().reconnect(),
  });

  registerCommand({
    id: 'dataGrid.copyToClipboard',
-    category: 'Data grid',
-    name: _t('command.datagrid.copyToClipboard', { defaultMessage: 'Copy to clipboard' }),
+    category: __t('command.datagrid', { defaultMessage: 'Data grid' }),
+    name: __t('command.datagrid.copyToClipboard', { defaultMessage: 'Copy to clipboard' }),
    keyText: 'CtrlOrCommand+C',
    disableHandleKeyText: 'CtrlOrCommand+C',
    testEnabled: () => getCurrentDataGrid() != null,
@@ -150,57 +150,57 @@

  registerCommand({
    id: 'dataGrid.editJsonDocument',
-    category: 'Data grid',
+    category: __t('command.datagrid', { defaultMessage: 'Data grid' }),
    keyText: 'CtrlOrCommand+J',
-    name: _t('command.datagrid.editJsonDocument', { defaultMessage: 'Edit row as JSON document' }),
+    name: __t('command.datagrid.editJsonDocument', { defaultMessage: 'Edit row as JSON document' }),
    testEnabled: () => getCurrentDataGrid()?.editJsonEnabled(),
    onClick: () => getCurrentDataGrid().editJsonDocument(),
  });

  registerCommand({
    id: 'dataGrid.openSelectionInMap',
-    category: 'Data grid',
-    name: _t('command.datagrid.openSelectionInMap', { defaultMessage: 'Open selection in map' }),
+    category: __t('command.datagrid', { defaultMessage: 'Data grid' }),
+    name: __t('command.datagrid.openSelectionInMap', { defaultMessage: 'Open selection in map' }),
    testEnabled: () => getCurrentDataGrid() != null,
    onClick: () => getCurrentDataGrid().openSelectionInMap(),
  });

  registerCommand({
    id: 'dataGrid.viewJsonDocument',
-    category: 'Data grid',
-    name: _t('command.datagrid.viewJsonDocument', { defaultMessage: 'View row as JSON document' }),
+    category: __t('command.datagrid', { defaultMessage: 'Data grid' }),
+    name: __t('command.datagrid.viewJsonDocument', { defaultMessage: 'View row as JSON document' }),
    testEnabled: () => getCurrentDataGrid()?.viewJsonDocumentEnabled(),
    onClick: () => getCurrentDataGrid().viewJsonDocument(),
  });

  registerCommand({
    id: 'dataGrid.viewJsonValue',
-    category: 'Data grid',
-    name: _t('command.datagrid.viewJsonValue', { defaultMessage: 'View cell as JSON document' }),
+    category: __t('command.datagrid', { defaultMessage: 'Data grid' }),
+    name: __t('command.datagrid.viewJsonValue', { defaultMessage: 'View cell as JSON document' }),
    testEnabled: () => getCurrentDataGrid()?.viewJsonValueEnabled(),
    onClick: () => getCurrentDataGrid().viewJsonValue(),
  });

  registerCommand({
    id: 'dataGrid.openJsonArrayInSheet',
-    category: 'Data grid',
-    name: _t('command.datagrid.openJsonArrayInSheet', { defaultMessage: 'Open array as table' }),
+    category: __t('command.datagrid', { defaultMessage: 'Data grid' }),
+    name: __t('command.datagrid.openJsonArrayInSheet', { defaultMessage: 'Open array as table' }),
    testEnabled: () => getCurrentDataGrid()?.openJsonArrayInSheetEnabled(),
    onClick: () => getCurrentDataGrid().openJsonArrayInSheet(),
  });

  registerCommand({
    id: 'dataGrid.saveCellToFile',
-    category: 'Data grid',
-    name: _t('command.datagrid.saveCellToFile', { defaultMessage: 'Save cell to file' }),
+    category: __t('command.datagrid', { defaultMessage: 'Data grid' }),
+    name: __t('command.datagrid.saveCellToFile', { defaultMessage: 'Save cell to file' }),
    testEnabled: () => getCurrentDataGrid()?.saveCellToFileEnabled(),
    onClick: () => getCurrentDataGrid().saveCellToFile(),
  });

  registerCommand({
    id: 'dataGrid.loadCellFromFile',
-    category: 'Data grid',
-    name: _t('command.datagrid.loadCellFromFile', { defaultMessage: 'Load cell from file' }),
+    category: __t('command.datagrid', { defaultMessage: 'Data grid' }),
+    name: __t('command.datagrid.loadCellFromFile', { defaultMessage: 'Load cell from file' }),
    testEnabled: () => getCurrentDataGrid()?.loadCellFromFileEnabled(),
    onClick: () => getCurrentDataGrid().loadCellFromFile(),
  });
@@ -216,62 +216,62 @@
  //
  registerCommand({
    id: 'dataGrid.filterSelected',
-    category: 'Data grid',
-    name: 'Filter selected value',
+    category: __t('command.datagrid', { defaultMessage: 'Data grid' }),
+    name: __t('command.datagrid.filterSelected', { defaultMessage : 'Filter selected value'}),
    keyText: 'CtrlOrCommand+Shift+F',
    testEnabled: () => getCurrentDataGrid()?.getDisplay().filterable,
    onClick: () => getCurrentDataGrid().filterSelectedValue(),
  });
  registerCommand({
    id: 'dataGrid.findColumn',
-    category: 'Data grid',
-    name: 'Find column',
+    category: __t('command.datagrid', { defaultMessage: 'Data grid' }),
+    name: __t('command.datagrid.findColumn', { defaultMessage: 'Find column'}),
    keyText: 'CtrlOrCommand+F',
    testEnabled: () => getCurrentDataGrid() != null,
    getSubCommands: () => getCurrentDataGrid().buildFindMenu(),
  });
  registerCommand({
    id: 'dataGrid.hideColumn',
-    category: 'Data grid',
-    name: 'Hide column',
+    category: __t('command.datagrid', { defaultMessage: 'Data grid' }),
+    name: __t('command.datgrid.hideColumn', { defaultMessage: 'Hide column' }),
    keyText: isMac() ? 'Alt+Command+F' : 'CtrlOrCommand+H',
    testEnabled: () => getCurrentDataGrid()?.canShowLeftPanel(),
    onClick: () => getCurrentDataGrid().hideColumn(),
  });
  registerCommand({
    id: 'dataGrid.clearFilter',
-    category: 'Data grid',
-    name: 'Clear filter',
+    category: __t('command.datagrid', { defaultMessage: 'Data grid' }),
+    name: __t('command.datagrid.clearFilter', { defaultMessage : 'Clear filter'}),
    keyText: 'CtrlOrCommand+Shift+E',
    testEnabled: () => getCurrentDataGrid()?.clearFilterEnabled(),
    onClick: () => getCurrentDataGrid().clearFilter(),
  });
  registerCommand({
    id: 'dataGrid.generateSqlFromData',
-    category: 'Data grid',
-    name: 'Generate SQL',
+    category: __t('command.datagrid', { defaultMessage: 'Data grid' }),
+    name: __t('command.datagrid.generateSql', { defaultMessage: 'Generate SQL'}),
    keyText: 'CtrlOrCommand+G',
    testEnabled: () => getCurrentDataGrid()?.generateSqlFromDataEnabled(),
    onClick: () => getCurrentDataGrid().generateSqlFromData(),
  });
  registerCommand({
    id: 'dataGrid.openFreeTable',
-    category: 'Data grid',
-    name: 'Edit selection as table',
+    category: __t('command.datagrid', { defaultMessage: 'Data grid' }),
+    name: __t('command.datagrid.editSelection', { defaultMessage: 'Edit selection as table'}),
    testEnabled: () => getCurrentDataGrid() != null,
    onClick: () => getCurrentDataGrid().openFreeTable(),
  });
  registerCommand({
    id: 'dataGrid.newJson',
-    category: 'Data grid',
-    name: 'Add JSON document',
+    category: __t('command.datagrid', { defaultMessage: 'Data grid' }),
+    name: __t('command.datagrid.addJsonDocument', { defaultMessage: 'Add JSON document'}),
    testEnabled: () => getCurrentDataGrid()?.addJsonDocumentEnabled(),
    onClick: () => getCurrentDataGrid().addJsonDocument(),
  });
  registerCommand({
    id: 'dataGrid.editCellValue',
-    category: 'Data grid',
-    name: 'Edit cell value',
+    category: __t('command.datagrid', { defaultMessage: 'Data grid' }),
+    name: __t('command.datagrid.editCell', { defaultMessage: 'Edit cell value' }),
    testEnabled: () => getCurrentDataGrid()?.editCellValueEnabled(),
    onClick: () => getCurrentDataGrid().editCellValue(),
  });
@@ -279,8 +279,8 @@
  if (isProApp()) {
    registerCommand({
      id: 'dataGrid.sendToDataDeploy',
-      category: 'Data grid',
-      name: 'Send to data deployer',
+      category: __t('command.datagrid', { defaultMessage: 'Data grid' }),
+      name: __t('command.datagrid.sendToDataDeployer', { defaultMessage: 'Send to data deployer' }),
      testEnabled: () => getCurrentDataGrid()?.sendToDataDeployEnabled(),
      onClick: () => getCurrentDataGrid().sendToDataDeploy(),
    });
@@ -361,6 +361,7 @@
    detectSqlFilterBehaviour,
    stringifyCellValue,
    shouldOpenMultilineDialog,
+    base64ToHex,
  } from 'dbgate-tools';
  import { getContext, onDestroy } from 'svelte';
  import _, { map } from 'lodash';
@@ -421,7 +422,7 @@
  import { openJsonLinesData } from '../utility/openJsonLinesData';
  import contextMenuActivator from '../utility/contextMenuActivator';
  import InputTextModal from '../modals/InputTextModal.svelte';
-  import { _t } from '../translations';
+  import { __t, _t, _val } from '../translations';
  import { isProApp } from '../utility/proTools';
  import SaveArchiveModal from '../modals/SaveArchiveModal.svelte';
  import hasPermission from '../utility/hasPermission';
@@ -758,7 +759,7 @@

  export function saveCellToFileEnabled() {
    const value = getSelectedExportableCell();
-    return _.isString(value) || (value?.type == 'Buffer' && _.isArray(value?.data));
+    return _.isString(value) || (value?.type == 'Buffer' && _.isArray(value?.data)) || (value?.$binary?.base64);
  }

  export async function saveCellToFile() {
@@ -771,6 +772,8 @@
        fs.promises.writeFile(file, value);
      } else if (value?.type == 'Buffer' && _.isArray(value?.data)) {
        fs.promises.writeFile(file, window['Buffer'].from(value.data));
+      } else if (value?.$binary?.base64) {
+        fs.promises.writeFile(file, window['Buffer'].from(value.$binary.base64, 'base64'));
      }
    }
  }
@@ -796,8 +799,9 @@
        isText
          ? data
          : {
-              type: 'Buffer',
-              data: [...data],
+              $binary: {
+                base64: data.toString('base64'),
+              },
            }
      );
    }
@@ -1413,7 +1417,11 @@

  function handleGridWheel(event) {
    if (event.shiftKey) {
-      scrollHorizontal(event.deltaY, event.deltaX);
+      if (isMac()) {
+        scrollHorizontal(event.deltaX, event.deltaY);
+      } else {
+        scrollHorizontal(event.deltaY, event.deltaX);
+      }
    } else {
      scrollHorizontal(event.deltaX, event.deltaY);
      scrollVertical(event.deltaX, event.deltaY);
@@ -1788,15 +1796,15 @@
    { command: 'dataGrid.refresh' },
    { placeTag: 'copy' },
    {
-      text: 'Copy advanced',
+      text: _t('datagrid.copyAdvanced', { defaultMessage: 'Copy advanced'}),
      submenu: [
        _.keys(copyRowsFormatDefs).map(format => ({
-          text: copyRowsFormatDefs[format].label,
+          text: _val(copyRowsFormatDefs[format].label),
          onClick: () => copyToClipboardCore(format),
        })),
        { divider: true },
        _.keys(copyRowsFormatDefs).map(format => ({
-          text: `Set format: ${copyRowsFormatDefs[format].name}`,
+          text: _t('datagrid.setFormat', { defaultMessage: 'Set format: ' }) + (_val(copyRowsFormatDefs[format].name)),
          onClick: () => ($copyRowsFormat = format),
        })),

@@ -1866,7 +1874,7 @@
    return [
      menu,
      {
-        text: copyRowsFormatDefs[$copyRowsFormat].label,
+        text: _val(copyRowsFormatDefs[$copyRowsFormat].label),
        onClick: () => copyToClipboardCore($copyRowsFormat),
        keyText: 'CtrlOrCommand+C',
        tag: 'copy',
@@ -3,8 +3,8 @@

  registerCommand({
    id: 'jslTableGrid.export',
-    category: 'Data grid',
-    name: 'Export',
+    category: __t('command.dataGrid', { defaultMessage: 'Data grid' }),
+    name: __t('command.dataGrid.export', { defaultMessage: 'Export' }),
    icon: 'icon export',
    keyText: 'CtrlOrCommand+E',
    testEnabled: () => getCurrentEditor() != null,
@@ -56,6 +56,7 @@

  import LoadingDataGridCore from './LoadingDataGridCore.svelte';
  import { openImportExportTab } from '../utility/importExportTools';
+  import { __t } from '../translations';

  export let jslid;
  export let display;
@@ -11,6 +11,8 @@
  import FontIcon from '../icons/FontIcon.svelte';
  import TokenizedFilteredText from '../widgets/TokenizedFilteredText.svelte';

+  import { _t } from '../translations';
+
  export let managerSize;
  export let display: GridDisplay;
  export let onReferenceClick = ref => {};
@@ -24,12 +26,12 @@
 </script>

 <SearchBoxWrapper>
-  <SearchInput placeholder="Search references" bind:value={filter} />
+  <SearchInput placeholder={_t('dataGrid.searchReferences', { defaultMessage: 'Search references' })} bind:value={filter} />
  <CloseSearchButton bind:filter />
 </SearchBoxWrapper>
 <ManagerInnerContainer width={managerSize}>
  {#if foreignKeys.length > 0}
-    <div class="bold nowrap ml-1">References tables ({foreignKeys.length})</div>
+    <div class="bold nowrap ml-1">{_t('dataGrid.referencesTables', { defaultMessage: 'References tables' })} ({foreignKeys.length})</div>
    {#each foreignKeys.filter(fk => filterName(filter, fk.refTableName)) as fk}
      <div
        class="link"
@@ -53,7 +55,7 @@
  {/if}

  {#if dependencies.length > 0}
-    <div class="bold nowrap ml-1">Dependent tables ({dependencies.length})</div>
+    <div class="bold nowrap ml-1">{_t('dataGrid.dependentTables', { defaultMessage: 'Dependent tables' })} ({dependencies.length})</div>
    {#each dependencies.filter(fk => filterName(filter, fk.pureName)) as fk}
      <div
        class="link"
@@ -1,18 +1,19 @@
 <script context="module" lang="ts">
+  import { __t } from '../translations'
  const getCurrentEditor = () => getActiveComponent('SqlDataGridCore');

  registerCommand({
    id: 'sqlDataGrid.openQuery',
-    category: 'Data grid',
-    name: 'Open query',
+    category: __t('command.datagrid', { defaultMessage: 'Data grid' }),
+    name: __t('command.openQuery', { defaultMessage : 'Open query' }),
    testEnabled: () => getCurrentEditor() != null && hasPermission('dbops/query'),
    onClick: () => getCurrentEditor().openQuery(),
  });

  registerCommand({
    id: 'sqlDataGrid.export',
-    category: 'Data grid',
-    name: 'Export',
+    category: __t('command.datagrid', { defaultMessage: 'Data grid' }),
+    name: __t('common.export', { defaultMessage : 'Export' }),
    icon: 'icon export',
    keyText: 'CtrlOrCommand+E',
    testEnabled: () => getCurrentEditor() != null && hasPermission('dbops/export'),
@@ -3,9 +3,9 @@

  registerCommand({
    id: 'designer.arrange',
-    category: 'Designer',
+    category: __t('command.designer', { defaultMessage: 'Designer' }),
    icon: 'icon arrange',
-    name: 'Arrange',
+    name: __t('command.designer.arrange', { defaultMessage: 'Arrange' }),
    toolbar: true,
    isRelatedToTab: true,
    testEnabled: () => getCurrentEditor()?.canArrange(),
@@ -15,9 +15,9 @@

  registerCommand({
    id: 'diagram.export',
-    category: 'Designer',
-    toolbarName: 'Export diagram',
-    name: 'Export diagram',
+    category: __t('command.designer', { defaultMessage: 'Designer' }),
+    toolbarName: __t('command.designer.exportDiagram', { defaultMessage: 'Export diagram' }),
+    name: __t('command.designer.exportDiagram', { defaultMessage: 'Export diagram' }),
    icon: 'icon report',
    toolbar: true,
    isRelatedToTab: true,
@@ -27,9 +27,9 @@

  registerCommand({
    id: 'diagram.deleteSelectedTables',
-    category: 'Designer',
-    toolbarName: 'Remove',
-    name: 'Remove selected tables',
+    category: __t('command.designer', { defaultMessage: 'Designer' }),
+    toolbarName: __t('command.designer.remove', { defaultMessage: 'Remove' }),
+    name: __t('command.designer.removeSelectedTables', { defaultMessage: 'Remove selected tables' }),
    icon: 'icon delete',
    toolbar: true,
    isRelatedToTab: true,
@@ -67,6 +67,7 @@
  import { isProApp } from '../utility/proTools';
  import dragScroll from '../utility/dragScroll';
  import FormStyledButton from '../buttons/FormStyledButton.svelte';
+  import { __t } from '../translations';

  export let value;
  export let onChange;
@@ -5,6 +5,7 @@

  import ObjectListControl from '../elements/ObjectListControl.svelte';
  import Link from './Link.svelte';
+  import { _t } from '../translations';

  export let collection;
  export let title;
@@ -24,18 +25,18 @@
  columns={[
    {
      fieldName: 'baseColumns',
-      header: 'Base columns',
+      header: _t('foreignKey.baseColumns', { defaultMessage: 'Base columns' }),
      slot: 0,
      sortable: true,
    },
    {
      fieldName: 'refTableName',
-      header: 'Referenced table',
+      header: _t('foreignKey.refTableName', { defaultMessage: 'Referenced table' }),
      sortable: true,
    },
    {
      fieldName: 'refColumns',
-      header: 'Referenced columns',
+      header: _t('foreignKey.refColumns', { defaultMessage: 'Referenced columns' }),
      slot: 1,
      sortable: true,
    },
@@ -60,5 +61,5 @@
  <svelte:fragment slot="name" let:row><ConstraintLabel {...row} /></svelte:fragment>
  <svelte:fragment slot="0" let:row>{row?.columns.map(x => x.columnName).join(', ')}</svelte:fragment>
  <svelte:fragment slot="1" let:row>{row?.columns.map(x => x.refColumnName).join(', ')}</svelte:fragment>
-  <svelte:fragment slot="2" let:row><Link onClick={() => onRemove(row)}>Remove</Link></svelte:fragment>
+  <svelte:fragment slot="2" let:row><Link onClick={() => onRemove(row)}>{_t('common.remove', { defaultMessage: 'Remove' })}</Link></svelte:fragment>
 </ObjectListControl>
@@ -4,6 +4,7 @@
  import Link from './Link.svelte';
  import TableControl from './TableControl.svelte';
  import { writable } from 'svelte/store';
+  import { _t } from '../translations';

  export let title;
  export let collection;
@@ -39,7 +40,7 @@
      </span>
      <span class="title mr-1">{title}</span>
      {#if onAddNew}
-        <Link onClick={onAddNew}><FontIcon icon="icon add" /> Add new</Link>
+        <Link onClick={onAddNew}><FontIcon icon="icon add" />{_t('common.addNew', { defaultMessage: 'Add new' })}</Link>
      {/if}
      {#if multipleItemsActions && activeMultipleSelection && activeMultipleSelection?.length > 0}
        {#each multipleItemsActions as item}
@@ -65,7 +66,7 @@
          columns={_.compact([
            !hideDisplayName && {
              fieldName: displayNameFieldName || 'displayName',
-              header: 'Name',
+              header: _t('common.name', { defaultMessage: 'Name' }),
              slot: -1,
              sortable: true,
              filterable: !!displayNameFieldName,
@@ -5,6 +5,8 @@
  import { onMount, afterUpdate } from 'svelte';

  export let code = '';
+  export let inline = false;
+  export let onClick = null;

  let domCode;

@@ -29,7 +31,11 @@
    The `sql` class hints the language; highlight.js will
    read it even though we register the grammar explicitly.
  -->
-  <pre bind:this={domCode} class="sql">{code}</pre>
+  {#if inline}
+    <span bind:this={domCode} class="sql" class:clickable={!!onClick} on:click={onClick}>{code}</span>
+  {:else}
+    <pre bind:this={domCode} class="sql" class:clickable={!!onClick} on:click={onClick}>{code}</pre>
+  {/if}
 {/key}

 <style>
@@ -38,4 +44,8 @@
    padding: 0;
    padding: 0.5em;
  }
+
+  .clickable {
+    cursor: pointer;
+  }
 </style>
@@ -27,6 +27,7 @@
  import { evaluateCondition } from 'dbgate-sqltree';
  import { compileCompoudEvalCondition } from 'dbgate-filterparser';
  import { chevronExpandIcon } from '../icons/expandIcons';
+  import { _val } from '../translations';

  export let columns: (TableControlColumn | false)[];
  export let rows = null;
@@ -368,7 +369,7 @@
                    {/if}
                  {/key}
                {:else}
-                  {row[col.fieldName] || ''}
+                  { _val(row[col.fieldName]) || '' }
                {/if}
              </td>
            {/each}
@@ -5,6 +5,7 @@

  import { getFormContext } from './FormProviderCore.svelte';
  import TextField from './TextField.svelte';
+  import { _t } from '../translations';

  export let name;
  export let disabled = false;
@@ -29,7 +30,7 @@
        setFieldValue(name, e.target['value']);
      }
    }}
-    placeholder={isCrypted ? '(Password is encrypted)' : undefined}
+    placeholder={isCrypted ? _t('common.passwordEncrypted', { defaultMessage: 'Password is encrypted' }) : undefined}
    type={isCrypted || showPassword ? 'text' : 'password'}
  />
  {#if !isCrypted}
@@ -1,6 +1,7 @@
 <script lang="ts">
  import { getFormContext } from './FormProviderCore.svelte';
  import TextField from './TextField.svelte';
+  import { _val } from '../translations';

  export let name;
  export let defaultValue;
@@ -11,7 +12,7 @@

 <TextField
  {...$$restProps}
-  value={$values?.[name] ?? defaultValue}
+  value={$values?.[name] ? _val($values[name]) : defaultValue}
  on:input={e => setFieldValue(name, e.target['value'])}
  on:input={e => {
    if (saveOnInput) {
@@ -3,8 +3,8 @@

  registerCommand({
    id: 'collectionJsonView.expandAll',
-    category: 'Collection data',
-    name: 'Expand all',
+    category: __t('command.collectionData', { defaultMessage: 'Collection data' }),
+    name: __t('command.collectionData.expandAll', { defaultMessage: 'Expand all' }),
    isRelatedToTab: true,
    icon: 'icon expand-all',
    onClick: () => getCurrentEditor().handleExpandAll(),
@@ -12,8 +12,8 @@
  });
  registerCommand({
    id: 'collectionJsonView.collapseAll',
-    category: 'Collection data',
-    name: 'Collapse all',
+    category: __t('command.collectionData', { defaultMessage: 'Collection data' }),
+    name: __t('command.collectionData.collapseAll', { defaultMessage: 'Collapse all' }),
    isRelatedToTab: true,
    icon: 'icon collapse-all',
    onClick: () => getCurrentEditor().handleCollapseAll(),
@@ -37,6 +37,7 @@
  import CollectionJsonRow from './CollectionJsonRow.svelte';
  import { getIntSettingsValue } from '../settings/settingsTools';
  import invalidateCommands from '../commands/invalidateCommands';
+  import { __t } from '../translations';

  export let conid;
  export let database;
@@ -14,8 +14,8 @@

  registerCommand({
    id: 'dataForm.refresh',
-    category: 'Data form',
-    name: _t('common.refresh', { defaultMessage: 'Refresh' }),
+    category: __t('command.dataForm', { defaultMessage: 'Data form' }),
+    name: __t('common.refresh', { defaultMessage: 'Refresh' }),
    keyText: 'F5 | CtrlOrCommand+R',
    toolbar: true,
    isRelatedToTab: true,
@@ -26,8 +26,8 @@

  registerCommand({
    id: 'dataForm.copyToClipboard',
-    category: 'Data form',
-    name: 'Copy to clipboard',
+    category: __t('command.dataForm', { defaultMessage: 'Data form' }),
+    name: __t('command.dataForm.copyToClipboard', { defaultMessage: 'Copy to clipboard' }),
    keyText: 'CtrlOrCommand+C',
    disableHandleKeyText: 'CtrlOrCommand+C',
    testEnabled: () => getCurrentDataForm() != null,
@@ -36,8 +36,8 @@

  registerCommand({
    id: 'dataForm.revertRowChanges',
-    category: 'Data form',
-    name: 'Revert row changes',
+    category: __t('command.dataForm', { defaultMessage: 'Data form' }),
+    name: __t('command.dataForm.revertRowChanges', { defaultMessage: 'Revert row changes' }),
    keyText: 'CtrlOrCommand+U',
    testEnabled: () => getCurrentDataForm()?.getGrider()?.containsChanges,
    onClick: () => getCurrentDataForm().getGrider().revertRowChanges(0),
@@ -45,8 +45,8 @@

  registerCommand({
    id: 'dataForm.setNull',
-    category: 'Data form',
-    name: 'Set NULL',
+    category: __t('command.dataForm', { defaultMessage: 'Data form' }),
+    name: __t('command.dataForm.setNull', { defaultMessage: 'Set NULL' }),
    keyText: 'CtrlOrCommand+0',
    testEnabled: () => getCurrentDataForm() != null && !getCurrentDataForm()?.getEditorTypes()?.supportFieldRemoval,
    onClick: () => getCurrentDataForm().setFixedValue(null),
@@ -54,8 +54,8 @@

  registerCommand({
    id: 'dataForm.removeField',
-    category: 'Data form',
-    name: 'Remove field',
+    category: __t('command.dataForm', { defaultMessage: 'Data form' }),
+    name: __t('command.dataForm.removeField', { defaultMessage: 'Remove field' }),
    keyText: 'CtrlOrCommand+0',
    testEnabled: () => getCurrentDataForm() != null && getCurrentDataForm()?.getEditorTypes()?.supportFieldRemoval,
    onClick: () => getCurrentDataForm().setFixedValue(undefined),
@@ -63,8 +63,8 @@

  registerCommand({
    id: 'dataForm.undo',
-    category: 'Data form',
-    name: 'Undo',
+    category: __t('command.dataForm', { defaultMessage: 'Data form' }),
+    name: __t('command.dataForm.undo', { defaultMessage: 'Undo' }),
    group: 'undo',
    icon: 'icon undo',
    toolbar: true,
@@ -75,8 +75,8 @@

  registerCommand({
    id: 'dataForm.redo',
-    category: 'Data form',
-    name: 'Redo',
+    category: __t('command.dataForm', { defaultMessage: 'Data form' }),
+    name: __t('command.dataForm.redo', { defaultMessage: 'Redo' }),
    group: 'redo',
    icon: 'icon redo',
    toolbar: true,
@@ -87,16 +87,16 @@

  registerCommand({
    id: 'dataForm.reconnect',
-    category: 'Data grid',
-    name: 'Reconnect',
+    category: __t('command.dataGrid', { defaultMessage: 'Data grid' }),
+    name: __t('command.dataGrid.reconnect', { defaultMessage: 'Reconnect' }),
    testEnabled: () => getCurrentDataForm() != null,
    onClick: () => getCurrentDataForm().reconnect(),
  });

  registerCommand({
    id: 'dataForm.filterSelected',
-    category: 'Data form',
-    name: 'Filter this value',
+    category: __t('command.dataForm', { defaultMessage: 'Data form' }),
+    name: __t('command.dataForm.filterSelected', { defaultMessage: 'Filter this value' }),
    keyText: 'CtrlOrCommand+Shift+F',
    testEnabled: () => getCurrentDataForm() != null,
    onClick: () => getCurrentDataForm().filterSelectedValue(),
@@ -104,16 +104,16 @@

  registerCommand({
    id: 'dataForm.addToFilter',
-    category: 'Data form',
-    name: 'Add to filter',
+    category: __t('command.dataForm', { defaultMessage: 'Data form' }),
+    name: __t('command.dataForm.addToFilter', { defaultMessage: 'Add to filter' }),
    testEnabled: () => getCurrentDataForm() != null,
    onClick: () => getCurrentDataForm().addToFilter(),
  });

  registerCommand({
    id: 'dataForm.goToFirst',
-    category: 'Data form',
-    name: 'First',
+    category: __t('command.dataForm', { defaultMessage: 'Data form' }),
+    name: __t('command.dataForm.goToFirst', { defaultMessage: 'First' }),
    keyText: 'CtrlOrCommand+Home',
    toolbar: true,
    isRelatedToTab: true,
@@ -124,8 +124,8 @@

  registerCommand({
    id: 'dataForm.goToPrevious',
-    category: 'Data form',
-    name: 'Previous',
+    category: __t('command.dataForm', { defaultMessage: 'Data form' }),
+    name: __t('command.dataForm.goToPrevious', { defaultMessage: 'Previous' }),
    keyText: 'CtrlOrCommand+ArrowUp',
    toolbar: true,
    isRelatedToTab: true,
@@ -136,8 +136,8 @@

  registerCommand({
    id: 'dataForm.goToNext',
-    category: 'Data form',
-    name: 'Next',
+    category: __t('command.dataForm', { defaultMessage: 'Data form' }),
+    name: __t('command.dataForm.goToNext', { defaultMessage: 'Next' }),
    keyText: 'CtrlOrCommand+ArrowDown',
    toolbar: true,
    isRelatedToTab: true,
@@ -148,8 +148,8 @@

  registerCommand({
    id: 'dataForm.goToLast',
-    category: 'Data form',
-    name: 'Last',
+    category: __t('command.dataForm', { defaultMessage: 'Data form' }),
+    name: __t('command.dataForm.goToLast', { defaultMessage: 'Last' }),
    keyText: 'CtrlOrCommand+End',
    toolbar: true,
    isRelatedToTab: true,
@@ -197,7 +197,7 @@
  import resizeObserver from '../utility/resizeObserver';
  import openReferenceForm from './openReferenceForm';
  import { useSettings } from '../utility/metadataLoaders';
-  import { _t } from '../translations';
+  import { _t, __t } from '../translations';

  export let conid;
  export let database;
@@ -243,20 +243,16 @@

  function getRowCountInfo(allRowCount) {
    if (rowCountNotAvailable) {
-      return `Row: ${((display.config.formViewRecordNumber || 0) + 1).toLocaleString()} / ???`;
+      return _t('dataForm.rowCount', { defaultMessage: 'Row: {rowCount} / ???', values: { rowCount: ((display.config.formViewRecordNumber || 0) + 1).toLocaleString() } });
    }
    if (rowData == null) {
      if (allRowCount != null) {
-        return `Out of bounds: ${(
-          (display.config.formViewRecordNumber || 0) + 1
-        ).toLocaleString()} / ${allRowCount.toLocaleString()}`;
+        return _t('dataForm.outOfBounds', { defaultMessage: 'Out of bounds: {current} / {total}', values: { current: ((display.config.formViewRecordNumber || 0) + 1).toLocaleString(), total: allRowCount.toLocaleString() } });
      }
-      return 'No data';
+      return _t('dataForm.noData', { defaultMessage: 'No data' });
    }
-    if (allRowCount == null || display == null) return 'Loading row count...';
-    return `Row: ${(
-      (display.config.formViewRecordNumber || 0) + 1
-    ).toLocaleString()} / ${allRowCount.toLocaleString()}`;
+    if (allRowCount == null || display == null) return _t('dataForm.loadingRowCount', { defaultMessage: 'Loading row count...' });
+    return _t('dataForm.rowCount', { defaultMessage: 'Row: {current} / {total}', values: { current: ((display.config.formViewRecordNumber || 0) + 1).toLocaleString(), total: allRowCount.toLocaleString() } });
  }

  export function getGrider() {
@@ -720,7 +716,7 @@
 </div>

 {#if isLoading}
-  <LoadingInfo wrapper message="Loading data" />
+  <LoadingInfo wrapper message={_t('common.loadingData', { defaultMessage: 'Loading data' })} />
 {/if}

 <style>
@@ -9,6 +9,7 @@
  import FormViewFilterColumn from './FormViewFilterColumn.svelte';
  import { stringFilterBehaviour } from 'dbgate-tools';
  import CheckboxField from '../forms/CheckboxField.svelte';
+  import { _t } from '../translations';
  // import PrimaryKeyFilterEditor from './PrimaryKeyFilterEditor.svelte';

  export let managerSize;
@@ -36,7 +37,7 @@

 {#if isFormView}
  <div class="m-1">
-    <div>Column name filter</div>
+    <div>{_t('datagrid.columnNameFilter', { defaultMessage: 'Column name filter' })}</div>
    <div class="flex">
      <input
        type="text"
@@ -63,7 +64,7 @@
 {#if hasMultiColumnFilter}
  <div class="m-1">
    <div class="space-between">
-      <span>Multi column filter</span>
+      <span>{_t('dataGrid.multiColumnFilter', { defaultMessage: 'Multi column filter' })}</span>
      {#if multiColumnFilter}
      <div class="flex items-center gap-2">
        <CheckboxField
@@ -6,6 +6,7 @@

  import MacroHeader from './MacroHeader.svelte';
  import MacroInfoTab from './MacroInfoTab.svelte';
+  import { _t } from '../translations';

  const selectedMacro = getContext('selectedMacro') as any;

@@ -17,7 +18,7 @@
  <TabControl
    tabs={[
      {
-        label: 'Macro detail',
+        label: _t('datagrid.macros.detail', { defaultMessage: 'Macro detail' }),
        component: MacroInfoTab,
        props: {
          onExecute,
@@ -2,6 +2,7 @@
  import { getContext } from 'svelte';
  import FontIcon from '../icons/FontIcon.svelte';
  import ToolbarButton from '../buttons/ToolbarButton.svelte';
+  import { _t } from '../translations';

  export let onExecute;

@@ -16,8 +17,8 @@
    </div>
  </div>
  <div class="buttons">
-    <ToolbarButton icon="icon run" on:click={onExecute}>Execute</ToolbarButton>
-    <ToolbarButton icon="icon close" on:click={() => ($selectedMacro = null)}>Close</ToolbarButton>
+    <ToolbarButton icon="icon run" on:click={onExecute}>{_t('common.execute', { defaultMessage: 'Execute' })}</ToolbarButton>
+    <ToolbarButton icon="icon close" on:click={() => ($selectedMacro = null)}>{_t('common.close', { defaultMessage: 'Close' })}</ToolbarButton>
  </div>
 </div>

@@ -5,6 +5,7 @@

  import WidgetTitle from '../widgets/WidgetTitle.svelte';
  import MacroParameters from './MacroParameters.svelte';
+  import { _t } from '../translations';

  const selectedMacro = getContext('selectedMacro') as any;

@@ -13,23 +14,23 @@

 <div class="wrapper">
  <div class="section">
-    <WidgetTitle>Execute</WidgetTitle>
-    <FormStyledButton value="Execute" on:click={onExecute} />
+    <WidgetTitle>{_t('common.execute', { defaultMessage: 'Execute' })}</WidgetTitle>
+    <FormStyledButton value={_t('common.execute', { defaultMessage: 'Execute' })} on:click={onExecute} />
  </div>

  <div class="section">
-    <WidgetTitle>Parameters</WidgetTitle>
+    <WidgetTitle>{_t('common.parameters', { defaultMessage: 'Parameters' })}</WidgetTitle>
    {#if $selectedMacro?.args && $selectedMacro?.args?.length > 0}
      {#key $selectedMacro?.name}
        <MacroParameters args={$selectedMacro?.args||[]} namePrefix={`${$selectedMacro?.name}#`} />
      {/key}
    {:else}
-      <div class="m-1">This macro has no parameters</div>
+      <div class="m-1">{_t('datagrid.macros.noParameters', { defaultMessage: 'This macro has no parameters' })}</div>
    {/if}
  </div>

  <div class="section">
-    <WidgetTitle>Description</WidgetTitle>
+    <WidgetTitle>{_t('common.description', { defaultMessage: 'Description' })}</WidgetTitle>
    <div class="m-1">{$selectedMacro?.description}</div>
  </div>
 </div>
@@ -8,6 +8,7 @@
  import SearchBoxWrapper from '../elements/SearchBoxWrapper.svelte';
  import SearchInput from '../elements/SearchInput.svelte';
  import macros from './macros';
+  import { _t } from '../translations';

  let filter = '';
  export let managerSize;
@@ -16,7 +17,7 @@

 <ManagerInnerContainer width={managerSize}>
  <SearchBoxWrapper>
-    <SearchInput placeholder="Search macros" bind:value={filter} />
+    <SearchInput placeholder={_t('datagrid.searchMacros', { defaultMessage: "Search macros"})} bind:value={filter} />
  </SearchBoxWrapper>
  <AppObjectList
    list={_.sortBy(macros, 'title').filter(x => (macroCondition ? macroCondition(x) : true))}
@@ -1,37 +1,39 @@
+import { __t } from '../translations';
+
 const macros = [
  {
-    title: 'Remove diacritics',
+    title: __t('datagrid.macros.removeDiacritics', { defaultMessage: 'Remove diacritics' }),
    name: 'removeDiacritics',
-    group: 'Text',
-    description: 'Removes diacritics from selected cells',
+    group: __t('datagrid.macros.textGroup', { defaultMessage: 'Text' }),
+    description: __t('datagrid.macros.removeDiacriticsDescription', { defaultMessage: 'Removes diacritics from selected cells' }),
    type: 'transformValue',
    code: `return modules.lodash.deburr(value)`,
  },
  {
-    title: 'Search & replace text',
+    title: __t('datagrid.macros.searchReplaceText', { defaultMessage: 'Search & replace text' }),
    name: 'stringReplace',
-    group: 'Text',
-    description: 'Search & replace text or regular expression',
+    group: __t('datagrid.macros.textGroup', { defaultMessage: 'Text' }),
+    description: __t('datagrid.macros.searchReplaceTextDescription', { defaultMessage: 'Search & replace text or regular expression' }),
    type: 'transformValue',
    args: [
      {
        type: 'text',
-        label: 'Find',
+        label: __t('datagrid.macros.searchReplaceTextFind', { defaultMessage: 'Find' }),
        name: 'find',
      },
      {
        type: 'text',
-        label: 'Replace with',
+        label: __t('datagrid.macros.searchReplaceTextReplaceWith', { defaultMessage: 'Replace with' }),
        name: 'replace',
      },
      {
        type: 'checkbox',
-        label: 'Case sensitive',
+        label: __t('datagrid.macros.searchReplaceTextCaseSensitive', { defaultMessage: 'Case sensitive' }),
        name: 'caseSensitive',
      },
      {
        type: 'checkbox',
-        label: 'Regular expression',
+        label: __t('datagrid.macros.searchReplaceTextIsRegex', { defaultMessage: 'Regular expression' }),
        name: 'isRegex',
      },
    ],
@@ -42,16 +44,16 @@ return value ? value.toString().replace(new RegExp(rtext, rflags), args.replace
    `,
  },
  {
-    title: 'Change text case',
+    title: __t('datagrid.macros.changeTextCase', { defaultMessage: 'Change text case' }),
    name: 'changeTextCase',
-    group: 'Text',
-    description: 'Uppercase, lowercase and other case functions',
+    group: __t('datagrid.macros.textGroup', { defaultMessage: 'Text' }),
+    description: __t('datagrid.macros.changeTextCaseDescription', { defaultMessage: 'Uppercase, lowercase and other case functions' }),
    type: 'transformValue',
    args: [
      {
        type: 'select',
        options: ['toUpper', 'toLower', 'lowerCase', 'upperCase', 'kebabCase', 'snakeCase', 'camelCase', 'startCase'],
-        label: 'Type',
+        label: __t('datagrid.macros.changeTextCaseType', { defaultMessage: 'Type' }),
        name: 'type',
        default: 'toUpper',
      },
@@ -59,81 +61,81 @@ return value ? value.toString().replace(new RegExp(rtext, rflags), args.replace
    code: `return modules.lodash[args.type](value)`,
  },
  {
-    title: 'Pad left',
+    title: __t('datagrid.macros.padLeft', { defaultMessage: 'Pad left' }),
    name: 'padLeft',
-    group: 'Text',
+    group: __t('datagrid.macros.textGroup', { defaultMessage: 'Text' }),
    args: [
      {
        type: 'text',
-        label: 'Character',
+        label: __t('datagrid.macros.padCharacter', { defaultMessage: 'Character' }),
        name: 'character',
        default: '0',
      },
      {
        type: 'text',
-        label: 'Length',
+        label: __t('datagrid.macros.padLength', { defaultMessage: 'Length' }),
        name: 'length',
        default: '3',
      },
    ],
    description:
-      'Returns string of a specified length in which the beginning of the current string is padded with spaces or other character',
+      __t('datagrid.macros.padLeftDescription', { defaultMessage: 'Returns string of a specified length in which the beginning of the current string is padded with spaces or other character' }),
    type: 'transformValue',
    code: `return modules.lodash.padStart(value, +args.length, args.character)`,
  },
  {
-    title: 'Pad right',
+    title: __t('datagrid.macros.padRight', { defaultMessage: 'Pad right' }),
    name: 'padRight',
-    group: 'Text',
+    group: __t('datagrid.macros.textGroup', { defaultMessage: 'Text' }),
    args: [
      {
        type: 'text',
-        label: 'Character',
+        label: __t('datagrid.macros.padCharacter', { defaultMessage: 'Character' }),
        name: 'character',
        default: '0',
      },
      {
        type: 'text',
-        label: 'Length',
+        label: __t('datagrid.macros.padLength', { defaultMessage: 'Length' }),
        name: 'length',
        default: '3',
      },
    ],
    description:
-      'Returns string of a specified length in which the end of the current string is padded with spaces or other character',
+      __t('datagrid.macros.padRightDescription', { defaultMessage: 'Returns string of a specified length in which the end of the current string is padded with spaces or other character' }),
    type: 'transformValue',
    code: `return modules.lodash.padEnd(value, +args.length, args.character)`,
  },
  {
-    title: 'Trim',
+    title: __t('datagrid.macros.trim', { defaultMessage: 'Trim' }),
    name: 'trim',
-    group: 'Text',
-    description: 'Removes leading and trailing whitespace ',
+    group: __t('datagrid.macros.textGroup', { defaultMessage: 'Text' }),
+    description: __t('datagrid.macros.trimDescription', { defaultMessage: 'Removes leading and trailing whitespace' }),
    type: 'transformValue',
    code: `return modules.lodash.trim(value)`,
  },
  {
-    title: 'Row index',
+    title: __t('datagrid.macros.rowIndex', { defaultMessage: 'Row index' }),
    name: 'rowIndex',
-    group: 'Tools',
-    description: 'Index of row from 1 (autoincrement)',
+    group: __t('datagrid.macros.toolsGroup', { defaultMessage: 'Tools' }),
+    description: __t('datagrid.macros.rowIndexDescription', { defaultMessage: 'Index of row from 1 (autoincrement)' }),
    type: 'transformValue',
    code: `return rowIndex + 1`,
  },
  {
-    title: 'Generate UUID',
+    title: __t('datagrid.macros.generateUUID', { defaultMessage: 'Generate UUID' }),
    name: 'uuidv1',
-    group: 'Tools',
-    description: 'Generate unique identifier',
+    group: __t('datagrid.macros.toolsGroup', { defaultMessage: 'Tools' }),
+    description: __t('datagrid.macros.generateUUIDDescription', { defaultMessage: 'Generate unique identifier' }),
    type: 'transformValue',
    args: [
      {
        type: 'select',
        options: [
          { value: 'uuidv1', name: 'V1 - from timestamp' },
-          { value: 'uuidv4', name: 'V4 - random generated' },
+          { value: 'uuidv4', name: 'V4 - random generated'},
        ],
-        label: 'Version',
+        label: __t('datagrid.macros.version', { defaultMessage: 'Version' }),
        name: 'version',
        default: 'uuidv1',
      },
@@ -141,26 +143,26 @@ return value ? value.toString().replace(new RegExp(rtext, rflags), args.replace
    code: `return modules[args.version]()`,
  },
  {
-    title: 'Convert to integer',
+    title: __t('datagrid.macros.toInt', { defaultMessage: 'Convert to integer' }),
    name: 'toInt',
-    group: 'Tools',
-    description: 'Converts to integral number',
+    group: __t('datagrid.macros.toolsGroup', { defaultMessage: 'Tools' }),
+    description: __t('datagrid.macros.toIntDescription', { defaultMessage: 'Converts to integral number' }),
    type: 'transformValue',
    code: `return modules.lodash.isNaN(parseInt(value)) ? null : parseInt(value)`,
  },
  {
-    title: 'Convert to number',
+    title: __t('datagrid.macros.toNumber', { defaultMessage: 'Convert to number' }),
    name: 'toNumber',
-    group: 'Tools',
-    description: 'Converts to number',
+    group: __t('datagrid.macros.toolsGroup', { defaultMessage: 'Tools' }),
+    description: __t('datagrid.macros.toNumberDescription', { defaultMessage: 'Converts to number' }),
    type: 'transformValue',
    code: `return modules.lodash.isNaN(parseFloat(value)) ? null : parseFloat(value)`,
  },
  {
-    title: 'Convert to boolean',
+    title: __t('datagrid.macros.toBoolean', { defaultMessage: 'Convert to boolean' }),
    name: 'toBoolean',
-    group: 'Tools',
-    description: 'Converts to boolean',
+    group: __t('datagrid.macros.toolsGroup', { defaultMessage: 'Tools' }),
+    description: __t('datagrid.macros.toBooleanDescription', { defaultMessage: 'Converts to boolean' }),
    type: 'transformValue',
    code: `
 if (modules.lodash.isString(value)) {
@@ -176,10 +178,10 @@ return !!value;
  `,
  },
  {
-    title: 'Convert to string',
+    title: __t('datagrid.macros.toString', { defaultMessage: 'Convert to string' }),
    name: 'toString',
-    group: 'Tools',
-    description: 'Converts to string',
+    group: __t('datagrid.macros.toolsGroup', { defaultMessage: 'Tools' }),
+    description: __t('datagrid.macros.toStringDescription', { defaultMessage: 'Converts to string' }),
    type: 'transformValue',
    code: `
    if (value==null) return null;
@@ -188,15 +190,15 @@ return !!value;
  `,
  },
  {
-    title: 'Current date',
+    title: __t('datagrid.macros.currentDate', { defaultMessage: 'Current date' }),
    name: 'currentDate',
-    group: 'Tools',
-    description: 'Gets current date',
+    group: __t('datagrid.macros.toolsGroup', { defaultMessage: 'Tools' }),
+    description: __t('datagrid.macros.currentDateDescription', { defaultMessage: 'Gets current date' }),
    type: 'transformValue',
    args: [
      {
        type: 'text',
-        label: 'Format',
+        label: __t('datagrid.macros.format', { defaultMessage: 'Format' }),
        name: 'format',
        default: 'YYYY-MM-DD HH:mm:ss',
      },
@@ -204,10 +206,10 @@ return !!value;
    code: `return modules.moment().format(args.format)`,
  },
  {
-    title: 'Duplicate columns',
+    title: __t('datagrid.macros.duplicateColumns', { defaultMessage: 'Duplicate columns' }),
    name: 'duplicateColumns',
-    group: 'Tools',
-    description: 'Duplicate selected columns',
+    group: __t('datagrid.macros.toolsGroup', { defaultMessage: 'Tools' }),
+    description: __t('datagrid.macros.duplicateColumnsDescription', { defaultMessage: 'Duplicate selected columns' }),
    type: 'transformRow',
    code: `
      return {
@@ -218,22 +220,22 @@ return !!value;
    args: [
      {
        type: 'text',
-        label: 'Prefix',
+        label: __t('datagrid.macros.prefix', { defaultMessage: 'Prefix' }),
        name: 'prefix',
      },
      {
        type: 'text',
-        label: 'Postfix',
+        label: __t('datagrid.macros.postfix', { defaultMessage: 'Postfix' }),
        name: 'postfix',
        default: '_copy',
      },
    ],
  },
  {
-    title: 'Split columns',
+    title: __t('datagrid.macros.splitColumns', { defaultMessage: 'Split columns' }),
    name: 'splitColumns',
-    group: 'Tools',
-    description: 'Split selected columns',
+    group: __t('datagrid.macros.toolsGroup', { defaultMessage: 'Tools' }),
+    description: __t('datagrid.macros.splitColumnsDescription', { defaultMessage: 'Split selected columns' }),
    type: 'transformRow',
    code: `
       const res = {...row};
@@ -252,22 +254,22 @@ return !!value;
    args: [
      {
        type: 'text',
-        label: 'Delimiter',
+        label: __t('datagrid.macros.delimiter', { defaultMessage: 'Delimiter' }),
        name: 'delimiter',
        default: ',',
      },
    ],
  },
  {
-    title: 'Calculation',
+    title: __t('datagrid.macros.calculation', { defaultMessage: 'Calculation' }),
    name: 'calculation',
-    group: 'Tools',
-    description: 'Custom expression. Use row.column_name for accessing column values, value for original value',
+    group: __t('datagrid.macros.toolsGroup', { defaultMessage: 'Tools' }),
+    description: __t('datagrid.macros.calculationDescription', { defaultMessage: 'Custom expression. Use row.column_name for accessing column values, value for original value' }),
    type: 'transformValue',
    args: [
      {
        type: 'text',
-        label: 'Expression',
+        label: __t('datagrid.macros.expression', { defaultMessage: 'Expression' }),
        name: 'expression',
        default: 'value',
      },
@@ -275,10 +277,10 @@ return !!value;
    code: `return eval(args.expression);`,
  },
  {
-    title: 'Extract date fields',
+    title: __t('datagrid.macros.extractDateFields', { defaultMessage: 'Extract date fields' }),
    name: 'extractDateFields',
-    group: 'Tools',
-    description: 'Extract yaear, month, day and other date/time fields from selection and adds it as new columns',
+    group: __t('datagrid.macros.toolsGroup', { defaultMessage: 'Tools' }),
+    description: __t('datagrid.macros.extractDateFieldsDescription', { defaultMessage: 'Extract year, month, day and other date/time fields from selection and adds it as new columns' }),
    type: 'transformRow',
    code: `
      let mom = null;
@@ -311,37 +313,37 @@ return !!value;
    args: [
      {
        type: 'text',
-        label: 'Year name',
+        label: __t('datagrid.macros.yearName', { defaultMessage: 'Year name' }),
        name: 'year',
        default: 'year',
      },
      {
        type: 'text',
-        label: 'Month name',
+        label: __t('datagrid.macros.monthName', { defaultMessage: 'Month name' })  ,
        name: 'month',
        default: 'month',
      },
      {
        type: 'text',
-        label: 'Day name',
+        label: __t('datagrid.macros.dayName', { defaultMessage: 'Day name' }),
        name: 'day',
        default: 'day',
      },
      {
        type: 'text',
-        label: 'Hour name',
+        label: __t('datagrid.macros.hourName', { defaultMessage: 'Hour name' }),
        name: 'hour',
        default: 'hour',
      },
      {
        type: 'text',
-        label: 'Minute name',
+        label: __t('datagrid.macros.minuteName', { defaultMessage: 'Minute name' }),
        name: 'minute',
        default: 'minute',
      },
      {
        type: 'text',
-        label: 'Second name',
+        label: __t('datagrid.macros.secondName', { defaultMessage: 'Second name' }),
        name: 'second',
        default: 'second',
      },
@@ -9,6 +9,8 @@
  import ModalBase from './ModalBase.svelte';
  import { closeCurrentModal } from './modalTools';
  import { commandsCustomized } from '../stores';
+  import { _t } from '../translations';
+  import _ from 'lodash';

  export let tabs;
  export let onConfirm;
@@ -27,10 +29,10 @@

 <FormProvider>
  <ModalBase {...$$restProps}>
-    <svelte:fragment slot="header">Confirm close tabs</svelte:fragment>
+    <svelte:fragment slot="header">{_t('datagrid.closeTabs.header', { defaultMessage: 'Confirm close tabs' })}</svelte:fragment>

    <div>
-      Following files are modified, really close tabs? After closing, you could reopen them in history
+      {_t('datagrid.closeTabs.modifiedFiles', { defaultMessage: 'Following files are modified, really close tabs? After closing, you could reopen them in history' })}
      <FontIcon icon="icon history" />
      widget
    </div>
@@ -41,7 +43,7 @@

    <svelte:fragment slot="footer">
      <FormSubmit
-        value="Close tabs"
+        value={_t('datagrid.closeTabs.close', { defaultMessage: 'Close tabs' })}
        on:click={() => {
          closeCurrentModal();
          onConfirm();
@@ -49,7 +51,7 @@
      />
      <FormStyledButton
        type="button"
-        value="Cancel"
+        value={_t('common.cancel', { defaultMessage: 'Cancel' })}
        on:click={() => {
          closeCurrentModal();
          onCancel();
@@ -11,6 +11,7 @@
  import KeyboardModal from './KeyboardModal.svelte';
  import ModalBase from './ModalBase.svelte';
  import { closeCurrentModal, showModal } from './modalTools';
+  import { _t } from '../translations';

  export let command;

@@ -23,16 +24,16 @@

 <FormProviderCore {values}>
  <ModalBase {...$$restProps}>
-    <svelte:fragment slot="header">Configure commmand</svelte:fragment>
+    <svelte:fragment slot="header">{_t('commandModal.configure', { defaultMessage: 'Configure command' })}</svelte:fragment>

-    <FormTextField label="Category" name="category" disabled />
-    <FormTextField label="Name" name="name" disabled />
+    <FormTextField label={_t('commandModal.category', { defaultMessage: 'Category' })} name="category" disabled />
+    <FormTextField label={_t('commandModal.name', { defaultMessage: 'Name' })} name="name" disabled />

    <div class="row">
-      <FormTextField label="Keyboard shortcut" name="keyText" templateProps={{ noMargin: true }} focused />
+      <FormTextField label={_t('commandModal.keyboardShortcut', { defaultMessage: 'Keyboard shortcut' })} name="keyText" templateProps={{ noMargin: true }} focused />
      <FormStyledButton
        type="button"
-        value="Keyboard"
+        value={_t('commandModal.keyboard', { defaultMessage: 'Keyboard' })}
        on:click={handleKeyboard}
        data-testid="CommandModal_keyboardButton"
      />
@@ -56,7 +57,7 @@
      />
      <FormStyledButton
        type="button"
-        value="Reset"
+        value={_t('common.reset', { defaultMessage: 'Reset' })}
        on:click={() => {
          closeCurrentModal();
          apiCall('config/update-settings', {
@@ -64,7 +65,7 @@
          });
        }}
      />
-      <FormStyledButton type="button" value="Close" on:click={closeCurrentModal} />
+      <FormStyledButton type="button" value={_t('common.close', { defaultMessage: 'Close' })} on:click={closeCurrentModal} />
    </svelte:fragment>
  </ModalBase>
 </FormProviderCore>
@@ -13,6 +13,7 @@
  import { parseCellValue, safeJsonParse, stringifyCellValue } from 'dbgate-tools';
  import { showSnackbarError } from '../utility/snackbar';
  import ErrorMessageModal from './ErrorMessageModal.svelte';
+  import { _t } from '../translations';
  
  export let onSave;
  export let value;
@@ -49,14 +50,14 @@
    if (parsed) {
      textValue = JSON.stringify(parsed, null, 2);
    } else {
-      showModal(ErrorMessageModal, { message: 'Not valid JSON' });
+      showModal(ErrorMessageModal, { message: _t('dataGrid.formatJson.invalid', { defaultMessage: 'Not valid JSON' }) });
    }
  }
 </script>

 <FormProvider>
  <ModalBase {...$$restProps}>
-    <div slot="header">Edit cell value</div>
+    <div slot="header">{_t('dataGrid.editCellValue', { defaultMessage: 'Edit cell value' })}</div>

    <div class="editor">
      <AceEditor bind:value={textValue} bind:this={editor} onKeyDown={handleKeyDown} mode={syntaxMode} />
@@ -72,21 +73,21 @@
            closeCurrentModal();
          }}
        />
-        <FormStyledButton type="button" value="Cancel" on:click={closeCurrentModal} />
+        <FormStyledButton type="button" value={_t('common.cancel', { defaultMessage: 'Cancel' })} on:click={closeCurrentModal} />
      </div>

      <div>
-        <FormStyledButton type="button" value="Format JSON" on:click={handleFormatJson} />
+        <FormStyledButton type="button" skipWidth={true} value={_t('dataGrid.formatJson', { defaultMessage: 'Format JSON' })} on:click={handleFormatJson} />

-        Code highlighting:
+        {_t('dataGrid.codeHighlighting', { defaultMessage: 'Code highlighting:' })}
        <SelectField
          isNative
          value={syntaxMode}
          on:change={e => (syntaxMode = e.detail)}
          options={[
-            { value: 'text', label: 'None (raw text)' },
+            { value: 'text', label: _t('dataGrid.codeHighlighting.none', { defaultMessage: 'None (raw text)' }) },
            { value: 'json', label: 'JSON' },
-            { value: 'html', label: 'HTML' },
+            { value: 'html', label: 'HTML'},
            { value: 'xml', label: 'XML' },
          ]}
        />
@@ -6,8 +6,9 @@

  import ModalBase from './ModalBase.svelte';
  import { closeCurrentModal } from './modalTools';
+  import { _t } from '../translations';

-  export let title = 'Error';
+  export let title = _t('common.error', { defaultMessage: 'Error' });
  export let message;
  export let showAsCode = false;
 </script>
@@ -30,7 +31,7 @@
    {/if}

    <div slot="footer">
-      <FormSubmit value="Close" on:click={closeCurrentModal} data-testid="ErrorMessageModal_closeButton" />
+      <FormSubmit value={_t('common.close', { defaultMessage: 'Close' })} on:click={closeCurrentModal} data-testid="ErrorMessageModal_closeButton" />
    </div>
  </ModalBase>
 </FormProvider>
@@ -5,6 +5,7 @@
  import keycodes from '../utility/keycodes';
  import ModalBase from './ModalBase.svelte';
  import { closeCurrentModal } from './modalTools';
+  import { _t } from '../translations';

  export let onChange;
  let value;
@@ -38,7 +39,7 @@
 </script>

 <ModalBase {...$$restProps} simple>
-  <div class="mb-2">Show desired key combination and press ENTER</div>
+  <div class="mb-2">_{_t('commandModal.showKeyCombination', { defaultMessage: 'Show desired key combination and press ENTER' })}</div>
  <div class="largeFormMarker">
    <TextField on:keydown={handleKeyDown} bind:value focused />
  </div>
@@ -10,6 +10,7 @@
  import ErrorMessageModal from './ErrorMessageModal.svelte';
  import ModalBase from './ModalBase.svelte';
  import { closeCurrentModal, showModal } from './modalTools';
+  import { _t } from '../translations';

  export let driver;
  export let dbid;
@@ -44,14 +45,14 @@
 <FormProvider initialValues={{ name: '' }}>
  <ModalBase {...$$restProps}>
    <svelte:fragment slot="header">
-      Create {driver?.collectionSingularLabel ?? 'collection/container'}
+      {_t('dbObject.createCollection', { defaultMessage: 'Create collection/container'})}
    </svelte:fragment>

    <FormArgumentList args={driver?.newCollectionFormParams} />

    <svelte:fragment slot="footer">
      <FormSubmit value="OK" on:click={e => handleSubmit(e.detail)} disabled={isSaving} />
-      <FormStyledButton type="button" value="Cancel" on:click={closeCurrentModal} />
+      <FormStyledButton type="button" value={_t('common.cancel', { defaultMessage: 'Cancel' })} on:click={closeCurrentModal} />
    </svelte:fragment>
  </ModalBase>
 </FormProvider>
@@ -7,6 +7,7 @@
  import { isProApp } from '../utility/proTools';
  import ModalBase from './ModalBase.svelte';
  import { closeCurrentModal } from './modalTools';
+  import { _t } from '../translations';

  export let multiTabIndex = undefined;

@@ -14,8 +15,8 @@
    {
      icon: 'icon sql-file',
      colorClass: 'color-icon-blue',
-      title: 'Query',
-      description: 'SQL query editor',
+      title: _t('common.query', { defaultMessage: 'Query' }),
+      description: _t('common.queryEditor', { defaultMessage: 'SQL query editor' }),
      action: () => {
        newQuery({ multiTabIndex });
      },
@@ -25,47 +26,47 @@
    {
      icon: 'icon connection',
      colorClass: 'color-icon-yellow',
-      title: 'Connection',
-      description: 'Database connection stored locally',
+      title: _t('common.connection', { defaultMessage: 'Connection' }),
+      description: _t('newObject.connectionLocal', { defaultMessage: 'Database connection stored locally' }),
      command: 'new.connection',
      changeWidget: 'database',
      testid: 'NewObjectModal_connection',
-      disabledMessage: 'You are not allowed to create new connections',
+      disabledMessage: _t('newObject.connectionLocalDisabled', { defaultMessage: 'You are not allowed to create new connections' }),
    },
    {
      icon: 'icon cloud-connection',
      colorClass: 'color-icon-blue',
-      title: 'Connection on Cloud',
-      description: 'Database connection stored on DbGate Cloud',
+      title: _t('common.connectionOnCloud', { defaultMessage: 'Connection on Cloud' }),
+      description: _t('newObject.connectionOnCloudDescription', { defaultMessage: 'Database connection stored on DbGate Cloud' }),
      command: 'new.connectionOnCloud',
      changeWidget: 'cloud-private',
      testid: 'NewObjectModal_connectionOnCloud',
-      disabledMessage: 'For creating connections on DbGate Cloud, you need to be logged in',
+      disabledMessage: _t('newObject.connectionOnCloudDisabled', { defaultMessage: 'For creating connections on DbGate Cloud, you need to be logged in' }),
    },
    {
      icon: 'icon query-design',
      colorClass: 'color-icon-red',
-      title: 'Query Designer',
-      description: 'Design SQL queries visually',
+      title: _t('common.queryDesigner', { defaultMessage: 'Query Designer' }),
+      description: _t('newObject.queryDesignerDescription', { defaultMessage: 'Design SQL queries visually' }),
      command: 'new.queryDesign',
      testid: 'NewObjectModal_queryDesign',
-      disabledMessage: 'Query Designer is not available for current database',
+      disabledMessage: _t('newObject.queryDesignerDisabled', { defaultMessage: 'Query Designer is not available for current database' }),
      isProFeature: true,
    },
    {
      icon: 'icon diagram',
      colorClass: 'color-icon-blue',
-      title: 'ER Diagram',
-      description: 'Visualize database structure',
+      title: _t('common.erDiagram', { defaultMessage: 'ER Diagram' }),
+      description: _t('newObject.erDiagramDescription', { defaultMessage: 'Visualize database structure' }),
      command: 'new.diagram',
      testid: 'NewObjectModal_diagram',
-      disabledMessage: 'ER Diagram is not available for current database',
+      disabledMessage: _t('newObject.erDiagramDisabled', { defaultMessage: 'ER Diagram is not available for current database' }),
    },
    {
      icon: 'icon perspective',
      colorClass: 'color-icon-yellow',
-      title: 'Perspective',
-      description: 'Join complex data from multiple databases',
+      title: _t('common.perspective', { defaultMessage: 'Perspective' }),
+      description: _t('newObject.perspectiveDescription', { defaultMessage: 'Join complex data from multiple databases' }),
      command: 'new.perspective',
      testid: 'NewObjectModal_perspective',
      isProFeature: true,
@@ -73,56 +74,56 @@
    {
      icon: 'icon table',
      colorClass: 'color-icon-blue',
-      title: 'Table',
-      description: 'Create table in the current database',
+      title: _t('common.table', { defaultMessage: 'Table' }),
+      description: _t('newObject.tableDescription', { defaultMessage: 'Create table in the current database' }),
      command: 'new.table',
      testid: 'NewObjectModal_table',
-      disabledMessage: 'Table creation is not available for current database',
+      disabledMessage: _t('newObject.tableDisabled', { defaultMessage: 'Table creation is not available for current database' }),
    },
    {
      icon: 'icon sql-generator',
      colorClass: 'color-icon-green',
-      title: 'SQL Generator',
-      description: 'Generate SQL scripts for database objects',
+      title: _t('common.sqlGenerator', { defaultMessage: 'SQL Generator' }),
+      description: _t('newObject.sqlGeneratorDescription', { defaultMessage: 'Generate SQL scripts for database objects' }),
      command: 'sql.generator',
      testid: 'NewObjectModal_sqlGenerator',
-      disabledMessage: 'SQL Generator is not available for current database',
+      disabledMessage: _t('newObject.sqlGeneratorDisabled', { defaultMessage: 'SQL Generator is not available for current database' }),
    },
    {
      icon: 'icon export',
      colorClass: 'color-icon-green',
-      title: 'Export database',
-      description: 'Export to file like CSV, JSON, Excel, or other DB',
+      title: _t('common.exportDatabase', { defaultMessage: 'Export database' }),
+      description: _t('newObject.exportDescription', { defaultMessage: 'Export to file like CSV, JSON, Excel, or other DB' }),
      command: 'database.export',
      isProFeature: true,
      testid: 'NewObjectModal_databaseExport',
-      disabledMessage: 'Export is not available for current database',
+      disabledMessage: _t('newObject.exportDisabled', { defaultMessage: 'Export is not available for current database' }),
    },
    {
      icon: 'icon compare',
      colorClass: 'color-icon-red',
-      title: 'Compare database',
-      description: 'Compare database schemas',
+      title: _t('common.compare', { defaultMessage: 'Compare database' }),
+      description: _t('newObject.compareDescription', { defaultMessage: 'Compare database schemas' }),
      command: 'database.compare',
      testid: 'NewObjectModal_databaseCompare',
-      disabledMessage: 'Database comparison is not available for current database',
+      disabledMessage: _t('newObject.compareDisabled', { defaultMessage: 'Database comparison is not available for current database' }),
      isProFeature: true,
    },
    {
      icon: 'icon ai',
      colorClass: 'color-icon-blue',
-      title: 'Database Chat',
-      description: 'Chat with your database using AI',
+      title: _t('common.databaseChat', { defaultMessage: 'Database Chat' }),
+      description: _t('newObject.databaseChatDescription', { defaultMessage: 'Chat with your database using AI' }),
      command: 'database.chat',
      isProFeature: true,
-      disabledMessage: 'Database chat is not available for current database',
+      disabledMessage: _t('newObject.databaseChatDisabled', { defaultMessage: 'Database chat is not available for current database' }),
      testid: 'NewObjectModal_databaseChat',
    },
  ];
 </script>

 <ModalBase simplefix {...$$restProps}>
-  <div class="create-header">Create new</div>
+  <div class="create-header">{_t('common.createNew', { defaultMessage: 'Create new' })}</div>
  <div class="wrapper">
    {#each NEW_ITEMS as item}
      {@const enabled = item.command
@@ -0,0 +1,59 @@
+<script lang='ts'>
+  import _ from 'lodash';
+  import FormStyledButton from '../buttons/FormStyledButton.svelte';
+  import newQuery from '../query/newQuery';
+  import SqlEditor from '../query/SqlEditor.svelte';
+
+  import ModalBase from './ModalBase.svelte';
+  import { closeCurrentModal } from './modalTools';
+  import { _t } from '../translations';
+
+  export let sql;
+  export let onConfirm;
+  export let engine = null;
+</script>
+
+<ModalBase {...$$restProps}>
+  <div slot="header">SQL Script</div>
+
+  <div class="editor">
+    <SqlEditor {engine} value={sql} readOnly />
+  </div>
+
+  <div slot="footer">
+    <FormStyledButton
+      type="button"
+      value={_t('common.close', { defaultMessage: 'Close' })}
+      on:click={closeCurrentModal}
+      data-testid="ShowSqlModal_closeButton"
+    />
+    <FormStyledButton
+      type="button"
+      value="Open script"
+      on:click={() => {
+        newQuery({
+          initialData: sql,
+        });
+
+        closeCurrentModal();
+      }}
+      data-testid="ShowSqlModal_openScriptButton"
+    />
+  </div>
+</ModalBase>
+
+<style>
+  .editor {
+    position: relative;
+    height: 30vh;
+    width: 40vw;
+  }
+
+  .form-margin {
+    margin: var(--dim-large-form-margin);
+  }
+
+  .flex-wrap {
+    flex-wrap: wrap;
+  }
+</style>
@@ -15,6 +15,8 @@
  import _ from 'lodash';
  import { apiCall } from '../utility/api';
  import ErrorInfo from '../elements/ErrorInfo.svelte';
+  import { base64ToHex } from 'dbgate-tools';
+  import { _t } from '../translations';

  export let onConfirm;
  export let conid;
@@ -73,15 +75,15 @@

 <FormProvider>
  <ModalBase {...$$restProps}>
-    <svelte:fragment slot="header">Choose value from {field}</svelte:fragment>
+    <svelte:fragment slot="header">{_t('dataGrid.chooseValue', { defaultMessage: 'Choose value from {field}', values: { field } })}</svelte:fragment>

    <!-- <FormTextField name="search" label='Search' placeholder="Search" bind:value={search} /> -->
    <div class="largeFormMarker">
-      <SearchInput placeholder="Search" bind:value={search} isDebounced />
+      <SearchInput placeholder={_t('common.search', { defaultMessage: 'Search' })} bind:value={search} isDebounced />
    </div>

    {#if isLoading}
-      <LoadingInfo message="Loading data" />
+      <LoadingInfo message={_t('common.loadingData', { defaultMessage: 'Loading data' })} />
    {/if}

    {#if !isLoading && rows}
@@ -111,8 +113,8 @@
              },
              {
                fieldName: 'value',
-                header: 'Value',
-                formatter: row => (row.value == null ? '(NULL)' : row.value),
+                header: _t('dataGrid.value', { defaultMessage: 'Value' }),
+                formatter: row => (row.value == null ? '(NULL)' : row.value?.$binary?.base64 ? base64ToHex(row.value.$binary.base64) :  row.value),
              },
            ]}
          >
@@ -146,7 +148,7 @@
          }}
        />
      {/if}
-      <FormStyledButton type="button" value="Close" on:click={closeCurrentModal} />
+      <FormStyledButton type="button" value={_t('common.close', { defaultMessage: 'Close' })} on:click={closeCurrentModal} />
    </svelte:fragment>
  </ModalBase>
 </FormProvider>
@@ -15,6 +15,9 @@
    if (force && value?.type == 'Buffer' && _.isArray(value.data)) {
      return String.fromCharCode.apply(String, value.data);
    }
+    else if (force && value?.$binary?.base64) {
+      return atob(value.$binary.base64);
+    }
    return stringifyCellValue(value, 'gridCellIntent').value;
  }
 </script>
@@ -75,7 +75,7 @@

    --token-base: #303030;
    --token-text: #ddd;
-    --token-keyword: white;
+    --token-keyword: #096dd9;
    --token-selector-tag: white;
    --token-literal: white;
    --token-section: white;
@@ -4,6 +4,8 @@
  import RowsFilterSwitcher from '../forms/RowsFilterSwitcher.svelte';
  import SearchInput from '../elements/SearchInput.svelte';
  import { filterName } from 'dbgate-tools';
+  import InlineButton from '../buttons/InlineButton.svelte';
+  import FontIcon from '../icons/FontIcon.svelte';

  export let items: any[];
  export let showProcedure = false;
@@ -12,8 +14,10 @@
  export let startLine = 0;
  export let onMessageClick = null;
  export let onExplainError = null;
+  export let engine = null;

  export let filter = '';
+  export let onClear = null;

  $: time0 = items[0] && new Date(items[0].time).getTime();

@@ -37,6 +41,17 @@

 <div class="main">
  <div class="topbar">
+    {#if onClear}
+      <InlineButton
+        icon="img clear"
+        on:click={() => {
+          onClear();
+        }}
+      >
+        <FontIcon icon="icon delete" padRight />
+        Clear
+      </InlineButton>
+    {/if}
    <RowsFilterSwitcher
      icon="img debug"
      label="Debug"
@@ -92,6 +107,7 @@
          previousRow={index > 0 ? items[index - 1] : null}
          {onMessageClick}
          {onExplainError}
+          {engine}
        />
      {/each}
    </table>
@@ -17,6 +17,10 @@
  import FontIcon from '../icons/FontIcon.svelte';
  import { plusExpandIcon } from '../icons/expandIcons';
  import InlineButton from '../buttons/InlineButton.svelte';
+  import SqlHighlighter from '../elements/SqlHighlighter.svelte';
+  import { showModal } from '../modals/modalTools';
+  import ShowSqlModal from '../modals/ShowSqlModal.svelte';
+  import openNewTab from '../utility/openNewTab';

  export let row;
  export let index;
@@ -29,6 +33,7 @@
  export let previousRow = null;
  export let onMessageClick = null;
  export let onExplainError = null;
+  export let engine = null;

  let isExpanded = false;
 </script>
@@ -55,10 +60,39 @@
        }}><FontIcon icon="img ai" /> Explain</InlineButton
      >
    {/if}
+    {#if row.jslid}
+      <InlineButton
+        title="Show data"
+        inlineBlock
+        data-testid={`MessageViewRow-showDataButton-${index}`}
+        on:click={e => {
+          openNewTab({
+            title: 'Query data #',
+            icon: 'img query-data',
+            tabComponent: 'ArchiveFileTab',
+            props: {
+              jslid: row.jslid,
+            },
+          });
+        }}><FontIcon icon="img query-data" /> Show Data</InlineButton
+      >
+    {/if}
+    {#if row.sql}
+      <SqlHighlighter
+        code={row.sql.substring(0, 100) + (row.sql.length > 100 ? '...' : '')}
+        inline
+        onClick={() => {
+          showModal(ShowSqlModal, {
+            sql: row.sql,
+            engine,
+          });
+        }}
+      />
+    {/if}
  </td>
  <td>{moment(row.time).format('HH:mm:ss')}</td>
  <td>{formatDuration(new Date(row.time).getTime() - time0)}</td>
-  <td> {previousRow ? formatDuration(new Date(row.time).getTime() - new Date(previousRow.time).getTime()) : 'n/a'}</td>
+  <td>{previousRow ? formatDuration(new Date(row.time).getTime() - new Date(previousRow.time).getTime()) : 'n/a'}</td>
  {#if showProcedure}
    <td>{row.procedure || ''}</td>
  {/if}
@@ -12,12 +12,13 @@
  export let showLine = false;
  export let showCaller = false;
  export let eventName;
-  export let executeNumber;
+  export let executeNumber = null;
  export let showNoMessagesAlert = false;
  export let startLine = 0;
  export let onChangeErrors = null;
  export let onMessageClick = null;
  export let onExplainError = null;
+  export let engine = null;

  const cachedMessagesRef = createRef([]);
  const lastErrorMessageCountRef = createRef(0);
@@ -43,6 +44,11 @@
    return () => {};
  });

+  function handleClearMessages() {
+    cachedMessagesRef.set([]);
+    displayedMessages = [];
+  }
+
  $: {
    if (executeNumber >= 0) {
      displayedMessages = [];
@@ -79,5 +85,7 @@
    {showCaller}
    {startLine}
    {onExplainError}
+    {engine}
+    onClear={executeNumber == null ? handleClearMessages : null}
  />
 {/if}
@@ -460,13 +460,13 @@
    disabled={isConnected}
    data-testid="ConnectionDriverFields_defaultDatabase"
    asyncMenu={createDatabasesMenu}
-    placeholder="(not selected - optional)"
+    placeholder={_t('common.notSelectedOptional', { defaultMessage : "(not selected - optional)"})}
  />
 {/if}

 {#if defaultDatabase && driver?.showConnectionField('singleDatabase', $values, showConnectionFieldArgs)}
  <FormCheckboxField
-    label={_t('connection.singleDatabase', { defaultMessage: `Use only database ${defaultDatabase}` })}
+    label={_t('connection.singleDatabase', { defaultMessage: 'Use only database {defaultDatabase}', values: { defaultDatabase } })}
    name="singleDatabase"
    disabled={isConnected}
    data-testid="ConnectionDriverFields_singleDatabase"
@@ -475,7 +475,7 @@

 {#if driver?.showConnectionField('useSeparateSchemas', $values, showConnectionFieldArgs)}
  <FormCheckboxField
-    label={_t('connection.useSeparateSchemas', { defaultMessage: `Use schemas separately (use this if you have many large schemas)` })}
+    label={_t('connection.useSeparateSchemas', { defaultMessage: 'Use schemas separately (use this if you have many large schemas)' })}
    name="useSeparateSchemas"
    disabled={isConnected}
    data-testid="ConnectionDriverFields_useSeparateSchemas"
@@ -95,7 +95,7 @@
    </div>
    <div class="col-6">
      <FormPasswordField
-        label={_t('connection.password', {defaultMessage: "Password"})}
+        label={_t('connection.password', {defaultMessage: 'Password'})}
        name="sshPassword"
        disabled={isConnected || !useSshTunnel}
        templateProps={{ noMargin: true }}
@@ -143,19 +143,20 @@ ORDER BY
            label={_t('settings.tabGroup.showServerName', { defaultMessage: 'Show server name alongside database name in title of the tab group' })}
            defaultValue={false}
          />
-          <!-- <div class="heading">{_t('settings.localization', { defaultMessage: 'Localization' })}</div>
+          <div class="heading">{_t('settings.localization', { defaultMessage: 'Localization' })}</div>
          <FormSelectField
-            label="Language"
+            label={_t('settings.localization.language', { defaultMessage: 'Language' })}
            name="localization.language"
            defaultValue={getSelectedLanguage()}
            isNative
            options={[
              { value: 'en', label: 'English' },
-              { value: 'cs', label: 'Czech' },
+              { value: 'cs', label: 'Čeština' },
+              { value: 'sk', label: 'Slovenčina' },
            ]}
            on:change={() => {
              showModal(ConfirmModal, {
-                message: 'Application will be reloaded to apply new language settings',
+                message: _t('settings.localization.reloadWarning', { defaultMessage: 'Application will be reloaded to apply new language settings' }),
                onConfirm: () => {
                  setTimeout(() => {
                    internalRedirectTo('/');
@@ -163,7 +164,7 @@ ORDER BY
                },
              });
            }}
-          /> -->
+          />

          <div class="heading">{_t('settings.dataGrid.title', { defaultMessage: 'Data grid' })}</div>
          <FormTextField
@@ -9,6 +9,7 @@ import { safeJsonParse } from 'dbgate-tools';
 import { apiCall } from './utility/api';
 import { getOpenedTabsStorageName, isAdminPage } from './utility/pageDefs';
 import { switchCurrentDatabase } from './utility/common';
+import { tick } from 'svelte';

 export interface TabDefinition {
  title: string;
@@ -189,7 +190,6 @@ export const cloudConnectionsStore = writable({});

 export const promoWidgetPreview = writable(null);

-
 export const DEFAULT_OBJECT_SEARCH_SETTINGS = {
  pureName: true,
  schemaName: false,
@@ -228,6 +228,12 @@ currentTheme.subscribe(value => {
 });
 export const getCurrentTheme = () => currentThemeValue;

+let extensionsValue: ExtensionsDirectory = null;
+extensions.subscribe(value => {
+  extensionsValue = value;
+});
+export const getExtensions = () => extensionsValue;
+
 export const currentThemeDefinition = derived(
  [currentTheme, extensions, systemThemeStore],
  ([$currentTheme, $extensions, $systemTheme]) => {
@@ -239,7 +245,9 @@ currentThemeDefinition.subscribe(value => {
  if (value?.themeType && getCurrentTheme()) {
    localStorage.setItem('currentThemeType', value?.themeType);
  } else {
-    localStorage.removeItem('currentThemeType');
+    if (extensionsValue?.themes?.length > 0) {
+      localStorage.removeItem('currentThemeType');
+    }
  }
 });
 export const openedConnectionsWithTemporary = derived(
@@ -310,17 +318,40 @@ openedTabs.subscribe(value => {
 });
 export const getOpenedTabs = () => openedTabsValue;

+let openedModalsValue = [];
+openedModals.subscribe(value => {
+  openedModalsValue = value;
+
+  tick().then(() => {
+    dispatchUpdateCommands();
+  });
+});
+export const getOpenedModals = () => openedModalsValue;
+
 let commandsValue = null;
 commands.subscribe(value => {
  commandsValue = value;

-  const electron = getElectron();
-  if (electron) {
-    electron.send('update-commands', JSON.stringify(value));
-  }
+  tick().then(() => {
+    dispatchUpdateCommands();
+  });
 });
 export const getCommands = () => commandsValue;

+function dispatchUpdateCommands() {
+  const electron = getElectron();
+  if (electron) {
+    electron.send(
+      'update-commands',
+      JSON.stringify({
+        isModalOpened: openedModalsValue?.length > 0,
+        commands: commandsValue,
+        dbgatePage: window['dbgate_page'],
+      })
+    );
+  }
+}
+
 let activeTabValue = null;
 activeTab.subscribe(value => {
  activeTabValue = value;
@@ -366,12 +397,6 @@ export const getCurrentDatabase = () => currentDatabaseValue;
 let currentSettingsValue = null;
 export const getCurrentSettings = () => currentSettingsValue || {};

-let extensionsValue: ExtensionsDirectory = null;
-extensions.subscribe(value => {
-  extensionsValue = value;
-});
-export const getExtensions = () => extensionsValue;
-
 let openedConnectionsValue = null;
 openedConnections.subscribe(value => {
  openedConnectionsValue = value;
@@ -418,12 +443,6 @@ selectedDatabaseObjectAppObject.subscribe(value => {
 });
 export const getSelectedDatabaseObjectAppObject = () => selectedDatabaseObjectAppObjectValue;

-let openedModalsValue = [];
-openedModals.subscribe(value => {
-  openedModalsValue = value;
-});
-export const getOpenedModals = () => openedModalsValue;
-
 let focusedConnectionOrDatabaseValue = null;
 focusedConnectionOrDatabase.subscribe(value => {
  focusedConnectionOrDatabaseValue = value;
@@ -27,41 +27,41 @@
 <FormProvider initialValues={fillEditorColumnInfo(columnInfo || {}, tableInfo)}>
  <ModalBase {...$$restProps}>
    <svelte:fragment slot="header"
-      >{columnInfo ? 'Edit column' : `Add column ${(tableInfo?.columns || []).length + 1}`}</svelte:fragment
+      >{columnInfo ? _t('columnEditor.editColumn', { defaultMessage: 'Edit column' }) : _t('columnEditor.addColumn', { defaultMessage: 'Add column {columnNumber}', values: { columnNumber: (tableInfo?.columns || []).length + 1 } })}</svelte:fragment
    >

-    <FormTextField name="columnName" label="Column name" focused disabled={isReadOnly} />
+    <FormTextField name="columnName" label={_t('columnEditor.columnName', { defaultMessage: 'Column name' })} focused disabled={isReadOnly} />
    <DataTypeEditor dialect={driver?.dialect} disabled={isReadOnly} />

    {#if !driver?.dialect?.specificNullabilityImplementation}
      <FormCheckboxField name="notNull" label="NOT NULL" disabled={isReadOnly} />
    {/if}
-    <FormCheckboxField name="isPrimaryKey" label="Is Primary Key" disabled={isReadOnly} />
+    <FormCheckboxField name="isPrimaryKey" label={_t('columnEditor.isPrimaryKey', { defaultMessage: 'Is Primary Key' })} disabled={isReadOnly} />
    {#if !driver?.dialect?.disableAutoIncrement}
-      <FormCheckboxField name="autoIncrement" label="Is Autoincrement" disabled={isReadOnly} />
+      <FormCheckboxField name="autoIncrement" label={_t('columnEditor.autoIncrement', { defaultMessage: 'Is Autoincrement' })} disabled={isReadOnly} />
    {/if}
    <FormTextField
      name="defaultValue"
-      label="Default value. Please use valid SQL expression, eg. 'Hello World' for string value, '' for empty string"
+      label={_t('columnEditor.defaultValue', { defaultMessage: "Default value. Please use valid SQL expression, eg. 'Hello World' for string value, '' for empty string" })}
      disabled={!setTableInfo}
    />
-    <FormTextField name="computedExpression" label="Computed expression" disabled={isReadOnly} />
+    <FormTextField name="computedExpression" label={_t('columnEditor.computedExpression', { defaultMessage: 'Computed expression' })} disabled={isReadOnly} />
    {#if driver?.dialect?.columnProperties?.isUnsigned}
-      <FormCheckboxField name="isUnsigned" label="Unsigned" disabled={isReadOnly} />
+      <FormCheckboxField name="isUnsigned" label={_t('columnEditor.isUnsigned', { defaultMessage: 'Unsigned' })} disabled={isReadOnly} />
    {/if}
    {#if driver?.dialect?.columnProperties?.isZerofill}
-      <FormCheckboxField name="isZerofill" label="Zero fill" disabled={isReadOnly} />
+      <FormCheckboxField name="isZerofill" label={_t('columnEditor.isZerofill', { defaultMessage: 'Zero fill' })} disabled={isReadOnly} />
    {/if}
    {#if driver?.dialect?.columnProperties?.columnComment}
-      <FormTextField name="columnComment" label="Comment" disabled={isReadOnly} />
+      <FormTextField name="columnComment" label={_t('columnEditor.columnComment', { defaultMessage: 'Comment' })} disabled={isReadOnly} />
    {/if}
    {#if driver?.dialect?.columnProperties?.isSparse}
-      <FormCheckboxField name="isSparse" label="Sparse" disabled={isReadOnly} />
+      <FormCheckboxField name="isSparse" label={_t('columnEditor.isSparse', { defaultMessage: 'Sparse' })} disabled={isReadOnly} />
    {/if}

    <svelte:fragment slot="footer">
      <FormSubmit
-        value={columnInfo ? 'Save' : 'Save and next'}
+        value={columnInfo ? _t('common.save', { defaultMessage: 'Save' }) : _t('common.saveAndNext', { defaultMessage: 'Save and next' })}
        disabled={isReadOnly}
        on:click={e => {
          closeCurrentModal();
@@ -85,11 +85,11 @@
        />
      {/if}

-      <FormStyledButton type="button" value="Close" on:click={closeCurrentModal} />
+      <FormStyledButton type="button" value={_t('common.close', { defaultMessage: 'Close' })} on:click={closeCurrentModal} />
      {#if columnInfo}
        <FormStyledButton
          type="button"
-          value="Remove"
+          value={_t('common.remove', { defaultMessage: 'Remove' })}
          on:click={() => {
            closeCurrentModal();
            setTableInfo(tbl => editorDeleteColumn(tbl, columnInfo, addDataCommand));
@@ -9,13 +9,15 @@
  import { editorAddConstraint, editorDeleteConstraint, editorModifyConstraint } from 'dbgate-tools';
  import TextField from '../forms/TextField.svelte';
  import SelectField from '../forms/SelectField.svelte';
+  import { _t, __t } from '../translations';
+  import _ from 'lodash';

  export let constraintInfo;
  export let setTableInfo;
  export let tableInfo;
  export let constraintLabel;
  export let constraintType;
-  export let constraintNameLabel = 'Constraint name';
+  export let constraintNameLabel = _t('tableEditor.constraintName', { defaultMessage: 'Constraint name' });
  export let getExtractConstraintProps;
  export let hideConstraintName = false;

@@ -41,7 +43,7 @@
 <FormProvider>
  <ModalBase {...$$restProps}>
    <svelte:fragment slot="header"
-      >{constraintInfo ? `Edit ${constraintLabel}` : `Add ${constraintLabel}`}</svelte:fragment
+      >{constraintInfo ? _t('tableEdit.editConstraintLabel', { defaultMessage: 'Edit {constraintLabel}', values: { constraintLabel } }) : _t('tableEdit.addConstraintLabel', { defaultMessage: 'Add {constraintLabel}', values: { constraintLabel } })}</svelte:fragment
    >

    <div class="largeFormMarker">
@@ -65,7 +67,7 @@

      {#each columns as column, index}
        <div class="row">
-          <div class="label col-3">Column {index + 1}</div>
+          <div class="label col-3">{_t('common.column', { defaultMessage: 'Column ' })}{index + 1}</div>
          <div class={$$slots.column ? 'col-3' : 'col-6'}>
            {#key column.columnName}
              <SelectField
@@ -91,7 +93,7 @@
          {/if}
          <div class="col-3 button">
            <FormStyledButton
-              value="Delete"
+              value={_t('common.delete', { defaultMessage: 'Delete' })}
              disabled={isReadOnly}
              on:click={e => {
                const x = [...columns];
@@ -104,11 +106,11 @@
      {/each}

      <div class="row">
-        <div class="label col-3">Add new column</div>
+        <div class="label col-3">{_t('columnsConstraintEditor.addNewColumn', { defaultMessage: 'Add new column' })}</div>
        <div class="col-9">
          {#key columns.length}
            <SelectField
-              placeholder="Select column"
+              placeholder={_t('columnsConstraintEditor.selectColumn', { defaultMessage: 'Select column' })}
              disabled={isReadOnly}
              value={''}
              on:change={e => {
@@ -123,7 +125,7 @@
              isNative
              options={[
                {
-                  label: 'Choose column',
+                  label: _t('columnsConstraintEditor.chooseColumn', { defaultMessage: 'Choose column' })  ,
                  value: '',
                },
                ...(tableInfo?.columns?.map(col => ({
@@ -139,7 +141,7 @@

    <svelte:fragment slot="footer">
      <FormSubmit
-        value={'Save'}
+        value={_t('common.save', { defaultMessage: 'Save' })}
        disabled={isReadOnly}
        on:click={() => {
          closeCurrentModal();
@@ -151,11 +153,11 @@
        }}
      />

-      <FormStyledButton type="button" value="Close" on:click={closeCurrentModal} />
+      <FormStyledButton type="button" value={_t('common.close', { defaultMessage: 'Close' })} on:click={closeCurrentModal} />
      {#if constraintInfo}
        <FormStyledButton
          type="button"
-          value="Remove"
+          value={_t('common.remove', { defaultMessage: 'Remove' })}
          disabled={isReadOnly}
          on:click={() => {
            closeCurrentModal();
@@ -1,6 +1,7 @@
 <script lang="ts">
  import FormDropDownTextField from '../forms/FormDropDownTextField.svelte';
  import { getFormContext } from '../forms/FormProviderCore.svelte';
+  import { _t } from '../translations';

  const { values, setFieldValue } = getFormContext();

@@ -17,4 +18,4 @@
  export let disabled = false;
 </script>

-<FormDropDownTextField name="dataType" label="Data type" menu={createDataTypesMenu} {disabled} />
+<FormDropDownTextField name="dataType" label="{_t('tableEditor.dataType', { defaultMessage: 'Data type' })}" menu={createDataTypesMenu} {disabled} />
@@ -60,11 +60,11 @@

 <FormProvider>
  <ModalBase {...$$restProps}>
-    <svelte:fragment slot="header">{constraintInfo ? `Edit foreign key` : `Add foreign key`}</svelte:fragment>
+    <svelte:fragment slot="header">{constraintInfo ? _t('foreignKeyEditor.editForeignKey', { defaultMessage: 'Edit foreign key' }) : _t('foreignKeyEditor.addForeignKey', { defaultMessage: 'Add foreign key' })}</svelte:fragment>

    <div class="largeFormMarker">
      <div class="row">
-        <div class="label col-3">Constraint name</div>
+        <div class="label col-3">{_t('tableEditor.constraintName', { defaultMessage: 'Constraint name' })}</div>
        <div class="col-9">
          <TextField
            value={constraintName}
@@ -76,7 +76,7 @@
      </div>

      <div class="row">
-        <div class="label col-3">Referenced table</div>
+        <div class="label col-3">{_t('foreignKeyEditor.referencedTable', { defaultMessage: 'Referenced table' })}</div>
        <div class="col-9">
          <SelectField
            value={fullNameToString({ pureName: refTableName, schemaName: refSchemaName })}
@@ -99,7 +99,7 @@
      </div>

      <div class="row">
-        <div class="label col-3">On update action</div>
+        <div class="label col-3">{_t('foreignKeyEditor.onUpdateAction', { defaultMessage: 'On update action' })}</div>
        <div class="col-9">
          <SelectField
            value={updateAction}
@@ -115,7 +115,7 @@
      </div>

      <div class="row">
-        <div class="label col-3">On delete action</div>
+        <div class="label col-3">{_t('foreignKeyEditor.onDeleteAction', { defaultMessage: 'On delete action' })}</div>
        <div class="col-9">
          <SelectField
            value={deleteAction}
@@ -132,10 +132,10 @@

      <div class="row">
        <div class="col-5 mr-1">
-          Base column - {tableInfo.pureName}
+          {_t('foreignKeyEditor.baseColumn', { defaultMessage: 'Base column - ' })}{tableInfo.pureName}
        </div>
        <div class="col-5 ml-1">
-          Ref column - {refTableName || '(table not set)'}
+          {_t('foreignKeyEditor.refColumn', { defaultMessage: 'Ref column - ' })}{refTableName || _t('foreignKeyEditor.tableNotSet', { defaultMessage: '(table not set)' })}
        </div>
      </div>

@@ -195,7 +195,7 @@

      <FormStyledButton
        type="button"
-        value="Add column"
+        value={_t('foreignKeyEditor.addColumn', { defaultMessage: 'Add column' })}
        disabled={isReadOnly}
        on:click={() => {
          columns = [...columns, {}];
@@ -217,12 +217,12 @@
        }}
      />

-      <FormStyledButton type="button" value="Close" on:click={closeCurrentModal} />
+      <FormStyledButton type="button" value={_t('common.close', { defaultMessage: 'Close' })} on:click={closeCurrentModal} />
      {#if constraintInfo}
        <FormStyledButton
          type="button"
          disabled={isReadOnly}
-          value="Remove"
+          value={_t('common.remove', { defaultMessage: 'Remove' })}
          on:click={() => {
            closeCurrentModal();
            setTableInfo(tbl => editorDeleteConstraint(tbl, constraintInfo));
@@ -3,6 +3,7 @@
  import FormCheckboxField from '../forms/FormCheckboxField.svelte';
  import SelectField from '../forms/SelectField.svelte';
  import TextField from '../forms/TextField.svelte';
+  import { _t } from '../translations';

  import ColumnsConstraintEditorModal from './ColumnsConstraintEditorModal.svelte';

@@ -29,7 +30,7 @@
  {...$$restProps}
  constraintLabel="index"
  constraintType="index"
-  constraintNameLabel="Index name"
+  constraintNameLabel={_t('indexEditor.indexName', { defaultMessage: 'Index name' })}
  {constraintInfo}
  {setTableInfo}
  {tableInfo}
@@ -61,15 +62,14 @@
  <svelte:fragment slot="constraintProps">
    <div class="largeFormMarker">
      <div class="row">
-        <CheckboxField checked={isUnique} on:change={e => (isUnique = e.target.checked)} disabled={isReadOnly} /> Is unique
-        index
+        <CheckboxField checked={isUnique} on:change={e => (isUnique = e.target.checked)} disabled={isReadOnly} /> {_t('indexEditor.isUnique', { defaultMessage: 'Is unique index' })}
      </div>
    </div>

    <div class="largeFormMarker">
      {#if driver?.dialect?.filteredIndexes}
        <div class="row">
-          <div class="label col-3">Filtered index condition</div>
+          <div class="label col-3">{_t('indexEditor.filteredIndexCondition', { defaultMessage: 'Filtered index condition' })}</div>
          <div class="col-9">
            <TextField
              value={filterDefinition}
@@ -1,12 +1,13 @@
 <script lang="ts">
  import ColumnsConstraintEditorModal from './ColumnsConstraintEditorModal.svelte';
+  import { _t } from '../translations';

  export let constraintInfo;
  export let setTableInfo;
  export let tableInfo;
  export let driver;

-  export let constraintLabel = 'primary key';
+  export let constraintLabel = _t('tableEditor.primaryKey', { defaultMessage: 'primary key' });
  export let constraintType = 'primaryKey';
 </script>

@@ -9,13 +9,14 @@
  import { showModal } from '../modals/modalTools';

  import PrimaryKeyEditorModal from './PrimaryKeyEditorModal.svelte';
+  import { _t } from '../translations';

  export let tableInfo;
  export let setTableInfo;
  export let isWritable;
  export let driver;

-  export let constraintLabel = 'primary key';
+  export let constraintLabel = _t('tableEditor.primaryKey', { defaultMessage: 'primary key' });
  export let constraintType = 'primaryKey';

  $: columns = tableInfo?.columns;
@@ -35,7 +36,12 @@
 <ObjectListControl
  collection={_.compact([keyConstraint])}
  title={_.startCase(constraintLabel)}
-  emptyMessage={isWritable ? `No ${constraintLabel} defined` : null}
+  emptyMessage={isWritable
+    ? _t('tableEditor.noConstraintDefined', {
+        defaultMessage: 'No {constraintLabel} defined',
+        values: { constraintLabel },
+      })
+    : null}
  onAddNew={isWritable && !keyConstraint && columns?.length > 0 ? addKeyConstraint : null}
  hideDisplayName={driver?.dialect?.anonymousPrimaryKey}
  clickable
@@ -51,7 +57,7 @@
  columns={[
    {
      fieldName: 'columns',
-      header: 'Columns',
+      header: _t('tableEditor.columns', { defaultMessage: 'Columns' }),
      slot: 0,
      sortable: true,
    },
@@ -70,7 +76,7 @@
      onClick={e => {
        e.stopPropagation();
        setTableInfo(tbl => editorDeleteConstraint(tbl, row));
-      }}>Remove</Link
+      }}>{_t('common.remove', { defaultMessage: 'Remove' })}</Link
    ></svelte:fragment
  >
 </ObjectListControl>
@@ -3,8 +3,8 @@

  registerCommand({
    id: 'tableEditor.addColumn',
-    category: 'Table editor',
-    name: 'Add column',
+    category: __t('tableEditor', { defaultMessage: 'Table editor'}),
+    name: __t('tableEditor.addColumn', { defaultMessage: 'Add column'}),
    icon: 'icon add-column',
    toolbar: true,
    isRelatedToTab: true,
@@ -14,8 +14,8 @@

  registerCommand({
    id: 'tableEditor.addPrimaryKey',
-    category: 'Table editor',
-    name: 'Add primary key',
+    category: __t('tableEditor', { defaultMessage: 'Table editor'}),
+    name: __t('tableEditor.addPrimaryKey', { defaultMessage: 'Add primary key'}),
    icon: 'icon add-key',
    toolbar: true,
    isRelatedToTab: true,
@@ -25,8 +25,8 @@

  registerCommand({
    id: 'tableEditor.addForeignKey',
-    category: 'Table editor',
-    name: 'Add foreign key',
+    category: __t('tableEditor', { defaultMessage: 'Table editor'}),
+    name: __t('tableEditor.addForeignKey', { defaultMessage: 'Add foreign key'}),
    icon: 'icon add-key',
    toolbar: true,
    isRelatedToTab: true,
@@ -36,8 +36,8 @@

  registerCommand({
    id: 'tableEditor.addIndex',
-    category: 'Table editor',
-    name: 'Add index',
+    category: __t('tableEditor', { defaultMessage: 'Table editor'}),
+    name: __t('tableEditor.addIndex', { defaultMessage: 'Add index'}),
    icon: 'icon add-key',
    toolbar: true,
    isRelatedToTab: true,
@@ -47,8 +47,8 @@

  registerCommand({
    id: 'tableEditor.addUnique',
-    category: 'Table editor',
-    name: 'Add unique',
+    category: __t('tableEditor', { defaultMessage: 'Table editor'}),
+    name: __t('tableEditor.addUnique', { defaultMessage: 'Add unique'}),
    icon: 'icon add-key',
    toolbar: true,
    isRelatedToTab: true,
@@ -83,6 +83,7 @@
  import UniqueEditorModal from './UniqueEditorModal.svelte';
  import ObjectFieldsEditor from '../elements/ObjectFieldsEditor.svelte';
  import PrimaryKeyLikeListControl from './PrimaryKeyLikeListControl.svelte';
+  import { __t, _t } from '../translations';

  export const activator = createActivator('TableEditor', true);

@@ -171,9 +172,9 @@
  {#if tableInfo && (tableFormOptions || isCreateTable)}
    {#key resetCounter}
      <ObjectFieldsEditor
-        title="Table properties"
+        title={_t('tableEditor.tableproperties', { defaultMessage: 'Table properties' })}
        fieldDefinitions={tableFormOptions ?? []}
-        pureNameTitle={isCreateTable ? 'Table name' : null}
+        pureNameTitle={isCreateTable ? _t('tableEditor.tablename', { defaultMessage: 'Table name' }) : null}
        schemaList={isCreateTable && schemaList?.length >= 0 ? schemaList : null}
        values={_.pick(tableInfo, ['schemaName', 'pureName', ...(tableFormOptions ?? []).map(x => x.name)])}
        onChangeValues={vals => {
@@ -187,15 +188,15 @@

  <ObjectListControl
    collection={columns?.map((x, index) => ({ ...x, ordinal: index + 1 }))}
-    title={`Columns (${columns?.length || 0})`}
-    emptyMessage="No columns defined"
+    title={_t('tableEditor.columns', { defaultMessage: 'Columns ({columnCount})', values: { columnCount: columns?.length || 0 } })}
+    emptyMessage={_t('tableEditor.nocolumnsdefined', { defaultMessage: 'No columns defined' })}
    clickable
    on:clickrow={e => showModal(ColumnEditorModal, { columnInfo: e.detail, tableInfo, setTableInfo, driver })}
    onAddNew={isWritable ? addColumn : null}
    displayNameFieldName="columnName"
    multipleItemsActions={[
      {
-        text: 'Remove',
+        text: _t('tableEditor.remove', { defaultMessage: 'Remove' }),
        icon: 'icon delete',
        onClick: selected => {
          setTableInfo(tbl => {
@@ -205,7 +206,7 @@
        },
      },
      {
-        text: 'Copy names',
+        text: _t('tableEditor.copynames', { defaultMessage: 'Copy names' }),
        icon: 'icon copy',
        onClick: selected => {
          const names = selected.map(x => x.columnName).join('\n');
@@ -213,7 +214,7 @@
        },
      },
      {
-        text: 'Copy definitions',
+        text: _t('tableEditor.copydefinitions', { defaultMessage: 'Copy definitions' }),
        icon: 'icon copy',
        onClick: selected => {
          const names = selected
@@ -226,55 +227,55 @@
    columns={[
      !driver?.dialect?.specificNullabilityImplementation && {
        fieldName: 'notNull',
-        header: 'Nullability',
+        header: _t('tableEditor.nullability', { defaultMessage: 'Nullability' }),
        sortable: true,
        slot: 0,
      },
      {
        fieldName: 'dataType',
-        header: 'Data Type',
+        header: _t('tableEditor.dataType', { defaultMessage: 'Data type' }),
        sortable: true,
        filterable: true,
      },
      {
        fieldName: 'defaultValue',
-        header: 'Default value',
+        header: _t('tableEditor.defaultValue', { defaultMessage: 'Default value' }),
        sortable: true,
        filterable: true,
      },
      driver?.dialect?.columnProperties?.isSparse && {
        fieldName: 'isSparse',
-        header: 'Is Sparse',
+        header: _t('tableEditor.isSparse', { defaultMessage: 'Is Sparse' }),
        sortable: true,
        slot: 1,
      },
      {
        fieldName: 'computedExpression',
-        header: 'Computed Expression',
+        header: _t('tableEditor.computedExpression', { defaultMessage: 'Computed Expression' }),
        sortable: true,
        filterable: true,
      },
      driver?.dialect?.columnProperties?.isPersisted && {
        fieldName: 'isPersisted',
-        header: 'Is Persisted',
+        header: _t('tableEditor.isPersisted', { defaultMessage: 'Is Persisted' }),
        sortable: true,
        slot: 2,
      },
      driver?.dialect?.columnProperties?.isUnsigned && {
        fieldName: 'isUnsigned',
-        header: 'Unsigned',
+        header: _t('tableEditor.isUnsigned', { defaultMessage: 'Unsigned' }),
        sortable: true,
        slot: 4,
      },
      driver?.dialect?.columnProperties?.isZerofill && {
        fieldName: 'isZerofill',
-        header: 'Zero fill',
+        header: _t('tableEditor.isZeroFill', { defaultMessage: 'Zero fill' }),
        sortable: true,
        slot: 5,
      },
      driver?.dialect?.columnProperties?.columnComment && {
        fieldName: 'columnComment',
-        header: 'Comment',
+        header: _t('tableEditor.columnComment', { defaultMessage: 'Comment' }),
        sortable: true,
        filterable: true,
      },
@@ -287,19 +288,19 @@
        : null,
    ]}
  >
-    <svelte:fragment slot="0" let:row>{row?.notNull ? 'NOT NULL' : 'NULL'}</svelte:fragment>
-    <svelte:fragment slot="1" let:row>{row?.isSparse ? 'YES' : 'NO'}</svelte:fragment>
-    <svelte:fragment slot="2" let:row>{row?.isPersisted ? 'YES' : 'NO'}</svelte:fragment>
+    <svelte:fragment slot="0" let:row>{row?.notNull ? _t('tableEditor.notnull', { defaultMessage: 'NOT NULL' }) : _t('tableEditor.null', { defaultMessage: 'NULL' })}</svelte:fragment>
+    <svelte:fragment slot="1" let:row>{row?.isSparse ? _t('tableEditor.yes', { defaultMessage: 'YES' }) : _t('tableEditor.no', { defaultMessage: 'NO' })}</svelte:fragment>
+    <svelte:fragment slot="2" let:row>{row?.isPersisted ? _t('tableEditor.yes', { defaultMessage: 'YES' }) : _t('tableEditor.no', { defaultMessage: 'NO' })}</svelte:fragment>
    <svelte:fragment slot="3" let:row
      ><Link
        onClick={e => {
          e.stopPropagation();
          setTableInfo(tbl => editorDeleteColumn(tbl, row));
-        }}>Remove</Link
+        }}>{_t('tableEditor.remove', { defaultMessage: 'Remove' })}</Link
      ></svelte:fragment
    >
-    <svelte:fragment slot="4" let:row>{row?.isUnsigned ? 'YES' : 'NO'}</svelte:fragment>
-    <svelte:fragment slot="5" let:row>{row?.isZerofill ? 'YES' : 'NO'}</svelte:fragment>
+    <svelte:fragment slot="4" let:row>{row?.isUnsigned ? _t('tableEditor.yes', { defaultMessage: 'YES' }) : _t('tableEditor.no', { defaultMessage: 'NO' })}</svelte:fragment>
+    <svelte:fragment slot="5" let:row>{row?.isZerofill ? _t('tableEditor.yes', { defaultMessage: 'YES' }) : _t('tableEditor.no', { defaultMessage: 'NO' })}</svelte:fragment>
    <svelte:fragment slot="name" let:row><ColumnLabel {...row} forceIcon /></svelte:fragment>
  </ObjectListControl>

@@ -320,20 +321,20 @@
    <ObjectListControl
      collection={indexes}
      onAddNew={isWritable && columns?.length > 0 ? addIndex : null}
-      title={`Indexes (${indexes?.length || 0})`}
-      emptyMessage={isWritable ? 'No index defined' : null}
+      title={_t('tableEditor.indexes', { defaultMessage: 'Indexes ({indexCount})', values: { indexCount: indexes?.length || 0 } })}
+      emptyMessage={isWritable ? _t('tableEditor.noindexdefined', { defaultMessage: 'No index defined' }) : null}
      clickable
      on:clickrow={e => showModal(IndexEditorModal, { constraintInfo: e.detail, tableInfo, setTableInfo, driver })}
      columns={[
        {
          fieldName: 'columns',
-          header: 'Columns',
+          header: _t('tableEditor.columns', { defaultMessage: 'Columns' }),
          slot: 0,
          sortable: true,
        },
        {
          fieldName: 'unique',
-          header: 'Unique',
+          header: _t('tableEditor.unique', { defaultMessage: 'Unique' }),
          slot: 1,
          sortable: true,
        },
@@ -347,13 +348,13 @@
    >
      <svelte:fragment slot="name" let:row><ConstraintLabel {...row} /></svelte:fragment>
      <svelte:fragment slot="0" let:row>{row?.columns.map(x => x.columnName).join(', ')}</svelte:fragment>
-      <svelte:fragment slot="1" let:row>{row?.isUnique ? 'YES' : 'NO'}</svelte:fragment>
+      <svelte:fragment slot="1" let:row>{row?.isUnique ? _t('tableEditor.yes', { defaultMessage: 'YES' }) : _t('tableEditor.no', { defaultMessage: 'NO' })}</svelte:fragment>
      <svelte:fragment slot="2" let:row
        ><Link
          onClick={e => {
            e.stopPropagation();
            setTableInfo(tbl => editorDeleteConstraint(tbl, row));
-          }}>Remove</Link
+          }}>{_t('common.remove', { defaultMessage: 'Remove' })}</Link
        ></svelte:fragment
      >
    </ObjectListControl>
@@ -363,14 +364,14 @@
    <ObjectListControl
      collection={uniques}
      onAddNew={isWritable && columns?.length > 0 ? addUnique : null}
-      title={`Unique constraints (${uniques?.length || 0})`}
-      emptyMessage={isWritable ? 'No unique defined' : null}
+      title={_t('tableEditor.uniqueConstraints', { defaultMessage: 'Unique constraints ({constraintCount})', values: { constraintCount: uniques?.length || 0 } })}
+      emptyMessage={isWritable ? _t('tableEditor.nouniquedefined', { defaultMessage: 'No unique defined' }) : null}
      clickable
      on:clickrow={e => showModal(UniqueEditorModal, { constraintInfo: e.detail, tableInfo, setTableInfo })}
      columns={[
        {
          fieldName: 'columns',
-          header: 'Columns',
+          header: _t('tableEditor.columns', { defaultMessage: 'Columns' }),
          slot: 0,
          sortable: true,
        },
@@ -390,7 +391,7 @@
          onClick={e => {
            e.stopPropagation();
            setTableInfo(tbl => editorDeleteConstraint(tbl, row));
-          }}>Remove</Link
+          }}>{_t('common.remove', { defaultMessage: 'Remove' })}</Link
        ></svelte:fragment
      >
    </ObjectListControl>
@@ -400,13 +401,13 @@
    <ForeignKeyObjectListControl
      collection={foreignKeys}
      onAddNew={isWritable && columns?.length > 0 ? addForeignKey : null}
-      title={`Foreign keys (${foreignKeys?.length || 0})`}
-      emptyMessage={isWritable ? 'No foreign key defined' : null}
+      title={_t('tableEditor.foreignKeys', { defaultMessage: 'Foreign keys ({foreignKeyCount})', values: { foreignKeyCount: foreignKeys?.length || 0 } })}
+      emptyMessage={isWritable ? _t('tableEditor.noforeignkeydefined', { defaultMessage: 'No foreign key defined' }) : null}
      clickable
      onRemove={row => setTableInfo(tbl => editorDeleteConstraint(tbl, row))}
      on:clickrow={e => showModal(ForeignKeyEditorModal, { constraintInfo: e.detail, tableInfo, setTableInfo, dbInfo })}
    />
-    <ForeignKeyObjectListControl collection={dependencies} title="Dependencies" />
+    <ForeignKeyObjectListControl collection={dependencies} title={_t('tableEditor.dependencies', { defaultMessage: 'Dependencies' })} />
  {/if}
 </div>

@@ -1,5 +1,6 @@
 <script lang="ts">
  import ColumnsConstraintEditorModal from './ColumnsConstraintEditorModal.svelte';
+  import { _t } from '../translations';

  export let constraintInfo;
  export let setTableInfo;
@@ -9,7 +10,7 @@

 <ColumnsConstraintEditorModal
  {...$$restProps}
-  constraintLabel="unique"
+  constraintLabel={_t('tableEdit.unique', { defaultMessage: "unique" })}
  constraintType="unique"
  {constraintInfo}
  {setTableInfo}
@@ -239,8 +239,8 @@

  registerCommand({
    id: 'tabs.nextTab',
-    category: 'Tabs',
-    name: _t('command.tabs.nextTab', { defaultMessage: 'Next tab' }),
+    category: __t('command.tabs', { defaultMessage: 'Tabs' }),
+    name: __t('command.tabs.nextTab', { defaultMessage: 'Next tab' }),
    keyText: 'Ctrl+Tab',
    testEnabled: () => getOpenedTabs().filter(x => !x.closedTime).length >= 2,
    onClick: () => switchTabByOrder(false),
@@ -248,8 +248,8 @@

  registerCommand({
    id: 'tabs.previousTab',
-    category: 'Tabs',
-    name: _t('command.tabs.previousTab', { defaultMessage: 'Previous tab' }),
+    category: __t('command.tabs', { defaultMessage: 'Tabs' }),
+    name: __t('command.tabs.previousTab', { defaultMessage: 'Previous tab' }),
    keyText: 'Ctrl+Shift+Tab',
    testEnabled: () => getOpenedTabs().filter(x => !x.closedTime).length >= 2,
    onClick: () => switchTabByOrder(true),
@@ -257,16 +257,16 @@

  registerCommand({
    id: 'tabs.closeAll',
-    category: 'Tabs',
-    name: _t('command.tabs.closeAll', { defaultMessage: 'Close all tabs' }),
+    category: __t('command.tabs', { defaultMessage: 'Tabs' }),
+    name: __t('command.tabs.closeAll', { defaultMessage: 'Close all tabs' }),
    testEnabled: () => getOpenedTabs().filter(x => !x.closedTime).length >= 1,
    onClick: closeAll,
  });

  registerCommand({
    id: 'tabs.closeTab',
-    category: 'Tabs',
-    name: _t('command.tabs.closeTab', { defaultMessage: 'Close tab' }),
+    category: __t('command.tabs', { defaultMessage: 'Tabs' }),
+    name: __t('command.tabs.closeTab', { defaultMessage: 'Close tab' }),
    keyText: isElectronAvailable() ? 'CtrlOrCommand+W' : 'Alt+W',
    testEnabled: () => {
      const hasAnyOtherTab = getOpenedTabs().filter(x => !x.closedTime).length >= 1;
@@ -279,24 +279,24 @@

  registerCommand({
    id: 'tabs.closeTabsWithCurrentDb',
-    category: 'Tabs',
-    name: _t('command.tabs.closeTabsWithCurrentDb', { defaultMessage: 'Close tabs with current DB' }),
+    category: __t('command.tabs', { defaultMessage: 'Tabs' }),
+    name: __t('command.tabs.closeTabsWithCurrentDb', { defaultMessage: 'Close tabs with current DB' }),
    testEnabled: () => getOpenedTabs().filter(x => !x.closedTime).length >= 1 && !!getCurrentDatabase(),
    onClick: closeTabsWithCurrentDb,
  });

  registerCommand({
    id: 'tabs.closeTabsButCurrentDb',
-    category: 'Tabs',
-    name: _t('command.tabs.closeTabsButCurrentDb', { defaultMessage: 'Close tabs but current DB' }),
+    category: __t('command.tabs', { defaultMessage: 'Tabs' }),
+    name: __t('command.tabs.closeTabsButCurrentDb', { defaultMessage: 'Close tabs but current DB' }),
    testEnabled: () => getOpenedTabs().filter(x => !x.closedTime).length >= 1 && !!getCurrentDatabase(),
    onClick: closeTabsButCurrentDb,
  });

  registerCommand({
    id: 'tabs.reopenClosedTab',
-    category: 'Tabs',
-    name: _t('command.tabs.reopenClosedTab', { defaultMessage: 'Reopen closed tab' }),
+    category: __t('command.tabs', { defaultMessage: 'Tabs' }),
+    name: __t('command.tabs.reopenClosedTab', { defaultMessage: 'Reopen closed tab' }),
    keyText: 'CtrlOrCommand+Shift+T',
    testEnabled: () => getOpenedTabs().filter(x => x.closedTime).length >= 1,
    onClick: reopenClosedTab,
@@ -304,8 +304,8 @@

  registerCommand({
    id: 'tabs.addToFavorites',
-    category: 'Tabs',
-    name: _t('command.tabs.addToFavorites', { defaultMessage: 'Add current tab to favorites' }),
+    category: __t('command.tabs', { defaultMessage: 'Tabs' }),
+    name: __t('command.tabs.addToFavorites', { defaultMessage: 'Add current tab to favorites' }),
    // icon: 'icon favorite',
    // toolbar: true,
    testEnabled: () =>
@@ -360,6 +360,7 @@
  import NewObjectModal from '../modals/NewObjectModal.svelte';
  import { isProApp } from '../utility/proTools';
  import { openWebLink } from '../utility/simpleTools';
+  import { __t } from '../translations';

  export let multiTabIndex;
  export let shownTab;
@@ -6,8 +6,8 @@
  registerCommand({
    id: 'archiveFile.save',
    group: 'save',
-    category: 'Archive file',
-    name: 'Save',
+    category: __t('command.archiveFile', { defaultMessage: 'Archive file' }),
+    name: __t('command.archiveFile.save', { defaultMessage: 'Save' }),
    toolbar: true,
    isRelatedToTab: true,
    icon: 'icon save',
@@ -17,8 +17,8 @@

  registerCommand({
    id: 'archiveFile.saveAs',
-    category: 'Archive file',
-    name: 'Save as',
+    category: __t('command.archiveFile', { defaultMessage: 'Archive file' }),
+    name: __t('command.archiveFile.saveAs', { defaultMessage: 'Save as' }),
    icon: 'icon save',
    isRelatedToTab: true,
    testEnabled: () => getCurrentEditor() != null,
@@ -49,6 +49,7 @@
  import { changeTab, markTabSaved, markTabUnsaved, sleep } from '../utility/common';
  import createActivator, { getActiveComponent } from '../utility/createActivator';
  import createUndoReducer from '../utility/createUndoReducer';
+  import { __t } from '../translations';

  export const activator = createActivator('ArchiveFileTab', true);

@@ -8,8 +8,8 @@
  registerCommand({
    id: 'collectionTable.save',
    group: 'save',
-    category: 'Collection data',
-    name: 'Save',
+    category: __t('command.collectionData', { defaultMessage: 'Collection data' }),
+    name: __t('command.collectionData.save', { defaultMessage: 'Save' }),
    // keyText: 'CtrlOrCommand+S',
    toolbar: true,
    isRelatedToTab: true,
@@ -56,6 +56,7 @@
  import useEditorData from '../query/useEditorData';
  import { markTabSaved, markTabUnsaved } from '../utility/common';
  import { getNumberIcon } from '../icons/FontIcon.svelte';
+  import { __t } from '../translations';

  export let tabid;
  export let conid;
@@ -300,7 +300,7 @@
      contentTestId="ConnectionTab_tabControlContent"
      tabs={[
        {
-          label: 'General',
+          label: _t('common.general', { defaultMessage: 'General' }),
          component: ConnectionDriverFields,
          props: { getDatabaseList, currentConnection },
          testid: 'ConnectionTab_tabGeneral',
@@ -316,7 +316,7 @@
          testid: 'ConnectionTab_tabSsl',
        },
        {
-          label: 'Advanced',
+          label: _t('common.advanced', { defaultMessage: 'Advanced' }),
          component: ConnectionAdvancedDriverFields,
          testid: 'ConnectionTab_tabAdvanced',
        },
@@ -383,7 +383,7 @@
          {/if}
          {#if isTesting}
            <div>
-              <FontIcon icon="icon loading" /> Testing connection
+              <FontIcon icon="icon loading" /> {_t('common.testingConnection', { defaultMessage: 'Testing connection' })}
            </div>
          {/if}
        </div>
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Stela Augustinova	a3d9fe76d6	Merge branch 'master' into feature/postgresql-export-bytea	2025-11-13 13:44:11 +01:00
Stela Augustinova	0f4f154637	Add support for base64 image source from binary object	2025-11-13 13:37:33 +01:00
Stela Augustinova	7d112a208f	Enhance binary data handling in modifyRow function to support ArrayBuffer conversion to base64	2025-11-13 13:12:51 +01:00
Stela Augustinova	c867d39d8d	Remove recordset call in MySQL driver	2025-11-13 10:26:12 +01:00
Stela Augustinova	83b6c939f7	Test binary - added engine label	2025-11-13 10:10:33 +01:00
Stela Augustinova	e1e4eb5d6f	Added binary data types for engines	2025-11-13 09:40:05 +01:00
Stela Augustinova	a14c08f122	Handle binary data in load cell from file by converting Buffer to base64	2025-11-12 17:03:35 +01:00
$SPRINX0\prochazka$ SPRINX0\prochazka	5fd50dcf45	SYNC: fix - license in pro widget	2025-11-12 15:40:48 +00:00
$SPRINX0\prochazka$ SPRINX0\prochazka	b2ac4ee245	SYNC: CSV parameters	2025-11-12 10:22:12 +00:00
$SPRINX0\prochazka$ SPRINX0\prochazka	0ad7c0546b	CSV for MS Excel export	2025-11-12 10:59:50 +01:00
$SPRINX0\prochazka$ SPRINX0\prochazka	748381fef3	v6.6.12-premium-beta.5	2025-11-12 08:50:46 +01:00
$SPRINX0\prochazka$ SPRINX0\prochazka	7eb9e42210	SYNC: load pro widget in trial	2025-11-12 07:47:06 +00:00
$SPRINX0\prochazka$ SPRINX0\prochazka	36a4b67ef4	SYNC: promo widget in trial	2025-11-12 07:47:05 +00:00
Stela Augustinova	94b35e3d5f	Enhance binary data handling by converting hex strings to base64 in filter parser and updating MongoDB driver for BinData support	2025-11-11 14:39:43 +01:00
Jan Prochazka	c5aa82b76a	Merge pull request #1252 from dbgate/feature/translation2 Feature/translation2	2025-11-11 08:50:22 +01:00
$SPRINX0\prochazka$ SPRINX0\prochazka	c2920e195f	optimalization	2025-11-11 08:25:56 +01:00
$SPRINX0\prochazka$ SPRINX0\prochazka	92a78a419e	fix in translation	2025-11-11 08:17:42 +01:00
Stela Augustinova	4f27c2b852	translation-select language	2025-11-10 16:29:36 +01:00
Jan Prochazka	ece5779b41	Merge pull request #1251 from dbgate/feature/electron-upgrade Feature/electron upgrade	2025-11-10 16:26:48 +01:00
Stela Augustinova	167aaa8491	translation-commands	2025-11-10 16:14:32 +01:00
$SPRINX0\prochazka$ SPRINX0\prochazka	de622b055b	v6.6.12-premium-beta.3	2025-11-10 16:00:04 +01:00
$SPRINX0\prochazka$ SPRINX0\prochazka	7e88b930ec	v6.6.12-beta.2	2025-11-10 15:25:51 +01:00
$SPRINX0\prochazka$ SPRINX0\prochazka	c9adc2b852	update packages	2025-11-10 15:25:39 +01:00
$SPRINX0\prochazka$ SPRINX0\prochazka	91d3aba611	v6.6.12-beta.1	2025-11-10 15:12:03 +01:00
$SPRINX0\prochazka$ SPRINX0\prochazka	48bc11dcb5	try to upgrade electron #1243	2025-11-10 15:11:45 +01:00
Stela Augustinova	9ee0b32cac	translation-db object	2025-11-10 14:42:20 +01:00
$SPRINX0\prochazka$ SPRINX0\prochazka	4b6b74604b	Use SSL automatically for Azure SQL	2025-11-10 11:57:48 +01:00
$SPRINX0\prochazka$ SPRINX0\prochazka	7ad3fc4751	SYNC: changelog	2025-11-07 16:03:27 +00:00
$SPRINX0\prochazka$ SPRINX0\prochazka	e604450cfb	v6.6.11	2025-11-07 17:01:21 +01:00
$SPRINX0\prochazka$ SPRINX0\prochazka	9cfbc83896	v6.6.11-premium-beta.3	2025-11-07 16:30:25 +01:00
$SPRINX0\prochazka$ SPRINX0\prochazka	98b2f4ec35	v6.6.11-premium-beta.2	2025-11-07 16:29:51 +01:00
$SPRINX0\prochazka$ SPRINX0\prochazka	47e30f2daf	v6.6.11-beta.1	2025-11-07 16:29:51 +01:00
$SPRINX0\prochazka$ SPRINX0\prochazka	6c21da6959	SYNC: themable starting screen	2025-11-07 15:28:49 +00:00
$SPRINX0\prochazka$ SPRINX0\prochazka	c5fe71d390	SYNC: text	2025-11-07 15:04:39 +00:00
Stela Augustinova	d14ffcb736	translation-data form,data grid	2025-11-07 14:49:00 +01:00
Stela Augustinova	e694aca70b	Refactor to use _val for translation handling across components	2025-11-07 14:40:52 +01:00
$SPRINX0\prochazka$ SPRINX0\prochazka	3c58cb1b9c	SYNC: licensing page improvements	2025-11-07 13:33:01 +00:00
$SPRINX0\prochazka$ SPRINX0\prochazka	dc452cdadf	SYNC: disable commands on special pages	2025-11-07 12:10:13 +00:00
$SPRINX0\prochazka$ SPRINX0\prochazka	e855365cbb	SYNC: themable special page layout	2025-11-07 11:19:03 +00:00
$SPRINX0\prochazka$ SPRINX0\prochazka	cffa288227	SYNC: fix - dont' show devtools	2025-11-07 09:26:26 +00:00
$SPRINX0\prochazka$ SPRINX0\prochazka	89ddced342	SYNC: disable commands when modal is opened	2025-11-07 09:25:18 +00:00
Jan Prochazka	7457328b59	v6.6.10	2025-11-06 22:34:02 +01:00
Jan Prochazka	44ff413810	changelog	2025-11-06 22:33:29 +01:00
$SPRINX0\prochazka$ SPRINX0\prochazka	d174c2c2d8	v6.6.10-premium-beta.2	2025-11-06 16:44:43 +01:00
$SPRINX0\prochazka$ SPRINX0\prochazka	480f4c9a8c	v6.6.10-beta.1	2025-11-06 16:44:35 +01:00
$SPRINX0\prochazka$ SPRINX0\prochazka	7474cc5d8a	SYNC: fixed trial scenario	2025-11-06 15:43:56 +00:00
CI workflows	bda5c4f5dd	chore: auto-update github workflows	2025-11-06 14:37:33 +00:00
CI workflows	4f5034c167	Update pro ref	2025-11-06 14:37:14 +00:00
$SPRINX0\prochazka$ SPRINX0\prochazka	9470db1f4d	SYNC: fixed License fron environment variable is not refreshed #1245	2025-11-06 14:37:04 +00:00
Stela Augustinova	dfeb910ac9	Enhance binary data handling by integrating modifyRow function in SQLite driver and helpers	2025-11-06 14:14:24 +01:00
$SPRINX0\prochazka$ SPRINX0\prochazka	a5745795be	SYNC: command palette fix	2025-11-06 12:43:04 +00:00
Stela Augustinova	98f2b5dd08	Enhance binary data handling in Oracle driver and adjust dumper for byte array values	2025-11-06 13:08:50 +01:00
$SPRINX0\prochazka$ SPRINX0\prochazka	f642c7570e	SYNC: fixed translating app object list	2025-11-06 12:07:54 +00:00
Stela Augustinova	dca9ea24d7	Implement base64 encoding for binary data in SQL dumper and modify row handling in MySQL and MSSQL drivers	2025-11-06 12:30:48 +01:00
$SPRINX0\prochazka$ SPRINX0\prochazka	43fd7b6000	rowsAffected field added	2025-11-06 08:23:31 +01:00
Jan Prochazka	1553ec3bd4	Query result - added click-throught to returned data #1236	2025-11-05 18:35:33 +01:00
Stela Augustinova	37d54811e0	Enhance binary data handling in transformRow to serialize Buffer as base64	2025-11-05 16:07:14 +01:00
Stela Augustinova	0f2af6eb37	Add binary data handling in query tests with enhanced stream handler	2025-11-05 14:09:58 +01:00
$SPRINX0\prochazka$ SPRINX0\prochazka	91546228fa	changed query workflow	2025-11-05 13:34:50 +01:00
$SPRINX0\prochazka$ SPRINX0\prochazka	5488ff06e0	_t	2025-11-05 13:34:50 +01:00
$SPRINX0\prochazka$ SPRINX0\prochazka	ef7f050bc5	Show executed query on log #1236	2025-11-05 13:34:50 +01:00
$SPRINX0\prochazka$ SPRINX0\prochazka	e5c94d9698	Merge branch 'feature/translation'	2025-11-05 12:18:23 +01:00
Stela Augustinova	4d3e0ac5d9	Merge branch 'master' into feature/translation	2025-11-05 11:56:51 +01:00
Stela Augustinova	0a2f0372be	Enhance translation regex to support multiple default message formats	2025-11-05 11:49:21 +01:00
Stela Augustinova	e378fc3cfb	translation-table editor, query, table structure	2025-11-04 16:52:45 +01:00
$SPRINX0\prochazka$ SPRINX0\prochazka	75a1d74d9c	handle changed current database for MS SQL #1237	2025-11-04 15:39:37 +01:00
$SPRINX0\prochazka$ SPRINX0\prochazka	1404685296	changing current DB handler for MySQL #1237	2025-11-04 15:20:21 +01:00
Stela Augustinova	0ebed9b46f	Refactor dataCopy to avoid mutating original structure	2025-11-04 12:32:20 +01:00
$SPRINX0\prochazka$ SPRINX0\prochazka	af69352361	SYNC: fixed references error	2025-11-04 08:09:30 +00:00
Jan Prochazka	840e3b861f	fixed horizontal grid scroll on MacOS #453	2025-11-04 08:29:54 +01:00
Jan Prochazka	a7cfe7fe04	fixed possible render error	2025-11-04 08:27:36 +01:00
$SPRINX0\prochazka$ SPRINX0\prochazka	a324cf0fcd	Column name collision resolving #1234 for postgres - commented out (not working)	2025-11-03 16:56:58 +01:00
$SPRINX0\prochazka$ SPRINX0\prochazka	0919f4c85b	FEAT: column name collision resolving #1234 (MySQL))	2025-11-03 16:30:56 +01:00
$SPRINX0\prochazka$ SPRINX0\prochazka	fd4cc6a1e8	#1235 ability to load CSV files	2025-11-03 15:44:57 +01:00
Stela Augustinova	d6ae3d4f16	Refactor binary data handling in SQL dumper and update test for binary insertion	2025-11-03 13:31:43 +01:00
Stela Augustinova	9c1819467a	test binary data type	2025-11-03 09:17:11 +01:00
$SPRINX0\prochazka$ SPRINX0\prochazka	08410ef209	v6.6.9	2025-10-31 16:32:37 +01:00
$SPRINX0\prochazka$ SPRINX0\prochazka	6cd3242454	v6.6.9-premium-beta.1	2025-10-31 16:05:43 +01:00
CI workflows	986c1a7bc8	chore: auto-update github workflows	2025-10-31 15:05:12 +00:00
$SPRINX0\prochazka$ SPRINX0\prochazka	a7703ec996	fix build	2025-10-31 16:04:46 +01:00
Stela Augustinova	82a4b2c769	translation-clipboard, exportMenu, macros, datagrid commands	2025-10-31 15:10:17 +01:00
$SPRINX0\prochazka$ SPRINX0\prochazka	9884ace309	fixed translations set during module startup - use __t	2025-10-30 10:37:06 +01:00
Stela Augustinova	70284ac440	translation-datagrid,filter,macros,newObject	2025-10-30 10:12:32 +01:00
Stela Augustinova	417334d140	Add base64 handling for binary data in filter and grid components	2025-10-29 15:08:57 +01:00
Stela Augustinova	aa7fb74312	PostgreSQL export to SQL and XML bytea contents #1228	2025-10-29 12:22:13 +01:00
Stela Augustinova	8429067ae5	translation-connections,sqlObject,column,filter	2025-10-27 15:04:04 +01:00
Stela Augustinova	c514a4d503	translation-settings,common	2025-10-27 09:33:26 +01:00