HOR-3365 conflict resolution

This commit is contained in:
u1
2017-08-07 23:52:32 -04:00
parent f70b763b30
commit 2240773cba
3 changed files with 14 additions and 4 deletions

View File

@@ -15440,8 +15440,13 @@ msgid "Remove selected"
msgstr "Remove selected"
# TRANSLATION
# LABEL/ENTER_VALID_URL
#: LABEL/ENTER_VALID_URL
# LABEL/ID_SELECT_DYNAFORM_USE_IN_CASE
#: LABEL/ID_SELECT_DYNAFORM_USE_IN_CASE
msgid "The \"dyn_uid\" parameter is required to configure a Web Entry of type \"Single Dynaform\""
msgstr "The \"dyn_uid\" parameter is required to configure a Web Entry of type \"Single Dynaform\""
# LABEL/ID_ENTER_VALID_URL
#: LABEL/ID_ENTER_VALID_URL
msgid "Enter a valid URL to redirect the browser after the web entry is completed"
msgstr "Enter a valid URL to redirect the browser after the web entry is completed"