diff --git a/CHANGELOG.md b/CHANGELOG.md
index 73a5cc93e..4d08824b7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,9 @@ This project adheres to [Semantic Versioning](http://semver.org).
 This document is formatted according to the principles of [Keep A CHANGELOG](http://keepachangelog.com).
 
 ## [Unreleased]
+### Fixed
+- Provide trailing space in Irish keywords ([#243](https://github.com/cucumber/gherkin/pull/243))
+- Tamil "And" and "But" translations should have single trailing space ([#243](https://github.com/cucumber/gherkin/pull/243))
 
 ## [28.0.0] - 2024-02-15
 ### Added
diff --git a/c/src/dialect.c b/c/src/dialect.c
index 27c5d423a..52002820f 100644
--- a/c/src/dialect.c
+++ b/c/src/dialect.c
@@ -1410,13 +1410,13 @@ static const Dialect fr_dialect = {
         &fr_then_keywords,
         &fr_when_keywords };
 
-static const wchar_t* const ga_and_KEYWORDS[] = { L"* ", L"Agus" };
+static const wchar_t* const ga_and_KEYWORDS[] = { L"* ", L"Agus " };
 static const Keywords ga_and_keywords = { 2, ga_and_KEYWORDS };
 
 static const wchar_t* const ga_background_KEYWORDS[] = { L"Cúlra" };
 static const Keywords ga_background_keywords = { 1, ga_background_KEYWORDS };
 
-static const wchar_t* const ga_but_KEYWORDS[] = { L"* ", L"Ach" };
+static const wchar_t* const ga_but_KEYWORDS[] = { L"* ", L"Ach " };
 static const Keywords ga_but_keywords = { 2, ga_but_KEYWORDS };
 
 static const wchar_t* const ga_examples_KEYWORDS[] = { L"Samplaí" };
@@ -1425,7 +1425,7 @@ static const Keywords ga_examples_keywords = { 1, ga_examples_KEYWORDS };
 static const wchar_t* const ga_feature_KEYWORDS[] = { L"Gné" };
 static const Keywords ga_feature_keywords = { 1, ga_feature_KEYWORDS };
 
-static const wchar_t* const ga_given_KEYWORDS[] = { L"* ", L"Cuir i gcás go", L"Cuir i gcás nach", L"Cuir i gcás gur", L"Cuir i gcás nár" };
+static const wchar_t* const ga_given_KEYWORDS[] = { L"* ", L"Cuir i gcás go ", L"Cuir i gcás nach ", L"Cuir i gcás gur ", L"Cuir i gcás nár " };
 static const Keywords ga_given_keywords = { 5, ga_given_KEYWORDS };
 
 static const wchar_t* const ga_rule_KEYWORDS[] = { L"Riail" };
@@ -1437,10 +1437,10 @@ static const Keywords ga_scenario_keywords = { 2, ga_scenario_KEYWORDS };
 static const wchar_t* const ga_scenarioOutline_KEYWORDS[] = { L"Cás Achomair" };
 static const Keywords ga_scenarioOutline_keywords = { 1, ga_scenarioOutline_KEYWORDS };
 
-static const wchar_t* const ga_then_KEYWORDS[] = { L"* ", L"Ansin" };
+static const wchar_t* const ga_then_KEYWORDS[] = { L"* ", L"Ansin " };
 static const Keywords ga_then_keywords = { 2, ga_then_KEYWORDS };
 
-static const wchar_t* const ga_when_KEYWORDS[] = { L"* ", L"Nuair a", L"Nuair nach", L"Nuair ba", L"Nuair nár" };
+static const wchar_t* const ga_when_KEYWORDS[] = { L"* ", L"Nuair a ", L"Nuair nach ", L"Nuair ba ", L"Nuair nár " };
 static const Keywords ga_when_keywords = { 5, ga_when_KEYWORDS };
 
 static const Dialect ga_dialect = {
@@ -3055,13 +3055,13 @@ static const Dialect sv_dialect = {
         &sv_then_keywords,
         &sv_when_keywords };
 
-static const wchar_t* const ta_and_KEYWORDS[] = { L"* ", L"மேலும்  ", L"மற்றும் " };
+static const wchar_t* const ta_and_KEYWORDS[] = { L"* ", L"மேலும் ", L"மற்றும் " };
 static const Keywords ta_and_keywords = { 3, ta_and_KEYWORDS };
 
 static const wchar_t* const ta_background_KEYWORDS[] = { L"பின்னணி" };
 static const Keywords ta_background_keywords = { 1, ta_background_KEYWORDS };
 
-static const wchar_t* const ta_but_KEYWORDS[] = { L"* ", L"ஆனால்  " };
+static const wchar_t* const ta_but_KEYWORDS[] = { L"* ", L"ஆனால் " };
 static const Keywords ta_but_keywords = { 2, ta_but_KEYWORDS };
 
 static const wchar_t* const ta_examples_KEYWORDS[] = { L"எடுத்துக்காட்டுகள்", L"காட்சிகள்", L"நிலைமைகளில்" };
diff --git a/cpp/src/lib/gherkin/cucumber/gherkin/dialect.cpp b/cpp/src/lib/gherkin/cucumber/gherkin/dialect.cpp
index ad8baf09b..118b65a74 100644
--- a/cpp/src/lib/gherkin/cucumber/gherkin/dialect.cpp
+++ b/cpp/src/lib/gherkin/cucumber/gherkin/dialect.cpp
@@ -223,7 +223,7 @@ all_keywords()
             { "examples", { "Eksempler" } },
             { "feature", { "Egenskab" } },
             { "given", { "* ", "Givet " } },
-            { "rule", { "Rule" } },
+            { "rule", { "Regel" } },
             { "scenario", { "Eksempel", "Scenarie" } },
             { "scenarioOutline", { "Abstrakt Scenario" } },
             { "then", { "* ", "Så " } },
@@ -399,7 +399,7 @@ all_keywords()
             { "examples", { "Ekzemploj" } },
             { "feature", { "Trajto" } },
             { "given", { "* ", "Donitaĵo ", "Komence " } },
-            { "rule", { "Rule" } },
+            { "rule", { "Regulo" } },
             { "scenario", { "Ekzemplo", "Scenaro", "Kazo" } },
             { "scenarioOutline", { "Konturo de la scenaro", "Skizo", "Kazo-skizo" } },
             { "then", { "* ", "Do " } },
@@ -489,17 +489,17 @@ all_keywords()
     {
         "ga",
         {
-            { "and", { "* ", "Agus" } },
+            { "and", { "* ", "Agus " } },
             { "background", { "Cúlra" } },
-            { "but", { "* ", "Ach" } },
+            { "but", { "* ", "Ach " } },
             { "examples", { "Samplaí" } },
             { "feature", { "Gné" } },
-            { "given", { "* ", "Cuir i gcás go", "Cuir i gcás nach", "Cuir i gcás gur", "Cuir i gcás nár" } },
+            { "given", { "* ", "Cuir i gcás go ", "Cuir i gcás nach ", "Cuir i gcás gur ", "Cuir i gcás nár " } },
             { "rule", { "Riail" } },
             { "scenario", { "Sampla", "Cás" } },
             { "scenarioOutline", { "Cás Achomair" } },
-            { "then", { "* ", "Ansin" } },
-            { "when", { "* ", "Nuair a", "Nuair nach", "Nuair ba", "Nuair nár" } }
+            { "then", { "* ", "Ansin " } },
+            { "when", { "* ", "Nuair a ", "Nuair nach ", "Nuair ba ", "Nuair nár " } }
         }
     },
     {
@@ -649,7 +649,7 @@ all_keywords()
     {
         "it",
         {
-            { "and", { "* ", "E " } },
+            { "and", { "* ", "E ", "Ed " } },
             { "background", { "Contesto" } },
             { "but", { "* ", "Ma " } },
             { "examples", { "Esempi" } },
@@ -863,7 +863,7 @@ all_keywords()
             { "examples", { "Voorbeelden" } },
             { "feature", { "Functionaliteit" } },
             { "given", { "* ", "Gegeven ", "Stel " } },
-            { "rule", { "Rule" } },
+            { "rule", { "Regel" } },
             { "scenario", { "Voorbeeld", "Scenario" } },
             { "scenarioOutline", { "Abstract Scenario" } },
             { "then", { "* ", "Dan " } },
@@ -1049,9 +1049,9 @@ all_keywords()
     {
         "ta",
         {
-            { "and", { "* ", "மேலும்  ", "மற்றும் " } },
+            { "and", { "* ", "மேலும் ", "மற்றும் " } },
             { "background", { "பின்னணி" } },
-            { "but", { "* ", "ஆனால்  " } },
+            { "but", { "* ", "ஆனால் " } },
             { "examples", { "எடுத்துக்காட்டுகள்", "காட்சிகள்", "நிலைமைகளில்" } },
             { "feature", { "அம்சம்", "வணிக தேவை", "திறன்" } },
             { "given", { "* ", "கொடுக்கப்பட்ட " } },
@@ -1199,7 +1199,7 @@ all_keywords()
             { "examples", { "Dữ liệu" } },
             { "feature", { "Tính năng" } },
             { "given", { "* ", "Biết ", "Cho " } },
-            { "rule", { "Rule" } },
+            { "rule", { "Quy tắc" } },
             { "scenario", { "Tình huống", "Kịch bản" } },
             { "scenarioOutline", { "Khung tình huống", "Khung kịch bản" } },
             { "then", { "* ", "Thì " } },
@@ -1222,6 +1222,22 @@ all_keywords()
             { "when", { "* ", "当" } }
         }
     },
+    {
+        "ml",
+        {
+            { "and", { "* ", "ഒപ്പം" } },
+            { "background", { "പശ്ചാത്തലം" } },
+            { "but", { "* ", "പക്ഷേ" } },
+            { "examples", { "ഉദാഹരണങ്ങൾ" } },
+            { "feature", { "സവിശേഷത" } },
+            { "given", { "* ", "നൽകിയത്" } },
+            { "rule", { "നിയമം" } },
+            { "scenario", { "രംഗം" } },
+            { "scenarioOutline", { "സാഹചര്യത്തിന്റെ രൂപരേഖ" } },
+            { "then", { "* ", "പിന്നെ" } },
+            { "when", { "എപ്പോൾ" } }
+        }
+    },
     {
         "zh-TW",
         {
diff --git a/dart/assets/gherkin-languages.json b/dart/assets/gherkin-languages.json
index c882f3e9b..7bdb99831 100644
--- a/dart/assets/gherkin-languages.json
+++ b/dart/assets/gherkin-languages.json
@@ -278,7 +278,7 @@
       "Nə vaxt ki "
     ]
   },
-    "be": {
+  "be": {
     "and": [
       "* ",
       "I ",
@@ -1401,14 +1401,14 @@
   "ga": {
     "and": [
       "* ",
-      "Agus"
+      "Agus "
     ],
     "background": [
       "Cúlra"
     ],
     "but": [
       "* ",
-      "Ach"
+      "Ach "
     ],
     "examples": [
       "Samplaí"
@@ -1418,10 +1418,10 @@
     ],
     "given": [
       "* ",
-      "Cuir i gcás go",
-      "Cuir i gcás nach",
-      "Cuir i gcás gur",
-      "Cuir i gcás nár"
+      "Cuir i gcás go ",
+      "Cuir i gcás nach ",
+      "Cuir i gcás gur ",
+      "Cuir i gcás nár "
     ],
     "name": "Irish",
     "native": "Gaeilge",
@@ -1437,14 +1437,14 @@
     ],
     "then": [
       "* ",
-      "Ansin"
+      "Ansin "
     ],
     "when": [
       "* ",
-      "Nuair a",
-      "Nuair nach",
-      "Nuair ba",
-      "Nuair nár"
+      "Nuair a ",
+      "Nuair nach ",
+      "Nuair ba ",
+      "Nuair nár "
     ]
   },
   "gj": {
@@ -3134,7 +3134,7 @@
   "ta": {
     "and": [
       "* ",
-      "மேலும்  ",
+      "மேலும் ",
       "மற்றும் "
     ],
     "background": [
@@ -3142,7 +3142,7 @@
     ],
     "but": [
       "* ",
-      "ஆனால்  "
+      "ஆனால் "
     ],
     "examples": [
       "எடுத்துக்காட்டுகள்",
diff --git a/dotnet/Gherkin/gherkin-languages.json b/dotnet/Gherkin/gherkin-languages.json
index c882f3e9b..7bdb99831 100644
--- a/dotnet/Gherkin/gherkin-languages.json
+++ b/dotnet/Gherkin/gherkin-languages.json
@@ -278,7 +278,7 @@
       "Nə vaxt ki "
     ]
   },
-    "be": {
+  "be": {
     "and": [
       "* ",
       "I ",
@@ -1401,14 +1401,14 @@
   "ga": {
     "and": [
       "* ",
-      "Agus"
+      "Agus "
     ],
     "background": [
       "Cúlra"
     ],
     "but": [
       "* ",
-      "Ach"
+      "Ach "
     ],
     "examples": [
       "Samplaí"
@@ -1418,10 +1418,10 @@
     ],
     "given": [
       "* ",
-      "Cuir i gcás go",
-      "Cuir i gcás nach",
-      "Cuir i gcás gur",
-      "Cuir i gcás nár"
+      "Cuir i gcás go ",
+      "Cuir i gcás nach ",
+      "Cuir i gcás gur ",
+      "Cuir i gcás nár "
     ],
     "name": "Irish",
     "native": "Gaeilge",
@@ -1437,14 +1437,14 @@
     ],
     "then": [
       "* ",
-      "Ansin"
+      "Ansin "
     ],
     "when": [
       "* ",
-      "Nuair a",
-      "Nuair nach",
-      "Nuair ba",
-      "Nuair nár"
+      "Nuair a ",
+      "Nuair nach ",
+      "Nuair ba ",
+      "Nuair nár "
     ]
   },
   "gj": {
@@ -3134,7 +3134,7 @@
   "ta": {
     "and": [
       "* ",
-      "மேலும்  ",
+      "மேலும் ",
       "மற்றும் "
     ],
     "background": [
@@ -3142,7 +3142,7 @@
     ],
     "but": [
       "* ",
-      "ஆனால்  "
+      "ஆனால் "
     ],
     "examples": [
       "எடுத்துக்காட்டுகள்",
diff --git a/elixir/priv/gherkin_languages.json b/elixir/priv/gherkin_languages.json
index c882f3e9b..7bdb99831 100644
--- a/elixir/priv/gherkin_languages.json
+++ b/elixir/priv/gherkin_languages.json
@@ -278,7 +278,7 @@
       "Nə vaxt ki "
     ]
   },
-    "be": {
+  "be": {
     "and": [
       "* ",
       "I ",
@@ -1401,14 +1401,14 @@
   "ga": {
     "and": [
       "* ",
-      "Agus"
+      "Agus "
     ],
     "background": [
       "Cúlra"
     ],
     "but": [
       "* ",
-      "Ach"
+      "Ach "
     ],
     "examples": [
       "Samplaí"
@@ -1418,10 +1418,10 @@
     ],
     "given": [
       "* ",
-      "Cuir i gcás go",
-      "Cuir i gcás nach",
-      "Cuir i gcás gur",
-      "Cuir i gcás nár"
+      "Cuir i gcás go ",
+      "Cuir i gcás nach ",
+      "Cuir i gcás gur ",
+      "Cuir i gcás nár "
     ],
     "name": "Irish",
     "native": "Gaeilge",
@@ -1437,14 +1437,14 @@
     ],
     "then": [
       "* ",
-      "Ansin"
+      "Ansin "
     ],
     "when": [
       "* ",
-      "Nuair a",
-      "Nuair nach",
-      "Nuair ba",
-      "Nuair nár"
+      "Nuair a ",
+      "Nuair nach ",
+      "Nuair ba ",
+      "Nuair nár "
     ]
   },
   "gj": {
@@ -3134,7 +3134,7 @@
   "ta": {
     "and": [
       "* ",
-      "மேலும்  ",
+      "மேலும் ",
       "மற்றும் "
     ],
     "background": [
@@ -3142,7 +3142,7 @@
     ],
     "but": [
       "* ",
-      "ஆனால்  "
+      "ஆனால் "
     ],
     "examples": [
       "எடுத்துக்காட்டுகள்",
diff --git a/gherkin-languages.json b/gherkin-languages.json
index c882f3e9b..7bdb99831 100644
--- a/gherkin-languages.json
+++ b/gherkin-languages.json
@@ -278,7 +278,7 @@
       "Nə vaxt ki "
     ]
   },
-    "be": {
+  "be": {
     "and": [
       "* ",
       "I ",
@@ -1401,14 +1401,14 @@
   "ga": {
     "and": [
       "* ",
-      "Agus"
+      "Agus "
     ],
     "background": [
       "Cúlra"
     ],
     "but": [
       "* ",
-      "Ach"
+      "Ach "
     ],
     "examples": [
       "Samplaí"
@@ -1418,10 +1418,10 @@
     ],
     "given": [
       "* ",
-      "Cuir i gcás go",
-      "Cuir i gcás nach",
-      "Cuir i gcás gur",
-      "Cuir i gcás nár"
+      "Cuir i gcás go ",
+      "Cuir i gcás nach ",
+      "Cuir i gcás gur ",
+      "Cuir i gcás nár "
     ],
     "name": "Irish",
     "native": "Gaeilge",
@@ -1437,14 +1437,14 @@
     ],
     "then": [
       "* ",
-      "Ansin"
+      "Ansin "
     ],
     "when": [
       "* ",
-      "Nuair a",
-      "Nuair nach",
-      "Nuair ba",
-      "Nuair nár"
+      "Nuair a ",
+      "Nuair nach ",
+      "Nuair ba ",
+      "Nuair nár "
     ]
   },
   "gj": {
@@ -3134,7 +3134,7 @@
   "ta": {
     "and": [
       "* ",
-      "மேலும்  ",
+      "மேலும் ",
       "மற்றும் "
     ],
     "background": [
@@ -3142,7 +3142,7 @@
     ],
     "but": [
       "* ",
-      "ஆனால்  "
+      "ஆனால் "
     ],
     "examples": [
       "எடுத்துக்காட்டுகள்",
diff --git a/go/dialects_builtin.go b/go/dialects_builtin.go
index 9edc66486..72205cbe3 100644
--- a/go/dialects_builtin.go
+++ b/go/dialects_builtin.go
@@ -1960,53 +1960,53 @@ var builtinDialects = gherkinDialectMap{
 			},
 			given: {
 				"* ",
-				"Cuir i gcás go",
-				"Cuir i gcás nach",
-				"Cuir i gcás gur",
-				"Cuir i gcás nár",
+				"Cuir i gcás go ",
+				"Cuir i gcás nach ",
+				"Cuir i gcás gur ",
+				"Cuir i gcás nár ",
 			},
 			when: {
 				"* ",
-				"Nuair a",
-				"Nuair nach",
-				"Nuair ba",
-				"Nuair nár",
+				"Nuair a ",
+				"Nuair nach ",
+				"Nuair ba ",
+				"Nuair nár ",
 			},
 			then: {
 				"* ",
-				"Ansin",
+				"Ansin ",
 			},
 			and: {
 				"* ",
-				"Agus",
+				"Agus ",
 			},
 			but: {
 				"* ",
-				"Ach",
+				"Ach ",
 			},
 		},
 		map[string]messages.StepKeywordType{
-			"Cuir i gcás go": messages.StepKeywordType_CONTEXT,
+			"Cuir i gcás go ": messages.StepKeywordType_CONTEXT,
 
-			"Cuir i gcás nach": messages.StepKeywordType_CONTEXT,
+			"Cuir i gcás nach ": messages.StepKeywordType_CONTEXT,
 
-			"Cuir i gcás gur": messages.StepKeywordType_CONTEXT,
+			"Cuir i gcás gur ": messages.StepKeywordType_CONTEXT,
 
-			"Cuir i gcás nár": messages.StepKeywordType_CONTEXT,
+			"Cuir i gcás nár ": messages.StepKeywordType_CONTEXT,
 
-			"Nuair a": messages.StepKeywordType_ACTION,
+			"Nuair a ": messages.StepKeywordType_ACTION,
 
-			"Nuair nach": messages.StepKeywordType_ACTION,
+			"Nuair nach ": messages.StepKeywordType_ACTION,
 
-			"Nuair ba": messages.StepKeywordType_ACTION,
+			"Nuair ba ": messages.StepKeywordType_ACTION,
 
-			"Nuair nár": messages.StepKeywordType_ACTION,
+			"Nuair nár ": messages.StepKeywordType_ACTION,
 
-			"Ansin": messages.StepKeywordType_OUTCOME,
+			"Ansin ": messages.StepKeywordType_OUTCOME,
 
-			"Agus": messages.StepKeywordType_CONJUNCTION,
+			"Agus ": messages.StepKeywordType_CONJUNCTION,
 
-			"Ach": messages.StepKeywordType_CONJUNCTION,
+			"Ach ": messages.StepKeywordType_CONJUNCTION,
 
 			"* ": messages.StepKeywordType_UNKNOWN,
 		}},
@@ -4382,12 +4382,12 @@ var builtinDialects = gherkinDialectMap{
 			},
 			and: {
 				"* ",
-				"மேலும்  ",
+				"மேலும் ",
 				"மற்றும் ",
 			},
 			but: {
 				"* ",
-				"ஆனால்  ",
+				"ஆனால் ",
 			},
 		},
 		map[string]messages.StepKeywordType{
@@ -4397,11 +4397,11 @@ var builtinDialects = gherkinDialectMap{
 
 			"அப்பொழுது ": messages.StepKeywordType_OUTCOME,
 
-			"மேலும்  ": messages.StepKeywordType_CONJUNCTION,
+			"மேலும் ": messages.StepKeywordType_CONJUNCTION,
 
 			"மற்றும் ": messages.StepKeywordType_CONJUNCTION,
 
-			"ஆனால்  ": messages.StepKeywordType_CONJUNCTION,
+			"ஆனால் ": messages.StepKeywordType_CONJUNCTION,
 
 			"* ": messages.StepKeywordType_UNKNOWN,
 		}},
diff --git a/javascript/src/gherkin-languages.json b/javascript/src/gherkin-languages.json
index c882f3e9b..7bdb99831 100644
--- a/javascript/src/gherkin-languages.json
+++ b/javascript/src/gherkin-languages.json
@@ -278,7 +278,7 @@
       "Nə vaxt ki "
     ]
   },
-    "be": {
+  "be": {
     "and": [
       "* ",
       "I ",
@@ -1401,14 +1401,14 @@
   "ga": {
     "and": [
       "* ",
-      "Agus"
+      "Agus "
     ],
     "background": [
       "Cúlra"
     ],
     "but": [
       "* ",
-      "Ach"
+      "Ach "
     ],
     "examples": [
       "Samplaí"
@@ -1418,10 +1418,10 @@
     ],
     "given": [
       "* ",
-      "Cuir i gcás go",
-      "Cuir i gcás nach",
-      "Cuir i gcás gur",
-      "Cuir i gcás nár"
+      "Cuir i gcás go ",
+      "Cuir i gcás nach ",
+      "Cuir i gcás gur ",
+      "Cuir i gcás nár "
     ],
     "name": "Irish",
     "native": "Gaeilge",
@@ -1437,14 +1437,14 @@
     ],
     "then": [
       "* ",
-      "Ansin"
+      "Ansin "
     ],
     "when": [
       "* ",
-      "Nuair a",
-      "Nuair nach",
-      "Nuair ba",
-      "Nuair nár"
+      "Nuair a ",
+      "Nuair nach ",
+      "Nuair ba ",
+      "Nuair nár "
     ]
   },
   "gj": {
@@ -3134,7 +3134,7 @@
   "ta": {
     "and": [
       "* ",
-      "மேலும்  ",
+      "மேலும் ",
       "மற்றும் "
     ],
     "background": [
@@ -3142,7 +3142,7 @@
     ],
     "but": [
       "* ",
-      "ஆனால்  "
+      "ஆனால் "
     ],
     "examples": [
       "எடுத்துக்காட்டுகள்",
diff --git a/objective-c/GherkinLanguages/gherkin-languages.json b/objective-c/GherkinLanguages/gherkin-languages.json
index 3e88c0811..7bdb99831 100644
--- a/objective-c/GherkinLanguages/gherkin-languages.json
+++ b/objective-c/GherkinLanguages/gherkin-languages.json
@@ -278,6 +278,55 @@
       "Nə vaxt ki "
     ]
   },
+  "be": {
+    "and": [
+      "* ",
+      "I ",
+      "Ды ",
+      "Таксама "
+    ],
+    "background": [
+      "Кантэкст"
+    ],
+    "but": [
+      "* ",
+      "Але ",
+      "Інакш "
+    ],
+    "examples": [
+      "Прыклады"
+    ],
+    "feature": [
+      "Функцыянальнасць",
+      "Фіча"
+    ],
+    "given": [
+      "* ",
+      "Няхай ",
+      "Дадзена "
+    ],
+    "name": "Belarusian",
+    "native": "Беларуская",
+    "rule": [
+      "Правілы"
+    ],
+    "scenario": [
+      "Сцэнарый",
+      "Cцэнар"
+    ],
+    "scenarioOutline": [
+      "Шаблон сцэнарыя",
+      "Узор сцэнара"
+    ],
+    "then": [
+      "* ",
+      "Тады "
+    ],
+    "when": [
+      "* ",
+      "Калі "
+    ]
+  },
   "bg": {
     "and": [
       "* ",
@@ -581,7 +630,7 @@
     "name": "Danish",
     "native": "dansk",
     "rule": [
-      "Rule"
+      "Regel"
     ],
     "scenario": [
       "Eksempel",
@@ -1083,7 +1132,7 @@
     "name": "Esperanto",
     "native": "Esperanto",
     "rule": [
-      "Rule"
+      "Regulo"
     ],
     "scenario": [
       "Ekzemplo",
@@ -1352,14 +1401,14 @@
   "ga": {
     "and": [
       "* ",
-      "Agus"
+      "Agus "
     ],
     "background": [
       "Cúlra"
     ],
     "but": [
       "* ",
-      "Ach"
+      "Ach "
     ],
     "examples": [
       "Samplaí"
@@ -1369,10 +1418,10 @@
     ],
     "given": [
       "* ",
-      "Cuir i gcás go",
-      "Cuir i gcás nach",
-      "Cuir i gcás gur",
-      "Cuir i gcás nár"
+      "Cuir i gcás go ",
+      "Cuir i gcás nach ",
+      "Cuir i gcás gur ",
+      "Cuir i gcás nár "
     ],
     "name": "Irish",
     "native": "Gaeilge",
@@ -1388,14 +1437,14 @@
     ],
     "then": [
       "* ",
-      "Ansin"
+      "Ansin "
     ],
     "when": [
       "* ",
-      "Nuair a",
-      "Nuair nach",
-      "Nuair ba",
-      "Nuair nár"
+      "Nuair a ",
+      "Nuair nach ",
+      "Nuair ba ",
+      "Nuair nár "
     ]
   },
   "gj": {
@@ -1837,7 +1886,8 @@
   "it": {
     "and": [
       "* ",
-      "E "
+      "E ",
+      "Ed "
     ],
     "background": [
       "Contesto"
@@ -2483,7 +2533,7 @@
     "name": "Dutch",
     "native": "Nederlands",
     "rule": [
-      "Rule"
+      "Regel"
     ],
     "scenario": [
       "Voorbeeld",
@@ -3084,7 +3134,7 @@
   "ta": {
     "and": [
       "* ",
-      "மேலும்  ",
+      "மேலும் ",
       "மற்றும் "
     ],
     "background": [
@@ -3092,7 +3142,7 @@
     ],
     "but": [
       "* ",
-      "ஆனால்  "
+      "ஆனால் "
     ],
     "examples": [
       "எடுத்துக்காட்டுகள்",
@@ -3526,7 +3576,7 @@
     "name": "Vietnamese",
     "native": "Tiếng Việt",
     "rule": [
-      "Rule"
+      "Quy tắc"
     ],
     "scenario": [
       "Tình huống",
@@ -3594,6 +3644,47 @@
       "当"
     ]
   },
+  "ml": {
+    "and": [
+      "* ",
+      "ഒപ്പം"
+    ],
+    "background": [
+      "പശ്ചാത്തലം"
+    ],
+    "but": [
+      "* ",
+      "പക്ഷേ"
+    ],
+    "examples": [
+      "ഉദാഹരണങ്ങൾ"
+    ],
+    "feature": [
+      "സവിശേഷത"
+    ],
+    "given": [
+      "* ",
+      "നൽകിയത്"
+    ],
+    "name": "Malayalam",
+    "native": "മലയാളം",
+    "rule": [
+      "നിയമം"
+    ],
+    "scenario": [
+      "രംഗം"
+    ],
+    "scenarioOutline": [
+      "സാഹചര്യത്തിന്റെ രൂപരേഖ"
+    ],
+    "then": [
+      "* ",
+      "പിന്നെ"
+    ],
+    "when": [
+      "എപ്പോൾ"
+    ]
+  },
   "zh-TW": {
     "and": [
       "* ",
diff --git a/php/resources/gherkin-languages.json b/php/resources/gherkin-languages.json
index c882f3e9b..7bdb99831 100644
--- a/php/resources/gherkin-languages.json
+++ b/php/resources/gherkin-languages.json
@@ -278,7 +278,7 @@
       "Nə vaxt ki "
     ]
   },
-    "be": {
+  "be": {
     "and": [
       "* ",
       "I ",
@@ -1401,14 +1401,14 @@
   "ga": {
     "and": [
       "* ",
-      "Agus"
+      "Agus "
     ],
     "background": [
       "Cúlra"
     ],
     "but": [
       "* ",
-      "Ach"
+      "Ach "
     ],
     "examples": [
       "Samplaí"
@@ -1418,10 +1418,10 @@
     ],
     "given": [
       "* ",
-      "Cuir i gcás go",
-      "Cuir i gcás nach",
-      "Cuir i gcás gur",
-      "Cuir i gcás nár"
+      "Cuir i gcás go ",
+      "Cuir i gcás nach ",
+      "Cuir i gcás gur ",
+      "Cuir i gcás nár "
     ],
     "name": "Irish",
     "native": "Gaeilge",
@@ -1437,14 +1437,14 @@
     ],
     "then": [
       "* ",
-      "Ansin"
+      "Ansin "
     ],
     "when": [
       "* ",
-      "Nuair a",
-      "Nuair nach",
-      "Nuair ba",
-      "Nuair nár"
+      "Nuair a ",
+      "Nuair nach ",
+      "Nuair ba ",
+      "Nuair nár "
     ]
   },
   "gj": {
@@ -3134,7 +3134,7 @@
   "ta": {
     "and": [
       "* ",
-      "மேலும்  ",
+      "மேலும் ",
       "மற்றும் "
     ],
     "background": [
@@ -3142,7 +3142,7 @@
     ],
     "but": [
       "* ",
-      "ஆனால்  "
+      "ஆனால் "
     ],
     "examples": [
       "எடுத்துக்காட்டுகள்",
diff --git a/python/gherkin/gherkin-languages.json b/python/gherkin/gherkin-languages.json
index c882f3e9b..7bdb99831 100644
--- a/python/gherkin/gherkin-languages.json
+++ b/python/gherkin/gherkin-languages.json
@@ -278,7 +278,7 @@
       "Nə vaxt ki "
     ]
   },
-    "be": {
+  "be": {
     "and": [
       "* ",
       "I ",
@@ -1401,14 +1401,14 @@
   "ga": {
     "and": [
       "* ",
-      "Agus"
+      "Agus "
     ],
     "background": [
       "Cúlra"
     ],
     "but": [
       "* ",
-      "Ach"
+      "Ach "
     ],
     "examples": [
       "Samplaí"
@@ -1418,10 +1418,10 @@
     ],
     "given": [
       "* ",
-      "Cuir i gcás go",
-      "Cuir i gcás nach",
-      "Cuir i gcás gur",
-      "Cuir i gcás nár"
+      "Cuir i gcás go ",
+      "Cuir i gcás nach ",
+      "Cuir i gcás gur ",
+      "Cuir i gcás nár "
     ],
     "name": "Irish",
     "native": "Gaeilge",
@@ -1437,14 +1437,14 @@
     ],
     "then": [
       "* ",
-      "Ansin"
+      "Ansin "
     ],
     "when": [
       "* ",
-      "Nuair a",
-      "Nuair nach",
-      "Nuair ba",
-      "Nuair nár"
+      "Nuair a ",
+      "Nuair nach ",
+      "Nuair ba ",
+      "Nuair nár "
     ]
   },
   "gj": {
@@ -3134,7 +3134,7 @@
   "ta": {
     "and": [
       "* ",
-      "மேலும்  ",
+      "மேலும் ",
       "மற்றும் "
     ],
     "background": [
@@ -3142,7 +3142,7 @@
     ],
     "but": [
       "* ",
-      "ஆனால்  "
+      "ஆனால் "
     ],
     "examples": [
       "எடுத்துக்காட்டுகள்",
diff --git a/ruby/lib/gherkin/gherkin-languages.json b/ruby/lib/gherkin/gherkin-languages.json
index c882f3e9b..7bdb99831 100644
--- a/ruby/lib/gherkin/gherkin-languages.json
+++ b/ruby/lib/gherkin/gherkin-languages.json
@@ -278,7 +278,7 @@
       "Nə vaxt ki "
     ]
   },
-    "be": {
+  "be": {
     "and": [
       "* ",
       "I ",
@@ -1401,14 +1401,14 @@
   "ga": {
     "and": [
       "* ",
-      "Agus"
+      "Agus "
     ],
     "background": [
       "Cúlra"
     ],
     "but": [
       "* ",
-      "Ach"
+      "Ach "
     ],
     "examples": [
       "Samplaí"
@@ -1418,10 +1418,10 @@
     ],
     "given": [
       "* ",
-      "Cuir i gcás go",
-      "Cuir i gcás nach",
-      "Cuir i gcás gur",
-      "Cuir i gcás nár"
+      "Cuir i gcás go ",
+      "Cuir i gcás nach ",
+      "Cuir i gcás gur ",
+      "Cuir i gcás nár "
     ],
     "name": "Irish",
     "native": "Gaeilge",
@@ -1437,14 +1437,14 @@
     ],
     "then": [
       "* ",
-      "Ansin"
+      "Ansin "
     ],
     "when": [
       "* ",
-      "Nuair a",
-      "Nuair nach",
-      "Nuair ba",
-      "Nuair nár"
+      "Nuair a ",
+      "Nuair nach ",
+      "Nuair ba ",
+      "Nuair nár "
     ]
   },
   "gj": {
@@ -3134,7 +3134,7 @@
   "ta": {
     "and": [
       "* ",
-      "மேலும்  ",
+      "மேலும் ",
       "மற்றும் "
     ],
     "background": [
@@ -3142,7 +3142,7 @@
     ],
     "but": [
       "* ",
-      "ஆனால்  "
+      "ஆனால் "
     ],
     "examples": [
       "எடுத்துக்காட்டுகள்",