Skip to content

Commit

Permalink
Merge branch 'develop' into germain-gg/room-header-no-drag-zone
Browse files Browse the repository at this point in the history
  • Loading branch information
Johennes authored Sep 5, 2023
2 parents d929da6 + 724c545 commit bae8b58
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build_and_test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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/*
Expand Down
3 changes: 2 additions & 1 deletion src/i18n/strings/fr.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
3 changes: 2 additions & 1 deletion src/i18n/strings/zh_Hans.json
Original file line number Diff line number Diff line change
Expand Up @@ -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帮助"
}

0 comments on commit bae8b58

Please sign in to comment.