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

Merge with develop: solving conflicts

Browse Source
This commit is contained in:
Paula Quispe
2019-05-29 13:12:45 -04:00
parent f53a3e3e0f d93c713297
commit 5dd5a25a74
93 changed files with 6342 additions and 6993 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ProcessMaker (Branch 3.3.1)\n"
"POT-Creation-Date: \n"
"PO-Revision-Date: 2018-11-23 20:16:26\n"
"PO-Revision-Date: 2019-05-20 19:36:15\n"
"Last-Translator: \n"
"Language-Team: Colosa Developers Team <developers@colosa.com>\n"
"MIME-Version: 1.0\n"
@@ -23039,6 +23039,18 @@ msgstr "Rules and user groups"
msgid "It sends a request to Sales Department, do you want to continue?"
msgstr "It sends a request to Sales Department, do you want to continue?"
# TRANSLATION
# LABEL/ID_SAML_ENABLE
#: LABEL/ID_SAML_ENABLE
msgid "SAML Authentication Enable"
msgstr "SAML Authentication Enable"
# TRANSLATION
# LABEL/ID_SAML_PROVIDER
#: LABEL/ID_SAML_PROVIDER
msgid "SAML Authentication Provider"
msgstr "SAML Authentication Provider"
# TRANSLATION
# LABEL/ID_SAMPLES
#: LABEL/ID_SAMPLES
@@ -23261,6 +23273,36 @@ msgstr "Username"
msgid "Search XML metadata"
msgstr "Search XML metadata"
# TRANSLATION
# LABEL/ID_SEARCHING
#: LABEL/ID_SEARCHING
msgid "Searching..."
msgstr "Searching..."
# TRANSLATION
# LABEL/ID_SEARCHING_CANCEL_MESSAGE
#: LABEL/ID_SEARCHING_CANCEL_MESSAGE
msgid "We are still gathering your search results. This may take a while based on your search criteria. You may cancel this search at any time"
msgstr "We are still gathering your search results. This may take a while based on your search criteria. You may cancel this search at any time"
# TRANSLATION
# LABEL/ID_SEARCHING_TIME_OUT
#: LABEL/ID_SEARCHING_TIME_OUT
msgid "Your search timed out"
msgstr "Your search timed out"
# TRANSLATION
# LABEL/ID_SEARCHING_UNEXPECTED_ERROR
#: LABEL/ID_SEARCHING_UNEXPECTED_ERROR
msgid "An unexpected error occurred while searching for your results. Error Code {0} and Please contact your administrator."
msgstr "An unexpected error occurred while searching for your results. Error Code {0} and Please contact your administrator."
# TRANSLATION
# LABEL/ID_SEARCHING_UNEXPECTED_ERROR_DEFAULT
#: LABEL/ID_SEARCHING_UNEXPECTED_ERROR_DEFAULT
msgid "An unexpected error occurred while searching for your results. Please contact your administrator."
msgstr "An unexpected error occurred while searching for your results. Please contact your administrator."
# TRANSLATION
# LABEL/ID_SECOND
#: LABEL/ID_SECOND