fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PMCORE-3824: solve conflicts

Browse Source
This commit is contained in:
Paula.Quispe
2022-05-03 11:21:32 -04:00
parent 1273bf388b 9513c5a13b
commit f1f705696f
9 changed files with 108 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
workflow/engine/content/translations/english/processmaker.en.po
View File

@@ -26561,6 +26561,12 @@ msgstr "The mime type does not correspond to the permitted extension, please ver
msgid "The change might cause data loss in the PM table. Do you want to continue?"
msgstr "The change might cause data loss in the PM table. Do you want to continue?"
# TRANSLATION
# LABEL/ID_THE_PERMISSION_CAN_NOT_BE_UNASSIGNED_FROM_THIS_ROLE
#: LABEL/ID_THE_PERMISSION_CAN_NOT_BE_UNASSIGNED_FROM_THIS_ROLE
msgid "The permission can not be unassigned from this role."
msgstr "The permission can not be unassigned from this role."
# TRANSLATION
# LABEL/ID_THE_PHP_FILES_EXECUTION_WAS_DISABLED
#: LABEL/ID_THE_PHP_FILES_EXECUTION_WAS_DISABLED