diff --git a/packages/web/src/forms/FormPasswordFieldRaw.svelte b/packages/web/src/forms/FormPasswordFieldRaw.svelte
index b2a8f0e39..6d8b96e4b 100644
--- a/packages/web/src/forms/FormPasswordFieldRaw.svelte
+++ b/packages/web/src/forms/FormPasswordFieldRaw.svelte
@@ -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}
diff --git a/packages/web/src/formview/FormView.svelte b/packages/web/src/formview/FormView.svelte
index 64a85ddfc..ae316d5a1 100644
--- a/packages/web/src/formview/FormView.svelte
+++ b/packages/web/src/formview/FormView.svelte
@@ -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>
diff --git a/packages/web/src/modals/EditCellDataModal.svelte b/packages/web/src/modals/EditCellDataModal.svelte
index b2980b76e..2912f59aa 100644
--- a/packages/web/src/modals/EditCellDataModal.svelte
+++ b/packages/web/src/modals/EditCellDataModal.svelte
@@ -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' },
           ]}
         />
diff --git a/packages/web/src/modals/ErrorMessageModal.svelte b/packages/web/src/modals/ErrorMessageModal.svelte
index 6cb052901..76be00b2b 100644
--- a/packages/web/src/modals/ErrorMessageModal.svelte
+++ b/packages/web/src/modals/ErrorMessageModal.svelte
@@ -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>
diff --git a/packages/web/src/modals/ValueLookupModal.svelte b/packages/web/src/modals/ValueLookupModal.svelte
index 56c2e9653..8055fb138 100644
--- a/packages/web/src/modals/ValueLookupModal.svelte
+++ b/packages/web/src/modals/ValueLookupModal.svelte
@@ -15,6 +15,7 @@
   import _ from 'lodash';
   import { apiCall } from '../utility/api';
   import ErrorInfo from '../elements/ErrorInfo.svelte';
+  import { _t } from '../translations';
 
   export let onConfirm;
   export let conid;
@@ -73,15 +74,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,7 +112,7 @@
               },
               {
                 fieldName: 'value',
-                header: 'Value',
+                header: _t('dataGrid.value', { defaultMessage: 'Value' }),
                 formatter: row => (row.value == null ? '(NULL)' : row.value),
               },
             ]}
@@ -146,7 +147,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>
diff --git a/packages/web/src/tableeditor/ColumnsConstraintEditorModal.svelte b/packages/web/src/tableeditor/ColumnsConstraintEditorModal.svelte
index 9e26297f1..d888a2749 100644
--- a/packages/web/src/tableeditor/ColumnsConstraintEditorModal.svelte
+++ b/packages/web/src/tableeditor/ColumnsConstraintEditorModal.svelte
@@ -43,7 +43,7 @@
 <FormProvider>
   <ModalBase {...$$restProps}>
     <svelte:fragment slot="header"
-      >{constraintInfo ? _t('tableEdit.editConstraintLabel', { defaultMessage: 'Edit {constraintLabel}', values: { constraintLabel: _.isFunction(constraintLabel) ? constraintLabel() : constraintLabel } }) : _t('tableEdit.addConstraintLabel', { defaultMessage: 'Add {constraintLabel}', values: { constraintLabel: _.isFunction(constraintLabel) ? constraintLabel() : 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">
diff --git a/translations/cs.json b/translations/cs.json
index b4c313cff..132659b13 100644
--- a/translations/cs.json
+++ b/translations/cs.json
@@ -44,6 +44,21 @@
   "columnsConstraintEditor.addNewColumn": "Přidat nový sloupec",
   "columnsConstraintEditor.chooseColumn": "Vybrat sloupec",
   "columnsConstraintEditor.selectColumn": "Vybrat sloupec",
+  "command.dataForm": "Formulář dat",
+  "command.dataForm.addToFilter": "Přidat do filtru",
+  "command.dataForm.copyToClipboard": "Zkopírovat do schránky",
+  "command.dataForm.filterSelected": "Filtrovat tuto hodnotu",
+  "command.dataForm.goToFirst": "První",
+  "command.dataForm.goToLast": "Poslední",
+  "command.dataForm.goToNext": "Další",
+  "command.dataForm.goToPrevious": "Předchozí",
+  "command.dataForm.redo": "Znovu",
+  "command.dataForm.removeField": "Odstranit pole",
+  "command.dataForm.revertRowChanges": "Vrátit změny řádku",
+  "command.dataForm.setNull": "Nastavit NULL",
+  "command.dataForm.undo": "Vrátit",
+  "command.dataGrid": "Datová mřížka",
+  "command.dataGrid.reconnect": "Znovu připojit",
   "command.datagrid": "Datová mřížka",
   "command.datagrid.addJsonDocument": "Přidat JSON dokument",
   "command.datagrid.addNewColumn": "Přidat nový sloupec",
@@ -140,6 +155,7 @@
   "common.delete": "Smazat",
   "common.description": "Popis",
   "common.erDiagram": "ER Diagram",
+  "common.error": "Chyba",
   "common.execute": "Spustit",
   "common.export": "Export",
   "common.exportDatabase": "Exportovat databázi",
@@ -147,9 +163,11 @@
   "common.general": "Obecné",
   "common.import": "Import",
   "common.kill": "Ukončit",
+  "common.loadingData": "Načítání dat",
   "common.name": "Název",
   "common.notSelectedOptional": "(nezvoleno - volitelné)",
   "common.parameters": "Parametry",
+  "common.passwordEncrypted": "Heslo je zašifrované",
   "common.perspective": "Perspektiva",
   "common.query": "Dotaz",
   "common.queryDesigner": "Návrhář dotazů",
@@ -160,6 +178,7 @@
   "common.saveAndNext": "Uložit a další",
   "common.saveToArchive": "Uložit do archívu",
   "common.schema": "Schéma",
+  "common.search": "Hledat",
   "common.searchBy": "Hledat podle:",
   "common.sqlGenerator": "SQL Generátor",
   "common.table": "Tabulka",
@@ -240,13 +259,24 @@
   "connection.user": "Uživatel",
   "connection.viewDetails": "Zobrazit detaily",
   "connection.windowsDomain": "Doména (zadejte pro použití NTLM autentizace)",
+  "dataForm.loadingRowCount": "Načítání počtu řádků...",
+  "dataForm.noData": "Žádná data",
+  "dataForm.outOfBounds": "Mimo rozsah: {current} / {total}",
+  "dataForm.rowCount": "Řádek: {current} / {total}",
+  "dataGrid.chooseValue": "Vybrat hodnotu z {field}",
+  "dataGrid.codeHighlighting": "Zvýraznění kódu:",
+  "dataGrid.codeHighlighting.none": "Žádné (neformátovaný text)",
   "dataGrid.columns": "Sloupce",
+  "dataGrid.editCellValue": "Upravit hodnotu buňky",
   "dataGrid.filters": "Filtry",
+  "dataGrid.formatJson": "Formátovat JSON",
+  "dataGrid.formatJson.invalid": "Neplatný JSON",
   "dataGrid.macros": "Makra",
   "dataGrid.multiColumnFilter": "Filtr více sloupců",
   "dataGrid.references": "Reference",
   "dataGrid.referencesTables": "Reference na tabulky",
   "dataGrid.searchReferences": "Hledat reference",
+  "dataGrid.value": "Hodnota",
   "database.backup": "Záloha #",
   "database.chooseArchiveFolderForDataDeployer": "Vybrat archivní složku pro data deployer",
   "database.closeConfirm": "Uzavření připojení uzavře {count} otevřených karet, pokračovat?",
diff --git a/translations/en.json b/translations/en.json
index 0e6bb9b42..e813a44e6 100644
--- a/translations/en.json
+++ b/translations/en.json
@@ -44,6 +44,21 @@
   "columnsConstraintEditor.addNewColumn": "Add new column",
   "columnsConstraintEditor.chooseColumn": "Choose column",
   "columnsConstraintEditor.selectColumn": "Select column",
+  "command.dataForm": "Data form",
+  "command.dataForm.addToFilter": "Add to filter",
+  "command.dataForm.copyToClipboard": "Copy to clipboard",
+  "command.dataForm.filterSelected": "Filter this value",
+  "command.dataForm.goToFirst": "First",
+  "command.dataForm.goToLast": "Last",
+  "command.dataForm.goToNext": "Next",
+  "command.dataForm.goToPrevious": "Previous",
+  "command.dataForm.redo": "Redo",
+  "command.dataForm.removeField": "Remove field",
+  "command.dataForm.revertRowChanges": "Revert row changes",
+  "command.dataForm.setNull": "Set NULL",
+  "command.dataForm.undo": "Undo",
+  "command.dataGrid": "Data grid",
+  "command.dataGrid.reconnect": "Reconnect",
   "command.datagrid": "Data grid",
   "command.datagrid.addJsonDocument": "Add JSON document",
   "command.datagrid.addNewColumn": "Add new column",
@@ -140,6 +155,7 @@
   "common.delete": "Delete",
   "common.description": "Description",
   "common.erDiagram": "ER Diagram",
+  "common.error": "Error",
   "common.execute": "Execute",
   "common.export": "Export",
   "common.exportDatabase": "Export database",
@@ -147,9 +163,11 @@
   "common.general": "General",
   "common.import": "Import",
   "common.kill": "Kill",
+  "common.loadingData": "Loading data",
   "common.name": "Name",
   "common.notSelectedOptional": "(not selected - optional)",
   "common.parameters": "Parameters",
+  "common.passwordEncrypted": "Password is encrypted",
   "common.perspective": "Perspective",
   "common.query": "Query",
   "common.queryDesigner": "Query Designer",
@@ -160,6 +178,7 @@
   "common.saveAndNext": "Save and next",
   "common.saveToArchive": "Save to archive",
   "common.schema": "Schema",
+  "common.search": "Search",
   "common.searchBy": "Search by:",
   "common.sqlGenerator": "SQL Generator",
   "common.table": "Table",
@@ -240,13 +259,24 @@
   "connection.user": "User",
   "connection.viewDetails": "View details",
   "connection.windowsDomain": "Domain (specify to use NTLM authentication)",
+  "dataForm.loadingRowCount": "Loading row count...",
+  "dataForm.noData": "No data",
+  "dataForm.outOfBounds": "Out of bounds: {current} / {total}",
+  "dataForm.rowCount": "Row: {current} / {total}",
+  "dataGrid.chooseValue": "Choose value from {field}",
+  "dataGrid.codeHighlighting": "Code highlighting:",
+  "dataGrid.codeHighlighting.none": "None (raw text)",
   "dataGrid.columns": "Columns",
+  "dataGrid.editCellValue": "Edit cell value",
   "dataGrid.filters": "Filters",
+  "dataGrid.formatJson": "Format JSON",
+  "dataGrid.formatJson.invalid": "Not valid JSON",
   "dataGrid.macros": "Macros",
   "dataGrid.multiColumnFilter": "Multi column filter",
   "dataGrid.references": "References",
   "dataGrid.referencesTables": "References tables",
   "dataGrid.searchReferences": "Search references",
+  "dataGrid.value": "Value",
   "database.backup": "Backup #",
   "database.chooseArchiveFolderForDataDeployer": "Choose archive folder for data deployer",
   "database.closeConfirm": "Closing connection will close {count} opened tabs, continue?",
diff --git a/translations/sk.json b/translations/sk.json
index 49559f682..e6db2b515 100644
--- a/translations/sk.json
+++ b/translations/sk.json
@@ -44,6 +44,21 @@
   "columnsConstraintEditor.addNewColumn": "Pridať nový stĺpec",
   "columnsConstraintEditor.chooseColumn": "Vybrať stĺpec",
   "columnsConstraintEditor.selectColumn": "Vybrať stĺpec",
+  "command.dataForm": "Formulár dát",
+  "command.dataForm.addToFilter": "Pridať do filtru",
+  "command.dataForm.copyToClipboard": "Kopírovať do schránky",
+  "command.dataForm.filterSelected": "Filtrovať túto hodnotu",
+  "command.dataForm.goToFirst": "Prvý",
+  "command.dataForm.goToLast": "Posledný",
+  "command.dataForm.goToNext": "Ďalší",
+  "command.dataForm.goToPrevious": "Predchádzajúci",
+  "command.dataForm.redo": "Znova",
+  "command.dataForm.removeField": "Odstrániť pole",
+  "command.dataForm.revertRowChanges": "Vrátiť zmeny riadka",
+  "command.dataForm.setNull": "Nastaviť NULL",
+  "command.dataForm.undo": "Vrátiť",
+  "command.dataGrid": "Dátová mriežka",
+  "command.dataGrid.reconnect": "Znovu pripojiť",
   "command.datagrid": "Dátová mriežka",
   "command.datagrid.addJsonDocument": "Pridať JSON dokument",
   "command.datagrid.addNewColumn": "Pridať nový stĺpec",
@@ -140,6 +155,7 @@
   "common.delete": "Odstrániť",
   "common.description": "Popis",
   "common.erDiagram": "ER Diagram",
+  "common.error": "Chyba",
   "common.execute": "Spustiť",
   "common.export": "Exportovať",
   "common.exportDatabase": "Exportovať databázu",
@@ -147,9 +163,11 @@
   "common.general": "Všeobecné",
   "common.import": "Importovať",
   "common.kill": "Ukončiť",
+  "common.loadingData": "Načítavanie dát",
   "common.name": "Názov",
   "common.notSelectedOptional": "(nezvolené - voliteľné)",
   "common.parameters": "Parametre",
+  "common.passwordEncrypted": "Heslo je zašifrované",
   "common.perspective": "Perspektíva",
   "common.query": "Dotaz",
   "common.queryDesigner": "Návrhár dotazov",
@@ -160,6 +178,7 @@
   "common.saveAndNext": "Uložiť a pokračovať",
   "common.saveToArchive": "Uložiť do archívu",
   "common.schema": "Schéma",
+  "common.search": "Hledat",
   "common.searchBy": "Hľadať podľa:",
   "common.sqlGenerator": "SQL Generátor",
   "common.table": "Tabuľka",
@@ -240,13 +259,24 @@
   "connection.user": "Používateľ",
   "connection.viewDetails": "Zobraziť detaily",
   "connection.windowsDomain": "Doména (zadajte pre použitie NTLM autentizácie)",
+  "dataForm.loadingRowCount": "Načítavanie počtu riadkov...",
+  "dataForm.noData": "Žiadne dáta",
+  "dataForm.outOfBounds": "Mimo rozsahu: {current} / {total}",
+  "dataForm.rowCount": "Riadok: {current} / {total}",
+  "dataGrid.chooseValue": "Vybrať hodnotu z {field}",
+  "dataGrid.codeHighlighting": "Zvýraznenie kódu:",
+  "dataGrid.codeHighlighting.none": "Žiadne (neformátovaný text)",
   "dataGrid.columns": "Stĺpce",
+  "dataGrid.editCellValue": "Upraviť hodnotu bunky",
   "dataGrid.filters": "Filtre",
+  "dataGrid.formatJson": "Formátovať JSON",
+  "dataGrid.formatJson.invalid": "Neplatný JSON",
   "dataGrid.macros": "Makrá",
   "dataGrid.multiColumnFilter": "Filter viacerých stĺpcov",
   "dataGrid.references": "Referencie",
   "dataGrid.referencesTables": "Referencie na tabuľky",
   "dataGrid.searchReferences": "Vyhľadať referencie",
+  "dataGrid.value": "Hodnota",
   "database.backup": "Záloha #",
   "database.chooseArchiveFolderForDataDeployer": "Vybrať archívnu zložku pre data deployer",
   "database.closeConfirm": "Zatvorenie pripojenia zatvorí {count} otvorených kariet, pokračovať?",