diff --git a/packages/grid/x-data-grid/src/locales/arSD.ts b/packages/grid/x-data-grid/src/locales/arSD.ts
index 99ca45a5d9d0a..98da4c492474e 100644
--- a/packages/grid/x-data-grid/src/locales/arSD.ts
+++ b/packages/grid/x-data-grid/src/locales/arSD.ts
@@ -45,6 +45,8 @@ const arSDGrid: Partial<GridLocaleText> = {
   filterPanelDeleteIconLabel: 'حذف',
   // filterPanelLinkOperator: 'Logic operator',
   filterPanelOperators: 'العاملين',
+
+  // TODO v6: rename to filterPanelOperator
   filterPanelOperatorAnd: 'و',
   filterPanelOperatorOr: 'او',
   filterPanelColumns: 'الأعمدة',
diff --git a/packages/grid/x-data-grid/src/locales/bgBG.ts b/packages/grid/x-data-grid/src/locales/bgBG.ts
index 2ac4cf25613d5..6affbf7157b83 100644
--- a/packages/grid/x-data-grid/src/locales/bgBG.ts
+++ b/packages/grid/x-data-grid/src/locales/bgBG.ts
@@ -44,6 +44,8 @@ const bgBGGrid: Partial<GridLocaleText> = {
   filterPanelDeleteIconLabel: 'Изтрий',
   // filterPanelLinkOperator: 'Logic operator',
   filterPanelOperators: 'Оператори',
+
+  // TODO v6: rename to filterPanelOperator
   filterPanelOperatorAnd: 'И',
   filterPanelOperatorOr: 'Или',
   filterPanelColumns: 'Колони',
diff --git a/packages/grid/x-data-grid/src/locales/csCZ.ts b/packages/grid/x-data-grid/src/locales/csCZ.ts
index c8ec1c7823f00..cc57eeca7c480 100644
--- a/packages/grid/x-data-grid/src/locales/csCZ.ts
+++ b/packages/grid/x-data-grid/src/locales/csCZ.ts
@@ -54,6 +54,8 @@ const csCZGrid: Partial<GridLocaleText> = {
   filterPanelDeleteIconLabel: 'Odstranit',
   // filterPanelLinkOperator: 'Logic operator',
   filterPanelOperators: 'Operátory',
+
+  // TODO v6: rename to filterPanelOperator
   filterPanelOperatorAnd: 'A',
   filterPanelOperatorOr: 'Nebo',
   filterPanelColumns: 'Sloupce',
diff --git a/packages/grid/x-data-grid/src/locales/daDK.ts b/packages/grid/x-data-grid/src/locales/daDK.ts
index 81abaa40588f1..921aeeabee8bb 100644
--- a/packages/grid/x-data-grid/src/locales/daDK.ts
+++ b/packages/grid/x-data-grid/src/locales/daDK.ts
@@ -45,6 +45,8 @@ const daDKGrid: Partial<GridLocaleText> = {
   filterPanelDeleteIconLabel: 'Slet',
   // filterPanelLinkOperator: 'Logic operator',
   filterPanelOperators: 'Operatorer',
+
+  // TODO v6: rename to filterPanelOperator
   // filterPanelOperatorAnd: 'And',
   // filterPanelOperatorOr: 'Or',
   filterPanelColumns: 'Kolonne',
diff --git a/packages/grid/x-data-grid/src/locales/deDE.ts b/packages/grid/x-data-grid/src/locales/deDE.ts
index a16a0acbfc02d..48a2c0ab01f19 100644
--- a/packages/grid/x-data-grid/src/locales/deDE.ts
+++ b/packages/grid/x-data-grid/src/locales/deDE.ts
@@ -45,6 +45,8 @@ const deDEGrid: Partial<GridLocaleText> = {
   filterPanelDeleteIconLabel: 'Löschen',
   // filterPanelLinkOperator: 'Logic operator',
   filterPanelOperators: 'Operatoren',
+
+  // TODO v6: rename to filterPanelOperator
   filterPanelOperatorAnd: 'Und',
   filterPanelOperatorOr: 'Oder',
   filterPanelColumns: 'Spalten',
diff --git a/packages/grid/x-data-grid/src/locales/elGR.ts b/packages/grid/x-data-grid/src/locales/elGR.ts
index 10c1e11e928d1..1e25fa9926751 100644
--- a/packages/grid/x-data-grid/src/locales/elGR.ts
+++ b/packages/grid/x-data-grid/src/locales/elGR.ts
@@ -44,6 +44,8 @@ const elGRGrid: Partial<GridLocaleText> = {
   filterPanelDeleteIconLabel: 'Διαγραφή',
   // filterPanelLinkOperator: 'Logic operator',
   filterPanelOperators: 'Τελεστές',
+
+  // TODO v6: rename to filterPanelOperator
   filterPanelOperatorAnd: 'Καί',
   filterPanelOperatorOr: 'Ή',
   filterPanelColumns: 'Στήλες',
diff --git a/packages/grid/x-data-grid/src/locales/esES.ts b/packages/grid/x-data-grid/src/locales/esES.ts
index 81ea4528fe1eb..96af5b6360254 100644
--- a/packages/grid/x-data-grid/src/locales/esES.ts
+++ b/packages/grid/x-data-grid/src/locales/esES.ts
@@ -45,6 +45,8 @@ const esESGrid: Partial<GridLocaleText> = {
   filterPanelDeleteIconLabel: 'Borrar',
   // filterPanelLinkOperator: 'Logic operator',
   filterPanelOperators: 'Operadores',
+
+  // TODO v6: rename to filterPanelOperator
   filterPanelOperatorAnd: 'Y',
   filterPanelOperatorOr: 'O',
   filterPanelColumns: 'Columnas',
diff --git a/packages/grid/x-data-grid/src/locales/faIR.ts b/packages/grid/x-data-grid/src/locales/faIR.ts
index 4052034826e4f..747d769a38541 100644
--- a/packages/grid/x-data-grid/src/locales/faIR.ts
+++ b/packages/grid/x-data-grid/src/locales/faIR.ts
@@ -45,6 +45,8 @@ const faIRGrid: Partial<GridLocaleText> = {
   filterPanelDeleteIconLabel: 'حذف',
   // filterPanelLinkOperator: 'Logic operator',
   filterPanelOperators: 'عملگرها',
+
+  // TODO v6: rename to filterPanelOperator
   filterPanelOperatorAnd: 'و',
   filterPanelOperatorOr: 'یا',
   filterPanelColumns: 'ستون‌ها',
diff --git a/packages/grid/x-data-grid/src/locales/fiFI.ts b/packages/grid/x-data-grid/src/locales/fiFI.ts
index 302fa13b18654..cfd1c3346d4a3 100644
--- a/packages/grid/x-data-grid/src/locales/fiFI.ts
+++ b/packages/grid/x-data-grid/src/locales/fiFI.ts
@@ -45,6 +45,8 @@ const fiFIGrid: Partial<GridLocaleText> = {
   filterPanelDeleteIconLabel: 'Poista',
   // filterPanelLinkOperator: 'Logic operator',
   filterPanelOperators: 'Operaattorit',
+
+  // TODO v6: rename to filterPanelOperator
   filterPanelOperatorAnd: 'Ja',
   filterPanelOperatorOr: 'Tai',
   filterPanelColumns: 'Sarakkeet',
diff --git a/packages/grid/x-data-grid/src/locales/frFR.ts b/packages/grid/x-data-grid/src/locales/frFR.ts
index 00a44475d1620..816c208d5ee40 100644
--- a/packages/grid/x-data-grid/src/locales/frFR.ts
+++ b/packages/grid/x-data-grid/src/locales/frFR.ts
@@ -45,6 +45,8 @@ const frFRGrid: Partial<GridLocaleText> = {
   filterPanelDeleteIconLabel: 'Supprimer',
   filterPanelLinkOperator: 'Opérateur logique',
   filterPanelOperators: 'Opérateur',
+
+  // TODO v6: rename to filterPanelOperator
   filterPanelOperatorAnd: 'Et',
   filterPanelOperatorOr: 'Ou',
   filterPanelColumns: 'Colonnes',
diff --git a/packages/grid/x-data-grid/src/locales/heIL.ts b/packages/grid/x-data-grid/src/locales/heIL.ts
index 6684be6c7b007..47205da6d5fc4 100644
--- a/packages/grid/x-data-grid/src/locales/heIL.ts
+++ b/packages/grid/x-data-grid/src/locales/heIL.ts
@@ -45,6 +45,8 @@ const heILGrid: Partial<GridLocaleText> = {
   filterPanelDeleteIconLabel: 'מחק',
   // filterPanelLinkOperator: 'Logic operator',
   filterPanelOperators: 'אופרטור',
+
+  // TODO v6: rename to filterPanelOperator
   filterPanelOperatorAnd: 'וגם',
   filterPanelOperatorOr: 'או',
   filterPanelColumns: 'עמודות',
diff --git a/packages/grid/x-data-grid/src/locales/itIT.ts b/packages/grid/x-data-grid/src/locales/itIT.ts
index d02133da36abb..ad9bd70e56732 100644
--- a/packages/grid/x-data-grid/src/locales/itIT.ts
+++ b/packages/grid/x-data-grid/src/locales/itIT.ts
@@ -45,6 +45,8 @@ const itITGrid: Partial<GridLocaleText> = {
   filterPanelDeleteIconLabel: 'Rimuovi',
   // filterPanelLinkOperator: 'Logic operator',
   filterPanelOperators: 'Operatori',
+
+  // TODO v6: rename to filterPanelOperator
   filterPanelOperatorAnd: 'E (and)',
   filterPanelOperatorOr: 'O (or)',
   filterPanelColumns: 'Colonne',
diff --git a/packages/grid/x-data-grid/src/locales/jaJP.ts b/packages/grid/x-data-grid/src/locales/jaJP.ts
index 35ebd966ade83..c757239baa6fd 100644
--- a/packages/grid/x-data-grid/src/locales/jaJP.ts
+++ b/packages/grid/x-data-grid/src/locales/jaJP.ts
@@ -44,6 +44,8 @@ const jaJPGrid: Partial<GridLocaleText> = {
   filterPanelDeleteIconLabel: '削除',
   // filterPanelLinkOperator: 'Logic operator',
   filterPanelOperators: 'オペレータ',
+
+  // TODO v6: rename to filterPanelOperator
   filterPanelOperatorAnd: 'And',
   filterPanelOperatorOr: 'Or',
   filterPanelColumns: '列',
diff --git a/packages/grid/x-data-grid/src/locales/koKR.ts b/packages/grid/x-data-grid/src/locales/koKR.ts
index 5f8d28cebd3a1..2ecf9366085de 100644
--- a/packages/grid/x-data-grid/src/locales/koKR.ts
+++ b/packages/grid/x-data-grid/src/locales/koKR.ts
@@ -44,6 +44,8 @@ const koKRGrid: Partial<GridLocaleText> = {
   filterPanelDeleteIconLabel: '삭제',
   // filterPanelLinkOperator: 'Logic operator',
   filterPanelOperators: '연산자',
+
+  // TODO v6: rename to filterPanelOperator
   filterPanelOperatorAnd: '그리고',
   filterPanelOperatorOr: '또는',
   filterPanelColumns: '목록',
diff --git a/packages/grid/x-data-grid/src/locales/nlNL.ts b/packages/grid/x-data-grid/src/locales/nlNL.ts
index 74c344bb5cbc3..95c8a3835aa15 100644
--- a/packages/grid/x-data-grid/src/locales/nlNL.ts
+++ b/packages/grid/x-data-grid/src/locales/nlNL.ts
@@ -45,6 +45,8 @@ const nlNLGrid: Partial<GridLocaleText> = {
   filterPanelDeleteIconLabel: 'Verwijderen',
   // filterPanelLinkOperator: 'Logic operator',
   filterPanelOperators: 'Operatoren',
+
+  // TODO v6: rename to filterPanelOperator
   filterPanelOperatorAnd: 'En',
   filterPanelOperatorOr: 'Of',
   filterPanelColumns: 'Kolommen',
diff --git a/packages/grid/x-data-grid/src/locales/plPL.ts b/packages/grid/x-data-grid/src/locales/plPL.ts
index 88b9e969d916f..3dd56256cfc04 100644
--- a/packages/grid/x-data-grid/src/locales/plPL.ts
+++ b/packages/grid/x-data-grid/src/locales/plPL.ts
@@ -44,6 +44,8 @@ const plPLGrid: Partial<GridLocaleText> = {
   filterPanelDeleteIconLabel: 'Usuń',
   // filterPanelLinkOperator: 'Logic operator',
   filterPanelOperators: 'Operator',
+
+  // TODO v6: rename to filterPanelOperator
   filterPanelOperatorAnd: 'I',
   filterPanelOperatorOr: 'Lub',
   filterPanelColumns: 'Kolumny',
diff --git a/packages/grid/x-data-grid/src/locales/ptBR.ts b/packages/grid/x-data-grid/src/locales/ptBR.ts
index 8a27a05ebb6c6..2f1f1dc88ae86 100644
--- a/packages/grid/x-data-grid/src/locales/ptBR.ts
+++ b/packages/grid/x-data-grid/src/locales/ptBR.ts
@@ -45,6 +45,8 @@ const ptBRGrid: Partial<GridLocaleText> = {
   filterPanelDeleteIconLabel: 'Excluir',
   filterPanelLinkOperator: 'Operador lógico',
   filterPanelOperators: 'Operador',
+
+  // TODO v6: rename to filterPanelOperator
   filterPanelOperatorAnd: 'E',
   filterPanelOperatorOr: 'Ou',
   filterPanelColumns: 'Colunas',
diff --git a/packages/grid/x-data-grid/src/locales/ruRU.ts b/packages/grid/x-data-grid/src/locales/ruRU.ts
index 21aa3b09cb307..8e8ddc9eb42bc 100644
--- a/packages/grid/x-data-grid/src/locales/ruRU.ts
+++ b/packages/grid/x-data-grid/src/locales/ruRU.ts
@@ -55,6 +55,8 @@ const ruRUGrid: Partial<GridLocaleText> = {
   filterPanelDeleteIconLabel: 'Удалить',
   // filterPanelLinkOperator: 'Logic operator',
   filterPanelOperators: 'Операторы',
+
+  // TODO v6: rename to filterPanelOperator
   filterPanelOperatorAnd: 'И',
   filterPanelOperatorOr: 'Или',
   filterPanelColumns: 'Столбцы',
diff --git a/packages/grid/x-data-grid/src/locales/skSK.ts b/packages/grid/x-data-grid/src/locales/skSK.ts
index 77b67058909c4..058815d54a521 100644
--- a/packages/grid/x-data-grid/src/locales/skSK.ts
+++ b/packages/grid/x-data-grid/src/locales/skSK.ts
@@ -54,6 +54,8 @@ const skSKGrid: Partial<GridLocaleText> = {
   filterPanelDeleteIconLabel: 'Odstrániť',
   // filterPanelLinkOperator: 'Logic operator',
   filterPanelOperators: 'Operátory',
+
+  // TODO v6: rename to filterPanelOperator
   filterPanelOperatorAnd: 'A',
   filterPanelOperatorOr: 'Alebo',
   filterPanelColumns: 'Stĺpce',
diff --git a/packages/grid/x-data-grid/src/locales/trTR.ts b/packages/grid/x-data-grid/src/locales/trTR.ts
index 551e2d55737c5..b6c68a0aa21d1 100644
--- a/packages/grid/x-data-grid/src/locales/trTR.ts
+++ b/packages/grid/x-data-grid/src/locales/trTR.ts
@@ -44,6 +44,8 @@ const trTRGrid: Partial<GridLocaleText> = {
   filterPanelDeleteIconLabel: 'Kaldır',
   // filterPanelLinkOperator: 'Logic operator',
   filterPanelOperators: 'Operatör',
+
+  // TODO v6: rename to filterPanelOperator
   filterPanelOperatorAnd: 'Ve',
   filterPanelOperatorOr: 'Veya',
   filterPanelColumns: 'Sütunlar',
diff --git a/packages/grid/x-data-grid/src/locales/ukUA.ts b/packages/grid/x-data-grid/src/locales/ukUA.ts
index e6dadcd996d58..84185d7bd1b48 100644
--- a/packages/grid/x-data-grid/src/locales/ukUA.ts
+++ b/packages/grid/x-data-grid/src/locales/ukUA.ts
@@ -68,6 +68,8 @@ const ukUAGrid: Partial<GridLocaleText> = {
   filterPanelDeleteIconLabel: 'Видалити',
   // filterPanelLinkOperator: 'Logic operator',
   filterPanelOperators: 'Оператори',
+
+  // TODO v6: rename to filterPanelOperator
   filterPanelOperatorAnd: 'І',
   filterPanelOperatorOr: 'Або',
   filterPanelColumns: 'Стовпці',
diff --git a/packages/grid/x-data-grid/src/locales/viVN.ts b/packages/grid/x-data-grid/src/locales/viVN.ts
index 799977e29e232..cf1ec0b421c18 100644
--- a/packages/grid/x-data-grid/src/locales/viVN.ts
+++ b/packages/grid/x-data-grid/src/locales/viVN.ts
@@ -45,6 +45,8 @@ const viVNGrid: Partial<GridLocaleText> = {
   filterPanelDeleteIconLabel: 'Xóa',
   // filterPanelLinkOperator: 'Logic operator',
   filterPanelOperators: 'Toán tử',
+
+  // TODO v6: rename to filterPanelOperator
   filterPanelOperatorAnd: 'Và',
   filterPanelOperatorOr: 'Hoặc',
   filterPanelColumns: 'Cột',
diff --git a/packages/grid/x-data-grid/src/locales/zhCN.ts b/packages/grid/x-data-grid/src/locales/zhCN.ts
index 6d561941863dc..e4fb3766d0536 100644
--- a/packages/grid/x-data-grid/src/locales/zhCN.ts
+++ b/packages/grid/x-data-grid/src/locales/zhCN.ts
@@ -44,6 +44,8 @@ const zhCNGrid: Partial<GridLocaleText> = {
   filterPanelDeleteIconLabel: '删除',
   // filterPanelLinkOperator: 'Logic operator',
   filterPanelOperators: '操作器',
+
+  // TODO v6: rename to filterPanelOperator
   filterPanelOperatorAnd: '与',
   filterPanelOperatorOr: '或',
   filterPanelColumns: '列',