Skip to content

Commit 3aa5441

Browse files
committed
Merge branch 'main' into actions-auto-expand-running-step
2 parents 233f3d6 + 35c86af commit 3aa5441

33 files changed

+147
-108
lines changed

options/locale/locale_en-US.ini

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1946,8 +1946,8 @@ pulls.delete.title = Delete this pull request?
19461946
pulls.delete.text = Do you really want to delete this pull request? (This will permanently remove all content. Consider closing it instead, if you intend to keep it archived)
19471947

19481948
pulls.recently_pushed_new_branches = You pushed on branch <strong>%[1]s</strong> %[2]s
1949-
pulls.upstream_diverging_prompt_behind_1 = This branch is %d commit behind %s
1950-
pulls.upstream_diverging_prompt_behind_n = This branch is %d commits behind %s
1949+
pulls.upstream_diverging_prompt_behind_1 = This branch is %[1]d commit behind %[2]s
1950+
pulls.upstream_diverging_prompt_behind_n = This branch is %[1]d commits behind %[2]s
19511951
pulls.upstream_diverging_prompt_base_newer = The base branch %s has new changes
19521952
pulls.upstream_diverging_merge = Sync fork
19531953

options/locale/locale_fr-FR.ini

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1945,8 +1945,6 @@ pulls.delete.title=Supprimer cette demande d'ajout ?
19451945
pulls.delete.text=Voulez-vous vraiment supprimer cet demande d'ajout ? (Cela supprimera définitivement tout le contenu. Envisagez de le fermer à la place, si vous avez l'intention de le garder archivé)
19461946
19471947
pulls.recently_pushed_new_branches=Vous avez soumis sur la branche <strong>%[1]s</strong> %[2]s
1948-
pulls.upstream_diverging_prompt_behind_1=Cette branche est en retard de %d révision sur %s
1949-
pulls.upstream_diverging_prompt_behind_n=Cette branche est en retard de %d révisions sur %s
19501948
pulls.upstream_diverging_prompt_base_newer=La branche de base %s a de nouveaux changements
19511949
pulls.upstream_diverging_merge=Synchroniser la bifurcation
19521950

options/locale/locale_ga-IE.ini

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1945,8 +1945,6 @@ pulls.delete.title=Scrios an t-iarratas tarraingthe seo?
19451945
pulls.delete.text=An bhfuil tú cinnte gur mhaith leat an t-iarratas tarraingthe seo a scriosadh? (Bainfidh sé seo an t-inneachar go léir go buan. Smaoinigh ar é a dhúnadh ina ionad sin, má tá sé i gceist agat é a choinneáil i gcartlann)
19461946

19471947
pulls.recently_pushed_new_branches=Bhrúigh tú ar bhrainse <strong>%[1]s</strong> %[2]s
1948-
pulls.upstream_diverging_prompt_behind_1=Tá an brainse seo %d tiomantas taobh thiar de %s
1949-
pulls.upstream_diverging_prompt_behind_n=Tá an brainse seo %d geallta taobh thiar de %s
19501948
pulls.upstream_diverging_prompt_base_newer=Tá athruithe nua ar an mbunbhrainse %s
19511949
pulls.upstream_diverging_merge=Forc sionc
19521950

options/locale/locale_ja-JP.ini

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1940,8 +1940,6 @@ pulls.delete.title=このプルリクエストを削除しますか?
19401940
pulls.delete.text=本当にこのプルリクエストを削除しますか? (これはすべてのコンテンツを完全に削除します。 保存しておきたい場合は、代わりにクローズすることを検討してください)
19411941

19421942
pulls.recently_pushed_new_branches=%[2]s 、あなたはブランチ <strong>%[1]s</strong> にプッシュしました
1943-
pulls.upstream_diverging_prompt_behind_1=このブランチは %[2]s よりも %[1]d コミット遅れています
1944-
pulls.upstream_diverging_prompt_behind_n=このブランチは %[2]s よりも %[1]d コミット遅れています
19451943
pulls.upstream_diverging_prompt_base_newer=ベースブランチ %s に新しい変更があります
19461944
pulls.upstream_diverging_merge=フォークを同期
19471945

options/locale/locale_pt-PT.ini

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1945,8 +1945,6 @@ pulls.delete.title=Eliminar este pedido de integração?
19451945
pulls.delete.text=Tem a certeza que quer eliminar este pedido de integração? Isso irá remover todo o conteúdo permanentemente. Como alternativa considere fechá-lo, se pretender mantê-lo em arquivo.
19461946

19471947
pulls.recently_pushed_new_branches=Enviou para o ramo <strong>%[1]s</strong> %[2]s
1948-
pulls.upstream_diverging_prompt_behind_1=Este ramo está %d cometimento atrás de %s
1949-
pulls.upstream_diverging_prompt_behind_n=Este ramo está %d cometimentos atrás de %s
19501948
pulls.upstream_diverging_prompt_base_newer=O ramo base %s tem novas modificações
19511949
pulls.upstream_diverging_merge=Sincronizar derivação
19521950

options/locale/locale_zh-CN.ini

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1945,8 +1945,6 @@ pulls.delete.title=删除此合并请求?
19451945
pulls.delete.text=你真的要删除这个合并请求吗? (这将永久删除所有内容。如果你打算将内容存档,请考虑关闭它)
19461946

19471947
pulls.recently_pushed_new_branches=您已经于%[2]s推送了分支 <strong>%[1]s</strong>
1948-
pulls.upstream_diverging_prompt_behind_1=该分支落后于 %s %d 个提交
1949-
pulls.upstream_diverging_prompt_behind_n=该分支落后于 %s %d 个提交
19501948
pulls.upstream_diverging_prompt_base_newer=基础分支 %s 有新的更改
19511949
pulls.upstream_diverging_merge=同步派生
19521950

options/locale/locale_zh-TW.ini

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1938,8 +1938,6 @@ pulls.delete.title=刪除此合併請求?
19381938
pulls.delete.text=您真的要刪除此合併請求嗎?(這將會永久移除所有內容。若您還想保留,請考慮改為關閉它。)
19391939

19401940
pulls.recently_pushed_new_branches=您在分支 <strong>%[1]s</strong> 上推送了 %[2]s
1941-
pulls.upstream_diverging_prompt_behind_1=此分支落後 %s %d 次提交
1942-
pulls.upstream_diverging_prompt_behind_n=此分支落後 %s %d 次提交
19431941
pulls.upstream_diverging_prompt_base_newer=基底分支 %s 有新變更
19441942
pulls.upstream_diverging_merge=同步 fork
19451943

tsconfig.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
"verbatimModuleSyntax": true,
2323
"stripInternal": true,
2424
"strict": false,
25+
"strictFunctionTypes": true,
2526
"noUnusedLocals": true,
2627
"noUnusedParameters": true,
2728
"noPropertyAccessFromIndexSignature": false,

web_src/js/components/ActionRunStatus.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import {SvgIcon} from '../svg.ts';
77
88
withDefaults(defineProps<{
99
status: 'success' | 'skipped' | 'waiting' | 'blocked' | 'running' | 'failure' | 'cancelled' | 'unknown',
10-
size: number,
11-
className: string,
10+
size?: number,
11+
className?: string,
1212
localeStatus?: string,
1313
}>(), {
1414
size: 16,

web_src/js/components/ContextPopup.vue

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,9 @@ const body = computed(() => {
2525
const root = ref<HTMLElement | null>(null);
2626
2727
onMounted(() => {
28-
root.value.addEventListener('ce-load-context-popup', (e: CustomEvent) => {
29-
const data: IssuePathInfo = e.detail;
28+
root.value.addEventListener('ce-load-context-popup', (e: CustomEventInit<IssuePathInfo>) => {
3029
if (!loading.value && issue.value === null) {
31-
load(data);
30+
load(e.detail);
3231
}
3332
});
3433
});

0 commit comments

Comments
 (0)