Skip to content

Commit

Permalink
Merge branch 'master' into DHIS2-9661
Browse files Browse the repository at this point in the history
  • Loading branch information
simonadomnisoru committed Oct 2, 2023
2 parents 81216d7 + 12060ed commit 1a01f65
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 9 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
## [100.40.1](https://github.com/dhis2/capture-app/compare/v100.40.0...v100.40.1) (2023-09-30)


### Bug Fixes

* **translations:** sync translations from transifex (master) ([b58bc66](https://github.com/dhis2/capture-app/commit/b58bc66db4136ad558c02f38ac54a2319b3af3f1))

# [100.40.0](https://github.com/dhis2/capture-app/compare/v100.39.4...v100.40.0) (2023-09-20)


Expand Down
12 changes: 6 additions & 6 deletions i18n/zh.po
Original file line number Diff line number Diff line change
Expand Up @@ -320,7 +320,7 @@ msgid ""
msgstr "一个具有 {{attributeName}} 的 {{trackedEntityTypeName}} 实体已经登记"

msgid "Show registered {{trackedEntityTypeName}}"
msgstr "显示登记的 {{attributeName}} "
msgstr "显示已注册的{{trackedEntityTypeName}}"

msgid "Registered person"
msgstr "登记的人"
Expand Down Expand Up @@ -1069,7 +1069,7 @@ msgid "To work with the selected program,"
msgstr "基于选择的项目工作"

msgid "open the Tracker Capture app"
msgstr "打开跟踪随访采集APP"
msgstr "打开跟踪记录APP"

msgid "This program is protected"
msgstr "该项目受保护"
Expand Down Expand Up @@ -1257,7 +1257,7 @@ msgid "Save changes"
msgstr "保存修改"

msgid "Profile"
msgstr "简历"
msgstr "基本信息"

msgid "There is a problem with this form"
msgstr "这个表单有问题"
Expand All @@ -1278,7 +1278,7 @@ msgid "Profile widget could not be loaded. Please try again later"
msgstr "无法加载个人资料窗口小部件。请稍后再试"

msgid "{{TETName}} profile"
msgstr "{{TETName}} 基本资料"
msgstr "{{TETName}} 基本信息"

msgid "Edit"
msgstr "编辑"
Expand Down Expand Up @@ -1314,7 +1314,7 @@ msgid "{{ overdueEvents }} overdue"
msgstr "{{ overdueEvents }} 逾期"

msgid "{{ scheduledEvents }} scheduled"
msgstr "{{scheduledEvents}} 已调度"
msgstr "{{ ScheduledEvents }} 已安排"

msgid "Stages and Events"
msgstr "阶段与活动"
Expand Down Expand Up @@ -1416,7 +1416,7 @@ msgid "Scheduled"
msgstr "已经调度"

msgid "Overdue{{ escape }} due {{ time }}"
msgstr "逾期{{逃脱}}到期{{时间}}"
msgstr "逾期{{ escape }}到期{{ time }}"

msgid "Overdue"
msgstr "逾期"
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "capture-app",
"homepage": ".",
"version": "100.40.0",
"version": "100.40.1",
"cacheVersion": "6",
"serverVersion": "38",
"license": "BSD-3-Clause",
Expand All @@ -10,7 +10,7 @@
"packages/rules-engine"
],
"dependencies": {
"@dhis2/rules-engine-javascript": "100.40.0",
"@dhis2/rules-engine-javascript": "100.40.1",
"@dhis2/app-runtime": "^3.9.3",
"@dhis2/d2-i18n": "^1.1.0",
"@dhis2/d2-icons": "^1.0.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/rules-engine/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@dhis2/rules-engine-javascript",
"version": "100.40.0",
"version": "100.40.1",
"license": "BSD-3-Clause",
"main": "./build/cjs/index.js",
"scripts": {
Expand Down

0 comments on commit 1a01f65

Please sign in to comment.