From d11bcdf858f4cfcc50cd29dde3311c9a61227e76 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 1 Dec 2022 19:45:02 +0000
Subject: [PATCH 1/2] fix(deps): update dependency @cucumber/gherkin to v25

---
 package-lock.json | 30 +++++++-----------------------
 package.json      |  2 +-
 2 files changed, 8 insertions(+), 24 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 2dec733f1..7fb833a7d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -11,7 +11,7 @@
       "dependencies": {
         "@cucumber/ci-environment": "9.1.0",
         "@cucumber/cucumber-expressions": "16.1.0",
-        "@cucumber/gherkin": "24.1.0",
+        "@cucumber/gherkin": "25.0.2",
         "@cucumber/gherkin-streams": "5.0.1",
         "@cucumber/gherkin-utils": "8.0.2",
         "@cucumber/html-formatter": "20.2.0",
@@ -558,9 +558,9 @@
       }
     },
     "node_modules/@cucumber/gherkin": {
-      "version": "24.1.0",
-      "resolved": "https://registry.npmjs.org/@cucumber/gherkin/-/gherkin-24.1.0.tgz",
-      "integrity": "sha512-B48XrUod4y3SoXe6mv12q7U1zThUNSK3yHSm/hBJCJZ6RJUJhFk3FVMN/83qOEbsYZe6iG9v+4L1Myf8/q8C6g==",
+      "version": "25.0.2",
+      "resolved": "https://registry.npmjs.org/@cucumber/gherkin/-/gherkin-25.0.2.tgz",
+      "integrity": "sha512-EdsrR33Y5GjuOoe2Kq5Y9DYwgNRtUD32H4y2hCrT6+AWo7ibUQu7H+oiWTgfVhwbkHsZmksxHSxXz/AwqqyCRQ==",
       "dependencies": {
         "@cucumber/messages": "^19.1.4"
       }
@@ -597,14 +597,6 @@
         "gherkin-utils": "bin/gherkin-utils"
       }
     },
-    "node_modules/@cucumber/gherkin-utils/node_modules/@cucumber/gherkin": {
-      "version": "25.0.2",
-      "resolved": "https://registry.npmjs.org/@cucumber/gherkin/-/gherkin-25.0.2.tgz",
-      "integrity": "sha512-EdsrR33Y5GjuOoe2Kq5Y9DYwgNRtUD32H4y2hCrT6+AWo7ibUQu7H+oiWTgfVhwbkHsZmksxHSxXz/AwqqyCRQ==",
-      "dependencies": {
-        "@cucumber/messages": "^19.1.4"
-      }
-    },
     "node_modules/@cucumber/gherkin-utils/node_modules/@cucumber/messages": {
       "version": "19.1.4",
       "resolved": "https://registry.npmjs.org/@cucumber/messages/-/messages-19.1.4.tgz",
@@ -8405,9 +8397,9 @@
       }
     },
     "@cucumber/gherkin": {
-      "version": "24.1.0",
-      "resolved": "https://registry.npmjs.org/@cucumber/gherkin/-/gherkin-24.1.0.tgz",
-      "integrity": "sha512-B48XrUod4y3SoXe6mv12q7U1zThUNSK3yHSm/hBJCJZ6RJUJhFk3FVMN/83qOEbsYZe6iG9v+4L1Myf8/q8C6g==",
+      "version": "25.0.2",
+      "resolved": "https://registry.npmjs.org/@cucumber/gherkin/-/gherkin-25.0.2.tgz",
+      "integrity": "sha512-EdsrR33Y5GjuOoe2Kq5Y9DYwgNRtUD32H4y2hCrT6+AWo7ibUQu7H+oiWTgfVhwbkHsZmksxHSxXz/AwqqyCRQ==",
       "requires": {
         "@cucumber/messages": "^19.1.4"
       },
@@ -8446,14 +8438,6 @@
         "source-map-support": "^0.5.21"
       },
       "dependencies": {
-        "@cucumber/gherkin": {
-          "version": "25.0.2",
-          "resolved": "https://registry.npmjs.org/@cucumber/gherkin/-/gherkin-25.0.2.tgz",
-          "integrity": "sha512-EdsrR33Y5GjuOoe2Kq5Y9DYwgNRtUD32H4y2hCrT6+AWo7ibUQu7H+oiWTgfVhwbkHsZmksxHSxXz/AwqqyCRQ==",
-          "requires": {
-            "@cucumber/messages": "^19.1.4"
-          }
-        },
         "@cucumber/messages": {
           "version": "19.1.4",
           "resolved": "https://registry.npmjs.org/@cucumber/messages/-/messages-19.1.4.tgz",
diff --git a/package.json b/package.json
index d32607f6d..1de048cb9 100644
--- a/package.json
+++ b/package.json
@@ -198,7 +198,7 @@
   "dependencies": {
     "@cucumber/ci-environment": "9.1.0",
     "@cucumber/cucumber-expressions": "16.1.0",
-    "@cucumber/gherkin": "24.1.0",
+    "@cucumber/gherkin": "25.0.2",
     "@cucumber/gherkin-streams": "5.0.1",
     "@cucumber/gherkin-utils": "8.0.2",
     "@cucumber/html-formatter": "20.2.0",

From 061cb7e4ba1f017136f27883bddc3ee6cbea7fd1 Mon Sep 17 00:00:00 2001
From: David Goss <david@davidgoss.co>
Date: Sat, 3 Dec 2022 12:03:03 +0000
Subject: [PATCH 2/2] update japanese language exanples

---
 features/i18n.feature | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/features/i18n.feature b/features/i18n.feature
index af7983c2e..b0528fff0 100644
--- a/features/i18n.feature
+++ b/features/i18n.feature
@@ -27,7 +27,7 @@ Feature: internationalization
       """
       ENGLISH KEYWORD  | NATIVE KEYWORDS
       Feature          | "フィーチャ", "機能"
-      Rule             | "Rule"
+      Rule             | "ルール"
       Background       | "背景"
       Scenario         | "シナリオ"
       Scenario Outline | "シナリオアウトライン", "シナリオテンプレート", "テンプレ", "シナリオテンプレ"
@@ -35,6 +35,6 @@ Feature: internationalization
       Given            | "* ", "前提"
       When             | "* ", "もし"
       Then             | "* ", "ならば"
-      And              | "* ", "かつ"
-      But              | "* ", "しかし", "但し", "ただし"
+      And              | "* ", "且つ", "かつ"
+      But              | "* ", "然し", "しかし", "但し", "ただし"
       """