Skip to content

Commit

Permalink
Revert "Merge remote-tracking branch 'origin/master' into hv/feat/DHI…
Browse files Browse the repository at this point in the history
…S2-18328_LogEntriesForOccurredAtScheduledAtGeometry"

This reverts commit f87564c, reversing
changes made to c782137.
  • Loading branch information
henrikmv committed Nov 19, 2024
1 parent 6428702 commit f25e85d
Show file tree
Hide file tree
Showing 7 changed files with 29 additions and 48 deletions.
7 changes: 0 additions & 7 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,3 @@
## [101.16.1](https://github.com/dhis2/capture-app/compare/v101.16.0...v101.16.1) (2024-11-17)


### Bug Fixes

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

# [101.16.0](https://github.com/dhis2/capture-app/compare/v101.15.0...v101.16.0) (2024-11-13)


Expand Down
17 changes: 6 additions & 11 deletions i18n/es_419.po
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: i18next-conv\n"
"POT-Creation-Date: 2024-10-25T18:18:11.518Z\n"
"POT-Creation-Date: 2024-10-14T14:53:34.553Z\n"
"PO-Revision-Date: 2019-06-27 07:31+0000\n"
"Last-Translator: Jaime Bosque <[email protected]>, 2024\n"
"Language-Team: Spanish (Latin America) (https://app.transifex.com/hisp-uio/teams/100509/es_419/)\n"
Expand Down Expand Up @@ -700,10 +700,8 @@ msgid "Add new enrollment for {{teiDisplayName}} in this program."
msgstr ""
"Agregue una nueva inscripción para {{teiDisplayName}} en este programa."

msgid ""
"You do not have permissions to access to this program, registering unit or "
"record, contact your administrator for more information."
msgstr ""
msgid "No access to program owner."
msgstr "Sin acceso al propietario del programa."

msgid "{{teiDisplayName}} is not enrolled in this program."
msgstr "{{teiDisplayName}} no está inscrito en este programa."
Expand Down Expand Up @@ -1100,7 +1098,7 @@ msgstr ""
msgid "Assigned to"
msgstr ""

msgid "You don't have access to edit the assigned user"
msgid "You don't have access to edit this assignee"
msgstr ""

msgid "Edit"
Expand All @@ -1109,7 +1107,7 @@ msgstr ""
msgid "No one is assigned to this event"
msgstr "No hay nadie asignado a este evento."

msgid "You don't have access to assign a user to this event"
msgid "You don't have access to assign an assignee"
msgstr ""

msgid "Assign"
Expand Down Expand Up @@ -1155,9 +1153,6 @@ msgstr ""
msgid "Mark incomplete"
msgstr ""

msgid "You do not have access to delete this enrollment"
msgstr ""

msgid "Delete enrollment"
msgstr ""

Expand Down Expand Up @@ -1539,7 +1534,7 @@ msgid "Change"
msgstr ""

msgid "Value"
msgstr "Valor"
msgstr ""

msgid "New {{trackedEntityTypeName}} relationship"
msgstr ""
Expand Down
23 changes: 10 additions & 13 deletions i18n/pt.po
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,13 @@
# Jason Pickering <[email protected]>, 2024
# Helton Dias, 2024
# Shelsea Chumaio, 2024
# Laurência Luís, 2024
#
msgid ""
msgstr ""
"Project-Id-Version: i18next-conv\n"
"POT-Creation-Date: 2024-10-25T18:18:11.518Z\n"
"PO-Revision-Date: 2019-06-27 07:31+0000\n"
"Last-Translator: Laurência Luís, 2024\n"
"Last-Translator: Shelsea Chumaio, 2024\n"
"Language-Team: Portuguese (https://app.transifex.com/hisp-uio/teams/100509/pt/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
Expand Down Expand Up @@ -341,7 +340,7 @@ msgstr ""

msgid ""
"Would you like to complete the enrollment and all active events as well?"
msgstr "Gostaria de completar a inscrição e todos os eventos activos?"
msgstr ""

msgid "{{count}} event in {{programStageName}}"
msgid_plural "{{count}} event in {{programStageName}}"
Expand All @@ -350,13 +349,13 @@ msgstr[1] ""
msgstr[2] ""

msgid "Yes, complete enrollment and events"
msgstr "Sim, completar a inscrição e os eventos"
msgstr ""

msgid "Complete enrollment only"
msgstr "Completar apenas a inscrição"
msgstr ""

msgid "Would you like to complete the enrollment?"
msgstr "Gostaria de completar a inscrição?"
msgstr ""

msgid "Complete enrollment"
msgstr "Completar inscrição"
Expand Down Expand Up @@ -392,7 +391,7 @@ msgid "validation failed"
msgstr "falha na validação"

msgid "No feedback for this event yet"
msgstr "Ainda não há feedback para este evento"
msgstr ""

msgid "No indicator output for this event yet"
msgstr ""
Expand Down Expand Up @@ -702,10 +701,8 @@ msgstr "Não há inscrições ativas."
msgid "Add new enrollment for {{teiDisplayName}} in this program."
msgstr "Adicione uma nova inscrição para {{teiDisplayName}} neste programa."

msgid ""
"You do not have permissions to access to this program, registering unit or "
"record, contact your administrator for more information."
msgstr ""
msgid "No access to program owner."
msgstr "Sem acesso ao proprietário do programa."

msgid "{{teiDisplayName}} is not enrolled in this program."
msgstr "{{teiDisplayName}} não está inscrito neste programa."
Expand Down Expand Up @@ -1110,7 +1107,7 @@ msgstr ""
msgid "Assigned to"
msgstr "Atribuído a"

msgid "You don't have access to edit the assigned user"
msgid "You don't have access to edit this assignee"
msgstr ""

msgid "Edit"
Expand All @@ -1119,7 +1116,7 @@ msgstr "Editar"
msgid "No one is assigned to this event"
msgstr "Ninguém está atribuído a este evento"

msgid "You don't have access to assign a user to this event"
msgid "You don't have access to assign an assignee"
msgstr ""

msgid "Assign"
Expand Down
14 changes: 6 additions & 8 deletions i18n/ru.po
Original file line number Diff line number Diff line change
Expand Up @@ -701,10 +701,8 @@ msgstr ""
"Создать новую регистрационную запись для объекта {{teiDisplayName}} в данной"
" программе."

msgid ""
"You do not have permissions to access to this program, registering unit or "
"record, contact your administrator for more information."
msgstr ""
msgid "No access to program owner."
msgstr "Нет доступа к владельцу программы."

msgid "{{teiDisplayName}} is not enrolled in this program."
msgstr "Объект {{teiDisplayName}} не зарегистрирован в данной программе."
Expand Down Expand Up @@ -1108,17 +1106,17 @@ msgstr "Нет доступных отслеживаемых типов объе
msgid "Assigned to"
msgstr "Назначено пользователю"

msgid "You don't have access to edit the assigned user"
msgstr ""
msgid "You don't have access to edit this assignee"
msgstr "У вас нет доступа к редактированию данного назначенного пользователя"

msgid "Edit"
msgstr "Редактировать"

msgid "No one is assigned to this event"
msgstr "Никто не назначен для данного события"

msgid "You don't have access to assign a user to this event"
msgstr ""
msgid "You don't have access to assign an assignee"
msgstr "У вас нет доступа к назначению пользователя"

msgid "Assign"
msgstr "Назначить"
Expand Down
10 changes: 4 additions & 6 deletions i18n/zh_CN.po
Original file line number Diff line number Diff line change
Expand Up @@ -667,10 +667,8 @@ msgstr "没有活跃的注册。"
msgid "Add new enrollment for {{teiDisplayName}} in this program."
msgstr "在此计划中为 {{teiDisplayName}} 添加新注册。"

msgid ""
"You do not have permissions to access to this program, registering unit or "
"record, contact your administrator for more information."
msgstr ""
msgid "No access to program owner."
msgstr "无法访问程序所有者。"

msgid "{{teiDisplayName}} is not enrolled in this program."
msgstr "该项目未报名{{teiDisplayName}} 。"
Expand Down Expand Up @@ -1057,7 +1055,7 @@ msgstr ""
msgid "Assigned to"
msgstr "指派到"

msgid "You don't have access to edit the assigned user"
msgid "You don't have access to edit this assignee"
msgstr ""

msgid "Edit"
Expand All @@ -1066,7 +1064,7 @@ msgstr "编辑"
msgid "No one is assigned to this event"
msgstr "没有人被分配到的该事件"

msgid "You don't have access to assign a user to this event"
msgid "You don't have access to assign an assignee"
msgstr ""

msgid "Assign"
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": "101.16.1",
"version": "101.16.0",
"cacheVersion": "7",
"serverVersion": "38",
"license": "BSD-3-Clause",
Expand All @@ -10,7 +10,7 @@
"packages/rules-engine"
],
"dependencies": {
"@dhis2/rules-engine-javascript": "101.16.1",
"@dhis2/rules-engine-javascript": "101.16.0",
"@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": "101.16.1",
"version": "101.16.0",
"license": "BSD-3-Clause",
"main": "./build/cjs/index.js",
"scripts": {
Expand Down

0 comments on commit f25e85d

Please sign in to comment.