Skip to content

FOUR-9386: (QA-Observation) Pending Translation for User Activity Logging #5012

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ryancooley merged 3 commits into from
Jul 19, 2023
Merged

FOUR-9386: (QA-Observation) Pending Translation for User Activity Logging #5012

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c5ab4a1
feature/FOUR-9386
luNunezProcessmaker Jul 18, 2023
d89ae62
Merge branch 'develop' into feature/FOUR-9386
ryancooley Jul 19, 2023
e218dbc
Merge branch 'develop' into feature/FOUR-9386
ryancooley Jul 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions resources/lang/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,6 +232,7 @@
"Data Name": "Data Name",
"Data Preview": "Data Preview",
"Data Source": "Data Source",
"Data_source_category": "Data Source Category",
"Data Type": "Data Type",
"Data": "Data",
"Database connection failed. Check your database configuration and try again.": "Database connection failed. Check your database configuration and try again.",
Expand Down Expand Up @@ -512,6 +513,7 @@
"M": "M",
"Make sure you copy your access token now. You won't be able to see it again.": "Make sure you copy your access token now. You won't be able to see it again.",
"Make this user a Super Admin": "Make this user a Super Admin",
"Manager_id": "Manager ID",
"Manual Task": "Manual Task",
"Manual translation": "Manual translation",
"Manually Complete Request": "Manually Complete Request",
Expand Down Expand Up @@ -632,6 +634,7 @@
"Please wait": "Please wait",
"Please wait while the files are generated. The screen will be updated when finished.": "Please wait while the files are generated. The screen will be updated when finished.",
"Please wait while your content is loaded": "Please wait while your content is loaded",
"Pm_block_category": "PM Block Category",
"Pool": "Pool",
"Postal Code": "Postal Code",
"Powered by ProcessMaker AI": "Powered by ProcessMaker AI",
Expand Down Expand Up @@ -748,6 +751,7 @@
"Screens": "Screens",
"Screen Categories": "Screen categories",
"Screen_category_id": "Screen Category ID",
"Screen_category": "Screen Category",
"ScreenCreated": "Screen Created",
"ScreenDeleted": "Screen Deleted",
"ScreenUpdated": "Screen Updated",
Expand Down Expand Up @@ -975,6 +979,7 @@
"Toggle Style": "Toggle Style",
"TokenCreated": "Token Created",
"TokenDeleted": "Token Deleted",
"Token_id": "Token ID",
"Too many login attempts. Please try again in :seconds seconds.": "Too many login attempts. Please try again in :seconds seconds.",
"Top": "Top",
"Translation in progress": "Translation in progress",
Expand Down Expand Up @@ -1019,6 +1024,7 @@
"UserGroupsUpdated": "User Groups Updated",
"UserUpdated": "User Updated",
"Username": "Username",
"User_name": "Username",
"Users that should be notified about task events": "Users that should be notified about task events",
"Users": "Users",
"Valid JSON Data Object": "Valid JSON Data Object",
Expand Down