diff --git a/src/main/resources/messages_en_GB.properties b/src/main/resources/messages_en_GB.properties index b560e8de..b87af8f3 100644 --- a/src/main/resources/messages_en_GB.properties +++ b/src/main/resources/messages_en_GB.properties @@ -61,6 +61,7 @@ settings.zipThreshold=Zip files when the number of downloaded files exceeds settings.signOut=Sign Out settings.accountSettings=Account Settings +account.title=Account Settings account.accountSettings=Account Settings account.adminSettings=Admin Settings - View and Add Users account.userControlSettings=User Control Settings @@ -85,10 +86,10 @@ adminUserSettings.title=User Control Settings adminUserSettings.header=Admin User Control Settings adminUserSettings.admin=Admin adminUserSettings.user=User -Add New User -Roles -Role -Actions +adminUserSettings.addUser=Add New User +adminUserSettings.roles=Roles +adminUserSettings.role=Role +adminUserSettings.actions=Actions adminUserSettings.apiUser=Limited API User adminUserSettings.webOnlyUser=Web Only User adminUserSettings.submit=Save User @@ -558,6 +559,8 @@ addImage.submit=Add image #merge merge.title=Merge merge.header=Merge multiple PDFs (2+) +merge.sortByName=Sort by name +merge.sortByDate=Sort by date merge.submit=Merge @@ -658,6 +661,8 @@ watermark.selectText.4=Rotation (0-360): watermark.selectText.5=widthSpacer (Space between each watermark horizontally): watermark.selectText.6=heightSpacer (Space between each watermark vertically): watermark.selectText.7=Opacity (0% - 100%): +watermark.selectText.8=Watermark Type: +watermark.selectText.9=Watermark Image: watermark.submit=Add Watermark diff --git a/src/main/resources/templates/account.html b/src/main/resources/templates/account.html index 714f8029..9d7c0ef6 100644 --- a/src/main/resources/templates/account.html +++ b/src/main/resources/templates/account.html @@ -1,7 +1,7 @@ - + diff --git a/src/main/resources/templates/addUsers.html b/src/main/resources/templates/addUsers.html index 88b66112..fe37e71c 100644 --- a/src/main/resources/templates/addUsers.html +++ b/src/main/resources/templates/addUsers.html @@ -22,9 +22,9 @@ - - - + + + @@ -39,7 +39,7 @@
UsernameRolesActionsUsernameRolesActions
-

Add New User

+

Add New User

@@ -50,7 +50,7 @@
- +