Merge branch 'origin/main' into 'next-release/main'

web/src/assets/locales/pt.json

@@ -308,7 +308,11 @@
             },
             "log_delete_confirm": "Você realmente deseja excluir os registros de etapas?",
             "log_delete_error": "Ocorreu um erro ao excluir os registros de etapas",
-            "view": "Ver pipeline"
+            "view": "Ver pipeline",
+            "cancel_info": {
+                "superseded_by": "Substituído pelo pipeline #{pipelineId}",
+                "canceled_by_user": "Cancelado por {user}"
+            }
         },
         "branches": "Branches",
         "pull_requests": "Pull requests",

web/src/assets/locales/zh-Hans.json

@@ -320,7 +320,11 @@
             "duration": "流水线耗时：{duration}",
             "log_delete_confirm": "您确定要删除步骤日志吗？",
             "log_delete_error": "删除步骤日志时发生了错误",
-            "view": "查看流水线"
+            "view": "查看流水线",
+            "cancel_info": {
+                "superseded_by": "#{pipelineId} 流水线已被取消",
+                "canceled_by_user": "{user} 已取消"
+            }
         },
         "pull_requests": "合并请求",
         "settings": {