diff --git a/components/ideintf/languages/objinspstrconsts.ca.po b/components/ideintf/languages/objinspstrconsts.ca.po
index 4e345dbce3..700526982c 100644
--- a/components/ideintf/languages/objinspstrconsts.ca.po
+++ b/components/ideintf/languages/objinspstrconsts.ca.po
@@ -1639,8 +1639,13 @@ msgstr "Editor de la cadena de la graella"
 msgid "Clean"
 msgstr "Netejar"
 
+#: objinspstrconsts.sccssgedtcolrowinfo
+#, object-pascal-format
+msgid "(%d columns, %d rows)"
+msgstr ""
+
 #: objinspstrconsts.sccssgedtdelcol
-msgid "Delete Column"
+msgid "Delete column"
 msgstr ""
 
 #: objinspstrconsts.sccssgedtdelcolno
@@ -1657,16 +1662,28 @@ msgstr ""
 msgid "Delete row #%d?"
 msgstr ""
 
+#: objinspstrconsts.sccssgedteditcoltitle
+msgid "Edit column title"
+msgstr ""
+
+#: objinspstrconsts.sccssgedteditfixedcoltitle
+msgid "Edit fixed column title"
+msgstr ""
+
+#: objinspstrconsts.sccssgedteditrowheader
+msgid "Edit row header"
+msgstr ""
+
 #: objinspstrconsts.sccssgedtgrp
 msgid "String Grid"
 msgstr ""
 
 #: objinspstrconsts.sccssgedtinscol
-msgid "Insert Column"
+msgid "Insert column"
 msgstr ""
 
 #: objinspstrconsts.sccssgedtinsrow
-msgid "Insert Row"
+msgid "Insert row"
 msgstr ""
 
 #: objinspstrconsts.sccssgedtload
@@ -1698,6 +1715,10 @@ msgctxt "objinspstrconsts.sccssgedtsavedialog"
 msgid "Save"
 msgstr "Desar"
 
+#: objinspstrconsts.sccssgedttitle
+msgid "Title"
+msgstr ""
+
 #: objinspstrconsts.sccstredt
 msgctxt "objinspstrconsts.sccstredt"
 msgid "Edit Items ..."
diff --git a/components/ideintf/languages/objinspstrconsts.cs.po b/components/ideintf/languages/objinspstrconsts.cs.po
index 78bb9faa4d..05e66a36b1 100644
--- a/components/ideintf/languages/objinspstrconsts.cs.po
+++ b/components/ideintf/languages/objinspstrconsts.cs.po
@@ -1584,8 +1584,13 @@ msgstr "Editor StringGrid"
 msgid "Clean"
 msgstr "Vyčistit"
 
+#: objinspstrconsts.sccssgedtcolrowinfo
+#, object-pascal-format
+msgid "(%d columns, %d rows)"
+msgstr ""
+
 #: objinspstrconsts.sccssgedtdelcol
-msgid "Delete Column"
+msgid "Delete column"
 msgstr ""
 
 #: objinspstrconsts.sccssgedtdelcolno
@@ -1602,16 +1607,28 @@ msgstr ""
 msgid "Delete row #%d?"
 msgstr ""
 
+#: objinspstrconsts.sccssgedteditcoltitle
+msgid "Edit column title"
+msgstr ""
+
+#: objinspstrconsts.sccssgedteditfixedcoltitle
+msgid "Edit fixed column title"
+msgstr ""
+
+#: objinspstrconsts.sccssgedteditrowheader
+msgid "Edit row header"
+msgstr ""
+
 #: objinspstrconsts.sccssgedtgrp
 msgid "String Grid"
 msgstr "Řetězcová mřížka"
 
 #: objinspstrconsts.sccssgedtinscol
-msgid "Insert Column"
+msgid "Insert column"
 msgstr ""
 
 #: objinspstrconsts.sccssgedtinsrow
-msgid "Insert Row"
+msgid "Insert row"
 msgstr ""
 
 #: objinspstrconsts.sccssgedtload
@@ -1639,6 +1656,10 @@ msgctxt "objinspstrconsts.sccssgedtsavedialog"
 msgid "Save"
 msgstr "Uložit"
 
+#: objinspstrconsts.sccssgedttitle
+msgid "Title"
+msgstr ""
+
 #: objinspstrconsts.sccstredt
 msgctxt "objinspstrconsts.sccstredt"
 msgid "Edit Items ..."
diff --git a/components/ideintf/languages/objinspstrconsts.de.po b/components/ideintf/languages/objinspstrconsts.de.po
index 962f2dbd95..a30f023fb0 100644
--- a/components/ideintf/languages/objinspstrconsts.de.po
+++ b/components/ideintf/languages/objinspstrconsts.de.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2022-03-21 13:46+0100\n"
+"PO-Revision-Date: 2022-04-06 00:06+0200\n"
 "Last-Translator: Swen Heinig <swen@heinig.email>\n"
 "Language-Team: Deutsch <lazarus@miraclec.com>\n"
 "Language: de\n"
@@ -191,6 +191,8 @@ msgid ""
 "Error message:\n"
 "%s"
 msgstr ""
+"Fehlermeldung:\n"
+"%s"
 
 #: objinspstrconsts.fesfetitle
 msgid "Edit Fields ..."
@@ -239,14 +241,10 @@ msgid "&Name:"
 msgstr "&Name:"
 
 #: objinspstrconsts.fesnofields
-#, fuzzy
-#| msgid "It was not possible to get the dataset field's list"
 msgid "It was not possible to get the dataset fields list."
 msgstr "Es war nicht möglich, die Liste der Felder des Datasets zu lesen"
 
 #: objinspstrconsts.fesnofieldsnote
-#, fuzzy
-#| msgid "Field's list is not available, can't check for duplicates"
 msgid "Fields list is not available, can't check for duplicates."
 msgstr "Feldliste ist nicht verfügbar, kann nicht auf Duplikate prüfen"
 
@@ -273,7 +271,7 @@ msgstr "&Typ:"
 
 #: objinspstrconsts.fpflowpaneleditor
 msgid "FlowPanel Editor"
-msgstr ""
+msgstr "FlowPanel-Editor"
 
 #: objinspstrconsts.ilesadd
 msgctxt "objinspstrconsts.ilesadd"
@@ -858,11 +856,11 @@ msgstr "Alle Felder auswählen"
 
 #: objinspstrconsts.oisselectedcontrol
 msgid "Selected control"
-msgstr ""
+msgstr "Ausgewähltes Steuerelement"
 
 #: objinspstrconsts.oisselectedcontrols
 msgid "Selected controls"
-msgstr ""
+msgstr "Ausgewählte Steuerelemente"
 
 #: objinspstrconsts.oisselectedproperties
 msgid "&Selected Properties"
@@ -883,7 +881,7 @@ msgstr "Setze MaxHeight=%d, MaxWidth=%d"
 
 #: objinspstrconsts.oissetmaxconstraintshint
 msgid "Use current size as Max Constraints"
-msgstr ""
+msgstr "Setze aktuelle Größe als obere Grenze"
 
 #: objinspstrconsts.oissetminconstraints
 #, object-pascal-format
@@ -892,7 +890,7 @@ msgstr "Setze MinHeight=%d, MinWidth=%d"
 
 #: objinspstrconsts.oissetminconstraintshint
 msgid "Use current size as Min Constraints"
-msgstr ""
+msgstr "Setze aktuelle Größe als untere Grenze"
 
 #: objinspstrconsts.oissettodefault
 #, object-pascal-format
@@ -1584,10 +1582,13 @@ msgstr "StringGrid Editor"
 msgid "Clean"
 msgstr "Löschen"
 
+#: objinspstrconsts.sccssgedtcolrowinfo
+#, object-pascal-format
+msgid "(%d columns, %d rows)"
+msgstr ""
+
 #: objinspstrconsts.sccssgedtdelcol
-#, fuzzy
-#| msgid "Delete Col"
-msgid "Delete Column"
+msgid "Delete column"
 msgstr "Spalte löschen"
 
 #: objinspstrconsts.sccssgedtdelcolno
@@ -1604,18 +1605,28 @@ msgstr "Zeile löschen"
 msgid "Delete row #%d?"
 msgstr "Zeile Nr. %d löschen?"
 
+#: objinspstrconsts.sccssgedteditcoltitle
+msgid "Edit column title"
+msgstr "Spaltentitel bearbeiten"
+
+#: objinspstrconsts.sccssgedteditfixedcoltitle
+msgid "Edit fixed column title"
+msgstr "Titel der festen Spalte bearbeiten"
+
+#: objinspstrconsts.sccssgedteditrowheader
+msgid "Edit row header"
+msgstr "Zeilenkopf bearbeiten"
+
 #: objinspstrconsts.sccssgedtgrp
 msgid "String Grid"
 msgstr "String-Gitter"
 
 #: objinspstrconsts.sccssgedtinscol
-#, fuzzy
-#| msgid "Insert Col"
-msgid "Insert Column"
+msgid "Insert column"
 msgstr "Spalte einfügen"
 
 #: objinspstrconsts.sccssgedtinsrow
-msgid "Insert Row"
+msgid "Insert row"
 msgstr "Zeile einfügen"
 
 #: objinspstrconsts.sccssgedtload
@@ -1623,8 +1634,6 @@ msgid "Load ..."
 msgstr "Laden..."
 
 #: objinspstrconsts.sccssgedtmoverowscols
-#, fuzzy
-#| msgid "Move Rows/Cols"
 msgid "Move Rows/Columns"
 msgstr "Zeilen/Spalten verschieben"
 
@@ -1643,6 +1652,10 @@ msgctxt "objinspstrconsts.sccssgedtsavedialog"
 msgid "Save"
 msgstr "Speichern"
 
+#: objinspstrconsts.sccssgedttitle
+msgid "Title"
+msgstr "Titel"
+
 #: objinspstrconsts.sccstredt
 msgctxt "objinspstrconsts.sccstredt"
 msgid "Edit Items ..."
@@ -1779,4 +1792,3 @@ msgstr "Tab nach links bewegen"
 #: objinspstrconsts.tccesmovetabright
 msgid "Move tab right"
 msgstr "Tab nach rechts bewegen"
-
diff --git a/components/ideintf/languages/objinspstrconsts.es.po b/components/ideintf/languages/objinspstrconsts.es.po
index 6f86f3dcef..417308c2f8 100644
--- a/components/ideintf/languages/objinspstrconsts.es.po
+++ b/components/ideintf/languages/objinspstrconsts.es.po
@@ -1585,8 +1585,13 @@ msgstr "Editor de StringGrid"
 msgid "Clean"
 msgstr "Limpiar"
 
+#: objinspstrconsts.sccssgedtcolrowinfo
+#, object-pascal-format
+msgid "(%d columns, %d rows)"
+msgstr ""
+
 #: objinspstrconsts.sccssgedtdelcol
-msgid "Delete Column"
+msgid "Delete column"
 msgstr ""
 
 #: objinspstrconsts.sccssgedtdelcolno
@@ -1603,16 +1608,28 @@ msgstr ""
 msgid "Delete row #%d?"
 msgstr ""
 
+#: objinspstrconsts.sccssgedteditcoltitle
+msgid "Edit column title"
+msgstr ""
+
+#: objinspstrconsts.sccssgedteditfixedcoltitle
+msgid "Edit fixed column title"
+msgstr ""
+
+#: objinspstrconsts.sccssgedteditrowheader
+msgid "Edit row header"
+msgstr ""
+
 #: objinspstrconsts.sccssgedtgrp
 msgid "String Grid"
 msgstr "String Grid"
 
 #: objinspstrconsts.sccssgedtinscol
-msgid "Insert Column"
+msgid "Insert column"
 msgstr ""
 
 #: objinspstrconsts.sccssgedtinsrow
-msgid "Insert Row"
+msgid "Insert row"
 msgstr ""
 
 #: objinspstrconsts.sccssgedtload
@@ -1640,6 +1657,10 @@ msgctxt "objinspstrconsts.sccssgedtsavedialog"
 msgid "Save"
 msgstr "Guardar"
 
+#: objinspstrconsts.sccssgedttitle
+msgid "Title"
+msgstr ""
+
 #: objinspstrconsts.sccstredt
 msgctxt "objinspstrconsts.sccstredt"
 msgid "Edit Items ..."
diff --git a/components/ideintf/languages/objinspstrconsts.fi.po b/components/ideintf/languages/objinspstrconsts.fi.po
index a3034cd550..13f6ee994d 100644
--- a/components/ideintf/languages/objinspstrconsts.fi.po
+++ b/components/ideintf/languages/objinspstrconsts.fi.po
@@ -1576,8 +1576,13 @@ msgstr "StringGrid muokkain"
 msgid "Clean"
 msgstr "Siivoa"
 
+#: objinspstrconsts.sccssgedtcolrowinfo
+#, object-pascal-format
+msgid "(%d columns, %d rows)"
+msgstr ""
+
 #: objinspstrconsts.sccssgedtdelcol
-msgid "Delete Column"
+msgid "Delete column"
 msgstr ""
 
 #: objinspstrconsts.sccssgedtdelcolno
@@ -1594,16 +1599,28 @@ msgstr ""
 msgid "Delete row #%d?"
 msgstr ""
 
+#: objinspstrconsts.sccssgedteditcoltitle
+msgid "Edit column title"
+msgstr ""
+
+#: objinspstrconsts.sccssgedteditfixedcoltitle
+msgid "Edit fixed column title"
+msgstr ""
+
+#: objinspstrconsts.sccssgedteditrowheader
+msgid "Edit row header"
+msgstr ""
+
 #: objinspstrconsts.sccssgedtgrp
 msgid "String Grid"
 msgstr "Merkkijonotaulukko"
 
 #: objinspstrconsts.sccssgedtinscol
-msgid "Insert Column"
+msgid "Insert column"
 msgstr ""
 
 #: objinspstrconsts.sccssgedtinsrow
-msgid "Insert Row"
+msgid "Insert row"
 msgstr ""
 
 #: objinspstrconsts.sccssgedtload
@@ -1631,6 +1648,10 @@ msgctxt "objinspstrconsts.sccssgedtsavedialog"
 msgid "Save"
 msgstr "Tallenna"
 
+#: objinspstrconsts.sccssgedttitle
+msgid "Title"
+msgstr ""
+
 #: objinspstrconsts.sccstredt
 msgctxt "objinspstrconsts.sccstredt"
 msgid "Edit Items ..."
diff --git a/components/ideintf/languages/objinspstrconsts.fr.po b/components/ideintf/languages/objinspstrconsts.fr.po
index 60ba885ae6..673e4556f2 100644
--- a/components/ideintf/languages/objinspstrconsts.fr.po
+++ b/components/ideintf/languages/objinspstrconsts.fr.po
@@ -1580,8 +1580,13 @@ msgstr "Éditeur de grille de chaînes"
 msgid "Clean"
 msgstr "Nettoyer"
 
+#: objinspstrconsts.sccssgedtcolrowinfo
+#, object-pascal-format
+msgid "(%d columns, %d rows)"
+msgstr ""
+
 #: objinspstrconsts.sccssgedtdelcol
-msgid "Delete Column"
+msgid "Delete column"
 msgstr ""
 
 #: objinspstrconsts.sccssgedtdelcolno
@@ -1598,16 +1603,28 @@ msgstr ""
 msgid "Delete row #%d?"
 msgstr ""
 
+#: objinspstrconsts.sccssgedteditcoltitle
+msgid "Edit column title"
+msgstr ""
+
+#: objinspstrconsts.sccssgedteditfixedcoltitle
+msgid "Edit fixed column title"
+msgstr ""
+
+#: objinspstrconsts.sccssgedteditrowheader
+msgid "Edit row header"
+msgstr ""
+
 #: objinspstrconsts.sccssgedtgrp
 msgid "String Grid"
 msgstr "Grille de chaînes"
 
 #: objinspstrconsts.sccssgedtinscol
-msgid "Insert Column"
+msgid "Insert column"
 msgstr ""
 
 #: objinspstrconsts.sccssgedtinsrow
-msgid "Insert Row"
+msgid "Insert row"
 msgstr ""
 
 #: objinspstrconsts.sccssgedtload
@@ -1635,6 +1652,10 @@ msgctxt "objinspstrconsts.sccssgedtsavedialog"
 msgid "Save"
 msgstr "Enregistrer"
 
+#: objinspstrconsts.sccssgedttitle
+msgid "Title"
+msgstr ""
+
 #: objinspstrconsts.sccstredt
 msgctxt "objinspstrconsts.sccstredt"
 msgid "Edit Items ..."
diff --git a/components/ideintf/languages/objinspstrconsts.he.po b/components/ideintf/languages/objinspstrconsts.he.po
index 79179d1f0c..95590b7bea 100644
--- a/components/ideintf/languages/objinspstrconsts.he.po
+++ b/components/ideintf/languages/objinspstrconsts.he.po
@@ -1648,8 +1648,13 @@ msgstr "עורך StringGrid "
 msgid "Clean"
 msgstr "נקה"
 
+#: objinspstrconsts.sccssgedtcolrowinfo
+#, object-pascal-format
+msgid "(%d columns, %d rows)"
+msgstr ""
+
 #: objinspstrconsts.sccssgedtdelcol
-msgid "Delete Column"
+msgid "Delete column"
 msgstr ""
 
 #: objinspstrconsts.sccssgedtdelcolno
@@ -1666,16 +1671,28 @@ msgstr ""
 msgid "Delete row #%d?"
 msgstr ""
 
+#: objinspstrconsts.sccssgedteditcoltitle
+msgid "Edit column title"
+msgstr ""
+
+#: objinspstrconsts.sccssgedteditfixedcoltitle
+msgid "Edit fixed column title"
+msgstr ""
+
+#: objinspstrconsts.sccssgedteditrowheader
+msgid "Edit row header"
+msgstr ""
+
 #: objinspstrconsts.sccssgedtgrp
 msgid "String Grid"
 msgstr "רשת מחרוזות"
 
 #: objinspstrconsts.sccssgedtinscol
-msgid "Insert Column"
+msgid "Insert column"
 msgstr ""
 
 #: objinspstrconsts.sccssgedtinsrow
-msgid "Insert Row"
+msgid "Insert row"
 msgstr ""
 
 #: objinspstrconsts.sccssgedtload
@@ -1707,6 +1724,10 @@ msgctxt "objinspstrconsts.sccssgedtsavedialog"
 msgid "Save"
 msgstr "שמור"
 
+#: objinspstrconsts.sccssgedttitle
+msgid "Title"
+msgstr ""
+
 #: objinspstrconsts.sccstredt
 #, fuzzy
 #| msgid "Edit Items..."
diff --git a/components/ideintf/languages/objinspstrconsts.hu.po b/components/ideintf/languages/objinspstrconsts.hu.po
index b62a776958..29acf4ac53 100644
--- a/components/ideintf/languages/objinspstrconsts.hu.po
+++ b/components/ideintf/languages/objinspstrconsts.hu.po
@@ -1583,8 +1583,13 @@ msgstr "StringGrid szerkesztő"
 msgid "Clean"
 msgstr "Tisztítás"
 
+#: objinspstrconsts.sccssgedtcolrowinfo
+#, object-pascal-format
+msgid "(%d columns, %d rows)"
+msgstr ""
+
 #: objinspstrconsts.sccssgedtdelcol
-msgid "Delete Column"
+msgid "Delete column"
 msgstr ""
 
 #: objinspstrconsts.sccssgedtdelcolno
@@ -1601,16 +1606,28 @@ msgstr ""
 msgid "Delete row #%d?"
 msgstr ""
 
+#: objinspstrconsts.sccssgedteditcoltitle
+msgid "Edit column title"
+msgstr ""
+
+#: objinspstrconsts.sccssgedteditfixedcoltitle
+msgid "Edit fixed column title"
+msgstr ""
+
+#: objinspstrconsts.sccssgedteditrowheader
+msgid "Edit row header"
+msgstr ""
+
 #: objinspstrconsts.sccssgedtgrp
 msgid "String Grid"
 msgstr "String Grid"
 
 #: objinspstrconsts.sccssgedtinscol
-msgid "Insert Column"
+msgid "Insert column"
 msgstr ""
 
 #: objinspstrconsts.sccssgedtinsrow
-msgid "Insert Row"
+msgid "Insert row"
 msgstr ""
 
 #: objinspstrconsts.sccssgedtload
@@ -1638,6 +1655,10 @@ msgctxt "objinspstrconsts.sccssgedtsavedialog"
 msgid "Save"
 msgstr "Mentés"
 
+#: objinspstrconsts.sccssgedttitle
+msgid "Title"
+msgstr ""
+
 #: objinspstrconsts.sccstredt
 msgctxt "objinspstrconsts.sccstredt"
 msgid "Edit Items ..."
diff --git a/components/ideintf/languages/objinspstrconsts.id.po b/components/ideintf/languages/objinspstrconsts.id.po
index 72a605fec6..463424f0f8 100644
--- a/components/ideintf/languages/objinspstrconsts.id.po
+++ b/components/ideintf/languages/objinspstrconsts.id.po
@@ -1649,8 +1649,13 @@ msgstr "StringGrid Editor"
 msgid "Clean"
 msgstr "Bersihkan"
 
+#: objinspstrconsts.sccssgedtcolrowinfo
+#, object-pascal-format
+msgid "(%d columns, %d rows)"
+msgstr ""
+
 #: objinspstrconsts.sccssgedtdelcol
-msgid "Delete Column"
+msgid "Delete column"
 msgstr ""
 
 #: objinspstrconsts.sccssgedtdelcolno
@@ -1667,16 +1672,28 @@ msgstr ""
 msgid "Delete row #%d?"
 msgstr ""
 
+#: objinspstrconsts.sccssgedteditcoltitle
+msgid "Edit column title"
+msgstr ""
+
+#: objinspstrconsts.sccssgedteditfixedcoltitle
+msgid "Edit fixed column title"
+msgstr ""
+
+#: objinspstrconsts.sccssgedteditrowheader
+msgid "Edit row header"
+msgstr ""
+
 #: objinspstrconsts.sccssgedtgrp
 msgid "String Grid"
 msgstr "String Grid"
 
 #: objinspstrconsts.sccssgedtinscol
-msgid "Insert Column"
+msgid "Insert column"
 msgstr ""
 
 #: objinspstrconsts.sccssgedtinsrow
-msgid "Insert Row"
+msgid "Insert row"
 msgstr ""
 
 #: objinspstrconsts.sccssgedtload
@@ -1710,6 +1727,10 @@ msgctxt "objinspstrconsts.sccssgedtsavedialog"
 msgid "Save"
 msgstr "Simpan"
 
+#: objinspstrconsts.sccssgedttitle
+msgid "Title"
+msgstr ""
+
 #: objinspstrconsts.sccstredt
 #, fuzzy
 #| msgid "Edit Items..."
diff --git a/components/ideintf/languages/objinspstrconsts.it.po b/components/ideintf/languages/objinspstrconsts.it.po
index e2d21b72cc..612eb29850 100644
--- a/components/ideintf/languages/objinspstrconsts.it.po
+++ b/components/ideintf/languages/objinspstrconsts.it.po
@@ -1586,8 +1586,13 @@ msgstr "Editor StringGrid"
 msgid "Clean"
 msgstr "Pulisci"
 
+#: objinspstrconsts.sccssgedtcolrowinfo
+#, object-pascal-format
+msgid "(%d columns, %d rows)"
+msgstr ""
+
 #: objinspstrconsts.sccssgedtdelcol
-msgid "Delete Column"
+msgid "Delete column"
 msgstr ""
 
 #: objinspstrconsts.sccssgedtdelcolno
@@ -1604,16 +1609,28 @@ msgstr ""
 msgid "Delete row #%d?"
 msgstr ""
 
+#: objinspstrconsts.sccssgedteditcoltitle
+msgid "Edit column title"
+msgstr ""
+
+#: objinspstrconsts.sccssgedteditfixedcoltitle
+msgid "Edit fixed column title"
+msgstr ""
+
+#: objinspstrconsts.sccssgedteditrowheader
+msgid "Edit row header"
+msgstr ""
+
 #: objinspstrconsts.sccssgedtgrp
 msgid "String Grid"
 msgstr "String Grid"
 
 #: objinspstrconsts.sccssgedtinscol
-msgid "Insert Column"
+msgid "Insert column"
 msgstr ""
 
 #: objinspstrconsts.sccssgedtinsrow
-msgid "Insert Row"
+msgid "Insert row"
 msgstr ""
 
 #: objinspstrconsts.sccssgedtload
@@ -1641,6 +1658,10 @@ msgctxt "objinspstrconsts.sccssgedtsavedialog"
 msgid "Save"
 msgstr "Salva"
 
+#: objinspstrconsts.sccssgedttitle
+msgid "Title"
+msgstr ""
+
 #: objinspstrconsts.sccstredt
 msgctxt "objinspstrconsts.sccstredt"
 msgid "Edit Items ..."
diff --git a/components/ideintf/languages/objinspstrconsts.ja.po b/components/ideintf/languages/objinspstrconsts.ja.po
index dcc62e62fb..5b3104f34d 100644
--- a/components/ideintf/languages/objinspstrconsts.ja.po
+++ b/components/ideintf/languages/objinspstrconsts.ja.po
@@ -1591,8 +1591,13 @@ msgstr "文字列グリッドエディタ"
 msgid "Clean"
 msgstr "掃除する"
 
+#: objinspstrconsts.sccssgedtcolrowinfo
+#, object-pascal-format
+msgid "(%d columns, %d rows)"
+msgstr ""
+
 #: objinspstrconsts.sccssgedtdelcol
-msgid "Delete Column"
+msgid "Delete column"
 msgstr ""
 
 #: objinspstrconsts.sccssgedtdelcolno
@@ -1609,16 +1614,28 @@ msgstr ""
 msgid "Delete row #%d?"
 msgstr ""
 
+#: objinspstrconsts.sccssgedteditcoltitle
+msgid "Edit column title"
+msgstr ""
+
+#: objinspstrconsts.sccssgedteditfixedcoltitle
+msgid "Edit fixed column title"
+msgstr ""
+
+#: objinspstrconsts.sccssgedteditrowheader
+msgid "Edit row header"
+msgstr ""
+
 #: objinspstrconsts.sccssgedtgrp
 msgid "String Grid"
 msgstr "文字列グリッド"
 
 #: objinspstrconsts.sccssgedtinscol
-msgid "Insert Column"
+msgid "Insert column"
 msgstr ""
 
 #: objinspstrconsts.sccssgedtinsrow
-msgid "Insert Row"
+msgid "Insert row"
 msgstr ""
 
 #: objinspstrconsts.sccssgedtload
@@ -1646,6 +1663,10 @@ msgctxt "objinspstrconsts.sccssgedtsavedialog"
 msgid "Save"
 msgstr "保存"
 
+#: objinspstrconsts.sccssgedttitle
+msgid "Title"
+msgstr ""
+
 #: objinspstrconsts.sccstredt
 msgctxt "objinspstrconsts.sccstredt"
 msgid "Edit Items ..."
diff --git a/components/ideintf/languages/objinspstrconsts.lt.po b/components/ideintf/languages/objinspstrconsts.lt.po
index ce6e02a825..5e7d751b68 100644
--- a/components/ideintf/languages/objinspstrconsts.lt.po
+++ b/components/ideintf/languages/objinspstrconsts.lt.po
@@ -1584,8 +1584,13 @@ msgstr "StringGrid rengyklė"
 msgid "Clean"
 msgstr "Išvalyti"
 
+#: objinspstrconsts.sccssgedtcolrowinfo
+#, object-pascal-format
+msgid "(%d columns, %d rows)"
+msgstr ""
+
 #: objinspstrconsts.sccssgedtdelcol
-msgid "Delete Column"
+msgid "Delete column"
 msgstr ""
 
 #: objinspstrconsts.sccssgedtdelcolno
@@ -1602,16 +1607,28 @@ msgstr ""
 msgid "Delete row #%d?"
 msgstr ""
 
+#: objinspstrconsts.sccssgedteditcoltitle
+msgid "Edit column title"
+msgstr ""
+
+#: objinspstrconsts.sccssgedteditfixedcoltitle
+msgid "Edit fixed column title"
+msgstr ""
+
+#: objinspstrconsts.sccssgedteditrowheader
+msgid "Edit row header"
+msgstr ""
+
 #: objinspstrconsts.sccssgedtgrp
 msgid "String Grid"
 msgstr "Teksto lentelė"
 
 #: objinspstrconsts.sccssgedtinscol
-msgid "Insert Column"
+msgid "Insert column"
 msgstr ""
 
 #: objinspstrconsts.sccssgedtinsrow
-msgid "Insert Row"
+msgid "Insert row"
 msgstr ""
 
 #: objinspstrconsts.sccssgedtload
@@ -1639,6 +1656,10 @@ msgctxt "objinspstrconsts.sccssgedtsavedialog"
 msgid "Save"
 msgstr "Įrašyti"
 
+#: objinspstrconsts.sccssgedttitle
+msgid "Title"
+msgstr ""
+
 #: objinspstrconsts.sccstredt
 msgctxt "objinspstrconsts.sccstredt"
 msgid "Edit Items ..."
diff --git a/components/ideintf/languages/objinspstrconsts.nl.po b/components/ideintf/languages/objinspstrconsts.nl.po
index b651df71ef..398599e24b 100644
--- a/components/ideintf/languages/objinspstrconsts.nl.po
+++ b/components/ideintf/languages/objinspstrconsts.nl.po
@@ -1634,8 +1634,13 @@ msgstr "StringGrid Bewerker"
 msgid "Clean"
 msgstr ""
 
+#: objinspstrconsts.sccssgedtcolrowinfo
+#, object-pascal-format
+msgid "(%d columns, %d rows)"
+msgstr ""
+
 #: objinspstrconsts.sccssgedtdelcol
-msgid "Delete Column"
+msgid "Delete column"
 msgstr ""
 
 #: objinspstrconsts.sccssgedtdelcolno
@@ -1652,16 +1657,28 @@ msgstr ""
 msgid "Delete row #%d?"
 msgstr ""
 
+#: objinspstrconsts.sccssgedteditcoltitle
+msgid "Edit column title"
+msgstr ""
+
+#: objinspstrconsts.sccssgedteditfixedcoltitle
+msgid "Edit fixed column title"
+msgstr ""
+
+#: objinspstrconsts.sccssgedteditrowheader
+msgid "Edit row header"
+msgstr ""
+
 #: objinspstrconsts.sccssgedtgrp
 msgid "String Grid"
 msgstr "String Grid"
 
 #: objinspstrconsts.sccssgedtinscol
-msgid "Insert Column"
+msgid "Insert column"
 msgstr ""
 
 #: objinspstrconsts.sccssgedtinsrow
-msgid "Insert Row"
+msgid "Insert row"
 msgstr ""
 
 #: objinspstrconsts.sccssgedtload
@@ -1694,6 +1711,10 @@ msgctxt "objinspstrconsts.sccssgedtsavedialog"
 msgid "Save"
 msgstr "Opslaan"
 
+#: objinspstrconsts.sccssgedttitle
+msgid "Title"
+msgstr ""
+
 #: objinspstrconsts.sccstredt
 #, fuzzy
 #| msgid "Edit Items..."
diff --git a/components/ideintf/languages/objinspstrconsts.pl.po b/components/ideintf/languages/objinspstrconsts.pl.po
index e4e90bda3f..20e19cd911 100644
--- a/components/ideintf/languages/objinspstrconsts.pl.po
+++ b/components/ideintf/languages/objinspstrconsts.pl.po
@@ -1578,8 +1578,13 @@ msgstr "Edytor StringGrid"
 msgid "Clean"
 msgstr "Wyczyść"
 
+#: objinspstrconsts.sccssgedtcolrowinfo
+#, object-pascal-format
+msgid "(%d columns, %d rows)"
+msgstr ""
+
 #: objinspstrconsts.sccssgedtdelcol
-msgid "Delete Column"
+msgid "Delete column"
 msgstr ""
 
 #: objinspstrconsts.sccssgedtdelcolno
@@ -1596,16 +1601,28 @@ msgstr ""
 msgid "Delete row #%d?"
 msgstr ""
 
+#: objinspstrconsts.sccssgedteditcoltitle
+msgid "Edit column title"
+msgstr ""
+
+#: objinspstrconsts.sccssgedteditfixedcoltitle
+msgid "Edit fixed column title"
+msgstr ""
+
+#: objinspstrconsts.sccssgedteditrowheader
+msgid "Edit row header"
+msgstr ""
+
 #: objinspstrconsts.sccssgedtgrp
 msgid "String Grid"
 msgstr "StringGrid"
 
 #: objinspstrconsts.sccssgedtinscol
-msgid "Insert Column"
+msgid "Insert column"
 msgstr ""
 
 #: objinspstrconsts.sccssgedtinsrow
-msgid "Insert Row"
+msgid "Insert row"
 msgstr ""
 
 #: objinspstrconsts.sccssgedtload
@@ -1633,6 +1650,10 @@ msgctxt "objinspstrconsts.sccssgedtsavedialog"
 msgid "Save"
 msgstr "Zapisz"
 
+#: objinspstrconsts.sccssgedttitle
+msgid "Title"
+msgstr ""
+
 #: objinspstrconsts.sccstredt
 msgctxt "objinspstrconsts.sccstredt"
 msgid "Edit Items ..."
diff --git a/components/ideintf/languages/objinspstrconsts.pot b/components/ideintf/languages/objinspstrconsts.pot
index 6053d925a2..a7909d1216 100644
--- a/components/ideintf/languages/objinspstrconsts.pot
+++ b/components/ideintf/languages/objinspstrconsts.pot
@@ -1570,8 +1570,13 @@ msgstr ""
 msgid "Clean"
 msgstr ""
 
+#: objinspstrconsts.sccssgedtcolrowinfo
+#, object-pascal-format
+msgid "(%d columns, %d rows)"
+msgstr ""
+
 #: objinspstrconsts.sccssgedtdelcol
-msgid "Delete Column"
+msgid "Delete column"
 msgstr ""
 
 #: objinspstrconsts.sccssgedtdelcolno
@@ -1588,16 +1593,28 @@ msgstr ""
 msgid "Delete row #%d?"
 msgstr ""
 
+#: objinspstrconsts.sccssgedteditcoltitle
+msgid "Edit column title"
+msgstr ""
+
+#: objinspstrconsts.sccssgedteditfixedcoltitle
+msgid "Edit fixed column title"
+msgstr ""
+
+#: objinspstrconsts.sccssgedteditrowheader
+msgid "Edit row header"
+msgstr ""
+
 #: objinspstrconsts.sccssgedtgrp
 msgid "String Grid"
 msgstr ""
 
 #: objinspstrconsts.sccssgedtinscol
-msgid "Insert Column"
+msgid "Insert column"
 msgstr ""
 
 #: objinspstrconsts.sccssgedtinsrow
-msgid "Insert Row"
+msgid "Insert row"
 msgstr ""
 
 #: objinspstrconsts.sccssgedtload
@@ -1623,6 +1640,10 @@ msgctxt "objinspstrconsts.sccssgedtsavedialog"
 msgid "Save"
 msgstr ""
 
+#: objinspstrconsts.sccssgedttitle
+msgid "Title"
+msgstr ""
+
 #: objinspstrconsts.sccstredt
 msgctxt "objinspstrconsts.sccstredt"
 msgid "Edit Items ..."
diff --git a/components/ideintf/languages/objinspstrconsts.pt_BR.po b/components/ideintf/languages/objinspstrconsts.pt_BR.po
index 4e5c9bd8bd..1506b1ad31 100644
--- a/components/ideintf/languages/objinspstrconsts.pt_BR.po
+++ b/components/ideintf/languages/objinspstrconsts.pt_BR.po
@@ -1579,8 +1579,13 @@ msgstr "Editor \"StringGrid\" ..."
 msgid "Clean"
 msgstr "Limpar"
 
+#: objinspstrconsts.sccssgedtcolrowinfo
+#, object-pascal-format
+msgid "(%d columns, %d rows)"
+msgstr ""
+
 #: objinspstrconsts.sccssgedtdelcol
-msgid "Delete Column"
+msgid "Delete column"
 msgstr ""
 
 #: objinspstrconsts.sccssgedtdelcolno
@@ -1597,16 +1602,28 @@ msgstr ""
 msgid "Delete row #%d?"
 msgstr ""
 
+#: objinspstrconsts.sccssgedteditcoltitle
+msgid "Edit column title"
+msgstr ""
+
+#: objinspstrconsts.sccssgedteditfixedcoltitle
+msgid "Edit fixed column title"
+msgstr ""
+
+#: objinspstrconsts.sccssgedteditrowheader
+msgid "Edit row header"
+msgstr ""
+
 #: objinspstrconsts.sccssgedtgrp
 msgid "String Grid"
 msgstr "\"String Grid\""
 
 #: objinspstrconsts.sccssgedtinscol
-msgid "Insert Column"
+msgid "Insert column"
 msgstr ""
 
 #: objinspstrconsts.sccssgedtinsrow
-msgid "Insert Row"
+msgid "Insert row"
 msgstr ""
 
 #: objinspstrconsts.sccssgedtload
@@ -1634,6 +1651,10 @@ msgctxt "objinspstrconsts.sccssgedtsavedialog"
 msgid "Save"
 msgstr "Salvar"
 
+#: objinspstrconsts.sccssgedttitle
+msgid "Title"
+msgstr ""
+
 #: objinspstrconsts.sccstredt
 msgctxt "objinspstrconsts.sccstredt"
 msgid "Edit Items ..."
diff --git a/components/ideintf/languages/objinspstrconsts.ru.po b/components/ideintf/languages/objinspstrconsts.ru.po
index 6868fd9cba..60053efa17 100644
--- a/components/ideintf/languages/objinspstrconsts.ru.po
+++ b/components/ideintf/languages/objinspstrconsts.ru.po
@@ -1579,8 +1579,15 @@ msgstr "Редактор StringGrid"
 msgid "Clean"
 msgstr "Очистить"
 
+#: objinspstrconsts.sccssgedtcolrowinfo
+#, object-pascal-format
+msgid "(%d columns, %d rows)"
+msgstr ""
+
 #: objinspstrconsts.sccssgedtdelcol
-msgid "Delete Column"
+#, fuzzy
+#| msgid "Delete Column"
+msgid "Delete column"
 msgstr "Удалить столбец"
 
 #: objinspstrconsts.sccssgedtdelcolno
@@ -1597,16 +1604,32 @@ msgstr "Удалить строку"
 msgid "Delete row #%d?"
 msgstr "Удалить строку №%d?"
 
+#: objinspstrconsts.sccssgedteditcoltitle
+msgid "Edit column title"
+msgstr ""
+
+#: objinspstrconsts.sccssgedteditfixedcoltitle
+msgid "Edit fixed column title"
+msgstr ""
+
+#: objinspstrconsts.sccssgedteditrowheader
+msgid "Edit row header"
+msgstr ""
+
 #: objinspstrconsts.sccssgedtgrp
 msgid "String Grid"
 msgstr "String Grid"
 
 #: objinspstrconsts.sccssgedtinscol
-msgid "Insert Column"
+#, fuzzy
+#| msgid "Insert Column"
+msgid "Insert column"
 msgstr "Вставить столбец"
 
 #: objinspstrconsts.sccssgedtinsrow
-msgid "Insert Row"
+#, fuzzy
+#| msgid "Insert Row"
+msgid "Insert row"
 msgstr "Вставить строку"
 
 #: objinspstrconsts.sccssgedtload
@@ -1632,6 +1655,10 @@ msgctxt "objinspstrconsts.sccssgedtsavedialog"
 msgid "Save"
 msgstr "Сохранить"
 
+#: objinspstrconsts.sccssgedttitle
+msgid "Title"
+msgstr ""
+
 #: objinspstrconsts.sccstredt
 msgctxt "objinspstrconsts.sccstredt"
 msgid "Edit Items ..."
diff --git a/components/ideintf/languages/objinspstrconsts.sk.po b/components/ideintf/languages/objinspstrconsts.sk.po
index fa4a404b1d..78ffa5dd98 100644
--- a/components/ideintf/languages/objinspstrconsts.sk.po
+++ b/components/ideintf/languages/objinspstrconsts.sk.po
@@ -1608,8 +1608,13 @@ msgstr "Editor StringGrid"
 msgid "Clean"
 msgstr "Vyčistiť"
 
+#: objinspstrconsts.sccssgedtcolrowinfo
+#, object-pascal-format
+msgid "(%d columns, %d rows)"
+msgstr ""
+
 #: objinspstrconsts.sccssgedtdelcol
-msgid "Delete Column"
+msgid "Delete column"
 msgstr ""
 
 #: objinspstrconsts.sccssgedtdelcolno
@@ -1626,16 +1631,28 @@ msgstr ""
 msgid "Delete row #%d?"
 msgstr ""
 
+#: objinspstrconsts.sccssgedteditcoltitle
+msgid "Edit column title"
+msgstr ""
+
+#: objinspstrconsts.sccssgedteditfixedcoltitle
+msgid "Edit fixed column title"
+msgstr ""
+
+#: objinspstrconsts.sccssgedteditrowheader
+msgid "Edit row header"
+msgstr ""
+
 #: objinspstrconsts.sccssgedtgrp
 msgid "String Grid"
 msgstr "String Grid"
 
 #: objinspstrconsts.sccssgedtinscol
-msgid "Insert Column"
+msgid "Insert column"
 msgstr ""
 
 #: objinspstrconsts.sccssgedtinsrow
-msgid "Insert Row"
+msgid "Insert row"
 msgstr ""
 
 #: objinspstrconsts.sccssgedtload
@@ -1663,6 +1680,10 @@ msgctxt "objinspstrconsts.sccssgedtsavedialog"
 msgid "Save"
 msgstr "Uložiť"
 
+#: objinspstrconsts.sccssgedttitle
+msgid "Title"
+msgstr ""
+
 #: objinspstrconsts.sccstredt
 msgctxt "objinspstrconsts.sccstredt"
 msgid "Edit Items ..."
diff --git a/components/ideintf/languages/objinspstrconsts.tr.po b/components/ideintf/languages/objinspstrconsts.tr.po
index 8546084e1d..bd2c486d71 100644
--- a/components/ideintf/languages/objinspstrconsts.tr.po
+++ b/components/ideintf/languages/objinspstrconsts.tr.po
@@ -1583,8 +1583,13 @@ msgstr "StringGrid Düzenleyici"
 msgid "Clean"
 msgstr "Temizle"
 
+#: objinspstrconsts.sccssgedtcolrowinfo
+#, object-pascal-format
+msgid "(%d columns, %d rows)"
+msgstr ""
+
 #: objinspstrconsts.sccssgedtdelcol
-msgid "Delete Column"
+msgid "Delete column"
 msgstr ""
 
 #: objinspstrconsts.sccssgedtdelcolno
@@ -1601,16 +1606,28 @@ msgstr ""
 msgid "Delete row #%d?"
 msgstr ""
 
+#: objinspstrconsts.sccssgedteditcoltitle
+msgid "Edit column title"
+msgstr ""
+
+#: objinspstrconsts.sccssgedteditfixedcoltitle
+msgid "Edit fixed column title"
+msgstr ""
+
+#: objinspstrconsts.sccssgedteditrowheader
+msgid "Edit row header"
+msgstr ""
+
 #: objinspstrconsts.sccssgedtgrp
 msgid "String Grid"
 msgstr "String Grid"
 
 #: objinspstrconsts.sccssgedtinscol
-msgid "Insert Column"
+msgid "Insert column"
 msgstr ""
 
 #: objinspstrconsts.sccssgedtinsrow
-msgid "Insert Row"
+msgid "Insert row"
 msgstr ""
 
 #: objinspstrconsts.sccssgedtload
@@ -1638,6 +1655,10 @@ msgctxt "objinspstrconsts.sccssgedtsavedialog"
 msgid "Save"
 msgstr "Kaydet"
 
+#: objinspstrconsts.sccssgedttitle
+msgid "Title"
+msgstr ""
+
 #: objinspstrconsts.sccstredt
 msgctxt "objinspstrconsts.sccstredt"
 msgid "Edit Items ..."
diff --git a/components/ideintf/languages/objinspstrconsts.uk.po b/components/ideintf/languages/objinspstrconsts.uk.po
index e34238585d..cc92aad3be 100644
--- a/components/ideintf/languages/objinspstrconsts.uk.po
+++ b/components/ideintf/languages/objinspstrconsts.uk.po
@@ -1586,8 +1586,13 @@ msgstr "Редактор StringGrid"
 msgid "Clean"
 msgstr "Очистити"
 
+#: objinspstrconsts.sccssgedtcolrowinfo
+#, object-pascal-format
+msgid "(%d columns, %d rows)"
+msgstr ""
+
 #: objinspstrconsts.sccssgedtdelcol
-msgid "Delete Column"
+msgid "Delete column"
 msgstr ""
 
 #: objinspstrconsts.sccssgedtdelcolno
@@ -1604,16 +1609,28 @@ msgstr ""
 msgid "Delete row #%d?"
 msgstr ""
 
+#: objinspstrconsts.sccssgedteditcoltitle
+msgid "Edit column title"
+msgstr ""
+
+#: objinspstrconsts.sccssgedteditfixedcoltitle
+msgid "Edit fixed column title"
+msgstr ""
+
+#: objinspstrconsts.sccssgedteditrowheader
+msgid "Edit row header"
+msgstr ""
+
 #: objinspstrconsts.sccssgedtgrp
 msgid "String Grid"
 msgstr "String Grid"
 
 #: objinspstrconsts.sccssgedtinscol
-msgid "Insert Column"
+msgid "Insert column"
 msgstr ""
 
 #: objinspstrconsts.sccssgedtinsrow
-msgid "Insert Row"
+msgid "Insert row"
 msgstr ""
 
 #: objinspstrconsts.sccssgedtload
@@ -1641,6 +1658,10 @@ msgctxt "objinspstrconsts.sccssgedtsavedialog"
 msgid "Save"
 msgstr "Зберегти"
 
+#: objinspstrconsts.sccssgedttitle
+msgid "Title"
+msgstr ""
+
 #: objinspstrconsts.sccstredt
 msgctxt "objinspstrconsts.sccstredt"
 msgid "Edit Items ..."
diff --git a/components/ideintf/languages/objinspstrconsts.zh_CN.po b/components/ideintf/languages/objinspstrconsts.zh_CN.po
index cc4c133f22..4533891514 100644
--- a/components/ideintf/languages/objinspstrconsts.zh_CN.po
+++ b/components/ideintf/languages/objinspstrconsts.zh_CN.po
@@ -1580,8 +1580,13 @@ msgstr "StringGrid 编辑器"
 msgid "Clean"
 msgstr "清理"
 
+#: objinspstrconsts.sccssgedtcolrowinfo
+#, object-pascal-format
+msgid "(%d columns, %d rows)"
+msgstr ""
+
 #: objinspstrconsts.sccssgedtdelcol
-msgid "Delete Column"
+msgid "Delete column"
 msgstr ""
 
 #: objinspstrconsts.sccssgedtdelcolno
@@ -1598,16 +1603,28 @@ msgstr ""
 msgid "Delete row #%d?"
 msgstr ""
 
+#: objinspstrconsts.sccssgedteditcoltitle
+msgid "Edit column title"
+msgstr ""
+
+#: objinspstrconsts.sccssgedteditfixedcoltitle
+msgid "Edit fixed column title"
+msgstr ""
+
+#: objinspstrconsts.sccssgedteditrowheader
+msgid "Edit row header"
+msgstr ""
+
 #: objinspstrconsts.sccssgedtgrp
 msgid "String Grid"
 msgstr "String 网格"
 
 #: objinspstrconsts.sccssgedtinscol
-msgid "Insert Column"
+msgid "Insert column"
 msgstr ""
 
 #: objinspstrconsts.sccssgedtinsrow
-msgid "Insert Row"
+msgid "Insert row"
 msgstr ""
 
 #: objinspstrconsts.sccssgedtload
@@ -1635,6 +1652,10 @@ msgctxt "objinspstrconsts.sccssgedtsavedialog"
 msgid "Save"
 msgstr "保存"
 
+#: objinspstrconsts.sccssgedttitle
+msgid "Title"
+msgstr ""
+
 #: objinspstrconsts.sccstredt
 msgctxt "objinspstrconsts.sccstredt"
 msgid "Edit Items ..."
diff --git a/components/ideintf/lazstringgridedit.lfm b/components/ideintf/lazstringgridedit.lfm
index 5e33c1cb80..ff573e4922 100644
--- a/components/ideintf/lazstringgridedit.lfm
+++ b/components/ideintf/lazstringgridedit.lfm
@@ -38,6 +38,7 @@ object StringGridEditorDlg: TStringGridEditorDlg
       FixedRows = 0
       Options = [goFixedVertLine, goFixedHorzLine, goVertLine, goHorzLine, goRowSizing, goColSizing, goRowMoving, goColMoving, goEditing, goSmoothScroll]
       TabOrder = 0
+      OnHeaderClick = StringGridHeaderClick
       OnPrepareCanvas = StringGridPrepareCanvas
     end
     object LoadSavePanel: TPanel
diff --git a/components/ideintf/lazstringgridedit.pas b/components/ideintf/lazstringgridedit.pas
index def7f19180..5d6640fc55 100644
--- a/components/ideintf/lazstringgridedit.pas
+++ b/components/ideintf/lazstringgridedit.pas
@@ -52,6 +52,8 @@ type
     procedure FormActivate(Sender: TObject);
     procedure FormClose(Sender: TObject; var {%H-}CloseAction: TCloseAction);
     procedure FormCreate(Sender: TObject);
+    procedure StringGridHeaderClick(Sender: TObject; IsColumn: Boolean; 
+      Index: Integer);
     procedure StringGridPrepareCanvas({%H-}sender: TObject; Col, Row: Integer;
       {%H-}aState: TGridDrawState);
     procedure ManageGrid(Sender:TObject);
@@ -59,6 +61,10 @@ type
   private
     FModified: Boolean;
     FStringGrid: TStringGrid;
+    FGroupBoxHeader: String;
+    procedure AssignGrid(Dest, Src: TStringGrid);
+    procedure UpdateBtnStates;
+    procedure UpdateGridInfo;
   public
     property Modified: Boolean read FModified;
     procedure LoadFromGrid(AStringGrid: TStringGrid);
@@ -69,18 +75,44 @@ implementation
 
 {$R *.lfm}
 
-procedure AssignGrid(Dest, Src: TStringGrid; Full: Boolean);
+var
+  saved_InputQueryEditSizePercents: Integer;
+  
+type
+  TStringGridAccess = class(TStringGrid)
+  public
+    function ColumnIndexFromGridColumn(AIndex: Integer):Integer;
+  end;
+  
+function TStringGridAccess.ColumnIndexFromGridColumn(AIndex: Integer): Integer;
+begin
+  Result := inherited;
+end;
+
+{ TStringGridEditorDlg }
+
+procedure TStringGridEditorDlg.AssignGrid(Dest, Src: TStringGrid);
 var
   I, J: Integer;
+  col: TGridColumn;
 begin
   Dest.BeginUpdate;
   try
-    if Full then
+    Dest.Clear;  
+    Dest.RowCount := Src.RowCount;
+
+    if Src.Columns.Enabled then
     begin
-      Dest.Clear;
+      Dest.Columns.Clear;
+      for I := 0 to Src.Columns.Count-1 do
+      begin
+        col := Dest.Columns.Add;
+        col.Assign(Src.Columns[I]);
+      end;
+      Dest.FixedCols := Src.FixedCols;
+      Dest.FixedRows := Src.FixedRows;
+    end else      
       Dest.ColCount := Src.ColCount;
-      Dest.RowCount := Src.RowCount;
-    end;
 
     for I := 0 to Src.RowCount - 1 do
       Dest.RowHeights[I] := Src.RowHeights[I];
@@ -96,11 +128,10 @@ begin
   end;
 end;
 
-
-{ TStringGridEditorDlg }
-
 procedure TStringGridEditorDlg.FormCreate(Sender: TObject);
 begin
+  FGroupBoxHeader := Groupbox.Caption;
+
   Caption := sccsSGEdtCaption;
 
   GroupBox.Caption := sccsSGEdtGrp;
@@ -129,10 +160,45 @@ begin
   IDEDialogLayoutList.ApplyLayout(Self);
 end;
 
+procedure TStringGridEditorDlg.StringGridHeaderClick(Sender: TObject; 
+  IsColumn: Boolean; Index: Integer);
+var
+  s: String;
+  colIndex: Integer;
+  mouseCell: TPoint;
+begin
+  mouseCell := StringGrid.MouseToCell(StringGrid.ScreenToClient(Mouse.CursorPos));
+  if IsColumn then
+  begin
+    if StringGrid.Columns.Enabled and (Index >= StringGrid.FixedCols) then
+    begin
+      colIndex := TStringGridAccess(StringGrid).ColumnIndexFromGridColumn(Index);
+      if mouseCell.Y = 0 then
+      begin
+        s := InputBox(sccsSGEdtEditColTitle, sccsSGEdtTitle, StringGrid.Columns[colIndex].Title.Caption);
+        StringGrid.Columns[colIndex].Title.Caption := s;
+      end else
+      begin
+        s := InputBox(sccsSGEdtEditColTitle, sccsSGEdtTitle, StringGrid.Cells[Index, mouseCell.Y]);
+        StringGrid.Cells[Index, mouseCell.Y] := s;
+      end;
+    end else
+    begin
+      s := InputBox(sccsSGEdtEditFixedColTitle, sccsSGEdtTitle, StringGrid.Cells[Index, mouseCell.Y]);
+      StringGrid.Cells[Index, mouseCell.Y] := s;
+    end;
+  end else
+  begin
+    s := InputBox(sccsSGEdtEditRowHeader, sccsSGEdtTitle, StringGrid.Cells[mouseCell.X, Index]);
+    StringGrid.Cells[mouseCell.X, Index] := s;
+  end;
+end;
+
 procedure TStringGridEditorDlg.FormClose(Sender: TObject;
   var CloseAction: TCloseAction);
 begin
   IDEDialogLayoutList.SaveLayout(Self);
+  cInputQueryEditSizePercents := saved_InputQueryEditSizePercents;
 end;
 
 procedure TStringGridEditorDlg.BtnApplyClick(Sender: TObject);
@@ -167,7 +233,12 @@ procedure TStringGridEditorDlg.FormActivate(Sender: TObject);
 var
   delta: Integer;
 begin
-  delta := Groupbox.BorderSpacing.Around;  // Assuming all borderspacings are equal
+  // Avoid the ultra-wide InputBox.
+  saved_InputQueryEditSizePercents := cInputQueryEditSizePercents;
+  cInputQueryEditSizePercents := 0;
+
+  // Adjust constraints (assuming all borderspacings are equal)
+  delta := Groupbox.BorderSpacing.Around;  
   Constraints.MinWidth := BtnColRight.Left + BtnColRight.Width + 
     (BtnClean.Left + BtnClean.Width - BtnLoad.Left) + 6*delta;
   if Width < Constraints.MinWidth then
@@ -184,12 +255,15 @@ end;
 procedure TStringGridEditorDlg.ManageGrid(Sender:TObject);
 var 
   irow, icol: integer;
+  fixed: Integer;
 begin
   irow := StringGrid.Row;
   icol := StringGrid.Col;
   if (Sender = BtnAddRow) then
   begin
+    fixed := StringGrid.FixedRows;
     StringGrid.InsertColRow(false, irow);
+    StringGrid.FixedRows := fixed;
     StringGrid.Row := StringGrid.Row-1;
   end 
   else
@@ -200,37 +274,38 @@ begin
   end else
   if Sender = BtnAddCol then
   begin
+    fixed := StringGrid.FixedCols;
     StringGrid.InsertColRow(true, icol);
+    StringGrid.FixedCols := fixed;
     StringGrid.Col := StringGrid.Col - 1;
   end
   else
   if (Sender = BtnDelCol) and (icol >= 0) then
     if MessageDlg(Application.Title, Format(sccsSGEdtDelColNo, [icol]), mtConfirmation, mbYesNo, 0) = mrYes then
       StringGrid.DeleteCol(icol);
+  UpdateBtnStates;
+  UpdateGridInfo;
 end;
 
 procedure TStringGridEditorDlg.SwapRowCol(Sender:TObject);
 begin
   if Sender = BtnColLeft then begin
-    if StringGrid.Col > 0 then
-      StringGrid.ExchangeColRow(true,StringGrid.Col,StringGrid.Col-1);
-      //StringGrid.Col := StringGrid.Col - 1;
+    if StringGrid.Col > StringGrid.FixedCols then
+      StringGrid.ExchangeColRow(true,StringGrid.Col-1,StringGrid.Col);
   end else
   if Sender = BtnRowUp then begin
-    if StringGrid.Row > 0 then
-      StringGrid.ExchangeColRow(false,StringGrid.Row,StringGrid.Row-1);
-      //StringGrid.Row := StringGrid.Row - 1;
+    if StringGrid.Row > StringGrid.FixedRows then
+      StringGrid.ExchangeColRow(false,StringGrid.Row-1,StringGrid.Row);
   end;
   if Sender = BtnColRight then begin
     if StringGrid.Col < StringGrid.ColCount-1 then
       StringGrid.ExchangeColRow(true,StringGrid.Col,StringGrid.Col+1);
-      //StringGrid.Col := StringGrid.Col + 1;
   end;
   if Sender = BtnRowDown then begin
     if StringGrid.Row < StringGrid.RowCount-1 then
       StringGrid.ExchangeColRow(false,StringGrid.Row,StringGrid.Row+1);
-      //StringGrid.Row := StringGrid.Row + 1;
   end;
+  UpdateBtnStates;
 end;
 
 procedure TStringGridEditorDlg.LoadFromGrid(AStringGrid: TStringGrid);
@@ -238,8 +313,9 @@ begin
   if Assigned(AStringGrid) then
   begin
     FStringGrid := AStringGrid;
-
-    AssignGrid(StringGrid, AStringGrid, True);
+    AssignGrid(StringGrid, AStringGrid);
+    UpdateBtnStates;
+    UpdateGridInfo;
     FModified := False;
   end;
 end;
@@ -248,10 +324,26 @@ procedure TStringGridEditorDlg.SaveToGrid;
 begin
   if Assigned(FStringGrid) then
   begin
-    AssignGrid(FStringGrid, StringGrid, true);
+    AssignGrid(FStringGrid, StringGrid);
     FModified := True;
   end;
 end;
 
+procedure TStringGridEditorDlg.UpdateBtnStates;
+begin
+  BtnDelRow.Enabled := StringGrid.RowCount > StringGrid.FixedRows;
+  BtnDelCol.Enabled := StringGrid.ColCount > StringGrid.FixedCols;
+  BtnColLeft.Enabled := StringGrid.Col > StringGrid.FixedCols;
+  BtnRowUp.Enabled := StringGrid.Row > StringGrid.FixedRows;
+  BtnColRight.Enabled := StringGrid.Col < StringGrid.ColCount-1;
+  BtnRowDown.Enabled := StringGrid.Row < StringGrid.RowCount-1;
+end;
+
+procedure TStringGridEditorDlg.UpdateGridInfo;
+begin
+  GroupBox.Caption := FGroupboxHeader + ' ' +
+    Format(sccsSGEdtColRowInfo, [StringGrid.ColCount, StringGrid.RowCount]);
+end;
+
 end.
 
diff --git a/components/ideintf/objinspstrconsts.pas b/components/ideintf/objinspstrconsts.pas
index 218f6ae09e..ea5e37f321 100644
--- a/components/ideintf/objinspstrconsts.pas
+++ b/components/ideintf/objinspstrconsts.pas
@@ -184,11 +184,16 @@ resourcestring
   sccsSGEdtSaveDialog = 'Save';
   sccsSGEdtMoveRowsCols = 'Move Rows/Columns';
   sccsSGEdtDelRow     = 'Delete Row';
-  sccsSGEdtDelCol     = 'Delete Column';
-  sccsSGEdtInsRow     = 'Insert Row';
-  sccsSGEdtInsCol     = 'Insert Column';
+  sccsSGEdtDelCol     = 'Delete column';
+  sccsSGEdtInsRow     = 'Insert row';
+  sccsSGEdtInsCol     = 'Insert column';
   sccsSGEdtDelRowNo   = 'Delete row #%d?';
   sccsSGEdtDelColNo   = 'Delete column #%d?';
+  sccsSGEdtTitle      = 'Title';
+  sccsSGEdtEditColTitle = 'Edit column title';
+  sccsSGEdtEditFixedColTitle = 'Edit fixed column title';
+  sccsSGEdtEditRowHeader = 'Edit row header';
+  sccsSGEdtColRowInfo = '(%d columns, %d rows)';
 
   // HeaderControl Editor
   sccsHCEditSections  = 'Sections Editor ...';