mirror of
https://github.com/CringeStudios/element-desktop.git
synced 2025-01-18 15:34:59 +01:00
Merge branch 'develop' into germain-gg/room-header-no-drag-zone
This commit is contained in:
commit
bae8b58c17
2
.github/workflows/build_and_test.yaml
vendored
2
.github/workflows/build_and_test.yaml
vendored
@ -41,7 +41,7 @@ jobs:
|
||||
|
||||
- name: "Get modified files"
|
||||
id: changed_files
|
||||
uses: tj-actions/changed-files@1c26215f3fbd51eba03bc199e5cbabdfc3584ce3 # v38
|
||||
uses: tj-actions/changed-files@2f7246cb26e8bb6709b6cbfc1fec7febfe82e96a # v38
|
||||
with:
|
||||
files: |
|
||||
dockerbuild/*
|
||||
|
@ -42,5 +42,6 @@
|
||||
"Start Speaking": "Commencer la dictée",
|
||||
"Copy image address": "Copier l'adresse de l'image",
|
||||
"Redo": "Refaire",
|
||||
"Close %(brand)s": "Fermer %(brand)s"
|
||||
"Close %(brand)s": "Fermer %(brand)s",
|
||||
"%(brand)s Help": "Aide de %(brand)s"
|
||||
}
|
||||
|
@ -42,5 +42,6 @@
|
||||
"Are you sure you want to quit?": "你确定要退出吗?",
|
||||
"Cancel": "取消",
|
||||
"Copy image address": "复制图片地址",
|
||||
"Close %(brand)s": "关闭 %(brand)s"
|
||||
"Close %(brand)s": "关闭 %(brand)s",
|
||||
"%(brand)s Help": "%(brand)s帮助"
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user