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

Solving conflicts with the last changes in develop branch

Browse Source
This commit is contained in:
Julio Cesar Laura Avendaño
2020-02-27 13:23:51 -04:00
parent 8167c5a7a7 1892106bf0
commit 4255031a49
51 changed files with 1795 additions and 54937 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
workflow/engine/content/languages/translation.en
View File

File diff suppressed because one or more lines are too long

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

@@ -15119,6 +15119,12 @@ msgstr "Error"
msgid "Monthly"
msgstr "Monthly"
# TRANSLATION
# LABEL/ID_MAFE_90589c47f06eb971d548591f23c285af
#: LABEL/ID_MAFE_90589c47f06eb971d548591f23c285af
msgid "Custom"
msgstr "Custom"
# TRANSLATION
# LABEL/ID_MAFE_9060587edeb01a63e3d3edc959678d1e
#: LABEL/ID_MAFE_9060587edeb01a63e3d3edc959678d1e
@@ -18059,12 +18065,6 @@ msgstr "There are problems updating the Timer Event, please try again."
msgid "Group or User"
msgstr "Group or User"
# TRANSLATION
# LABEL/ID_MAFE_f4b5974fd11406f8410fa7e8502a26a3
#: LABEL/ID_MAFE_f4b5974fd11406f8410fa7e8502a26a3
msgid "Granular"
msgstr "Granular"
# TRANSLATION
# LABEL/ID_MAFE_f4ee0932c0b3cdb0af6d4407fc915b28
#: LABEL/ID_MAFE_f4ee0932c0b3cdb0af6d4407fc915b28