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

Merged in bugfix/PMCORE-525 (pull request #7265)

Browse Source 
PMCORE-525 Two different labels for the same action (Promotion Manager export)

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
This commit is contained in:
Roly
2020-02-18 20:19:40 +00:00
committed by Julio Cesar Laura Avendaño
parent ba987f4526 14d34b5a57
commit 37051c6a34
3 changed files with 9 additions and 9 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

2
workflow/engine/data/mysql/insert.sql
View File

@@ -59371,6 +59371,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
( 'LABEL','ID_MAFE_8ff922bbcd8ad41cdfc48d3c5163b2ab','en','Calendar', NOW()) ,
( 'LABEL','ID_MAFE_902b0d55fddef6f8d651fe1035b7d4bd','en','Error', NOW()) ,
( 'LABEL','ID_MAFE_9030e39f00132d583da4122532e509e9','en','Monthly', NOW()) ,
( 'LABEL','ID_MAFE_90589c47f06eb971d548591f23c285af','en','Custom', NOW()) ,
( 'LABEL','ID_MAFE_9060587edeb01a63e3d3edc959678d1e','en','Before', NOW()) ,
( 'LABEL','ID_MAFE_9119da1dd85e63663fb91ce63de56b09','en','Start Event: The process always begins with a start event.', NOW()) ,
( 'LABEL','ID_MAFE_912ce77b9eb2aa7567125d574283747c','en','Assignment Rules saved successfully', NOW()) ,
@@ -59871,7 +59872,6 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
( 'LABEL','ID_MAFE_f4636507ca93332f92f92fb219a43b02','en','Database Connection', NOW()) ,
( 'LABEL','ID_MAFE_f49b52022300199128ed01380edda751','en','There are problems updating the Timer Event, please try again.', NOW()) ,
( 'LABEL','ID_MAFE_f4ae7ce97eda9edfe1541b3fdea115b6','en','Group or User', NOW()) ,
( 'LABEL','ID_MAFE_f4b5974fd11406f8410fa7e8502a26a3','en','Granular', NOW()) ,
( 'LABEL','ID_MAFE_f4ee0932c0b3cdb0af6d4407fc915b28','en','The variable Name already exists.', NOW()) ,
( 'LABEL','ID_MAFE_f4f33214dfca4a6aa8a15fff06c43ff5','en','One date/time', NOW()) ,
( 'LABEL','ID_MAFE_f4f70727dc34561dfde1a3c529b6205c','en','Settings', NOW()) ,