Merge branch 'master' into feat-convert-content-sharing-api-response

Author: mergify[bot]

.github/workflows/semantic.yml

@@ -9,6 +9,7 @@ on:
 
 jobs:
     main:
+        if: github.actor != 'mergify[bot]'
         name: lint_pull_request
         runs-on: ubuntu-latest
         steps:

.mergify.yml

@@ -6,6 +6,10 @@ pull_request_rules:
       conditions:
           - -draft
           - base = master
+          - label != do-not-merge
+          - status-success = license/cla
+          - status-success = lint_pull_request
+          - status-success = lint_test_build
       actions:
           queue:
 
@@ -15,27 +19,16 @@ queue_rules:
           - author = boxmoji
           - title ~= ^(fix)\(i18n\)?:\supdate translations$
           - files ~= ^i18n/
-          - label != do-not-merge
-          - status-success = license/cla
-          - status-success = lint_pull_request
-          - status-success = lint_test_build
-      merge_conditions:
           - status-success = lint_test_build
       merge_method: squash
 
     - name: Automatic strict merge
       queue_conditions:
           - title ~= ^(build|ci|chore|docs|feat|fix|perf|refactor|revert|style|test)(\([^)]+\))?:\s.+$
           - label = ready-to-merge
-          - label != do-not-merge
-          - status-success = license/cla
-          - status-success = lint_pull_request
           - status-success = lint_test_build
           - branch-protection-review-decision = APPROVED
           - "#approved-reviews-by >= 2"
           - "#changes-requested-reviews-by = 0"
           - "#review-threads-unresolved = 0"
-      merge_conditions:
-          - status-success = license/cla
-          - status-success = lint_test_build
       merge_method: squash

i18n/ja-JP.properties

@@ -233,7 +233,7 @@ be.contentSidebar.activityFeed.common.seeLessMessage = 表示を減らす
 # See more button for showing whole long message
 be.contentSidebar.activityFeed.common.seeMoreMessage = さらに表示
 # Accessibility label for timestamp button that allows jumping to a specific time in media
-be.contentSidebar.activityFeed.common.timestampLabel = Seek to video timestamp
+be.contentSidebar.activityFeed.common.timestampLabel = ビデオのタイムスタンプに移動します
 # Translate button for translating comment
 be.contentSidebar.activityFeed.common.translateMessage = 翻訳する
 # Text for aria label of approval task circle type icon