From f25e85df29980406593f2c7d200baea2961a2de3 Mon Sep 17 00:00:00 2001 From: henrikmv Date: Tue, 19 Nov 2024 15:23:43 +0100 Subject: [PATCH] Revert "Merge remote-tracking branch 'origin/master' into hv/feat/DHIS2-18328_LogEntriesForOccurredAtScheduledAtGeometry" This reverts commit f87564c0186fb565e1cee22c73fe9babe253a409, reversing changes made to c782137ea67ab85f40010ade8a3083dc6625b97b. --- CHANGELOG.md | 7 ------- i18n/es_419.po | 17 ++++++----------- i18n/pt.po | 23 ++++++++++------------- i18n/ru.po | 14 ++++++-------- i18n/zh_CN.po | 10 ++++------ package.json | 4 ++-- packages/rules-engine/package.json | 2 +- 7 files changed, 29 insertions(+), 48 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 91bede54a0..8ab035123e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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) diff --git a/i18n/es_419.po b/i18n/es_419.po index f996ede3ef..c94ef95e6a 100644 --- a/i18n/es_419.po +++ b/i18n/es_419.po @@ -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 , 2024\n" "Language-Team: Spanish (Latin America) (https://app.transifex.com/hisp-uio/teams/100509/es_419/)\n" @@ -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." @@ -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" @@ -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" @@ -1155,9 +1153,6 @@ msgstr "" msgid "Mark incomplete" msgstr "" -msgid "You do not have access to delete this enrollment" -msgstr "" - msgid "Delete enrollment" msgstr "" @@ -1539,7 +1534,7 @@ msgid "Change" msgstr "" msgid "Value" -msgstr "Valor" +msgstr "" msgid "New {{trackedEntityTypeName}} relationship" msgstr "" diff --git a/i18n/pt.po b/i18n/pt.po index 7c9dc3090d..1a05f44f6b 100644 --- a/i18n/pt.po +++ b/i18n/pt.po @@ -11,14 +11,13 @@ # Jason Pickering , 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" @@ -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}}" @@ -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" @@ -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 "" @@ -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." @@ -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" @@ -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" diff --git a/i18n/ru.po b/i18n/ru.po index 0d16b78d76..23d7e47cd1 100644 --- a/i18n/ru.po +++ b/i18n/ru.po @@ -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}} не зарегистрирован в данной программе." @@ -1108,8 +1106,8 @@ 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 "Редактировать" @@ -1117,8 +1115,8 @@ 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 "Назначить" diff --git a/i18n/zh_CN.po b/i18n/zh_CN.po index 6a0a80ee90..8d01178792 100644 --- a/i18n/zh_CN.po +++ b/i18n/zh_CN.po @@ -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}} 。" @@ -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" @@ -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" diff --git a/package.json b/package.json index b54a12f078..07eb53096a 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "capture-app", "homepage": ".", - "version": "101.16.1", + "version": "101.16.0", "cacheVersion": "7", "serverVersion": "38", "license": "BSD-3-Clause", @@ -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", diff --git a/packages/rules-engine/package.json b/packages/rules-engine/package.json index 4526bc13fe..d0b7bd5ae9 100644 --- a/packages/rules-engine/package.json +++ b/packages/rules-engine/package.json @@ -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": {