From 58ae9d35cb30aec4e87d1c84cdb8fe41bd743624 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 2 Apr 2024 09:46:28 +0200 Subject: [PATCH 1/5] chore(l10n) update translations (#2924) Co-authored-by: bonita-ci --- .../src/main/resources/i18n/portal-js_es.po | 2 +- .../src/main/resources/i18n/portal-js_fr.po | 2 +- .../src/main/resources/i18n/portal-js_ja.po | 2 +- .../src/main/resources/i18n/portal-js_pt_BR.po | 10 +++++----- .../src/main/resources/i18n/portal_es.po | 4 ++-- .../src/main/resources/i18n/portal_fr.po | 4 ++-- .../src/main/resources/i18n/portal_ja.po | 4 ++-- .../src/main/resources/i18n/portal_pt_BR.po | 4 ++-- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/bpm/bonita-web-server/src/main/resources/i18n/portal-js_es.po b/bpm/bonita-web-server/src/main/resources/i18n/portal-js_es.po index ace4b482e6..240f9770f6 100644 --- a/bpm/bonita-web-server/src/main/resources/i18n/portal-js_es.po +++ b/bpm/bonita-web-server/src/main/resources/i18n/portal-js_es.po @@ -11,7 +11,7 @@ msgstr "" "X-Crowdin-File-ID: 61810\n" "Language-Team: Spanish\n" "Language: es_ES\n" -"PO-Revision-Date: 2023-11-19 02:32\n" +"PO-Revision-Date: 2024-04-01 14:46\n" msgid "1 case has been deleted" msgstr "Se ha eliminado 1 caso" diff --git a/bpm/bonita-web-server/src/main/resources/i18n/portal-js_fr.po b/bpm/bonita-web-server/src/main/resources/i18n/portal-js_fr.po index 2cda9e991c..7559f66eaf 100644 --- a/bpm/bonita-web-server/src/main/resources/i18n/portal-js_fr.po +++ b/bpm/bonita-web-server/src/main/resources/i18n/portal-js_fr.po @@ -11,7 +11,7 @@ msgstr "" "X-Crowdin-File-ID: 61810\n" "Language-Team: French\n" "Language: fr_FR\n" -"PO-Revision-Date: 2023-11-19 02:28\n" +"PO-Revision-Date: 2024-04-01 14:46\n" msgid "1 case has been deleted" msgstr "1 cas a été supprimé" diff --git a/bpm/bonita-web-server/src/main/resources/i18n/portal-js_ja.po b/bpm/bonita-web-server/src/main/resources/i18n/portal-js_ja.po index 1cc2e97a44..31ff963c3d 100644 --- a/bpm/bonita-web-server/src/main/resources/i18n/portal-js_ja.po +++ b/bpm/bonita-web-server/src/main/resources/i18n/portal-js_ja.po @@ -11,7 +11,7 @@ msgstr "" "X-Crowdin-File-ID: 61810\n" "Language-Team: Japanese\n" "Language: ja_JP\n" -"PO-Revision-Date: 2023-11-19 02:30\n" +"PO-Revision-Date: 2024-04-01 14:46\n" msgid "1 case has been deleted" msgstr "1 案件が削除されました" diff --git a/bpm/bonita-web-server/src/main/resources/i18n/portal-js_pt_BR.po b/bpm/bonita-web-server/src/main/resources/i18n/portal-js_pt_BR.po index 99975dc074..f08e754ea9 100644 --- a/bpm/bonita-web-server/src/main/resources/i18n/portal-js_pt_BR.po +++ b/bpm/bonita-web-server/src/main/resources/i18n/portal-js_pt_BR.po @@ -11,7 +11,7 @@ msgstr "" "X-Crowdin-File-ID: 61810\n" "Language-Team: Portuguese, Brazilian\n" "Language: pt_BR\n" -"PO-Revision-Date: 2023-11-19 02:31\n" +"PO-Revision-Date: 2024-04-01 14:46\n" msgid "1 case has been deleted" msgstr "1 caso foi excluído" @@ -353,7 +353,7 @@ msgid "Enable all" msgstr "Ativar Tudo" msgid "Enter a new category name and click \"Add\" button to create a new category." -msgstr "Insira um novo nome de categoria e clique no botão \"Adicionar\" para criar uma nova categoria." +msgstr "Insira um novo nome de categoria e clique no botão \"Adicionar\" para criar uma categoria nova." msgid "Enter the user to start the case for..." msgstr "Digite o usuário para o qual o caso será iniciado..." @@ -770,7 +770,7 @@ msgid "Remove all" msgstr "Remover tudo" msgid "Removing on apply" -msgstr "Removendo em aplicar" +msgstr "Removendo ao aplicar" msgid "Reset" msgstr "Restaurar" @@ -935,7 +935,7 @@ msgid "The case {{caseId}} has been started successfully." msgstr "A instância {{caseId}} foi iniciada com êxito." msgid "The category cannot be removed and added at the same time." -msgstr "Categoria não pode ser removida e adicionada ao mesmo tempo." +msgstr "Categoria não pode ser removida e adicionada em simultâneo." msgid "The current process has no connectors defined." msgstr "O processo atual tem os conectores não definidos." @@ -986,7 +986,7 @@ msgid "This application is core to the Bonita platform. To keep it working as it msgstr "Essa aplicação é essencial para a plataforma Bonita. Para que continue a funcionar como deve ser, tem de permanecer disponível e o seu menu deve permanecer como está." msgid "This category has already been added to this process." -msgstr "Esta categoria já foi adicionada a este processo." +msgstr "Esta categoria já foi adicionada para este processo." msgid "This field is mandatory" msgstr "Este campo é obrigatório" diff --git a/bpm/bonita-web-server/src/main/resources/i18n/portal_es.po b/bpm/bonita-web-server/src/main/resources/i18n/portal_es.po index 177ca26f72..f730bee0ca 100644 --- a/bpm/bonita-web-server/src/main/resources/i18n/portal_es.po +++ b/bpm/bonita-web-server/src/main/resources/i18n/portal_es.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bonita\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-02-04 06:21+0100\n" -"PO-Revision-Date: 2024-02-05 03:01\n" +"POT-Creation-Date: 2024-04-01 14:32+0000\n" +"PO-Revision-Date: 2024-04-01 14:46\n" "Last-Translator: \n" "Language-Team: Spanish\n" "Language: es_ES\n" diff --git a/bpm/bonita-web-server/src/main/resources/i18n/portal_fr.po b/bpm/bonita-web-server/src/main/resources/i18n/portal_fr.po index c1483b6e34..f0dc50bf7d 100644 --- a/bpm/bonita-web-server/src/main/resources/i18n/portal_fr.po +++ b/bpm/bonita-web-server/src/main/resources/i18n/portal_fr.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bonita\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-02-04 06:21+0100\n" -"PO-Revision-Date: 2024-03-07 03:01\n" +"POT-Creation-Date: 2024-04-01 14:32+0000\n" +"PO-Revision-Date: 2024-04-01 14:46\n" "Last-Translator: \n" "Language-Team: French\n" "Language: fr_FR\n" diff --git a/bpm/bonita-web-server/src/main/resources/i18n/portal_ja.po b/bpm/bonita-web-server/src/main/resources/i18n/portal_ja.po index e040b5f7f2..e02abdd66d 100644 --- a/bpm/bonita-web-server/src/main/resources/i18n/portal_ja.po +++ b/bpm/bonita-web-server/src/main/resources/i18n/portal_ja.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bonita\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-02-04 06:21+0100\n" -"PO-Revision-Date: 2024-02-05 03:01\n" +"POT-Creation-Date: 2024-04-01 14:32+0000\n" +"PO-Revision-Date: 2024-04-01 14:46\n" "Last-Translator: \n" "Language-Team: Japanese\n" "Language: ja_JP\n" diff --git a/bpm/bonita-web-server/src/main/resources/i18n/portal_pt_BR.po b/bpm/bonita-web-server/src/main/resources/i18n/portal_pt_BR.po index 4a3a2325fe..19151fb477 100644 --- a/bpm/bonita-web-server/src/main/resources/i18n/portal_pt_BR.po +++ b/bpm/bonita-web-server/src/main/resources/i18n/portal_pt_BR.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bonita\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-02-04 06:21+0100\n" -"PO-Revision-Date: 2024-02-05 03:01\n" +"POT-Creation-Date: 2024-04-01 14:32+0000\n" +"PO-Revision-Date: 2024-04-01 14:46\n" "Last-Translator: \n" "Language-Team: Portuguese, Brazilian\n" "Language: pt_BR\n" From dde82cab8a949e099c12282daec4a7c3256576d9 Mon Sep 17 00:00:00 2001 From: Emmanuel Duchastenier Date: Tue, 2 Apr 2024 09:58:16 +0200 Subject: [PATCH 2/5] chore(imports): fix import format violation --- .../main/java/org/bonitasoft/engine/api/impl/ProcessAPIImpl.java | 1 - 1 file changed, 1 deletion(-) diff --git a/bpm/bonita-core/bonita-process-engine/src/main/java/org/bonitasoft/engine/api/impl/ProcessAPIImpl.java b/bpm/bonita-core/bonita-process-engine/src/main/java/org/bonitasoft/engine/api/impl/ProcessAPIImpl.java index 81c7aa42c9..a6224a94db 100644 --- a/bpm/bonita-core/bonita-process-engine/src/main/java/org/bonitasoft/engine/api/impl/ProcessAPIImpl.java +++ b/bpm/bonita-core/bonita-process-engine/src/main/java/org/bonitasoft/engine/api/impl/ProcessAPIImpl.java @@ -189,7 +189,6 @@ import org.bonitasoft.engine.persistence.OrderAndField; import org.bonitasoft.engine.persistence.OrderByOption; import org.bonitasoft.engine.persistence.OrderByType; -import org.bonitasoft.engine.persistence.PersistentObject; import org.bonitasoft.engine.persistence.QueryOptions; import org.bonitasoft.engine.persistence.ReadPersistenceService; import org.bonitasoft.engine.persistence.SBonitaReadException; From db43484994526df8e59fd3d890a34afd2ada0f32 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 2 Apr 2024 10:32:19 +0200 Subject: [PATCH 3/5] chore(l10n) update translations (#2929) Co-authored-by: bonita-ci --- .../src/main/resources/i18n/portal-js_es.po | 8 ++++---- .../src/main/resources/i18n/portal-js_pt_BR.po | 4 ++-- .../src/main/resources/i18n/portal_es.po | 2 +- .../src/main/resources/i18n/portal_pt_BR.po | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/bpm/bonita-web-server/src/main/resources/i18n/portal-js_es.po b/bpm/bonita-web-server/src/main/resources/i18n/portal-js_es.po index 240f9770f6..3f7835a51b 100644 --- a/bpm/bonita-web-server/src/main/resources/i18n/portal-js_es.po +++ b/bpm/bonita-web-server/src/main/resources/i18n/portal-js_es.po @@ -11,7 +11,7 @@ msgstr "" "X-Crowdin-File-ID: 61810\n" "Language-Team: Spanish\n" "Language: es_ES\n" -"PO-Revision-Date: 2024-04-01 14:46\n" +"PO-Revision-Date: 2024-04-02 08:23\n" msgid "1 case has been deleted" msgstr "Se ha eliminado 1 caso" @@ -224,13 +224,13 @@ msgid "Click here to choose your .zip file" msgstr "Haga clic aquí para seleccionar su archivo .zip" msgid "Click on Cancel to remain on this page and try to execute the operation again once you logged back in (e.g. in another tab)." -msgstr "Haz click en Cancelar para permanecer en esta página e intentar de nuevo la operación cuando su sesión sera de nuevo iniciada (p.ej. en otra pestaña).\n" +msgstr "Haz click en Cancelar para permanecer en esta página e intentar de nuevo la operación cuando su sesión sera de nuevo iniciada (p.ej. en otra pestaña)." msgid "Click on Cancel to remain on this page and wait for the maintenance to end." -msgstr "Haz click en Cancelar para permanecer en esta página y esperar a que finalice el mantenimiento.\n" +msgstr "Haz click en Cancelar para permanecer en esta página y esperar a que finalice el mantenimiento." msgid "Click on OK to be redirected and log back in." -msgstr "Haz click en Aceptar para volver a iniciar sesión.\n" +msgstr "Haz click en Aceptar para volver a iniciar sesión." msgid "Click on OK to be redirected to the maintenance page." msgstr "Haz click en Aceptar para ser redirigido." diff --git a/bpm/bonita-web-server/src/main/resources/i18n/portal-js_pt_BR.po b/bpm/bonita-web-server/src/main/resources/i18n/portal-js_pt_BR.po index f08e754ea9..cae716511e 100644 --- a/bpm/bonita-web-server/src/main/resources/i18n/portal-js_pt_BR.po +++ b/bpm/bonita-web-server/src/main/resources/i18n/portal-js_pt_BR.po @@ -11,7 +11,7 @@ msgstr "" "X-Crowdin-File-ID: 61810\n" "Language-Team: Portuguese, Brazilian\n" "Language: pt_BR\n" -"PO-Revision-Date: 2024-04-01 14:46\n" +"PO-Revision-Date: 2024-04-02 08:23\n" msgid "1 case has been deleted" msgstr "1 caso foi excluído" @@ -224,7 +224,7 @@ msgid "Click here to choose your .zip file" msgstr "Clique aqui para escolher o arquivo .zip" msgid "Click on Cancel to remain on this page and try to execute the operation again once you logged back in (e.g. in another tab)." -msgstr "Clique em Cancelar para permanecer nesta página e tente executar a operação novamente depois de fazer login novamente (por exemplo, em outra guia).\n" +msgstr "Clique em Cancelar para permanecer nesta página e tente executar a operação novamente depois de fazer login novamente (por exemplo, em outra guia)." msgid "Click on Cancel to remain on this page and wait for the maintenance to end." msgstr "Clique em Cancelar para permanecer nesta página e aguardar o término da manutenção." diff --git a/bpm/bonita-web-server/src/main/resources/i18n/portal_es.po b/bpm/bonita-web-server/src/main/resources/i18n/portal_es.po index f730bee0ca..47a4be838a 100644 --- a/bpm/bonita-web-server/src/main/resources/i18n/portal_es.po +++ b/bpm/bonita-web-server/src/main/resources/i18n/portal_es.po @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: bonita\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-04-01 14:32+0000\n" -"PO-Revision-Date: 2024-04-01 14:46\n" +"PO-Revision-Date: 2024-04-02 08:23\n" "Last-Translator: \n" "Language-Team: Spanish\n" "Language: es_ES\n" diff --git a/bpm/bonita-web-server/src/main/resources/i18n/portal_pt_BR.po b/bpm/bonita-web-server/src/main/resources/i18n/portal_pt_BR.po index 19151fb477..860f69e8e8 100644 --- a/bpm/bonita-web-server/src/main/resources/i18n/portal_pt_BR.po +++ b/bpm/bonita-web-server/src/main/resources/i18n/portal_pt_BR.po @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: bonita\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-04-01 14:32+0000\n" -"PO-Revision-Date: 2024-04-01 14:46\n" +"PO-Revision-Date: 2024-04-02 08:23\n" "Last-Translator: \n" "Language-Team: Portuguese, Brazilian\n" "Language: pt_BR\n" From 62f9f24ffe28f38e37ab65c72bad7e29c2cbafc0 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 2 Apr 2024 10:33:30 +0200 Subject: [PATCH 4/5] chore(l10n) update translations (#2930) Co-authored-by: bonita-ci --- .../src/main/resources/i18n/portal-js_es.po | 8 ++++---- .../src/main/resources/i18n/portal-js_pt_BR.po | 4 ++-- .../src/main/resources/i18n/portal_es.po | 2 +- .../src/main/resources/i18n/portal_pt_BR.po | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/bpm/bonita-web-server/src/main/resources/i18n/portal-js_es.po b/bpm/bonita-web-server/src/main/resources/i18n/portal-js_es.po index 2e30a132c6..c2ed990482 100644 --- a/bpm/bonita-web-server/src/main/resources/i18n/portal-js_es.po +++ b/bpm/bonita-web-server/src/main/resources/i18n/portal-js_es.po @@ -11,7 +11,7 @@ msgstr "" "X-Crowdin-File-ID: 72698\n" "Language-Team: Spanish\n" "Language: es_ES\n" -"PO-Revision-Date: 2024-04-01 14:46\n" +"PO-Revision-Date: 2024-04-02 08:23\n" msgid "1 case has been deleted" msgstr "Se ha eliminado 1 caso" @@ -224,13 +224,13 @@ msgid "Click here to choose your .zip file" msgstr "Haga clic aquí para seleccionar su archivo .zip" msgid "Click on Cancel to remain on this page and try to execute the operation again once you logged back in (e.g. in another tab)." -msgstr "Haz click en Cancelar para permanecer en esta página e intentar de nuevo la operación cuando su sesión sera de nuevo iniciada (p.ej. en otra pestaña).\n" +msgstr "Haz click en Cancelar para permanecer en esta página e intentar de nuevo la operación cuando su sesión sera de nuevo iniciada (p.ej. en otra pestaña)." msgid "Click on Cancel to remain on this page and wait for the maintenance to end." -msgstr "Haz click en Cancelar para permanecer en esta página y esperar a que finalice el mantenimiento.\n" +msgstr "Haz click en Cancelar para permanecer en esta página y esperar a que finalice el mantenimiento." msgid "Click on OK to be redirected and log back in." -msgstr "Haz click en Aceptar para volver a iniciar sesión.\n" +msgstr "Haz click en Aceptar para volver a iniciar sesión." msgid "Click on OK to be redirected to the maintenance page." msgstr "Haz click en Aceptar para ser redirigido." diff --git a/bpm/bonita-web-server/src/main/resources/i18n/portal-js_pt_BR.po b/bpm/bonita-web-server/src/main/resources/i18n/portal-js_pt_BR.po index 60f403179d..0050c112bb 100644 --- a/bpm/bonita-web-server/src/main/resources/i18n/portal-js_pt_BR.po +++ b/bpm/bonita-web-server/src/main/resources/i18n/portal-js_pt_BR.po @@ -11,7 +11,7 @@ msgstr "" "X-Crowdin-File-ID: 72698\n" "Language-Team: Portuguese, Brazilian\n" "Language: pt_BR\n" -"PO-Revision-Date: 2024-04-01 14:46\n" +"PO-Revision-Date: 2024-04-02 08:23\n" msgid "1 case has been deleted" msgstr "1 caso foi excluído" @@ -224,7 +224,7 @@ msgid "Click here to choose your .zip file" msgstr "Clique aqui para escolher o arquivo .zip" msgid "Click on Cancel to remain on this page and try to execute the operation again once you logged back in (e.g. in another tab)." -msgstr "Clique em Cancelar para permanecer nesta página e tente executar a operação novamente depois de fazer login novamente (por exemplo, em outra guia).\n" +msgstr "Clique em Cancelar para permanecer nesta página e tente executar a operação novamente depois de fazer login novamente (por exemplo, em outra guia)." msgid "Click on Cancel to remain on this page and wait for the maintenance to end." msgstr "Clique em Cancelar para permanecer nesta página e aguardar o término da manutenção." diff --git a/bpm/bonita-web-server/src/main/resources/i18n/portal_es.po b/bpm/bonita-web-server/src/main/resources/i18n/portal_es.po index 2f6714ab72..4b72e13c58 100644 --- a/bpm/bonita-web-server/src/main/resources/i18n/portal_es.po +++ b/bpm/bonita-web-server/src/main/resources/i18n/portal_es.po @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: bonita\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-04-01 14:35+0000\n" -"PO-Revision-Date: 2024-04-01 14:46\n" +"PO-Revision-Date: 2024-04-02 08:23\n" "Last-Translator: \n" "Language-Team: Spanish\n" "Language: es_ES\n" diff --git a/bpm/bonita-web-server/src/main/resources/i18n/portal_pt_BR.po b/bpm/bonita-web-server/src/main/resources/i18n/portal_pt_BR.po index 2d82c7aaef..01c8ab5319 100644 --- a/bpm/bonita-web-server/src/main/resources/i18n/portal_pt_BR.po +++ b/bpm/bonita-web-server/src/main/resources/i18n/portal_pt_BR.po @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: bonita\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-04-01 14:35+0000\n" -"PO-Revision-Date: 2024-04-01 14:46\n" +"PO-Revision-Date: 2024-04-02 08:23\n" "Last-Translator: \n" "Language-Team: Portuguese, Brazilian\n" "Language: pt_BR\n" From 26be08244e3b96904695c5ec69928b5e47dbf0b9 Mon Sep 17 00:00:00 2001 From: Romain Bioteau Date: Tue, 2 Apr 2024 10:42:15 +0200 Subject: [PATCH 5/5] chore(l10n): fix conflicts --- bpm/bonita-web-server/src/main/resources/i18n/portal_es.po | 4 ---- bpm/bonita-web-server/src/main/resources/i18n/portal_fr.po | 4 ---- bpm/bonita-web-server/src/main/resources/i18n/portal_ja.po | 4 ---- bpm/bonita-web-server/src/main/resources/i18n/portal_pt_BR.po | 4 ---- 4 files changed, 16 deletions(-) diff --git a/bpm/bonita-web-server/src/main/resources/i18n/portal_es.po b/bpm/bonita-web-server/src/main/resources/i18n/portal_es.po index 2344492815..4b72e13c58 100644 --- a/bpm/bonita-web-server/src/main/resources/i18n/portal_es.po +++ b/bpm/bonita-web-server/src/main/resources/i18n/portal_es.po @@ -2,11 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: bonita\n" "Report-Msgid-Bugs-To: \n" -<<<<<<< HEAD "POT-Creation-Date: 2024-04-01 14:35+0000\n" -======= -"POT-Creation-Date: 2024-04-01 14:32+0000\n" ->>>>>>> origin/master "PO-Revision-Date: 2024-04-02 08:23\n" "Last-Translator: \n" "Language-Team: Spanish\n" diff --git a/bpm/bonita-web-server/src/main/resources/i18n/portal_fr.po b/bpm/bonita-web-server/src/main/resources/i18n/portal_fr.po index 7fc347f44f..786ebe07ae 100644 --- a/bpm/bonita-web-server/src/main/resources/i18n/portal_fr.po +++ b/bpm/bonita-web-server/src/main/resources/i18n/portal_fr.po @@ -2,11 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: bonita\n" "Report-Msgid-Bugs-To: \n" -<<<<<<< HEAD "POT-Creation-Date: 2024-04-01 14:35+0000\n" -======= -"POT-Creation-Date: 2024-04-01 14:32+0000\n" ->>>>>>> origin/master "PO-Revision-Date: 2024-04-01 14:46\n" "Last-Translator: \n" "Language-Team: French\n" diff --git a/bpm/bonita-web-server/src/main/resources/i18n/portal_ja.po b/bpm/bonita-web-server/src/main/resources/i18n/portal_ja.po index c830585ec9..8a582d7243 100644 --- a/bpm/bonita-web-server/src/main/resources/i18n/portal_ja.po +++ b/bpm/bonita-web-server/src/main/resources/i18n/portal_ja.po @@ -2,11 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: bonita\n" "Report-Msgid-Bugs-To: \n" -<<<<<<< HEAD "POT-Creation-Date: 2024-04-01 14:35+0000\n" -======= -"POT-Creation-Date: 2024-04-01 14:32+0000\n" ->>>>>>> origin/master "PO-Revision-Date: 2024-04-01 14:46\n" "Last-Translator: \n" "Language-Team: Japanese\n" diff --git a/bpm/bonita-web-server/src/main/resources/i18n/portal_pt_BR.po b/bpm/bonita-web-server/src/main/resources/i18n/portal_pt_BR.po index e5f6619264..01c8ab5319 100644 --- a/bpm/bonita-web-server/src/main/resources/i18n/portal_pt_BR.po +++ b/bpm/bonita-web-server/src/main/resources/i18n/portal_pt_BR.po @@ -2,11 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: bonita\n" "Report-Msgid-Bugs-To: \n" -<<<<<<< HEAD "POT-Creation-Date: 2024-04-01 14:35+0000\n" -======= -"POT-Creation-Date: 2024-04-01 14:32+0000\n" ->>>>>>> origin/master "PO-Revision-Date: 2024-04-02 08:23\n" "Last-Translator: \n" "Language-Team: Portuguese, Brazilian\n"