diff --git a/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/General/general_en.lex b/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/General/general_en.lex
index 32913a1..8d4da7a 100644
--- a/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/General/general_en.lex
+++ b/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/General/general_en.lex
@@ -3,13 +3,11 @@
 'exit' => 'Exit',
 'cancel' => 'Cancel',
 'hello' => 'hello',
-'All rights reserved' => 'All Rights Reserved',
 'Collaboration' => 'Collaboration',
 'Administration' => 'Administration',
 'Security' => 'Security',
 'Configuration' => 'Configuration',
 'Miscellaneous' => 'Miscellaneous',
-'Your Settings' => 'Your Settings',
 'SAVE' => 'Save',
 'CANCEL' => 'Cancel',
 'ENABLED' => 'Enabled',
@@ -132,40 +130,22 @@
 'FM_MAC_ADDRESS1' => 'You must provide a MAC address.',
 'FM_MAC_ADDRESS2' => 'The MAC address you provided was not valid.',
 'FM_ERR_UNEXPECTED_DESC' => 'Error: unexpected or missing characters in description',
-'
-swt_THEME ' => 'Theme',
-'
-swt_LOGIN_AGAIN ' => 'You may need to login again to see the choosed theme',
-'
-acs_NO ' => 'Not Authorized',
-'
-acs_LOGIN ' => 'Login required',
-'
-acs_ADMIN ' => 'Admin rights required',
-'User password' => 'User password',
-'
-Logout ' => 'Logout',
-'
-Home ' => 'Home',
-'
-CSRF_VALIDATION_FAILURE ' => 'Error: CSRF token is invalid or outdated.',
-'
-Empty ' => 'Empty',
-'
-Active ' => 'Active',
-'
-MINUTE ' => 'Minute',
-'
-MINUTES ' => 'Minutes',
-'
-HOUR ' => 'Hour',
-'
-HOURS ' => 'Hours',
-'
-SMALL ' => 'Small',
-'
-MEDIUM ' => 'Medium',
-'
-LARGE ' => 'Large',
-'
-FIELD_INVALID_CHARS ' => 'A field you entered contains invalid characters.',
+'swt_THEME' => 'Theme',
+'swt_LOGIN_AGAIN' => 'You may need to login again to see the choosed theme',
+'acs_NO' => 'Not Authorized',
+'acs_LOGIN' => 'Login required',
+'acs_ADMIN' => 'Admin rights required',
+',
+Logout' => 'Logout',
+'Home' => 'Home',
+'CSRF_VALIDATION_FAILURE' => 'Error: CSRF token is invalid or outdated.',
+'Empty' => 'Empty',
+'Active' => 'Active',
+'MINUTE' => 'Minute',
+'MINUTES' => 'Minutes',
+'HOUR' => 'Hour',
+'HOURS' => 'Hours',
+'SMALL' => 'Small',
+'MEDIUM' => 'Medium',
+'LARGE' => 'Large',
+'FIELD_INVALID_CHARS' => 'A field you entered contains invalid characters.',
diff --git a/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/General/pofiles/general_bg.po b/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/General/pofiles/general_bg.po
index c28744e..437e5f9 100644
--- a/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/General/pofiles/general_bg.po
+++ b/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/General/pofiles/general_bg.po
@@ -5,99 +5,95 @@ msgstr ""
 "Language: None\n"
 "Content-Type: text/plain; charset=utf-8\n"
 
-msgctxt "OPERATION_Collaboration"
+msgctxt "Collaboration"
 msgid "Collaboration"
 msgstr "Групова работа"
 
-msgctxt "OPERATION_Administration"
+msgctxt "Administration"
 msgid "Administration"
 msgstr "Администриране"
 
-msgctxt "OPERATION_Security"
+msgctxt "Security"
 msgid "Security"
 msgstr "Сигурност"
 
-msgctxt "OPERATION_Configuration"
+msgctxt "Configuration"
 msgid "Configuration"
 msgstr "Конфигурация"
 
-msgctxt "OPERATION_Miscellaneous"
+msgctxt "Miscellaneous"
 msgid "Miscellaneous"
 msgstr "Разни"
 
-msgctxt "OPERATION_Your Settings"
-msgid "Your Settings"
-msgstr "Вашите настройки"
-
-msgctxt "OPERATION_SAVE"
+msgctxt "SAVE"
 msgid "Save"
 msgstr "Запис"
 
-msgctxt "OPERATION_CANCEL"
+msgctxt "CANCEL"
 msgid "Cancel"
 msgstr "Отказ"
 
-msgctxt "OPERATION_ENABLED"
+msgctxt "ENABLED"
 msgid "Enabled"
 msgstr "Разрешен"
 
-msgctxt "OPERATION_DISABLED"
+msgctxt "DISABLED"
 msgid "Disabled"
 msgstr "Забранено"
 
-msgctxt "OPERATION_NO"
+msgctxt "NO"
 msgid "No"
 msgstr "Не"
 
-msgctxt "OPERATION_YES"
+msgctxt "YES"
 msgid "Yes"
 msgstr "Да"
 
-msgctxt "OPERATION_ADD"
+msgctxt "ADD"
 msgid "Add"
 msgstr "Добави"
 
-msgctxt "OPERATION_CREATE"
+msgctxt "CREATE"
 msgid "Create"
 msgstr "Създай"
 
-msgctxt "OPERATION_MODIFY"
+msgctxt "MODIFY"
 msgid "Modify"
 msgstr "Промени"
 
-msgctxt "OPERATION_REMOVE"
+msgctxt "REMOVE"
 msgid "Remove"
 msgstr "Премахване"
 
-msgctxt "OPERATION_COMMENT"
+msgctxt "COMMENT"
 msgid "Comment"
 msgstr "Коментар"
 
-msgctxt "OPERATION_NEXT"
+msgctxt "NEXT"
 msgid "Next"
 msgstr "Следващ"
 
-msgctxt "OPERATION_SELF"
+msgctxt "SELF"
 msgid "Self"
 msgstr "Себе си"
 
-msgctxt "OPERATION_REMOTE"
+msgctxt "REMOTE"
 msgid "Remote"
 msgstr "Отдалечен"
 
-msgctxt "OPERATION_LOCAL"
+msgctxt "LOCAL"
 msgid "Local"
 msgstr "Локален"
 
-msgctxt "OPERATION_ACTION"
+msgctxt "ACTION"
 msgid "Action"
 msgstr "Действие"
 
-msgctxt "OPERATION_NETWORK"
+msgctxt "NETWORK"
 msgid "Network"
 msgstr "Мрежа"
 
-msgctxt "OPERATION_ROUTER"
+msgctxt "ROUTER"
 msgid "Router"
 msgstr "Маршрутизатор"
 
@@ -105,23 +101,23 @@ msgctxt "OPERATION_STATUS_REPORT"
 msgid "Operation status report"
 msgstr "Отчет за състоянието на операциите"
 
-msgctxt "OPERATION_ACCOUNT"
+msgctxt "ACCOUNT"
 msgid "Account"
 msgstr "Акаунт"
 
-msgctxt "OPERATION_GROUP"
+msgctxt "GROUP"
 msgid "Group"
 msgstr "Група"
 
-msgctxt "OPERATION_DESC_SECTIONBAR"
+msgctxt "DESC_SECTIONBAR"
 msgid "<hr class=\"sectionbar\"/>"
-msgstr " <hr class=\"sectionbar\"/> "
+msgstr "<hr class=\"sectionbar\"/>"
 
-msgctxt "OPERATION_NO_PIPES_ALLOWED"
+msgctxt "NO_PIPES_ALLOWED"
 msgid "Pipe symbols (|) are not permitted in this field"
 msgstr "Символите за предаване (|) не са позволени в това поле"
 
-msgctxt "OPERATION_ERROR_BELOW"
+msgctxt "ERROR_BELOW"
 msgid ""
 "ERROR: There was an error in the validation of this page. Please scroll down"
 " and find the specific problem."
@@ -129,27 +125,27 @@ msgstr ""
 "ГРЕШКА: Има грешка при проверката на тази страница. Моля, придвижете се "
 "надолу и намерете специфичния проблем."
 
-msgctxt "OPERATION_ACCESS"
+msgctxt "ACCESS"
 msgid "Access"
 msgstr "Достъп"
 
-msgctxt "OPERATION_ACCOUNT_LOCKED"
+msgctxt "ACCOUNT_LOCKED"
 msgid "Account is locked"
 msgstr "Акаунтът е заключен"
 
-msgctxt "OPERATION_GROUP_ADD"
+msgctxt "GROUP_ADD"
 msgid "Add group"
 msgstr "Добави група"
 
-msgctxt "OPERATION_NETWORKS_ALLOW_LOCAL"
+msgctxt "NETWORKS_ALLOW_LOCAL"
 msgid "Allow access only from local networks"
 msgstr "Разрешаване на достъп само от локални мрежи"
 
-msgctxt "OPERATION_NETWORKS_ALLOW_PUBLIC"
+msgctxt "NETWORKS_ALLOW_PUBLIC"
 msgid "Allow public access (entire Internet)"
 msgstr "Позволи публичен достъп (целия Интернет)"
 
-msgctxt "OPERATION_ERROR_PASSWORD_CHANGE"
+msgctxt "ERROR_PASSWORD_CHANGE"
 msgid ""
 "An error occurred while attempting to change your password. Please make sure"
 " that the old password entered is correct."
@@ -157,370 +153,370 @@ msgstr ""
 "Възникна грешка по време на опита за промяна на Вашата парола. Моля, уверете"
 " се, че старата парола, която сте въвели е правилна."
 
-msgctxt "OPERATION_BACK"
+msgctxt "BACK"
 msgid "Back"
 msgstr "Назад"
 
-msgctxt "OPERATION_BACKUP"
+msgctxt "BACKUP"
 msgid "Backup"
 msgstr "Резервно копие"
 
-msgctxt "OPERATION_DESCRIPTION_BRIEF"
+msgctxt "DESCRIPTION_BRIEF"
 msgid "Brief description"
 msgstr "Кратко описание"
 
-msgctxt "OPERATION_PASSWORD_CHANGE"
+msgctxt "PASSWORD_CHANGE"
 msgid "Change Password"
 msgstr "Смяна на парола"
 
-msgctxt "OPERATION_RESET_PASSWORD_TITLE"
+msgctxt "RESET_PASSWORD_TITLE"
 msgid "Reset user password"
 msgstr "Инициализиране на паролата на потребителя"
 
-msgctxt "OPERATION_ACCOUNT_PASSWORD_CHANGE"
+msgctxt "ACCOUNT_PASSWORD_CHANGE"
 msgid "Change account password"
 msgstr "Смяна на парола на потребител"
 
-msgctxt "OPERATION_CONTENT"
+msgctxt "CONTENT"
 msgid "Content"
 msgstr "Съдържание"
 
-msgctxt "OPERATION_CREATE_GROUP"
+msgctxt "CREATE_GROUP"
 msgid "Create user group"
 msgstr "Създаване на потребителска група"
 
-msgctxt "OPERATION_USER_LIST_CURRENT"
+msgctxt "USER_LIST_CURRENT"
 msgid "Current list of users"
 msgstr "Текущ списък с потребители"
 
-msgctxt "OPERATION_DESCRIPTION"
+msgctxt "DESCRIPTION"
 msgid "Description"
 msgstr "Описание"
 
-msgctxt "OPERATION_DESTINATION"
+msgctxt "DESTINATION"
 msgid "Destination"
 msgstr "Направление"
 
-msgctxt "OPERATION_DOMAIN_NAME"
+msgctxt "DOMAIN_NAME"
 msgid "Domain name"
 msgstr "Име на домейн"
 
-msgctxt "OPERATION_DOMAIN"
+msgctxt "DOMAIN"
 msgid "Domain"
 msgstr "Домейн"
 
-msgctxt "OPERATION_DOMAINS"
+msgctxt "DOMAINS"
 msgid "Domains"
 msgstr "Домейни"
 
-msgctxt "OPERATION_DOWNLOAD"
+msgctxt "DOWNLOAD"
 msgid "Download"
 msgstr "Сваляне"
 
-msgctxt "OPERATION_ERROR_UPDATING_CONFIGURATION"
+msgctxt "ERROR_UPDATING_CONFIGURATION"
 msgid "Error occurred while updating system configuration."
 msgstr ""
 "Възникна грешка по време на актуализирането на системната конфигурация."
 
-msgctxt "OPERATION_GROUP_MEMBERS"
+msgctxt "GROUP_MEMBERS"
 msgid "Group Members"
 msgstr "Членове на групата"
 
-msgctxt "OPERATION_GROUP_NAME"
+msgctxt "GROUP_NAME"
 msgid "Group Name"
 msgstr "Име на група"
 
-msgctxt "OPERATION_GROUPS"
+msgctxt "GROUPS"
 msgid "Groups"
 msgstr "Групи"
 
-msgctxt "OPERATION_IP_ADDRESS"
+msgctxt "IP_ADDRESS"
 msgid "IP Address"
 msgstr "IP адрес"
 
-msgctxt "OPERATION_IP_ADDRESS_OR_FQDN"
+msgctxt "IP_ADDRESS_OR_FQDN"
 msgid "IP Address or FQDN"
 msgstr "IP адрес или FQDN"
 
-msgctxt "OPERATION_USER_INVALID"
+msgctxt "USER_INVALID"
 msgid "Invalid user"
 msgstr "Невалиден потребител"
 
-msgctxt "OPERATION_LOCATION"
+msgctxt "LOCATION"
 msgid "Location"
 msgstr "Разположение"
 
-msgctxt "OPERATION_MB"
+msgctxt "MB"
 msgid "Mb"
 msgstr "Mb"
 
-msgctxt "OPERATION_MODIFY_USER_GROUP"
+msgctxt "MODIFY_USER_GROUP"
 msgid "Modify user group"
 msgstr "Промяна на потребителска група"
 
-msgctxt "OPERATION_NAME"
+msgctxt "NAME"
 msgid "Name"
 msgstr "Име"
 
-msgctxt "OPERATION_PASSWORD_VERIFY_NEW"
+msgctxt "PASSWORD_VERIFY_NEW"
 msgid "New password (verify):"
 msgstr "Нова парола (проверка):"
 
-msgctxt "OPERATION_PASSWORD_NEW"
+msgctxt "PASSWORD_NEW"
 msgid "New password:"
 msgstr "Нова парола:"
 
-msgctxt "OPERATION_OFF"
+msgctxt "OFF"
 msgid "Off"
 msgstr "Изключване"
 
-msgctxt "OPERATION_OK"
+msgctxt "OK"
 msgid "Ok"
 msgstr "Ок"
 
-msgctxt "OPERATION_PASSWORD_OLD"
+msgctxt "PASSWORD_OLD"
 msgid "Old password:"
 msgstr "Стара парола:"
 
-msgctxt "OPERATION_ON"
+msgctxt "ON"
 msgid "On"
 msgstr "Включване"
 
-msgctxt "OPERATION_PASSWORD"
+msgctxt "PASSWORD"
 msgid "Password"
 msgstr "Парола"
 
-msgctxt "OPERATION_PERFORM"
+msgctxt "PERFORM"
 msgid "Perform"
 msgstr "Изпълни"
 
-msgctxt "OPERATION_RECONFIGURE"
+msgctxt "RECONFIGURE"
 msgid "Reconfigure"
 msgstr "Преконфигурация"
 
-msgctxt "OPERATION_REMOVE_USER_GROUP"
+msgctxt "REMOVE_USER_GROUP"
 msgid "Remove user group"
 msgstr "Премахни потребителска група"
 
-msgctxt "OPERATION_PASSWORD_RESET"
+msgctxt "PASSWORD_RESET"
 msgid "Reset password"
 msgstr "Инициализиране на парола"
 
-msgctxt "OPERATION_RESTORE"
+msgctxt "RESTORE"
 msgid "Restore"
 msgstr "Възстанови"
 
-msgctxt "OPERATION_SHUTDOWN"
+msgctxt "SHUTDOWN"
 msgid "Shutdown"
 msgstr "Изключване"
 
-msgctxt "OPERATION_SUCCESS"
+msgctxt "SUCCESS"
 msgid "Success"
 msgstr "Успех"
 
-msgctxt "OPERATION_ACCOUNT_NAME_INVALID"
+msgctxt "ACCOUNT_NAME_INVALID"
 msgid "The account name entered is invalid."
 msgstr "Грешно написано име на акаунт."
 
-msgctxt "OPERATION_ACCOUNT_NAME_INVALID_CHARS"
+msgctxt "ACCOUNT_NAME_INVALID_CHARS"
 msgid "The account name you entered contained invalid characters."
 msgstr "Името на акаунта, който сте въвели съдържа грешни символи."
 
-msgctxt "OPERATION_PASSWORD_OLD_INVALID_CHARS"
+msgctxt "PASSWORD_OLD_INVALID_CHARS"
 msgid "The old password you entered contained invalid characters."
 msgstr "Старата парола, която сте въвели съдържа грешни символи."
 
-msgctxt "OPERATION_PASSWORD_INVALID_CHARS"
+msgctxt "PASSWORD_INVALID_CHARS"
 msgid "The password you entered contained invalid characters."
 msgstr "Паролата, която сте въвели съдържа грешни символи."
 
-msgctxt "OPERATION_PASSWORD_VERIFY_ERROR"
+msgctxt "PASSWORD_VERIFY_ERROR"
 msgid "The passwords you entered did not match."
 msgstr "Паролите, които сте въвели не съвпадат."
 
-msgctxt "OPERATION_ACCOUNT_USER_NONE"
+msgctxt "ACCOUNT_USER_NONE"
 msgid "There are no user accounts in the system."
 msgstr "Няма потребителски акаунти в системата."
 
-msgctxt "OPERATION_ACCOUNT_GROUP_NONE"
+msgctxt "ACCOUNT_GROUP_NONE"
 msgid "There are no user groups in the system."
 msgstr "Няма потребителски групи в системата."
 
-msgctxt "OPERATION_ERROR_INVALID_CHARS"
+msgctxt "ERROR_INVALID_CHARS"
 msgid "Unexpected characters in description."
 msgstr "Неочаквани символи в описанието."
 
-msgctxt "OPERATION_USER_NAME"
+msgctxt "USER_NAME"
 msgid "User Name"
 msgstr "Потребителско име"
 
-msgctxt "OPERATION_YOUR_ACCOUNT"
+msgctxt "YOUR_ACCOUNT"
 msgid "Your account:"
 msgstr "Вашия акаунт:"
 
-msgctxt "OPERATION_YOUR_ACCOUNT_INVALID"
+msgctxt "YOUR_ACCOUNT_INVALID"
 msgid "The account name entered is invalid."
 msgstr "Грешно написано име на акаунт."
 
-msgctxt "OPERATION_PASSWORD_CHANGE_SUCCESS"
+msgctxt "PASSWORD_CHANGE_SUCCESS"
 msgid "Your password has been successfully changed."
 msgstr "Вашата парола беше променена успешно."
 
-msgctxt "OPERATION_FM_NONBLANK"
+msgctxt "FM_NONBLANK"
 msgid "This field must not be left blank"
 msgstr "Това поле не трябва да бъде оставяно празно"
 
-msgctxt "OPERATION_FM_INTEGER"
+msgctxt "FM_INTEGER"
 msgid "This field must contain a positive integer"
 msgstr "Това поле трябва да съдържа положително цяло число"
 
-msgctxt "OPERATION_FM_NUMBER"
+msgctxt "FM_NUMBER"
 msgid "This field must contain a number"
 msgstr "Това поле трябва да съдържа число"
 
-msgctxt "OPERATION_FM_WORD"
+msgctxt "FM_WORD"
 msgid "This field must look like a single word."
 msgstr "Това поле трябва да изглежда като една дума."
 
-msgctxt "OPERATION_FM_DATE"
+msgctxt "FM_DATE"
 msgid "The data entered could not be parsed as a date"
 msgstr "Въведените данни не могат да бъдат възприети като дата"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_NUMBER1"
+msgctxt "FM_CREDIT_CARD_NUMBER1"
 msgid "You must enter a credit card number"
 msgstr "Трябва да въведете номер на кредитна карта"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_NUMBER2"
+msgctxt "FM_CREDIT_CARD_NUMBER2"
 msgid ""
 "Credit card numbers shouldn\\'t have anything but numbers, spaces or dashes"
 msgstr ""
 "Номерата на кредитните карти не трябва да съдържат нищо друго освен цифри, "
 "празни символи и тирета"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_NUMBER3"
+msgctxt "FM_CREDIT_CARD_NUMBER3"
 msgid "Must be at least 14 characters in length"
 msgstr "Трябва да бъде поне 14 сивола дълго"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_NUMBER4"
+msgctxt "FM_CREDIT_CARD_NUMBER4"
 msgid "Doesn\\'t appear to be a valid credit card number"
 msgstr "Не изглежда като валиден номер на кредитна карта"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_EXPIRY1"
+msgctxt "FM_CREDIT_CARD_EXPIRY1"
 msgid "No expiry date entered."
 msgstr "Не е въведена дата на изтичане."
 
-msgctxt "OPERATION_FM_CREDIT_CARD_EXPIRY2"
+msgctxt "FM_CREDIT_CARD_EXPIRY2"
 msgid "Expiry date must be in the format MM/YY or MM/YYYY"
 msgstr "Датата на изтичане трябва да бъде във формат MM/YY или MM/YYYY"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_EXPIRY3"
+msgctxt "FM_CREDIT_CARD_EXPIRY3"
 msgid "This expiry date appears to have already passed"
 msgstr "Посочената дата на изтичане изглежда вече е минала"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_EXPIRY4"
+msgctxt "FM_CREDIT_CARD_EXPIRY4"
 msgid "This expiry date appears to be too far in the future"
 msgstr "Датата на изтичане изглежда е твърде далеч в бъдещето"
 
-msgctxt "OPERATION_FM_ISO_COUNTRY_CODE1"
+msgctxt "FM_ISO_COUNTRY_CODE1"
 msgid "You must provide a country code"
 msgstr "Трябва да предоставите код на държавата"
 
-msgctxt "OPERATION_FM_ISO_COUNTRY_CODE2"
+msgctxt "FM_ISO_COUNTRY_CODE2"
 msgid "This field does not contain an ISO country code"
 msgstr "Това поле не съдържа код на държавата по ISO"
 
-msgctxt "OPERATION_FM_US_STATE"
+msgctxt "FM_US_STATE"
 msgid "This doesn\\'t appear to be a valid 2-letter US state abbreviation"
 msgstr "Това не изглежда като валиден 2-буквено съкращение на щат от САЩ"
 
-msgctxt "OPERATION_FM_US_ZIPCODE"
+msgctxt "FM_US_ZIPCODE"
 msgid "US zip codes must contain 5 or 9 numbers"
 msgstr "ПК в САЩ трябва да съдържат 5 или 9 цифри"
 
-msgctxt "OPERATION_FM_MINLENGTH1"
+msgctxt "FM_MINLENGTH1"
 msgid "Minimum length has been specified meaninglessly as [_1]"
 msgstr "Минималната дължина беше зададена около {$minlength}"
 
-msgctxt "OPERATION_FM_MINLENGTH2"
+msgctxt "FM_MINLENGTH2"
 msgid "This field must be at least [_1] characters"
 msgstr "Полето трябва да бъде най-малко {$minlength} символа"
 
-msgctxt "OPERATION_FM_MAXLENGTH1"
+msgctxt "FM_MAXLENGTH1"
 msgid "Maximum length has been specified meaninglessly as [_1]"
 msgstr "Максималната дължина беше зададена около {$minlength}"
 
-msgctxt "OPERATION_FM_MAXLENGTH2"
+msgctxt "FM_MAXLENGTH2"
 msgid "This field must be no more than [_1] characters"
 msgstr "Полето трябва да бъде не повече от {$minlength} символа"
 
-msgctxt "OPERATION_FM_EXACTLENGTH1"
+msgctxt "FM_EXACTLENGTH1"
 msgid "You must specify the length for the field."
 msgstr "Трябва да определите дължина на полето."
 
-msgctxt "OPERATION_FM_EXACTLENGTH2"
+msgctxt "FM_EXACTLENGTH2"
 msgid "You must specify the exactlength of the field with an integer"
 msgstr "Трябва да зададете точната дължина на полето с цяло число"
 
-msgctxt "OPERATION_FM_EXACTLENGTH3"
+msgctxt "FM_EXACTLENGTH3"
 msgid "This field must be exactly [_1] characters"
 msgstr "Полето трябва да бъде точно {$minlength} символа"
 
-msgctxt "OPERATION_FM_LENGTHRANGE1"
+msgctxt "FM_LENGTHRANGE1"
 msgid "You must specify the maximum and minimum length for the field."
 msgstr "Трябва да зададете максимална и минимална дължина на полето."
 
-msgctxt "OPERATION_FM_LENGTHRANGE2"
+msgctxt "FM_LENGTHRANGE2"
 msgid ""
 "You must specify the maximum and minimum lengths of the field with an "
 "integer"
 msgstr ""
 "Трябва да зададете максимална и минимална дължина на полето като цели числа"
 
-msgctxt "OPERATION_FM_LENGTHRANGE3"
+msgctxt "FM_LENGTHRANGE3"
 msgid "This field must be between [_1] and [_2] characters"
 msgstr "Това поле трябва да бъде между {$minlength} и {$maxlength} символа"
 
-msgctxt "OPERATION_FM_URL"
+msgctxt "FM_URL"
 msgid "This field must contain a URL starting with http:// or ftp://"
 msgstr "Това поле трябва да съдържа URL и да започва с http:// или ftp://"
 
-msgctxt "OPERATION_FM_EMAIL_SIMPLE1"
+msgctxt "FM_EMAIL_SIMPLE1"
 msgid "You must enter an email address."
 msgstr "Трябва да напишете валиден email адрес."
 
-msgctxt "OPERATION_FM_EMAIL_SIMPLE2"
+msgctxt "FM_EMAIL_SIMPLE2"
 msgid "This field doesn\\'t look like an RFC822-compliant email address"
 msgstr "Това поле не изглежда като електронен адрес съвместим с RFC822"
 
-msgctxt "OPERATION_FM_DOMAIN_NAME"
+msgctxt "FM_DOMAIN_NAME"
 msgid "This field doesn\\'t look like a valid Internet domain name or hostname."
 msgstr "Това поле не изглежда като валидно име на интернет домейн или хост."
 
-msgctxt "OPERATION_FM_IP_NUMBER1"
+msgctxt "FM_IP_NUMBER1"
 msgid "This field must contain a valid IP number and can not be left blank."
 msgstr ""
 "Това поле трябва да съдържа валиден номер на IP и не може да остане празно."
 
-msgctxt "OPERATION_FM_IP_NUMBER2"
+msgctxt "FM_IP_NUMBER2"
 msgid "Invalid IP address format (expected X.X.X.X)"
 msgstr "Неправилен формат на IP адрес (очаква се X.X.X.X)"
 
-msgctxt "OPERATION_FM_IP_NUMBER3"
+msgctxt "FM_IP_NUMBER3"
 msgid "[_1] is more than 255"
 msgstr "{$octet} е повече от 255"
 
-msgctxt "OPERATION_FM_USERNAME"
+msgctxt "FM_USERNAME"
 msgid ""
 "This field must look like a valid username (3 to 8 letters and numbers)"
 msgstr ""
 "Това поле трябва да изглежда като валидно потребителско име (от 3 до 8 букви"
 " и цифри)"
 
-msgctxt "OPERATION_FM_PASSWORD1"
+msgctxt "FM_PASSWORD1"
 msgid "You must provide a password."
 msgstr "Трябва да предоставите парола."
 
-msgctxt "OPERATION_FM_PASSWORD2"
+msgctxt "FM_PASSWORD2"
 msgid ""
 "The password you provided was not a good password.A good password must "
 "contain all of the following: upper case letter, lower case letter, number, "
@@ -530,18 +526,18 @@ msgstr ""
 "съдържа всеки от следните знаци: главни букви, малки букви, цифри и "
 "специални символи. И нейната дължина трябва да бъде поне 7 знака."
 
-msgctxt "OPERATION_FM_MAC_ADDRESS1"
+msgctxt "FM_MAC_ADDRESS1"
 msgid "You must provide a MAC address."
 msgstr "Трябва да предоставите MAC адрес."
 
-msgctxt "OPERATION_FM_MAC_ADDRESS2"
+msgctxt "FM_MAC_ADDRESS2"
 msgid "The MAC address you provided was not valid."
 msgstr "MAC адреса, който сте предоставили е невалиден."
 
-msgctxt "OPERATION_FM_ERR_UNEXPECTED_DESC"
+msgctxt "FM_ERR_UNEXPECTED_DESC"
 msgid "Error: unexpected or missing characters in description"
 msgstr "Грешка: неочаквани или липсващи знаци в описанието"
 
-msgctxt "OPERATION_CSRF_VALIDATION_FAILURE"
-msgid "Placeholder for missing original text"
+msgctxt "CSRF_VALIDATION_FAILURE"
+msgid "Error: CSRF token is invalid or outdated."
 msgstr "Error: CSRF token is invalid or outdated."
diff --git a/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/General/pofiles/general_da.po b/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/General/pofiles/general_da.po
index d7020fc..9d8c654 100644
--- a/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/General/pofiles/general_da.po
+++ b/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/General/pofiles/general_da.po
@@ -5,99 +5,95 @@ msgstr ""
 "Language: None\n"
 "Content-Type: text/plain; charset=utf-8\n"
 
-msgctxt "OPERATION_Collaboration"
+msgctxt "Collaboration"
 msgid "Collaboration"
 msgstr "Samarbejde"
 
-msgctxt "OPERATION_Administration"
+msgctxt "Administration"
 msgid "Administration"
 msgstr "Administration"
 
-msgctxt "OPERATION_Security"
+msgctxt "Security"
 msgid "Security"
 msgstr "Sikkerhed"
 
-msgctxt "OPERATION_Configuration"
+msgctxt "Configuration"
 msgid "Configuration"
 msgstr "Opsætning"
 
-msgctxt "OPERATION_Miscellaneous"
+msgctxt "Miscellaneous"
 msgid "Miscellaneous"
 msgstr "Diverse"
 
-msgctxt "OPERATION_Your Settings"
-msgid "Your Settings"
-msgstr "Dine indstillinger"
-
-msgctxt "OPERATION_SAVE"
+msgctxt "SAVE"
 msgid "Save"
 msgstr "Gem"
 
-msgctxt "OPERATION_CANCEL"
+msgctxt "CANCEL"
 msgid "Cancel"
 msgstr "Fortryd"
 
-msgctxt "OPERATION_ENABLED"
+msgctxt "ENABLED"
 msgid "Enabled"
 msgstr "Aktiveret"
 
-msgctxt "OPERATION_DISABLED"
+msgctxt "DISABLED"
 msgid "Disabled"
 msgstr "Deaktiveret"
 
-msgctxt "OPERATION_NO"
+msgctxt "NO"
 msgid "No"
 msgstr "Nej"
 
-msgctxt "OPERATION_YES"
+msgctxt "YES"
 msgid "Yes"
 msgstr "Ja"
 
-msgctxt "OPERATION_ADD"
+msgctxt "ADD"
 msgid "Add"
 msgstr "Tilføj"
 
-msgctxt "OPERATION_CREATE"
+msgctxt "CREATE"
 msgid "Create"
 msgstr "Opret"
 
-msgctxt "OPERATION_MODIFY"
+msgctxt "MODIFY"
 msgid "Modify"
 msgstr "Ændre"
 
-msgctxt "OPERATION_REMOVE"
+msgctxt "REMOVE"
 msgid "Remove"
 msgstr "Fjern"
 
-msgctxt "OPERATION_COMMENT"
+msgctxt "COMMENT"
 msgid "Comment"
 msgstr "Kommentar"
 
-msgctxt "OPERATION_NEXT"
+msgctxt "NEXT"
 msgid "Next"
 msgstr "Næste"
 
-msgctxt "OPERATION_SELF"
+msgctxt "SELF"
 msgid "Self"
 msgstr "Selv"
 
-msgctxt "OPERATION_REMOTE"
+msgctxt "REMOTE"
 msgid "Remote"
 msgstr "Fjern"
 
-msgctxt "OPERATION_LOCAL"
+msgctxt "LOCAL"
 msgid "Local"
 msgstr "Lokal"
 
-msgctxt "OPERATION_ACTION"
+msgctxt "ACTION"
 msgid "Action"
 msgstr "Aktivitet"
 
-msgctxt "OPERATION_NETWORK"
+msgctxt "NETWORK"
 msgid "Network"
 msgstr "Netværk"
 
-msgctxt "OPERATION_ROUTER"
+msgctxt "ROUTER"
 msgid "Router"
 msgstr "Router"
 
@@ -105,23 +101,23 @@ msgctxt "OPERATION_STATUS_REPORT"
 msgid "Operation status report"
 msgstr "Status rapport"
 
-msgctxt "OPERATION_ACCOUNT"
+msgctxt "ACCOUNT"
 msgid "Account"
 msgstr "Konto"
 
-msgctxt "OPERATION_GROUP"
+msgctxt "GROUP"
 msgid "Group"
 msgstr "Gruppe"
 
-msgctxt "OPERATION_DESC_SECTIONBAR"
+msgctxt "DESC_SECTIONBAR"
 msgid "<hr class=\"sectionbar\"/>"
-msgstr " <hr class=\"sectionbar\"/> "
+msgstr "<hr class=\"sectionbar\"/>"
 
-msgctxt "OPERATION_NO_PIPES_ALLOWED"
+msgctxt "NO_PIPES_ALLOWED"
 msgid "Pipe symbols (|) are not permitted in this field"
 msgstr "Pipe symboler (|) er ikke tilladte i dette felt"
 
-msgctxt "OPERATION_ERROR_BELOW"
+msgctxt "ERROR_BELOW"
 msgid ""
 "ERROR: There was an error in the validation of this page. Please scroll down"
 " and find the specific problem."
@@ -129,27 +125,27 @@ msgstr ""
 "Fejl: Der skete en fejl i forbindelse med kontrol af denne side. Rul "
 "venligst ned ad siden for at finde problemet."
 
-msgctxt "OPERATION_ACCESS"
+msgctxt "ACCESS"
 msgid "Access"
 msgstr "Adgang"
 
-msgctxt "OPERATION_ACCOUNT_LOCKED"
+msgctxt "ACCOUNT_LOCKED"
 msgid "Account is locked"
 msgstr "Kontoen er låst"
 
-msgctxt "OPERATION_GROUP_ADD"
+msgctxt "GROUP_ADD"
 msgid "Add group"
 msgstr "Tilføj gruppe"
 
-msgctxt "OPERATION_NETWORKS_ALLOW_LOCAL"
+msgctxt "NETWORKS_ALLOW_LOCAL"
 msgid "Allow access only from local networks"
 msgstr "Tillad kun adgang fra lokalnet"
 
-msgctxt "OPERATION_NETWORKS_ALLOW_PUBLIC"
+msgctxt "NETWORKS_ALLOW_PUBLIC"
 msgid "Allow public access (entire Internet)"
 msgstr "Tillad offentlig adgang (hele Internet)"
 
-msgctxt "OPERATION_ERROR_PASSWORD_CHANGE"
+msgctxt "ERROR_PASSWORD_CHANGE"
 msgid ""
 "An error occurred while attempting to change your password. Please make sure"
 " that the old password entered is correct."
@@ -157,363 +153,363 @@ msgstr ""
 "Der er sket en fejl ved skift af din adgangskode. Kontroller venligst at den"
 " gamle adgangskode er korrekt."
 
-msgctxt "OPERATION_BACK"
+msgctxt "BACK"
 msgid "Back"
 msgstr "Tilbage"
 
-msgctxt "OPERATION_BACKUP"
+msgctxt "BACKUP"
 msgid "Backup"
 msgstr "Sikkerhedskopi"
 
-msgctxt "OPERATION_DESCRIPTION_BRIEF"
+msgctxt "DESCRIPTION_BRIEF"
 msgid "Brief description"
 msgstr "Kort beskrivelse"
 
-msgctxt "OPERATION_PASSWORD_CHANGE"
+msgctxt "PASSWORD_CHANGE"
 msgid "Change Password"
 msgstr "Skift adgangskode"
 
-msgctxt "OPERATION_RESET_PASSWORD_TITLE"
+msgctxt "RESET_PASSWORD_TITLE"
 msgid "Reset user password"
 msgstr "Nulstil adgangskode"
 
-msgctxt "OPERATION_ACCOUNT_PASSWORD_CHANGE"
+msgctxt "ACCOUNT_PASSWORD_CHANGE"
 msgid "Change account password"
 msgstr "Skift brugerkontoens adgangskode"
 
-msgctxt "OPERATION_CONTENT"
+msgctxt "CONTENT"
 msgid "Content"
 msgstr "Indhold"
 
-msgctxt "OPERATION_CREATE_GROUP"
+msgctxt "CREATE_GROUP"
 msgid "Create user group"
 msgstr "Opret gruppe"
 
-msgctxt "OPERATION_USER_LIST_CURRENT"
+msgctxt "USER_LIST_CURRENT"
 msgid "Current list of users"
 msgstr "Aktuel brugerliste"
 
-msgctxt "OPERATION_DESCRIPTION"
+msgctxt "DESCRIPTION"
 msgid "Description"
 msgstr "Beskrivelse"
 
-msgctxt "OPERATION_DESTINATION"
+msgctxt "DESTINATION"
 msgid "Destination"
 msgstr "Destination"
 
-msgctxt "OPERATION_DOMAIN_NAME"
+msgctxt "DOMAIN_NAME"
 msgid "Domain name"
 msgstr "Domænenavn"
 
-msgctxt "OPERATION_DOMAIN"
+msgctxt "DOMAIN"
 msgid "Domain"
 msgstr "Domæne"
 
-msgctxt "OPERATION_DOMAINS"
+msgctxt "DOMAINS"
 msgid "Domains"
 msgstr "Domæner"
 
-msgctxt "OPERATION_DOWNLOAD"
+msgctxt "DOWNLOAD"
 msgid "Download"
 msgstr "Hent"
 
-msgctxt "OPERATION_ERROR_UPDATING_CONFIGURATION"
+msgctxt "ERROR_UPDATING_CONFIGURATION"
 msgid "Error occurred while updating system configuration."
 msgstr "Fejl under opdatering af systemopsætningen."
 
-msgctxt "OPERATION_GROUP_MEMBERS"
+msgctxt "GROUP_MEMBERS"
 msgid "Group Members"
 msgstr "Gruppemedlemmer"
 
-msgctxt "OPERATION_GROUP_NAME"
+msgctxt "GROUP_NAME"
 msgid "Group Name"
 msgstr "Gruppenavn"
 
-msgctxt "OPERATION_GROUPS"
+msgctxt "GROUPS"
 msgid "Groups"
 msgstr "Grupper"
 
-msgctxt "OPERATION_IP_ADDRESS"
+msgctxt "IP_ADDRESS"
 msgid "IP Address"
 msgstr "IP adresse"
 
-msgctxt "OPERATION_IP_ADDRESS_OR_FQDN"
+msgctxt "IP_ADDRESS_OR_FQDN"
 msgid "IP Address or FQDN"
 msgstr "IP adresse eller FQDN"
 
-msgctxt "OPERATION_USER_INVALID"
+msgctxt "USER_INVALID"
 msgid "Invalid user"
 msgstr "Ugyldig bruger"
 
-msgctxt "OPERATION_LOCATION"
+msgctxt "LOCATION"
 msgid "Location"
 msgstr "Placering"
 
-msgctxt "OPERATION_MB"
+msgctxt "MB"
 msgid "Mb"
 msgstr "Mb"
 
-msgctxt "OPERATION_MODIFY_USER_GROUP"
+msgctxt "MODIFY_USER_GROUP"
 msgid "Modify user group"
 msgstr "Ændre gruppe"
 
-msgctxt "OPERATION_NAME"
+msgctxt "NAME"
 msgid "Name"
 msgstr "Navn"
 
-msgctxt "OPERATION_PASSWORD_VERIFY_NEW"
+msgctxt "PASSWORD_VERIFY_NEW"
 msgid "New password (verify):"
 msgstr "Ny adgangskode (igen):"
 
-msgctxt "OPERATION_PASSWORD_NEW"
+msgctxt "PASSWORD_NEW"
 msgid "New password:"
 msgstr "Ny adgangskode:"
 
-msgctxt "OPERATION_OFF"
+msgctxt "OFF"
 msgid "Off"
 msgstr "Fra"
 
-msgctxt "OPERATION_OK"
+msgctxt "OK"
 msgid "Ok"
 msgstr "Ok"
 
-msgctxt "OPERATION_PASSWORD_OLD"
+msgctxt "PASSWORD_OLD"
 msgid "Old password:"
 msgstr "Gammel adgangskode:"
 
-msgctxt "OPERATION_ON"
+msgctxt "ON"
 msgid "On"
 msgstr "Tænd"
 
-msgctxt "OPERATION_PASSWORD"
+msgctxt "PASSWORD"
 msgid "Password"
 msgstr "Adgangskode"
 
-msgctxt "OPERATION_PERFORM"
+msgctxt "PERFORM"
 msgid "Perform"
 msgstr "Udfør"
 
-msgctxt "OPERATION_RECONFIGURE"
+msgctxt "RECONFIGURE"
 msgid "Reconfigure"
 msgstr "Omkonfigurer"
 
-msgctxt "OPERATION_REMOVE_USER_GROUP"
+msgctxt "REMOVE_USER_GROUP"
 msgid "Remove user group"
 msgstr "Fjern gruppe"
 
-msgctxt "OPERATION_PASSWORD_RESET"
+msgctxt "PASSWORD_RESET"
 msgid "Reset password"
 msgstr "Skift adgangskode"
 
-msgctxt "OPERATION_RESTORE"
+msgctxt "RESTORE"
 msgid "Restore"
 msgstr "Gendan"
 
-msgctxt "OPERATION_SHUTDOWN"
+msgctxt "SHUTDOWN"
 msgid "Shutdown"
 msgstr "Luk ned"
 
-msgctxt "OPERATION_SUCCESS"
+msgctxt "SUCCESS"
 msgid "Success"
 msgstr "Succes"
 
-msgctxt "OPERATION_ACCOUNT_NAME_INVALID"
+msgctxt "ACCOUNT_NAME_INVALID"
 msgid "The account name entered is invalid."
 msgstr "Det indtastede brugernavn er ugyldigt."
 
-msgctxt "OPERATION_ACCOUNT_NAME_INVALID_CHARS"
+msgctxt "ACCOUNT_NAME_INVALID_CHARS"
 msgid "The account name you entered contained invalid characters."
 msgstr "Det indtastede brugernavn indeholder ugyldige tegn."
 
-msgctxt "OPERATION_PASSWORD_OLD_INVALID_CHARS"
+msgctxt "PASSWORD_OLD_INVALID_CHARS"
 msgid "The old password you entered contained invalid characters."
 msgstr "Den gamle adgangskode du tastede indeholdt ugyldige tegn."
 
-msgctxt "OPERATION_PASSWORD_INVALID_CHARS"
+msgctxt "PASSWORD_INVALID_CHARS"
 msgid "The password you entered contained invalid characters."
 msgstr "Den nye adgangskode du tastede indeholdt ugyldige tegn."
 
-msgctxt "OPERATION_PASSWORD_VERIFY_ERROR"
+msgctxt "PASSWORD_VERIFY_ERROR"
 msgid "The passwords you entered did not match."
 msgstr "De indtastede adgangskoder er ikke ens."
 
-msgctxt "OPERATION_ACCOUNT_USER_NONE"
+msgctxt "ACCOUNT_USER_NONE"
 msgid "There are no user accounts in the system."
 msgstr "Der findes ingen brugerkonti i systemet."
 
-msgctxt "OPERATION_ACCOUNT_GROUP_NONE"
+msgctxt "ACCOUNT_GROUP_NONE"
 msgid "There are no user groups in the system."
 msgstr "Der er ingen grupper i systemet."
 
-msgctxt "OPERATION_ERROR_INVALID_CHARS"
+msgctxt "ERROR_INVALID_CHARS"
 msgid "Unexpected characters in description."
 msgstr "Uventede tegn i beskrivelsen."
 
-msgctxt "OPERATION_USER_NAME"
+msgctxt "USER_NAME"
 msgid "User Name"
 msgstr "Brugernavn"
 
-msgctxt "OPERATION_YOUR_ACCOUNT"
+msgctxt "YOUR_ACCOUNT"
 msgid "Your account:"
 msgstr "Brugernavn:"
 
-msgctxt "OPERATION_YOUR_ACCOUNT_INVALID"
+msgctxt "YOUR_ACCOUNT_INVALID"
 msgid "The account name entered is invalid."
 msgstr "Det indtastede brugernavn er ugyldigt."
 
-msgctxt "OPERATION_PASSWORD_CHANGE_SUCCESS"
+msgctxt "PASSWORD_CHANGE_SUCCESS"
 msgid "Your password has been successfully changed."
 msgstr "Adgangskoden er skiftet."
 
-msgctxt "OPERATION_FM_NONBLANK"
+msgctxt "FM_NONBLANK"
 msgid "This field must not be left blank"
 msgstr "Dette felt må ikke være tomt"
 
-msgctxt "OPERATION_FM_INTEGER"
+msgctxt "FM_INTEGER"
 msgid "This field must contain a positive integer"
 msgstr "Dette felt skal indeholde et positivt tal"
 
-msgctxt "OPERATION_FM_NUMBER"
+msgctxt "FM_NUMBER"
 msgid "This field must contain a number"
 msgstr "Dette felt skal indeholde et tal"
 
-msgctxt "OPERATION_FM_WORD"
+msgctxt "FM_WORD"
 msgid "This field must look like a single word."
 msgstr "Dette felt skal ligne et enkelt ord."
 
-msgctxt "OPERATION_FM_DATE"
+msgctxt "FM_DATE"
 msgid "The data entered could not be parsed as a date"
 msgstr "Indtastede data ligner ikke en dato"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_NUMBER1"
+msgctxt "FM_CREDIT_CARD_NUMBER1"
 msgid "You must enter a credit card number"
 msgstr "Du skal angive et kreditkortnummer"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_NUMBER2"
+msgctxt "FM_CREDIT_CARD_NUMBER2"
 msgid ""
 "Credit card numbers shouldn\\'t have anything but numbers, spaces or dashes"
 msgstr "Kreditkortnumre indeholder kun tal, mellemrum og bindestreger"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_NUMBER3"
+msgctxt "FM_CREDIT_CARD_NUMBER3"
 msgid "Must be at least 14 characters in length"
 msgstr "Skal være mindst 14 karakterer langt"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_NUMBER4"
+msgctxt "FM_CREDIT_CARD_NUMBER4"
 msgid "Doesn\\'t appear to be a valid credit card number"
 msgstr "Ligner ikke et gyldigt kreditkortnummer"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_EXPIRY1"
+msgctxt "FM_CREDIT_CARD_EXPIRY1"
 msgid "No expiry date entered."
 msgstr "Manglende udløbsdato."
 
-msgctxt "OPERATION_FM_CREDIT_CARD_EXPIRY2"
+msgctxt "FM_CREDIT_CARD_EXPIRY2"
 msgid "Expiry date must be in the format MM/YY or MM/YYYY"
 msgstr "Udløbsdato skal være i formatet MM/ÅÅ eller MM/ÅÅÅÅ"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_EXPIRY3"
+msgctxt "FM_CREDIT_CARD_EXPIRY3"
 msgid "This expiry date appears to have already passed"
 msgstr "Udløbsdato er overskredet"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_EXPIRY4"
+msgctxt "FM_CREDIT_CARD_EXPIRY4"
 msgid "This expiry date appears to be too far in the future"
 msgstr "Udløbsdato ligger for langt ud i fremtiden"
 
-msgctxt "OPERATION_FM_ISO_COUNTRY_CODE1"
+msgctxt "FM_ISO_COUNTRY_CODE1"
 msgid "You must provide a country code"
 msgstr "Du skal angive en landekode"
 
-msgctxt "OPERATION_FM_ISO_COUNTRY_CODE2"
+msgctxt "FM_ISO_COUNTRY_CODE2"
 msgid "This field does not contain an ISO country code"
 msgstr "Dette felt indholder ikke en ISO-landekode"
 
-msgctxt "OPERATION_FM_US_STATE"
+msgctxt "FM_US_STATE"
 msgid "This doesn\\'t appear to be a valid 2-letter US state abbreviation"
 msgstr "Dette forkommer ikke at være en gyldig 2-cifret US-statsforkortelse"
 
-msgctxt "OPERATION_FM_US_ZIPCODE"
+msgctxt "FM_US_ZIPCODE"
 msgid "US zip codes must contain 5 or 9 numbers"
 msgstr "US-postnumre indeholder 5 eller 9 cifre"
 
-msgctxt "OPERATION_FM_MINLENGTH1"
+msgctxt "FM_MINLENGTH1"
 msgid "Minimum length has been specified meaninglessly as [_1]"
 msgstr "Minimumslængden er meningsløst blevet sat til {$minlength}"
 
-msgctxt "OPERATION_FM_MINLENGTH2"
+msgctxt "FM_MINLENGTH2"
 msgid "This field must be at least [_1] characters"
 msgstr "Dette felt skal mindst have {$minlength} tegn"
 
-msgctxt "OPERATION_FM_MAXLENGTH1"
+msgctxt "FM_MAXLENGTH1"
 msgid "Maximum length has been specified meaninglessly as [_1]"
 msgstr "Maksimumslængden er meningsløst blevet sat til {$maxlength}"
 
-msgctxt "OPERATION_FM_MAXLENGTH2"
+msgctxt "FM_MAXLENGTH2"
 msgid "This field must be no more than [_1] characters"
 msgstr "Dette felt må maksimalt indeholde {$maxlength} tegn"
 
-msgctxt "OPERATION_FM_EXACTLENGTH1"
+msgctxt "FM_EXACTLENGTH1"
 msgid "You must specify the length for the field."
 msgstr "Du skal angive feltets længde."
 
-msgctxt "OPERATION_FM_EXACTLENGTH2"
+msgctxt "FM_EXACTLENGTH2"
 msgid "You must specify the exactlength of the field with an integer"
 msgstr "Du skal angive feltets præcise længde med et heltal"
 
-msgctxt "OPERATION_FM_EXACTLENGTH3"
+msgctxt "FM_EXACTLENGTH3"
 msgid "This field must be exactly [_1] characters"
 msgstr "Dette felt skal indeholde præcis {$exactlength} anslag"
 
-msgctxt "OPERATION_FM_LENGTHRANGE1"
+msgctxt "FM_LENGTHRANGE1"
 msgid "You must specify the maximum and minimum length for the field."
 msgstr "Du skal angive minimal- og maksimallængden for feltet."
 
-msgctxt "OPERATION_FM_LENGTHRANGE2"
+msgctxt "FM_LENGTHRANGE2"
 msgid ""
 "You must specify the maximum and minimum lengths of the field with an "
 "integer"
 msgstr "Du skal angive minimal- og maksimal-længden for feltet med heltal"
 
-msgctxt "OPERATION_FM_LENGTHRANGE3"
+msgctxt "FM_LENGTHRANGE3"
 msgid "This field must be between [_1] and [_2] characters"
 msgstr "Dette felt skal være mellem {$minlength} og {$maxlength} tegn"
 
-msgctxt "OPERATION_FM_URL"
+msgctxt "FM_URL"
 msgid "This field must contain a URL starting with http:// or ftp://"
 msgstr "Feltet skal indeholde en URL startende med http:// eller ftp://"
 
-msgctxt "OPERATION_FM_EMAIL_SIMPLE1"
+msgctxt "FM_EMAIL_SIMPLE1"
 msgid "You must enter an email address."
 msgstr "Du skal indtaste en e-post adresse."
 
-msgctxt "OPERATION_FM_EMAIL_SIMPLE2"
+msgctxt "FM_EMAIL_SIMPLE2"
 msgid "This field doesn\\'t look like an RFC822-compliant email address"
 msgstr "Feltet ligner ikke en RFC822-standard e-postadresse"
 
-msgctxt "OPERATION_FM_DOMAIN_NAME"
+msgctxt "FM_DOMAIN_NAME"
 msgid "This field doesn\\'t look like a valid Internet domain name or hostname."
 msgstr "Feltet ligner ikke et korrekt Internet domænenavn eller værtsnavn."
 
-msgctxt "OPERATION_FM_IP_NUMBER1"
+msgctxt "FM_IP_NUMBER1"
 msgid "This field must contain a valid IP number and can not be left blank."
 msgstr "Feltet skal indeholde en brugbar IPadresse og skal udfyldes."
 
-msgctxt "OPERATION_FM_IP_NUMBER2"
+msgctxt "FM_IP_NUMBER2"
 msgid "Invalid IP address format (expected X.X.X.X)"
 msgstr "Ugyldig IP-adresse (forventet X.X.X.X)"
 
-msgctxt "OPERATION_FM_IP_NUMBER3"
+msgctxt "FM_IP_NUMBER3"
 msgid "[_1] is more than 255"
 msgstr "{$octet} er større end 255"
 
-msgctxt "OPERATION_FM_USERNAME"
+msgctxt "FM_USERNAME"
 msgid ""
 "This field must look like a valid username (3 to 8 letters and numbers)"
 msgstr "Feltet skal ligne et brugernavn (3 til 8 bogstaver og tal)"
 
-msgctxt "OPERATION_FM_PASSWORD1"
+msgctxt "FM_PASSWORD1"
 msgid "You must provide a password."
 msgstr "Du skal skrive en adgangskode."
 
-msgctxt "OPERATION_FM_PASSWORD2"
+msgctxt "FM_PASSWORD2"
 msgid ""
 "The password you provided was not a good password.A good password must "
 "contain all of the following: upper case letter, lower case letter, number, "
@@ -523,18 +519,18 @@ msgstr ""
 "indeholde alle følgende komponenter: STORT BOGSTAV, lille bogstav, et tal, "
 "et kontroltegn og være på minimum 7 karakterers længde."
 
-msgctxt "OPERATION_FM_MAC_ADDRESS1"
+msgctxt "FM_MAC_ADDRESS1"
 msgid "You must provide a MAC address."
 msgstr "Du skal skrive en MAC adresse."
 
-msgctxt "OPERATION_FM_MAC_ADDRESS2"
+msgctxt "FM_MAC_ADDRESS2"
 msgid "The MAC address you provided was not valid."
 msgstr "Den indtastede MAC adresse er ikke gyldig."
 
-msgctxt "OPERATION_FM_ERR_UNEXPECTED_DESC"
+msgctxt "FM_ERR_UNEXPECTED_DESC"
 msgid "Error: unexpected or missing characters in description"
 msgstr "Fejl: Uventede eller manglende tegn i beskrivelsen"
 
-msgctxt "OPERATION_CSRF_VALIDATION_FAILURE"
-msgid "Placeholder for missing original text"
+msgctxt "CSRF_VALIDATION_FAILURE"
+msgid "Error: CSRF token is invalid or outdated."
 msgstr "Error: CSRF token is invalid or outdated."
diff --git a/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/General/pofiles/general_de.po b/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/General/pofiles/general_de.po
index e93d55b..fdbbc85 100644
--- a/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/General/pofiles/general_de.po
+++ b/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/General/pofiles/general_de.po
@@ -5,99 +5,95 @@ msgstr ""
 "Language: None\n"
 "Content-Type: text/plain; charset=utf-8\n"
 
-msgctxt "OPERATION_Collaboration"
+msgctxt "Collaboration"
 msgid "Collaboration"
 msgstr "Zusammenarbeit"
 
-msgctxt "OPERATION_Administration"
+msgctxt "Administration"
 msgid "Administration"
 msgstr "Administration"
 
-msgctxt "OPERATION_Security"
+msgctxt "Security"
 msgid "Security"
 msgstr "Sicherheit"
 
-msgctxt "OPERATION_Configuration"
+msgctxt "Configuration"
 msgid "Configuration"
 msgstr "Konfiguration"
 
-msgctxt "OPERATION_Miscellaneous"
+msgctxt "Miscellaneous"
 msgid "Miscellaneous"
 msgstr "Verschiedenes"
 
-msgctxt "OPERATION_Your Settings"
-msgid "Your Settings"
-msgstr "Ihre Einstellungen"
-
-msgctxt "OPERATION_SAVE"
+msgctxt "SAVE"
 msgid "Save"
 msgstr "Speichern"
 
-msgctxt "OPERATION_CANCEL"
+msgctxt "CANCEL"
 msgid "Cancel"
 msgstr "Abbrechen"
 
-msgctxt "OPERATION_ENABLED"
+msgctxt "ENABLED"
 msgid "Enabled"
 msgstr "Aktiviert"
 
-msgctxt "OPERATION_DISABLED"
+msgctxt "DISABLED"
 msgid "Disabled"
 msgstr "Deaktiviert"
 
-msgctxt "OPERATION_NO"
+msgctxt "NO"
 msgid "No"
 msgstr "Nein"
 
-msgctxt "OPERATION_YES"
+msgctxt "YES"
 msgid "Yes"
 msgstr "Ja"
 
-msgctxt "OPERATION_ADD"
+msgctxt "ADD"
 msgid "Add"
 msgstr "Hinzufügen"
 
-msgctxt "OPERATION_CREATE"
+msgctxt "CREATE"
 msgid "Create"
 msgstr "Erstellen"
 
-msgctxt "OPERATION_MODIFY"
+msgctxt "MODIFY"
 msgid "Modify"
 msgstr "Ändern"
 
-msgctxt "OPERATION_REMOVE"
+msgctxt "REMOVE"
 msgid "Remove"
 msgstr "Entfernen"
 
-msgctxt "OPERATION_COMMENT"
+msgctxt "COMMENT"
 msgid "Comment"
 msgstr "Kommentar"
 
-msgctxt "OPERATION_NEXT"
+msgctxt "NEXT"
 msgid "Next"
 msgstr "Weiter"
 
-msgctxt "OPERATION_SELF"
+msgctxt "SELF"
 msgid "Self"
 msgstr "Selbst"
 
-msgctxt "OPERATION_REMOTE"
+msgctxt "REMOTE"
 msgid "Remote"
 msgstr "Fernzugriff"
 
-msgctxt "OPERATION_LOCAL"
+msgctxt "LOCAL"
 msgid "Local"
 msgstr "Lokal"
 
-msgctxt "OPERATION_ACTION"
+msgctxt "ACTION"
 msgid "Action"
 msgstr "Aktion"
 
-msgctxt "OPERATION_NETWORK"
+msgctxt "NETWORK"
 msgid "Network"
 msgstr "Netzwerk"
 
-msgctxt "OPERATION_ROUTER"
+msgctxt "ROUTER"
 msgid "Router"
 msgstr "Router"
 
@@ -105,23 +101,23 @@ msgctxt "OPERATION_STATUS_REPORT"
 msgid "Operation status report"
 msgstr "Statusbericht"
 
-msgctxt "OPERATION_ACCOUNT"
+msgctxt "ACCOUNT"
 msgid "Account"
 msgstr "Benutzerkonto"
 
-msgctxt "OPERATION_GROUP"
+msgctxt "GROUP"
 msgid "Group"
 msgstr "Benutzergruppe"
 
-msgctxt "OPERATION_DESC_SECTIONBAR"
+msgctxt "DESC_SECTIONBAR"
 msgid "<hr class=\"sectionbar\"/>"
-msgstr " <hr class=\"sectionbar\"/> "
+msgstr "<hr class=\"sectionbar\"/>"
 
-msgctxt "OPERATION_NO_PIPES_ALLOWED"
+msgctxt "NO_PIPES_ALLOWED"
 msgid "Pipe symbols (|) are not permitted in this field"
 msgstr "Pipe-Symbole (|) sind in diesem Feld nicht erlaubt"
 
-msgctxt "OPERATION_ERROR_BELOW"
+msgctxt "ERROR_BELOW"
 msgid ""
 "ERROR: There was an error in the validation of this page. Please scroll down"
 " and find the specific problem."
@@ -129,27 +125,27 @@ msgstr ""
 "FEHLER: Es gab einen Fehler mit der Gültigkeitsprüfung auf dieser Seite. "
 "Bitte navigieren Sie durch diese Seite und finden Sie das Problem."
 
-msgctxt "OPERATION_ACCESS"
+msgctxt "ACCESS"
 msgid "Access"
 msgstr "Zugriff"
 
-msgctxt "OPERATION_ACCOUNT_LOCKED"
+msgctxt "ACCOUNT_LOCKED"
 msgid "Account is locked"
 msgstr "Konto ist gesperrt"
 
-msgctxt "OPERATION_GROUP_ADD"
+msgctxt "GROUP_ADD"
 msgid "Add group"
 msgstr "Gruppe anlegen"
 
-msgctxt "OPERATION_NETWORKS_ALLOW_LOCAL"
+msgctxt "NETWORKS_ALLOW_LOCAL"
 msgid "Allow access only from local networks"
 msgstr "Zugriff nur von lokalen Netzwerken aus erlauben"
 
-msgctxt "OPERATION_NETWORKS_ALLOW_PUBLIC"
+msgctxt "NETWORKS_ALLOW_PUBLIC"
 msgid "Allow public access (entire Internet)"
 msgstr "Öffentlichen Zugriff erlauben (gesamtes Internet)"
 
-msgctxt "OPERATION_ERROR_PASSWORD_CHANGE"
+msgctxt "ERROR_PASSWORD_CHANGE"
 msgid ""
 "An error occurred while attempting to change your password. Please make sure"
 " that the old password entered is correct."
@@ -158,318 +154,318 @@ msgstr ""
 "stellen Sie sicher\\, dass das alte Kennwort\\, das Sie eingegeben haben\\, "
 "richtig ist."
 
-msgctxt "OPERATION_BACK"
+msgctxt "BACK"
 msgid "Back"
 msgstr "Zurück"
 
-msgctxt "OPERATION_BACKUP"
+msgctxt "BACKUP"
 msgid "Backup"
 msgstr "Sichern"
 
-msgctxt "OPERATION_DESCRIPTION_BRIEF"
+msgctxt "DESCRIPTION_BRIEF"
 msgid "Brief description"
 msgstr "Kurzbeschreibung"
 
-msgctxt "OPERATION_PASSWORD_CHANGE"
+msgctxt "PASSWORD_CHANGE"
 msgid "Change Password"
 msgstr "Kennwort ändern"
 
-msgctxt "OPERATION_RESET_PASSWORD_TITLE"
+msgctxt "RESET_PASSWORD_TITLE"
 msgid "Reset user password"
 msgstr "Benutzerkennwort zurücksetzen"
 
-msgctxt "OPERATION_ACCOUNT_PASSWORD_CHANGE"
+msgctxt "ACCOUNT_PASSWORD_CHANGE"
 msgid "Change account password"
 msgstr "Konto-Kennwort ändern"
 
-msgctxt "OPERATION_CONTENT"
+msgctxt "CONTENT"
 msgid "Content"
 msgstr "Inhalt"
 
-msgctxt "OPERATION_CREATE_GROUP"
+msgctxt "CREATE_GROUP"
 msgid "Create user group"
 msgstr "Benutzergruppe anlegen"
 
-msgctxt "OPERATION_USER_LIST_CURRENT"
+msgctxt "USER_LIST_CURRENT"
 msgid "Current list of users"
 msgstr "Aktuelle Liste der Benutzer"
 
-msgctxt "OPERATION_DESCRIPTION"
+msgctxt "DESCRIPTION"
 msgid "Description"
 msgstr "Beschreibung"
 
-msgctxt "OPERATION_DESTINATION"
+msgctxt "DESTINATION"
 msgid "Destination"
 msgstr "Ziel"
 
-msgctxt "OPERATION_DOMAIN_NAME"
+msgctxt "DOMAIN_NAME"
 msgid "Domain name"
 msgstr "Domänenname"
 
-msgctxt "OPERATION_DOMAIN"
+msgctxt "DOMAIN"
 msgid "Domain"
 msgstr "Domäne"
 
-msgctxt "OPERATION_DOMAINS"
+msgctxt "DOMAINS"
 msgid "Domains"
 msgstr "Domänen"
 
-msgctxt "OPERATION_DOWNLOAD"
+msgctxt "DOWNLOAD"
 msgid "Download"
 msgstr "Herunterladen"
 
-msgctxt "OPERATION_ERROR_UPDATING_CONFIGURATION"
+msgctxt "ERROR_UPDATING_CONFIGURATION"
 msgid "Error occurred while updating system configuration."
 msgstr "Es ist ein Fehler bei der Systemaktualisierung aufgetreten."
 
-msgctxt "OPERATION_GROUP_MEMBERS"
+msgctxt "GROUP_MEMBERS"
 msgid "Group Members"
 msgstr "Gruppenmitglieder"
 
-msgctxt "OPERATION_GROUP_NAME"
+msgctxt "GROUP_NAME"
 msgid "Group Name"
 msgstr "Gruppenname"
 
-msgctxt "OPERATION_GROUPS"
+msgctxt "GROUPS"
 msgid "Groups"
 msgstr "Gruppen"
 
-msgctxt "OPERATION_IP_ADDRESS"
+msgctxt "IP_ADDRESS"
 msgid "IP Address"
 msgstr "IP-Adresse"
 
-msgctxt "OPERATION_IP_ADDRESS_OR_FQDN"
+msgctxt "IP_ADDRESS_OR_FQDN"
 msgid "IP Address or FQDN"
 msgstr "IP-Adresse oder voll qualifizierter Domänenname"
 
-msgctxt "OPERATION_USER_INVALID"
+msgctxt "USER_INVALID"
 msgid "Invalid user"
 msgstr "Ungültiger Benutzer"
 
-msgctxt "OPERATION_LOCATION"
+msgctxt "LOCATION"
 msgid "Location"
 msgstr "Standort"
 
-msgctxt "OPERATION_MB"
+msgctxt "MB"
 msgid "Mb"
 msgstr "Mb"
 
-msgctxt "OPERATION_MODIFY_USER_GROUP"
+msgctxt "MODIFY_USER_GROUP"
 msgid "Modify user group"
 msgstr "Benutzergruppe ändern"
 
-msgctxt "OPERATION_NAME"
+msgctxt "NAME"
 msgid "Name"
 msgstr "Name"
 
-msgctxt "OPERATION_PASSWORD_VERIFY_NEW"
+msgctxt "PASSWORD_VERIFY_NEW"
 msgid "New password (verify):"
 msgstr "Neues Kennwort (bestätigen):"
 
-msgctxt "OPERATION_PASSWORD_NEW"
+msgctxt "PASSWORD_NEW"
 msgid "New password:"
 msgstr "Neues Kennwort:"
 
-msgctxt "OPERATION_OFF"
+msgctxt "OFF"
 msgid "Off"
 msgstr "Aus"
 
-msgctxt "OPERATION_OK"
+msgctxt "OK"
 msgid "Ok"
 msgstr "Ok"
 
-msgctxt "OPERATION_PASSWORD_OLD"
+msgctxt "PASSWORD_OLD"
 msgid "Old password:"
 msgstr "Altes Kennwort:"
 
-msgctxt "OPERATION_ON"
+msgctxt "ON"
 msgid "On"
 msgstr "Aktiviert"
 
-msgctxt "OPERATION_PASSWORD"
+msgctxt "PASSWORD"
 msgid "Password"
 msgstr "Passwort"
 
-msgctxt "OPERATION_PERFORM"
+msgctxt "PERFORM"
 msgid "Perform"
 msgstr "Ausführen"
 
-msgctxt "OPERATION_RECONFIGURE"
+msgctxt "RECONFIGURE"
 msgid "Reconfigure"
 msgstr "Rekonfigurieren"
 
-msgctxt "OPERATION_REMOVE_USER_GROUP"
+msgctxt "REMOVE_USER_GROUP"
 msgid "Remove user group"
 msgstr "Benutzergruppe löschen"
 
-msgctxt "OPERATION_PASSWORD_RESET"
+msgctxt "PASSWORD_RESET"
 msgid "Reset password"
 msgstr "Kennwort zurücksetzen"
 
-msgctxt "OPERATION_RESTORE"
+msgctxt "RESTORE"
 msgid "Restore"
 msgstr "Wiederherstellen"
 
-msgctxt "OPERATION_SHUTDOWN"
+msgctxt "SHUTDOWN"
 msgid "Shutdown"
 msgstr "Herunterfahren"
 
-msgctxt "OPERATION_SUCCESS"
+msgctxt "SUCCESS"
 msgid "Success"
 msgstr "Erfolg"
 
-msgctxt "OPERATION_ACCOUNT_NAME_INVALID"
+msgctxt "ACCOUNT_NAME_INVALID"
 msgid "The account name entered is invalid."
 msgstr "Der eingegebene Kontoname ist ungültig."
 
-msgctxt "OPERATION_ACCOUNT_NAME_INVALID_CHARS"
+msgctxt "ACCOUNT_NAME_INVALID_CHARS"
 msgid "The account name you entered contained invalid characters."
 msgstr "Der eingegebene Kontoname enthält ungültige Zeichen."
 
-msgctxt "OPERATION_PASSWORD_OLD_INVALID_CHARS"
+msgctxt "PASSWORD_OLD_INVALID_CHARS"
 msgid "The old password you entered contained invalid characters."
 msgstr "Das alte eingegebene Kennwort enthält ungültige Zeichen."
 
-msgctxt "OPERATION_PASSWORD_INVALID_CHARS"
+msgctxt "PASSWORD_INVALID_CHARS"
 msgid "The password you entered contained invalid characters."
 msgstr "Das eingegebene Kennwort enthält ungültige Zeichen."
 
-msgctxt "OPERATION_PASSWORD_VERIFY_ERROR"
+msgctxt "PASSWORD_VERIFY_ERROR"
 msgid "The passwords you entered did not match."
 msgstr "Die eingegebenen Kennwörter stimmen nicht überein."
 
-msgctxt "OPERATION_ACCOUNT_USER_NONE"
+msgctxt "ACCOUNT_USER_NONE"
 msgid "There are no user accounts in the system."
 msgstr "Es gibt keine Benutzerkonten auf diesem System."
 
-msgctxt "OPERATION_ACCOUNT_GROUP_NONE"
+msgctxt "ACCOUNT_GROUP_NONE"
 msgid "There are no user groups in the system."
 msgstr "Es sind keine Benutzergruppen auf dem System vorhanden."
 
-msgctxt "OPERATION_ERROR_INVALID_CHARS"
+msgctxt "ERROR_INVALID_CHARS"
 msgid "Unexpected characters in description."
 msgstr "Unzulässige oder fehlende Zeichen in der Beschreibung"
 
-msgctxt "OPERATION_USER_NAME"
+msgctxt "USER_NAME"
 msgid "User Name"
 msgstr "Benutzername"
 
-msgctxt "OPERATION_YOUR_ACCOUNT"
+msgctxt "YOUR_ACCOUNT"
 msgid "Your account:"
 msgstr "Ihr Benutzerkonto:"
 
-msgctxt "OPERATION_YOUR_ACCOUNT_INVALID"
+msgctxt "YOUR_ACCOUNT_INVALID"
 msgid "The account name entered is invalid."
 msgstr "Der eingegebene Kontoname ist ungültig."
 
-msgctxt "OPERATION_PASSWORD_CHANGE_SUCCESS"
+msgctxt "PASSWORD_CHANGE_SUCCESS"
 msgid "Your password has been successfully changed."
 msgstr "Ihr Kennwort wurde erfolgreich geändert."
 
-msgctxt "OPERATION_FM_NONBLANK"
+msgctxt "FM_NONBLANK"
 msgid "This field must not be left blank"
 msgstr "Dieses Feld darf nicht leer bleiben"
 
-msgctxt "OPERATION_FM_INTEGER"
+msgctxt "FM_INTEGER"
 msgid "This field must contain a positive integer"
 msgstr "Dieses Feld muss eine positive Ganzzahl enthalten"
 
-msgctxt "OPERATION_FM_NUMBER"
+msgctxt "FM_NUMBER"
 msgid "This field must contain a number"
 msgstr "Dieses Feld muss eine Zahl enthalten"
 
-msgctxt "OPERATION_FM_WORD"
+msgctxt "FM_WORD"
 msgid "This field must look like a single word."
 msgstr "Dieses Feld sollte wie ein einzelnes Wort aussehen"
 
-msgctxt "OPERATION_FM_DATE"
+msgctxt "FM_DATE"
 msgid "The data entered could not be parsed as a date"
 msgstr "Die Eingabe konnte nicht als Datum erkannt werden"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_NUMBER1"
+msgctxt "FM_CREDIT_CARD_NUMBER1"
 msgid "You must enter a credit card number"
 msgstr "Sie müssen eine Kreditkarten-Nummer eingeben"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_NUMBER2"
+msgctxt "FM_CREDIT_CARD_NUMBER2"
 msgid ""
 "Credit card numbers shouldn\\'t have anything but numbers, spaces or dashes"
 msgstr ""
 "Die Kreditkarten-Nummer darf nur Zahlen\\, Leerzeichen und Gedankenstriche "
 "enthalten"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_NUMBER3"
+msgctxt "FM_CREDIT_CARD_NUMBER3"
 msgid "Must be at least 14 characters in length"
 msgstr "Die Länge muss mindestens 14 Zeichen betragen"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_NUMBER4"
+msgctxt "FM_CREDIT_CARD_NUMBER4"
 msgid "Doesn\\'t appear to be a valid credit card number"
 msgstr "Es scheint keine Kreditkarten-Nummer zu sein"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_EXPIRY1"
+msgctxt "FM_CREDIT_CARD_EXPIRY1"
 msgid "No expiry date entered."
 msgstr "Kein Ablaufdatum eingegeben"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_EXPIRY2"
+msgctxt "FM_CREDIT_CARD_EXPIRY2"
 msgid "Expiry date must be in the format MM/YY or MM/YYYY"
 msgstr "Das Ablaufdatum muss im Format MM/YY oder MM/YYYY sein"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_EXPIRY3"
+msgctxt "FM_CREDIT_CARD_EXPIRY3"
 msgid "This expiry date appears to have already passed"
 msgstr "Dieses Ablaufdatum scheint schon abgelaufen zu sein"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_EXPIRY4"
+msgctxt "FM_CREDIT_CARD_EXPIRY4"
 msgid "This expiry date appears to be too far in the future"
 msgstr "Dieses Ablaufdatum scheint zu weit in der Zukunft zu liegen"
 
-msgctxt "OPERATION_FM_ISO_COUNTRY_CODE1"
+msgctxt "FM_ISO_COUNTRY_CODE1"
 msgid "You must provide a country code"
 msgstr "Geben Sie bitte einen Länder-Code ein"
 
-msgctxt "OPERATION_FM_ISO_COUNTRY_CODE2"
+msgctxt "FM_ISO_COUNTRY_CODE2"
 msgid "This field does not contain an ISO country code"
 msgstr "Dieses Feld enthält keinen ISO-Länder-Code"
 
-msgctxt "OPERATION_FM_US_STATE"
+msgctxt "FM_US_STATE"
 msgid "This doesn\\'t appear to be a valid 2-letter US state abbreviation"
 msgstr "Dies scheint keine 2-buchstabige US-Staat-Abkürzung zu sein"
 
-msgctxt "OPERATION_FM_US_ZIPCODE"
+msgctxt "FM_US_ZIPCODE"
 msgid "US zip codes must contain 5 or 9 numbers"
 msgstr "US Postleitzahlen müssen zwischen 5 und 9 Nummer enthalten"
 
-msgctxt "OPERATION_FM_MINLENGTH1"
+msgctxt "FM_MINLENGTH1"
 msgid "Minimum length has been specified meaninglessly as [_1]"
 msgstr "Die Mindestlänge ist mit {$minlength} vorgegeben"
 
-msgctxt "OPERATION_FM_MINLENGTH2"
+msgctxt "FM_MINLENGTH2"
 msgid "This field must be at least [_1] characters"
 msgstr "Dieses Feld muss wenigstens {$minlength} Zeichen lang sein"
 
-msgctxt "OPERATION_FM_MAXLENGTH1"
+msgctxt "FM_MAXLENGTH1"
 msgid "Maximum length has been specified meaninglessly as [_1]"
 msgstr "Die Maximallänge ist unsinnig mit {$maxlength} angegeben"
 
-msgctxt "OPERATION_FM_MAXLENGTH2"
+msgctxt "FM_MAXLENGTH2"
 msgid "This field must be no more than [_1] characters"
 msgstr "Dieses Feld darf nicht mehr als {$maxlength} Zeichen lang sein"
 
-msgctxt "OPERATION_FM_EXACTLENGTH1"
+msgctxt "FM_EXACTLENGTH1"
 msgid "You must specify the length for the field."
 msgstr "Sie müssen eine Länge für dieses Feld angeben."
 
-msgctxt "OPERATION_FM_EXACTLENGTH2"
+msgctxt "FM_EXACTLENGTH2"
 msgid "You must specify the exactlength of the field with an integer"
 msgstr "Sie müssen die exakte Länge des Feldes mit einer Ganzzahl angeben"
 
-msgctxt "OPERATION_FM_EXACTLENGTH3"
+msgctxt "FM_EXACTLENGTH3"
 msgid "This field must be exactly [_1] characters"
 msgstr "Dieses Feld muss genau {$exactlength} Zeichen beinhalten"
 
-msgctxt "OPERATION_FM_LENGTHRANGE1"
+msgctxt "FM_LENGTHRANGE1"
 msgid "You must specify the maximum and minimum length for the field."
 msgstr "Sie müssen für das Feld die Mindest- und Maximallänge angeben."
 
-msgctxt "OPERATION_FM_LENGTHRANGE2"
+msgctxt "FM_LENGTHRANGE2"
 msgid ""
 "You must specify the maximum and minimum lengths of the field with an "
 "integer"
@@ -477,55 +473,55 @@ msgstr ""
 "Sie müssen für das Feld die Mindest- und Maximallänge in einer Ganzzahl "
 "angeben"
 
-msgctxt "OPERATION_FM_LENGTHRANGE3"
+msgctxt "FM_LENGTHRANGE3"
 msgid "This field must be between [_1] and [_2] characters"
 msgstr ""
 "Dieses Feld muss zwischen {$minlength} und {$maxlength} Zeichen lang sein"
 
-msgctxt "OPERATION_FM_URL"
+msgctxt "FM_URL"
 msgid "This field must contain a URL starting with http:// or ftp://"
 msgstr ""
 "Dieses Feld muss eine URL enthalten, die mit http:// oder ftp:// beginnt"
 
-msgctxt "OPERATION_FM_EMAIL_SIMPLE1"
+msgctxt "FM_EMAIL_SIMPLE1"
 msgid "You must enter an email address."
 msgstr "Sie müssen eine E-Mail-Adresse angeben."
 
-msgctxt "OPERATION_FM_EMAIL_SIMPLE2"
+msgctxt "FM_EMAIL_SIMPLE2"
 msgid "This field doesn\\'t look like an RFC822-compliant email address"
 msgstr "Dieses Feld sieht nicht wie eine RFC822-konforme E-Mail-Adresse aus"
 
-msgctxt "OPERATION_FM_DOMAIN_NAME"
+msgctxt "FM_DOMAIN_NAME"
 msgid "This field doesn\\'t look like a valid Internet domain name or hostname."
 msgstr ""
 "Dieses Feld sieht nicht aus wie ein gültiger Internet-Domänenname oder "
 "Hostname"
 
-msgctxt "OPERATION_FM_IP_NUMBER1"
+msgctxt "FM_IP_NUMBER1"
 msgid "This field must contain a valid IP number and can not be left blank."
 msgstr ""
 "Dieses Feld muß eine gültige IP-Adresse enthalten und darf nicht leer sein."
 
-msgctxt "OPERATION_FM_IP_NUMBER2"
+msgctxt "FM_IP_NUMBER2"
 msgid "Invalid IP address format (expected X.X.X.X)"
 msgstr "IP-Adresse hat ein ungültiges Format (erwartet X.X.X.X)"
 
-msgctxt "OPERATION_FM_IP_NUMBER3"
+msgctxt "FM_IP_NUMBER3"
 msgid "[_1] is more than 255"
 msgstr "{$octet} ist größer als 255"
 
-msgctxt "OPERATION_FM_USERNAME"
+msgctxt "FM_USERNAME"
 msgid ""
 "This field must look like a valid username (3 to 8 letters and numbers)"
 msgstr ""
 "Dieses Feld muß wie ein richtiger Benutzername aussehen (3 bis 8 Buchstaben "
 "und Zahlen)"
 
-msgctxt "OPERATION_FM_PASSWORD1"
+msgctxt "FM_PASSWORD1"
 msgid "You must provide a password."
 msgstr "Sie müssen ein Kennwort hinterlegen."
 
-msgctxt "OPERATION_FM_PASSWORD2"
+msgctxt "FM_PASSWORD2"
 msgid ""
 "The password you provided was not a good password.A good password must "
 "contain all of the following: upper case letter, lower case letter, number, "
@@ -535,18 +531,18 @@ msgstr ""
 " Kleinbuchstaben, Zahlen und nicht alphanumerische Zeichen beinhalten sowie "
 "mindestens 7 Zeichen lang sein."
 
-msgctxt "OPERATION_FM_MAC_ADDRESS1"
+msgctxt "FM_MAC_ADDRESS1"
 msgid "You must provide a MAC address."
 msgstr "Sie müssen eine MAC-Adresse eingeben."
 
-msgctxt "OPERATION_FM_MAC_ADDRESS2"
+msgctxt "FM_MAC_ADDRESS2"
 msgid "The MAC address you provided was not valid."
 msgstr "Die eingegebene MAC-Adresse ist unzulässig."
 
-msgctxt "OPERATION_FM_ERR_UNEXPECTED_DESC"
+msgctxt "FM_ERR_UNEXPECTED_DESC"
 msgid "Error: unexpected or missing characters in description"
 msgstr "Fehler: Unzulässige oder fehlende Zeichen in der Beschreibung"
 
-msgctxt "OPERATION_CSRF_VALIDATION_FAILURE"
-msgid "Placeholder for missing original text"
+msgctxt "CSRF_VALIDATION_FAILURE"
+msgid "Error: CSRF token is invalid or outdated."
 msgstr "Error: CSRF token is invalid or outdated."
diff --git a/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/General/pofiles/general_el.po b/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/General/pofiles/general_el.po
index 76a9be6..c0f41b7 100644
--- a/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/General/pofiles/general_el.po
+++ b/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/General/pofiles/general_el.po
@@ -5,99 +5,95 @@ msgstr ""
 "Language: None\n"
 "Content-Type: text/plain; charset=utf-8\n"
 
-msgctxt "OPERATION_Collaboration"
+msgctxt "Collaboration"
 msgid "Collaboration"
 msgstr "Συνεργασία"
 
-msgctxt "OPERATION_Administration"
+msgctxt "Administration"
 msgid "Administration"
 msgstr "Διαχείριση"
 
-msgctxt "OPERATION_Security"
+msgctxt "Security"
 msgid "Security"
 msgstr "Ασφάλεια"
 
-msgctxt "OPERATION_Configuration"
+msgctxt "Configuration"
 msgid "Configuration"
 msgstr "Ρύθμιση παραμέτρων συστήματος"
 
-msgctxt "OPERATION_Miscellaneous"
+msgctxt "Miscellaneous"
 msgid "Miscellaneous"
 msgstr "Διάφορα"
 
-msgctxt "OPERATION_Your Settings"
-msgid "Your Settings"
-msgstr "Οι ρυθμίσεις σας"
-
-msgctxt "OPERATION_SAVE"
+msgctxt "SAVE"
 msgid "Save"
 msgstr "Αποθήκευση"
 
-msgctxt "OPERATION_CANCEL"
+msgctxt "CANCEL"
 msgid "Cancel"
 msgstr "Ακύρωση"
 
-msgctxt "OPERATION_ENABLED"
+msgctxt "ENABLED"
 msgid "Enabled"
 msgstr "Ενεργοποιήθηκε"
 
-msgctxt "OPERATION_DISABLED"
+msgctxt "DISABLED"
 msgid "Disabled"
 msgstr "Απενεργοποιημένος/η/ο"
 
-msgctxt "OPERATION_NO"
+msgctxt "NO"
 msgid "No"
 msgstr "Όχι"
 
-msgctxt "OPERATION_YES"
+msgctxt "YES"
 msgid "Yes"
 msgstr "Ναι"
 
-msgctxt "OPERATION_ADD"
+msgctxt "ADD"
 msgid "Add"
 msgstr "Προσθήκη"
 
-msgctxt "OPERATION_CREATE"
+msgctxt "CREATE"
 msgid "Create"
 msgstr "Δημιουργία"
 
-msgctxt "OPERATION_MODIFY"
+msgctxt "MODIFY"
 msgid "Modify"
 msgstr "Τροποποίηση"
 
-msgctxt "OPERATION_REMOVE"
+msgctxt "REMOVE"
 msgid "Remove"
 msgstr "Διαγραφή"
 
-msgctxt "OPERATION_COMMENT"
+msgctxt "COMMENT"
 msgid "Comment"
 msgstr "Σχόλιο"
 
-msgctxt "OPERATION_NEXT"
+msgctxt "NEXT"
 msgid "Next"
 msgstr "Επόμενο"
 
-msgctxt "OPERATION_SELF"
+msgctxt "SELF"
 msgid "Self"
 msgstr "Ίδιο"
 
-msgctxt "OPERATION_REMOTE"
+msgctxt "REMOTE"
 msgid "Remote"
 msgstr "Απομακρυσμένο"
 
-msgctxt "OPERATION_LOCAL"
+msgctxt "LOCAL"
 msgid "Local"
 msgstr "Τοπικό"
 
-msgctxt "OPERATION_ACTION"
+msgctxt "ACTION"
 msgid "Action"
 msgstr "Ενέργεια"
 
-msgctxt "OPERATION_NETWORK"
+msgctxt "NETWORK"
 msgid "Network"
 msgstr "Δίκτυο"
 
-msgctxt "OPERATION_ROUTER"
+msgctxt "ROUTER"
 msgid "Router"
 msgstr "Δρομολογητής"
 
@@ -105,24 +101,24 @@ msgctxt "OPERATION_STATUS_REPORT"
 msgid "Operation status report"
 msgstr "Αναφορά κατάστασης λειτουργίας"
 
-msgctxt "OPERATION_ACCOUNT"
+msgctxt "ACCOUNT"
 msgid "Account"
 msgstr "Λογαριασμός"
 
-msgctxt "OPERATION_GROUP"
+msgctxt "GROUP"
 msgid "Group"
 msgstr "Ομάδα"
 
-msgctxt "OPERATION_DESC_SECTIONBAR"
+msgctxt "DESC_SECTIONBAR"
 msgid "<hr class=\"sectionbar\"/>"
-msgstr " <hr class=\"sectionbar\"/> "
+msgstr "<hr class=\"sectionbar\"/>"
 
-msgctxt "OPERATION_NO_PIPES_ALLOWED"
+msgctxt "NO_PIPES_ALLOWED"
 msgid "Pipe symbols (|) are not permitted in this field"
 msgstr ""
 "Το σύμβολο της κατακόρυφης μπάρας (|) δεν επιτρέπεται σ΄ετούτο το πεδίο"
 
-msgctxt "OPERATION_ERROR_BELOW"
+msgctxt "ERROR_BELOW"
 msgid ""
 "ERROR: There was an error in the validation of this page. Please scroll down"
 " and find the specific problem."
@@ -130,27 +126,27 @@ msgstr ""
 "ΣΦΑΛΜΑ: Συνέβη κάποιο σφάλμα στην επικύρωση της παρούσας σελίδας. Παρακαλώ "
 "κάντε κύλιση της οθόνη προς τα κάτω για να βρείτε το συγκεκριμένο πρόβλημα."
 
-msgctxt "OPERATION_ACCESS"
+msgctxt "ACCESS"
 msgid "Access"
 msgstr "Πρόσβαση"
 
-msgctxt "OPERATION_ACCOUNT_LOCKED"
+msgctxt "ACCOUNT_LOCKED"
 msgid "Account is locked"
 msgstr "Ο Λογαριασμός είναι κλειδωμένος"
 
-msgctxt "OPERATION_GROUP_ADD"
+msgctxt "GROUP_ADD"
 msgid "Add group"
 msgstr "Προσθήκη ομάδας"
 
-msgctxt "OPERATION_NETWORKS_ALLOW_LOCAL"
+msgctxt "NETWORKS_ALLOW_LOCAL"
 msgid "Allow access only from local networks"
 msgstr "Επιτρέπεται η πρόσβαση μόνον από τοπικά δίκτυα"
 
-msgctxt "OPERATION_NETWORKS_ALLOW_PUBLIC"
+msgctxt "NETWORKS_ALLOW_PUBLIC"
 msgid "Allow public access (entire Internet)"
 msgstr "Επιτρέπεται η δημόσια πρόσβαση (από ολόκληρο το Διαδίκτυο)"
 
-msgctxt "OPERATION_ERROR_PASSWORD_CHANGE"
+msgctxt "ERROR_PASSWORD_CHANGE"
 msgid ""
 "An error occurred while attempting to change your password. Please make sure"
 " that the old password entered is correct."
@@ -159,386 +155,386 @@ msgstr ""
 " Παρακαλώ σιγουρευτείτε ότι έγινε σωστή εισαγωγή του παλιού κωδικού "
 "πρόσβασης."
 
-msgctxt "OPERATION_BACK"
+msgctxt "BACK"
 msgid "Back"
 msgstr "Πίσω"
 
-msgctxt "OPERATION_BACKUP"
+msgctxt "BACKUP"
 msgid "Backup"
 msgstr "Αντίγραφο Ασφαλείας"
 
-msgctxt "OPERATION_DESCRIPTION_BRIEF"
+msgctxt "DESCRIPTION_BRIEF"
 msgid "Brief description"
 msgstr "Σύντομη περιγραφή"
 
-msgctxt "OPERATION_PASSWORD_CHANGE"
+msgctxt "PASSWORD_CHANGE"
 msgid "Change Password"
 msgstr "Αλλαγή κωδικού πρόσβασης"
 
-msgctxt "OPERATION_RESET_PASSWORD_TITLE"
+msgctxt "RESET_PASSWORD_TITLE"
 msgid "Reset user password"
 msgstr "Αρχικοποίηση (reset) αρχικού κωδικού πρόσβασης χρήστη"
 
-msgctxt "OPERATION_ACCOUNT_PASSWORD_CHANGE"
+msgctxt "ACCOUNT_PASSWORD_CHANGE"
 msgid "Change account password"
 msgstr "Αλλαγή κωδικού πρόσβασης λογαριασμού"
 
-msgctxt "OPERATION_CONTENT"
+msgctxt "CONTENT"
 msgid "Content"
 msgstr "Περιεχόμενο"
 
-msgctxt "OPERATION_CREATE_GROUP"
+msgctxt "CREATE_GROUP"
 msgid "Create user group"
 msgstr "Δημιουργία ομάδας χρηστών"
 
-msgctxt "OPERATION_USER_LIST_CURRENT"
+msgctxt "USER_LIST_CURRENT"
 msgid "Current list of users"
 msgstr "Τρέχουσα λίστα χρηστών"
 
-msgctxt "OPERATION_DESCRIPTION"
+msgctxt "DESCRIPTION"
 msgid "Description"
 msgstr "Περιγραφή"
 
-msgctxt "OPERATION_DESTINATION"
+msgctxt "DESTINATION"
 msgid "Destination"
 msgstr "Προορισμός"
 
-msgctxt "OPERATION_DOMAIN_NAME"
+msgctxt "DOMAIN_NAME"
 msgid "Domain name"
 msgstr "Όνομα τομέα"
 
-msgctxt "OPERATION_DOMAIN"
+msgctxt "DOMAIN"
 msgid "Domain"
 msgstr "Τομέας"
 
-msgctxt "OPERATION_DOMAINS"
+msgctxt "DOMAINS"
 msgid "Domains"
 msgstr "Τομείς"
 
-msgctxt "OPERATION_DOWNLOAD"
+msgctxt "DOWNLOAD"
 msgid "Download"
 msgstr "Λήψη"
 
-msgctxt "OPERATION_ERROR_UPDATING_CONFIGURATION"
+msgctxt "ERROR_UPDATING_CONFIGURATION"
 msgid "Error occurred while updating system configuration."
 msgstr "Σφάλμα συνέβη κατά την ενημέρωση των ρυθμίσεων παραμέτρων συστήματος."
 
-msgctxt "OPERATION_GROUP_MEMBERS"
+msgctxt "GROUP_MEMBERS"
 msgid "Group Members"
 msgstr "Μέλη ομάδας"
 
-msgctxt "OPERATION_GROUP_NAME"
+msgctxt "GROUP_NAME"
 msgid "Group Name"
 msgstr "Όνομα ομάδας"
 
-msgctxt "OPERATION_GROUPS"
+msgctxt "GROUPS"
 msgid "Groups"
 msgstr "Ομάδες"
 
-msgctxt "OPERATION_IP_ADDRESS"
+msgctxt "IP_ADDRESS"
 msgid "IP Address"
 msgstr "Διεύθυνση IP"
 
-msgctxt "OPERATION_IP_ADDRESS_OR_FQDN"
+msgctxt "IP_ADDRESS_OR_FQDN"
 msgid "IP Address or FQDN"
 msgstr "Διεύθυνση IP"
 
-msgctxt "OPERATION_USER_INVALID"
+msgctxt "USER_INVALID"
 msgid "Invalid user"
 msgstr "Μη-έγκυρος χρήστης"
 
-msgctxt "OPERATION_LOCATION"
+msgctxt "LOCATION"
 msgid "Location"
 msgstr "Τοποθεσία"
 
-msgctxt "OPERATION_MB"
+msgctxt "MB"
 msgid "Mb"
 msgstr "Mb"
 
-msgctxt "OPERATION_MODIFY_USER_GROUP"
+msgctxt "MODIFY_USER_GROUP"
 msgid "Modify user group"
 msgstr "Τροποποίηση ομάδας χρηστών"
 
-msgctxt "OPERATION_NAME"
+msgctxt "NAME"
 msgid "Name"
 msgstr "Όνομα"
 
-msgctxt "OPERATION_PASSWORD_VERIFY_NEW"
+msgctxt "PASSWORD_VERIFY_NEW"
 msgid "New password (verify):"
 msgstr "Νέος κωδικός πρόσβασης (επαλήθευση)"
 
-msgctxt "OPERATION_PASSWORD_NEW"
+msgctxt "PASSWORD_NEW"
 msgid "New password:"
 msgstr "Νέος κωδικός πρόσβασης:"
 
-msgctxt "OPERATION_OFF"
+msgctxt "OFF"
 msgid "Off"
 msgstr "Εκτός"
 
-msgctxt "OPERATION_OK"
+msgctxt "OK"
 msgid "Ok"
 msgstr "Εντάξει"
 
-msgctxt "OPERATION_PASSWORD_OLD"
+msgctxt "PASSWORD_OLD"
 msgid "Old password:"
 msgstr "Παλαιός κωδικός πρόσβασης:"
 
-msgctxt "OPERATION_ON"
+msgctxt "ON"
 msgid "On"
 msgstr "Εντός"
 
-msgctxt "OPERATION_PASSWORD"
+msgctxt "PASSWORD"
 msgid "Password"
 msgstr "Κωδικός πρόσβασης"
 
-msgctxt "OPERATION_PERFORM"
+msgctxt "PERFORM"
 msgid "Perform"
 msgstr "Εκτέλεση"
 
-msgctxt "OPERATION_RECONFIGURE"
+msgctxt "RECONFIGURE"
 msgid "Reconfigure"
 msgstr "Επαναρύθμιση παραμέτρων"
 
-msgctxt "OPERATION_REMOVE_USER_GROUP"
+msgctxt "REMOVE_USER_GROUP"
 msgid "Remove user group"
 msgstr "Διαγραφή ομάδας χρηστών"
 
-msgctxt "OPERATION_PASSWORD_RESET"
+msgctxt "PASSWORD_RESET"
 msgid "Reset password"
 msgstr "Αρχικοποίηση κωδικού πρόσβασης"
 
-msgctxt "OPERATION_RESTORE"
+msgctxt "RESTORE"
 msgid "Restore"
 msgstr "Επαναφορά"
 
-msgctxt "OPERATION_SHUTDOWN"
+msgctxt "SHUTDOWN"
 msgid "Shutdown"
 msgstr "Τερματισμός"
 
-msgctxt "OPERATION_SUCCESS"
+msgctxt "SUCCESS"
 msgid "Success"
 msgstr "Επιτυχής"
 
-msgctxt "OPERATION_ACCOUNT_NAME_INVALID"
+msgctxt "ACCOUNT_NAME_INVALID"
 msgid "The account name entered is invalid."
 msgstr "Η ονομασία λογαριασμού που πληκτρολογήσατε δεν είναι έγκυρη."
 
-msgctxt "OPERATION_ACCOUNT_NAME_INVALID_CHARS"
+msgctxt "ACCOUNT_NAME_INVALID_CHARS"
 msgid "The account name you entered contained invalid characters."
 msgstr ""
 "Η ονομασία του λογαριασμού που πληκτρολογήσατε περιλαμβάνει μη-έγκυρους "
 "χαρακτήρες."
 
-msgctxt "OPERATION_PASSWORD_OLD_INVALID_CHARS"
+msgctxt "PASSWORD_OLD_INVALID_CHARS"
 msgid "The old password you entered contained invalid characters."
 msgstr ""
 "Ο παλαιός κωδικός πρόσβασης που πληκτρολογήσατε περιέχει μη-έγκυρους "
 "χαρακτήρες."
 
-msgctxt "OPERATION_PASSWORD_INVALID_CHARS"
+msgctxt "PASSWORD_INVALID_CHARS"
 msgid "The password you entered contained invalid characters."
 msgstr ""
 "Ο κωδικός πρόσβασης που πληκτρολογήσατε περιέχει μη-έγκυρους χαρακτήρες."
 
-msgctxt "OPERATION_PASSWORD_VERIFY_ERROR"
+msgctxt "PASSWORD_VERIFY_ERROR"
 msgid "The passwords you entered did not match."
 msgstr "Οι κωδικοί πρόσβασης που πληκτρολογήσατε δεν ταυτίζονται."
 
-msgctxt "OPERATION_ACCOUNT_USER_NONE"
+msgctxt "ACCOUNT_USER_NONE"
 msgid "There are no user accounts in the system."
 msgstr "Δεν υφίστανται λογαριασμοί χρηστών στο σύστημα."
 
-msgctxt "OPERATION_ACCOUNT_GROUP_NONE"
+msgctxt "ACCOUNT_GROUP_NONE"
 msgid "There are no user groups in the system."
 msgstr "Δεν υφίστανται ομάδες χρηστών στο σύστημα."
 
-msgctxt "OPERATION_ERROR_INVALID_CHARS"
+msgctxt "ERROR_INVALID_CHARS"
 msgid "Unexpected characters in description."
 msgstr "Μη-αναμενόμενοι χαρακτήρες στην περιγραφή."
 
-msgctxt "OPERATION_USER_NAME"
+msgctxt "USER_NAME"
 msgid "User Name"
 msgstr "Όνομα χρήστη"
 
-msgctxt "OPERATION_YOUR_ACCOUNT"
+msgctxt "YOUR_ACCOUNT"
 msgid "Your account:"
 msgstr "Ο λογαριασμός σας:"
 
-msgctxt "OPERATION_YOUR_ACCOUNT_INVALID"
+msgctxt "YOUR_ACCOUNT_INVALID"
 msgid "The account name entered is invalid."
 msgstr "Η ονομασία λογαριασμού που πληκτρολογήσατε δεν είναι έγκυρη."
 
-msgctxt "OPERATION_PASSWORD_CHANGE_SUCCESS"
+msgctxt "PASSWORD_CHANGE_SUCCESS"
 msgid "Your password has been successfully changed."
 msgstr "Ο κωδικός πρόσβασής σας άλλαξε επιτυχώς."
 
-msgctxt "OPERATION_FM_NONBLANK"
+msgctxt "FM_NONBLANK"
 msgid "This field must not be left blank"
 msgstr "Αυτό το πεδίο δεν πρέπει ν΄αφεθεί κενό"
 
-msgctxt "OPERATION_FM_INTEGER"
+msgctxt "FM_INTEGER"
 msgid "This field must contain a positive integer"
 msgstr "Αυτό το πεδίο πρέπει να περιέχει ένα θετικό ακέραιο αριθμό"
 
-msgctxt "OPERATION_FM_NUMBER"
+msgctxt "FM_NUMBER"
 msgid "This field must contain a number"
 msgstr "Αυτό το πεδίο πρέπει να περιέχει έναν αριθμό"
 
-msgctxt "OPERATION_FM_WORD"
+msgctxt "FM_WORD"
 msgid "This field must look like a single word."
 msgstr "Αυτό το πεδίο πρέπει να μοιάζει με μία λέξη."
 
-msgctxt "OPERATION_FM_DATE"
+msgctxt "FM_DATE"
 msgid "The data entered could not be parsed as a date"
 msgstr ""
 "Τα δεδομένα που πληκτρολογήθηκαν δεν μπορούν να ερμηνευτούν σαν ημερομηνία"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_NUMBER1"
+msgctxt "FM_CREDIT_CARD_NUMBER1"
 msgid "You must enter a credit card number"
 msgstr "Πρέπει να πληκτρολογήσετε έναν αριθμό πιστωτικής κάρτας"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_NUMBER2"
+msgctxt "FM_CREDIT_CARD_NUMBER2"
 msgid ""
 "Credit card numbers shouldn\\'t have anything but numbers, spaces or dashes"
 msgstr ""
 "Ο αριθμός πιστωτικής κάρτας δεν μπορεί να περιέχει τίποτε άλλο παρά "
 "αριθμούς, κενά ή παύλες"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_NUMBER3"
+msgctxt "FM_CREDIT_CARD_NUMBER3"
 msgid "Must be at least 14 characters in length"
 msgstr "Πρέπει να έχει μήκος τουλάχιστον 14 χαρακτήρες"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_NUMBER4"
+msgctxt "FM_CREDIT_CARD_NUMBER4"
 msgid "Doesn\\'t appear to be a valid credit card number"
 msgstr "Δεν φαίνεται να είναι ένας έγκυρος αριθμός πιστωτικής κάρτας"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_EXPIRY1"
+msgctxt "FM_CREDIT_CARD_EXPIRY1"
 msgid "No expiry date entered."
 msgstr "Δεν πληκτρολογήθηκε ημερομηνία λήξης ισχύος."
 
-msgctxt "OPERATION_FM_CREDIT_CARD_EXPIRY2"
+msgctxt "FM_CREDIT_CARD_EXPIRY2"
 msgid "Expiry date must be in the format MM/YY or MM/YYYY"
 msgstr "Η ημερομηνία λήξης ισχύος πρέπει να είναι φόρμας MM/YY ή MM/YYYY"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_EXPIRY3"
+msgctxt "FM_CREDIT_CARD_EXPIRY3"
 msgid "This expiry date appears to have already passed"
 msgstr "Η ημερομηνία λήξης ισχύος φαίνεται να έχει ήδη παρέλθει"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_EXPIRY4"
+msgctxt "FM_CREDIT_CARD_EXPIRY4"
 msgid "This expiry date appears to be too far in the future"
 msgstr "Η ημερομηνία λήξης ισχύος φαίνεται να είναι πολύ μακριά στο μέλλον"
 
-msgctxt "OPERATION_FM_ISO_COUNTRY_CODE1"
+msgctxt "FM_ISO_COUNTRY_CODE1"
 msgid "You must provide a country code"
 msgstr "Πρέπει να δώσετε ένα κωδικό χώρας"
 
-msgctxt "OPERATION_FM_ISO_COUNTRY_CODE2"
+msgctxt "FM_ISO_COUNTRY_CODE2"
 msgid "This field does not contain an ISO country code"
 msgstr "Αυτό το πεδίο δεν περιέχει έναν ISO κωδικό χώρας"
 
-msgctxt "OPERATION_FM_US_STATE"
+msgctxt "FM_US_STATE"
 msgid "This doesn\\'t appear to be a valid 2-letter US state abbreviation"
 msgstr ""
 "Αυτός δεν φαίνεται να είναι ένας έγκυρος διγράμματος κωδικός Πολιτείας των "
 "Η.Π.Α"
 
-msgctxt "OPERATION_FM_US_ZIPCODE"
+msgctxt "FM_US_ZIPCODE"
 msgid "US zip codes must contain 5 or 9 numbers"
 msgstr "Οι ταχυδρομικοί κωδικοί των Η.Π.Α πρέπει να περιέχουν 5 ή 9 ψηφία"
 
-msgctxt "OPERATION_FM_MINLENGTH1"
+msgctxt "FM_MINLENGTH1"
 msgid "Minimum length has been specified meaninglessly as [_1]"
 msgstr "Το ελάχιστο μήκος έχει ορισθεί χωρίς νόημα ως {$minlength}"
 
-msgctxt "OPERATION_FM_MINLENGTH2"
+msgctxt "FM_MINLENGTH2"
 msgid "This field must be at least [_1] characters"
 msgstr "Αυτό το πεδίο πρέπει να είναι τουλάχιστον {$minlength} χαρακτήρες"
 
-msgctxt "OPERATION_FM_MAXLENGTH1"
+msgctxt "FM_MAXLENGTH1"
 msgid "Maximum length has been specified meaninglessly as [_1]"
 msgstr "Το μέγιστο μήκος έχει ορισθεί χωρίς νόημα ως {$maxlength}"
 
-msgctxt "OPERATION_FM_MAXLENGTH2"
+msgctxt "FM_MAXLENGTH2"
 msgid "This field must be no more than [_1] characters"
 msgstr ""
 "Αυτό το πεδίο δεν μπορεί να περιέχει περισσότερους από {$maxlength} "
 "χαρακτήρες"
 
-msgctxt "OPERATION_FM_EXACTLENGTH1"
+msgctxt "FM_EXACTLENGTH1"
 msgid "You must specify the length for the field."
 msgstr "Πρέπει να ορίσετε το μήκος του πεδίου."
 
-msgctxt "OPERATION_FM_EXACTLENGTH2"
+msgctxt "FM_EXACTLENGTH2"
 msgid "You must specify the exactlength of the field with an integer"
 msgstr "Πρέπει να ορίσετε το ακριβές μήκος του πεδίου δι΄ ενός ακεραίου"
 
-msgctxt "OPERATION_FM_EXACTLENGTH3"
+msgctxt "FM_EXACTLENGTH3"
 msgid "This field must be exactly [_1] characters"
 msgstr "Αυτό το πεδίο θα πρέπει να είναι ακριβώς {$exactlength} χαρακτήρες"
 
-msgctxt "OPERATION_FM_LENGTHRANGE1"
+msgctxt "FM_LENGTHRANGE1"
 msgid "You must specify the maximum and minimum length for the field."
 msgstr "Πρέπει να ορίσετε το μέγιστο και το ελάχιστο μήκος για το πεδίο."
 
-msgctxt "OPERATION_FM_LENGTHRANGE2"
+msgctxt "FM_LENGTHRANGE2"
 msgid ""
 "You must specify the maximum and minimum lengths of the field with an "
 "integer"
 msgstr ""
 "Πρέπει να ορίσετε το μέγιστο και ελάχιστο μήκος του πεδίου δι΄ ενός ακεραίου"
 
-msgctxt "OPERATION_FM_LENGTHRANGE3"
+msgctxt "FM_LENGTHRANGE3"
 msgid "This field must be between [_1] and [_2] characters"
 msgstr ""
 "Αυτό το πεδίο πρέπει να είναι μεταξύ {$minlength} και {$maxlength} "
 "χαρακτήρες"
 
-msgctxt "OPERATION_FM_URL"
+msgctxt "FM_URL"
 msgid "This field must contain a URL starting with http:// or ftp://"
 msgstr "Το πεδίο πρέπει να περιέχει ένα URL που ν΄αρχίζει με http:// ή ftp://"
 
-msgctxt "OPERATION_FM_EMAIL_SIMPLE1"
+msgctxt "FM_EMAIL_SIMPLE1"
 msgid "You must enter an email address."
 msgstr "Πρέπει να πληκτρολογήσετε μια διεύθυνση ηλεκτρονικής αλληλογραφίας."
 
-msgctxt "OPERATION_FM_EMAIL_SIMPLE2"
+msgctxt "FM_EMAIL_SIMPLE2"
 msgid "This field doesn\\'t look like an RFC822-compliant email address"
 msgstr ""
 "Αυτό το πεδίο δεν μοιάζει με μία συμβατή προς RFC822 διεύθυνση ηλεκτρονικής "
 "αλληλογραφίας"
 
-msgctxt "OPERATION_FM_DOMAIN_NAME"
+msgctxt "FM_DOMAIN_NAME"
 msgid "This field doesn\\'t look like a valid Internet domain name or hostname."
 msgstr ""
 "Αυτό το πεδίο δεν μοιάζει με μία έγκυρη ονομασία τομέα διαδικτύου ή δικτυακή"
 " ονομασία Η/Υ."
 
-msgctxt "OPERATION_FM_IP_NUMBER1"
+msgctxt "FM_IP_NUMBER1"
 msgid "This field must contain a valid IP number and can not be left blank."
 msgstr ""
 "Αυτό το πεδίο πρέπει να περιέχει μία έγκυρη διεύθυνση IP και δεν μπορεί να "
 "αφεθεί κενό."
 
-msgctxt "OPERATION_FM_IP_NUMBER2"
+msgctxt "FM_IP_NUMBER2"
 msgid "Invalid IP address format (expected X.X.X.X)"
 msgstr "Invalid IP address format (expected X.X.X.X)"
 
-msgctxt "OPERATION_FM_IP_NUMBER3"
+msgctxt "FM_IP_NUMBER3"
 msgid "[_1] is more than 255"
 msgstr "{$octet} είναι μεγαλύτερο από 255"
 
-msgctxt "OPERATION_FM_USERNAME"
+msgctxt "FM_USERNAME"
 msgid ""
 "This field must look like a valid username (3 to 8 letters and numbers)"
 msgstr ""
 "Το πεδίο πρέπει να μοιάζει με ένα έγκυρο όνομα χρήστη (3 έως 8 γράμματα και "
 "αριθμητικά ψηφία)"
 
-msgctxt "OPERATION_FM_PASSWORD1"
+msgctxt "FM_PASSWORD1"
 msgid "You must provide a password."
 msgstr "Πρέπει να δώσετε ένα κωδικό πρόσβασης."
 
-msgctxt "OPERATION_FM_PASSWORD2"
+msgctxt "FM_PASSWORD2"
 msgid ""
 "The password you provided was not a good password.A good password must "
 "contain all of the following: upper case letter, lower case letter, number, "
@@ -549,18 +545,18 @@ msgstr ""
 "αριθμητικά ψηφία, μη αλφαριθμητικούς χαρακτήρες και να έχει μήκος "
 "τουλάχιστον 7 χαρακτήρων."
 
-msgctxt "OPERATION_FM_MAC_ADDRESS1"
+msgctxt "FM_MAC_ADDRESS1"
 msgid "You must provide a MAC address."
 msgstr "Πρέπει να δώσετε μια MAC διεύθυνση."
 
-msgctxt "OPERATION_FM_MAC_ADDRESS2"
+msgctxt "FM_MAC_ADDRESS2"
 msgid "The MAC address you provided was not valid."
 msgstr "Η MAC διεύθυνση που δώσατε δεν είναι έγκυρη."
 
-msgctxt "OPERATION_FM_ERR_UNEXPECTED_DESC"
+msgctxt "FM_ERR_UNEXPECTED_DESC"
 msgid "Error: unexpected or missing characters in description"
 msgstr "Σφάλμα: μη αναμενόμενοι ή ελλείποντες χαρακτήρες στην περιγραφή"
 
-msgctxt "OPERATION_CSRF_VALIDATION_FAILURE"
-msgid "Placeholder for missing original text"
+msgctxt "CSRF_VALIDATION_FAILURE"
+msgid "Error: CSRF token is invalid or outdated."
 msgstr "Error: CSRF token is invalid or outdated."
diff --git a/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/General/pofiles/general_en.po b/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/General/pofiles/general_en.po
index f635cd9..c564986 100644
--- a/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/General/pofiles/general_en.po
+++ b/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/General/pofiles/general_en.po
@@ -25,10 +25,6 @@ msgctxt "hello"
 msgid "hello"
 msgstr ""
 
-msgctxt "All rights reserved"
-msgid "All Rights Reserved"
-msgstr ""
-
 msgctxt "Collaboration"
 msgid "Collaboration"
 msgstr ""
@@ -49,10 +45,6 @@ msgctxt "Miscellaneous"
 msgid "Miscellaneous"
 msgstr ""
 
-msgctxt "Your Settings"
-msgid "Your Settings"
-msgstr ""
-
 msgctxt "SAVE"
 msgid "Save"
 msgstr ""
@@ -552,114 +544,76 @@ msgctxt "FM_ERR_UNEXPECTED_DESC"
 msgid "Error: unexpected or missing characters in description"
 msgstr ""
 
-msgctxt ""
-"\n"
-"swt_THEME "
+msgctxt "swt_THEME"
 msgid "Theme"
 msgstr ""
 
-msgctxt ""
-"\n"
-"swt_LOGIN_AGAIN "
+msgctxt "swt_LOGIN_AGAIN"
 msgid "You may need to login again to see the choosed theme"
 msgstr ""
 
-msgctxt ""
-"\n"
-"acs_NO "
+msgctxt "acs_NO"
 msgid "Not Authorized"
 msgstr ""
 
-msgctxt ""
-"\n"
-"acs_LOGIN "
+msgctxt "acs_LOGIN"
 msgid "Login required"
 msgstr ""
 
-msgctxt ""
-"\n"
-"acs_ADMIN "
+msgctxt "acs_ADMIN"
 msgid "Admin rights required"
 msgstr ""
 
-msgctxt "User password"
-msgid "User password"
-msgstr ""
-
 msgctxt ""
-"\n"
-"Logout "
+",\n"
+"Logout"
 msgid "Logout"
 msgstr ""
 
-msgctxt ""
-"\n"
-"Home "
+msgctxt "Home"
 msgid "Home"
 msgstr ""
 
-msgctxt ""
-"\n"
-"CSRF_VALIDATION_FAILURE "
+msgctxt "CSRF_VALIDATION_FAILURE"
 msgid "Error: CSRF token is invalid or outdated."
 msgstr ""
 
-msgctxt ""
-"\n"
-"Empty "
+msgctxt "Empty"
 msgid "Empty"
 msgstr ""
 
-msgctxt ""
-"\n"
-"Active "
+msgctxt "Active"
 msgid "Active"
 msgstr ""
 
-msgctxt ""
-"\n"
-"MINUTE "
+msgctxt "MINUTE"
 msgid "Minute"
 msgstr ""
 
-msgctxt ""
-"\n"
-"MINUTES "
+msgctxt "MINUTES"
 msgid "Minutes"
 msgstr ""
 
-msgctxt ""
-"\n"
-"HOUR "
+msgctxt "HOUR"
 msgid "Hour"
 msgstr ""
 
-msgctxt ""
-"\n"
-"HOURS "
+msgctxt "HOURS"
 msgid "Hours"
 msgstr ""
 
-msgctxt ""
-"\n"
-"SMALL "
+msgctxt "SMALL"
 msgid "Small"
 msgstr ""
 
-msgctxt ""
-"\n"
-"MEDIUM "
+msgctxt "MEDIUM"
 msgid "Medium"
 msgstr ""
 
-msgctxt ""
-"\n"
-"LARGE "
+msgctxt "LARGE"
 msgid "Large"
 msgstr ""
 
-msgctxt ""
-"\n"
-"FIELD_INVALID_CHARS "
+msgctxt "FIELD_INVALID_CHARS"
 msgid "A field you entered contains invalid characters."
 msgstr ""
diff --git a/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/General/pofiles/general_es.po b/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/General/pofiles/general_es.po
index 716f354..6d303d8 100644
--- a/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/General/pofiles/general_es.po
+++ b/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/General/pofiles/general_es.po
@@ -5,99 +5,95 @@ msgstr ""
 "Language: None\n"
 "Content-Type: text/plain; charset=utf-8\n"
 
-msgctxt "OPERATION_Collaboration"
+msgctxt "Collaboration"
 msgid "Collaboration"
 msgstr "Colaboración"
 
-msgctxt "OPERATION_Administration"
+msgctxt "Administration"
 msgid "Administration"
 msgstr "Administración"
 
-msgctxt "OPERATION_Security"
+msgctxt "Security"
 msgid "Security"
 msgstr "Seguridad"
 
-msgctxt "OPERATION_Configuration"
+msgctxt "Configuration"
 msgid "Configuration"
 msgstr "Configuración"
 
-msgctxt "OPERATION_Miscellaneous"
+msgctxt "Miscellaneous"
 msgid "Miscellaneous"
 msgstr "Misceláneo"
 
-msgctxt "OPERATION_Your Settings"
-msgid "Your Settings"
-msgstr "Sus Ajustes"
-
-msgctxt "OPERATION_SAVE"
+msgctxt "SAVE"
 msgid "Save"
 msgstr "Guardar"
 
-msgctxt "OPERATION_CANCEL"
+msgctxt "CANCEL"
 msgid "Cancel"
 msgstr "Cancelar"
 
-msgctxt "OPERATION_ENABLED"
+msgctxt "ENABLED"
 msgid "Enabled"
 msgstr "Habilitado"
 
-msgctxt "OPERATION_DISABLED"
+msgctxt "DISABLED"
 msgid "Disabled"
 msgstr "Deshabilitado"
 
-msgctxt "OPERATION_NO"
+msgctxt "NO"
 msgid "No"
 msgstr "No"
 
-msgctxt "OPERATION_YES"
+msgctxt "YES"
 msgid "Yes"
 msgstr "Sí"
 
-msgctxt "OPERATION_ADD"
+msgctxt "ADD"
 msgid "Add"
 msgstr "Agregar"
 
-msgctxt "OPERATION_CREATE"
+msgctxt "CREATE"
 msgid "Create"
 msgstr "Crear"
 
-msgctxt "OPERATION_MODIFY"
+msgctxt "MODIFY"
 msgid "Modify"
 msgstr "Modificar"
 
-msgctxt "OPERATION_REMOVE"
+msgctxt "REMOVE"
 msgid "Remove"
 msgstr "Eliminar"
 
-msgctxt "OPERATION_COMMENT"
+msgctxt "COMMENT"
 msgid "Comment"
 msgstr "Comentario"
 
-msgctxt "OPERATION_NEXT"
+msgctxt "NEXT"
 msgid "Next"
 msgstr "Siguiente"
 
-msgctxt "OPERATION_SELF"
+msgctxt "SELF"
 msgid "Self"
 msgstr "Auto"
 
-msgctxt "OPERATION_REMOTE"
+msgctxt "REMOTE"
 msgid "Remote"
 msgstr "Remoto"
 
-msgctxt "OPERATION_LOCAL"
+msgctxt "LOCAL"
 msgid "Local"
 msgstr "Local"
 
-msgctxt "OPERATION_ACTION"
+msgctxt "ACTION"
 msgid "Action"
 msgstr "Acción"
 
-msgctxt "OPERATION_NETWORK"
+msgctxt "NETWORK"
 msgid "Network"
 msgstr "Red"
 
-msgctxt "OPERATION_ROUTER"
+msgctxt "ROUTER"
 msgid "Router"
 msgstr "Router"
 
@@ -105,23 +101,23 @@ msgctxt "OPERATION_STATUS_REPORT"
 msgid "Operation status report"
 msgstr "Estado de la operación"
 
-msgctxt "OPERATION_ACCOUNT"
+msgctxt "ACCOUNT"
 msgid "Account"
 msgstr "Cuenta"
 
-msgctxt "OPERATION_GROUP"
+msgctxt "GROUP"
 msgid "Group"
 msgstr "Grupo"
 
-msgctxt "OPERATION_DESC_SECTIONBAR"
+msgctxt "DESC_SECTIONBAR"
 msgid "<hr class=\"sectionbar\"/>"
-msgstr " <hr class=\"sectionbar\"/> "
+msgstr "<hr class=\"sectionbar\"/>"
 
-msgctxt "OPERATION_NO_PIPES_ALLOWED"
+msgctxt "NO_PIPES_ALLOWED"
 msgid "Pipe symbols (|) are not permitted in this field"
 msgstr "Los símbolos pipe (|) no están permitidos en este campo"
 
-msgctxt "OPERATION_ERROR_BELOW"
+msgctxt "ERROR_BELOW"
 msgid ""
 "ERROR: There was an error in the validation of this page. Please scroll down"
 " and find the specific problem."
@@ -129,27 +125,27 @@ msgstr ""
 "ERROR: Se ha producido un error en la validación de esta página. Por favor, "
 "desplácese hacia abajo y busque el problema específico."
 
-msgctxt "OPERATION_ACCESS"
+msgctxt "ACCESS"
 msgid "Access"
 msgstr "Acceso"
 
-msgctxt "OPERATION_ACCOUNT_LOCKED"
+msgctxt "ACCOUNT_LOCKED"
 msgid "Account is locked"
 msgstr "Cuenta bloqueada"
 
-msgctxt "OPERATION_GROUP_ADD"
+msgctxt "GROUP_ADD"
 msgid "Add group"
 msgstr "Agregar grupo"
 
-msgctxt "OPERATION_NETWORKS_ALLOW_LOCAL"
+msgctxt "NETWORKS_ALLOW_LOCAL"
 msgid "Allow access only from local networks"
 msgstr "Permitir acceso sólo desde redes locales"
 
-msgctxt "OPERATION_NETWORKS_ALLOW_PUBLIC"
+msgctxt "NETWORKS_ALLOW_PUBLIC"
 msgid "Allow public access (entire Internet)"
 msgstr "Permitir acceso público (desde toda la Web)"
 
-msgctxt "OPERATION_ERROR_PASSWORD_CHANGE"
+msgctxt "ERROR_PASSWORD_CHANGE"
 msgid ""
 "An error occurred while attempting to change your password. Please make sure"
 " that the old password entered is correct."
@@ -157,370 +153,370 @@ msgstr ""
 "Ocurrió un error al intentar cambiar su contraseña. Asegúrese de que la "
 "antigua contraseña ingresada esté correcta."
 
-msgctxt "OPERATION_BACK"
+msgctxt "BACK"
 msgid "Back"
 msgstr "Atrás"
 
-msgctxt "OPERATION_BACKUP"
+msgctxt "BACKUP"
 msgid "Backup"
 msgstr "Respaldar"
 
-msgctxt "OPERATION_DESCRIPTION_BRIEF"
+msgctxt "DESCRIPTION_BRIEF"
 msgid "Brief description"
 msgstr "Breve descripción"
 
-msgctxt "OPERATION_PASSWORD_CHANGE"
+msgctxt "PASSWORD_CHANGE"
 msgid "Change Password"
 msgstr "Cambiar Contraseña"
 
-msgctxt "OPERATION_RESET_PASSWORD_TITLE"
+msgctxt "RESET_PASSWORD_TITLE"
 msgid "Reset user password"
 msgstr "Restablecer la contraseña de usuario"
 
-msgctxt "OPERATION_ACCOUNT_PASSWORD_CHANGE"
+msgctxt "ACCOUNT_PASSWORD_CHANGE"
 msgid "Change account password"
 msgstr "Cambiar contraseña de la cuenta"
 
-msgctxt "OPERATION_CONTENT"
+msgctxt "CONTENT"
 msgid "Content"
 msgstr "Contenido"
 
-msgctxt "OPERATION_CREATE_GROUP"
+msgctxt "CREATE_GROUP"
 msgid "Create user group"
 msgstr "Crear grupo de usuario"
 
-msgctxt "OPERATION_USER_LIST_CURRENT"
+msgctxt "USER_LIST_CURRENT"
 msgid "Current list of users"
 msgstr "Lista actual de usuarios"
 
-msgctxt "OPERATION_DESCRIPTION"
+msgctxt "DESCRIPTION"
 msgid "Description"
 msgstr "Descripción"
 
-msgctxt "OPERATION_DESTINATION"
+msgctxt "DESTINATION"
 msgid "Destination"
 msgstr "Destino"
 
-msgctxt "OPERATION_DOMAIN_NAME"
+msgctxt "DOMAIN_NAME"
 msgid "Domain name"
 msgstr "Nombre del dominio"
 
-msgctxt "OPERATION_DOMAIN"
+msgctxt "DOMAIN"
 msgid "Domain"
 msgstr "Dominio"
 
-msgctxt "OPERATION_DOMAINS"
+msgctxt "DOMAINS"
 msgid "Domains"
 msgstr "Dominios"
 
-msgctxt "OPERATION_DOWNLOAD"
+msgctxt "DOWNLOAD"
 msgid "Download"
 msgstr "Descargar"
 
-msgctxt "OPERATION_ERROR_UPDATING_CONFIGURATION"
+msgctxt "ERROR_UPDATING_CONFIGURATION"
 msgid "Error occurred while updating system configuration."
 msgstr ""
 "Ocurrió un error mientras se actualizaba la configuración del sistema."
 
-msgctxt "OPERATION_GROUP_MEMBERS"
+msgctxt "GROUP_MEMBERS"
 msgid "Group Members"
 msgstr "Miembros del Grupo"
 
-msgctxt "OPERATION_GROUP_NAME"
+msgctxt "GROUP_NAME"
 msgid "Group Name"
 msgstr "Nombre del Grupo"
 
-msgctxt "OPERATION_GROUPS"
+msgctxt "GROUPS"
 msgid "Groups"
 msgstr "Grupos"
 
-msgctxt "OPERATION_IP_ADDRESS"
+msgctxt "IP_ADDRESS"
 msgid "IP Address"
 msgstr "Dirección IP"
 
-msgctxt "OPERATION_IP_ADDRESS_OR_FQDN"
+msgctxt "IP_ADDRESS_OR_FQDN"
 msgid "IP Address or FQDN"
 msgstr "Dirección IP o FQDN"
 
-msgctxt "OPERATION_USER_INVALID"
+msgctxt "USER_INVALID"
 msgid "Invalid user"
 msgstr "Usuario inválido"
 
-msgctxt "OPERATION_LOCATION"
+msgctxt "LOCATION"
 msgid "Location"
 msgstr "Ubicación"
 
-msgctxt "OPERATION_MB"
+msgctxt "MB"
 msgid "Mb"
 msgstr "Mb"
 
-msgctxt "OPERATION_MODIFY_USER_GROUP"
+msgctxt "MODIFY_USER_GROUP"
 msgid "Modify user group"
 msgstr "Modificar grupo de usuario"
 
-msgctxt "OPERATION_NAME"
+msgctxt "NAME"
 msgid "Name"
 msgstr "Nombre"
 
-msgctxt "OPERATION_PASSWORD_VERIFY_NEW"
+msgctxt "PASSWORD_VERIFY_NEW"
 msgid "New password (verify):"
 msgstr "Nueva contraseña (repetir):"
 
-msgctxt "OPERATION_PASSWORD_NEW"
+msgctxt "PASSWORD_NEW"
 msgid "New password:"
 msgstr "Nueva contraseña:"
 
-msgctxt "OPERATION_OFF"
+msgctxt "OFF"
 msgid "Off"
 msgstr "Apagado"
 
-msgctxt "OPERATION_OK"
+msgctxt "OK"
 msgid "Ok"
 msgstr "Ok"
 
-msgctxt "OPERATION_PASSWORD_OLD"
+msgctxt "PASSWORD_OLD"
 msgid "Old password:"
 msgstr "Contraseña antigua:"
 
-msgctxt "OPERATION_ON"
+msgctxt "ON"
 msgid "On"
 msgstr "Encendido"
 
-msgctxt "OPERATION_PASSWORD"
+msgctxt "PASSWORD"
 msgid "Password"
 msgstr "Contraseña"
 
-msgctxt "OPERATION_PERFORM"
+msgctxt "PERFORM"
 msgid "Perform"
 msgstr "Ejecutar"
 
-msgctxt "OPERATION_RECONFIGURE"
+msgctxt "RECONFIGURE"
 msgid "Reconfigure"
 msgstr "Reconfigurar"
 
-msgctxt "OPERATION_REMOVE_USER_GROUP"
+msgctxt "REMOVE_USER_GROUP"
 msgid "Remove user group"
 msgstr "Eliminar grupo de usuario"
 
-msgctxt "OPERATION_PASSWORD_RESET"
+msgctxt "PASSWORD_RESET"
 msgid "Reset password"
 msgstr "Restablecer contraseña"
 
-msgctxt "OPERATION_RESTORE"
+msgctxt "RESTORE"
 msgid "Restore"
 msgstr "Restaurar"
 
-msgctxt "OPERATION_SHUTDOWN"
+msgctxt "SHUTDOWN"
 msgid "Shutdown"
 msgstr "Apagar"
 
-msgctxt "OPERATION_SUCCESS"
+msgctxt "SUCCESS"
 msgid "Success"
 msgstr "Correcto"
 
-msgctxt "OPERATION_ACCOUNT_NAME_INVALID"
+msgctxt "ACCOUNT_NAME_INVALID"
 msgid "The account name entered is invalid."
 msgstr "El nombre de cuenta que escribió es inválido."
 
-msgctxt "OPERATION_ACCOUNT_NAME_INVALID_CHARS"
+msgctxt "ACCOUNT_NAME_INVALID_CHARS"
 msgid "The account name you entered contained invalid characters."
 msgstr "El nombre de cuenta que escribió contiene caracteres inválidos."
 
-msgctxt "OPERATION_PASSWORD_OLD_INVALID_CHARS"
+msgctxt "PASSWORD_OLD_INVALID_CHARS"
 msgid "The old password you entered contained invalid characters."
 msgstr "La contraseña antigua que escribió contiene caracteres inválidos."
 
-msgctxt "OPERATION_PASSWORD_INVALID_CHARS"
+msgctxt "PASSWORD_INVALID_CHARS"
 msgid "The password you entered contained invalid characters."
 msgstr "La contraseña que escribió contiene caracteres inválidos."
 
-msgctxt "OPERATION_PASSWORD_VERIFY_ERROR"
+msgctxt "PASSWORD_VERIFY_ERROR"
 msgid "The passwords you entered did not match."
 msgstr "Las contraseñas que escribió no coinciden."
 
-msgctxt "OPERATION_ACCOUNT_USER_NONE"
+msgctxt "ACCOUNT_USER_NONE"
 msgid "There are no user accounts in the system."
 msgstr "No hay cuentas de usuario en el sistema."
 
-msgctxt "OPERATION_ACCOUNT_GROUP_NONE"
+msgctxt "ACCOUNT_GROUP_NONE"
 msgid "There are no user groups in the system."
 msgstr "No hay grupos de usuario en el sistema."
 
-msgctxt "OPERATION_ERROR_INVALID_CHARS"
+msgctxt "ERROR_INVALID_CHARS"
 msgid "Unexpected characters in description."
 msgstr "Caracteres erróneos en la descripción."
 
-msgctxt "OPERATION_USER_NAME"
+msgctxt "USER_NAME"
 msgid "User Name"
 msgstr "Nombre de Usuario"
 
-msgctxt "OPERATION_YOUR_ACCOUNT"
+msgctxt "YOUR_ACCOUNT"
 msgid "Your account:"
 msgstr "Su cuenta:"
 
-msgctxt "OPERATION_YOUR_ACCOUNT_INVALID"
+msgctxt "YOUR_ACCOUNT_INVALID"
 msgid "The account name entered is invalid."
 msgstr "El nombre de cuenta que escribió es inválido."
 
-msgctxt "OPERATION_PASSWORD_CHANGE_SUCCESS"
+msgctxt "PASSWORD_CHANGE_SUCCESS"
 msgid "Your password has been successfully changed."
 msgstr "Se cambió con éxito la contraseña."
 
-msgctxt "OPERATION_FM_NONBLANK"
+msgctxt "FM_NONBLANK"
 msgid "This field must not be left blank"
 msgstr "Este campo no puede dejarse en blanco"
 
-msgctxt "OPERATION_FM_INTEGER"
+msgctxt "FM_INTEGER"
 msgid "This field must contain a positive integer"
 msgstr "Este campo debe contener un número entero positivo"
 
-msgctxt "OPERATION_FM_NUMBER"
+msgctxt "FM_NUMBER"
 msgid "This field must contain a number"
 msgstr "Este campo debe contener un número"
 
-msgctxt "OPERATION_FM_WORD"
+msgctxt "FM_WORD"
 msgid "This field must look like a single word."
 msgstr "Este campo debe tener una sola palabra."
 
-msgctxt "OPERATION_FM_DATE"
+msgctxt "FM_DATE"
 msgid "The data entered could not be parsed as a date"
 msgstr "Los datos ingresados no pueden analizarse como una fecha"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_NUMBER1"
+msgctxt "FM_CREDIT_CARD_NUMBER1"
 msgid "You must enter a credit card number"
 msgstr "Debe ingresar un número de tarjeta de crédito"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_NUMBER2"
+msgctxt "FM_CREDIT_CARD_NUMBER2"
 msgid ""
 "Credit card numbers shouldn\\'t have anything but numbers, spaces or dashes"
 msgstr ""
 "Los números de la tarjeta solo pueden contener números, espacios o guiones"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_NUMBER3"
+msgctxt "FM_CREDIT_CARD_NUMBER3"
 msgid "Must be at least 14 characters in length"
 msgstr "Debe tener al menos 14 caracteres de longitud"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_NUMBER4"
+msgctxt "FM_CREDIT_CARD_NUMBER4"
 msgid "Doesn\\'t appear to be a valid credit card number"
 msgstr "No parece ser un número de tarjeta de crédito válido"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_EXPIRY1"
+msgctxt "FM_CREDIT_CARD_EXPIRY1"
 msgid "No expiry date entered."
 msgstr "No se ingresó la fecha de vencimiento."
 
-msgctxt "OPERATION_FM_CREDIT_CARD_EXPIRY2"
+msgctxt "FM_CREDIT_CARD_EXPIRY2"
 msgid "Expiry date must be in the format MM/YY or MM/YYYY"
 msgstr "La fecha de vencimiento debe estar en el formato MM/YY o MM/YYYY"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_EXPIRY3"
+msgctxt "FM_CREDIT_CARD_EXPIRY3"
 msgid "This expiry date appears to have already passed"
 msgstr "Esta fecha de vencimiento ya ha sido superada"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_EXPIRY4"
+msgctxt "FM_CREDIT_CARD_EXPIRY4"
 msgid "This expiry date appears to be too far in the future"
 msgstr "Esta fecha de vencimiento parece ser muy lejana"
 
-msgctxt "OPERATION_FM_ISO_COUNTRY_CODE1"
+msgctxt "FM_ISO_COUNTRY_CODE1"
 msgid "You must provide a country code"
 msgstr "Debe proveer un código de país"
 
-msgctxt "OPERATION_FM_ISO_COUNTRY_CODE2"
+msgctxt "FM_ISO_COUNTRY_CODE2"
 msgid "This field does not contain an ISO country code"
 msgstr "Este campo no incluye un código de país ISO"
 
-msgctxt "OPERATION_FM_US_STATE"
+msgctxt "FM_US_STATE"
 msgid "This doesn\\'t appear to be a valid 2-letter US state abbreviation"
 msgstr "No parece ser una abreviatura de estado de US valida de 2-letras"
 
-msgctxt "OPERATION_FM_US_ZIPCODE"
+msgctxt "FM_US_ZIPCODE"
 msgid "US zip codes must contain 5 or 9 numbers"
 msgstr "El código postal de US debe contener 5 o 9 números"
 
-msgctxt "OPERATION_FM_MINLENGTH1"
+msgctxt "FM_MINLENGTH1"
 msgid "Minimum length has been specified meaninglessly as [_1]"
 msgstr "La longitud mínima ha sido especificada en {$minlength}"
 
-msgctxt "OPERATION_FM_MINLENGTH2"
+msgctxt "FM_MINLENGTH2"
 msgid "This field must be at least [_1] characters"
 msgstr "Este campo debe ser de al menos {$minlength} caracteres"
 
-msgctxt "OPERATION_FM_MAXLENGTH1"
+msgctxt "FM_MAXLENGTH1"
 msgid "Maximum length has been specified meaninglessly as [_1]"
 msgstr "La longitud máxima ha sido especificada en {$maxlength}"
 
-msgctxt "OPERATION_FM_MAXLENGTH2"
+msgctxt "FM_MAXLENGTH2"
 msgid "This field must be no more than [_1] characters"
 msgstr "Esta campo no debe ser de más de {$maxlength} caracteres"
 
-msgctxt "OPERATION_FM_EXACTLENGTH1"
+msgctxt "FM_EXACTLENGTH1"
 msgid "You must specify the length for the field."
 msgstr "Debe especificar la longitud para el campo."
 
-msgctxt "OPERATION_FM_EXACTLENGTH2"
+msgctxt "FM_EXACTLENGTH2"
 msgid "You must specify the exactlength of the field with an integer"
 msgstr "Debe especificar la longitud exacta del campo con un número entero"
 
-msgctxt "OPERATION_FM_EXACTLENGTH3"
+msgctxt "FM_EXACTLENGTH3"
 msgid "This field must be exactly [_1] characters"
 msgstr "Este campo debe ser exactamente de {$exactlength} caracteres"
 
-msgctxt "OPERATION_FM_LENGTHRANGE1"
+msgctxt "FM_LENGTHRANGE1"
 msgid "You must specify the maximum and minimum length for the field."
 msgstr "Debe especificar la longitud máxima y mínima del campo."
 
-msgctxt "OPERATION_FM_LENGTHRANGE2"
+msgctxt "FM_LENGTHRANGE2"
 msgid ""
 "You must specify the maximum and minimum lengths of the field with an "
 "integer"
 msgstr ""
 "Debe especificar la longitud máxima y mínima del campo con un número entero"
 
-msgctxt "OPERATION_FM_LENGTHRANGE3"
+msgctxt "FM_LENGTHRANGE3"
 msgid "This field must be between [_1] and [_2] characters"
 msgstr "Este campo debe ser de entre {$minlength} y {$maxlength} caracteres"
 
-msgctxt "OPERATION_FM_URL"
+msgctxt "FM_URL"
 msgid "This field must contain a URL starting with http:// or ftp://"
 msgstr "Este campo debe contener una URL comenzando con http:// o ftp://"
 
-msgctxt "OPERATION_FM_EMAIL_SIMPLE1"
+msgctxt "FM_EMAIL_SIMPLE1"
 msgid "You must enter an email address."
 msgstr "Debe ingresar una dirección de email."
 
-msgctxt "OPERATION_FM_EMAIL_SIMPLE2"
+msgctxt "FM_EMAIL_SIMPLE2"
 msgid "This field doesn\\'t look like an RFC822-compliant email address"
 msgstr "Este campo no se parece a una dirección de email RFC822-compatible"
 
-msgctxt "OPERATION_FM_DOMAIN_NAME"
+msgctxt "FM_DOMAIN_NAME"
 msgid "This field doesn\\'t look like a valid Internet domain name or hostname."
 msgstr ""
 "Este campo no parece ser un nombre de dominio de Internet o nombre de host "
 "válido."
 
-msgctxt "OPERATION_FM_IP_NUMBER1"
+msgctxt "FM_IP_NUMBER1"
 msgid "This field must contain a valid IP number and can not be left blank."
 msgstr ""
 "Este campo debe contener un número de IP válido y no debe dejarse en blanco."
 
-msgctxt "OPERATION_FM_IP_NUMBER2"
+msgctxt "FM_IP_NUMBER2"
 msgid "Invalid IP address format (expected X.X.X.X)"
 msgstr "Dirección IP inválida de inicio para DHCP"
 
-msgctxt "OPERATION_FM_IP_NUMBER3"
+msgctxt "FM_IP_NUMBER3"
 msgid "[_1] is more than 255"
 msgstr "{$octet} es mas de 255"
 
-msgctxt "OPERATION_FM_USERNAME"
+msgctxt "FM_USERNAME"
 msgid ""
 "This field must look like a valid username (3 to 8 letters and numbers)"
 msgstr ""
 "Este campo debe ser un nombre de usuario válido (3 a 8 letras y números)"
 
-msgctxt "OPERATION_FM_PASSWORD1"
+msgctxt "FM_PASSWORD1"
 msgid "You must provide a password."
 msgstr "Debe suministrar una contraseña."
 
-msgctxt "OPERATION_FM_PASSWORD2"
+msgctxt "FM_PASSWORD2"
 msgid ""
 "The password you provided was not a good password.A good password must "
 "contain all of the following: upper case letter, lower case letter, number, "
@@ -531,18 +527,18 @@ msgstr ""
 "números, caracteres no-alfanuméricos, y ser mayor a 7 caracteres de "
 "longitud."
 
-msgctxt "OPERATION_FM_MAC_ADDRESS1"
+msgctxt "FM_MAC_ADDRESS1"
 msgid "You must provide a MAC address."
 msgstr "Debe proveer una dirección MAC."
 
-msgctxt "OPERATION_FM_MAC_ADDRESS2"
+msgctxt "FM_MAC_ADDRESS2"
 msgid "The MAC address you provided was not valid."
 msgstr "La dirección MAC suministrada no es válida."
 
-msgctxt "OPERATION_FM_ERR_UNEXPECTED_DESC"
+msgctxt "FM_ERR_UNEXPECTED_DESC"
 msgid "Error: unexpected or missing characters in description"
 msgstr "Error: caracteres erróneos o faltantes en la descripción"
 
-msgctxt "OPERATION_CSRF_VALIDATION_FAILURE"
-msgid "Placeholder for missing original text"
+msgctxt "CSRF_VALIDATION_FAILURE"
+msgid "Error: CSRF token is invalid or outdated."
 msgstr "Error: CSRF token is invalid or outdated."
diff --git a/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/General/pofiles/general_et.po b/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/General/pofiles/general_et.po
index 7f314b7..fe82e68 100644
--- a/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/General/pofiles/general_et.po
+++ b/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/General/pofiles/general_et.po
@@ -5,99 +5,95 @@ msgstr ""
 "Language: None\n"
 "Content-Type: text/plain; charset=utf-8\n"
 
-msgctxt "OPERATION_Collaboration"
+msgctxt "Collaboration"
 msgid "Collaboration"
 msgstr "Collaboration"
 
-msgctxt "OPERATION_Administration"
+msgctxt "Administration"
 msgid "Administration"
 msgstr "Administreerimine"
 
-msgctxt "OPERATION_Security"
+msgctxt "Security"
 msgid "Security"
 msgstr "Turvalisus"
 
-msgctxt "OPERATION_Configuration"
+msgctxt "Configuration"
 msgid "Configuration"
 msgstr "Seadistused"
 
-msgctxt "OPERATION_Miscellaneous"
+msgctxt "Miscellaneous"
 msgid "Miscellaneous"
 msgstr "Muu"
 
-msgctxt "OPERATION_Your Settings"
-msgid "Your Settings"
-msgstr "Sinu seaded"
-
-msgctxt "OPERATION_SAVE"
+msgctxt "SAVE"
 msgid "Save"
 msgstr "Salvesta"
 
-msgctxt "OPERATION_CANCEL"
+msgctxt "CANCEL"
 msgid "Cancel"
 msgstr "Tühista"
 
-msgctxt "OPERATION_ENABLED"
+msgctxt "ENABLED"
 msgid "Enabled"
 msgstr "Lubatud"
 
-msgctxt "OPERATION_DISABLED"
+msgctxt "DISABLED"
 msgid "Disabled"
 msgstr "Keelatud"
 
-msgctxt "OPERATION_NO"
+msgctxt "NO"
 msgid "No"
 msgstr "Ei"
 
-msgctxt "OPERATION_YES"
+msgctxt "YES"
 msgid "Yes"
 msgstr "Jah"
 
-msgctxt "OPERATION_ADD"
+msgctxt "ADD"
 msgid "Add"
 msgstr "Lisa"
 
-msgctxt "OPERATION_CREATE"
+msgctxt "CREATE"
 msgid "Create"
 msgstr "Loo"
 
-msgctxt "OPERATION_MODIFY"
+msgctxt "MODIFY"
 msgid "Modify"
 msgstr "Muuda"
 
-msgctxt "OPERATION_REMOVE"
+msgctxt "REMOVE"
 msgid "Remove"
 msgstr "Eemalda"
 
-msgctxt "OPERATION_COMMENT"
+msgctxt "COMMENT"
 msgid "Comment"
 msgstr "Kommentaar"
 
-msgctxt "OPERATION_NEXT"
+msgctxt "NEXT"
 msgid "Next"
 msgstr "Edasi"
 
-msgctxt "OPERATION_SELF"
+msgctxt "SELF"
 msgid "Self"
 msgstr "Ise"
 
-msgctxt "OPERATION_REMOTE"
+msgctxt "REMOTE"
 msgid "Remote"
 msgstr "Eemalt"
 
-msgctxt "OPERATION_LOCAL"
+msgctxt "LOCAL"
 msgid "Local"
 msgstr "Kohalik"
 
-msgctxt "OPERATION_ACTION"
+msgctxt "ACTION"
 msgid "Action"
 msgstr "Tegevus"
 
-msgctxt "OPERATION_NETWORK"
+msgctxt "NETWORK"
 msgid "Network"
 msgstr "Võrk"
 
-msgctxt "OPERATION_ROUTER"
+msgctxt "ROUTER"
 msgid "Router"
 msgstr "Ruuter"
 
@@ -105,50 +101,50 @@ msgctxt "OPERATION_STATUS_REPORT"
 msgid "Operation status report"
 msgstr "Operatsiooni tulemus"
 
-msgctxt "OPERATION_ACCOUNT"
+msgctxt "ACCOUNT"
 msgid "Account"
 msgstr "Konto"
 
-msgctxt "OPERATION_GROUP"
+msgctxt "GROUP"
 msgid "Group"
 msgstr "Grupp"
 
-msgctxt "OPERATION_DESC_SECTIONBAR"
+msgctxt "DESC_SECTIONBAR"
 msgid "<hr class=\"sectionbar\"/>"
-msgstr " <hr class=\"sectionbar\"/> "
+msgstr "<hr class=\"sectionbar\"/>"
 
-msgctxt "OPERATION_NO_PIPES_ALLOWED"
+msgctxt "NO_PIPES_ALLOWED"
 msgid "Pipe symbols (|) are not permitted in this field"
 msgstr "Pipe sümboleid (|) pole siin väljal lubatud"
 
-msgctxt "OPERATION_ERROR_BELOW"
+msgctxt "ERROR_BELOW"
 msgid ""
 "ERROR: There was an error in the validation of this page. Please scroll down"
 " and find the specific problem."
 msgstr ""
 "VIGA: Lehe valideerimisel ilmnes viga. Probleemi kirjeldus lehe lõpus."
 
-msgctxt "OPERATION_ACCESS"
+msgctxt "ACCESS"
 msgid "Access"
 msgstr "Juurdepääs"
 
-msgctxt "OPERATION_ACCOUNT_LOCKED"
+msgctxt "ACCOUNT_LOCKED"
 msgid "Account is locked"
 msgstr "Konto on lukus"
 
-msgctxt "OPERATION_GROUP_ADD"
+msgctxt "GROUP_ADD"
 msgid "Add group"
 msgstr "Lisa grupp"
 
-msgctxt "OPERATION_NETWORKS_ALLOW_LOCAL"
+msgctxt "NETWORKS_ALLOW_LOCAL"
 msgid "Allow access only from local networks"
 msgstr "Luba juurdepääs ainult kohtvõrgust"
 
-msgctxt "OPERATION_NETWORKS_ALLOW_PUBLIC"
+msgctxt "NETWORKS_ALLOW_PUBLIC"
 msgid "Allow public access (entire Internet)"
 msgstr "Luba avalik juurdepääs (internetist)"
 
-msgctxt "OPERATION_ERROR_PASSWORD_CHANGE"
+msgctxt "ERROR_PASSWORD_CHANGE"
 msgid ""
 "An error occurred while attempting to change your password. Please make sure"
 " that the old password entered is correct."
@@ -156,318 +152,318 @@ msgstr ""
 "Parooli muutmisel ilmnes viga. Palun kontrolli kas sisestasid vana parooli "
 "õieti."
 
-msgctxt "OPERATION_BACK"
+msgctxt "BACK"
 msgid "Back"
 msgstr "Tagasi"
 
-msgctxt "OPERATION_BACKUP"
+msgctxt "BACKUP"
 msgid "Backup"
 msgstr "Varukoopia"
 
-msgctxt "OPERATION_DESCRIPTION_BRIEF"
+msgctxt "DESCRIPTION_BRIEF"
 msgid "Brief description"
 msgstr "Brief kirjeldus"
 
-msgctxt "OPERATION_PASSWORD_CHANGE"
+msgctxt "PASSWORD_CHANGE"
 msgid "Change Password"
 msgstr "Muuda parooli"
 
-msgctxt "OPERATION_RESET_PASSWORD_TITLE"
+msgctxt "RESET_PASSWORD_TITLE"
 msgid "Reset user password"
 msgstr "Tühista kasutaja parool"
 
-msgctxt "OPERATION_ACCOUNT_PASSWORD_CHANGE"
+msgctxt "ACCOUNT_PASSWORD_CHANGE"
 msgid "Change account password"
 msgstr "Parooli muutmine"
 
-msgctxt "OPERATION_CONTENT"
+msgctxt "CONTENT"
 msgid "Content"
 msgstr "Sisu"
 
-msgctxt "OPERATION_CREATE_GROUP"
+msgctxt "CREATE_GROUP"
 msgid "Create user group"
 msgstr "Loo kasutajate grupp"
 
-msgctxt "OPERATION_USER_LIST_CURRENT"
+msgctxt "USER_LIST_CURRENT"
 msgid "Current list of users"
 msgstr "Nimekiri kasutajatest"
 
-msgctxt "OPERATION_DESCRIPTION"
+msgctxt "DESCRIPTION"
 msgid "Description"
 msgstr "Kirjeldus"
 
-msgctxt "OPERATION_DESTINATION"
+msgctxt "DESTINATION"
 msgid "Destination"
 msgstr "Asukoht"
 
-msgctxt "OPERATION_DOMAIN_NAME"
+msgctxt "DOMAIN_NAME"
 msgid "Domain name"
 msgstr "Domeeni nimi"
 
-msgctxt "OPERATION_DOMAIN"
+msgctxt "DOMAIN"
 msgid "Domain"
 msgstr "Domeen"
 
-msgctxt "OPERATION_DOMAINS"
+msgctxt "DOMAINS"
 msgid "Domains"
 msgstr "Domeenid"
 
-msgctxt "OPERATION_DOWNLOAD"
+msgctxt "DOWNLOAD"
 msgid "Download"
 msgstr "Allalaadimine"
 
-msgctxt "OPERATION_ERROR_UPDATING_CONFIGURATION"
+msgctxt "ERROR_UPDATING_CONFIGURATION"
 msgid "Error occurred while updating system configuration."
 msgstr "Viga süsteemi seadete uuendamisel"
 
-msgctxt "OPERATION_GROUP_MEMBERS"
+msgctxt "GROUP_MEMBERS"
 msgid "Group Members"
 msgstr "Grupi liikmed"
 
-msgctxt "OPERATION_GROUP_NAME"
+msgctxt "GROUP_NAME"
 msgid "Group Name"
 msgstr "Grupi nimi"
 
-msgctxt "OPERATION_GROUPS"
+msgctxt "GROUPS"
 msgid "Groups"
 msgstr "Grupid"
 
-msgctxt "OPERATION_IP_ADDRESS"
+msgctxt "IP_ADDRESS"
 msgid "IP Address"
 msgstr "IP aadress"
 
-msgctxt "OPERATION_IP_ADDRESS_OR_FQDN"
+msgctxt "IP_ADDRESS_OR_FQDN"
 msgid "IP Address or FQDN"
 msgstr "IP aadress või FQDN"
 
-msgctxt "OPERATION_USER_INVALID"
+msgctxt "USER_INVALID"
 msgid "Invalid user"
 msgstr "Olematu kasutaja"
 
-msgctxt "OPERATION_LOCATION"
+msgctxt "LOCATION"
 msgid "Location"
 msgstr "Asukoht"
 
-msgctxt "OPERATION_MB"
+msgctxt "MB"
 msgid "Mb"
 msgstr "Mb"
 
-msgctxt "OPERATION_MODIFY_USER_GROUP"
+msgctxt "MODIFY_USER_GROUP"
 msgid "Modify user group"
 msgstr "Muuda kasutaja kuuluvust gruppi"
 
-msgctxt "OPERATION_NAME"
+msgctxt "NAME"
 msgid "Name"
 msgstr "Nimi"
 
-msgctxt "OPERATION_PASSWORD_VERIFY_NEW"
+msgctxt "PASSWORD_VERIFY_NEW"
 msgid "New password (verify):"
 msgstr "Uus parool (korda uut parooli):"
 
-msgctxt "OPERATION_PASSWORD_NEW"
+msgctxt "PASSWORD_NEW"
 msgid "New password:"
 msgstr "Uus parool:"
 
-msgctxt "OPERATION_OFF"
+msgctxt "OFF"
 msgid "Off"
 msgstr "Väljas"
 
-msgctxt "OPERATION_OK"
+msgctxt "OK"
 msgid "Ok"
 msgstr "Ok"
 
-msgctxt "OPERATION_PASSWORD_OLD"
+msgctxt "PASSWORD_OLD"
 msgid "Old password:"
 msgstr "Vana parool:"
 
-msgctxt "OPERATION_ON"
+msgctxt "ON"
 msgid "On"
 msgstr "Sees"
 
-msgctxt "OPERATION_PASSWORD"
+msgctxt "PASSWORD"
 msgid "Password"
 msgstr "Parool"
 
-msgctxt "OPERATION_PERFORM"
+msgctxt "PERFORM"
 msgid "Perform"
 msgstr "Perform"
 
-msgctxt "OPERATION_RECONFIGURE"
+msgctxt "RECONFIGURE"
 msgid "Reconfigure"
 msgstr "Seadista ümber"
 
-msgctxt "OPERATION_REMOVE_USER_GROUP"
+msgctxt "REMOVE_USER_GROUP"
 msgid "Remove user group"
 msgstr "Eemalda kasutajate grupp"
 
-msgctxt "OPERATION_PASSWORD_RESET"
+msgctxt "PASSWORD_RESET"
 msgid "Reset password"
 msgstr "Tühista parool"
 
-msgctxt "OPERATION_RESTORE"
+msgctxt "RESTORE"
 msgid "Restore"
 msgstr "Taasta"
 
-msgctxt "OPERATION_SHUTDOWN"
+msgctxt "SHUTDOWN"
 msgid "Shutdown"
 msgstr "Sulge"
 
-msgctxt "OPERATION_SUCCESS"
+msgctxt "SUCCESS"
 msgid "Success"
 msgstr "Õnnestus"
 
-msgctxt "OPERATION_ACCOUNT_NAME_INVALID"
+msgctxt "ACCOUNT_NAME_INVALID"
 msgid "The account name entered is invalid."
 msgstr "Sisestatud kasutajanime ei leitud."
 
-msgctxt "OPERATION_ACCOUNT_NAME_INVALID_CHARS"
+msgctxt "ACCOUNT_NAME_INVALID_CHARS"
 msgid "The account name you entered contained invalid characters."
 msgstr "Kasutajanimi mis sa sisestasid sisaldab sobimatuid sümboleid."
 
-msgctxt "OPERATION_PASSWORD_OLD_INVALID_CHARS"
+msgctxt "PASSWORD_OLD_INVALID_CHARS"
 msgid "The old password you entered contained invalid characters."
 msgstr "Vana parool mis sa sisestasid sisaldab sobimatuid sümboleid."
 
-msgctxt "OPERATION_PASSWORD_INVALID_CHARS"
+msgctxt "PASSWORD_INVALID_CHARS"
 msgid "The password you entered contained invalid characters."
 msgstr "Parool mis sa sisestasid sisaldab sobimatuid sümboleid."
 
-msgctxt "OPERATION_PASSWORD_VERIFY_ERROR"
+msgctxt "PASSWORD_VERIFY_ERROR"
 msgid "The passwords you entered did not match."
 msgstr "Paroolid mis sa sisestasid ei ühti."
 
-msgctxt "OPERATION_ACCOUNT_USER_NONE"
+msgctxt "ACCOUNT_USER_NONE"
 msgid "There are no user accounts in the system."
 msgstr "Süsteemis pole kasutajakontosid."
 
-msgctxt "OPERATION_ACCOUNT_GROUP_NONE"
+msgctxt "ACCOUNT_GROUP_NONE"
 msgid "There are no user groups in the system."
 msgstr "Süsteemis pole kasutajagruppe."
 
-msgctxt "OPERATION_ERROR_INVALID_CHARS"
+msgctxt "ERROR_INVALID_CHARS"
 msgid "Unexpected characters in description."
 msgstr "Sobimatu sümbol kirjelduses."
 
-msgctxt "OPERATION_USER_NAME"
+msgctxt "USER_NAME"
 msgid "User Name"
 msgstr "Kasutajanimi"
 
-msgctxt "OPERATION_YOUR_ACCOUNT"
+msgctxt "YOUR_ACCOUNT"
 msgid "Your account:"
 msgstr "Sinu konto:"
 
-msgctxt "OPERATION_YOUR_ACCOUNT_INVALID"
+msgctxt "YOUR_ACCOUNT_INVALID"
 msgid "The account name entered is invalid."
 msgstr "Sisestatud kasutajanime ei leitud."
 
-msgctxt "OPERATION_PASSWORD_CHANGE_SUCCESS"
+msgctxt "PASSWORD_CHANGE_SUCCESS"
 msgid "Your password has been successfully changed."
 msgstr "Sinu parool on edukalt muudetud."
 
-msgctxt "OPERATION_FM_NONBLANK"
+msgctxt "FM_NONBLANK"
 msgid "This field must not be left blank"
 msgstr "See väli peab täidetud olema"
 
-msgctxt "OPERATION_FM_INTEGER"
+msgctxt "FM_INTEGER"
 msgid "This field must contain a positive integer"
 msgstr "See väli peab sisaldama positiivset täisarvu"
 
-msgctxt "OPERATION_FM_NUMBER"
+msgctxt "FM_NUMBER"
 msgid "This field must contain a number"
 msgstr "Sellele väljale saab ainult numbreid sisestada"
 
-msgctxt "OPERATION_FM_WORD"
+msgctxt "FM_WORD"
 msgid "This field must look like a single word."
 msgstr "Selle välja sisestus peab välja nägema nagu üks sõna."
 
-msgctxt "OPERATION_FM_DATE"
+msgctxt "FM_DATE"
 msgid "The data entered could not be parsed as a date"
 msgstr "Sisestatud andmeid ei saa kuupäevaks lugeda"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_NUMBER1"
+msgctxt "FM_CREDIT_CARD_NUMBER1"
 msgid "You must enter a credit card number"
 msgstr "Sa pead sisestama krediitkaardi numbri"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_NUMBER2"
+msgctxt "FM_CREDIT_CARD_NUMBER2"
 msgid ""
 "Credit card numbers shouldn\\'t have anything but numbers, spaces or dashes"
 msgstr ""
 "Krediitkaardi number ei tohi sisaldada mitte midagi muud kui numbreid ja "
 "tühikuid"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_NUMBER3"
+msgctxt "FM_CREDIT_CARD_NUMBER3"
 msgid "Must be at least 14 characters in length"
 msgstr "Peab olema vähemalt 14 sümbolit pikk"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_NUMBER4"
+msgctxt "FM_CREDIT_CARD_NUMBER4"
 msgid "Doesn\\'t appear to be a valid credit card number"
 msgstr "Ei tundu sobivat krediikaardi numbriks"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_EXPIRY1"
+msgctxt "FM_CREDIT_CARD_EXPIRY1"
 msgid "No expiry date entered."
 msgstr "Kaardi kehtivuse lõpu kuupäeva ei sisestatud."
 
-msgctxt "OPERATION_FM_CREDIT_CARD_EXPIRY2"
+msgctxt "FM_CREDIT_CARD_EXPIRY2"
 msgid "Expiry date must be in the format MM/YY or MM/YYYY"
 msgstr "Kehtivuse lõpp peab olema vormingus KK/AA või KK/AAAA"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_EXPIRY3"
+msgctxt "FM_CREDIT_CARD_EXPIRY3"
 msgid "This expiry date appears to have already passed"
 msgstr "See kuupäev on juba möödas"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_EXPIRY4"
+msgctxt "FM_CREDIT_CARD_EXPIRY4"
 msgid "This expiry date appears to be too far in the future"
 msgstr "See kehtivuse lõpu kuupäev on liiga kaugel tulevikus"
 
-msgctxt "OPERATION_FM_ISO_COUNTRY_CODE1"
+msgctxt "FM_ISO_COUNTRY_CODE1"
 msgid "You must provide a country code"
 msgstr "Sisesta riigi kood"
 
-msgctxt "OPERATION_FM_ISO_COUNTRY_CODE2"
+msgctxt "FM_ISO_COUNTRY_CODE2"
 msgid "This field does not contain an ISO country code"
 msgstr "Väli ei sisalda maa koodi ISO vormingus"
 
-msgctxt "OPERATION_FM_US_STATE"
+msgctxt "FM_US_STATE"
 msgid "This doesn\\'t appear to be a valid 2-letter US state abbreviation"
 msgstr "This doesn\\'t appear to be a valid 2-letter US state abbreviation"
 
-msgctxt "OPERATION_FM_US_ZIPCODE"
+msgctxt "FM_US_ZIPCODE"
 msgid "US zip codes must contain 5 or 9 numbers"
 msgstr "US indeks koosneb ainult 5 või 9 numbrist"
 
-msgctxt "OPERATION_FM_MINLENGTH1"
+msgctxt "FM_MINLENGTH1"
 msgid "Minimum length has been specified meaninglessly as [_1]"
 msgstr "Minimum length has been specified meaninglessly as {$minlength}"
 
-msgctxt "OPERATION_FM_MINLENGTH2"
+msgctxt "FM_MINLENGTH2"
 msgid "This field must be at least [_1] characters"
 msgstr "See väli peab sisaldama vähemalt {$minlength} sümbolit"
 
-msgctxt "OPERATION_FM_MAXLENGTH1"
+msgctxt "FM_MAXLENGTH1"
 msgid "Maximum length has been specified meaninglessly as [_1]"
 msgstr "Maximum length has been specified meaninglessly as {$maxlength}"
 
-msgctxt "OPERATION_FM_MAXLENGTH2"
+msgctxt "FM_MAXLENGTH2"
 msgid "This field must be no more than [_1] characters"
 msgstr "See väli ei tohi sisaldada rohkem kui {$maxlength} sümbolit"
 
-msgctxt "OPERATION_FM_EXACTLENGTH1"
+msgctxt "FM_EXACTLENGTH1"
 msgid "You must specify the length for the field."
 msgstr "You must specify the length for the field."
 
-msgctxt "OPERATION_FM_EXACTLENGTH2"
+msgctxt "FM_EXACTLENGTH2"
 msgid "You must specify the exactlength of the field with an integer"
 msgstr "You must specify the exactlength of the field with an integer"
 
-msgctxt "OPERATION_FM_EXACTLENGTH3"
+msgctxt "FM_EXACTLENGTH3"
 msgid "This field must be exactly [_1] characters"
 msgstr "This field must be exactly {$exactlength} characters"
 
-msgctxt "OPERATION_FM_LENGTHRANGE1"
+msgctxt "FM_LENGTHRANGE1"
 msgid "You must specify the maximum and minimum length for the field."
 msgstr "Pead täpsustama maksimum ja miinimum pikkuse sellele väljale"
 
-msgctxt "OPERATION_FM_LENGTHRANGE2"
+msgctxt "FM_LENGTHRANGE2"
 msgid ""
 "You must specify the maximum and minimum lengths of the field with an "
 "integer"
@@ -475,49 +471,49 @@ msgstr ""
 "You must specify the maximum and minimum lengths of the field with an "
 "integer"
 
-msgctxt "OPERATION_FM_LENGTHRANGE3"
+msgctxt "FM_LENGTHRANGE3"
 msgid "This field must be between [_1] and [_2] characters"
 msgstr ""
 "See väli saab sisaldada {$minlength} ja {$maxlength} vahemikus sümboleid"
 
-msgctxt "OPERATION_FM_URL"
+msgctxt "FM_URL"
 msgid "This field must contain a URL starting with http:// or ftp://"
 msgstr "Väli peab sisaldama URL-i algusega http:// või ftp://"
 
-msgctxt "OPERATION_FM_EMAIL_SIMPLE1"
+msgctxt "FM_EMAIL_SIMPLE1"
 msgid "You must enter an email address."
 msgstr "Pead sisestama e-maili aadressi:"
 
-msgctxt "OPERATION_FM_EMAIL_SIMPLE2"
+msgctxt "FM_EMAIL_SIMPLE2"
 msgid "This field doesn\\'t look like an RFC822-compliant email address"
 msgstr "Sisestus sellel väljal ei ole RFC822-vormingus e-maili aadress"
 
-msgctxt "OPERATION_FM_DOMAIN_NAME"
+msgctxt "FM_DOMAIN_NAME"
 msgid "This field doesn\\'t look like a valid Internet domain name or hostname."
 msgstr "Sisestus sellel väljal ei paista olevat domeeni või hostinimi."
 
-msgctxt "OPERATION_FM_IP_NUMBER1"
+msgctxt "FM_IP_NUMBER1"
 msgid "This field must contain a valid IP number and can not be left blank."
 msgstr "See väli peab sisaldama IP aadressi ja ei tohi sisaldada tühikuid."
 
-msgctxt "OPERATION_FM_IP_NUMBER2"
+msgctxt "FM_IP_NUMBER2"
 msgid "Invalid IP address format (expected X.X.X.X)"
 msgstr "Sobimatu IP aadress DHCP alguseks (mall X.X.X.X)"
 
-msgctxt "OPERATION_FM_IP_NUMBER3"
+msgctxt "FM_IP_NUMBER3"
 msgid "[_1] is more than 255"
 msgstr "{$octet} on rohkem kui 255"
 
-msgctxt "OPERATION_FM_USERNAME"
+msgctxt "FM_USERNAME"
 msgid ""
 "This field must look like a valid username (3 to 8 letters and numbers)"
 msgstr "See väli peab sisaldama kasutajanime (3 kuni 8 tähte ja numbrit)"
 
-msgctxt "OPERATION_FM_PASSWORD1"
+msgctxt "FM_PASSWORD1"
 msgid "You must provide a password."
 msgstr "Pead parooli looma."
 
-msgctxt "OPERATION_FM_PASSWORD2"
+msgctxt "FM_PASSWORD2"
 msgid ""
 "The password you provided was not a good password.A good password must "
 "contain all of the following: upper case letter, lower case letter, number, "
@@ -527,18 +523,18 @@ msgstr ""
 "sisaldama: Suuri ja väikseid tähti, numbreid, tähestikus mitte olevaid "
 "sümboleid ja vähemalt 7 sümbolit pikk."
 
-msgctxt "OPERATION_FM_MAC_ADDRESS1"
+msgctxt "FM_MAC_ADDRESS1"
 msgid "You must provide a MAC address."
 msgstr "Sisesta MAC aadress:"
 
-msgctxt "OPERATION_FM_MAC_ADDRESS2"
+msgctxt "FM_MAC_ADDRESS2"
 msgid "The MAC address you provided was not valid."
 msgstr "Sisestatud MAC aadress ei sobi."
 
-msgctxt "OPERATION_FM_ERR_UNEXPECTED_DESC"
+msgctxt "FM_ERR_UNEXPECTED_DESC"
 msgid "Error: unexpected or missing characters in description"
 msgstr "Viga: sobimatu või puuduv sümbol kirjelduses"
 
-msgctxt "OPERATION_CSRF_VALIDATION_FAILURE"
-msgid "Placeholder for missing original text"
+msgctxt "CSRF_VALIDATION_FAILURE"
+msgid "Error: CSRF token is invalid or outdated."
 msgstr "Error: CSRF token is invalid or outdated."
diff --git a/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/General/pofiles/general_fr.po b/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/General/pofiles/general_fr.po
index 1fc6ff0..4f0707d 100644
--- a/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/General/pofiles/general_fr.po
+++ b/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/General/pofiles/general_fr.po
@@ -6,145 +6,121 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 
 msgctxt ""
-"OPERATION__AUTO => 1,\n"
+"1,\n"
 "\n"
-"YES "
+"YES"
 msgid "Placeholder for missing original text"
 msgstr "Oui"
 
-msgctxt ""
-"OPERATION_\n"
-"NO "
-msgid "Placeholder for missing original text"
-msgstr "Non"
-
-msgctxt ""
-"OPERATION_\n"
-"edit "
-msgid "Placeholder for missing original text"
-msgstr "Modifier"
-
-msgctxt ""
-"OPERATION_\n"
-"del "
-msgid "Placeholder for missing original text"
-msgstr "Effacer"
-
-msgctxt ""
-"OPERATION_\n"
-"exit "
-msgid "Placeholder for missing original text"
-msgstr "Quitter"
-
-msgctxt ""
-"OPERATION_\n"
-"cancel "
-msgid "Placeholder for missing original text"
-msgstr "Annuler"
-
-msgctxt ""
-"OPERATION_\n"
-"hello "
-msgid "Placeholder for missing original text"
-msgstr "salut"
-
-msgctxt "OPERATION_All rights reserved"
-msgid "All Rights Reserved"
-msgstr "Tous droits réservés"
-
-msgctxt "OPERATION_Collaboration"
-msgid "Collaboration"
-msgstr "Collaboration"
-
-msgctxt "OPERATION_Administration"
-msgid "Administration"
-msgstr "Administration"
-
-msgctxt "OPERATION_Security"
-msgid "Security"
-msgstr "Sécurité"
-
-msgctxt "OPERATION_Configuration"
-msgid "Configuration"
-msgstr "Configuration"
-
-msgctxt "OPERATION_Miscellaneous"
-msgid "Miscellaneous"
-msgstr "Divers"
-
-msgctxt "OPERATION_Your Settings"
-msgid "Your Settings"
-msgstr "Vos paramètres"
-
-msgctxt "OPERATION_SAVE"
-msgid "Save"
-msgstr "Enregistrer"
-
-msgctxt "OPERATION_CANCEL"
-msgid "Cancel"
-msgstr "Annuler"
-
-msgctxt "OPERATION_ENABLED"
-msgid "Enabled"
-msgstr "Activé"
-
-msgctxt "OPERATION_DISABLED"
-msgid "Disabled"
-msgstr "Désactivé"
-
-msgctxt "OPERATION_NO"
+msgctxt "NO"
 msgid "No"
 msgstr "Non"
 
-msgctxt "OPERATION_YES"
+msgctxt "edit"
+msgid "edit"
+msgstr "Modifier"
+
+msgctxt "del"
+msgid "del"
+msgstr "Effacer"
+
+msgctxt "exit"
+msgid "Exit"
+msgstr "Quitter"
+
+msgctxt "cancel"
+msgid "Cancel"
+msgstr "Annuler"
+
+msgctxt "hello"
+msgid "hello"
+msgstr "salut"
+
+msgctxt "Collaboration"
+msgid "Collaboration"
+msgstr "Collaboration"
+
+msgctxt "Administration"
+msgid "Administration"
+msgstr "Administration"
+
+msgctxt "Security"
+msgid "Security"
+msgstr "Sécurité"
+
+msgctxt "Configuration"
+msgid "Configuration"
+msgstr "Configuration"
+
+msgctxt "Miscellaneous"
+msgid "Miscellaneous"
+msgstr "Divers"
+
+msgctxt "SAVE"
+msgid "Save"
+msgstr "Enregistrer"
+
+msgctxt "CANCEL"
+msgid "Cancel"
+msgstr "Annuler"
+
+msgctxt "ENABLED"
+msgid "Enabled"
+msgstr "Activé"
+
+msgctxt "DISABLED"
+msgid "Disabled"
+msgstr "Désactivé"
+
+msgctxt "YES"
 msgid "Yes"
 msgstr "Oui"
 
-msgctxt "OPERATION_ADD"
+msgctxt "ADD"
 msgid "Add"
 msgstr "Ajouter"
 
-msgctxt "OPERATION_CREATE"
+msgctxt "CREATE"
 msgid "Create"
 msgstr "Créer"
 
-msgctxt "OPERATION_MODIFY"
+msgctxt "MODIFY"
 msgid "Modify"
 msgstr "Modifier"
 
-msgctxt "OPERATION_REMOVE"
+msgctxt "REMOVE"
 msgid "Remove"
 msgstr "Supprimer"
 
-msgctxt "OPERATION_COMMENT"
+msgctxt "COMMENT"
 msgid "Comment"
 msgstr "Commentaire"
 
-msgctxt "OPERATION_NEXT"
+msgctxt "NEXT"
 msgid "Next"
 msgstr "Suivant"
 
-msgctxt "OPERATION_SELF"
+msgctxt "SELF"
 msgid "Self"
 msgstr "Ce serveur"
 
-msgctxt "OPERATION_REMOTE"
+msgctxt "REMOTE"
 msgid "Remote"
 msgstr "Distant"
 
-msgctxt "OPERATION_LOCAL"
+msgctxt "LOCAL"
 msgid "Local"
 msgstr "Local"
 
-msgctxt "OPERATION_ACTION"
+msgctxt "ACTION"
 msgid "Action"
 msgstr "Action"
 
-msgctxt "OPERATION_NETWORK"
+msgctxt "NETWORK"
 msgid "Network"
 msgstr "Réseau"
 
-msgctxt "OPERATION_ROUTER"
+msgctxt "ROUTER"
 msgid "Router"
 msgstr "Routeur"
 
@@ -152,23 +128,23 @@ msgctxt "OPERATION_STATUS_REPORT"
 msgid "Operation status report"
 msgstr "Rapport d\\'état de l\\'opération"
 
-msgctxt "OPERATION_ACCOUNT"
+msgctxt "ACCOUNT"
 msgid "Account"
 msgstr "Compte"
 
-msgctxt "OPERATION_GROUP"
+msgctxt "GROUP"
 msgid "Group"
 msgstr "Groupe"
 
-msgctxt "OPERATION_DESC_SECTIONBAR"
+msgctxt "DESC_SECTIONBAR"
 msgid "<hr class=\"sectionbar\"/>"
-msgstr " <hr class=\"sectionbar\"/> "
+msgstr "<hr class=\"sectionbar\"/>"
 
-msgctxt "OPERATION_NO_PIPES_ALLOWED"
+msgctxt "NO_PIPES_ALLOWED"
 msgid "Pipe symbols (|) are not permitted in this field"
 msgstr "La barre verticale \"|\" (pipe) n\\'est pas autorisée dans ce champ."
 
-msgctxt "OPERATION_ERROR_BELOW"
+msgctxt "ERROR_BELOW"
 msgid ""
 "ERROR: There was an error in the validation of this page. Please scroll down"
 " and find the specific problem."
@@ -176,27 +152,27 @@ msgstr ""
 "ERREUR : Une erreur s\\'est produite lors de la validation de cette page. "
 "Vous trouverez ci-dessous les raisons de ce problème :"
 
-msgctxt "OPERATION_ACCESS"
+msgctxt "ACCESS"
 msgid "Access"
 msgstr "Accès"
 
-msgctxt "OPERATION_ACCOUNT_LOCKED"
+msgctxt "ACCOUNT_LOCKED"
 msgid "Account is locked"
 msgstr "Le compte est verrouillé"
 
-msgctxt "OPERATION_GROUP_ADD"
+msgctxt "GROUP_ADD"
 msgid "Add group"
 msgstr "Ajouter un groupe"
 
-msgctxt "OPERATION_NETWORKS_ALLOW_LOCAL"
+msgctxt "NETWORKS_ALLOW_LOCAL"
 msgid "Allow access only from local networks"
 msgstr "N\\'autoriser l\\'accès que depuis les réseaux locaux"
 
-msgctxt "OPERATION_NETWORKS_ALLOW_PUBLIC"
+msgctxt "NETWORKS_ALLOW_PUBLIC"
 msgid "Allow public access (entire Internet)"
 msgstr "Autoriser l\\'accès complet (LAN et Internet)"
 
-msgctxt "OPERATION_ERROR_PASSWORD_CHANGE"
+msgctxt "ERROR_PASSWORD_CHANGE"
 msgid ""
 "An error occurred while attempting to change your password. Please make sure"
 " that the old password entered is correct."
@@ -204,326 +180,326 @@ msgstr ""
 "Une erreur s\\'est produite pendant la modification de votre mot de passe. "
 "Veuillez vous assurer de l\\'exactitude de l\\'ancien mot de passe tapé."
 
-msgctxt "OPERATION_BACK"
+msgctxt "BACK"
 msgid "Back"
 msgstr "Retour"
 
-msgctxt "OPERATION_BACKUP"
+msgctxt "BACKUP"
 msgid "Backup"
 msgstr "Sauvegarde"
 
-msgctxt "OPERATION_DESCRIPTION_BRIEF"
+msgctxt "DESCRIPTION_BRIEF"
 msgid "Brief description"
 msgstr "Brève description"
 
-msgctxt "OPERATION_PASSWORD_CHANGE"
+msgctxt "PASSWORD_CHANGE"
 msgid "Change Password"
 msgstr "Changer le mot de passe"
 
-msgctxt "OPERATION_RESET_PASSWORD_TITLE"
+msgctxt "RESET_PASSWORD_TITLE"
 msgid "Reset user password"
 msgstr "Réinitialiser le mot de passe de l\\'utilisateur"
 
-msgctxt "OPERATION_ACCOUNT_PASSWORD_CHANGE"
+msgctxt "ACCOUNT_PASSWORD_CHANGE"
 msgid "Change account password"
 msgstr "Changer le mot de passe du compte"
 
-msgctxt "OPERATION_CONTENT"
+msgctxt "CONTENT"
 msgid "Content"
 msgstr "Contenu"
 
-msgctxt "OPERATION_CREATE_GROUP"
+msgctxt "CREATE_GROUP"
 msgid "Create user group"
 msgstr "Créer un groupe d\\'utilisateurs"
 
-msgctxt "OPERATION_USER_LIST_CURRENT"
+msgctxt "USER_LIST_CURRENT"
 msgid "Current list of users"
 msgstr "Liste des utilisateurs"
 
-msgctxt "OPERATION_DESCRIPTION"
+msgctxt "DESCRIPTION"
 msgid "Description"
 msgstr "Description"
 
-msgctxt "OPERATION_DESTINATION"
+msgctxt "DESTINATION"
 msgid "Destination"
 msgstr "Destination"
 
-msgctxt "OPERATION_DOMAIN_NAME"
+msgctxt "DOMAIN_NAME"
 msgid "Domain name"
 msgstr "Nom de Domaine"
 
-msgctxt "OPERATION_DOMAIN"
+msgctxt "DOMAIN"
 msgid "Domain"
 msgstr "Domaine"
 
-msgctxt "OPERATION_DOMAINS"
+msgctxt "DOMAINS"
 msgid "Domains"
 msgstr "Domaines"
 
-msgctxt "OPERATION_DOWNLOAD"
+msgctxt "DOWNLOAD"
 msgid "Download"
 msgstr "Télécharger"
 
-msgctxt "OPERATION_ERROR_UPDATING_CONFIGURATION"
+msgctxt "ERROR_UPDATING_CONFIGURATION"
 msgid "Error occurred while updating system configuration."
 msgstr ""
 "Une erreur s\\'est produite pendant la mise à jour de la configuration du "
 "serveur."
 
-msgctxt "OPERATION_GROUP_MEMBERS"
+msgctxt "GROUP_MEMBERS"
 msgid "Group Members"
 msgstr "Membres du groupe"
 
-msgctxt "OPERATION_GROUP_NAME"
+msgctxt "GROUP_NAME"
 msgid "Group Name"
 msgstr "Nom du groupe"
 
-msgctxt "OPERATION_GROUPS"
+msgctxt "GROUPS"
 msgid "Groups"
 msgstr "Groupes"
 
-msgctxt "OPERATION_IP_ADDRESS"
+msgctxt "IP_ADDRESS"
 msgid "IP Address"
 msgstr "Adresse IP"
 
-msgctxt "OPERATION_IP_ADDRESS_OR_FQDN"
+msgctxt "IP_ADDRESS_OR_FQDN"
 msgid "IP Address or FQDN"
 msgstr "Adresse IP ou FQDN"
 
-msgctxt "OPERATION_USER_INVALID"
+msgctxt "USER_INVALID"
 msgid "Invalid user"
 msgstr "Utilisateur non autorisé"
 
-msgctxt "OPERATION_LOCATION"
+msgctxt "LOCATION"
 msgid "Location"
 msgstr "Emplacement"
 
-msgctxt "OPERATION_MB"
+msgctxt "MB"
 msgid "Mb"
 msgstr "Mo"
 
-msgctxt "OPERATION_MODIFY_USER_GROUP"
+msgctxt "MODIFY_USER_GROUP"
 msgid "Modify user group"
 msgstr "Modifier le groupe d\\'utilisateurs"
 
-msgctxt "OPERATION_NAME"
+msgctxt "NAME"
 msgid "Name"
 msgstr "Nom"
 
-msgctxt "OPERATION_PASSWORD_VERIFY_NEW"
+msgctxt "PASSWORD_VERIFY_NEW"
 msgid "New password (verify):"
 msgstr "Nouveau mot de passe (vérification)"
 
-msgctxt "OPERATION_PASSWORD_NEW"
+msgctxt "PASSWORD_NEW"
 msgid "New password:"
 msgstr "Nouveau mot de passe"
 
-msgctxt "OPERATION_OFF"
+msgctxt "OFF"
 msgid "Off"
 msgstr "Désactivé"
 
-msgctxt "OPERATION_OK"
+msgctxt "OK"
 msgid "Ok"
 msgstr "Ok"
 
-msgctxt "OPERATION_PASSWORD_OLD"
+msgctxt "PASSWORD_OLD"
 msgid "Old password:"
 msgstr "Ancien mot de passe"
 
-msgctxt "OPERATION_ON"
+msgctxt "ON"
 msgid "On"
 msgstr "Activé"
 
-msgctxt "OPERATION_PASSWORD"
+msgctxt "PASSWORD"
 msgid "Password"
 msgstr "Mot de passe"
 
-msgctxt "OPERATION_PERFORM"
+msgctxt "PERFORM"
 msgid "Perform"
 msgstr "Exécuter"
 
-msgctxt "OPERATION_RECONFIGURE"
+msgctxt "RECONFIGURE"
 msgid "Reconfigure"
 msgstr "Reconfigurer"
 
-msgctxt "OPERATION_REMOVE_USER_GROUP"
+msgctxt "REMOVE_USER_GROUP"
 msgid "Remove user group"
 msgstr "Supprimer le groupe d\\'utilisateurs"
 
-msgctxt "OPERATION_PASSWORD_RESET"
+msgctxt "PASSWORD_RESET"
 msgid "Reset password"
 msgstr "Réinitialiser le mot de passe"
 
-msgctxt "OPERATION_RESTORE"
+msgctxt "RESTORE"
 msgid "Restore"
 msgstr "Restaurer"
 
-msgctxt "OPERATION_SHUTDOWN"
+msgctxt "SHUTDOWN"
 msgid "Shutdown"
 msgstr "Arrêter"
 
-msgctxt "OPERATION_SUCCESS"
+msgctxt "SUCCESS"
 msgid "Success"
 msgstr "Opération réussie"
 
-msgctxt "OPERATION_ACCOUNT_NAME_INVALID"
+msgctxt "ACCOUNT_NAME_INVALID"
 msgid "The account name entered is invalid."
 msgstr "Le nom d\\'utilisateur que vous avez tapé n\\'est pas valide."
 
-msgctxt "OPERATION_ACCOUNT_NAME_INVALID_CHARS"
+msgctxt "ACCOUNT_NAME_INVALID_CHARS"
 msgid "The account name you entered contained invalid characters."
 msgstr ""
 "Le nom d\\'utilisateur que vous avez tapé contient des caractères non "
 "valides."
 
-msgctxt "OPERATION_PASSWORD_OLD_INVALID_CHARS"
+msgctxt "PASSWORD_OLD_INVALID_CHARS"
 msgid "The old password you entered contained invalid characters."
 msgstr ""
 "L\\'ancien mot de passe que vous avez tapé contient des caractères non "
 "valides."
 
-msgctxt "OPERATION_PASSWORD_INVALID_CHARS"
+msgctxt "PASSWORD_INVALID_CHARS"
 msgid "The password you entered contained invalid characters."
 msgstr ""
 "Le mot de passe que vous avez tapé contient des caractères non valides."
 
-msgctxt "OPERATION_PASSWORD_VERIFY_ERROR"
+msgctxt "PASSWORD_VERIFY_ERROR"
 msgid "The passwords you entered did not match."
 msgstr "Les mots de passe ne concordent pas."
 
-msgctxt "OPERATION_ACCOUNT_USER_NONE"
+msgctxt "ACCOUNT_USER_NONE"
 msgid "There are no user accounts in the system."
 msgstr "Aucun compte utilisateur n\\'a été défini dans le système."
 
-msgctxt "OPERATION_ACCOUNT_GROUP_NONE"
+msgctxt "ACCOUNT_GROUP_NONE"
 msgid "There are no user groups in the system."
 msgstr "Il n\\'y a aucun groupe d\\'utilisateurs défini dans le système."
 
-msgctxt "OPERATION_ERROR_INVALID_CHARS"
+msgctxt "ERROR_INVALID_CHARS"
 msgid "Unexpected characters in description."
 msgstr "Caractères inattendus dans la description."
 
-msgctxt "OPERATION_USER_NAME"
+msgctxt "USER_NAME"
 msgid "User Name"
 msgstr "Nom d\\'utilisateur"
 
-msgctxt "OPERATION_YOUR_ACCOUNT"
+msgctxt "YOUR_ACCOUNT"
 msgid "Your account:"
 msgstr "Votre compte utilisateur:"
 
-msgctxt "OPERATION_YOUR_ACCOUNT_INVALID"
+msgctxt "YOUR_ACCOUNT_INVALID"
 msgid "The account name entered is invalid."
 msgstr "Le nom d\\'utilisateur que vous avez tapé n\\'est pas valide."
 
-msgctxt "OPERATION_PASSWORD_CHANGE_SUCCESS"
+msgctxt "PASSWORD_CHANGE_SUCCESS"
 msgid "Your password has been successfully changed."
 msgstr "Le mot de passe a été modifié avec succès."
 
-msgctxt "OPERATION_FM_NONBLANK"
+msgctxt "FM_NONBLANK"
 msgid "This field must not be left blank"
 msgstr "Ce champ ne doit pas être vide."
 
-msgctxt "OPERATION_FM_INTEGER"
+msgctxt "FM_INTEGER"
 msgid "This field must contain a positive integer"
 msgstr "Ce champ doit contenir un entier positif."
 
-msgctxt "OPERATION_FM_NUMBER"
+msgctxt "FM_NUMBER"
 msgid "This field must contain a number"
 msgstr "Ce champ doit contenir un nombre."
 
-msgctxt "OPERATION_FM_WORD"
+msgctxt "FM_WORD"
 msgid "This field must look like a single word."
 msgstr "Ce champ doit être composé d\\'un seul mot."
 
-msgctxt "OPERATION_FM_DATE"
+msgctxt "FM_DATE"
 msgid "The data entered could not be parsed as a date"
 msgstr "La valeur tapée ne correspond pas à une date."
 
-msgctxt "OPERATION_FM_CREDIT_CARD_NUMBER1"
+msgctxt "FM_CREDIT_CARD_NUMBER1"
 msgid "You must enter a credit card number"
 msgstr "Vous devez taper un numéro de carte de paiement."
 
-msgctxt "OPERATION_FM_CREDIT_CARD_NUMBER2"
+msgctxt "FM_CREDIT_CARD_NUMBER2"
 msgid ""
 "Credit card numbers shouldn\\'t have anything but numbers, spaces or dashes"
 msgstr ""
 "Le numéro de carte de paiement ne doit contenir que des nombres, des espaces"
 " ou des tirets."
 
-msgctxt "OPERATION_FM_CREDIT_CARD_NUMBER3"
+msgctxt "FM_CREDIT_CARD_NUMBER3"
 msgid "Must be at least 14 characters in length"
 msgstr "Il doit être composé d\\'au moins 14 caractères."
 
-msgctxt "OPERATION_FM_CREDIT_CARD_NUMBER4"
+msgctxt "FM_CREDIT_CARD_NUMBER4"
 msgid "Doesn\\'t appear to be a valid credit card number"
 msgstr ""
 "Il ne semble pas correspondre à un numéro valide de carte de paiement."
 
-msgctxt "OPERATION_FM_CREDIT_CARD_EXPIRY1"
+msgctxt "FM_CREDIT_CARD_EXPIRY1"
 msgid "No expiry date entered."
 msgstr "Aucune date d\\'expiration n\\'a été tapée."
 
-msgctxt "OPERATION_FM_CREDIT_CARD_EXPIRY2"
+msgctxt "FM_CREDIT_CARD_EXPIRY2"
 msgid "Expiry date must be in the format MM/YY or MM/YYYY"
 msgstr "La date d\\'expiration doit être tapée sous la forme MM/AA ou MM/AAAA."
 
-msgctxt "OPERATION_FM_CREDIT_CARD_EXPIRY3"
+msgctxt "FM_CREDIT_CARD_EXPIRY3"
 msgid "This expiry date appears to have already passed"
 msgstr "La date d\\'expiration a déjà expirée."
 
-msgctxt "OPERATION_FM_CREDIT_CARD_EXPIRY4"
+msgctxt "FM_CREDIT_CARD_EXPIRY4"
 msgid "This expiry date appears to be too far in the future"
 msgstr "La date d\\'expiration semble trop éloignée dans le futur."
 
-msgctxt "OPERATION_FM_ISO_COUNTRY_CODE1"
+msgctxt "FM_ISO_COUNTRY_CODE1"
 msgid "You must provide a country code"
 msgstr "Vous devez taper un code de région."
 
-msgctxt "OPERATION_FM_ISO_COUNTRY_CODE2"
+msgctxt "FM_ISO_COUNTRY_CODE2"
 msgid "This field does not contain an ISO country code"
 msgstr "Ce champ ne contient pas de code ISO de région valide."
 
-msgctxt "OPERATION_FM_US_STATE"
+msgctxt "FM_US_STATE"
 msgid "This doesn\\'t appear to be a valid 2-letter US state abbreviation"
 msgstr "Cette abréviation en deux lettres d\\'état américain n\\'est pas valide."
 
-msgctxt "OPERATION_FM_US_ZIPCODE"
+msgctxt "FM_US_ZIPCODE"
 msgid "US zip codes must contain 5 or 9 numbers"
 msgstr "Les codes postaux américains doivent contenir 5 ou 9 chiffres."
 
-msgctxt "OPERATION_FM_MINLENGTH1"
+msgctxt "FM_MINLENGTH1"
 msgid "Minimum length has been specified meaninglessly as [_1]"
 msgstr "La longueur minimale a été définie arbitrairement à [_1] caractères."
 
-msgctxt "OPERATION_FM_MINLENGTH2"
+msgctxt "FM_MINLENGTH2"
 msgid "This field must be at least [_1] characters"
 msgstr "Ce champ doit contenir au minimum [_1] caractères."
 
-msgctxt "OPERATION_FM_MAXLENGTH1"
+msgctxt "FM_MAXLENGTH1"
 msgid "Maximum length has been specified meaninglessly as [_1]"
 msgstr "La longueur maximale a été définie arbitrairement à [_1] caractères."
 
-msgctxt "OPERATION_FM_MAXLENGTH2"
+msgctxt "FM_MAXLENGTH2"
 msgid "This field must be no more than [_1] characters"
 msgstr "Ce champ doit ne doit pas dépasser [_1] caractères."
 
-msgctxt "OPERATION_FM_EXACTLENGTH1"
+msgctxt "FM_EXACTLENGTH1"
 msgid "You must specify the length for the field."
 msgstr "Vous devez définir la longueur de ce champ."
 
-msgctxt "OPERATION_FM_EXACTLENGTH2"
+msgctxt "FM_EXACTLENGTH2"
 msgid "You must specify the exactlength of the field with an integer"
 msgstr "Vous devez définir la longueur exacte de ce champ avec un entier."
 
-msgctxt "OPERATION_FM_EXACTLENGTH3"
+msgctxt "FM_EXACTLENGTH3"
 msgid "This field must be exactly [_1] characters"
 msgstr "Ce champ doit faire exactement [_1] caractères."
 
-msgctxt "OPERATION_FM_LENGTHRANGE1"
+msgctxt "FM_LENGTHRANGE1"
 msgid "You must specify the maximum and minimum length for the field."
 msgstr "Vous devez définir les longueurs maximale et minimale de ce champ."
 
-msgctxt "OPERATION_FM_LENGTHRANGE2"
+msgctxt "FM_LENGTHRANGE2"
 msgid ""
 "You must specify the maximum and minimum lengths of the field with an "
 "integer"
@@ -531,54 +507,54 @@ msgstr ""
 "Vous devez définir les longueurs maximale et minimale de ce champ avec des "
 "entiers."
 
-msgctxt "OPERATION_FM_LENGTHRANGE3"
+msgctxt "FM_LENGTHRANGE3"
 msgid "This field must be between [_1] and [_2] characters"
 msgstr "La longueur de ce champ doit être comprise entre [_1] caractères."
 
-msgctxt "OPERATION_FM_URL"
+msgctxt "FM_URL"
 msgid "This field must contain a URL starting with http:// or ftp://"
 msgstr "Ce champ doit contenir une URL commençant par http:// ou ftp://"
 
-msgctxt "OPERATION_FM_EMAIL_SIMPLE1"
+msgctxt "FM_EMAIL_SIMPLE1"
 msgid "You must enter an email address."
 msgstr "Vous devez taper une adresse de courriel."
 
-msgctxt "OPERATION_FM_EMAIL_SIMPLE2"
+msgctxt "FM_EMAIL_SIMPLE2"
 msgid "This field doesn\\'t look like an RFC822-compliant email address"
 msgstr ""
 "Ce champ ne semble pas respecter le format RFC822 des adresses de courriel."
 
-msgctxt "OPERATION_FM_DOMAIN_NAME"
+msgctxt "FM_DOMAIN_NAME"
 msgid "This field doesn\\'t look like a valid Internet domain name or hostname."
 msgstr ""
 "Ce champ ne semble pas contenir de nom de domaine Internet ou d\\'hôte "
 "valide."
 
-msgctxt "OPERATION_FM_IP_NUMBER1"
+msgctxt "FM_IP_NUMBER1"
 msgid "This field must contain a valid IP number and can not be left blank."
 msgstr ""
 "Ce champ doit contenir une adresse IP valide et ne doit pas être vide."
 
-msgctxt "OPERATION_FM_IP_NUMBER2"
+msgctxt "FM_IP_NUMBER2"
 msgid "Invalid IP address format (expected X.X.X.X)"
 msgstr "Format d\\'adresse IP incorrect (X.X.X.X attendu)"
 
-msgctxt "OPERATION_FM_IP_NUMBER3"
+msgctxt "FM_IP_NUMBER3"
 msgid "[_1] is more than 255"
 msgstr "La valeur [_1] dépasse 255."
 
-msgctxt "OPERATION_FM_USERNAME"
+msgctxt "FM_USERNAME"
 msgid ""
 "This field must look like a valid username (3 to 8 letters and numbers)"
 msgstr ""
 "Ce champ doit contenir un nom d\\'utilisateur valide (3 à 8 lettres et "
 "chiffres)."
 
-msgctxt "OPERATION_FM_PASSWORD1"
+msgctxt "FM_PASSWORD1"
 msgid "You must provide a password."
 msgstr "Vous devez taper un mot de passe."
 
-msgctxt "OPERATION_FM_PASSWORD2"
+msgctxt "FM_PASSWORD2"
 msgid ""
 "The password you provided was not a good password.A good password must "
 "contain all of the following: upper case letter, lower case letter, number, "
@@ -589,54 +565,40 @@ msgstr ""
 "chiffres et des caractères non alphanumériques et être composé d\\'au moins "
 "7 caractères."
 
-msgctxt "OPERATION_FM_MAC_ADDRESS1"
+msgctxt "FM_MAC_ADDRESS1"
 msgid "You must provide a MAC address."
 msgstr "Vous devez taper une adresse Ethernet."
 
-msgctxt "OPERATION_FM_MAC_ADDRESS2"
+msgctxt "FM_MAC_ADDRESS2"
 msgid "The MAC address you provided was not valid."
 msgstr "L\\'adresse Ethernet que vous avez tapé n\\'est pas valide."
 
-msgctxt "OPERATION_FM_ERR_UNEXPECTED_DESC"
+msgctxt "FM_ERR_UNEXPECTED_DESC"
 msgid "Error: unexpected or missing characters in description"
 msgstr "ERREUR : caractères invalides ou manquants dans la description."
 
-msgctxt ""
-"OPERATION_\n"
-"acs_NO "
+msgctxt "acs_NO"
 msgid "Not Authorized"
 msgstr "Non autorisé"
 
-msgctxt ""
-"OPERATION_\n"
-"acs_LOGIN "
+msgctxt "acs_LOGIN"
 msgid "Login required"
 msgstr "Connexion obligatoire"
 
-msgctxt ""
-"OPERATION_\n"
-"acs_ADMIN "
+msgctxt "acs_ADMIN"
 msgid "Admin rights required"
 msgstr "Droits d\\'administration requis"
 
-msgctxt "OPERATION_User password"
-msgid "User password"
-msgstr "Mot de passe utilisateur"
-
 msgctxt ""
-"OPERATION_\n"
-"Logout "
+",\n"
+"Logout"
 msgid "Logout"
 msgstr "Déconnexion"
 
-msgctxt ""
-"OPERATION_\n"
-"Home "
+msgctxt "Home"
 msgid "Home"
 msgstr "Accueil"
 
-msgctxt ""
-"OPERATION_\n"
-"CSRF_VALIDATION_FAILURE "
+msgctxt "CSRF_VALIDATION_FAILURE"
 msgid "Error: CSRF token is invalid or outdated."
 msgstr "Erreur: le jeton CSRF est invalide ou expiré."
diff --git a/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/General/pofiles/general_he.po b/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/General/pofiles/general_he.po
index 75d3c9e..06b8fe9 100644
--- a/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/General/pofiles/general_he.po
+++ b/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/General/pofiles/general_he.po
@@ -5,99 +5,95 @@ msgstr ""
 "Language: None\n"
 "Content-Type: text/plain; charset=utf-8\n"
 
-msgctxt "OPERATION_Collaboration"
+msgctxt "Collaboration"
 msgid "Collaboration"
 msgstr "Collaboration"
 
-msgctxt "OPERATION_Administration"
+msgctxt "Administration"
 msgid "Administration"
 msgstr "Administration"
 
-msgctxt "OPERATION_Security"
+msgctxt "Security"
 msgid "Security"
 msgstr "Security"
 
-msgctxt "OPERATION_Configuration"
+msgctxt "Configuration"
 msgid "Configuration"
 msgstr "קונפיגורציה"
 
-msgctxt "OPERATION_Miscellaneous"
+msgctxt "Miscellaneous"
 msgid "Miscellaneous"
 msgstr "Miscellaneous"
 
-msgctxt "OPERATION_Your Settings"
-msgid "Your Settings"
-msgstr "Your Settings"
-
-msgctxt "OPERATION_SAVE"
+msgctxt "SAVE"
 msgid "Save"
 msgstr "שמור"
 
-msgctxt "OPERATION_CANCEL"
+msgctxt "CANCEL"
 msgid "Cancel"
 msgstr "Cancel"
 
-msgctxt "OPERATION_ENABLED"
+msgctxt "ENABLED"
 msgid "Enabled"
 msgstr "Enabled"
 
-msgctxt "OPERATION_DISABLED"
+msgctxt "DISABLED"
 msgid "Disabled"
 msgstr "Disabled"
 
-msgctxt "OPERATION_NO"
+msgctxt "NO"
 msgid "No"
 msgstr "No"
 
-msgctxt "OPERATION_YES"
+msgctxt "YES"
 msgid "Yes"
 msgstr "Yes"
 
-msgctxt "OPERATION_ADD"
+msgctxt "ADD"
 msgid "Add"
 msgstr "הוסף"
 
-msgctxt "OPERATION_CREATE"
+msgctxt "CREATE"
 msgid "Create"
 msgstr "Create"
 
-msgctxt "OPERATION_MODIFY"
+msgctxt "MODIFY"
 msgid "Modify"
 msgstr "שנה"
 
-msgctxt "OPERATION_REMOVE"
+msgctxt "REMOVE"
 msgid "Remove"
 msgstr "הסרה"
 
-msgctxt "OPERATION_COMMENT"
+msgctxt "COMMENT"
 msgid "Comment"
 msgstr "Comment"
 
-msgctxt "OPERATION_NEXT"
+msgctxt "NEXT"
 msgid "Next"
 msgstr "Next"
 
-msgctxt "OPERATION_SELF"
+msgctxt "SELF"
 msgid "Self"
 msgstr "Self"
 
-msgctxt "OPERATION_REMOTE"
+msgctxt "REMOTE"
 msgid "Remote"
 msgstr "הסרה"
 
-msgctxt "OPERATION_LOCAL"
+msgctxt "LOCAL"
 msgid "Local"
 msgstr "Local"
 
-msgctxt "OPERATION_ACTION"
+msgctxt "ACTION"
 msgid "Action"
 msgstr "פעולה"
 
-msgctxt "OPERATION_NETWORK"
+msgctxt "NETWORK"
 msgid "Network"
 msgstr "Network"
 
-msgctxt "OPERATION_ROUTER"
+msgctxt "ROUTER"
 msgid "Router"
 msgstr "Router"
 
@@ -105,23 +101,23 @@ msgctxt "OPERATION_STATUS_REPORT"
 msgid "Operation status report"
 msgstr "Operation status report"
 
-msgctxt "OPERATION_ACCOUNT"
+msgctxt "ACCOUNT"
 msgid "Account"
 msgstr "חשבון"
 
-msgctxt "OPERATION_GROUP"
+msgctxt "GROUP"
 msgid "Group"
 msgstr "Group"
 
-msgctxt "OPERATION_DESC_SECTIONBAR"
+msgctxt "DESC_SECTIONBAR"
 msgid "<hr class=\"sectionbar\"/>"
-msgstr " <hr class=\"sectionbar\"/> "
+msgstr "<hr class=\"sectionbar\"/>"
 
-msgctxt "OPERATION_NO_PIPES_ALLOWED"
+msgctxt "NO_PIPES_ALLOWED"
 msgid "Pipe symbols (|) are not permitted in this field"
 msgstr "Pipe symbols (|) are not permitted in this field"
 
-msgctxt "OPERATION_ERROR_BELOW"
+msgctxt "ERROR_BELOW"
 msgid ""
 "ERROR: There was an error in the validation of this page. Please scroll down"
 " and find the specific problem."
@@ -129,27 +125,27 @@ msgstr ""
 "ERROR: There was an error in the validation of this page. Please scroll down"
 " and find the specific problem."
 
-msgctxt "OPERATION_ACCESS"
+msgctxt "ACCESS"
 msgid "Access"
 msgstr "Access"
 
-msgctxt "OPERATION_ACCOUNT_LOCKED"
+msgctxt "ACCOUNT_LOCKED"
 msgid "Account is locked"
 msgstr "Account is locked"
 
-msgctxt "OPERATION_GROUP_ADD"
+msgctxt "GROUP_ADD"
 msgid "Add group"
 msgstr "Add group"
 
-msgctxt "OPERATION_NETWORKS_ALLOW_LOCAL"
+msgctxt "NETWORKS_ALLOW_LOCAL"
 msgid "Allow access only from local networks"
 msgstr "Allow access only from local networks"
 
-msgctxt "OPERATION_NETWORKS_ALLOW_PUBLIC"
+msgctxt "NETWORKS_ALLOW_PUBLIC"
 msgid "Allow public access (entire Internet)"
 msgstr "Allow public access (entire Internet)"
 
-msgctxt "OPERATION_ERROR_PASSWORD_CHANGE"
+msgctxt "ERROR_PASSWORD_CHANGE"
 msgid ""
 "An error occurred while attempting to change your password. Please make sure"
 " that the old password entered is correct."
@@ -157,317 +153,317 @@ msgstr ""
 "An error occurred while attempting to change your password. Please make sure"
 " that the old password entered is correct."
 
-msgctxt "OPERATION_BACK"
+msgctxt "BACK"
 msgid "Back"
 msgstr "חזרה"
 
-msgctxt "OPERATION_BACKUP"
+msgctxt "BACKUP"
 msgid "Backup"
 msgstr "Backup"
 
-msgctxt "OPERATION_DESCRIPTION_BRIEF"
+msgctxt "DESCRIPTION_BRIEF"
 msgid "Brief description"
 msgstr "Brief description"
 
-msgctxt "OPERATION_PASSWORD_CHANGE"
+msgctxt "PASSWORD_CHANGE"
 msgid "Change Password"
 msgstr "Change Password"
 
-msgctxt "OPERATION_RESET_PASSWORD_TITLE"
+msgctxt "RESET_PASSWORD_TITLE"
 msgid "Reset user password"
 msgstr "Reset user password"
 
-msgctxt "OPERATION_ACCOUNT_PASSWORD_CHANGE"
+msgctxt "ACCOUNT_PASSWORD_CHANGE"
 msgid "Change account password"
 msgstr "Change account password"
 
-msgctxt "OPERATION_CONTENT"
+msgctxt "CONTENT"
 msgid "Content"
 msgstr "Content"
 
-msgctxt "OPERATION_CREATE_GROUP"
+msgctxt "CREATE_GROUP"
 msgid "Create user group"
 msgstr "Create user group"
 
-msgctxt "OPERATION_USER_LIST_CURRENT"
+msgctxt "USER_LIST_CURRENT"
 msgid "Current list of users"
 msgstr "Current list of users"
 
-msgctxt "OPERATION_DESCRIPTION"
+msgctxt "DESCRIPTION"
 msgid "Description"
 msgstr "תיאור"
 
-msgctxt "OPERATION_DESTINATION"
+msgctxt "DESTINATION"
 msgid "Destination"
 msgstr "Destination"
 
-msgctxt "OPERATION_DOMAIN_NAME"
+msgctxt "DOMAIN_NAME"
 msgid "Domain name"
 msgstr "Domain name"
 
-msgctxt "OPERATION_DOMAIN"
+msgctxt "DOMAIN"
 msgid "Domain"
 msgstr "Domain"
 
-msgctxt "OPERATION_DOMAINS"
+msgctxt "DOMAINS"
 msgid "Domains"
 msgstr "Domains"
 
-msgctxt "OPERATION_DOWNLOAD"
+msgctxt "DOWNLOAD"
 msgid "Download"
 msgstr "Download"
 
-msgctxt "OPERATION_ERROR_UPDATING_CONFIGURATION"
+msgctxt "ERROR_UPDATING_CONFIGURATION"
 msgid "Error occurred while updating system configuration."
 msgstr "Error occurred while updating system configuration."
 
-msgctxt "OPERATION_GROUP_MEMBERS"
+msgctxt "GROUP_MEMBERS"
 msgid "Group Members"
 msgstr "Group Members"
 
-msgctxt "OPERATION_GROUP_NAME"
+msgctxt "GROUP_NAME"
 msgid "Group Name"
 msgstr "Group Name"
 
-msgctxt "OPERATION_GROUPS"
+msgctxt "GROUPS"
 msgid "Groups"
 msgstr "Groups"
 
-msgctxt "OPERATION_IP_ADDRESS"
+msgctxt "IP_ADDRESS"
 msgid "IP Address"
 msgstr "כתובת IP"
 
-msgctxt "OPERATION_IP_ADDRESS_OR_FQDN"
+msgctxt "IP_ADDRESS_OR_FQDN"
 msgid "IP Address or FQDN"
 msgstr "IP Address or FQDN"
 
-msgctxt "OPERATION_USER_INVALID"
+msgctxt "USER_INVALID"
 msgid "Invalid user"
 msgstr "Invalid user"
 
-msgctxt "OPERATION_LOCATION"
+msgctxt "LOCATION"
 msgid "Location"
 msgstr "Location"
 
-msgctxt "OPERATION_MB"
+msgctxt "MB"
 msgid "Mb"
 msgstr "מגה בייט"
 
-msgctxt "OPERATION_MODIFY_USER_GROUP"
+msgctxt "MODIFY_USER_GROUP"
 msgid "Modify user group"
 msgstr "Modify user group"
 
-msgctxt "OPERATION_NAME"
+msgctxt "NAME"
 msgid "Name"
 msgstr "שם"
 
-msgctxt "OPERATION_PASSWORD_VERIFY_NEW"
+msgctxt "PASSWORD_VERIFY_NEW"
 msgid "New password (verify):"
 msgstr "New password (verify):"
 
-msgctxt "OPERATION_PASSWORD_NEW"
+msgctxt "PASSWORD_NEW"
 msgid "New password:"
 msgstr "New password:"
 
-msgctxt "OPERATION_OFF"
+msgctxt "OFF"
 msgid "Off"
 msgstr "Off"
 
-msgctxt "OPERATION_OK"
+msgctxt "OK"
 msgid "Ok"
 msgstr "Ok"
 
-msgctxt "OPERATION_PASSWORD_OLD"
+msgctxt "PASSWORD_OLD"
 msgid "Old password:"
 msgstr "Old password:"
 
-msgctxt "OPERATION_ON"
+msgctxt "ON"
 msgid "On"
 msgstr "On"
 
-msgctxt "OPERATION_PASSWORD"
+msgctxt "PASSWORD"
 msgid "Password"
 msgstr "סיסמה"
 
-msgctxt "OPERATION_PERFORM"
+msgctxt "PERFORM"
 msgid "Perform"
 msgstr "Perform"
 
-msgctxt "OPERATION_RECONFIGURE"
+msgctxt "RECONFIGURE"
 msgid "Reconfigure"
 msgstr "Reconfigure"
 
-msgctxt "OPERATION_REMOVE_USER_GROUP"
+msgctxt "REMOVE_USER_GROUP"
 msgid "Remove user group"
 msgstr "Remove user group"
 
-msgctxt "OPERATION_PASSWORD_RESET"
+msgctxt "PASSWORD_RESET"
 msgid "Reset password"
 msgstr "Reset password"
 
-msgctxt "OPERATION_RESTORE"
+msgctxt "RESTORE"
 msgid "Restore"
 msgstr "Restore"
 
-msgctxt "OPERATION_SHUTDOWN"
+msgctxt "SHUTDOWN"
 msgid "Shutdown"
 msgstr "Shutdown"
 
-msgctxt "OPERATION_SUCCESS"
+msgctxt "SUCCESS"
 msgid "Success"
 msgstr "Success"
 
-msgctxt "OPERATION_ACCOUNT_NAME_INVALID"
+msgctxt "ACCOUNT_NAME_INVALID"
 msgid "The account name entered is invalid."
 msgstr "The account name entered is invalid."
 
-msgctxt "OPERATION_ACCOUNT_NAME_INVALID_CHARS"
+msgctxt "ACCOUNT_NAME_INVALID_CHARS"
 msgid "The account name you entered contained invalid characters."
 msgstr "The account name you entered contained invalid characters."
 
-msgctxt "OPERATION_PASSWORD_OLD_INVALID_CHARS"
+msgctxt "PASSWORD_OLD_INVALID_CHARS"
 msgid "The old password you entered contained invalid characters."
 msgstr "The old password you entered contained invalid characters."
 
-msgctxt "OPERATION_PASSWORD_INVALID_CHARS"
+msgctxt "PASSWORD_INVALID_CHARS"
 msgid "The password you entered contained invalid characters."
 msgstr "The password you entered contained invalid characters."
 
-msgctxt "OPERATION_PASSWORD_VERIFY_ERROR"
+msgctxt "PASSWORD_VERIFY_ERROR"
 msgid "The passwords you entered did not match."
 msgstr "The passwords you entered did not match."
 
-msgctxt "OPERATION_ACCOUNT_USER_NONE"
+msgctxt "ACCOUNT_USER_NONE"
 msgid "There are no user accounts in the system."
 msgstr "There are no user accounts in the system."
 
-msgctxt "OPERATION_ACCOUNT_GROUP_NONE"
+msgctxt "ACCOUNT_GROUP_NONE"
 msgid "There are no user groups in the system."
 msgstr "There are no user groups in the system."
 
-msgctxt "OPERATION_ERROR_INVALID_CHARS"
+msgctxt "ERROR_INVALID_CHARS"
 msgid "Unexpected characters in description."
 msgstr "Unexpected characters in description."
 
-msgctxt "OPERATION_USER_NAME"
+msgctxt "USER_NAME"
 msgid "User Name"
 msgstr "User Name"
 
-msgctxt "OPERATION_YOUR_ACCOUNT"
+msgctxt "YOUR_ACCOUNT"
 msgid "Your account:"
 msgstr "Your account:"
 
-msgctxt "OPERATION_YOUR_ACCOUNT_INVALID"
+msgctxt "YOUR_ACCOUNT_INVALID"
 msgid "The account name entered is invalid."
 msgstr "The account name entered is invalid."
 
-msgctxt "OPERATION_PASSWORD_CHANGE_SUCCESS"
+msgctxt "PASSWORD_CHANGE_SUCCESS"
 msgid "Your password has been successfully changed."
 msgstr "Your password has been successfully changed."
 
-msgctxt "OPERATION_FM_NONBLANK"
+msgctxt "FM_NONBLANK"
 msgid "This field must not be left blank"
 msgstr "This field must not be left blank"
 
-msgctxt "OPERATION_FM_INTEGER"
+msgctxt "FM_INTEGER"
 msgid "This field must contain a positive integer"
 msgstr "This field must contain a positive integer"
 
-msgctxt "OPERATION_FM_NUMBER"
+msgctxt "FM_NUMBER"
 msgid "This field must contain a number"
 msgstr "This field must contain a number"
 
-msgctxt "OPERATION_FM_WORD"
+msgctxt "FM_WORD"
 msgid "This field must look like a single word."
 msgstr "This field must look like a single word."
 
-msgctxt "OPERATION_FM_DATE"
+msgctxt "FM_DATE"
 msgid "The data entered could not be parsed as a date"
 msgstr "The data entered could not be parsed as a date"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_NUMBER1"
+msgctxt "FM_CREDIT_CARD_NUMBER1"
 msgid "You must enter a credit card number"
 msgstr "You must enter a credit card number"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_NUMBER2"
+msgctxt "FM_CREDIT_CARD_NUMBER2"
 msgid ""
 "Credit card numbers shouldn\\'t have anything but numbers, spaces or dashes"
 msgstr ""
 "Credit card numbers shouldn\\'t have anything but numbers, spaces or dashes"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_NUMBER3"
+msgctxt "FM_CREDIT_CARD_NUMBER3"
 msgid "Must be at least 14 characters in length"
 msgstr "Must be at least 14 characters in length"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_NUMBER4"
+msgctxt "FM_CREDIT_CARD_NUMBER4"
 msgid "Doesn\\'t appear to be a valid credit card number"
 msgstr "Doesn\\'t appear to be a valid credit card number"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_EXPIRY1"
+msgctxt "FM_CREDIT_CARD_EXPIRY1"
 msgid "No expiry date entered."
 msgstr "No expiry date entered."
 
-msgctxt "OPERATION_FM_CREDIT_CARD_EXPIRY2"
+msgctxt "FM_CREDIT_CARD_EXPIRY2"
 msgid "Expiry date must be in the format MM/YY or MM/YYYY"
 msgstr "Expiry date must be in the format MM/YY or MM/YYYY"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_EXPIRY3"
+msgctxt "FM_CREDIT_CARD_EXPIRY3"
 msgid "This expiry date appears to have already passed"
 msgstr "This expiry date appears to have already passed"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_EXPIRY4"
+msgctxt "FM_CREDIT_CARD_EXPIRY4"
 msgid "This expiry date appears to be too far in the future"
 msgstr "This expiry date appears to be too far in the future"
 
-msgctxt "OPERATION_FM_ISO_COUNTRY_CODE1"
+msgctxt "FM_ISO_COUNTRY_CODE1"
 msgid "You must provide a country code"
 msgstr "You must provide a country code"
 
-msgctxt "OPERATION_FM_ISO_COUNTRY_CODE2"
+msgctxt "FM_ISO_COUNTRY_CODE2"
 msgid "This field does not contain an ISO country code"
 msgstr "This field does not contain an ISO country code"
 
-msgctxt "OPERATION_FM_US_STATE"
+msgctxt "FM_US_STATE"
 msgid "This doesn\\'t appear to be a valid 2-letter US state abbreviation"
 msgstr "This doesn\\'t appear to be a valid 2-letter US state abbreviation"
 
-msgctxt "OPERATION_FM_US_ZIPCODE"
+msgctxt "FM_US_ZIPCODE"
 msgid "US zip codes must contain 5 or 9 numbers"
 msgstr "US zip codes must contain 5 or 9 numbers"
 
-msgctxt "OPERATION_FM_MINLENGTH1"
+msgctxt "FM_MINLENGTH1"
 msgid "Minimum length has been specified meaninglessly as [_1]"
 msgstr "Minimum length has been specified meaninglessly as {$minlength}"
 
-msgctxt "OPERATION_FM_MINLENGTH2"
+msgctxt "FM_MINLENGTH2"
 msgid "This field must be at least [_1] characters"
 msgstr "This field must be at least {$minlength} characters"
 
-msgctxt "OPERATION_FM_MAXLENGTH1"
+msgctxt "FM_MAXLENGTH1"
 msgid "Maximum length has been specified meaninglessly as [_1]"
 msgstr "Maximum length has been specified meaninglessly as {$maxlength}"
 
-msgctxt "OPERATION_FM_MAXLENGTH2"
+msgctxt "FM_MAXLENGTH2"
 msgid "This field must be no more than [_1] characters"
 msgstr "This field must be no more than {$maxlength} characters"
 
-msgctxt "OPERATION_FM_EXACTLENGTH1"
+msgctxt "FM_EXACTLENGTH1"
 msgid "You must specify the length for the field."
 msgstr "You must specify the length for the field."
 
-msgctxt "OPERATION_FM_EXACTLENGTH2"
+msgctxt "FM_EXACTLENGTH2"
 msgid "You must specify the exactlength of the field with an integer"
 msgstr "You must specify the exactlength of the field with an integer"
 
-msgctxt "OPERATION_FM_EXACTLENGTH3"
+msgctxt "FM_EXACTLENGTH3"
 msgid "This field must be exactly [_1] characters"
 msgstr "This field must be exactly {$exactlength} characters"
 
-msgctxt "OPERATION_FM_LENGTHRANGE1"
+msgctxt "FM_LENGTHRANGE1"
 msgid "You must specify the maximum and minimum length for the field."
 msgstr "You must specify the maximum and minimum length for the field."
 
-msgctxt "OPERATION_FM_LENGTHRANGE2"
+msgctxt "FM_LENGTHRANGE2"
 msgid ""
 "You must specify the maximum and minimum lengths of the field with an "
 "integer"
@@ -475,50 +471,50 @@ msgstr ""
 "You must specify the maximum and minimum lengths of the field with an "
 "integer"
 
-msgctxt "OPERATION_FM_LENGTHRANGE3"
+msgctxt "FM_LENGTHRANGE3"
 msgid "This field must be between [_1] and [_2] characters"
 msgstr "This field must be between {$minlength} and {$maxlength} characters"
 
-msgctxt "OPERATION_FM_URL"
+msgctxt "FM_URL"
 msgid "This field must contain a URL starting with http:// or ftp://"
 msgstr "This field must contain a URL starting with http:// or ftp://"
 
-msgctxt "OPERATION_FM_EMAIL_SIMPLE1"
+msgctxt "FM_EMAIL_SIMPLE1"
 msgid "You must enter an email address."
 msgstr "You must enter an email address."
 
-msgctxt "OPERATION_FM_EMAIL_SIMPLE2"
+msgctxt "FM_EMAIL_SIMPLE2"
 msgid "This field doesn\\'t look like an RFC822-compliant email address"
 msgstr "This field doesn\\'t look like an RFC822-compliant email address"
 
-msgctxt "OPERATION_FM_DOMAIN_NAME"
+msgctxt "FM_DOMAIN_NAME"
 msgid "This field doesn\\'t look like a valid Internet domain name or hostname."
 msgstr ""
 "This field doesn\\'t look like a valid Internet domain name or hostname."
 
-msgctxt "OPERATION_FM_IP_NUMBER1"
+msgctxt "FM_IP_NUMBER1"
 msgid "This field must contain a valid IP number and can not be left blank."
 msgstr "This field must contain a valid IP number and can not be left blank."
 
-msgctxt "OPERATION_FM_IP_NUMBER2"
+msgctxt "FM_IP_NUMBER2"
 msgid "Invalid IP address format (expected X.X.X.X)"
 msgstr "Invalid IP address format (expected X.X.X.X)"
 
-msgctxt "OPERATION_FM_IP_NUMBER3"
+msgctxt "FM_IP_NUMBER3"
 msgid "[_1] is more than 255"
 msgstr "{$octet} is more than 255"
 
-msgctxt "OPERATION_FM_USERNAME"
+msgctxt "FM_USERNAME"
 msgid ""
 "This field must look like a valid username (3 to 8 letters and numbers)"
 msgstr ""
 "This field must look like a valid username (3 to 8 letters and numbers)"
 
-msgctxt "OPERATION_FM_PASSWORD1"
+msgctxt "FM_PASSWORD1"
 msgid "You must provide a password."
 msgstr "You must provide a password."
 
-msgctxt "OPERATION_FM_PASSWORD2"
+msgctxt "FM_PASSWORD2"
 msgid ""
 "The password you provided was not a good password.A good password must "
 "contain all of the following: upper case letter, lower case letter, number, "
@@ -528,18 +524,18 @@ msgstr ""
 "contain all of the following: upper case letter, lower case letter, number, "
 "non-alphanumeric character, be at least 7 characters long."
 
-msgctxt "OPERATION_FM_MAC_ADDRESS1"
+msgctxt "FM_MAC_ADDRESS1"
 msgid "You must provide a MAC address."
 msgstr "You must provide a MAC address."
 
-msgctxt "OPERATION_FM_MAC_ADDRESS2"
+msgctxt "FM_MAC_ADDRESS2"
 msgid "The MAC address you provided was not valid."
 msgstr "The MAC address you provided was not valid."
 
-msgctxt "OPERATION_FM_ERR_UNEXPECTED_DESC"
+msgctxt "FM_ERR_UNEXPECTED_DESC"
 msgid "Error: unexpected or missing characters in description"
 msgstr "Error: unexpected or missing characters in description"
 
-msgctxt "OPERATION_CSRF_VALIDATION_FAILURE"
-msgid "Placeholder for missing original text"
+msgctxt "CSRF_VALIDATION_FAILURE"
+msgid "Error: CSRF token is invalid or outdated."
 msgstr "Error: CSRF token is invalid or outdated."
diff --git a/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/General/pofiles/general_hu.po b/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/General/pofiles/general_hu.po
index 05bfe01..4cfc52d 100644
--- a/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/General/pofiles/general_hu.po
+++ b/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/General/pofiles/general_hu.po
@@ -5,99 +5,95 @@ msgstr ""
 "Language: None\n"
 "Content-Type: text/plain; charset=utf-8\n"
 
-msgctxt "OPERATION_Collaboration"
+msgctxt "Collaboration"
 msgid "Collaboration"
 msgstr "Csoportmunka"
 
-msgctxt "OPERATION_Administration"
+msgctxt "Administration"
 msgid "Administration"
 msgstr "Adminisztráció"
 
-msgctxt "OPERATION_Security"
+msgctxt "Security"
 msgid "Security"
 msgstr "Biztonság"
 
-msgctxt "OPERATION_Configuration"
+msgctxt "Configuration"
 msgid "Configuration"
 msgstr "Konfiguráció"
 
-msgctxt "OPERATION_Miscellaneous"
+msgctxt "Miscellaneous"
 msgid "Miscellaneous"
 msgstr "Egyéb"
 
-msgctxt "OPERATION_Your Settings"
-msgid "Your Settings"
-msgstr "Az ön beállításai"
-
-msgctxt "OPERATION_SAVE"
+msgctxt "SAVE"
 msgid "Save"
 msgstr "Mentés"
 
-msgctxt "OPERATION_CANCEL"
+msgctxt "CANCEL"
 msgid "Cancel"
 msgstr "Mégsem"
 
-msgctxt "OPERATION_ENABLED"
+msgctxt "ENABLED"
 msgid "Enabled"
 msgstr "Engedélyezve"
 
-msgctxt "OPERATION_DISABLED"
+msgctxt "DISABLED"
 msgid "Disabled"
 msgstr "Letiltva"
 
-msgctxt "OPERATION_NO"
+msgctxt "NO"
 msgid "No"
 msgstr "Nem"
 
-msgctxt "OPERATION_YES"
+msgctxt "YES"
 msgid "Yes"
 msgstr "Igen"
 
-msgctxt "OPERATION_ADD"
+msgctxt "ADD"
 msgid "Add"
 msgstr "Hozzáad"
 
-msgctxt "OPERATION_CREATE"
+msgctxt "CREATE"
 msgid "Create"
 msgstr "Létrehoz"
 
-msgctxt "OPERATION_MODIFY"
+msgctxt "MODIFY"
 msgid "Modify"
 msgstr "Módosítás"
 
-msgctxt "OPERATION_REMOVE"
+msgctxt "REMOVE"
 msgid "Remove"
 msgstr "Eltávolít"
 
-msgctxt "OPERATION_COMMENT"
+msgctxt "COMMENT"
 msgid "Comment"
 msgstr "Megjegyzés"
 
-msgctxt "OPERATION_NEXT"
+msgctxt "NEXT"
 msgid "Next"
 msgstr "Következő"
 
-msgctxt "OPERATION_SELF"
+msgctxt "SELF"
 msgid "Self"
 msgstr "Saját"
 
-msgctxt "OPERATION_REMOTE"
+msgctxt "REMOTE"
 msgid "Remote"
 msgstr "Távoli"
 
-msgctxt "OPERATION_LOCAL"
+msgctxt "LOCAL"
 msgid "Local"
 msgstr "Helyi"
 
-msgctxt "OPERATION_ACTION"
+msgctxt "ACTION"
 msgid "Action"
 msgstr "Művelet"
 
-msgctxt "OPERATION_NETWORK"
+msgctxt "NETWORK"
 msgid "Network"
 msgstr "Hálózat"
 
-msgctxt "OPERATION_ROUTER"
+msgctxt "ROUTER"
 msgid "Router"
 msgstr "Átjáró"
 
@@ -105,23 +101,23 @@ msgctxt "OPERATION_STATUS_REPORT"
 msgid "Operation status report"
 msgstr "Használati jelentés"
 
-msgctxt "OPERATION_ACCOUNT"
+msgctxt "ACCOUNT"
 msgid "Account"
 msgstr "Felhasználói fiók"
 
-msgctxt "OPERATION_GROUP"
+msgctxt "GROUP"
 msgid "Group"
 msgstr "Csoport"
 
-msgctxt "OPERATION_DESC_SECTIONBAR"
+msgctxt "DESC_SECTIONBAR"
 msgid "<hr class=\"sectionbar\"/>"
-msgstr " "
+msgstr ""
 
-msgctxt "OPERATION_NO_PIPES_ALLOWED"
+msgctxt "NO_PIPES_ALLOWED"
 msgid "Pipe symbols (|) are not permitted in this field"
 msgstr "A cső jelek (|) nem engedélyezettek ebben a mezőben"
 
-msgctxt "OPERATION_ERROR_BELOW"
+msgctxt "ERROR_BELOW"
 msgid ""
 "ERROR: There was an error in the validation of this page. Please scroll down"
 " and find the specific problem."
@@ -129,27 +125,27 @@ msgstr ""
 "HIBA: Hiba történt ennek az oldalnak az érvényesítése során. Kérem görgessen"
 " lejjebb és keresse meg a problémát."
 
-msgctxt "OPERATION_ACCESS"
+msgctxt "ACCESS"
 msgid "Access"
 msgstr "Hozzáférés"
 
-msgctxt "OPERATION_ACCOUNT_LOCKED"
+msgctxt "ACCOUNT_LOCKED"
 msgid "Account is locked"
 msgstr "Fiók zárolva"
 
-msgctxt "OPERATION_GROUP_ADD"
+msgctxt "GROUP_ADD"
 msgid "Add group"
 msgstr "Csoport létrehozása"
 
-msgctxt "OPERATION_NETWORKS_ALLOW_LOCAL"
+msgctxt "NETWORKS_ALLOW_LOCAL"
 msgid "Allow access only from local networks"
 msgstr "Hozzáférés csak helyi hálózatból"
 
-msgctxt "OPERATION_NETWORKS_ALLOW_PUBLIC"
+msgctxt "NETWORKS_ALLOW_PUBLIC"
 msgid "Allow public access (entire Internet)"
 msgstr "Puplikus hozzáférés engedélyezése (Internet)"
 
-msgctxt "OPERATION_ERROR_PASSWORD_CHANGE"
+msgctxt "ERROR_PASSWORD_CHANGE"
 msgid ""
 "An error occurred while attempting to change your password. Please make sure"
 " that the old password entered is correct."
@@ -157,374 +153,374 @@ msgstr ""
 "Hiba történt a jelszava megváltoztatása során. Kérem bizonyosodjon meg "
 "arról, hogy a régi jelszavát helyesen írta be."
 
-msgctxt "OPERATION_BACK"
+msgctxt "BACK"
 msgid "Back"
 msgstr "Vissza"
 
-msgctxt "OPERATION_BACKUP"
+msgctxt "BACKUP"
 msgid "Backup"
 msgstr "Biztonsági mentés"
 
-msgctxt "OPERATION_DESCRIPTION_BRIEF"
+msgctxt "DESCRIPTION_BRIEF"
 msgid "Brief description"
 msgstr "Rövid leírás"
 
-msgctxt "OPERATION_PASSWORD_CHANGE"
+msgctxt "PASSWORD_CHANGE"
 msgid "Change Password"
 msgstr "Jelszó változtatás"
 
-msgctxt "OPERATION_RESET_PASSWORD_TITLE"
+msgctxt "RESET_PASSWORD_TITLE"
 msgid "Reset user password"
 msgstr "Felhasználói jelszó megváltoztatása"
 
-msgctxt "OPERATION_ACCOUNT_PASSWORD_CHANGE"
+msgctxt "ACCOUNT_PASSWORD_CHANGE"
 msgid "Change account password"
 msgstr "Fiók jelszó változtatás"
 
-msgctxt "OPERATION_CONTENT"
+msgctxt "CONTENT"
 msgid "Content"
 msgstr "Tartalom"
 
-msgctxt "OPERATION_CREATE_GROUP"
+msgctxt "CREATE_GROUP"
 msgid "Create user group"
 msgstr "Felhasználói csoport létrehozása"
 
-msgctxt "OPERATION_USER_LIST_CURRENT"
+msgctxt "USER_LIST_CURRENT"
 msgid "Current list of users"
 msgstr "Felhasználók listája"
 
-msgctxt "OPERATION_DESCRIPTION"
+msgctxt "DESCRIPTION"
 msgid "Description"
 msgstr "Leírás"
 
-msgctxt "OPERATION_DESTINATION"
+msgctxt "DESTINATION"
 msgid "Destination"
 msgstr "Cél"
 
-msgctxt "OPERATION_DOMAIN_NAME"
+msgctxt "DOMAIN_NAME"
 msgid "Domain name"
 msgstr "Domén név"
 
-msgctxt "OPERATION_DOMAIN"
+msgctxt "DOMAIN"
 msgid "Domain"
 msgstr "Domén"
 
-msgctxt "OPERATION_DOMAINS"
+msgctxt "DOMAINS"
 msgid "Domains"
 msgstr "Domének"
 
-msgctxt "OPERATION_DOWNLOAD"
+msgctxt "DOWNLOAD"
 msgid "Download"
 msgstr "Letöltés"
 
-msgctxt "OPERATION_ERROR_UPDATING_CONFIGURATION"
+msgctxt "ERROR_UPDATING_CONFIGURATION"
 msgid "Error occurred while updating system configuration."
 msgstr "Hiba történt a rendszer beállításainak frissítésekor."
 
-msgctxt "OPERATION_GROUP_MEMBERS"
+msgctxt "GROUP_MEMBERS"
 msgid "Group Members"
 msgstr "Csoporttagok"
 
-msgctxt "OPERATION_GROUP_NAME"
+msgctxt "GROUP_NAME"
 msgid "Group Name"
 msgstr "Csoportnév"
 
-msgctxt "OPERATION_GROUPS"
+msgctxt "GROUPS"
 msgid "Groups"
 msgstr "Csoportok"
 
-msgctxt "OPERATION_IP_ADDRESS"
+msgctxt "IP_ADDRESS"
 msgid "IP Address"
 msgstr "IP cím"
 
-msgctxt "OPERATION_IP_ADDRESS_OR_FQDN"
+msgctxt "IP_ADDRESS_OR_FQDN"
 msgid "IP Address or FQDN"
 msgstr "IP cím vagy FQDN"
 
-msgctxt "OPERATION_USER_INVALID"
+msgctxt "USER_INVALID"
 msgid "Invalid user"
 msgstr "Érvénytelen felhasználó"
 
-msgctxt "OPERATION_LOCATION"
+msgctxt "LOCATION"
 msgid "Location"
 msgstr "Hely"
 
-msgctxt "OPERATION_MB"
+msgctxt "MB"
 msgid "Mb"
 msgstr "Mb"
 
-msgctxt "OPERATION_MODIFY_USER_GROUP"
+msgctxt "MODIFY_USER_GROUP"
 msgid "Modify user group"
 msgstr "Felhasználói csoport módosítása"
 
-msgctxt "OPERATION_NAME"
+msgctxt "NAME"
 msgid "Name"
 msgstr "Név"
 
-msgctxt "OPERATION_PASSWORD_VERIFY_NEW"
+msgctxt "PASSWORD_VERIFY_NEW"
 msgid "New password (verify):"
 msgstr "Új jelszó (ellenőrzés):"
 
-msgctxt "OPERATION_PASSWORD_NEW"
+msgctxt "PASSWORD_NEW"
 msgid "New password:"
 msgstr "Új jelszó:"
 
-msgctxt "OPERATION_OFF"
+msgctxt "OFF"
 msgid "Off"
 msgstr "Ki"
 
-msgctxt "OPERATION_OK"
+msgctxt "OK"
 msgid "Ok"
 msgstr "Rendben"
 
-msgctxt "OPERATION_PASSWORD_OLD"
+msgctxt "PASSWORD_OLD"
 msgid "Old password:"
 msgstr "Régi jelszó:"
 
-msgctxt "OPERATION_ON"
+msgctxt "ON"
 msgid "On"
 msgstr "Be"
 
-msgctxt "OPERATION_PASSWORD"
+msgctxt "PASSWORD"
 msgid "Password"
 msgstr "Jelszó"
 
-msgctxt "OPERATION_PERFORM"
+msgctxt "PERFORM"
 msgid "Perform"
 msgstr "Végrehajtás"
 
-msgctxt "OPERATION_RECONFIGURE"
+msgctxt "RECONFIGURE"
 msgid "Reconfigure"
 msgstr "Újrakonfigurálás"
 
-msgctxt "OPERATION_REMOVE_USER_GROUP"
+msgctxt "REMOVE_USER_GROUP"
 msgid "Remove user group"
 msgstr "Felhasználói csoport törlése"
 
-msgctxt "OPERATION_PASSWORD_RESET"
+msgctxt "PASSWORD_RESET"
 msgid "Reset password"
 msgstr "Jelszó megváltoztatása"
 
-msgctxt "OPERATION_RESTORE"
+msgctxt "RESTORE"
 msgid "Restore"
 msgstr "Helyreállítás"
 
-msgctxt "OPERATION_SHUTDOWN"
+msgctxt "SHUTDOWN"
 msgid "Shutdown"
 msgstr "Leállítás"
 
-msgctxt "OPERATION_SUCCESS"
+msgctxt "SUCCESS"
 msgid "Success"
 msgstr "Kész"
 
-msgctxt "OPERATION_ACCOUNT_NAME_INVALID"
+msgctxt "ACCOUNT_NAME_INVALID"
 msgid "The account name entered is invalid."
 msgstr "A megadott fióknév érvénytelen."
 
-msgctxt "OPERATION_ACCOUNT_NAME_INVALID_CHARS"
+msgctxt "ACCOUNT_NAME_INVALID_CHARS"
 msgid "The account name you entered contained invalid characters."
 msgstr "A megadott fióknév érvénytelen karaktereket tartalmaz."
 
-msgctxt "OPERATION_PASSWORD_OLD_INVALID_CHARS"
+msgctxt "PASSWORD_OLD_INVALID_CHARS"
 msgid "The old password you entered contained invalid characters."
 msgstr "A megadott régi jelszó érvénytelen karaktereket tartalmaz."
 
-msgctxt "OPERATION_PASSWORD_INVALID_CHARS"
+msgctxt "PASSWORD_INVALID_CHARS"
 msgid "The password you entered contained invalid characters."
 msgstr "A megadott jelszó érvénytelen karaktereket tartalmaz."
 
-msgctxt "OPERATION_PASSWORD_VERIFY_ERROR"
+msgctxt "PASSWORD_VERIFY_ERROR"
 msgid "The passwords you entered did not match."
 msgstr "A két jelszó nem egyezik"
 
-msgctxt "OPERATION_ACCOUNT_USER_NONE"
+msgctxt "ACCOUNT_USER_NONE"
 msgid "There are no user accounts in the system."
 msgstr "Nincsenek felhasználói fiókok ebben a rendszerben."
 
-msgctxt "OPERATION_ACCOUNT_GROUP_NONE"
+msgctxt "ACCOUNT_GROUP_NONE"
 msgid "There are no user groups in the system."
 msgstr "Nincsenek felhasználói csoportok ebben a rendszerben."
 
-msgctxt "OPERATION_ERROR_INVALID_CHARS"
+msgctxt "ERROR_INVALID_CHARS"
 msgid "Unexpected characters in description."
 msgstr "Érvénytelen karakterek a leírásban."
 
-msgctxt "OPERATION_USER_NAME"
+msgctxt "USER_NAME"
 msgid "User Name"
 msgstr "Felhasználónév"
 
-msgctxt "OPERATION_YOUR_ACCOUNT"
+msgctxt "YOUR_ACCOUNT"
 msgid "Your account:"
 msgstr "Az ön fiókja:"
 
-msgctxt "OPERATION_YOUR_ACCOUNT_INVALID"
+msgctxt "YOUR_ACCOUNT_INVALID"
 msgid "The account name entered is invalid."
 msgstr "A megadott fióknév érvénytelen."
 
-msgctxt "OPERATION_PASSWORD_CHANGE_SUCCESS"
+msgctxt "PASSWORD_CHANGE_SUCCESS"
 msgid "Your password has been successfully changed."
 msgstr "A jelszava megváltozott."
 
-msgctxt "OPERATION_FM_NONBLANK"
+msgctxt "FM_NONBLANK"
 msgid "This field must not be left blank"
 msgstr "Ez a mező nem maradhat üresen."
 
-msgctxt "OPERATION_FM_INTEGER"
+msgctxt "FM_INTEGER"
 msgid "This field must contain a positive integer"
 msgstr "A mezőnek pozitív egész számot kell tartalmaznia"
 
-msgctxt "OPERATION_FM_NUMBER"
+msgctxt "FM_NUMBER"
 msgid "This field must contain a number"
 msgstr "A mezőnek számot kell tartalmaznia"
 
-msgctxt "OPERATION_FM_WORD"
+msgctxt "FM_WORD"
 msgid "This field must look like a single word."
 msgstr "A mező csak egyetlen szót tartalmazhat"
 
-msgctxt "OPERATION_FM_DATE"
+msgctxt "FM_DATE"
 msgid "The data entered could not be parsed as a date"
 msgstr "A megadott adat nem dolgozható fel dátumként"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_NUMBER1"
+msgctxt "FM_CREDIT_CARD_NUMBER1"
 msgid "You must enter a credit card number"
 msgstr "Meg kell adnia egy hitelkártya számot"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_NUMBER2"
+msgctxt "FM_CREDIT_CARD_NUMBER2"
 msgid ""
 "Credit card numbers shouldn\\'t have anything but numbers, spaces or dashes"
 msgstr ""
 "A hitelkártya szám csak számokat szóközöket és kötőjeleket tartalmazhat"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_NUMBER3"
+msgctxt "FM_CREDIT_CARD_NUMBER3"
 msgid "Must be at least 14 characters in length"
 msgstr "Legalább 14 karakter hosszúságúnak kell lennie"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_NUMBER4"
+msgctxt "FM_CREDIT_CARD_NUMBER4"
 msgid "Doesn\\'t appear to be a valid credit card number"
 msgstr "Nem úgy néz ki mint egy érvényes hitelkártya szám"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_EXPIRY1"
+msgctxt "FM_CREDIT_CARD_EXPIRY1"
 msgid "No expiry date entered."
 msgstr "Nincs lejárati dátum megadva."
 
-msgctxt "OPERATION_FM_CREDIT_CARD_EXPIRY2"
+msgctxt "FM_CREDIT_CARD_EXPIRY2"
 msgid "Expiry date must be in the format MM/YY or MM/YYYY"
 msgstr "A lejárati dátumnak HH/ÉÉ vagy HH/ÉÉÉÉ formátumúnak kell lennie"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_EXPIRY3"
+msgctxt "FM_CREDIT_CARD_EXPIRY3"
 msgid "This expiry date appears to have already passed"
 msgstr "Ez a lejárati dátum úgy tűnik, már letelt."
 
-msgctxt "OPERATION_FM_CREDIT_CARD_EXPIRY4"
+msgctxt "FM_CREDIT_CARD_EXPIRY4"
 msgid "This expiry date appears to be too far in the future"
 msgstr "Ez a lejárati dátum úgy tűnik, hogy túlságosan messze van"
 
-msgctxt "OPERATION_FM_ISO_COUNTRY_CODE1"
+msgctxt "FM_ISO_COUNTRY_CODE1"
 msgid "You must provide a country code"
 msgstr "Meg kell adnia egy országkódot"
 
-msgctxt "OPERATION_FM_ISO_COUNTRY_CODE2"
+msgctxt "FM_ISO_COUNTRY_CODE2"
 msgid "This field does not contain an ISO country code"
 msgstr "Ez a mező nem ISO országkódot tartalmaz"
 
-msgctxt "OPERATION_FM_US_STATE"
+msgctxt "FM_US_STATE"
 msgid "This doesn\\'t appear to be a valid 2-letter US state abbreviation"
 msgstr "Ez nem tűnik érvényes 2-betűs USA állam rövidítésnek"
 
-msgctxt "OPERATION_FM_US_ZIPCODE"
+msgctxt "FM_US_ZIPCODE"
 msgid "US zip codes must contain 5 or 9 numbers"
 msgstr "Az USA irányítószámok 5 vagy 9 számjegyűek"
 
-msgctxt "OPERATION_FM_MINLENGTH1"
+msgctxt "FM_MINLENGTH1"
 msgid "Minimum length has been specified meaninglessly as [_1]"
 msgstr ""
 "A minimális hosszúság értelmetlenül {$minlength} -ban lett meghatározva."
 
-msgctxt "OPERATION_FM_MINLENGTH2"
+msgctxt "FM_MINLENGTH2"
 msgid "This field must be at least [_1] characters"
 msgstr "Ennek a mezőnek legalább {$minlength} karaktert kell tartalmaznia"
 
-msgctxt "OPERATION_FM_MAXLENGTH1"
+msgctxt "FM_MAXLENGTH1"
 msgid "Maximum length has been specified meaninglessly as [_1]"
 msgstr ""
 "A maximális hosszúság értelmetlenül {$maxlength} -ban lett meghatározva."
 
-msgctxt "OPERATION_FM_MAXLENGTH2"
+msgctxt "FM_MAXLENGTH2"
 msgid "This field must be no more than [_1] characters"
 msgstr "Ez a mező nem tartalmazhat {$maxlength} karakternél többet"
 
-msgctxt "OPERATION_FM_EXACTLENGTH1"
+msgctxt "FM_EXACTLENGTH1"
 msgid "You must specify the length for the field."
 msgstr "Meg kell adnia a mező hosszúságát."
 
-msgctxt "OPERATION_FM_EXACTLENGTH2"
+msgctxt "FM_EXACTLENGTH2"
 msgid "You must specify the exactlength of the field with an integer"
 msgstr "A mező pontos hosszúságát egész számmal kell megadnia"
 
-msgctxt "OPERATION_FM_EXACTLENGTH3"
+msgctxt "FM_EXACTLENGTH3"
 msgid "This field must be exactly [_1] characters"
 msgstr ""
 "Ennek a mezőnek pontosan {$exactlength} karakter hosszúságúnak kell lennie."
 
-msgctxt "OPERATION_FM_LENGTHRANGE1"
+msgctxt "FM_LENGTHRANGE1"
 msgid "You must specify the maximum and minimum length for the field."
 msgstr "Meg kell adnia a mező maximum és minimum hosszúságát."
 
-msgctxt "OPERATION_FM_LENGTHRANGE2"
+msgctxt "FM_LENGTHRANGE2"
 msgid ""
 "You must specify the maximum and minimum lengths of the field with an "
 "integer"
 msgstr "A mező maximum és minimum hosszúságát egész számmal kell megadnia"
 
-msgctxt "OPERATION_FM_LENGTHRANGE3"
+msgctxt "FM_LENGTHRANGE3"
 msgid "This field must be between [_1] and [_2] characters"
 msgstr ""
 "Ennek a mezőnek a hoszúsága {$minlength} és {$maxlength} karakter között "
 "kell lennie"
 
-msgctxt "OPERATION_FM_URL"
+msgctxt "FM_URL"
 msgid "This field must contain a URL starting with http:// or ftp://"
 msgstr ""
 "Ennek a mezőnek http:// vagy ftp:// -vel kezdődő URL-t kell tartalmaznia."
 
-msgctxt "OPERATION_FM_EMAIL_SIMPLE1"
+msgctxt "FM_EMAIL_SIMPLE1"
 msgid "You must enter an email address."
 msgstr "Meg kell adnia egy email címet."
 
-msgctxt "OPERATION_FM_EMAIL_SIMPLE2"
+msgctxt "FM_EMAIL_SIMPLE2"
 msgid "This field doesn\\'t look like an RFC822-compliant email address"
 msgstr "Ez nem úgy néz ki mint egy RFC822 szabványú email cím"
 
-msgctxt "OPERATION_FM_DOMAIN_NAME"
+msgctxt "FM_DOMAIN_NAME"
 msgid "This field doesn\\'t look like a valid Internet domain name or hostname."
 msgstr "Ez nem úgy néz ki mint egy érvényes Internetes domén vagy gépnév."
 
-msgctxt "OPERATION_FM_IP_NUMBER1"
+msgctxt "FM_IP_NUMBER1"
 msgid "This field must contain a valid IP number and can not be left blank."
 msgstr ""
 "Ennek a mezőnek egy érvényes IP címet kell tartalmaznia és nem hagyható "
 "üresen."
 
-msgctxt "OPERATION_FM_IP_NUMBER2"
+msgctxt "FM_IP_NUMBER2"
 msgid "Invalid IP address format (expected X.X.X.X)"
 msgstr "Érvénytelen IP cím formátum (X.X.X.X az elfogadott)"
 
-msgctxt "OPERATION_FM_IP_NUMBER3"
+msgctxt "FM_IP_NUMBER3"
 msgid "[_1] is more than 255"
 msgstr "A {$octet} nagyobb mint 255"
 
-msgctxt "OPERATION_FM_USERNAME"
+msgctxt "FM_USERNAME"
 msgid ""
 "This field must look like a valid username (3 to 8 letters and numbers)"
 msgstr ""
 "Ennek érvényes felhasználói névnek kell lennie (3-tól 8 karakterig és "
 "számok)"
 
-msgctxt "OPERATION_FM_PASSWORD1"
+msgctxt "FM_PASSWORD1"
 msgid "You must provide a password."
 msgstr "Meg kell adnia egy jelszót."
 
-msgctxt "OPERATION_FM_PASSWORD2"
+msgctxt "FM_PASSWORD2"
 msgid ""
 "The password you provided was not a good password.A good password must "
 "contain all of the following: upper case letter, lower case letter, number, "
@@ -534,18 +530,18 @@ msgstr ""
 "hosszúságúnak kell lennie és kis, valamint nagybetűket, számokat és nem "
 "alfanumerikus karaktereket kell tartalmaznia."
 
-msgctxt "OPERATION_FM_MAC_ADDRESS1"
+msgctxt "FM_MAC_ADDRESS1"
 msgid "You must provide a MAC address."
 msgstr "Meg kell adnia egy MAC címet."
 
-msgctxt "OPERATION_FM_MAC_ADDRESS2"
+msgctxt "FM_MAC_ADDRESS2"
 msgid "The MAC address you provided was not valid."
 msgstr "A megadott MAC cím érvénytelen volt."
 
-msgctxt "OPERATION_FM_ERR_UNEXPECTED_DESC"
+msgctxt "FM_ERR_UNEXPECTED_DESC"
 msgid "Error: unexpected or missing characters in description"
 msgstr "Hiba: Érvénytelen, vagy hiányzó karakterek a leírásban"
 
-msgctxt "OPERATION_CSRF_VALIDATION_FAILURE"
-msgid "Placeholder for missing original text"
+msgctxt "CSRF_VALIDATION_FAILURE"
+msgid "Error: CSRF token is invalid or outdated."
 msgstr "Hiba: a CSRF token érvénytelen vagy lejárt"
diff --git a/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/General/pofiles/general_id.po b/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/General/pofiles/general_id.po
index 86a6893..8c1f75f 100644
--- a/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/General/pofiles/general_id.po
+++ b/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/General/pofiles/general_id.po
@@ -5,99 +5,95 @@ msgstr ""
 "Language: None\n"
 "Content-Type: text/plain; charset=utf-8\n"
 
-msgctxt "OPERATION_Collaboration"
+msgctxt "Collaboration"
 msgid "Collaboration"
 msgstr "Kolaborasi"
 
-msgctxt "OPERATION_Administration"
+msgctxt "Administration"
 msgid "Administration"
 msgstr "Administrasi"
 
-msgctxt "OPERATION_Security"
+msgctxt "Security"
 msgid "Security"
 msgstr "Keamanan"
 
-msgctxt "OPERATION_Configuration"
+msgctxt "Configuration"
 msgid "Configuration"
 msgstr "Konfigurasi"
 
-msgctxt "OPERATION_Miscellaneous"
+msgctxt "Miscellaneous"
 msgid "Miscellaneous"
 msgstr "Lain-lain"
 
-msgctxt "OPERATION_Your Settings"
-msgid "Your Settings"
-msgstr "Pengaturan anda"
-
-msgctxt "OPERATION_SAVE"
+msgctxt "SAVE"
 msgid "Save"
 msgstr "Simpan"
 
-msgctxt "OPERATION_CANCEL"
+msgctxt "CANCEL"
 msgid "Cancel"
 msgstr "Batal"
 
-msgctxt "OPERATION_ENABLED"
+msgctxt "ENABLED"
 msgid "Enabled"
 msgstr "Enabled"
 
-msgctxt "OPERATION_DISABLED"
+msgctxt "DISABLED"
 msgid "Disabled"
 msgstr "Disabled"
 
-msgctxt "OPERATION_NO"
+msgctxt "NO"
 msgid "No"
 msgstr "Tidak"
 
-msgctxt "OPERATION_YES"
+msgctxt "YES"
 msgid "Yes"
 msgstr "Ya"
 
-msgctxt "OPERATION_ADD"
+msgctxt "ADD"
 msgid "Add"
 msgstr "Tambah"
 
-msgctxt "OPERATION_CREATE"
+msgctxt "CREATE"
 msgid "Create"
 msgstr "Buat"
 
-msgctxt "OPERATION_MODIFY"
+msgctxt "MODIFY"
 msgid "Modify"
 msgstr "Ubah"
 
-msgctxt "OPERATION_REMOVE"
+msgctxt "REMOVE"
 msgid "Remove"
 msgstr "Hapus"
 
-msgctxt "OPERATION_COMMENT"
+msgctxt "COMMENT"
 msgid "Comment"
 msgstr "Komentar"
 
-msgctxt "OPERATION_NEXT"
+msgctxt "NEXT"
 msgid "Next"
 msgstr "Selanjutnya"
 
-msgctxt "OPERATION_SELF"
+msgctxt "SELF"
 msgid "Self"
 msgstr "Sendiri"
 
-msgctxt "OPERATION_REMOTE"
+msgctxt "REMOTE"
 msgid "Remote"
 msgstr "Remote"
 
-msgctxt "OPERATION_LOCAL"
+msgctxt "LOCAL"
 msgid "Local"
 msgstr "Lokal"
 
-msgctxt "OPERATION_ACTION"
+msgctxt "ACTION"
 msgid "Action"
 msgstr "Aksi"
 
-msgctxt "OPERATION_NETWORK"
+msgctxt "NETWORK"
 msgid "Network"
 msgstr "Jaringan"
 
-msgctxt "OPERATION_ROUTER"
+msgctxt "ROUTER"
 msgid "Router"
 msgstr "Router"
 
@@ -105,23 +101,23 @@ msgctxt "OPERATION_STATUS_REPORT"
 msgid "Operation status report"
 msgstr "Laporan status operasi"
 
-msgctxt "OPERATION_ACCOUNT"
+msgctxt "ACCOUNT"
 msgid "Account"
 msgstr "Akun"
 
-msgctxt "OPERATION_GROUP"
+msgctxt "GROUP"
 msgid "Group"
 msgstr "Grup"
 
-msgctxt "OPERATION_DESC_SECTIONBAR"
+msgctxt "DESC_SECTIONBAR"
 msgid "<hr class=\"sectionbar\"/>"
-msgstr " <hr class=\"sectionbar\"/> "
+msgstr "<hr class=\"sectionbar\"/>"
 
-msgctxt "OPERATION_NO_PIPES_ALLOWED"
+msgctxt "NO_PIPES_ALLOWED"
 msgid "Pipe symbols (|) are not permitted in this field"
 msgstr "Simbol \\'pipe\\' (|) tidak diperbolehkan dalam field ini"
 
-msgctxt "OPERATION_ERROR_BELOW"
+msgctxt "ERROR_BELOW"
 msgid ""
 "ERROR: There was an error in the validation of this page. Please scroll down"
 " and find the specific problem."
@@ -129,27 +125,27 @@ msgstr ""
 "ERROR: Terjadi kesalahan dalam validasi halaman ini. Silakan gulung kebawah "
 "dan temukan masalah tersebut."
 
-msgctxt "OPERATION_ACCESS"
+msgctxt "ACCESS"
 msgid "Access"
 msgstr "Akses"
 
-msgctxt "OPERATION_ACCOUNT_LOCKED"
+msgctxt "ACCOUNT_LOCKED"
 msgid "Account is locked"
 msgstr "Akun dikunci"
 
-msgctxt "OPERATION_GROUP_ADD"
+msgctxt "GROUP_ADD"
 msgid "Add group"
 msgstr "Tambah Grup"
 
-msgctxt "OPERATION_NETWORKS_ALLOW_LOCAL"
+msgctxt "NETWORKS_ALLOW_LOCAL"
 msgid "Allow access only from local networks"
 msgstr "Bolehkan akses hanya dari jaringan lokal"
 
-msgctxt "OPERATION_NETWORKS_ALLOW_PUBLIC"
+msgctxt "NETWORKS_ALLOW_PUBLIC"
 msgid "Allow public access (entire Internet)"
 msgstr "Bolehkan akses publik (seluruh internet)"
 
-msgctxt "OPERATION_ERROR_PASSWORD_CHANGE"
+msgctxt "ERROR_PASSWORD_CHANGE"
 msgid ""
 "An error occurred while attempting to change your password. Please make sure"
 " that the old password entered is correct."
@@ -157,319 +153,319 @@ msgstr ""
 "Terjadi kesalahan saat mencoba mengganti password. Pastikan bahwa anda sudah"
 " mengisikan password lama dengan benar."
 
-msgctxt "OPERATION_BACK"
+msgctxt "BACK"
 msgid "Back"
 msgstr "Kembali"
 
-msgctxt "OPERATION_BACKUP"
+msgctxt "BACKUP"
 msgid "Backup"
 msgstr "Backup"
 
-msgctxt "OPERATION_DESCRIPTION_BRIEF"
+msgctxt "DESCRIPTION_BRIEF"
 msgid "Brief description"
 msgstr "Deskripsi singkat"
 
-msgctxt "OPERATION_PASSWORD_CHANGE"
+msgctxt "PASSWORD_CHANGE"
 msgid "Change Password"
 msgstr "Ganti password"
 
-msgctxt "OPERATION_RESET_PASSWORD_TITLE"
+msgctxt "RESET_PASSWORD_TITLE"
 msgid "Reset user password"
 msgstr "Reset Password user"
 
-msgctxt "OPERATION_ACCOUNT_PASSWORD_CHANGE"
+msgctxt "ACCOUNT_PASSWORD_CHANGE"
 msgid "Change account password"
 msgstr "Ganti password akun"
 
-msgctxt "OPERATION_CONTENT"
+msgctxt "CONTENT"
 msgid "Content"
 msgstr "Isi"
 
-msgctxt "OPERATION_CREATE_GROUP"
+msgctxt "CREATE_GROUP"
 msgid "Create user group"
 msgstr "Buat grup pengguna"
 
-msgctxt "OPERATION_USER_LIST_CURRENT"
+msgctxt "USER_LIST_CURRENT"
 msgid "Current list of users"
 msgstr "Daftar pengguna"
 
-msgctxt "OPERATION_DESCRIPTION"
+msgctxt "DESCRIPTION"
 msgid "Description"
 msgstr "Gambaran"
 
-msgctxt "OPERATION_DESTINATION"
+msgctxt "DESTINATION"
 msgid "Destination"
 msgstr "Tujuan"
 
-msgctxt "OPERATION_DOMAIN_NAME"
+msgctxt "DOMAIN_NAME"
 msgid "Domain name"
 msgstr "Nama domain"
 
-msgctxt "OPERATION_DOMAIN"
+msgctxt "DOMAIN"
 msgid "Domain"
 msgstr "Domain"
 
-msgctxt "OPERATION_DOMAINS"
+msgctxt "DOMAINS"
 msgid "Domains"
 msgstr "Domain-domain"
 
-msgctxt "OPERATION_DOWNLOAD"
+msgctxt "DOWNLOAD"
 msgid "Download"
 msgstr "Download"
 
-msgctxt "OPERATION_ERROR_UPDATING_CONFIGURATION"
+msgctxt "ERROR_UPDATING_CONFIGURATION"
 msgid "Error occurred while updating system configuration."
 msgstr "Terjadi kesalahan saat memutakhirkan konfigurasi sistem."
 
-msgctxt "OPERATION_GROUP_MEMBERS"
+msgctxt "GROUP_MEMBERS"
 msgid "Group Members"
 msgstr "Anggota Grup"
 
-msgctxt "OPERATION_GROUP_NAME"
+msgctxt "GROUP_NAME"
 msgid "Group Name"
 msgstr "Nama Grup"
 
-msgctxt "OPERATION_GROUPS"
+msgctxt "GROUPS"
 msgid "Groups"
 msgstr "Grup"
 
-msgctxt "OPERATION_IP_ADDRESS"
+msgctxt "IP_ADDRESS"
 msgid "IP Address"
 msgstr "Alamat IP"
 
-msgctxt "OPERATION_IP_ADDRESS_OR_FQDN"
+msgctxt "IP_ADDRESS_OR_FQDN"
 msgid "IP Address or FQDN"
 msgstr "Alamat IP"
 
-msgctxt "OPERATION_USER_INVALID"
+msgctxt "USER_INVALID"
 msgid "Invalid user"
 msgstr "Pengguna Invalid"
 
-msgctxt "OPERATION_LOCATION"
+msgctxt "LOCATION"
 msgid "Location"
 msgstr "Lokasi"
 
-msgctxt "OPERATION_MB"
+msgctxt "MB"
 msgid "Mb"
 msgstr "Mb"
 
-msgctxt "OPERATION_MODIFY_USER_GROUP"
+msgctxt "MODIFY_USER_GROUP"
 msgid "Modify user group"
 msgstr "Ubah grup pengguna"
 
-msgctxt "OPERATION_NAME"
+msgctxt "NAME"
 msgid "Name"
 msgstr "Nama"
 
-msgctxt "OPERATION_PASSWORD_VERIFY_NEW"
+msgctxt "PASSWORD_VERIFY_NEW"
 msgid "New password (verify):"
 msgstr "Password baru(verifikasi):"
 
-msgctxt "OPERATION_PASSWORD_NEW"
+msgctxt "PASSWORD_NEW"
 msgid "New password:"
 msgstr "Password baru:"
 
-msgctxt "OPERATION_OFF"
+msgctxt "OFF"
 msgid "Off"
 msgstr "Padam"
 
-msgctxt "OPERATION_OK"
+msgctxt "OK"
 msgid "Ok"
 msgstr "Ok"
 
-msgctxt "OPERATION_PASSWORD_OLD"
+msgctxt "PASSWORD_OLD"
 msgid "Old password:"
 msgstr "Password lama:"
 
-msgctxt "OPERATION_ON"
+msgctxt "ON"
 msgid "On"
 msgstr "Hidup"
 
-msgctxt "OPERATION_PASSWORD"
+msgctxt "PASSWORD"
 msgid "Password"
 msgstr "Kata kunci"
 
-msgctxt "OPERATION_PERFORM"
+msgctxt "PERFORM"
 msgid "Perform"
 msgstr "Jalankan"
 
-msgctxt "OPERATION_RECONFIGURE"
+msgctxt "RECONFIGURE"
 msgid "Reconfigure"
 msgstr "Rekonfigurasi"
 
-msgctxt "OPERATION_REMOVE_USER_GROUP"
+msgctxt "REMOVE_USER_GROUP"
 msgid "Remove user group"
 msgstr "Hapus grup pengguna"
 
-msgctxt "OPERATION_PASSWORD_RESET"
+msgctxt "PASSWORD_RESET"
 msgid "Reset password"
 msgstr "Reset Password"
 
-msgctxt "OPERATION_RESTORE"
+msgctxt "RESTORE"
 msgid "Restore"
 msgstr "Kembalikan"
 
-msgctxt "OPERATION_SHUTDOWN"
+msgctxt "SHUTDOWN"
 msgid "Shutdown"
 msgstr "Tutup padam"
 
-msgctxt "OPERATION_SUCCESS"
+msgctxt "SUCCESS"
 msgid "Success"
 msgstr "Berhasil"
 
-msgctxt "OPERATION_ACCOUNT_NAME_INVALID"
+msgctxt "ACCOUNT_NAME_INVALID"
 msgid "The account name entered is invalid."
 msgstr "Nama akun anda invalid"
 
-msgctxt "OPERATION_ACCOUNT_NAME_INVALID_CHARS"
+msgctxt "ACCOUNT_NAME_INVALID_CHARS"
 msgid "The account name you entered contained invalid characters."
 msgstr "Nama akun anda mengandung karakter yang tidak diperkenankan"
 
-msgctxt "OPERATION_PASSWORD_OLD_INVALID_CHARS"
+msgctxt "PASSWORD_OLD_INVALID_CHARS"
 msgid "The old password you entered contained invalid characters."
 msgstr "Password lama anda mengandung karakter yang tidak diperkenankan"
 
-msgctxt "OPERATION_PASSWORD_INVALID_CHARS"
+msgctxt "PASSWORD_INVALID_CHARS"
 msgid "The password you entered contained invalid characters."
 msgstr "Password anda mengandung karakter yang tidak diperkenankan"
 
-msgctxt "OPERATION_PASSWORD_VERIFY_ERROR"
+msgctxt "PASSWORD_VERIFY_ERROR"
 msgid "The passwords you entered did not match."
 msgstr "Password yang anda masukkan tidak sama."
 
-msgctxt "OPERATION_ACCOUNT_USER_NONE"
+msgctxt "ACCOUNT_USER_NONE"
 msgid "There are no user accounts in the system."
 msgstr "Tidak ada akun pengguna dalam sistem ini."
 
-msgctxt "OPERATION_ACCOUNT_GROUP_NONE"
+msgctxt "ACCOUNT_GROUP_NONE"
 msgid "There are no user groups in the system."
 msgstr "Tidak ada grup pengguna dalam sistem."
 
-msgctxt "OPERATION_ERROR_INVALID_CHARS"
+msgctxt "ERROR_INVALID_CHARS"
 msgid "Unexpected characters in description."
 msgstr "Karakter yang tidak diharapkan dalam deskripsi"
 
-msgctxt "OPERATION_USER_NAME"
+msgctxt "USER_NAME"
 msgid "User Name"
 msgstr "Nama pengguna"
 
-msgctxt "OPERATION_YOUR_ACCOUNT"
+msgctxt "YOUR_ACCOUNT"
 msgid "Your account:"
 msgstr "Akun anda:"
 
-msgctxt "OPERATION_YOUR_ACCOUNT_INVALID"
+msgctxt "YOUR_ACCOUNT_INVALID"
 msgid "The account name entered is invalid."
 msgstr "Nama akun anda invalid"
 
-msgctxt "OPERATION_PASSWORD_CHANGE_SUCCESS"
+msgctxt "PASSWORD_CHANGE_SUCCESS"
 msgid "Your password has been successfully changed."
 msgstr "Password anda telah berhasil diubah"
 
-msgctxt "OPERATION_FM_NONBLANK"
+msgctxt "FM_NONBLANK"
 msgid "This field must not be left blank"
 msgstr "Field ini tidak boleh dikosongkan"
 
-msgctxt "OPERATION_FM_INTEGER"
+msgctxt "FM_INTEGER"
 msgid "This field must contain a positive integer"
 msgstr "Field ini harus berisi bilangan bulat positif"
 
-msgctxt "OPERATION_FM_NUMBER"
+msgctxt "FM_NUMBER"
 msgid "This field must contain a number"
 msgstr "Field ini harus berisi angka"
 
-msgctxt "OPERATION_FM_WORD"
+msgctxt "FM_WORD"
 msgid "This field must look like a single word."
 msgstr "Field ini harus tampak seperti kata tunggal."
 
-msgctxt "OPERATION_FM_DATE"
+msgctxt "FM_DATE"
 msgid "The data entered could not be parsed as a date"
 msgstr "Data yang dimasukkan tidak dapat dikenali sebagai tanggal"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_NUMBER1"
+msgctxt "FM_CREDIT_CARD_NUMBER1"
 msgid "You must enter a credit card number"
 msgstr "Anda harus memasukkan nomor kartu kredit"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_NUMBER2"
+msgctxt "FM_CREDIT_CARD_NUMBER2"
 msgid ""
 "Credit card numbers shouldn\\'t have anything but numbers, spaces or dashes"
 msgstr ""
 "Nomor kartu kredit tidak boleh mengandung selain angka, spasi atau tanda "
 "minus"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_NUMBER3"
+msgctxt "FM_CREDIT_CARD_NUMBER3"
 msgid "Must be at least 14 characters in length"
 msgstr "Harus 14 karakter atau lebih"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_NUMBER4"
+msgctxt "FM_CREDIT_CARD_NUMBER4"
 msgid "Doesn\\'t appear to be a valid credit card number"
 msgstr "Sepertinya bukan nomor kartu kredit yang valid"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_EXPIRY1"
+msgctxt "FM_CREDIT_CARD_EXPIRY1"
 msgid "No expiry date entered."
 msgstr "Tanggal kadaluarsa belum diisi"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_EXPIRY2"
+msgctxt "FM_CREDIT_CARD_EXPIRY2"
 msgid "Expiry date must be in the format MM/YY or MM/YYYY"
 msgstr "Tanggal kadaluarsa harus dalam format MM/YY atau MM/YYYY"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_EXPIRY3"
+msgctxt "FM_CREDIT_CARD_EXPIRY3"
 msgid "This expiry date appears to have already passed"
 msgstr "Tanggal kadaluarsa sudah lewat"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_EXPIRY4"
+msgctxt "FM_CREDIT_CARD_EXPIRY4"
 msgid "This expiry date appears to be too far in the future"
-msgstr "Tanggal kadaluarsa terlalu lama "
+msgstr "Tanggal kadaluarsa terlalu lama"
 
-msgctxt "OPERATION_FM_ISO_COUNTRY_CODE1"
+msgctxt "FM_ISO_COUNTRY_CODE1"
 msgid "You must provide a country code"
 msgstr "Anda harus mengisikan kode negara"
 
-msgctxt "OPERATION_FM_ISO_COUNTRY_CODE2"
+msgctxt "FM_ISO_COUNTRY_CODE2"
 msgid "This field does not contain an ISO country code"
 msgstr "Field ini tidak mengandung kode negara standar ISO"
 
-msgctxt "OPERATION_FM_US_STATE"
+msgctxt "FM_US_STATE"
 msgid "This doesn\\'t appear to be a valid 2-letter US state abbreviation"
 msgstr ""
 "Sepertinya ini bukan 2 huruf singkatan negara bagian Amerika yang valid"
 
-msgctxt "OPERATION_FM_US_ZIPCODE"
+msgctxt "FM_US_ZIPCODE"
 msgid "US zip codes must contain 5 or 9 numbers"
 msgstr "Kode Pos Amerika harus berisi 5 atau 9 angka"
 
-msgctxt "OPERATION_FM_MINLENGTH1"
+msgctxt "FM_MINLENGTH1"
 msgid "Minimum length has been specified meaninglessly as [_1]"
 msgstr "Minimum length has been specified meaninglessly as {$minlength}"
 
-msgctxt "OPERATION_FM_MINLENGTH2"
+msgctxt "FM_MINLENGTH2"
 msgid "This field must be at least [_1] characters"
 msgstr "Panjang field ini setidaknya harus {$minlength} karakter"
 
-msgctxt "OPERATION_FM_MAXLENGTH1"
+msgctxt "FM_MAXLENGTH1"
 msgid "Maximum length has been specified meaninglessly as [_1]"
 msgstr "Maximum length has been specified meaninglessly as {$maxlength}"
 
-msgctxt "OPERATION_FM_MAXLENGTH2"
+msgctxt "FM_MAXLENGTH2"
 msgid "This field must be no more than [_1] characters"
 msgstr "Field ini tidak boleh lebih dari {$maxlength} karakter"
 
-msgctxt "OPERATION_FM_EXACTLENGTH1"
+msgctxt "FM_EXACTLENGTH1"
 msgid "You must specify the length for the field."
 msgstr "Anda harus menentukan panjang field."
 
-msgctxt "OPERATION_FM_EXACTLENGTH2"
+msgctxt "FM_EXACTLENGTH2"
 msgid "You must specify the exactlength of the field with an integer"
 msgstr "Anda harus menentukan panjang field dengan bilangan bulat"
 
-msgctxt "OPERATION_FM_EXACTLENGTH3"
+msgctxt "FM_EXACTLENGTH3"
 msgid "This field must be exactly [_1] characters"
 msgstr "Panjang field ini harus tepat {$exactlength} karakter"
 
-msgctxt "OPERATION_FM_LENGTHRANGE1"
+msgctxt "FM_LENGTHRANGE1"
 msgid "You must specify the maximum and minimum length for the field."
 msgstr "Anda harus menentukan panjang maksimum dan minimum dari field ini"
 
-msgctxt "OPERATION_FM_LENGTHRANGE2"
+msgctxt "FM_LENGTHRANGE2"
 msgid ""
 "You must specify the maximum and minimum lengths of the field with an "
 "integer"
@@ -477,55 +473,55 @@ msgstr ""
 "Anda harus menentukan panjang maksimum dan minimum field dengan bilangan "
 "bulat"
 
-msgctxt "OPERATION_FM_LENGTHRANGE3"
+msgctxt "FM_LENGTHRANGE3"
 msgid "This field must be between [_1] and [_2] characters"
 msgstr "Field ini harus antara {$minlength} dan {$maxlength} karakter"
 
-msgctxt "OPERATION_FM_URL"
+msgctxt "FM_URL"
 msgid "This field must contain a URL starting with http:// or ftp://"
 msgstr ""
 "Field ini harus mengandung URL yang dimulai dengan http:// atau ftp://"
 
-msgctxt "OPERATION_FM_EMAIL_SIMPLE1"
+msgctxt "FM_EMAIL_SIMPLE1"
 msgid "You must enter an email address."
 msgstr "Anda harus mengisikan alamat email."
 
-msgctxt "OPERATION_FM_EMAIL_SIMPLE2"
+msgctxt "FM_EMAIL_SIMPLE2"
 msgid "This field doesn\\'t look like an RFC822-compliant email address"
 msgstr ""
 "Field ini tidak sesuai dengan alamat email menurut ketentuan "
 "RFC822-compliant"
 
-msgctxt "OPERATION_FM_DOMAIN_NAME"
+msgctxt "FM_DOMAIN_NAME"
 msgid "This field doesn\\'t look like a valid Internet domain name or hostname."
 msgstr ""
 "Field ini tidak tampak seperti alamat domain internet atau hostname yang "
 "valid"
 
-msgctxt "OPERATION_FM_IP_NUMBER1"
+msgctxt "FM_IP_NUMBER1"
 msgid "This field must contain a valid IP number and can not be left blank."
 msgstr ""
 "Field ini harus berisi nomor IP yang valid dan tidak boleh dikosongkan"
 
-msgctxt "OPERATION_FM_IP_NUMBER2"
+msgctxt "FM_IP_NUMBER2"
 msgid "Invalid IP address format (expected X.X.X.X)"
 msgstr "Alamat IP tidak valid untuk memulai DHCP"
 
-msgctxt "OPERATION_FM_IP_NUMBER3"
+msgctxt "FM_IP_NUMBER3"
 msgid "[_1] is more than 255"
 msgstr "{$octet} lebih dari 255"
 
-msgctxt "OPERATION_FM_USERNAME"
+msgctxt "FM_USERNAME"
 msgid ""
 "This field must look like a valid username (3 to 8 letters and numbers)"
 msgstr ""
 "Field ini harus tampak seperti username yang valid (3 s.d 8 huruf dan angka)"
 
-msgctxt "OPERATION_FM_PASSWORD1"
+msgctxt "FM_PASSWORD1"
 msgid "You must provide a password."
 msgstr "Anda harus mengisikan password."
 
-msgctxt "OPERATION_FM_PASSWORD2"
+msgctxt "FM_PASSWORD2"
 msgid ""
 "The password you provided was not a good password.A good password must "
 "contain all of the following: upper case letter, lower case letter, number, "
@@ -535,18 +531,18 @@ msgstr ""
 "huruf besar, huruf kecil, angka, karakter non-alphanumerik, dan harus lebih "
 "dari 6 karakter."
 
-msgctxt "OPERATION_FM_MAC_ADDRESS1"
+msgctxt "FM_MAC_ADDRESS1"
 msgid "You must provide a MAC address."
 msgstr "Anda harus mengisikan alamat MAC"
 
-msgctxt "OPERATION_FM_MAC_ADDRESS2"
+msgctxt "FM_MAC_ADDRESS2"
 msgid "The MAC address you provided was not valid."
 msgstr "Alamat MAC yang anda sediakan tidak valid."
 
-msgctxt "OPERATION_FM_ERR_UNEXPECTED_DESC"
+msgctxt "FM_ERR_UNEXPECTED_DESC"
 msgid "Error: unexpected or missing characters in description"
 msgstr "Error: karakter yang tidak diharapkan atau hilang dalam deskripsi"
 
-msgctxt "OPERATION_CSRF_VALIDATION_FAILURE"
-msgid "Placeholder for missing original text"
+msgctxt "CSRF_VALIDATION_FAILURE"
+msgid "Error: CSRF token is invalid or outdated."
 msgstr "Error: CSRF token is invalid or outdated."
diff --git a/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/General/pofiles/general_it.po b/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/General/pofiles/general_it.po
index 8213dc5..94c34c2 100644
--- a/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/General/pofiles/general_it.po
+++ b/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/General/pofiles/general_it.po
@@ -5,99 +5,95 @@ msgstr ""
 "Language: None\n"
 "Content-Type: text/plain; charset=utf-8\n"
 
-msgctxt "OPERATION_Collaboration"
+msgctxt "Collaboration"
 msgid "Collaboration"
 msgstr "Collaborazione"
 
-msgctxt "OPERATION_Administration"
+msgctxt "Administration"
 msgid "Administration"
 msgstr "Amministrazione"
 
-msgctxt "OPERATION_Security"
+msgctxt "Security"
 msgid "Security"
 msgstr "Sicurezza"
 
-msgctxt "OPERATION_Configuration"
+msgctxt "Configuration"
 msgid "Configuration"
 msgstr "Configurazione"
 
-msgctxt "OPERATION_Miscellaneous"
+msgctxt "Miscellaneous"
 msgid "Miscellaneous"
 msgstr "Varie"
 
-msgctxt "OPERATION_Your Settings"
-msgid "Your Settings"
-msgstr "Impostazioni"
-
-msgctxt "OPERATION_SAVE"
+msgctxt "SAVE"
 msgid "Save"
 msgstr "Salva"
 
-msgctxt "OPERATION_CANCEL"
+msgctxt "CANCEL"
 msgid "Cancel"
 msgstr "Annulla"
 
-msgctxt "OPERATION_ENABLED"
+msgctxt "ENABLED"
 msgid "Enabled"
 msgstr "Abilitato"
 
-msgctxt "OPERATION_DISABLED"
+msgctxt "DISABLED"
 msgid "Disabled"
 msgstr "Disabilitato"
 
-msgctxt "OPERATION_NO"
+msgctxt "NO"
 msgid "No"
 msgstr "No"
 
-msgctxt "OPERATION_YES"
+msgctxt "YES"
 msgid "Yes"
 msgstr "Si"
 
-msgctxt "OPERATION_ADD"
+msgctxt "ADD"
 msgid "Add"
 msgstr "Aggiungi"
 
-msgctxt "OPERATION_CREATE"
+msgctxt "CREATE"
 msgid "Create"
 msgstr "Crea"
 
-msgctxt "OPERATION_MODIFY"
+msgctxt "MODIFY"
 msgid "Modify"
 msgstr "Modifica"
 
-msgctxt "OPERATION_REMOVE"
+msgctxt "REMOVE"
 msgid "Remove"
 msgstr "Rimuovi"
 
-msgctxt "OPERATION_COMMENT"
+msgctxt "COMMENT"
 msgid "Comment"
 msgstr "Commento"
 
-msgctxt "OPERATION_NEXT"
+msgctxt "NEXT"
 msgid "Next"
 msgstr "Avanti"
 
-msgctxt "OPERATION_SELF"
+msgctxt "SELF"
 msgid "Self"
 msgstr "Questo server"
 
-msgctxt "OPERATION_REMOTE"
+msgctxt "REMOTE"
 msgid "Remote"
 msgstr "Remoto"
 
-msgctxt "OPERATION_LOCAL"
+msgctxt "LOCAL"
 msgid "Local"
 msgstr "Locale"
 
-msgctxt "OPERATION_ACTION"
+msgctxt "ACTION"
 msgid "Action"
 msgstr "Azione"
 
-msgctxt "OPERATION_NETWORK"
+msgctxt "NETWORK"
 msgid "Network"
 msgstr "Rete"
 
-msgctxt "OPERATION_ROUTER"
+msgctxt "ROUTER"
 msgid "Router"
 msgstr "Router"
 
@@ -105,23 +101,23 @@ msgctxt "OPERATION_STATUS_REPORT"
 msgid "Operation status report"
 msgstr "Rapporto operazione"
 
-msgctxt "OPERATION_ACCOUNT"
+msgctxt "ACCOUNT"
 msgid "Account"
 msgstr "Utente"
 
-msgctxt "OPERATION_GROUP"
+msgctxt "GROUP"
 msgid "Group"
 msgstr "Gruppo"
 
-msgctxt "OPERATION_DESC_SECTIONBAR"
+msgctxt "DESC_SECTIONBAR"
 msgid "<hr class=\"sectionbar\"/>"
-msgstr " <hr class=\"sectionbar\"/> "
+msgstr "<hr class=\"sectionbar\"/>"
 
-msgctxt "OPERATION_NO_PIPES_ALLOWED"
+msgctxt "NO_PIPES_ALLOWED"
 msgid "Pipe symbols (|) are not permitted in this field"
 msgstr "Pipe (|) non permesso in questo campo"
 
-msgctxt "OPERATION_ERROR_BELOW"
+msgctxt "ERROR_BELOW"
 msgid ""
 "ERROR: There was an error in the validation of this page. Please scroll down"
 " and find the specific problem."
@@ -129,27 +125,27 @@ msgstr ""
 "ERRORE: Errore durante la validazione della pagina. Scorrere verso il basso "
 "per trovare l\\'errore specifico."
 
-msgctxt "OPERATION_ACCESS"
+msgctxt "ACCESS"
 msgid "Access"
 msgstr "Accesso"
 
-msgctxt "OPERATION_ACCOUNT_LOCKED"
+msgctxt "ACCOUNT_LOCKED"
 msgid "Account is locked"
 msgstr "Account bloccato"
 
-msgctxt "OPERATION_GROUP_ADD"
+msgctxt "GROUP_ADD"
 msgid "Add group"
 msgstr "Aggiungi gruppo"
 
-msgctxt "OPERATION_NETWORKS_ALLOW_LOCAL"
+msgctxt "NETWORKS_ALLOW_LOCAL"
 msgid "Allow access only from local networks"
 msgstr "Consenti l\\'accesso solo dalle reti locali"
 
-msgctxt "OPERATION_NETWORKS_ALLOW_PUBLIC"
+msgctxt "NETWORKS_ALLOW_PUBLIC"
 msgid "Allow public access (entire Internet)"
 msgstr "Consenti accesso pubblico (Internet intera)"
 
-msgctxt "OPERATION_ERROR_PASSWORD_CHANGE"
+msgctxt "ERROR_PASSWORD_CHANGE"
 msgid ""
 "An error occurred while attempting to change your password. Please make sure"
 " that the old password entered is correct."
@@ -157,322 +153,322 @@ msgstr ""
 "Errore durante la modifica della password. Assicurarsi di aver inserito "
 "correttamente la vecchia password."
 
-msgctxt "OPERATION_BACK"
+msgctxt "BACK"
 msgid "Back"
 msgstr "Indietro"
 
-msgctxt "OPERATION_BACKUP"
+msgctxt "BACKUP"
 msgid "Backup"
 msgstr "Backup"
 
-msgctxt "OPERATION_DESCRIPTION_BRIEF"
+msgctxt "DESCRIPTION_BRIEF"
 msgid "Brief description"
 msgstr "Breve descrizione"
 
-msgctxt "OPERATION_PASSWORD_CHANGE"
+msgctxt "PASSWORD_CHANGE"
 msgid "Change Password"
 msgstr "Cambia Password"
 
-msgctxt "OPERATION_RESET_PASSWORD_TITLE"
+msgctxt "RESET_PASSWORD_TITLE"
 msgid "Reset user password"
 msgstr "Modifica password utente"
 
-msgctxt "OPERATION_ACCOUNT_PASSWORD_CHANGE"
+msgctxt "ACCOUNT_PASSWORD_CHANGE"
 msgid "Change account password"
 msgstr "Cambio password utente"
 
-msgctxt "OPERATION_CONTENT"
+msgctxt "CONTENT"
 msgid "Content"
 msgstr "Contenuto"
 
-msgctxt "OPERATION_CREATE_GROUP"
+msgctxt "CREATE_GROUP"
 msgid "Create user group"
 msgstr "Creazione gruppo"
 
-msgctxt "OPERATION_USER_LIST_CURRENT"
+msgctxt "USER_LIST_CURRENT"
 msgid "Current list of users"
 msgstr "Lista utenti corrente"
 
-msgctxt "OPERATION_DESCRIPTION"
+msgctxt "DESCRIPTION"
 msgid "Description"
 msgstr "Descrizione"
 
-msgctxt "OPERATION_DESTINATION"
+msgctxt "DESTINATION"
 msgid "Destination"
 msgstr "Destinazione"
 
-msgctxt "OPERATION_DOMAIN_NAME"
+msgctxt "DOMAIN_NAME"
 msgid "Domain name"
 msgstr "Nome dominio"
 
-msgctxt "OPERATION_DOMAIN"
+msgctxt "DOMAIN"
 msgid "Domain"
 msgstr "Dominio"
 
-msgctxt "OPERATION_DOMAINS"
+msgctxt "DOMAINS"
 msgid "Domains"
 msgstr "Domini"
 
-msgctxt "OPERATION_DOWNLOAD"
+msgctxt "DOWNLOAD"
 msgid "Download"
 msgstr "Download"
 
-msgctxt "OPERATION_ERROR_UPDATING_CONFIGURATION"
+msgctxt "ERROR_UPDATING_CONFIGURATION"
 msgid "Error occurred while updating system configuration."
 msgstr "Errore durante l\\'aggiornamento della configurazione di sistema."
 
-msgctxt "OPERATION_GROUP_MEMBERS"
+msgctxt "GROUP_MEMBERS"
 msgid "Group Members"
 msgstr "Membri del Gruppo"
 
-msgctxt "OPERATION_GROUP_NAME"
+msgctxt "GROUP_NAME"
 msgid "Group Name"
 msgstr "Nome Gruppo"
 
-msgctxt "OPERATION_GROUPS"
+msgctxt "GROUPS"
 msgid "Groups"
 msgstr "Gruppi"
 
-msgctxt "OPERATION_IP_ADDRESS"
+msgctxt "IP_ADDRESS"
 msgid "IP Address"
 msgstr "Indirizzo IP"
 
-msgctxt "OPERATION_IP_ADDRESS_OR_FQDN"
+msgctxt "IP_ADDRESS_OR_FQDN"
 msgid "IP Address or FQDN"
 msgstr "Indirizzo IP o FQDN"
 
-msgctxt "OPERATION_USER_INVALID"
+msgctxt "USER_INVALID"
 msgid "Invalid user"
 msgstr "Utente non valido"
 
-msgctxt "OPERATION_LOCATION"
+msgctxt "LOCATION"
 msgid "Location"
 msgstr "Posizione"
 
-msgctxt "OPERATION_MB"
+msgctxt "MB"
 msgid "Mb"
 msgstr "Mb"
 
-msgctxt "OPERATION_MODIFY_USER_GROUP"
+msgctxt "MODIFY_USER_GROUP"
 msgid "Modify user group"
 msgstr "Modifica gruppo"
 
-msgctxt "OPERATION_NAME"
+msgctxt "NAME"
 msgid "Name"
 msgstr "Nome"
 
-msgctxt "OPERATION_PASSWORD_VERIFY_NEW"
+msgctxt "PASSWORD_VERIFY_NEW"
 msgid "New password (verify):"
 msgstr "Nuova password (verifica):"
 
-msgctxt "OPERATION_PASSWORD_NEW"
+msgctxt "PASSWORD_NEW"
 msgid "New password:"
 msgstr "Nuova password:"
 
-msgctxt "OPERATION_OFF"
+msgctxt "OFF"
 msgid "Off"
 msgstr "Disabilitato"
 
-msgctxt "OPERATION_OK"
+msgctxt "OK"
 msgid "Ok"
 msgstr "Ok"
 
-msgctxt "OPERATION_PASSWORD_OLD"
+msgctxt "PASSWORD_OLD"
 msgid "Old password:"
 msgstr "Vecchia password:"
 
-msgctxt "OPERATION_ON"
+msgctxt "ON"
 msgid "On"
 msgstr "Abilitato"
 
-msgctxt "OPERATION_PASSWORD"
+msgctxt "PASSWORD"
 msgid "Password"
 msgstr "Password"
 
-msgctxt "OPERATION_PERFORM"
+msgctxt "PERFORM"
 msgid "Perform"
 msgstr "Esegui"
 
-msgctxt "OPERATION_RECONFIGURE"
+msgctxt "RECONFIGURE"
 msgid "Reconfigure"
 msgstr "Riconfigura il server"
 
-msgctxt "OPERATION_REMOVE_USER_GROUP"
+msgctxt "REMOVE_USER_GROUP"
 msgid "Remove user group"
 msgstr "Rimuovi gruppo"
 
-msgctxt "OPERATION_PASSWORD_RESET"
+msgctxt "PASSWORD_RESET"
 msgid "Reset password"
 msgstr "Imposta password"
 
-msgctxt "OPERATION_RESTORE"
+msgctxt "RESTORE"
 msgid "Restore"
 msgstr "Ripristina"
 
-msgctxt "OPERATION_SHUTDOWN"
+msgctxt "SHUTDOWN"
 msgid "Shutdown"
 msgstr "Spegnimento"
 
-msgctxt "OPERATION_SUCCESS"
+msgctxt "SUCCESS"
 msgid "Success"
 msgstr "Successo"
 
-msgctxt "OPERATION_ACCOUNT_NAME_INVALID"
+msgctxt "ACCOUNT_NAME_INVALID"
 msgid "The account name entered is invalid."
 msgstr "Il nome utente inserito non è valido"
 
-msgctxt "OPERATION_ACCOUNT_NAME_INVALID_CHARS"
+msgctxt "ACCOUNT_NAME_INVALID_CHARS"
 msgid "The account name you entered contained invalid characters."
 msgstr "Il nome utente inserito contiene caratteri non validi."
 
-msgctxt "OPERATION_PASSWORD_OLD_INVALID_CHARS"
+msgctxt "PASSWORD_OLD_INVALID_CHARS"
 msgid "The old password you entered contained invalid characters."
 msgstr "La vecchia password inserita contiene caratteri non validi."
 
-msgctxt "OPERATION_PASSWORD_INVALID_CHARS"
+msgctxt "PASSWORD_INVALID_CHARS"
 msgid "The password you entered contained invalid characters."
 msgstr "La password inserita contiene caratteri non validi."
 
-msgctxt "OPERATION_PASSWORD_VERIFY_ERROR"
+msgctxt "PASSWORD_VERIFY_ERROR"
 msgid "The passwords you entered did not match."
 msgstr "Le password non coincidono."
 
-msgctxt "OPERATION_ACCOUNT_USER_NONE"
+msgctxt "ACCOUNT_USER_NONE"
 msgid "There are no user accounts in the system."
 msgstr "Non ci sono utenti nel sistema."
 
-msgctxt "OPERATION_ACCOUNT_GROUP_NONE"
+msgctxt "ACCOUNT_GROUP_NONE"
 msgid "There are no user groups in the system."
 msgstr "Non ci sono gruppi nel sistema."
 
-msgctxt "OPERATION_ERROR_INVALID_CHARS"
+msgctxt "ERROR_INVALID_CHARS"
 msgid "Unexpected characters in description."
 msgstr "Carattere inaspettato nella descrizione."
 
-msgctxt "OPERATION_USER_NAME"
+msgctxt "USER_NAME"
 msgid "User Name"
 msgstr "Nome Utente"
 
-msgctxt "OPERATION_YOUR_ACCOUNT"
+msgctxt "YOUR_ACCOUNT"
 msgid "Your account:"
 msgstr "Nome utente:"
 
-msgctxt "OPERATION_YOUR_ACCOUNT_INVALID"
+msgctxt "YOUR_ACCOUNT_INVALID"
 msgid "The account name entered is invalid."
 msgstr "Il nome utente inserito non è valido"
 
-msgctxt "OPERATION_PASSWORD_CHANGE_SUCCESS"
+msgctxt "PASSWORD_CHANGE_SUCCESS"
 msgid "Your password has been successfully changed."
 msgstr "Password modificata con successo."
 
-msgctxt "OPERATION_FM_NONBLANK"
+msgctxt "FM_NONBLANK"
 msgid "This field must not be left blank"
 msgstr "Il campo non può essere lasciato vuoto"
 
-msgctxt "OPERATION_FM_INTEGER"
+msgctxt "FM_INTEGER"
 msgid "This field must contain a positive integer"
 msgstr "Questo campo deve contenere un intero positivo"
 
-msgctxt "OPERATION_FM_NUMBER"
+msgctxt "FM_NUMBER"
 msgid "This field must contain a number"
 msgstr "Questo campo deve contenere un numero"
 
-msgctxt "OPERATION_FM_WORD"
+msgctxt "FM_WORD"
 msgid "This field must look like a single word."
 msgstr "Questo campo può contenere una singola parola"
 
-msgctxt "OPERATION_FM_DATE"
+msgctxt "FM_DATE"
 msgid "The data entered could not be parsed as a date"
 msgstr "Il valore immesso non sembra una data"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_NUMBER1"
+msgctxt "FM_CREDIT_CARD_NUMBER1"
 msgid "You must enter a credit card number"
 msgstr "Inserire un numero di carta di credito"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_NUMBER2"
+msgctxt "FM_CREDIT_CARD_NUMBER2"
 msgid ""
 "Credit card numbers shouldn\\'t have anything but numbers, spaces or dashes"
 msgstr ""
 "I numeri di carta di credito non devono contenere altro che numeri, spazi o "
 "trattini (-)."
 
-msgctxt "OPERATION_FM_CREDIT_CARD_NUMBER3"
+msgctxt "FM_CREDIT_CARD_NUMBER3"
 msgid "Must be at least 14 characters in length"
 msgstr "Deve essere lungo al massimo 14 caratteri"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_NUMBER4"
+msgctxt "FM_CREDIT_CARD_NUMBER4"
 msgid "Doesn\\'t appear to be a valid credit card number"
 msgstr "Non è un numero valido di carta di credito"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_EXPIRY1"
+msgctxt "FM_CREDIT_CARD_EXPIRY1"
 msgid "No expiry date entered."
 msgstr "Non è stata inserita la data di scadenza"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_EXPIRY2"
+msgctxt "FM_CREDIT_CARD_EXPIRY2"
 msgid "Expiry date must be in the format MM/YY or MM/YYYY"
 msgstr "La data di scadenza deve essere nel formato MM/AA oppure MM/AAAA"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_EXPIRY3"
+msgctxt "FM_CREDIT_CARD_EXPIRY3"
 msgid "This expiry date appears to have already passed"
 msgstr "La data di scadenza è già passata"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_EXPIRY4"
+msgctxt "FM_CREDIT_CARD_EXPIRY4"
 msgid "This expiry date appears to be too far in the future"
 msgstr "La data di scadenza è troppo lontana."
 
-msgctxt "OPERATION_FM_ISO_COUNTRY_CODE1"
+msgctxt "FM_ISO_COUNTRY_CODE1"
 msgid "You must provide a country code"
 msgstr "Inserire un country code ISO"
 
-msgctxt "OPERATION_FM_ISO_COUNTRY_CODE2"
+msgctxt "FM_ISO_COUNTRY_CODE2"
 msgid "This field does not contain an ISO country code"
 msgstr "Questo campo non contiene un country code ISO"
 
-msgctxt "OPERATION_FM_US_STATE"
+msgctxt "FM_US_STATE"
 msgid "This doesn\\'t appear to be a valid 2-letter US state abbreviation"
 msgstr ""
 "Questa sembra non essere una valida abbreviazione a due lettere di uno Stato"
 " USA"
 
-msgctxt "OPERATION_FM_US_ZIPCODE"
+msgctxt "FM_US_ZIPCODE"
 msgid "US zip codes must contain 5 or 9 numbers"
 msgstr "Il Codice Postale degli USA deve essere di 5 o 9 numeri"
 
-msgctxt "OPERATION_FM_MINLENGTH1"
+msgctxt "FM_MINLENGTH1"
 msgid "Minimum length has been specified meaninglessly as [_1]"
 msgstr "La lunghezza minima è stata specificata in {$minlength}"
 
-msgctxt "OPERATION_FM_MINLENGTH2"
+msgctxt "FM_MINLENGTH2"
 msgid "This field must be at least [_1] characters"
 msgstr "Questo campo deve essere contenere almeno {$minlength} caratteri"
 
-msgctxt "OPERATION_FM_MAXLENGTH1"
+msgctxt "FM_MAXLENGTH1"
 msgid "Maximum length has been specified meaninglessly as [_1]"
 msgstr "La lunghezza massima è stata specificata in {$maxlength}"
 
-msgctxt "OPERATION_FM_MAXLENGTH2"
+msgctxt "FM_MAXLENGTH2"
 msgid "This field must be no more than [_1] characters"
 msgstr "Questo campo non può contenere più di {$maxlength} caratteri"
 
-msgctxt "OPERATION_FM_EXACTLENGTH1"
+msgctxt "FM_EXACTLENGTH1"
 msgid "You must specify the length for the field."
 msgstr "Specificare la lunghezza del campo."
 
-msgctxt "OPERATION_FM_EXACTLENGTH2"
+msgctxt "FM_EXACTLENGTH2"
 msgid "You must specify the exactlength of the field with an integer"
 msgstr ""
 "Deve essere specifcata la lunghezza esatta del campo con un numero intero."
 
-msgctxt "OPERATION_FM_EXACTLENGTH3"
+msgctxt "FM_EXACTLENGTH3"
 msgid "This field must be exactly [_1] characters"
 msgstr ""
 "Questo campo deve essere contenere esattamante {$exactlength} caratteri"
 
-msgctxt "OPERATION_FM_LENGTHRANGE1"
+msgctxt "FM_LENGTHRANGE1"
 msgid "You must specify the maximum and minimum length for the field."
 msgstr "Devono essere specificate le lunghezze massima e minima del campo."
 
-msgctxt "OPERATION_FM_LENGTHRANGE2"
+msgctxt "FM_LENGTHRANGE2"
 msgid ""
 "You must specify the maximum and minimum lengths of the field with an "
 "integer"
@@ -480,54 +476,54 @@ msgstr ""
 "Devono essere specificate le lunghezze massima e minima del campo con un "
 "numero intero."
 
-msgctxt "OPERATION_FM_LENGTHRANGE3"
+msgctxt "FM_LENGTHRANGE3"
 msgid "This field must be between [_1] and [_2] characters"
 msgstr ""
 "Il campo deve essere compreso tra {$minlength} e {$maxlength} caratteri."
 
-msgctxt "OPERATION_FM_URL"
+msgctxt "FM_URL"
 msgid "This field must contain a URL starting with http:// or ftp://"
 msgstr "Il campo deve contenere un URL che inizi con http:// or ftp://"
 
-msgctxt "OPERATION_FM_EMAIL_SIMPLE1"
+msgctxt "FM_EMAIL_SIMPLE1"
 msgid "You must enter an email address."
 msgstr "Introdurre un indirizzo di posta."
 
-msgctxt "OPERATION_FM_EMAIL_SIMPLE2"
+msgctxt "FM_EMAIL_SIMPLE2"
 msgid "This field doesn\\'t look like an RFC822-compliant email address"
 msgstr ""
 "Il campo non pare essere un indirizzo d posta compatibile con le specifiche "
 "RFC822."
 
-msgctxt "OPERATION_FM_DOMAIN_NAME"
+msgctxt "FM_DOMAIN_NAME"
 msgid "This field doesn\\'t look like a valid Internet domain name or hostname."
 msgstr "Questo campo non sembra un dominio Internet o un hostname valido."
 
-msgctxt "OPERATION_FM_IP_NUMBER1"
+msgctxt "FM_IP_NUMBER1"
 msgid "This field must contain a valid IP number and can not be left blank."
 msgstr ""
 "Il campo deve contenere un indirizzo IP valido e non può essere lasciato "
 "vuoto."
 
-msgctxt "OPERATION_FM_IP_NUMBER2"
+msgctxt "FM_IP_NUMBER2"
 msgid "Invalid IP address format (expected X.X.X.X)"
 msgstr "Formato dell\\'Indirizzo IP non valido (ci si aspetta un x.x.x.x)"
 
-msgctxt "OPERATION_FM_IP_NUMBER3"
+msgctxt "FM_IP_NUMBER3"
 msgid "[_1] is more than 255"
 msgstr "{$octet} è più grande di 255"
 
-msgctxt "OPERATION_FM_USERNAME"
+msgctxt "FM_USERNAME"
 msgid ""
 "This field must look like a valid username (3 to 8 letters and numbers)"
 msgstr ""
 "Questo campo non sembra uno username valido (da 3 a 8 lettere o numeri)"
 
-msgctxt "OPERATION_FM_PASSWORD1"
+msgctxt "FM_PASSWORD1"
 msgid "You must provide a password."
 msgstr "Deve essere immessa una password"
 
-msgctxt "OPERATION_FM_PASSWORD2"
+msgctxt "FM_PASSWORD2"
 msgid ""
 "The password you provided was not a good password.A good password must "
 "contain all of the following: upper case letter, lower case letter, number, "
@@ -537,18 +533,18 @@ msgstr ""
 "contenere tutti i seguenti elementi: lettere maiuscole, lettere minuscole, "
 "numeri, caratteri non alfanumerici ed essere lunga almeno 7 caratteri."
 
-msgctxt "OPERATION_FM_MAC_ADDRESS1"
+msgctxt "FM_MAC_ADDRESS1"
 msgid "You must provide a MAC address."
 msgstr "Deve essere introdotto un Mac-Address"
 
-msgctxt "OPERATION_FM_MAC_ADDRESS2"
+msgctxt "FM_MAC_ADDRESS2"
 msgid "The MAC address you provided was not valid."
 msgstr "Il Mac-Address fornito non è valido."
 
-msgctxt "OPERATION_FM_ERR_UNEXPECTED_DESC"
+msgctxt "FM_ERR_UNEXPECTED_DESC"
 msgid "Error: unexpected or missing characters in description"
 msgstr "Errore: carattere mancante o inaspettato nella descrizione."
 
-msgctxt "OPERATION_CSRF_VALIDATION_FAILURE"
-msgid "Placeholder for missing original text"
+msgctxt "CSRF_VALIDATION_FAILURE"
+msgid "Error: CSRF token is invalid or outdated."
 msgstr "Error: CSRF token is invalid or outdated."
diff --git a/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/General/pofiles/general_ja.po b/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/General/pofiles/general_ja.po
index 14d04cf..6abaded 100644
--- a/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/General/pofiles/general_ja.po
+++ b/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/General/pofiles/general_ja.po
@@ -5,99 +5,95 @@ msgstr ""
 "Language: None\n"
 "Content-Type: text/plain; charset=utf-8\n"
 
-msgctxt "OPERATION_Collaboration"
+msgctxt "Collaboration"
 msgid "Collaboration"
 msgstr "協力"
 
-msgctxt "OPERATION_Administration"
+msgctxt "Administration"
 msgid "Administration"
 msgstr "管理"
 
-msgctxt "OPERATION_Security"
+msgctxt "Security"
 msgid "Security"
 msgstr "セキュリティ"
 
-msgctxt "OPERATION_Configuration"
+msgctxt "Configuration"
 msgid "Configuration"
 msgstr "設定"
 
-msgctxt "OPERATION_Miscellaneous"
+msgctxt "Miscellaneous"
 msgid "Miscellaneous"
 msgstr "Miscellaneous"
 
-msgctxt "OPERATION_Your Settings"
-msgid "Your Settings"
-msgstr "Your Settings"
-
-msgctxt "OPERATION_SAVE"
+msgctxt "SAVE"
 msgid "Save"
 msgstr "保存"
 
-msgctxt "OPERATION_CANCEL"
+msgctxt "CANCEL"
 msgid "Cancel"
 msgstr "取消し"
 
-msgctxt "OPERATION_ENABLED"
+msgctxt "ENABLED"
 msgid "Enabled"
 msgstr "Enabled"
 
-msgctxt "OPERATION_DISABLED"
+msgctxt "DISABLED"
 msgid "Disabled"
 msgstr "Disabled"
 
-msgctxt "OPERATION_NO"
+msgctxt "NO"
 msgid "No"
 msgstr "いいえ"
 
-msgctxt "OPERATION_YES"
+msgctxt "YES"
 msgid "Yes"
 msgstr "はい"
 
-msgctxt "OPERATION_ADD"
+msgctxt "ADD"
 msgid "Add"
 msgstr "追加"
 
-msgctxt "OPERATION_CREATE"
+msgctxt "CREATE"
 msgid "Create"
 msgstr "作成"
 
-msgctxt "OPERATION_MODIFY"
+msgctxt "MODIFY"
 msgid "Modify"
 msgstr "更新"
 
-msgctxt "OPERATION_REMOVE"
+msgctxt "REMOVE"
 msgid "Remove"
 msgstr "削除"
 
-msgctxt "OPERATION_COMMENT"
+msgctxt "COMMENT"
 msgid "Comment"
 msgstr "Comment"
 
-msgctxt "OPERATION_NEXT"
+msgctxt "NEXT"
 msgid "Next"
 msgstr "次へ"
 
-msgctxt "OPERATION_SELF"
+msgctxt "SELF"
 msgid "Self"
 msgstr "Self"
 
-msgctxt "OPERATION_REMOTE"
+msgctxt "REMOTE"
 msgid "Remote"
 msgstr "遠隔"
 
-msgctxt "OPERATION_LOCAL"
+msgctxt "LOCAL"
 msgid "Local"
 msgstr "内部"
 
-msgctxt "OPERATION_ACTION"
+msgctxt "ACTION"
 msgid "Action"
 msgstr "Action"
 
-msgctxt "OPERATION_NETWORK"
+msgctxt "NETWORK"
 msgid "Network"
 msgstr "ネットワーク"
 
-msgctxt "OPERATION_ROUTER"
+msgctxt "ROUTER"
 msgid "Router"
 msgstr "Router"
 
@@ -105,23 +101,23 @@ msgctxt "OPERATION_STATUS_REPORT"
 msgid "Operation status report"
 msgstr "Operation status report"
 
-msgctxt "OPERATION_ACCOUNT"
+msgctxt "ACCOUNT"
 msgid "Account"
 msgstr "アカウント"
 
-msgctxt "OPERATION_GROUP"
+msgctxt "GROUP"
 msgid "Group"
 msgstr "郡"
 
-msgctxt "OPERATION_DESC_SECTIONBAR"
+msgctxt "DESC_SECTIONBAR"
 msgid "<hr class=\"sectionbar\"/>"
-msgstr " <hr class=\"sectionbar\"/> "
+msgstr "<hr class=\"sectionbar\"/>"
 
-msgctxt "OPERATION_NO_PIPES_ALLOWED"
+msgctxt "NO_PIPES_ALLOWED"
 msgid "Pipe symbols (|) are not permitted in this field"
 msgstr "Pipe symbols (|) are not permitted in this field"
 
-msgctxt "OPERATION_ERROR_BELOW"
+msgctxt "ERROR_BELOW"
 msgid ""
 "ERROR: There was an error in the validation of this page. Please scroll down"
 " and find the specific problem."
@@ -129,343 +125,343 @@ msgstr ""
 "ERROR: There was an error in the validation of this page. Please scroll down"
 " and find the specific problem."
 
-msgctxt "OPERATION_ACCESS"
+msgctxt "ACCESS"
 msgid "Access"
 msgstr "Access"
 
-msgctxt "OPERATION_ACCOUNT_LOCKED"
+msgctxt "ACCOUNT_LOCKED"
 msgid "Account is locked"
 msgstr "Account is locked"
 
-msgctxt "OPERATION_GROUP_ADD"
+msgctxt "GROUP_ADD"
 msgid "Add group"
 msgstr "Add group"
 
-msgctxt "OPERATION_NETWORKS_ALLOW_LOCAL"
+msgctxt "NETWORKS_ALLOW_LOCAL"
 msgid "Allow access only from local networks"
 msgstr "Allow access only from local networks"
 
-msgctxt "OPERATION_NETWORKS_ALLOW_PUBLIC"
+msgctxt "NETWORKS_ALLOW_PUBLIC"
 msgid "Allow public access (entire Internet)"
 msgstr "Allow public access (entire Internet)"
 
-msgctxt "OPERATION_ERROR_PASSWORD_CHANGE"
+msgctxt "ERROR_PASSWORD_CHANGE"
 msgid ""
 "An error occurred while attempting to change your password. Please make sure"
 " that the old password entered is correct."
 msgstr "パスワードの変更の途中でエラーが起きました。前のパスワードがあっているか、確認してください。"
 
-msgctxt "OPERATION_BACK"
+msgctxt "BACK"
 msgid "Back"
 msgstr "戻る"
 
-msgctxt "OPERATION_BACKUP"
+msgctxt "BACKUP"
 msgid "Backup"
 msgstr "バックアップ"
 
-msgctxt "OPERATION_DESCRIPTION_BRIEF"
+msgctxt "DESCRIPTION_BRIEF"
 msgid "Brief description"
 msgstr "Brief description"
 
-msgctxt "OPERATION_PASSWORD_CHANGE"
+msgctxt "PASSWORD_CHANGE"
 msgid "Change Password"
 msgstr "パスワードを変更する。"
 
-msgctxt "OPERATION_RESET_PASSWORD_TITLE"
+msgctxt "RESET_PASSWORD_TITLE"
 msgid "Reset user password"
 msgstr "Reset user password"
 
-msgctxt "OPERATION_ACCOUNT_PASSWORD_CHANGE"
+msgctxt "ACCOUNT_PASSWORD_CHANGE"
 msgid "Change account password"
 msgstr "Change account password"
 
-msgctxt "OPERATION_CONTENT"
+msgctxt "CONTENT"
 msgid "Content"
 msgstr "内容"
 
-msgctxt "OPERATION_CREATE_GROUP"
+msgctxt "CREATE_GROUP"
 msgid "Create user group"
 msgstr "Create user group"
 
-msgctxt "OPERATION_USER_LIST_CURRENT"
+msgctxt "USER_LIST_CURRENT"
 msgid "Current list of users"
 msgstr "Current list of users"
 
-msgctxt "OPERATION_DESCRIPTION"
+msgctxt "DESCRIPTION"
 msgid "Description"
 msgstr "説明"
 
-msgctxt "OPERATION_DESTINATION"
+msgctxt "DESTINATION"
 msgid "Destination"
 msgstr "移動先"
 
-msgctxt "OPERATION_DOMAIN_NAME"
+msgctxt "DOMAIN_NAME"
 msgid "Domain name"
 msgstr "Domain name"
 
-msgctxt "OPERATION_DOMAIN"
+msgctxt "DOMAIN"
 msgid "Domain"
 msgstr "ドメイン"
 
-msgctxt "OPERATION_DOMAINS"
+msgctxt "DOMAINS"
 msgid "Domains"
 msgstr "ドメイン"
 
-msgctxt "OPERATION_DOWNLOAD"
+msgctxt "DOWNLOAD"
 msgid "Download"
 msgstr "ダウンロード"
 
-msgctxt "OPERATION_ERROR_UPDATING_CONFIGURATION"
+msgctxt "ERROR_UPDATING_CONFIGURATION"
 msgid "Error occurred while updating system configuration."
 msgstr "Error occurred while updating system configuration."
 
-msgctxt "OPERATION_GROUP_MEMBERS"
+msgctxt "GROUP_MEMBERS"
 msgid "Group Members"
 msgstr "Group Members"
 
-msgctxt "OPERATION_GROUP_NAME"
+msgctxt "GROUP_NAME"
 msgid "Group Name"
 msgstr "Group Name"
 
-msgctxt "OPERATION_GROUPS"
+msgctxt "GROUPS"
 msgid "Groups"
 msgstr "郡"
 
-msgctxt "OPERATION_IP_ADDRESS"
+msgctxt "IP_ADDRESS"
 msgid "IP Address"
 msgstr "IPアドレス"
 
-msgctxt "OPERATION_IP_ADDRESS_OR_FQDN"
+msgctxt "IP_ADDRESS_OR_FQDN"
 msgid "IP Address or FQDN"
 msgstr "IPアドレス"
 
-msgctxt "OPERATION_USER_INVALID"
+msgctxt "USER_INVALID"
 msgid "Invalid user"
 msgstr "Invalid user"
 
-msgctxt "OPERATION_LOCATION"
+msgctxt "LOCATION"
 msgid "Location"
 msgstr "位置"
 
-msgctxt "OPERATION_MB"
+msgctxt "MB"
 msgid "Mb"
 msgstr "Mb"
 
-msgctxt "OPERATION_MODIFY_USER_GROUP"
+msgctxt "MODIFY_USER_GROUP"
 msgid "Modify user group"
 msgstr "Modify user group"
 
-msgctxt "OPERATION_NAME"
+msgctxt "NAME"
 msgid "Name"
 msgstr "氏名"
 
-msgctxt "OPERATION_PASSWORD_VERIFY_NEW"
+msgctxt "PASSWORD_VERIFY_NEW"
 msgid "New password (verify):"
 msgstr "New password (verify):"
 
-msgctxt "OPERATION_PASSWORD_NEW"
+msgctxt "PASSWORD_NEW"
 msgid "New password:"
 msgstr "New password:"
 
-msgctxt "OPERATION_OFF"
+msgctxt "OFF"
 msgid "Off"
 msgstr "Off"
 
-msgctxt "OPERATION_OK"
+msgctxt "OK"
 msgid "Ok"
 msgstr "Ok"
 
-msgctxt "OPERATION_PASSWORD_OLD"
+msgctxt "PASSWORD_OLD"
 msgid "Old password:"
 msgstr "Old password:"
 
-msgctxt "OPERATION_ON"
+msgctxt "ON"
 msgid "On"
 msgstr "On"
 
-msgctxt "OPERATION_PASSWORD"
+msgctxt "PASSWORD"
 msgid "Password"
 msgstr "パスワード"
 
-msgctxt "OPERATION_PERFORM"
+msgctxt "PERFORM"
 msgid "Perform"
 msgstr "Perform"
 
-msgctxt "OPERATION_RECONFIGURE"
+msgctxt "RECONFIGURE"
 msgid "Reconfigure"
 msgstr "Reconfigure"
 
-msgctxt "OPERATION_REMOVE_USER_GROUP"
+msgctxt "REMOVE_USER_GROUP"
 msgid "Remove user group"
 msgstr "Remove user group"
 
-msgctxt "OPERATION_PASSWORD_RESET"
+msgctxt "PASSWORD_RESET"
 msgid "Reset password"
 msgstr "Reset password"
 
-msgctxt "OPERATION_RESTORE"
+msgctxt "RESTORE"
 msgid "Restore"
 msgstr "Restore"
 
-msgctxt "OPERATION_SHUTDOWN"
+msgctxt "SHUTDOWN"
 msgid "Shutdown"
 msgstr "Shutdown"
 
-msgctxt "OPERATION_SUCCESS"
+msgctxt "SUCCESS"
 msgid "Success"
 msgstr "Success"
 
-msgctxt "OPERATION_ACCOUNT_NAME_INVALID"
+msgctxt "ACCOUNT_NAME_INVALID"
 msgid "The account name entered is invalid."
 msgstr "The account name entered is invalid."
 
-msgctxt "OPERATION_ACCOUNT_NAME_INVALID_CHARS"
+msgctxt "ACCOUNT_NAME_INVALID_CHARS"
 msgid "The account name you entered contained invalid characters."
 msgstr "The account name you entered contained invalid characters."
 
-msgctxt "OPERATION_PASSWORD_OLD_INVALID_CHARS"
+msgctxt "PASSWORD_OLD_INVALID_CHARS"
 msgid "The old password you entered contained invalid characters."
 msgstr "The old password you entered contained invalid characters."
 
-msgctxt "OPERATION_PASSWORD_INVALID_CHARS"
+msgctxt "PASSWORD_INVALID_CHARS"
 msgid "The password you entered contained invalid characters."
 msgstr "The password you entered contained invalid characters."
 
-msgctxt "OPERATION_PASSWORD_VERIFY_ERROR"
+msgctxt "PASSWORD_VERIFY_ERROR"
 msgid "The passwords you entered did not match."
 msgstr "The passwords you entered did not match."
 
-msgctxt "OPERATION_ACCOUNT_USER_NONE"
+msgctxt "ACCOUNT_USER_NONE"
 msgid "There are no user accounts in the system."
 msgstr "There are no user accounts in the system."
 
-msgctxt "OPERATION_ACCOUNT_GROUP_NONE"
+msgctxt "ACCOUNT_GROUP_NONE"
 msgid "There are no user groups in the system."
 msgstr "There are no user groups in the system."
 
-msgctxt "OPERATION_ERROR_INVALID_CHARS"
+msgctxt "ERROR_INVALID_CHARS"
 msgid "Unexpected characters in description."
 msgstr "Unexpected characters in description."
 
-msgctxt "OPERATION_USER_NAME"
+msgctxt "USER_NAME"
 msgid "User Name"
 msgstr "User Name"
 
-msgctxt "OPERATION_YOUR_ACCOUNT"
+msgctxt "YOUR_ACCOUNT"
 msgid "Your account:"
 msgstr "Your account:"
 
-msgctxt "OPERATION_YOUR_ACCOUNT_INVALID"
+msgctxt "YOUR_ACCOUNT_INVALID"
 msgid "The account name entered is invalid."
 msgstr "The account name entered is invalid."
 
-msgctxt "OPERATION_PASSWORD_CHANGE_SUCCESS"
+msgctxt "PASSWORD_CHANGE_SUCCESS"
 msgid "Your password has been successfully changed."
 msgstr "Your password has been successfully changed."
 
-msgctxt "OPERATION_FM_NONBLANK"
+msgctxt "FM_NONBLANK"
 msgid "This field must not be left blank"
 msgstr "This field must not be left blank"
 
-msgctxt "OPERATION_FM_INTEGER"
+msgctxt "FM_INTEGER"
 msgid "This field must contain a positive integer"
 msgstr "This field must contain a positive integer"
 
-msgctxt "OPERATION_FM_NUMBER"
+msgctxt "FM_NUMBER"
 msgid "This field must contain a number"
 msgstr "This field must contain a number"
 
-msgctxt "OPERATION_FM_WORD"
+msgctxt "FM_WORD"
 msgid "This field must look like a single word."
 msgstr "This field must look like a single word."
 
-msgctxt "OPERATION_FM_DATE"
+msgctxt "FM_DATE"
 msgid "The data entered could not be parsed as a date"
 msgstr "The data entered could not be parsed as a date"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_NUMBER1"
+msgctxt "FM_CREDIT_CARD_NUMBER1"
 msgid "You must enter a credit card number"
 msgstr "You must enter a credit card number"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_NUMBER2"
+msgctxt "FM_CREDIT_CARD_NUMBER2"
 msgid ""
 "Credit card numbers shouldn\\'t have anything but numbers, spaces or dashes"
 msgstr ""
 "Credit card numbers shouldn\\'t have anything but numbers, spaces or dashes"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_NUMBER3"
+msgctxt "FM_CREDIT_CARD_NUMBER3"
 msgid "Must be at least 14 characters in length"
 msgstr "Must be at least 14 characters in length"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_NUMBER4"
+msgctxt "FM_CREDIT_CARD_NUMBER4"
 msgid "Doesn\\'t appear to be a valid credit card number"
 msgstr "Doesn\\'t appear to be a valid credit card number"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_EXPIRY1"
+msgctxt "FM_CREDIT_CARD_EXPIRY1"
 msgid "No expiry date entered."
 msgstr "No expiry date entered."
 
-msgctxt "OPERATION_FM_CREDIT_CARD_EXPIRY2"
+msgctxt "FM_CREDIT_CARD_EXPIRY2"
 msgid "Expiry date must be in the format MM/YY or MM/YYYY"
 msgstr "Expiry date must be in the format MM/YY or MM/YYYY"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_EXPIRY3"
+msgctxt "FM_CREDIT_CARD_EXPIRY3"
 msgid "This expiry date appears to have already passed"
 msgstr "This expiry date appears to have already passed"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_EXPIRY4"
+msgctxt "FM_CREDIT_CARD_EXPIRY4"
 msgid "This expiry date appears to be too far in the future"
 msgstr "This expiry date appears to be too far in the future"
 
-msgctxt "OPERATION_FM_ISO_COUNTRY_CODE1"
+msgctxt "FM_ISO_COUNTRY_CODE1"
 msgid "You must provide a country code"
 msgstr "You must provide a country code"
 
-msgctxt "OPERATION_FM_ISO_COUNTRY_CODE2"
+msgctxt "FM_ISO_COUNTRY_CODE2"
 msgid "This field does not contain an ISO country code"
 msgstr "This field does not contain an ISO country code"
 
-msgctxt "OPERATION_FM_US_STATE"
+msgctxt "FM_US_STATE"
 msgid "This doesn\\'t appear to be a valid 2-letter US state abbreviation"
 msgstr "This doesn\\'t appear to be a valid 2-letter US state abbreviation"
 
-msgctxt "OPERATION_FM_US_ZIPCODE"
+msgctxt "FM_US_ZIPCODE"
 msgid "US zip codes must contain 5 or 9 numbers"
 msgstr "US zip codes must contain 5 or 9 numbers"
 
-msgctxt "OPERATION_FM_MINLENGTH1"
+msgctxt "FM_MINLENGTH1"
 msgid "Minimum length has been specified meaninglessly as [_1]"
 msgstr "Minimum length has been specified meaninglessly as {$minlength}"
 
-msgctxt "OPERATION_FM_MINLENGTH2"
+msgctxt "FM_MINLENGTH2"
 msgid "This field must be at least [_1] characters"
 msgstr "This field must be at least {$minlength} characters"
 
-msgctxt "OPERATION_FM_MAXLENGTH1"
+msgctxt "FM_MAXLENGTH1"
 msgid "Maximum length has been specified meaninglessly as [_1]"
 msgstr "Maximum length has been specified meaninglessly as {$maxlength}"
 
-msgctxt "OPERATION_FM_MAXLENGTH2"
+msgctxt "FM_MAXLENGTH2"
 msgid "This field must be no more than [_1] characters"
 msgstr "This field must be no more than {$maxlength} characters"
 
-msgctxt "OPERATION_FM_EXACTLENGTH1"
+msgctxt "FM_EXACTLENGTH1"
 msgid "You must specify the length for the field."
 msgstr "You must specify the length for the field."
 
-msgctxt "OPERATION_FM_EXACTLENGTH2"
+msgctxt "FM_EXACTLENGTH2"
 msgid "You must specify the exactlength of the field with an integer"
 msgstr "You must specify the exactlength of the field with an integer"
 
-msgctxt "OPERATION_FM_EXACTLENGTH3"
+msgctxt "FM_EXACTLENGTH3"
 msgid "This field must be exactly [_1] characters"
 msgstr "This field must be exactly {$exactlength} characters"
 
-msgctxt "OPERATION_FM_LENGTHRANGE1"
+msgctxt "FM_LENGTHRANGE1"
 msgid "You must specify the maximum and minimum length for the field."
 msgstr "You must specify the maximum and minimum length for the field."
 
-msgctxt "OPERATION_FM_LENGTHRANGE2"
+msgctxt "FM_LENGTHRANGE2"
 msgid ""
 "You must specify the maximum and minimum lengths of the field with an "
 "integer"
@@ -473,50 +469,50 @@ msgstr ""
 "You must specify the maximum and minimum lengths of the field with an "
 "integer"
 
-msgctxt "OPERATION_FM_LENGTHRANGE3"
+msgctxt "FM_LENGTHRANGE3"
 msgid "This field must be between [_1] and [_2] characters"
 msgstr "This field must be between {$minlength} and {$maxlength} characters"
 
-msgctxt "OPERATION_FM_URL"
+msgctxt "FM_URL"
 msgid "This field must contain a URL starting with http:// or ftp://"
 msgstr "This field must contain a URL starting with http:// or ftp://"
 
-msgctxt "OPERATION_FM_EMAIL_SIMPLE1"
+msgctxt "FM_EMAIL_SIMPLE1"
 msgid "You must enter an email address."
 msgstr "You must enter an email address."
 
-msgctxt "OPERATION_FM_EMAIL_SIMPLE2"
+msgctxt "FM_EMAIL_SIMPLE2"
 msgid "This field doesn\\'t look like an RFC822-compliant email address"
 msgstr "This field doesn\\'t look like an RFC822-compliant email address"
 
-msgctxt "OPERATION_FM_DOMAIN_NAME"
+msgctxt "FM_DOMAIN_NAME"
 msgid "This field doesn\\'t look like a valid Internet domain name or hostname."
 msgstr ""
 "This field doesn\\'t look like a valid Internet domain name or hostname."
 
-msgctxt "OPERATION_FM_IP_NUMBER1"
+msgctxt "FM_IP_NUMBER1"
 msgid "This field must contain a valid IP number and can not be left blank."
 msgstr "This field must contain a valid IP number and can not be left blank."
 
-msgctxt "OPERATION_FM_IP_NUMBER2"
+msgctxt "FM_IP_NUMBER2"
 msgid "Invalid IP address format (expected X.X.X.X)"
 msgstr "Invalid IP address format (expected X.X.X.X)"
 
-msgctxt "OPERATION_FM_IP_NUMBER3"
+msgctxt "FM_IP_NUMBER3"
 msgid "[_1] is more than 255"
 msgstr "{$octet} is more than 255"
 
-msgctxt "OPERATION_FM_USERNAME"
+msgctxt "FM_USERNAME"
 msgid ""
 "This field must look like a valid username (3 to 8 letters and numbers)"
 msgstr ""
 "This field must look like a valid username (3 to 8 letters and numbers)"
 
-msgctxt "OPERATION_FM_PASSWORD1"
+msgctxt "FM_PASSWORD1"
 msgid "You must provide a password."
 msgstr "You must provide a password."
 
-msgctxt "OPERATION_FM_PASSWORD2"
+msgctxt "FM_PASSWORD2"
 msgid ""
 "The password you provided was not a good password.A good password must "
 "contain all of the following: upper case letter, lower case letter, number, "
@@ -526,18 +522,18 @@ msgstr ""
 "contain all of the following: upper case letter, lower case letter, number, "
 "non-alphanumeric character, be at least 7 characters long."
 
-msgctxt "OPERATION_FM_MAC_ADDRESS1"
+msgctxt "FM_MAC_ADDRESS1"
 msgid "You must provide a MAC address."
 msgstr "You must provide a MAC address."
 
-msgctxt "OPERATION_FM_MAC_ADDRESS2"
+msgctxt "FM_MAC_ADDRESS2"
 msgid "The MAC address you provided was not valid."
 msgstr "The MAC address you provided was not valid."
 
-msgctxt "OPERATION_FM_ERR_UNEXPECTED_DESC"
+msgctxt "FM_ERR_UNEXPECTED_DESC"
 msgid "Error: unexpected or missing characters in description"
 msgstr "Error: unexpected or missing characters in description"
 
-msgctxt "OPERATION_CSRF_VALIDATION_FAILURE"
-msgid "Placeholder for missing original text"
+msgctxt "CSRF_VALIDATION_FAILURE"
+msgid "Error: CSRF token is invalid or outdated."
 msgstr "Error: CSRF token is invalid or outdated."
diff --git a/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/General/pofiles/general_nb.po b/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/General/pofiles/general_nb.po
index 9e83c6b..d17c19f 100644
--- a/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/General/pofiles/general_nb.po
+++ b/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/General/pofiles/general_nb.po
@@ -5,99 +5,95 @@ msgstr ""
 "Language: None\n"
 "Content-Type: text/plain; charset=utf-8\n"
 
-msgctxt "OPERATION_Collaboration"
+msgctxt "Collaboration"
 msgid "Collaboration"
 msgstr "Samarbeid"
 
-msgctxt "OPERATION_Administration"
+msgctxt "Administration"
 msgid "Administration"
 msgstr "Administrasjon"
 
-msgctxt "OPERATION_Security"
+msgctxt "Security"
 msgid "Security"
 msgstr "Sikkerhet"
 
-msgctxt "OPERATION_Configuration"
+msgctxt "Configuration"
 msgid "Configuration"
 msgstr "Oppsett"
 
-msgctxt "OPERATION_Miscellaneous"
+msgctxt "Miscellaneous"
 msgid "Miscellaneous"
 msgstr "Diverse"
 
-msgctxt "OPERATION_Your Settings"
-msgid "Your Settings"
-msgstr "Dine innstillinger"
-
-msgctxt "OPERATION_SAVE"
+msgctxt "SAVE"
 msgid "Save"
 msgstr "Lagre"
 
-msgctxt "OPERATION_CANCEL"
+msgctxt "CANCEL"
 msgid "Cancel"
 msgstr "Avbryt"
 
-msgctxt "OPERATION_ENABLED"
+msgctxt "ENABLED"
 msgid "Enabled"
 msgstr "aktivert"
 
-msgctxt "OPERATION_DISABLED"
+msgctxt "DISABLED"
 msgid "Disabled"
 msgstr "Deaktivert"
 
-msgctxt "OPERATION_NO"
+msgctxt "NO"
 msgid "No"
 msgstr "Nei"
 
-msgctxt "OPERATION_YES"
+msgctxt "YES"
 msgid "Yes"
 msgstr "Ja"
 
-msgctxt "OPERATION_ADD"
+msgctxt "ADD"
 msgid "Add"
 msgstr "Legg til"
 
-msgctxt "OPERATION_CREATE"
+msgctxt "CREATE"
 msgid "Create"
 msgstr "Opprett"
 
-msgctxt "OPERATION_MODIFY"
+msgctxt "MODIFY"
 msgid "Modify"
 msgstr "Endre"
 
-msgctxt "OPERATION_REMOVE"
+msgctxt "REMOVE"
 msgid "Remove"
 msgstr "Fjern"
 
-msgctxt "OPERATION_COMMENT"
+msgctxt "COMMENT"
 msgid "Comment"
 msgstr "Kommentar"
 
-msgctxt "OPERATION_NEXT"
+msgctxt "NEXT"
 msgid "Next"
 msgstr "Neste"
 
-msgctxt "OPERATION_SELF"
+msgctxt "SELF"
 msgid "Self"
 msgstr "Selv"
 
-msgctxt "OPERATION_REMOTE"
+msgctxt "REMOTE"
 msgid "Remote"
 msgstr "Fjern"
 
-msgctxt "OPERATION_LOCAL"
+msgctxt "LOCAL"
 msgid "Local"
 msgstr "Lokal"
 
-msgctxt "OPERATION_ACTION"
+msgctxt "ACTION"
 msgid "Action"
 msgstr "Handling"
 
-msgctxt "OPERATION_NETWORK"
+msgctxt "NETWORK"
 msgid "Network"
 msgstr "Nettverk"
 
-msgctxt "OPERATION_ROUTER"
+msgctxt "ROUTER"
 msgid "Router"
 msgstr "Ruter"
 
@@ -105,23 +101,23 @@ msgctxt "OPERATION_STATUS_REPORT"
 msgid "Operation status report"
 msgstr "Statusrapport for operasjonen"
 
-msgctxt "OPERATION_ACCOUNT"
+msgctxt "ACCOUNT"
 msgid "Account"
 msgstr "Konto"
 
-msgctxt "OPERATION_GROUP"
+msgctxt "GROUP"
 msgid "Group"
 msgstr "Gruppe"
 
-msgctxt "OPERATION_DESC_SECTIONBAR"
+msgctxt "DESC_SECTIONBAR"
 msgid "<hr class=\"sectionbar\"/>"
-msgstr " "
+msgstr ""
 
-msgctxt "OPERATION_NO_PIPES_ALLOWED"
+msgctxt "NO_PIPES_ALLOWED"
 msgid "Pipe symbols (|) are not permitted in this field"
 msgstr "Pipe symboler (|) er ikke tillatt i dette feltet"
 
-msgctxt "OPERATION_ERROR_BELOW"
+msgctxt "ERROR_BELOW"
 msgid ""
 "ERROR: There was an error in the validation of this page. Please scroll down"
 " and find the specific problem."
@@ -129,27 +125,27 @@ msgstr ""
 "Feil: Det oppsto en feil ved validering av siden. rull ned og rett opp den "
 "spesifikke problemet."
 
-msgctxt "OPERATION_ACCESS"
+msgctxt "ACCESS"
 msgid "Access"
 msgstr "Tilgang"
 
-msgctxt "OPERATION_ACCOUNT_LOCKED"
+msgctxt "ACCOUNT_LOCKED"
 msgid "Account is locked"
 msgstr "Kontoen er låst"
 
-msgctxt "OPERATION_GROUP_ADD"
+msgctxt "GROUP_ADD"
 msgid "Add group"
 msgstr "Legg til gruppe"
 
-msgctxt "OPERATION_NETWORKS_ALLOW_LOCAL"
+msgctxt "NETWORKS_ALLOW_LOCAL"
 msgid "Allow access only from local networks"
 msgstr "Tillat tilgang bare fra det lokale nettverket"
 
-msgctxt "OPERATION_NETWORKS_ALLOW_PUBLIC"
+msgctxt "NETWORKS_ALLOW_PUBLIC"
 msgid "Allow public access (entire Internet)"
 msgstr "Tillat offentlig tilgang (hele internett)"
 
-msgctxt "OPERATION_ERROR_PASSWORD_CHANGE"
+msgctxt "ERROR_PASSWORD_CHANGE"
 msgid ""
 "An error occurred while attempting to change your password. Please make sure"
 " that the old password entered is correct."
@@ -157,365 +153,365 @@ msgstr ""
 "En feil oppsto under endring av passordet ditt. sjekk at det gamle passordet"
 " er korrekt."
 
-msgctxt "OPERATION_BACK"
+msgctxt "BACK"
 msgid "Back"
 msgstr "Tilbake"
 
-msgctxt "OPERATION_BACKUP"
+msgctxt "BACKUP"
 msgid "Backup"
 msgstr "Sikkerhetskopi"
 
-msgctxt "OPERATION_DESCRIPTION_BRIEF"
+msgctxt "DESCRIPTION_BRIEF"
 msgid "Brief description"
 msgstr "Kort beskrivelse"
 
-msgctxt "OPERATION_PASSWORD_CHANGE"
+msgctxt "PASSWORD_CHANGE"
 msgid "Change Password"
 msgstr "Endre passord"
 
-msgctxt "OPERATION_RESET_PASSWORD_TITLE"
+msgctxt "RESET_PASSWORD_TITLE"
 msgid "Reset user password"
 msgstr "Nullstill bruker passord"
 
-msgctxt "OPERATION_ACCOUNT_PASSWORD_CHANGE"
+msgctxt "ACCOUNT_PASSWORD_CHANGE"
 msgid "Change account password"
 msgstr "Endre konto passord"
 
-msgctxt "OPERATION_CONTENT"
+msgctxt "CONTENT"
 msgid "Content"
 msgstr "Innehold"
 
-msgctxt "OPERATION_CREATE_GROUP"
+msgctxt "CREATE_GROUP"
 msgid "Create user group"
 msgstr "Opprett bruker gruppe"
 
-msgctxt "OPERATION_USER_LIST_CURRENT"
+msgctxt "USER_LIST_CURRENT"
 msgid "Current list of users"
 msgstr "Gjeldende liste over brukere"
 
-msgctxt "OPERATION_DESCRIPTION"
+msgctxt "DESCRIPTION"
 msgid "Description"
 msgstr "Beskrivelse"
 
-msgctxt "OPERATION_DESTINATION"
+msgctxt "DESTINATION"
 msgid "Destination"
 msgstr "Mål"
 
-msgctxt "OPERATION_DOMAIN_NAME"
+msgctxt "DOMAIN_NAME"
 msgid "Domain name"
 msgstr "Domenenavn"
 
-msgctxt "OPERATION_DOMAIN"
+msgctxt "DOMAIN"
 msgid "Domain"
 msgstr "Domene"
 
-msgctxt "OPERATION_DOMAINS"
+msgctxt "DOMAINS"
 msgid "Domains"
 msgstr "Domener"
 
-msgctxt "OPERATION_DOWNLOAD"
+msgctxt "DOWNLOAD"
 msgid "Download"
 msgstr "Last ned"
 
-msgctxt "OPERATION_ERROR_UPDATING_CONFIGURATION"
+msgctxt "ERROR_UPDATING_CONFIGURATION"
 msgid "Error occurred while updating system configuration."
 msgstr "En feil oppsto når systeminnstillingene ble oppdatert."
 
-msgctxt "OPERATION_GROUP_MEMBERS"
+msgctxt "GROUP_MEMBERS"
 msgid "Group Members"
 msgstr "Gruppe medlemmer"
 
-msgctxt "OPERATION_GROUP_NAME"
+msgctxt "GROUP_NAME"
 msgid "Group Name"
 msgstr "Gruppenavn"
 
-msgctxt "OPERATION_GROUPS"
+msgctxt "GROUPS"
 msgid "Groups"
 msgstr "Grupper"
 
-msgctxt "OPERATION_IP_ADDRESS"
+msgctxt "IP_ADDRESS"
 msgid "IP Address"
 msgstr "IP adresse"
 
-msgctxt "OPERATION_IP_ADDRESS_OR_FQDN"
+msgctxt "IP_ADDRESS_OR_FQDN"
 msgid "IP Address or FQDN"
 msgstr "IP adresse"
 
-msgctxt "OPERATION_USER_INVALID"
+msgctxt "USER_INVALID"
 msgid "Invalid user"
 msgstr "Ugyldig bruker"
 
-msgctxt "OPERATION_LOCATION"
+msgctxt "LOCATION"
 msgid "Location"
 msgstr "Lokasjon"
 
-msgctxt "OPERATION_MB"
+msgctxt "MB"
 msgid "Mb"
 msgstr "Mb"
 
-msgctxt "OPERATION_MODIFY_USER_GROUP"
+msgctxt "MODIFY_USER_GROUP"
 msgid "Modify user group"
 msgstr "Endre brukergruppe"
 
-msgctxt "OPERATION_NAME"
+msgctxt "NAME"
 msgid "Name"
 msgstr "Navn"
 
-msgctxt "OPERATION_PASSWORD_VERIFY_NEW"
+msgctxt "PASSWORD_VERIFY_NEW"
 msgid "New password (verify):"
 msgstr "Nytt passord (bekreft):"
 
-msgctxt "OPERATION_PASSWORD_NEW"
+msgctxt "PASSWORD_NEW"
 msgid "New password:"
 msgstr "Nytt passord:"
 
-msgctxt "OPERATION_OFF"
+msgctxt "OFF"
 msgid "Off"
 msgstr "Fra"
 
-msgctxt "OPERATION_OK"
+msgctxt "OK"
 msgid "Ok"
 msgstr "Ok"
 
-msgctxt "OPERATION_PASSWORD_OLD"
+msgctxt "PASSWORD_OLD"
 msgid "Old password:"
 msgstr "Gammelt passord:"
 
-msgctxt "OPERATION_ON"
+msgctxt "ON"
 msgid "On"
 msgstr "På"
 
-msgctxt "OPERATION_PASSWORD"
+msgctxt "PASSWORD"
 msgid "Password"
 msgstr "Passord"
 
-msgctxt "OPERATION_PERFORM"
+msgctxt "PERFORM"
 msgid "Perform"
 msgstr "Utfør"
 
-msgctxt "OPERATION_RECONFIGURE"
+msgctxt "RECONFIGURE"
 msgid "Reconfigure"
 msgstr "Omkonfigurer"
 
-msgctxt "OPERATION_REMOVE_USER_GROUP"
+msgctxt "REMOVE_USER_GROUP"
 msgid "Remove user group"
 msgstr "Fjerne brukergruppe"
 
-msgctxt "OPERATION_PASSWORD_RESET"
+msgctxt "PASSWORD_RESET"
 msgid "Reset password"
 msgstr "Nulstill passord"
 
-msgctxt "OPERATION_RESTORE"
+msgctxt "RESTORE"
 msgid "Restore"
 msgstr "Gjenopprett"
 
-msgctxt "OPERATION_SHUTDOWN"
+msgctxt "SHUTDOWN"
 msgid "Shutdown"
 msgstr "Slå av"
 
-msgctxt "OPERATION_SUCCESS"
+msgctxt "SUCCESS"
 msgid "Success"
 msgstr "Suksess"
 
-msgctxt "OPERATION_ACCOUNT_NAME_INVALID"
+msgctxt "ACCOUNT_NAME_INVALID"
 msgid "The account name entered is invalid."
 msgstr "Kontonavnet er ugyldig."
 
-msgctxt "OPERATION_ACCOUNT_NAME_INVALID_CHARS"
+msgctxt "ACCOUNT_NAME_INVALID_CHARS"
 msgid "The account name you entered contained invalid characters."
 msgstr "Kontonavnet inneholder ugyldige tegn."
 
-msgctxt "OPERATION_PASSWORD_OLD_INVALID_CHARS"
+msgctxt "PASSWORD_OLD_INVALID_CHARS"
 msgid "The old password you entered contained invalid characters."
 msgstr "Det gamle passordet inneholder ugyldige tegn."
 
-msgctxt "OPERATION_PASSWORD_INVALID_CHARS"
+msgctxt "PASSWORD_INVALID_CHARS"
 msgid "The password you entered contained invalid characters."
 msgstr "Passordet du oppga inneholder ugyldige tegn."
 
-msgctxt "OPERATION_PASSWORD_VERIFY_ERROR"
+msgctxt "PASSWORD_VERIFY_ERROR"
 msgid "The passwords you entered did not match."
 msgstr "Passordene du oppga er ikke like."
 
-msgctxt "OPERATION_ACCOUNT_USER_NONE"
+msgctxt "ACCOUNT_USER_NONE"
 msgid "There are no user accounts in the system."
 msgstr "Det er ingen brukere på systemet."
 
-msgctxt "OPERATION_ACCOUNT_GROUP_NONE"
+msgctxt "ACCOUNT_GROUP_NONE"
 msgid "There are no user groups in the system."
 msgstr "Det er ingen grupper på systemet."
 
-msgctxt "OPERATION_ERROR_INVALID_CHARS"
+msgctxt "ERROR_INVALID_CHARS"
 msgid "Unexpected characters in description."
 msgstr "Uventede tegn i beskrivelsen."
 
-msgctxt "OPERATION_USER_NAME"
+msgctxt "USER_NAME"
 msgid "User Name"
 msgstr "Ditt navn"
 
-msgctxt "OPERATION_YOUR_ACCOUNT"
+msgctxt "YOUR_ACCOUNT"
 msgid "Your account:"
 msgstr "Din konto:"
 
-msgctxt "OPERATION_YOUR_ACCOUNT_INVALID"
+msgctxt "YOUR_ACCOUNT_INVALID"
 msgid "The account name entered is invalid."
 msgstr "Kontonavnet er ugyldig."
 
-msgctxt "OPERATION_PASSWORD_CHANGE_SUCCESS"
+msgctxt "PASSWORD_CHANGE_SUCCESS"
 msgid "Your password has been successfully changed."
 msgstr "Passordet er endret."
 
-msgctxt "OPERATION_FM_NONBLANK"
+msgctxt "FM_NONBLANK"
 msgid "This field must not be left blank"
 msgstr "Feltet kan ikke være tomt"
 
-msgctxt "OPERATION_FM_INTEGER"
+msgctxt "FM_INTEGER"
 msgid "This field must contain a positive integer"
 msgstr "Feltet må innehode et positivt tall"
 
-msgctxt "OPERATION_FM_NUMBER"
+msgctxt "FM_NUMBER"
 msgid "This field must contain a number"
 msgstr "Feltet må inneholde et nummer"
 
-msgctxt "OPERATION_FM_WORD"
+msgctxt "FM_WORD"
 msgid "This field must look like a single word."
 msgstr "Feltet må se ut som et enkelt ord."
 
-msgctxt "OPERATION_FM_DATE"
+msgctxt "FM_DATE"
 msgid "The data entered could not be parsed as a date"
 msgstr "Dataene som ble oppgitt kan ikke brukes som en dato"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_NUMBER1"
+msgctxt "FM_CREDIT_CARD_NUMBER1"
 msgid "You must enter a credit card number"
 msgstr "Du må oppgi et kredittkortnummer"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_NUMBER2"
+msgctxt "FM_CREDIT_CARD_NUMBER2"
 msgid ""
 "Credit card numbers shouldn\\'t have anything but numbers, spaces or dashes"
 msgstr "Kredittkortnummer skal kun inneholde tall, mellomrum, og punktum"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_NUMBER3"
+msgctxt "FM_CREDIT_CARD_NUMBER3"
 msgid "Must be at least 14 characters in length"
 msgstr "Må være minst 14 tegne langt"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_NUMBER4"
+msgctxt "FM_CREDIT_CARD_NUMBER4"
 msgid "Doesn\\'t appear to be a valid credit card number"
 msgstr "Ser ikke ut til å være et gyldig kreditkortnummer"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_EXPIRY1"
+msgctxt "FM_CREDIT_CARD_EXPIRY1"
 msgid "No expiry date entered."
 msgstr "Ingen utløpsdato er oppgitt."
 
-msgctxt "OPERATION_FM_CREDIT_CARD_EXPIRY2"
+msgctxt "FM_CREDIT_CARD_EXPIRY2"
 msgid "Expiry date must be in the format MM/YY or MM/YYYY"
 msgstr "Utløpsdato må være i formatet MM/ÅÅ eller MM/ÅÅÅÅ"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_EXPIRY3"
+msgctxt "FM_CREDIT_CARD_EXPIRY3"
 msgid "This expiry date appears to have already passed"
 msgstr "Utløpsdatoen er allerede passert"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_EXPIRY4"
+msgctxt "FM_CREDIT_CARD_EXPIRY4"
 msgid "This expiry date appears to be too far in the future"
 msgstr "Utløpsdatoen ser ut til å være for langt frem i tid"
 
-msgctxt "OPERATION_FM_ISO_COUNTRY_CODE1"
+msgctxt "FM_ISO_COUNTRY_CODE1"
 msgid "You must provide a country code"
 msgstr "Du må oppgi landskode"
 
-msgctxt "OPERATION_FM_ISO_COUNTRY_CODE2"
+msgctxt "FM_ISO_COUNTRY_CODE2"
 msgid "This field does not contain an ISO country code"
 msgstr "Feltet inneholder ikke en ISO landskode"
 
-msgctxt "OPERATION_FM_US_STATE"
+msgctxt "FM_US_STATE"
 msgid "This doesn\\'t appear to be a valid 2-letter US state abbreviation"
 msgstr "Dette ser ikke ut til å være en gyldig 2tegns US stat forkortelse"
 
-msgctxt "OPERATION_FM_US_ZIPCODE"
+msgctxt "FM_US_ZIPCODE"
 msgid "US zip codes must contain 5 or 9 numbers"
 msgstr "US zip koder må inneholde 5 eller 9 tall"
 
-msgctxt "OPERATION_FM_MINLENGTH1"
+msgctxt "FM_MINLENGTH1"
 msgid "Minimum length has been specified meaninglessly as [_1]"
 msgstr "Minimumslengden har blitt spesifisert meningsløst som {$minlength}"
 
-msgctxt "OPERATION_FM_MINLENGTH2"
+msgctxt "FM_MINLENGTH2"
 msgid "This field must be at least [_1] characters"
 msgstr "Feltet må minst inneholde {$minlength} tegn"
 
-msgctxt "OPERATION_FM_MAXLENGTH1"
+msgctxt "FM_MAXLENGTH1"
 msgid "Maximum length has been specified meaninglessly as [_1]"
 msgstr "Maksimumslengden har blitt spesifisert meningsløst som {$maxlength}"
 
-msgctxt "OPERATION_FM_MAXLENGTH2"
+msgctxt "FM_MAXLENGTH2"
 msgid "This field must be no more than [_1] characters"
 msgstr "Feltet må ikke inneholde flere en {$maxlength} tegn"
 
-msgctxt "OPERATION_FM_EXACTLENGTH1"
+msgctxt "FM_EXACTLENGTH1"
 msgid "You must specify the length for the field."
 msgstr "Du må spesifisere lengden på feltet."
 
-msgctxt "OPERATION_FM_EXACTLENGTH2"
+msgctxt "FM_EXACTLENGTH2"
 msgid "You must specify the exactlength of the field with an integer"
 msgstr "Du må spesifisere den eksakte lengden med et tall"
 
-msgctxt "OPERATION_FM_EXACTLENGTH3"
+msgctxt "FM_EXACTLENGTH3"
 msgid "This field must be exactly [_1] characters"
 msgstr "Feltet må være eksakt {$exactlength} tegn langt"
 
-msgctxt "OPERATION_FM_LENGTHRANGE1"
+msgctxt "FM_LENGTHRANGE1"
 msgid "You must specify the maximum and minimum length for the field."
 msgstr "Du må spesifisere maksimum og minimum lengden på feltet."
 
-msgctxt "OPERATION_FM_LENGTHRANGE2"
+msgctxt "FM_LENGTHRANGE2"
 msgid ""
 "You must specify the maximum and minimum lengths of the field with an "
 "integer"
 msgstr "Du må spesifisere maksimum og minimum lengden på feltet med et tall"
 
-msgctxt "OPERATION_FM_LENGTHRANGE3"
+msgctxt "FM_LENGTHRANGE3"
 msgid "This field must be between [_1] and [_2] characters"
 msgstr "Feltet må være mellom {$minlength} og {$maxlength} tegn"
 
-msgctxt "OPERATION_FM_URL"
+msgctxt "FM_URL"
 msgid "This field must contain a URL starting with http:// or ftp://"
 msgstr "Feltet må inneholde en URL som starter med http:// eller ftp://"
 
-msgctxt "OPERATION_FM_EMAIL_SIMPLE1"
+msgctxt "FM_EMAIL_SIMPLE1"
 msgid "You must enter an email address."
 msgstr "Du må oppgi en e-post adresse."
 
-msgctxt "OPERATION_FM_EMAIL_SIMPLE2"
+msgctxt "FM_EMAIL_SIMPLE2"
 msgid "This field doesn\\'t look like an RFC822-compliant email address"
 msgstr "Feltet ser ikke ut til å være en RFC822-kompatibel e-postadresse"
 
-msgctxt "OPERATION_FM_DOMAIN_NAME"
+msgctxt "FM_DOMAIN_NAME"
 msgid "This field doesn\\'t look like a valid Internet domain name or hostname."
 msgstr ""
 "Feltet ser ikke ut til å være et gyldig internett domenenavn eller "
 "maskinnavn."
 
-msgctxt "OPERATION_FM_IP_NUMBER1"
+msgctxt "FM_IP_NUMBER1"
 msgid "This field must contain a valid IP number and can not be left blank."
 msgstr "Feltet må inneholde en gyldig IP adresse og kan ikke være tom."
 
-msgctxt "OPERATION_FM_IP_NUMBER2"
+msgctxt "FM_IP_NUMBER2"
 msgid "Invalid IP address format (expected X.X.X.X)"
 msgstr "Ugyldig IP-adresse til DHCP-start"
 
-msgctxt "OPERATION_FM_IP_NUMBER3"
+msgctxt "FM_IP_NUMBER3"
 msgid "[_1] is more than 255"
 msgstr "{$octet} er mer en 255"
 
-msgctxt "OPERATION_FM_USERNAME"
+msgctxt "FM_USERNAME"
 msgid ""
 "This field must look like a valid username (3 to 8 letters and numbers)"
 msgstr "Feltet må se ut som et gyldig brukernavn. (3 til 8 tegn)"
 
-msgctxt "OPERATION_FM_PASSWORD1"
+msgctxt "FM_PASSWORD1"
 msgid "You must provide a password."
 msgstr "Du må oppgi et passord."
 
-msgctxt "OPERATION_FM_PASSWORD2"
+msgctxt "FM_PASSWORD2"
 msgid ""
 "The password you provided was not a good password.A good password must "
 "contain all of the following: upper case letter, lower case letter, number, "
@@ -525,18 +521,18 @@ msgstr ""
 " følgende: Stor bokstav, liten bokstav, tall, ikke-alfanumerisk tegn, og "
 "være minst 7 tegn langt."
 
-msgctxt "OPERATION_FM_MAC_ADDRESS1"
+msgctxt "FM_MAC_ADDRESS1"
 msgid "You must provide a MAC address."
 msgstr "Du må oppgi MAC adresse."
 
-msgctxt "OPERATION_FM_MAC_ADDRESS2"
+msgctxt "FM_MAC_ADDRESS2"
 msgid "The MAC address you provided was not valid."
 msgstr "MAC adressen er ikke gyldig."
 
-msgctxt "OPERATION_FM_ERR_UNEXPECTED_DESC"
+msgctxt "FM_ERR_UNEXPECTED_DESC"
 msgid "Error: unexpected or missing characters in description"
 msgstr "Feil: uventet eller manglende tegn i beskrivelsen"
 
-msgctxt "OPERATION_CSRF_VALIDATION_FAILURE"
-msgid "Placeholder for missing original text"
+msgctxt "CSRF_VALIDATION_FAILURE"
+msgid "Error: CSRF token is invalid or outdated."
 msgstr "Error: CSRF token is invalid or outdated."
diff --git a/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/General/pofiles/general_nl.po b/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/General/pofiles/general_nl.po
index cdccdf4..e5a7b1c 100644
--- a/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/General/pofiles/general_nl.po
+++ b/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/General/pofiles/general_nl.po
@@ -5,99 +5,95 @@ msgstr ""
 "Language: None\n"
 "Content-Type: text/plain; charset=utf-8\n"
 
-msgctxt "OPERATION_Collaboration"
+msgctxt "Collaboration"
 msgid "Collaboration"
 msgstr "Samenwerken"
 
-msgctxt "OPERATION_Administration"
+msgctxt "Administration"
 msgid "Administration"
 msgstr "Beheer"
 
-msgctxt "OPERATION_Security"
+msgctxt "Security"
 msgid "Security"
 msgstr "Beveiliging"
 
-msgctxt "OPERATION_Configuration"
+msgctxt "Configuration"
 msgid "Configuration"
 msgstr "Configuratie"
 
-msgctxt "OPERATION_Miscellaneous"
+msgctxt "Miscellaneous"
 msgid "Miscellaneous"
 msgstr "Diversen"
 
-msgctxt "OPERATION_Your Settings"
-msgid "Your Settings"
-msgstr "Uw instellingen"
-
-msgctxt "OPERATION_SAVE"
+msgctxt "SAVE"
 msgid "Save"
 msgstr "Opslaan"
 
-msgctxt "OPERATION_CANCEL"
+msgctxt "CANCEL"
 msgid "Cancel"
 msgstr "Annuleer"
 
-msgctxt "OPERATION_ENABLED"
+msgctxt "ENABLED"
 msgid "Enabled"
 msgstr "Actief"
 
-msgctxt "OPERATION_DISABLED"
+msgctxt "DISABLED"
 msgid "Disabled"
 msgstr "Inactief"
 
-msgctxt "OPERATION_NO"
+msgctxt "NO"
 msgid "No"
 msgstr "Nee"
 
-msgctxt "OPERATION_YES"
+msgctxt "YES"
 msgid "Yes"
 msgstr "Ja"
 
-msgctxt "OPERATION_ADD"
+msgctxt "ADD"
 msgid "Add"
 msgstr "Toevoegen"
 
-msgctxt "OPERATION_CREATE"
+msgctxt "CREATE"
 msgid "Create"
 msgstr "Toevoegen"
 
-msgctxt "OPERATION_MODIFY"
+msgctxt "MODIFY"
 msgid "Modify"
 msgstr "Wijzigen"
 
-msgctxt "OPERATION_REMOVE"
+msgctxt "REMOVE"
 msgid "Remove"
 msgstr "Verwijderen"
 
-msgctxt "OPERATION_COMMENT"
+msgctxt "COMMENT"
 msgid "Comment"
 msgstr "Commentaar"
 
-msgctxt "OPERATION_NEXT"
+msgctxt "NEXT"
 msgid "Next"
 msgstr "Volgende"
 
-msgctxt "OPERATION_SELF"
+msgctxt "SELF"
 msgid "Self"
 msgstr "Zelf"
 
-msgctxt "OPERATION_REMOTE"
+msgctxt "REMOTE"
 msgid "Remote"
 msgstr "Elders"
 
-msgctxt "OPERATION_LOCAL"
+msgctxt "LOCAL"
 msgid "Local"
 msgstr "Lokaal"
 
-msgctxt "OPERATION_ACTION"
+msgctxt "ACTION"
 msgid "Action"
 msgstr "Actie"
 
-msgctxt "OPERATION_NETWORK"
+msgctxt "NETWORK"
 msgid "Network"
 msgstr "Netwerk"
 
-msgctxt "OPERATION_ROUTER"
+msgctxt "ROUTER"
 msgid "Router"
 msgstr "Router"
 
@@ -105,23 +101,23 @@ msgctxt "OPERATION_STATUS_REPORT"
 msgid "Operation status report"
 msgstr "Operationeel status rapport"
 
-msgctxt "OPERATION_ACCOUNT"
+msgctxt "ACCOUNT"
 msgid "Account"
 msgstr "Account"
 
-msgctxt "OPERATION_GROUP"
+msgctxt "GROUP"
 msgid "Group"
 msgstr "Groep"
 
-msgctxt "OPERATION_DESC_SECTIONBAR"
+msgctxt "DESC_SECTIONBAR"
 msgid "<hr class=\"sectionbar\"/>"
-msgstr " <hr class=\"sectionbar\"/> "
+msgstr "<hr class=\"sectionbar\"/>"
 
-msgctxt "OPERATION_NO_PIPES_ALLOWED"
+msgctxt "NO_PIPES_ALLOWED"
 msgid "Pipe symbols (|) are not permitted in this field"
 msgstr "Pijplijn symbolen (|) zijn niet toegestaan in dit veld"
 
-msgctxt "OPERATION_ERROR_BELOW"
+msgctxt "ERROR_BELOW"
 msgid ""
 "ERROR: There was an error in the validation of this page. Please scroll down"
 " and find the specific problem."
@@ -129,27 +125,27 @@ msgstr ""
 "FOUT: Er is een fout opgetreden in de validatie van deze pagina. Blader naar"
 " onderen om het specifieke probleem te vinden."
 
-msgctxt "OPERATION_ACCESS"
+msgctxt "ACCESS"
 msgid "Access"
 msgstr "Toegang"
 
-msgctxt "OPERATION_ACCOUNT_LOCKED"
+msgctxt "ACCOUNT_LOCKED"
 msgid "Account is locked"
 msgstr "De account is vergrendeld"
 
-msgctxt "OPERATION_GROUP_ADD"
+msgctxt "GROUP_ADD"
 msgid "Add group"
 msgstr "Groep toevoegen"
 
-msgctxt "OPERATION_NETWORKS_ALLOW_LOCAL"
+msgctxt "NETWORKS_ALLOW_LOCAL"
 msgid "Allow access only from local networks"
 msgstr "Alleen toegang accepteren vanaf lokale netwerken"
 
-msgctxt "OPERATION_NETWORKS_ALLOW_PUBLIC"
+msgctxt "NETWORKS_ALLOW_PUBLIC"
 msgid "Allow public access (entire Internet)"
 msgstr "Publieke toegang toestaan (volledig internet)"
 
-msgctxt "OPERATION_ERROR_PASSWORD_CHANGE"
+msgctxt "ERROR_PASSWORD_CHANGE"
 msgid ""
 "An error occurred while attempting to change your password. Please make sure"
 " that the old password entered is correct."
@@ -157,369 +153,369 @@ msgstr ""
 "Er is een fout opgetreden tijdens het wijzigen van uw wachtwoord. Zorg er "
 "voor dat uw huidige wachtwoord correct is ingevoerd."
 
-msgctxt "OPERATION_BACK"
+msgctxt "BACK"
 msgid "Back"
 msgstr "Terug"
 
-msgctxt "OPERATION_BACKUP"
+msgctxt "BACKUP"
 msgid "Backup"
 msgstr "Veilig stellen"
 
-msgctxt "OPERATION_DESCRIPTION_BRIEF"
+msgctxt "DESCRIPTION_BRIEF"
 msgid "Brief description"
 msgstr "Korte beschrijving"
 
-msgctxt "OPERATION_PASSWORD_CHANGE"
+msgctxt "PASSWORD_CHANGE"
 msgid "Change Password"
 msgstr "Wachtwoord wijzigen"
 
-msgctxt "OPERATION_RESET_PASSWORD_TITLE"
+msgctxt "RESET_PASSWORD_TITLE"
 msgid "Reset user password"
 msgstr "Gebruikerswachtwoord opnieuw instellen"
 
-msgctxt "OPERATION_ACCOUNT_PASSWORD_CHANGE"
+msgctxt "ACCOUNT_PASSWORD_CHANGE"
 msgid "Change account password"
 msgstr "Account wachtwoord wijzigen"
 
-msgctxt "OPERATION_CONTENT"
+msgctxt "CONTENT"
 msgid "Content"
 msgstr "Inhoud"
 
-msgctxt "OPERATION_CREATE_GROUP"
+msgctxt "CREATE_GROUP"
 msgid "Create user group"
 msgstr "Gebruikersgroep toevoegen"
 
-msgctxt "OPERATION_USER_LIST_CURRENT"
+msgctxt "USER_LIST_CURRENT"
 msgid "Current list of users"
 msgstr "Huidige lijst met gebruikers"
 
-msgctxt "OPERATION_DESCRIPTION"
+msgctxt "DESCRIPTION"
 msgid "Description"
 msgstr "Beschrijving"
 
-msgctxt "OPERATION_DESTINATION"
+msgctxt "DESTINATION"
 msgid "Destination"
 msgstr "Bestemming"
 
-msgctxt "OPERATION_DOMAIN_NAME"
+msgctxt "DOMAIN_NAME"
 msgid "Domain name"
 msgstr "Domeinnaam"
 
-msgctxt "OPERATION_DOMAIN"
+msgctxt "DOMAIN"
 msgid "Domain"
 msgstr "Domein"
 
-msgctxt "OPERATION_DOMAINS"
+msgctxt "DOMAINS"
 msgid "Domains"
 msgstr "Domeinen"
 
-msgctxt "OPERATION_DOWNLOAD"
+msgctxt "DOWNLOAD"
 msgid "Download"
 msgstr "Ophalen"
 
-msgctxt "OPERATION_ERROR_UPDATING_CONFIGURATION"
+msgctxt "ERROR_UPDATING_CONFIGURATION"
 msgid "Error occurred while updating system configuration."
 msgstr ""
 "Er is een fout opgetreden bij het wijzigen van de systeemconfiguratie."
 
-msgctxt "OPERATION_GROUP_MEMBERS"
+msgctxt "GROUP_MEMBERS"
 msgid "Group Members"
 msgstr "Groepsleden"
 
-msgctxt "OPERATION_GROUP_NAME"
+msgctxt "GROUP_NAME"
 msgid "Group Name"
 msgstr "Groepsnaam"
 
-msgctxt "OPERATION_GROUPS"
+msgctxt "GROUPS"
 msgid "Groups"
 msgstr "Groepen"
 
-msgctxt "OPERATION_IP_ADDRESS"
+msgctxt "IP_ADDRESS"
 msgid "IP Address"
 msgstr "IP adres"
 
-msgctxt "OPERATION_IP_ADDRESS_OR_FQDN"
+msgctxt "IP_ADDRESS_OR_FQDN"
 msgid "IP Address or FQDN"
 msgstr "IP adres of FQDN"
 
-msgctxt "OPERATION_USER_INVALID"
+msgctxt "USER_INVALID"
 msgid "Invalid user"
 msgstr "Ongeldige gebruiker"
 
-msgctxt "OPERATION_LOCATION"
+msgctxt "LOCATION"
 msgid "Location"
 msgstr "Locatie"
 
-msgctxt "OPERATION_MB"
+msgctxt "MB"
 msgid "Mb"
 msgstr "MB"
 
-msgctxt "OPERATION_MODIFY_USER_GROUP"
+msgctxt "MODIFY_USER_GROUP"
 msgid "Modify user group"
 msgstr "Gebruikersgroep wijzigen"
 
-msgctxt "OPERATION_NAME"
+msgctxt "NAME"
 msgid "Name"
 msgstr "Naam"
 
-msgctxt "OPERATION_PASSWORD_VERIFY_NEW"
+msgctxt "PASSWORD_VERIFY_NEW"
 msgid "New password (verify):"
 msgstr "Nieuw wachtwoord (verificatie):"
 
-msgctxt "OPERATION_PASSWORD_NEW"
+msgctxt "PASSWORD_NEW"
 msgid "New password:"
 msgstr "Nieuw wachtwoord:"
 
-msgctxt "OPERATION_OFF"
+msgctxt "OFF"
 msgid "Off"
 msgstr "Uit"
 
-msgctxt "OPERATION_OK"
+msgctxt "OK"
 msgid "Ok"
 msgstr "Ok"
 
-msgctxt "OPERATION_PASSWORD_OLD"
+msgctxt "PASSWORD_OLD"
 msgid "Old password:"
 msgstr "Huidig wachtwoord:"
 
-msgctxt "OPERATION_ON"
+msgctxt "ON"
 msgid "On"
 msgstr "Aan"
 
-msgctxt "OPERATION_PASSWORD"
+msgctxt "PASSWORD"
 msgid "Password"
 msgstr "Wachtwoord"
 
-msgctxt "OPERATION_PERFORM"
+msgctxt "PERFORM"
 msgid "Perform"
 msgstr "Uitvoeren"
 
-msgctxt "OPERATION_RECONFIGURE"
+msgctxt "RECONFIGURE"
 msgid "Reconfigure"
 msgstr "Herconfigureren"
 
-msgctxt "OPERATION_REMOVE_USER_GROUP"
+msgctxt "REMOVE_USER_GROUP"
 msgid "Remove user group"
 msgstr "Gebruikersgroep verwijderen"
 
-msgctxt "OPERATION_PASSWORD_RESET"
+msgctxt "PASSWORD_RESET"
 msgid "Reset password"
 msgstr "Wachtwoord wijzigen"
 
-msgctxt "OPERATION_RESTORE"
+msgctxt "RESTORE"
 msgid "Restore"
 msgstr "Herstellen"
 
-msgctxt "OPERATION_SHUTDOWN"
+msgctxt "SHUTDOWN"
 msgid "Shutdown"
 msgstr "Afsluiten"
 
-msgctxt "OPERATION_SUCCESS"
+msgctxt "SUCCESS"
 msgid "Success"
 msgstr "Succes"
 
-msgctxt "OPERATION_ACCOUNT_NAME_INVALID"
+msgctxt "ACCOUNT_NAME_INVALID"
 msgid "The account name entered is invalid."
 msgstr "De ingegeven accountnaam is ongeldig."
 
-msgctxt "OPERATION_ACCOUNT_NAME_INVALID_CHARS"
+msgctxt "ACCOUNT_NAME_INVALID_CHARS"
 msgid "The account name you entered contained invalid characters."
 msgstr "De ingegeven accountnaam bevat ongeldige tekens."
 
-msgctxt "OPERATION_PASSWORD_OLD_INVALID_CHARS"
+msgctxt "PASSWORD_OLD_INVALID_CHARS"
 msgid "The old password you entered contained invalid characters."
 msgstr "Het ingegeven huidige wachtwoord bevat ongeldige tekens."
 
-msgctxt "OPERATION_PASSWORD_INVALID_CHARS"
+msgctxt "PASSWORD_INVALID_CHARS"
 msgid "The password you entered contained invalid characters."
 msgstr "Het ingegeven wachtwoord bevat ongeldige tekens."
 
-msgctxt "OPERATION_PASSWORD_VERIFY_ERROR"
+msgctxt "PASSWORD_VERIFY_ERROR"
 msgid "The passwords you entered did not match."
 msgstr "De ingegeven wachtwoorden komen niet overeen."
 
-msgctxt "OPERATION_ACCOUNT_USER_NONE"
+msgctxt "ACCOUNT_USER_NONE"
 msgid "There are no user accounts in the system."
 msgstr "Er zijn geen gebruikeraccounts op dit systeem."
 
-msgctxt "OPERATION_ACCOUNT_GROUP_NONE"
+msgctxt "ACCOUNT_GROUP_NONE"
 msgid "There are no user groups in the system."
 msgstr "Er zijn geen gebruikersgroepen op dit systeem."
 
-msgctxt "OPERATION_ERROR_INVALID_CHARS"
+msgctxt "ERROR_INVALID_CHARS"
 msgid "Unexpected characters in description."
 msgstr "Onverwachte tekens in de beschrijving."
 
-msgctxt "OPERATION_USER_NAME"
+msgctxt "USER_NAME"
 msgid "User Name"
 msgstr "Gebruikersnaam"
 
-msgctxt "OPERATION_YOUR_ACCOUNT"
+msgctxt "YOUR_ACCOUNT"
 msgid "Your account:"
 msgstr "Uw account:"
 
-msgctxt "OPERATION_YOUR_ACCOUNT_INVALID"
+msgctxt "YOUR_ACCOUNT_INVALID"
 msgid "The account name entered is invalid."
 msgstr "De ingegeven accountnaam is ongeldig."
 
-msgctxt "OPERATION_PASSWORD_CHANGE_SUCCESS"
+msgctxt "PASSWORD_CHANGE_SUCCESS"
 msgid "Your password has been successfully changed."
 msgstr "Uw wachtwoord is met succes gewijzigd."
 
-msgctxt "OPERATION_FM_NONBLANK"
+msgctxt "FM_NONBLANK"
 msgid "This field must not be left blank"
 msgstr "Dit veld mag niet leeg worden gelaten"
 
-msgctxt "OPERATION_FM_INTEGER"
+msgctxt "FM_INTEGER"
 msgid "This field must contain a positive integer"
 msgstr "Dit veld moet een positieve integere waarde bevatten"
 
-msgctxt "OPERATION_FM_NUMBER"
+msgctxt "FM_NUMBER"
 msgid "This field must contain a number"
 msgstr "Dit veld moet een nummer bevatten"
 
-msgctxt "OPERATION_FM_WORD"
+msgctxt "FM_WORD"
 msgid "This field must look like a single word."
 msgstr "Dit veld moet lijken op één enkel woord."
 
-msgctxt "OPERATION_FM_DATE"
+msgctxt "FM_DATE"
 msgid "The data entered could not be parsed as a date"
 msgstr "De ingevoerde gegevens kunnen niet als datum worden benut"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_NUMBER1"
+msgctxt "FM_CREDIT_CARD_NUMBER1"
 msgid "You must enter a credit card number"
 msgstr "U moet een kredietkaart nummer ingeven"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_NUMBER2"
+msgctxt "FM_CREDIT_CARD_NUMBER2"
 msgid ""
 "Credit card numbers shouldn\\'t have anything but numbers, spaces or dashes"
 msgstr ""
 "Kredietkaart nummers kunnen alleen nummers, spaties of streepjes bevatten"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_NUMBER3"
+msgctxt "FM_CREDIT_CARD_NUMBER3"
 msgid "Must be at least 14 characters in length"
 msgstr "Moet tenminste 14 tekens lang zijn"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_NUMBER4"
+msgctxt "FM_CREDIT_CARD_NUMBER4"
 msgid "Doesn\\'t appear to be a valid credit card number"
 msgstr "Lijkt niet een geldig kredietkaart nummer te zijn"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_EXPIRY1"
+msgctxt "FM_CREDIT_CARD_EXPIRY1"
 msgid "No expiry date entered."
 msgstr "Geen expiratie datum ingevoerd."
 
-msgctxt "OPERATION_FM_CREDIT_CARD_EXPIRY2"
+msgctxt "FM_CREDIT_CARD_EXPIRY2"
 msgid "Expiry date must be in the format MM/YY or MM/YYYY"
 msgstr "Vervaldatum moet in het formaat MM/JJ of MM/JJJJ worden opgegeven"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_EXPIRY3"
+msgctxt "FM_CREDIT_CARD_EXPIRY3"
 msgid "This expiry date appears to have already passed"
 msgstr "De expiratie datum lijkt al te zijn gepasseerd"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_EXPIRY4"
+msgctxt "FM_CREDIT_CARD_EXPIRY4"
 msgid "This expiry date appears to be too far in the future"
 msgstr "De expiratie datum lijkt te ver in de toekomst te zijn"
 
-msgctxt "OPERATION_FM_ISO_COUNTRY_CODE1"
+msgctxt "FM_ISO_COUNTRY_CODE1"
 msgid "You must provide a country code"
 msgstr "U moet een landcode opgeven"
 
-msgctxt "OPERATION_FM_ISO_COUNTRY_CODE2"
+msgctxt "FM_ISO_COUNTRY_CODE2"
 msgid "This field does not contain an ISO country code"
 msgstr "Dit veld bevat geen ISO landcode"
 
-msgctxt "OPERATION_FM_US_STATE"
+msgctxt "FM_US_STATE"
 msgid "This doesn\\'t appear to be a valid 2-letter US state abbreviation"
 msgstr "Dit lijkt niet een geldige 2-letter US staat afkorting te zijn"
 
-msgctxt "OPERATION_FM_US_ZIPCODE"
+msgctxt "FM_US_ZIPCODE"
 msgid "US zip codes must contain 5 or 9 numbers"
 msgstr "US zip codes moeten 5 of 9 nummers bevatten"
 
-msgctxt "OPERATION_FM_MINLENGTH1"
+msgctxt "FM_MINLENGTH1"
 msgid "Minimum length has been specified meaninglessly as [_1]"
 msgstr "Minimale lengte is zinloos gespecificeerd als {$minlength}"
 
-msgctxt "OPERATION_FM_MINLENGTH2"
+msgctxt "FM_MINLENGTH2"
 msgid "This field must be at least [_1] characters"
 msgstr "Dit veld moet tenminste {$minlength} tekens zijn"
 
-msgctxt "OPERATION_FM_MAXLENGTH1"
+msgctxt "FM_MAXLENGTH1"
 msgid "Maximum length has been specified meaninglessly as [_1]"
 msgstr "Maximale lengte is zinloos gespecificeerd als {$maxlength}"
 
-msgctxt "OPERATION_FM_MAXLENGTH2"
+msgctxt "FM_MAXLENGTH2"
 msgid "This field must be no more than [_1] characters"
 msgstr "Dit veld mag hooguit {$maxlength} tekens zijn"
 
-msgctxt "OPERATION_FM_EXACTLENGTH1"
+msgctxt "FM_EXACTLENGTH1"
 msgid "You must specify the length for the field."
 msgstr "U moet de lengte specificeren voor dit veld."
 
-msgctxt "OPERATION_FM_EXACTLENGTH2"
+msgctxt "FM_EXACTLENGTH2"
 msgid "You must specify the exactlength of the field with an integer"
 msgstr "U moet de exacte lengte van het veld opgeven met een integer"
 
-msgctxt "OPERATION_FM_EXACTLENGTH3"
+msgctxt "FM_EXACTLENGTH3"
 msgid "This field must be exactly [_1] characters"
 msgstr "Dit veld moet exact {$exactlength} tekens zijn"
 
-msgctxt "OPERATION_FM_LENGTHRANGE1"
+msgctxt "FM_LENGTHRANGE1"
 msgid "You must specify the maximum and minimum length for the field."
 msgstr "U moet de maximale en minimale lengte voor dit veld specificeren."
 
-msgctxt "OPERATION_FM_LENGTHRANGE2"
+msgctxt "FM_LENGTHRANGE2"
 msgid ""
 "You must specify the maximum and minimum lengths of the field with an "
 "integer"
 msgstr ""
 "U moet de maximale en minimale lengtes voor dit veld opgeven met een integer"
 
-msgctxt "OPERATION_FM_LENGTHRANGE3"
+msgctxt "FM_LENGTHRANGE3"
 msgid "This field must be between [_1] and [_2] characters"
 msgstr "Dit veld moet tussen {$minlength} en {$maxlength} tekens zijn"
 
-msgctxt "OPERATION_FM_URL"
+msgctxt "FM_URL"
 msgid "This field must contain a URL starting with http:// or ftp://"
 msgstr "Dit veld moet een URL bevatten beginnend met http:// of ftp://"
 
-msgctxt "OPERATION_FM_EMAIL_SIMPLE1"
+msgctxt "FM_EMAIL_SIMPLE1"
 msgid "You must enter an email address."
 msgstr "U moet een geldig e-mail adres opgeven."
 
-msgctxt "OPERATION_FM_EMAIL_SIMPLE2"
+msgctxt "FM_EMAIL_SIMPLE2"
 msgid "This field doesn\\'t look like an RFC822-compliant email address"
 msgstr "Dit veld lijkt niet een RFC822-overeenkomstig e-mail adres"
 
-msgctxt "OPERATION_FM_DOMAIN_NAME"
+msgctxt "FM_DOMAIN_NAME"
 msgid "This field doesn\\'t look like a valid Internet domain name or hostname."
 msgstr "Dit veld lijkt niet een geldige Internet domeinnaam of hostnaam."
 
-msgctxt "OPERATION_FM_IP_NUMBER1"
+msgctxt "FM_IP_NUMBER1"
 msgid "This field must contain a valid IP number and can not be left blank."
 msgstr ""
 "Dit veld moet een geldig IP nummer bevatten en kan niet leeg worden gelaten."
 
-msgctxt "OPERATION_FM_IP_NUMBER2"
+msgctxt "FM_IP_NUMBER2"
 msgid "Invalid IP address format (expected X.X.X.X)"
 msgstr "Ongeldig IP adres (geldig formaat X.X.X.X)"
 
-msgctxt "OPERATION_FM_IP_NUMBER3"
+msgctxt "FM_IP_NUMBER3"
 msgid "[_1] is more than 255"
 msgstr "{$octet} is meer dan 255"
 
-msgctxt "OPERATION_FM_USERNAME"
+msgctxt "FM_USERNAME"
 msgid ""
 "This field must look like a valid username (3 to 8 letters and numbers)"
 msgstr ""
 "Dit veld moet lijken op een geldige gebruikersnaam (3 tot 8 letters en "
 "nummers)"
 
-msgctxt "OPERATION_FM_PASSWORD1"
+msgctxt "FM_PASSWORD1"
 msgid "You must provide a password."
 msgstr "U moet een wachtwoord opgeven."
 
-msgctxt "OPERATION_FM_PASSWORD2"
+msgctxt "FM_PASSWORD2"
 msgid ""
 "The password you provided was not a good password.A good password must "
 "contain all of the following: upper case letter, lower case letter, number, "
@@ -529,18 +525,18 @@ msgstr ""
 " bevat alle volgende elementen: hoofdletters, kleine letters, cijfers, niet "
 "alfanumerieke tekens en tenminste 7 tekens lang."
 
-msgctxt "OPERATION_FM_MAC_ADDRESS1"
+msgctxt "FM_MAC_ADDRESS1"
 msgid "You must provide a MAC address."
 msgstr "U moet een MAC adres opgeven."
 
-msgctxt "OPERATION_FM_MAC_ADDRESS2"
+msgctxt "FM_MAC_ADDRESS2"
 msgid "The MAC address you provided was not valid."
 msgstr "Het MAC adres dat u opgaf is niet geldig."
 
-msgctxt "OPERATION_FM_ERR_UNEXPECTED_DESC"
+msgctxt "FM_ERR_UNEXPECTED_DESC"
 msgid "Error: unexpected or missing characters in description"
 msgstr "Fout: onverwachte of ontbrekende tekens in de beschrijving"
 
-msgctxt "OPERATION_CSRF_VALIDATION_FAILURE"
-msgid "Placeholder for missing original text"
+msgctxt "CSRF_VALIDATION_FAILURE"
+msgid "Error: CSRF token is invalid or outdated."
 msgstr "Error: CSRF token is invalid or outdated."
diff --git a/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/General/pofiles/general_pl.po b/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/General/pofiles/general_pl.po
index b2aa292..4006b0f 100644
--- a/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/General/pofiles/general_pl.po
+++ b/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/General/pofiles/general_pl.po
@@ -5,99 +5,95 @@ msgstr ""
 "Language: None\n"
 "Content-Type: text/plain; charset=utf-8\n"
 
-msgctxt "OPERATION_Collaboration"
+msgctxt "Collaboration"
 msgid "Collaboration"
 msgstr "Współpraca"
 
-msgctxt "OPERATION_Administration"
+msgctxt "Administration"
 msgid "Administration"
 msgstr "Administracja"
 
-msgctxt "OPERATION_Security"
+msgctxt "Security"
 msgid "Security"
 msgstr "Bezpieczeństwo"
 
-msgctxt "OPERATION_Configuration"
+msgctxt "Configuration"
 msgid "Configuration"
 msgstr "Konfiguracja"
 
-msgctxt "OPERATION_Miscellaneous"
+msgctxt "Miscellaneous"
 msgid "Miscellaneous"
 msgstr "Miscellaneous"
 
-msgctxt "OPERATION_Your Settings"
-msgid "Your Settings"
-msgstr "Your Settings"
-
-msgctxt "OPERATION_SAVE"
+msgctxt "SAVE"
 msgid "Save"
 msgstr "Zapisz"
 
-msgctxt "OPERATION_CANCEL"
+msgctxt "CANCEL"
 msgid "Cancel"
 msgstr "Anuluj"
 
-msgctxt "OPERATION_ENABLED"
+msgctxt "ENABLED"
 msgid "Enabled"
 msgstr "Enabled"
 
-msgctxt "OPERATION_DISABLED"
+msgctxt "DISABLED"
 msgid "Disabled"
 msgstr "Disabled"
 
-msgctxt "OPERATION_NO"
+msgctxt "NO"
 msgid "No"
 msgstr "Nie"
 
-msgctxt "OPERATION_YES"
+msgctxt "YES"
 msgid "Yes"
 msgstr "Tak"
 
-msgctxt "OPERATION_ADD"
+msgctxt "ADD"
 msgid "Add"
 msgstr "Dodaj"
 
-msgctxt "OPERATION_CREATE"
+msgctxt "CREATE"
 msgid "Create"
 msgstr "Utwórz"
 
-msgctxt "OPERATION_MODIFY"
+msgctxt "MODIFY"
 msgid "Modify"
 msgstr "Zmodyfikuj"
 
-msgctxt "OPERATION_REMOVE"
+msgctxt "REMOVE"
 msgid "Remove"
 msgstr "Usuń"
 
-msgctxt "OPERATION_COMMENT"
+msgctxt "COMMENT"
 msgid "Comment"
 msgstr "Comment"
 
-msgctxt "OPERATION_NEXT"
+msgctxt "NEXT"
 msgid "Next"
 msgstr "Dalej"
 
-msgctxt "OPERATION_SELF"
+msgctxt "SELF"
 msgid "Self"
 msgstr "Self"
 
-msgctxt "OPERATION_REMOTE"
+msgctxt "REMOTE"
 msgid "Remote"
 msgstr "Zdalny"
 
-msgctxt "OPERATION_LOCAL"
+msgctxt "LOCAL"
 msgid "Local"
 msgstr "Lokalny"
 
-msgctxt "OPERATION_ACTION"
+msgctxt "ACTION"
 msgid "Action"
 msgstr "Action"
 
-msgctxt "OPERATION_NETWORK"
+msgctxt "NETWORK"
 msgid "Network"
 msgstr "Sieć"
 
-msgctxt "OPERATION_ROUTER"
+msgctxt "ROUTER"
 msgid "Router"
 msgstr "Router"
 
@@ -105,23 +101,23 @@ msgctxt "OPERATION_STATUS_REPORT"
 msgid "Operation status report"
 msgstr "Raport o stanie procesu"
 
-msgctxt "OPERATION_ACCOUNT"
+msgctxt "ACCOUNT"
 msgid "Account"
 msgstr "Konto"
 
-msgctxt "OPERATION_GROUP"
+msgctxt "GROUP"
 msgid "Group"
 msgstr "Grupa"
 
-msgctxt "OPERATION_DESC_SECTIONBAR"
+msgctxt "DESC_SECTIONBAR"
 msgid "<hr class=\"sectionbar\"/>"
-msgstr " <hr class=\"sectionbar\"/> "
+msgstr "<hr class=\"sectionbar\"/>"
 
-msgctxt "OPERATION_NO_PIPES_ALLOWED"
+msgctxt "NO_PIPES_ALLOWED"
 msgid "Pipe symbols (|) are not permitted in this field"
 msgstr "Znaki pionowej kreski (|) nie są dozwolone w tym polu"
 
-msgctxt "OPERATION_ERROR_BELOW"
+msgctxt "ERROR_BELOW"
 msgid ""
 "ERROR: There was an error in the validation of this page. Please scroll down"
 " and find the specific problem."
@@ -129,27 +125,27 @@ msgstr ""
 "BŁĄD: Wystąpił błąd podczas sprawdzania poprawności tej strony. Przewiń w "
 "dół i znajdź konkretny problem."
 
-msgctxt "OPERATION_ACCESS"
+msgctxt "ACCESS"
 msgid "Access"
 msgstr "Dostęp"
 
-msgctxt "OPERATION_ACCOUNT_LOCKED"
+msgctxt "ACCOUNT_LOCKED"
 msgid "Account is locked"
 msgstr "Konto jest zablokowane"
 
-msgctxt "OPERATION_GROUP_ADD"
+msgctxt "GROUP_ADD"
 msgid "Add group"
 msgstr "Dodaj grupę"
 
-msgctxt "OPERATION_NETWORKS_ALLOW_LOCAL"
+msgctxt "NETWORKS_ALLOW_LOCAL"
 msgid "Allow access only from local networks"
 msgstr "Zezwalaj na dostęp tylko z sieci lokalnych"
 
-msgctxt "OPERATION_NETWORKS_ALLOW_PUBLIC"
+msgctxt "NETWORKS_ALLOW_PUBLIC"
 msgid "Allow public access (entire Internet)"
 msgstr "Zezwalaj na publiczny dostęp (z całego Internetu)"
 
-msgctxt "OPERATION_ERROR_PASSWORD_CHANGE"
+msgctxt "ERROR_PASSWORD_CHANGE"
 msgid ""
 "An error occurred while attempting to change your password. Please make sure"
 " that the old password entered is correct."
@@ -157,317 +153,317 @@ msgstr ""
 "Wystąpił błąd podczas próby zmiany hasła. Upewnij się, że stare wprowadzone "
 "hasło jest poprawne."
 
-msgctxt "OPERATION_BACK"
+msgctxt "BACK"
 msgid "Back"
 msgstr "Wstecz"
 
-msgctxt "OPERATION_BACKUP"
+msgctxt "BACKUP"
 msgid "Backup"
 msgstr "Kopia zapasowa"
 
-msgctxt "OPERATION_DESCRIPTION_BRIEF"
+msgctxt "DESCRIPTION_BRIEF"
 msgid "Brief description"
 msgstr "Krótki opis"
 
-msgctxt "OPERATION_PASSWORD_CHANGE"
+msgctxt "PASSWORD_CHANGE"
 msgid "Change Password"
 msgstr "Zmiana hasła"
 
-msgctxt "OPERATION_RESET_PASSWORD_TITLE"
+msgctxt "RESET_PASSWORD_TITLE"
 msgid "Reset user password"
 msgstr "Reset user password"
 
-msgctxt "OPERATION_ACCOUNT_PASSWORD_CHANGE"
+msgctxt "ACCOUNT_PASSWORD_CHANGE"
 msgid "Change account password"
 msgstr "Change account password"
 
-msgctxt "OPERATION_CONTENT"
+msgctxt "CONTENT"
 msgid "Content"
 msgstr "Zawartość"
 
-msgctxt "OPERATION_CREATE_GROUP"
+msgctxt "CREATE_GROUP"
 msgid "Create user group"
 msgstr "Create user group"
 
-msgctxt "OPERATION_USER_LIST_CURRENT"
+msgctxt "USER_LIST_CURRENT"
 msgid "Current list of users"
 msgstr "Current list of users"
 
-msgctxt "OPERATION_DESCRIPTION"
+msgctxt "DESCRIPTION"
 msgid "Description"
 msgstr "Opis"
 
-msgctxt "OPERATION_DESTINATION"
+msgctxt "DESTINATION"
 msgid "Destination"
 msgstr "Cel"
 
-msgctxt "OPERATION_DOMAIN_NAME"
+msgctxt "DOMAIN_NAME"
 msgid "Domain name"
 msgstr "Domain name"
 
-msgctxt "OPERATION_DOMAIN"
+msgctxt "DOMAIN"
 msgid "Domain"
 msgstr "Domena"
 
-msgctxt "OPERATION_DOMAINS"
+msgctxt "DOMAINS"
 msgid "Domains"
 msgstr "Domena"
 
-msgctxt "OPERATION_DOWNLOAD"
+msgctxt "DOWNLOAD"
 msgid "Download"
 msgstr "Pobierz"
 
-msgctxt "OPERATION_ERROR_UPDATING_CONFIGURATION"
+msgctxt "ERROR_UPDATING_CONFIGURATION"
 msgid "Error occurred while updating system configuration."
 msgstr "Error occurred while updating system configuration."
 
-msgctxt "OPERATION_GROUP_MEMBERS"
+msgctxt "GROUP_MEMBERS"
 msgid "Group Members"
 msgstr "Group Members"
 
-msgctxt "OPERATION_GROUP_NAME"
+msgctxt "GROUP_NAME"
 msgid "Group Name"
 msgstr "Group Name"
 
-msgctxt "OPERATION_GROUPS"
+msgctxt "GROUPS"
 msgid "Groups"
 msgstr "Grupa"
 
-msgctxt "OPERATION_IP_ADDRESS"
+msgctxt "IP_ADDRESS"
 msgid "IP Address"
 msgstr "Adres IP"
 
-msgctxt "OPERATION_IP_ADDRESS_OR_FQDN"
+msgctxt "IP_ADDRESS_OR_FQDN"
 msgid "IP Address or FQDN"
 msgstr "Adres IP"
 
-msgctxt "OPERATION_USER_INVALID"
+msgctxt "USER_INVALID"
 msgid "Invalid user"
 msgstr "Invalid user"
 
-msgctxt "OPERATION_LOCATION"
+msgctxt "LOCATION"
 msgid "Location"
 msgstr "Położenie"
 
-msgctxt "OPERATION_MB"
+msgctxt "MB"
 msgid "Mb"
 msgstr "Mb"
 
-msgctxt "OPERATION_MODIFY_USER_GROUP"
+msgctxt "MODIFY_USER_GROUP"
 msgid "Modify user group"
 msgstr "Modify user group"
 
-msgctxt "OPERATION_NAME"
+msgctxt "NAME"
 msgid "Name"
 msgstr "Nazwa"
 
-msgctxt "OPERATION_PASSWORD_VERIFY_NEW"
+msgctxt "PASSWORD_VERIFY_NEW"
 msgid "New password (verify):"
 msgstr "New password (verify):"
 
-msgctxt "OPERATION_PASSWORD_NEW"
+msgctxt "PASSWORD_NEW"
 msgid "New password:"
 msgstr "New password:"
 
-msgctxt "OPERATION_OFF"
+msgctxt "OFF"
 msgid "Off"
 msgstr "Off"
 
-msgctxt "OPERATION_OK"
+msgctxt "OK"
 msgid "Ok"
 msgstr "Ok"
 
-msgctxt "OPERATION_PASSWORD_OLD"
+msgctxt "PASSWORD_OLD"
 msgid "Old password:"
 msgstr "Old password:"
 
-msgctxt "OPERATION_ON"
+msgctxt "ON"
 msgid "On"
 msgstr "On"
 
-msgctxt "OPERATION_PASSWORD"
+msgctxt "PASSWORD"
 msgid "Password"
 msgstr "Hasło"
 
-msgctxt "OPERATION_PERFORM"
+msgctxt "PERFORM"
 msgid "Perform"
 msgstr "Perform"
 
-msgctxt "OPERATION_RECONFIGURE"
+msgctxt "RECONFIGURE"
 msgid "Reconfigure"
 msgstr "Skonfiguruj ponownie"
 
-msgctxt "OPERATION_REMOVE_USER_GROUP"
+msgctxt "REMOVE_USER_GROUP"
 msgid "Remove user group"
 msgstr "Remove user group"
 
-msgctxt "OPERATION_PASSWORD_RESET"
+msgctxt "PASSWORD_RESET"
 msgid "Reset password"
 msgstr "Reset password"
 
-msgctxt "OPERATION_RESTORE"
+msgctxt "RESTORE"
 msgid "Restore"
 msgstr "Restore"
 
-msgctxt "OPERATION_SHUTDOWN"
+msgctxt "SHUTDOWN"
 msgid "Shutdown"
 msgstr "Wyłącz"
 
-msgctxt "OPERATION_SUCCESS"
+msgctxt "SUCCESS"
 msgid "Success"
 msgstr "Success"
 
-msgctxt "OPERATION_ACCOUNT_NAME_INVALID"
+msgctxt "ACCOUNT_NAME_INVALID"
 msgid "The account name entered is invalid."
 msgstr "The account name entered is invalid."
 
-msgctxt "OPERATION_ACCOUNT_NAME_INVALID_CHARS"
+msgctxt "ACCOUNT_NAME_INVALID_CHARS"
 msgid "The account name you entered contained invalid characters."
 msgstr "The account name you entered contained invalid characters."
 
-msgctxt "OPERATION_PASSWORD_OLD_INVALID_CHARS"
+msgctxt "PASSWORD_OLD_INVALID_CHARS"
 msgid "The old password you entered contained invalid characters."
 msgstr "The old password you entered contained invalid characters."
 
-msgctxt "OPERATION_PASSWORD_INVALID_CHARS"
+msgctxt "PASSWORD_INVALID_CHARS"
 msgid "The password you entered contained invalid characters."
 msgstr "The password you entered contained invalid characters."
 
-msgctxt "OPERATION_PASSWORD_VERIFY_ERROR"
+msgctxt "PASSWORD_VERIFY_ERROR"
 msgid "The passwords you entered did not match."
 msgstr "The passwords you entered did not match."
 
-msgctxt "OPERATION_ACCOUNT_USER_NONE"
+msgctxt "ACCOUNT_USER_NONE"
 msgid "There are no user accounts in the system."
 msgstr "There are no user accounts in the system."
 
-msgctxt "OPERATION_ACCOUNT_GROUP_NONE"
+msgctxt "ACCOUNT_GROUP_NONE"
 msgid "There are no user groups in the system."
 msgstr "There are no user groups in the system."
 
-msgctxt "OPERATION_ERROR_INVALID_CHARS"
+msgctxt "ERROR_INVALID_CHARS"
 msgid "Unexpected characters in description."
 msgstr "Unexpected characters in description."
 
-msgctxt "OPERATION_USER_NAME"
+msgctxt "USER_NAME"
 msgid "User Name"
 msgstr "User Name"
 
-msgctxt "OPERATION_YOUR_ACCOUNT"
+msgctxt "YOUR_ACCOUNT"
 msgid "Your account:"
 msgstr "Your account:"
 
-msgctxt "OPERATION_YOUR_ACCOUNT_INVALID"
+msgctxt "YOUR_ACCOUNT_INVALID"
 msgid "The account name entered is invalid."
 msgstr "The account name entered is invalid."
 
-msgctxt "OPERATION_PASSWORD_CHANGE_SUCCESS"
+msgctxt "PASSWORD_CHANGE_SUCCESS"
 msgid "Your password has been successfully changed."
 msgstr "Your password has been successfully changed."
 
-msgctxt "OPERATION_FM_NONBLANK"
+msgctxt "FM_NONBLANK"
 msgid "This field must not be left blank"
 msgstr "This field must not be left blank"
 
-msgctxt "OPERATION_FM_INTEGER"
+msgctxt "FM_INTEGER"
 msgid "This field must contain a positive integer"
 msgstr "This field must contain a positive integer"
 
-msgctxt "OPERATION_FM_NUMBER"
+msgctxt "FM_NUMBER"
 msgid "This field must contain a number"
 msgstr "This field must contain a number"
 
-msgctxt "OPERATION_FM_WORD"
+msgctxt "FM_WORD"
 msgid "This field must look like a single word."
 msgstr "This field must look like a single word."
 
-msgctxt "OPERATION_FM_DATE"
+msgctxt "FM_DATE"
 msgid "The data entered could not be parsed as a date"
 msgstr "The data entered could not be parsed as a date"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_NUMBER1"
+msgctxt "FM_CREDIT_CARD_NUMBER1"
 msgid "You must enter a credit card number"
 msgstr "You must enter a credit card number"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_NUMBER2"
+msgctxt "FM_CREDIT_CARD_NUMBER2"
 msgid ""
 "Credit card numbers shouldn\\'t have anything but numbers, spaces or dashes"
 msgstr ""
 "Credit card numbers shouldn\\'t have anything but numbers, spaces or dashes"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_NUMBER3"
+msgctxt "FM_CREDIT_CARD_NUMBER3"
 msgid "Must be at least 14 characters in length"
 msgstr "Must be at least 14 characters in length"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_NUMBER4"
+msgctxt "FM_CREDIT_CARD_NUMBER4"
 msgid "Doesn\\'t appear to be a valid credit card number"
 msgstr "Doesn\\'t appear to be a valid credit card number"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_EXPIRY1"
+msgctxt "FM_CREDIT_CARD_EXPIRY1"
 msgid "No expiry date entered."
 msgstr "No expiry date entered."
 
-msgctxt "OPERATION_FM_CREDIT_CARD_EXPIRY2"
+msgctxt "FM_CREDIT_CARD_EXPIRY2"
 msgid "Expiry date must be in the format MM/YY or MM/YYYY"
 msgstr "Expiry date must be in the format MM/YY or MM/YYYY"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_EXPIRY3"
+msgctxt "FM_CREDIT_CARD_EXPIRY3"
 msgid "This expiry date appears to have already passed"
 msgstr "This expiry date appears to have already passed"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_EXPIRY4"
+msgctxt "FM_CREDIT_CARD_EXPIRY4"
 msgid "This expiry date appears to be too far in the future"
 msgstr "This expiry date appears to be too far in the future"
 
-msgctxt "OPERATION_FM_ISO_COUNTRY_CODE1"
+msgctxt "FM_ISO_COUNTRY_CODE1"
 msgid "You must provide a country code"
 msgstr "You must provide a country code"
 
-msgctxt "OPERATION_FM_ISO_COUNTRY_CODE2"
+msgctxt "FM_ISO_COUNTRY_CODE2"
 msgid "This field does not contain an ISO country code"
 msgstr "This field does not contain an ISO country code"
 
-msgctxt "OPERATION_FM_US_STATE"
+msgctxt "FM_US_STATE"
 msgid "This doesn\\'t appear to be a valid 2-letter US state abbreviation"
 msgstr "This doesn\\'t appear to be a valid 2-letter US state abbreviation"
 
-msgctxt "OPERATION_FM_US_ZIPCODE"
+msgctxt "FM_US_ZIPCODE"
 msgid "US zip codes must contain 5 or 9 numbers"
 msgstr "US zip codes must contain 5 or 9 numbers"
 
-msgctxt "OPERATION_FM_MINLENGTH1"
+msgctxt "FM_MINLENGTH1"
 msgid "Minimum length has been specified meaninglessly as [_1]"
 msgstr "Minimum length has been specified meaninglessly as {$minlength}"
 
-msgctxt "OPERATION_FM_MINLENGTH2"
+msgctxt "FM_MINLENGTH2"
 msgid "This field must be at least [_1] characters"
 msgstr "This field must be at least {$minlength} characters"
 
-msgctxt "OPERATION_FM_MAXLENGTH1"
+msgctxt "FM_MAXLENGTH1"
 msgid "Maximum length has been specified meaninglessly as [_1]"
 msgstr "Maximum length has been specified meaninglessly as {$maxlength}"
 
-msgctxt "OPERATION_FM_MAXLENGTH2"
+msgctxt "FM_MAXLENGTH2"
 msgid "This field must be no more than [_1] characters"
 msgstr "This field must be no more than {$maxlength} characters"
 
-msgctxt "OPERATION_FM_EXACTLENGTH1"
+msgctxt "FM_EXACTLENGTH1"
 msgid "You must specify the length for the field."
 msgstr "You must specify the length for the field."
 
-msgctxt "OPERATION_FM_EXACTLENGTH2"
+msgctxt "FM_EXACTLENGTH2"
 msgid "You must specify the exactlength of the field with an integer"
 msgstr "You must specify the exactlength of the field with an integer"
 
-msgctxt "OPERATION_FM_EXACTLENGTH3"
+msgctxt "FM_EXACTLENGTH3"
 msgid "This field must be exactly [_1] characters"
 msgstr "This field must be exactly {$exactlength} characters"
 
-msgctxt "OPERATION_FM_LENGTHRANGE1"
+msgctxt "FM_LENGTHRANGE1"
 msgid "You must specify the maximum and minimum length for the field."
 msgstr "You must specify the maximum and minimum length for the field."
 
-msgctxt "OPERATION_FM_LENGTHRANGE2"
+msgctxt "FM_LENGTHRANGE2"
 msgid ""
 "You must specify the maximum and minimum lengths of the field with an "
 "integer"
@@ -475,50 +471,50 @@ msgstr ""
 "You must specify the maximum and minimum lengths of the field with an "
 "integer"
 
-msgctxt "OPERATION_FM_LENGTHRANGE3"
+msgctxt "FM_LENGTHRANGE3"
 msgid "This field must be between [_1] and [_2] characters"
 msgstr "This field must be between {$minlength} and {$maxlength} characters"
 
-msgctxt "OPERATION_FM_URL"
+msgctxt "FM_URL"
 msgid "This field must contain a URL starting with http:// or ftp://"
 msgstr "This field must contain a URL starting with http:// or ftp://"
 
-msgctxt "OPERATION_FM_EMAIL_SIMPLE1"
+msgctxt "FM_EMAIL_SIMPLE1"
 msgid "You must enter an email address."
 msgstr "You must enter an email address."
 
-msgctxt "OPERATION_FM_EMAIL_SIMPLE2"
+msgctxt "FM_EMAIL_SIMPLE2"
 msgid "This field doesn\\'t look like an RFC822-compliant email address"
 msgstr "This field doesn\\'t look like an RFC822-compliant email address"
 
-msgctxt "OPERATION_FM_DOMAIN_NAME"
+msgctxt "FM_DOMAIN_NAME"
 msgid "This field doesn\\'t look like a valid Internet domain name or hostname."
 msgstr ""
 "This field doesn\\'t look like a valid Internet domain name or hostname."
 
-msgctxt "OPERATION_FM_IP_NUMBER1"
+msgctxt "FM_IP_NUMBER1"
 msgid "This field must contain a valid IP number and can not be left blank."
 msgstr "This field must contain a valid IP number and can not be left blank."
 
-msgctxt "OPERATION_FM_IP_NUMBER2"
+msgctxt "FM_IP_NUMBER2"
 msgid "Invalid IP address format (expected X.X.X.X)"
 msgstr "Invalid IP address format (expected X.X.X.X)"
 
-msgctxt "OPERATION_FM_IP_NUMBER3"
+msgctxt "FM_IP_NUMBER3"
 msgid "[_1] is more than 255"
 msgstr "{$octet} is more than 255"
 
-msgctxt "OPERATION_FM_USERNAME"
+msgctxt "FM_USERNAME"
 msgid ""
 "This field must look like a valid username (3 to 8 letters and numbers)"
 msgstr ""
 "This field must look like a valid username (3 to 8 letters and numbers)"
 
-msgctxt "OPERATION_FM_PASSWORD1"
+msgctxt "FM_PASSWORD1"
 msgid "You must provide a password."
 msgstr "You must provide a password."
 
-msgctxt "OPERATION_FM_PASSWORD2"
+msgctxt "FM_PASSWORD2"
 msgid ""
 "The password you provided was not a good password.A good password must "
 "contain all of the following: upper case letter, lower case letter, number, "
@@ -528,18 +524,18 @@ msgstr ""
 "contain all of the following: upper case letter, lower case letter, number, "
 "non-alphanumeric character, be at least 7 characters long."
 
-msgctxt "OPERATION_FM_MAC_ADDRESS1"
+msgctxt "FM_MAC_ADDRESS1"
 msgid "You must provide a MAC address."
 msgstr "You must provide a MAC address."
 
-msgctxt "OPERATION_FM_MAC_ADDRESS2"
+msgctxt "FM_MAC_ADDRESS2"
 msgid "The MAC address you provided was not valid."
 msgstr "The MAC address you provided was not valid."
 
-msgctxt "OPERATION_FM_ERR_UNEXPECTED_DESC"
+msgctxt "FM_ERR_UNEXPECTED_DESC"
 msgid "Error: unexpected or missing characters in description"
 msgstr "Error: unexpected or missing characters in description"
 
-msgctxt "OPERATION_CSRF_VALIDATION_FAILURE"
-msgid "Placeholder for missing original text"
+msgctxt "CSRF_VALIDATION_FAILURE"
+msgid "Error: CSRF token is invalid or outdated."
 msgstr "Error: CSRF token is invalid or outdated."
diff --git a/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/General/pofiles/general_pt-br.po b/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/General/pofiles/general_pt-br.po
index c2639ac..31a702a 100644
--- a/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/General/pofiles/general_pt-br.po
+++ b/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/General/pofiles/general_pt-br.po
@@ -5,99 +5,95 @@ msgstr ""
 "Language: None\n"
 "Content-Type: text/plain; charset=utf-8\n"
 
-msgctxt "OPERATION_Collaboration"
+msgctxt "Collaboration"
 msgid "Collaboration"
 msgstr "Colaboração"
 
-msgctxt "OPERATION_Administration"
+msgctxt "Administration"
 msgid "Administration"
 msgstr "Administração"
 
-msgctxt "OPERATION_Security"
+msgctxt "Security"
 msgid "Security"
 msgstr "Segurança"
 
-msgctxt "OPERATION_Configuration"
+msgctxt "Configuration"
 msgid "Configuration"
 msgstr "Configuração"
 
-msgctxt "OPERATION_Miscellaneous"
+msgctxt "Miscellaneous"
 msgid "Miscellaneous"
 msgstr "Miscelânea"
 
-msgctxt "OPERATION_Your Settings"
-msgid "Your Settings"
-msgstr "Suas Configurações"
-
-msgctxt "OPERATION_SAVE"
+msgctxt "SAVE"
 msgid "Save"
 msgstr "Salvar"
 
-msgctxt "OPERATION_CANCEL"
+msgctxt "CANCEL"
 msgid "Cancel"
 msgstr "Cancelar"
 
-msgctxt "OPERATION_ENABLED"
+msgctxt "ENABLED"
 msgid "Enabled"
 msgstr "Habilitado"
 
-msgctxt "OPERATION_DISABLED"
+msgctxt "DISABLED"
 msgid "Disabled"
 msgstr "Desabilitado"
 
-msgctxt "OPERATION_NO"
+msgctxt "NO"
 msgid "No"
 msgstr "Não"
 
-msgctxt "OPERATION_YES"
+msgctxt "YES"
 msgid "Yes"
 msgstr "Sim"
 
-msgctxt "OPERATION_ADD"
+msgctxt "ADD"
 msgid "Add"
 msgstr "Adicionar"
 
-msgctxt "OPERATION_CREATE"
+msgctxt "CREATE"
 msgid "Create"
 msgstr "Criar"
 
-msgctxt "OPERATION_MODIFY"
+msgctxt "MODIFY"
 msgid "Modify"
 msgstr "Modificar"
 
-msgctxt "OPERATION_REMOVE"
+msgctxt "REMOVE"
 msgid "Remove"
 msgstr "Remover"
 
-msgctxt "OPERATION_COMMENT"
+msgctxt "COMMENT"
 msgid "Comment"
 msgstr "Comentário"
 
-msgctxt "OPERATION_NEXT"
+msgctxt "NEXT"
 msgid "Next"
 msgstr "Próximo"
 
-msgctxt "OPERATION_SELF"
+msgctxt "SELF"
 msgid "Self"
 msgstr "Próprio"
 
-msgctxt "OPERATION_REMOTE"
+msgctxt "REMOTE"
 msgid "Remote"
 msgstr "Remoto"
 
-msgctxt "OPERATION_LOCAL"
+msgctxt "LOCAL"
 msgid "Local"
 msgstr "Local"
 
-msgctxt "OPERATION_ACTION"
+msgctxt "ACTION"
 msgid "Action"
 msgstr "Ação"
 
-msgctxt "OPERATION_NETWORK"
+msgctxt "NETWORK"
 msgid "Network"
 msgstr "Rede"
 
-msgctxt "OPERATION_ROUTER"
+msgctxt "ROUTER"
 msgid "Router"
 msgstr "Roteador"
 
@@ -105,23 +101,23 @@ msgctxt "OPERATION_STATUS_REPORT"
 msgid "Operation status report"
 msgstr "Relatório de status da operação"
 
-msgctxt "OPERATION_ACCOUNT"
+msgctxt "ACCOUNT"
 msgid "Account"
 msgstr "Conta"
 
-msgctxt "OPERATION_GROUP"
+msgctxt "GROUP"
 msgid "Group"
 msgstr "Grupo"
 
-msgctxt "OPERATION_DESC_SECTIONBAR"
+msgctxt "DESC_SECTIONBAR"
 msgid "<hr class=\"sectionbar\"/>"
 msgstr ""
 
-msgctxt "OPERATION_NO_PIPES_ALLOWED"
+msgctxt "NO_PIPES_ALLOWED"
 msgid "Pipe symbols (|) are not permitted in this field"
 msgstr "Símbolos pipe (|) não são permitidos neste campo"
 
-msgctxt "OPERATION_ERROR_BELOW"
+msgctxt "ERROR_BELOW"
 msgid ""
 "ERROR: There was an error in the validation of this page. Please scroll down"
 " and find the specific problem."
@@ -129,27 +125,27 @@ msgstr ""
 "ERRO: Existiu um erro na validação desta página. Favor rolar para baixo para"
 " encontrar o problema detectado."
 
-msgctxt "OPERATION_ACCESS"
+msgctxt "ACCESS"
 msgid "Access"
 msgstr "Acesso"
 
-msgctxt "OPERATION_ACCOUNT_LOCKED"
+msgctxt "ACCOUNT_LOCKED"
 msgid "Account is locked"
 msgstr "Conta bloqueada"
 
-msgctxt "OPERATION_GROUP_ADD"
+msgctxt "GROUP_ADD"
 msgid "Add group"
 msgstr "Adicionar grupo"
 
-msgctxt "OPERATION_NETWORKS_ALLOW_LOCAL"
+msgctxt "NETWORKS_ALLOW_LOCAL"
 msgid "Allow access only from local networks"
 msgstr "Permite acesso somente da rede local"
 
-msgctxt "OPERATION_NETWORKS_ALLOW_PUBLIC"
+msgctxt "NETWORKS_ALLOW_PUBLIC"
 msgid "Allow public access (entire Internet)"
 msgstr "Permite acesso público (Internet inteira)"
 
-msgctxt "OPERATION_ERROR_PASSWORD_CHANGE"
+msgctxt "ERROR_PASSWORD_CHANGE"
 msgid ""
 "An error occurred while attempting to change your password. Please make sure"
 " that the old password entered is correct."
@@ -157,319 +153,319 @@ msgstr ""
 "Ocorreu um erro enquanto tentando mudar sua senha. Por favor assegure-se de "
 "que a senha antiga digitada esteja correta."
 
-msgctxt "OPERATION_BACK"
+msgctxt "BACK"
 msgid "Back"
 msgstr "Voltar"
 
-msgctxt "OPERATION_BACKUP"
+msgctxt "BACKUP"
 msgid "Backup"
 msgstr "Backup"
 
-msgctxt "OPERATION_DESCRIPTION_BRIEF"
+msgctxt "DESCRIPTION_BRIEF"
 msgid "Brief description"
 msgstr "Breve descrição"
 
-msgctxt "OPERATION_PASSWORD_CHANGE"
+msgctxt "PASSWORD_CHANGE"
 msgid "Change Password"
 msgstr "Trocar senha"
 
-msgctxt "OPERATION_RESET_PASSWORD_TITLE"
+msgctxt "RESET_PASSWORD_TITLE"
 msgid "Reset user password"
 msgstr "Resetar senha de usuário"
 
-msgctxt "OPERATION_ACCOUNT_PASSWORD_CHANGE"
+msgctxt "ACCOUNT_PASSWORD_CHANGE"
 msgid "Change account password"
 msgstr "Mudar a senha da conta"
 
-msgctxt "OPERATION_CONTENT"
+msgctxt "CONTENT"
 msgid "Content"
 msgstr "Conteúdo"
 
-msgctxt "OPERATION_CREATE_GROUP"
+msgctxt "CREATE_GROUP"
 msgid "Create user group"
 msgstr "Criar grupo de usuários"
 
-msgctxt "OPERATION_USER_LIST_CURRENT"
+msgctxt "USER_LIST_CURRENT"
 msgid "Current list of users"
 msgstr "Lista atual de usuários"
 
-msgctxt "OPERATION_DESCRIPTION"
+msgctxt "DESCRIPTION"
 msgid "Description"
 msgstr "Descrição"
 
-msgctxt "OPERATION_DESTINATION"
+msgctxt "DESTINATION"
 msgid "Destination"
 msgstr "Destino"
 
-msgctxt "OPERATION_DOMAIN_NAME"
+msgctxt "DOMAIN_NAME"
 msgid "Domain name"
 msgstr "Nome do domínio"
 
-msgctxt "OPERATION_DOMAIN"
+msgctxt "DOMAIN"
 msgid "Domain"
 msgstr "Domínio"
 
-msgctxt "OPERATION_DOMAINS"
+msgctxt "DOMAINS"
 msgid "Domains"
 msgstr "Domínios"
 
-msgctxt "OPERATION_DOWNLOAD"
+msgctxt "DOWNLOAD"
 msgid "Download"
 msgstr "Baixar"
 
-msgctxt "OPERATION_ERROR_UPDATING_CONFIGURATION"
+msgctxt "ERROR_UPDATING_CONFIGURATION"
 msgid "Error occurred while updating system configuration."
 msgstr "Ocorreu erro enquanto atualizava a configuração do sistema."
 
-msgctxt "OPERATION_GROUP_MEMBERS"
+msgctxt "GROUP_MEMBERS"
 msgid "Group Members"
 msgstr "Membros do Grupo"
 
-msgctxt "OPERATION_GROUP_NAME"
+msgctxt "GROUP_NAME"
 msgid "Group Name"
 msgstr "Nome do grupo"
 
-msgctxt "OPERATION_GROUPS"
+msgctxt "GROUPS"
 msgid "Groups"
 msgstr "Grupos"
 
-msgctxt "OPERATION_IP_ADDRESS"
+msgctxt "IP_ADDRESS"
 msgid "IP Address"
 msgstr "Endereço IP"
 
-msgctxt "OPERATION_IP_ADDRESS_OR_FQDN"
+msgctxt "IP_ADDRESS_OR_FQDN"
 msgid "IP Address or FQDN"
 msgstr "Endereço IP ou FQDN"
 
-msgctxt "OPERATION_USER_INVALID"
+msgctxt "USER_INVALID"
 msgid "Invalid user"
 msgstr "Usuário inválido"
 
-msgctxt "OPERATION_LOCATION"
+msgctxt "LOCATION"
 msgid "Location"
 msgstr "Localização"
 
-msgctxt "OPERATION_MB"
+msgctxt "MB"
 msgid "Mb"
 msgstr "Mb"
 
-msgctxt "OPERATION_MODIFY_USER_GROUP"
+msgctxt "MODIFY_USER_GROUP"
 msgid "Modify user group"
 msgstr "Modificar grupo de usuários"
 
-msgctxt "OPERATION_NAME"
+msgctxt "NAME"
 msgid "Name"
 msgstr "Nome"
 
-msgctxt "OPERATION_PASSWORD_VERIFY_NEW"
+msgctxt "PASSWORD_VERIFY_NEW"
 msgid "New password (verify):"
 msgstr "Nova senha (verificação):"
 
-msgctxt "OPERATION_PASSWORD_NEW"
+msgctxt "PASSWORD_NEW"
 msgid "New password:"
 msgstr "Nova senha:"
 
-msgctxt "OPERATION_OFF"
+msgctxt "OFF"
 msgid "Off"
 msgstr "Desligado"
 
-msgctxt "OPERATION_OK"
+msgctxt "OK"
 msgid "Ok"
 msgstr "Ok"
 
-msgctxt "OPERATION_PASSWORD_OLD"
+msgctxt "PASSWORD_OLD"
 msgid "Old password:"
 msgstr "Senha antiga:"
 
-msgctxt "OPERATION_ON"
+msgctxt "ON"
 msgid "On"
 msgstr "On"
 
-msgctxt "OPERATION_PASSWORD"
+msgctxt "PASSWORD"
 msgid "Password"
 msgstr "Senha"
 
-msgctxt "OPERATION_PERFORM"
+msgctxt "PERFORM"
 msgid "Perform"
 msgstr "Executar"
 
-msgctxt "OPERATION_RECONFIGURE"
+msgctxt "RECONFIGURE"
 msgid "Reconfigure"
 msgstr "Reconfigurar"
 
-msgctxt "OPERATION_REMOVE_USER_GROUP"
+msgctxt "REMOVE_USER_GROUP"
 msgid "Remove user group"
 msgstr "Remover grupo de usuários"
 
-msgctxt "OPERATION_PASSWORD_RESET"
+msgctxt "PASSWORD_RESET"
 msgid "Reset password"
 msgstr "Resetar senha"
 
-msgctxt "OPERATION_RESTORE"
+msgctxt "RESTORE"
 msgid "Restore"
 msgstr "Restaurar"
 
-msgctxt "OPERATION_SHUTDOWN"
+msgctxt "SHUTDOWN"
 msgid "Shutdown"
 msgstr "Desligar"
 
-msgctxt "OPERATION_SUCCESS"
+msgctxt "SUCCESS"
 msgid "Success"
 msgstr "Sucesso"
 
-msgctxt "OPERATION_ACCOUNT_NAME_INVALID"
+msgctxt "ACCOUNT_NAME_INVALID"
 msgid "The account name entered is invalid."
 msgstr "O nome de conta digitado é inválido."
 
-msgctxt "OPERATION_ACCOUNT_NAME_INVALID_CHARS"
+msgctxt "ACCOUNT_NAME_INVALID_CHARS"
 msgid "The account name you entered contained invalid characters."
 msgstr "O nome de conta que você digitou contém caracteres inválidos."
 
-msgctxt "OPERATION_PASSWORD_OLD_INVALID_CHARS"
+msgctxt "PASSWORD_OLD_INVALID_CHARS"
 msgid "The old password you entered contained invalid characters."
 msgstr "A senha antiga que você digitou contém caracteres inválidos."
 
-msgctxt "OPERATION_PASSWORD_INVALID_CHARS"
+msgctxt "PASSWORD_INVALID_CHARS"
 msgid "The password you entered contained invalid characters."
 msgstr "A senha que você digitou contém caracteres inválidos."
 
-msgctxt "OPERATION_PASSWORD_VERIFY_ERROR"
+msgctxt "PASSWORD_VERIFY_ERROR"
 msgid "The passwords you entered did not match."
 msgstr "As senhas que você entrou não são iguais."
 
-msgctxt "OPERATION_ACCOUNT_USER_NONE"
+msgctxt "ACCOUNT_USER_NONE"
 msgid "There are no user accounts in the system."
 msgstr "Não há contas de usuário no sistema."
 
-msgctxt "OPERATION_ACCOUNT_GROUP_NONE"
+msgctxt "ACCOUNT_GROUP_NONE"
 msgid "There are no user groups in the system."
 msgstr "Não existe grupo de usuários no sistema."
 
-msgctxt "OPERATION_ERROR_INVALID_CHARS"
+msgctxt "ERROR_INVALID_CHARS"
 msgid "Unexpected characters in description."
 msgstr "Caracteres inesperados na descrição."
 
-msgctxt "OPERATION_USER_NAME"
+msgctxt "USER_NAME"
 msgid "User Name"
 msgstr "Nome do usuário"
 
-msgctxt "OPERATION_YOUR_ACCOUNT"
+msgctxt "YOUR_ACCOUNT"
 msgid "Your account:"
 msgstr "Sua conta:"
 
-msgctxt "OPERATION_YOUR_ACCOUNT_INVALID"
+msgctxt "YOUR_ACCOUNT_INVALID"
 msgid "The account name entered is invalid."
 msgstr "O nome de conta digitado é inválido."
 
-msgctxt "OPERATION_PASSWORD_CHANGE_SUCCESS"
+msgctxt "PASSWORD_CHANGE_SUCCESS"
 msgid "Your password has been successfully changed."
 msgstr "Sua senha foi trocada com sucesso."
 
-msgctxt "OPERATION_FM_NONBLANK"
+msgctxt "FM_NONBLANK"
 msgid "This field must not be left blank"
 msgstr "Este campo não pode ser deixado em branco"
 
-msgctxt "OPERATION_FM_INTEGER"
+msgctxt "FM_INTEGER"
 msgid "This field must contain a positive integer"
 msgstr "Este campo tem que conter um número inteiro positivo"
 
-msgctxt "OPERATION_FM_NUMBER"
+msgctxt "FM_NUMBER"
 msgid "This field must contain a number"
 msgstr "Este campo tem que conter um número"
 
-msgctxt "OPERATION_FM_WORD"
+msgctxt "FM_WORD"
 msgid "This field must look like a single word."
 msgstr "Este campo tem que parecer uma única palavra."
 
-msgctxt "OPERATION_FM_DATE"
+msgctxt "FM_DATE"
 msgid "The data entered could not be parsed as a date"
 msgstr "A data entrada não pode ser interpretada como data"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_NUMBER1"
+msgctxt "FM_CREDIT_CARD_NUMBER1"
 msgid "You must enter a credit card number"
 msgstr "Você tem que entrar um número de cartão de crédito"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_NUMBER2"
+msgctxt "FM_CREDIT_CARD_NUMBER2"
 msgid ""
 "Credit card numbers shouldn\\'t have anything but numbers, spaces or dashes"
 msgstr "Número de cartão de crédito só podem conter número, espaço e barra"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_NUMBER3"
+msgctxt "FM_CREDIT_CARD_NUMBER3"
 msgid "Must be at least 14 characters in length"
 msgstr "Tem que ter pelo menos 14 caracteres"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_NUMBER4"
+msgctxt "FM_CREDIT_CARD_NUMBER4"
 msgid "Doesn\\'t appear to be a valid credit card number"
 msgstr "Não parece ser o número de um cartão de crédito válido"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_EXPIRY1"
+msgctxt "FM_CREDIT_CARD_EXPIRY1"
 msgid "No expiry date entered."
 msgstr "Falta entrar data de expiração."
 
-msgctxt "OPERATION_FM_CREDIT_CARD_EXPIRY2"
+msgctxt "FM_CREDIT_CARD_EXPIRY2"
 msgid "Expiry date must be in the format MM/YY or MM/YYYY"
 msgstr "Data de expiração tem que ter o formato MM/YY ou MM/YYYY"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_EXPIRY3"
+msgctxt "FM_CREDIT_CARD_EXPIRY3"
 msgid "This expiry date appears to have already passed"
 msgstr "Esta data de expiração parece já ter passado"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_EXPIRY4"
+msgctxt "FM_CREDIT_CARD_EXPIRY4"
 msgid "This expiry date appears to be too far in the future"
 msgstr "Esta data de expiração parece ser em um futuro muito distante"
 
-msgctxt "OPERATION_FM_ISO_COUNTRY_CODE1"
+msgctxt "FM_ISO_COUNTRY_CODE1"
 msgid "You must provide a country code"
 msgstr "Você tem que fornecer o código do país"
 
-msgctxt "OPERATION_FM_ISO_COUNTRY_CODE2"
+msgctxt "FM_ISO_COUNTRY_CODE2"
 msgid "This field does not contain an ISO country code"
 msgstr "O campo não contem um código ISO de um país"
 
-msgctxt "OPERATION_FM_US_STATE"
+msgctxt "FM_US_STATE"
 msgid "This doesn\\'t appear to be a valid 2-letter US state abbreviation"
 msgstr "Isto não parece ser a abreviação de um estado americano com 2 letras"
 
-msgctxt "OPERATION_FM_US_ZIPCODE"
+msgctxt "FM_US_ZIPCODE"
 msgid "US zip codes must contain 5 or 9 numbers"
 msgstr "O código ZIP americano (o CEP deles) tem que conter 5 ou 9 números"
 
-msgctxt "OPERATION_FM_MINLENGTH1"
+msgctxt "FM_MINLENGTH1"
 msgid "Minimum length has been specified meaninglessly as [_1]"
 msgstr "O tamanho mínimo foi especificado inexpressivamente como {$minlength}"
 
-msgctxt "OPERATION_FM_MINLENGTH2"
+msgctxt "FM_MINLENGTH2"
 msgid "This field must be at least [_1] characters"
 msgstr "O campo precisa conter pelo menos {$minlength} caracteres"
 
-msgctxt "OPERATION_FM_MAXLENGTH1"
+msgctxt "FM_MAXLENGTH1"
 msgid "Maximum length has been specified meaninglessly as [_1]"
 msgstr "O tamanho máximo foi especificado inexpressivamente como {$maxlength}"
 
-msgctxt "OPERATION_FM_MAXLENGTH2"
+msgctxt "FM_MAXLENGTH2"
 msgid "This field must be no more than [_1] characters"
 msgstr "Este campo precisa conter não mais que {$maxlength} caracteres"
 
-msgctxt "OPERATION_FM_EXACTLENGTH1"
+msgctxt "FM_EXACTLENGTH1"
 msgid "You must specify the length for the field."
 msgstr "Você precisa especificar um tamanho para o campo."
 
-msgctxt "OPERATION_FM_EXACTLENGTH2"
+msgctxt "FM_EXACTLENGTH2"
 msgid "You must specify the exactlength of the field with an integer"
 msgstr ""
 "Você precisa especificar o comprimento máximo do campo como um número "
 "inteiro"
 
-msgctxt "OPERATION_FM_EXACTLENGTH3"
+msgctxt "FM_EXACTLENGTH3"
 msgid "This field must be exactly [_1] characters"
 msgstr "Este campo precisa ter exatamente {$exactlength} caracteres"
 
-msgctxt "OPERATION_FM_LENGTHRANGE1"
+msgctxt "FM_LENGTHRANGE1"
 msgid "You must specify the maximum and minimum length for the field."
 msgstr ""
 "Você tem que especificar os comprimentos máximo e o mínimo para o campo."
 
-msgctxt "OPERATION_FM_LENGTHRANGE2"
+msgctxt "FM_LENGTHRANGE2"
 msgid ""
 "You must specify the maximum and minimum lengths of the field with an "
 "integer"
@@ -477,53 +473,53 @@ msgstr ""
 "Você precisa especificar os comprimentos máximo e mínimo para o campo usando"
 " um número inteiro"
 
-msgctxt "OPERATION_FM_LENGTHRANGE3"
+msgctxt "FM_LENGTHRANGE3"
 msgid "This field must be between [_1] and [_2] characters"
 msgstr "Este campo precisa ter entre {$minlength} e {$maxlength} caracteres"
 
-msgctxt "OPERATION_FM_URL"
+msgctxt "FM_URL"
 msgid "This field must contain a URL starting with http:// or ftp://"
 msgstr "Este campo precisa conter uma URL começando com http:// ou ftp://"
 
-msgctxt "OPERATION_FM_EMAIL_SIMPLE1"
+msgctxt "FM_EMAIL_SIMPLE1"
 msgid "You must enter an email address."
 msgstr "Você precisa entrar um endereço de email."
 
-msgctxt "OPERATION_FM_EMAIL_SIMPLE2"
+msgctxt "FM_EMAIL_SIMPLE2"
 msgid "This field doesn\\'t look like an RFC822-compliant email address"
 msgstr ""
 "Este campo não parece ser um endereço de email compatível com a RFC822"
 
-msgctxt "OPERATION_FM_DOMAIN_NAME"
+msgctxt "FM_DOMAIN_NAME"
 msgid "This field doesn\\'t look like a valid Internet domain name or hostname."
 msgstr ""
 "Este campo não parece ser um endereço de domínio válido ou um nome de host."
 
-msgctxt "OPERATION_FM_IP_NUMBER1"
+msgctxt "FM_IP_NUMBER1"
 msgid "This field must contain a valid IP number and can not be left blank."
 msgstr ""
 "Este campo precisa conter um endereço IP e não pode ser deixado em branco."
 
-msgctxt "OPERATION_FM_IP_NUMBER2"
+msgctxt "FM_IP_NUMBER2"
 msgid "Invalid IP address format (expected X.X.X.X)"
 msgstr "Formato do endereço IP inválido (deve ser X.X.X.X)"
 
-msgctxt "OPERATION_FM_IP_NUMBER3"
+msgctxt "FM_IP_NUMBER3"
 msgid "[_1] is more than 255"
 msgstr "{$octet} é maior que 255"
 
-msgctxt "OPERATION_FM_USERNAME"
+msgctxt "FM_USERNAME"
 msgid ""
 "This field must look like a valid username (3 to 8 letters and numbers)"
 msgstr ""
 "Este campo precisa parecer um nome de usuário válido (3 à 8 letras e "
 "números)"
 
-msgctxt "OPERATION_FM_PASSWORD1"
+msgctxt "FM_PASSWORD1"
 msgid "You must provide a password."
 msgstr "Você tem que fornecer uma senha."
 
-msgctxt "OPERATION_FM_PASSWORD2"
+msgctxt "FM_PASSWORD2"
 msgid ""
 "The password you provided was not a good password.A good password must "
 "contain all of the following: upper case letter, lower case letter, number, "
@@ -533,18 +529,18 @@ msgstr ""
 " tudo o que segue: letra maiúscula, minúscula, números e caracteres não "
 "alfabéticos, e ter pelo menos 7 caracteres."
 
-msgctxt "OPERATION_FM_MAC_ADDRESS1"
+msgctxt "FM_MAC_ADDRESS1"
 msgid "You must provide a MAC address."
 msgstr "Você precisa fornecer um endereço MAC."
 
-msgctxt "OPERATION_FM_MAC_ADDRESS2"
+msgctxt "FM_MAC_ADDRESS2"
 msgid "The MAC address you provided was not valid."
 msgstr "O endereço MAC fornecido não é válido."
 
-msgctxt "OPERATION_FM_ERR_UNEXPECTED_DESC"
+msgctxt "FM_ERR_UNEXPECTED_DESC"
 msgid "Error: unexpected or missing characters in description"
 msgstr "Erro: caracter inesperado ou faltando na descrição"
 
-msgctxt "OPERATION_CSRF_VALIDATION_FAILURE"
-msgid "Placeholder for missing original text"
+msgctxt "CSRF_VALIDATION_FAILURE"
+msgid "Error: CSRF token is invalid or outdated."
 msgstr "Error: CSRF token is invalid or outdated."
diff --git a/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/General/pofiles/general_pt.po b/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/General/pofiles/general_pt.po
index 6b94627..c845dce 100644
--- a/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/General/pofiles/general_pt.po
+++ b/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/General/pofiles/general_pt.po
@@ -5,99 +5,95 @@ msgstr ""
 "Language: None\n"
 "Content-Type: text/plain; charset=utf-8\n"
 
-msgctxt "OPERATION_Collaboration"
+msgctxt "Collaboration"
 msgid "Collaboration"
 msgstr "Colaboração"
 
-msgctxt "OPERATION_Administration"
+msgctxt "Administration"
 msgid "Administration"
 msgstr "Administração"
 
-msgctxt "OPERATION_Security"
+msgctxt "Security"
 msgid "Security"
 msgstr "Segurança"
 
-msgctxt "OPERATION_Configuration"
+msgctxt "Configuration"
 msgid "Configuration"
 msgstr "Configuração"
 
-msgctxt "OPERATION_Miscellaneous"
+msgctxt "Miscellaneous"
 msgid "Miscellaneous"
 msgstr "Miscelânea"
 
-msgctxt "OPERATION_Your Settings"
-msgid "Your Settings"
-msgstr "Suas Configurações"
-
-msgctxt "OPERATION_SAVE"
+msgctxt "SAVE"
 msgid "Save"
 msgstr "Salvar"
 
-msgctxt "OPERATION_CANCEL"
+msgctxt "CANCEL"
 msgid "Cancel"
 msgstr "Cancelar"
 
-msgctxt "OPERATION_ENABLED"
+msgctxt "ENABLED"
 msgid "Enabled"
 msgstr "Habilitado"
 
-msgctxt "OPERATION_DISABLED"
+msgctxt "DISABLED"
 msgid "Disabled"
 msgstr "Desabilitado"
 
-msgctxt "OPERATION_NO"
+msgctxt "NO"
 msgid "No"
 msgstr "Não"
 
-msgctxt "OPERATION_YES"
+msgctxt "YES"
 msgid "Yes"
 msgstr "Sim"
 
-msgctxt "OPERATION_ADD"
+msgctxt "ADD"
 msgid "Add"
 msgstr "Adicionar"
 
-msgctxt "OPERATION_CREATE"
+msgctxt "CREATE"
 msgid "Create"
 msgstr "Criar"
 
-msgctxt "OPERATION_MODIFY"
+msgctxt "MODIFY"
 msgid "Modify"
 msgstr "Modificar"
 
-msgctxt "OPERATION_REMOVE"
+msgctxt "REMOVE"
 msgid "Remove"
 msgstr "Remover"
 
-msgctxt "OPERATION_COMMENT"
+msgctxt "COMMENT"
 msgid "Comment"
 msgstr "Comentário"
 
-msgctxt "OPERATION_NEXT"
+msgctxt "NEXT"
 msgid "Next"
 msgstr "Próximo"
 
-msgctxt "OPERATION_SELF"
+msgctxt "SELF"
 msgid "Self"
 msgstr "Próprio"
 
-msgctxt "OPERATION_REMOTE"
+msgctxt "REMOTE"
 msgid "Remote"
 msgstr "Remoto"
 
-msgctxt "OPERATION_LOCAL"
+msgctxt "LOCAL"
 msgid "Local"
 msgstr "Local"
 
-msgctxt "OPERATION_ACTION"
+msgctxt "ACTION"
 msgid "Action"
 msgstr "Ação"
 
-msgctxt "OPERATION_NETWORK"
+msgctxt "NETWORK"
 msgid "Network"
 msgstr "Rede"
 
-msgctxt "OPERATION_ROUTER"
+msgctxt "ROUTER"
 msgid "Router"
 msgstr "Roteador"
 
@@ -105,23 +101,23 @@ msgctxt "OPERATION_STATUS_REPORT"
 msgid "Operation status report"
 msgstr "Relarório de status de operação"
 
-msgctxt "OPERATION_ACCOUNT"
+msgctxt "ACCOUNT"
 msgid "Account"
 msgstr "Conta"
 
-msgctxt "OPERATION_GROUP"
+msgctxt "GROUP"
 msgid "Group"
 msgstr "Grupo"
 
-msgctxt "OPERATION_DESC_SECTIONBAR"
+msgctxt "DESC_SECTIONBAR"
 msgid "<hr class=\"sectionbar\"/>"
-msgstr " <hr class=\"sectionbar\"/> "
+msgstr "<hr class=\"sectionbar\"/>"
 
-msgctxt "OPERATION_NO_PIPES_ALLOWED"
+msgctxt "NO_PIPES_ALLOWED"
 msgid "Pipe symbols (|) are not permitted in this field"
 msgstr "Símbolos pipe (|) não são permitidos neste campo"
 
-msgctxt "OPERATION_ERROR_BELOW"
+msgctxt "ERROR_BELOW"
 msgid ""
 "ERROR: There was an error in the validation of this page. Please scroll down"
 " and find the specific problem."
@@ -129,27 +125,27 @@ msgstr ""
 "ERRO: Existiu um erro na validação desta página. Favor rolar para baixo e "
 "encontrar o problema específico."
 
-msgctxt "OPERATION_ACCESS"
+msgctxt "ACCESS"
 msgid "Access"
 msgstr "Acesso"
 
-msgctxt "OPERATION_ACCOUNT_LOCKED"
+msgctxt "ACCOUNT_LOCKED"
 msgid "Account is locked"
 msgstr "Conta bloqueada"
 
-msgctxt "OPERATION_GROUP_ADD"
+msgctxt "GROUP_ADD"
 msgid "Add group"
 msgstr "Adicionar grupo"
 
-msgctxt "OPERATION_NETWORKS_ALLOW_LOCAL"
+msgctxt "NETWORKS_ALLOW_LOCAL"
 msgid "Allow access only from local networks"
 msgstr "Permite acesso somente da rede local"
 
-msgctxt "OPERATION_NETWORKS_ALLOW_PUBLIC"
+msgctxt "NETWORKS_ALLOW_PUBLIC"
 msgid "Allow public access (entire Internet)"
 msgstr "Permite acesso público (Internet inteira)"
 
-msgctxt "OPERATION_ERROR_PASSWORD_CHANGE"
+msgctxt "ERROR_PASSWORD_CHANGE"
 msgid ""
 "An error occurred while attempting to change your password. Please make sure"
 " that the old password entered is correct."
@@ -157,319 +153,319 @@ msgstr ""
 "Ocorreu um erro enquanto tentando mudar sua senha. Por favor assegure-se de "
 "que a senha antiga digitada esteja correta."
 
-msgctxt "OPERATION_BACK"
+msgctxt "BACK"
 msgid "Back"
 msgstr "Voltar"
 
-msgctxt "OPERATION_BACKUP"
+msgctxt "BACKUP"
 msgid "Backup"
 msgstr "Backup"
 
-msgctxt "OPERATION_DESCRIPTION_BRIEF"
+msgctxt "DESCRIPTION_BRIEF"
 msgid "Brief description"
 msgstr "Breve descrição"
 
-msgctxt "OPERATION_PASSWORD_CHANGE"
+msgctxt "PASSWORD_CHANGE"
 msgid "Change Password"
 msgstr "Trocar senha"
 
-msgctxt "OPERATION_RESET_PASSWORD_TITLE"
+msgctxt "RESET_PASSWORD_TITLE"
 msgid "Reset user password"
 msgstr "Resetar senha de usuário"
 
-msgctxt "OPERATION_ACCOUNT_PASSWORD_CHANGE"
+msgctxt "ACCOUNT_PASSWORD_CHANGE"
 msgid "Change account password"
 msgstr "Mudar a senha da conta"
 
-msgctxt "OPERATION_CONTENT"
+msgctxt "CONTENT"
 msgid "Content"
 msgstr "Conteúdo"
 
-msgctxt "OPERATION_CREATE_GROUP"
+msgctxt "CREATE_GROUP"
 msgid "Create user group"
 msgstr "Criar grupo de usuários"
 
-msgctxt "OPERATION_USER_LIST_CURRENT"
+msgctxt "USER_LIST_CURRENT"
 msgid "Current list of users"
 msgstr "Lista atual de usuários"
 
-msgctxt "OPERATION_DESCRIPTION"
+msgctxt "DESCRIPTION"
 msgid "Description"
 msgstr "Descrição"
 
-msgctxt "OPERATION_DESTINATION"
+msgctxt "DESTINATION"
 msgid "Destination"
 msgstr "Destino"
 
-msgctxt "OPERATION_DOMAIN_NAME"
+msgctxt "DOMAIN_NAME"
 msgid "Domain name"
 msgstr "Nome do domínio"
 
-msgctxt "OPERATION_DOMAIN"
+msgctxt "DOMAIN"
 msgid "Domain"
 msgstr "Domínio"
 
-msgctxt "OPERATION_DOMAINS"
+msgctxt "DOMAINS"
 msgid "Domains"
 msgstr "Domínios"
 
-msgctxt "OPERATION_DOWNLOAD"
+msgctxt "DOWNLOAD"
 msgid "Download"
 msgstr "Baixar"
 
-msgctxt "OPERATION_ERROR_UPDATING_CONFIGURATION"
+msgctxt "ERROR_UPDATING_CONFIGURATION"
 msgid "Error occurred while updating system configuration."
 msgstr "Ocorreu erro enquanto atualizava a configuração do sistema."
 
-msgctxt "OPERATION_GROUP_MEMBERS"
+msgctxt "GROUP_MEMBERS"
 msgid "Group Members"
 msgstr "Membros do grupo"
 
-msgctxt "OPERATION_GROUP_NAME"
+msgctxt "GROUP_NAME"
 msgid "Group Name"
 msgstr "Nome do grupo"
 
-msgctxt "OPERATION_GROUPS"
+msgctxt "GROUPS"
 msgid "Groups"
 msgstr "Grupos"
 
-msgctxt "OPERATION_IP_ADDRESS"
+msgctxt "IP_ADDRESS"
 msgid "IP Address"
 msgstr "Endereço IP"
 
-msgctxt "OPERATION_IP_ADDRESS_OR_FQDN"
+msgctxt "IP_ADDRESS_OR_FQDN"
 msgid "IP Address or FQDN"
 msgstr "Endereço IP"
 
-msgctxt "OPERATION_USER_INVALID"
+msgctxt "USER_INVALID"
 msgid "Invalid user"
 msgstr "Usuário inválido"
 
-msgctxt "OPERATION_LOCATION"
+msgctxt "LOCATION"
 msgid "Location"
 msgstr "Localização"
 
-msgctxt "OPERATION_MB"
+msgctxt "MB"
 msgid "Mb"
 msgstr "Mb"
 
-msgctxt "OPERATION_MODIFY_USER_GROUP"
+msgctxt "MODIFY_USER_GROUP"
 msgid "Modify user group"
 msgstr "Modificar grupo de usuários"
 
-msgctxt "OPERATION_NAME"
+msgctxt "NAME"
 msgid "Name"
 msgstr "Nome"
 
-msgctxt "OPERATION_PASSWORD_VERIFY_NEW"
+msgctxt "PASSWORD_VERIFY_NEW"
 msgid "New password (verify):"
 msgstr "Nova senha (verificação):"
 
-msgctxt "OPERATION_PASSWORD_NEW"
+msgctxt "PASSWORD_NEW"
 msgid "New password:"
 msgstr "Nova senha:"
 
-msgctxt "OPERATION_OFF"
+msgctxt "OFF"
 msgid "Off"
 msgstr "Desligado"
 
-msgctxt "OPERATION_OK"
+msgctxt "OK"
 msgid "Ok"
 msgstr "Ok"
 
-msgctxt "OPERATION_PASSWORD_OLD"
+msgctxt "PASSWORD_OLD"
 msgid "Old password:"
 msgstr "Senha antiga:"
 
-msgctxt "OPERATION_ON"
+msgctxt "ON"
 msgid "On"
 msgstr "On"
 
-msgctxt "OPERATION_PASSWORD"
+msgctxt "PASSWORD"
 msgid "Password"
 msgstr "Senha"
 
-msgctxt "OPERATION_PERFORM"
+msgctxt "PERFORM"
 msgid "Perform"
 msgstr "Executar"
 
-msgctxt "OPERATION_RECONFIGURE"
+msgctxt "RECONFIGURE"
 msgid "Reconfigure"
 msgstr "Reconfigurar"
 
-msgctxt "OPERATION_REMOVE_USER_GROUP"
+msgctxt "REMOVE_USER_GROUP"
 msgid "Remove user group"
 msgstr "Remover grupo de usuários"
 
-msgctxt "OPERATION_PASSWORD_RESET"
+msgctxt "PASSWORD_RESET"
 msgid "Reset password"
 msgstr "Resetar senha"
 
-msgctxt "OPERATION_RESTORE"
+msgctxt "RESTORE"
 msgid "Restore"
 msgstr "Restaurar"
 
-msgctxt "OPERATION_SHUTDOWN"
+msgctxt "SHUTDOWN"
 msgid "Shutdown"
 msgstr "Desligar"
 
-msgctxt "OPERATION_SUCCESS"
+msgctxt "SUCCESS"
 msgid "Success"
 msgstr "Sucesso"
 
-msgctxt "OPERATION_ACCOUNT_NAME_INVALID"
+msgctxt "ACCOUNT_NAME_INVALID"
 msgid "The account name entered is invalid."
 msgstr "O nome de conta digitado é inválido."
 
-msgctxt "OPERATION_ACCOUNT_NAME_INVALID_CHARS"
+msgctxt "ACCOUNT_NAME_INVALID_CHARS"
 msgid "The account name you entered contained invalid characters."
 msgstr "O nome de conta que você digitou contém caracteres inválidos."
 
-msgctxt "OPERATION_PASSWORD_OLD_INVALID_CHARS"
+msgctxt "PASSWORD_OLD_INVALID_CHARS"
 msgid "The old password you entered contained invalid characters."
 msgstr "A senha antiga que você digitou contém caracteres inválidos."
 
-msgctxt "OPERATION_PASSWORD_INVALID_CHARS"
+msgctxt "PASSWORD_INVALID_CHARS"
 msgid "The password you entered contained invalid characters."
 msgstr "A senha que você digitou contém caracteres inválidos."
 
-msgctxt "OPERATION_PASSWORD_VERIFY_ERROR"
+msgctxt "PASSWORD_VERIFY_ERROR"
 msgid "The passwords you entered did not match."
 msgstr "As senhas que você entrou não são iguais."
 
-msgctxt "OPERATION_ACCOUNT_USER_NONE"
+msgctxt "ACCOUNT_USER_NONE"
 msgid "There are no user accounts in the system."
 msgstr "Não há contas de usuário no sistema."
 
-msgctxt "OPERATION_ACCOUNT_GROUP_NONE"
+msgctxt "ACCOUNT_GROUP_NONE"
 msgid "There are no user groups in the system."
 msgstr "Não existe grupo de usuários no sistema."
 
-msgctxt "OPERATION_ERROR_INVALID_CHARS"
+msgctxt "ERROR_INVALID_CHARS"
 msgid "Unexpected characters in description."
 msgstr "Caracteres inesperados na descrição."
 
-msgctxt "OPERATION_USER_NAME"
+msgctxt "USER_NAME"
 msgid "User Name"
 msgstr "Nome do usuário"
 
-msgctxt "OPERATION_YOUR_ACCOUNT"
+msgctxt "YOUR_ACCOUNT"
 msgid "Your account:"
 msgstr "Sua conta:"
 
-msgctxt "OPERATION_YOUR_ACCOUNT_INVALID"
+msgctxt "YOUR_ACCOUNT_INVALID"
 msgid "The account name entered is invalid."
 msgstr "O nome de conta digitado é inválido."
 
-msgctxt "OPERATION_PASSWORD_CHANGE_SUCCESS"
+msgctxt "PASSWORD_CHANGE_SUCCESS"
 msgid "Your password has been successfully changed."
 msgstr "Sua senha foi trocada com sucesso."
 
-msgctxt "OPERATION_FM_NONBLANK"
+msgctxt "FM_NONBLANK"
 msgid "This field must not be left blank"
 msgstr "Este campo não pode ser deixado em branco"
 
-msgctxt "OPERATION_FM_INTEGER"
+msgctxt "FM_INTEGER"
 msgid "This field must contain a positive integer"
 msgstr "Este campo tem que conter um número inteiro positivo"
 
-msgctxt "OPERATION_FM_NUMBER"
+msgctxt "FM_NUMBER"
 msgid "This field must contain a number"
 msgstr "Este campo tem que conter um número"
 
-msgctxt "OPERATION_FM_WORD"
+msgctxt "FM_WORD"
 msgid "This field must look like a single word."
 msgstr "Este campo tem que parecer uma única palavra."
 
-msgctxt "OPERATION_FM_DATE"
+msgctxt "FM_DATE"
 msgid "The data entered could not be parsed as a date"
 msgstr "A data entrada não pode ser interpretada como data"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_NUMBER1"
+msgctxt "FM_CREDIT_CARD_NUMBER1"
 msgid "You must enter a credit card number"
 msgstr "Você tem que entrar um número de cartão de crédito"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_NUMBER2"
+msgctxt "FM_CREDIT_CARD_NUMBER2"
 msgid ""
 "Credit card numbers shouldn\\'t have anything but numbers, spaces or dashes"
 msgstr "Número de cartão de crédito só podem conter número, espaço e barra"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_NUMBER3"
+msgctxt "FM_CREDIT_CARD_NUMBER3"
 msgid "Must be at least 14 characters in length"
 msgstr "Tem que ter pelo menos 14 caracteres"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_NUMBER4"
+msgctxt "FM_CREDIT_CARD_NUMBER4"
 msgid "Doesn\\'t appear to be a valid credit card number"
 msgstr "Não parece ser o número de um cartão de crédito"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_EXPIRY1"
+msgctxt "FM_CREDIT_CARD_EXPIRY1"
 msgid "No expiry date entered."
 msgstr "Falta entrar data de expiração."
 
-msgctxt "OPERATION_FM_CREDIT_CARD_EXPIRY2"
+msgctxt "FM_CREDIT_CARD_EXPIRY2"
 msgid "Expiry date must be in the format MM/YY or MM/YYYY"
 msgstr "Data de expiração tem que ter o formato MM/YY ou MM/YYYY"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_EXPIRY3"
+msgctxt "FM_CREDIT_CARD_EXPIRY3"
 msgid "This expiry date appears to have already passed"
 msgstr "Esta data de expiração parece já ter sido passada"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_EXPIRY4"
+msgctxt "FM_CREDIT_CARD_EXPIRY4"
 msgid "This expiry date appears to be too far in the future"
 msgstr "Esta data de expiração parece ser em um futuro muito distante"
 
-msgctxt "OPERATION_FM_ISO_COUNTRY_CODE1"
+msgctxt "FM_ISO_COUNTRY_CODE1"
 msgid "You must provide a country code"
 msgstr "Você tem que fornacer o código do país"
 
-msgctxt "OPERATION_FM_ISO_COUNTRY_CODE2"
+msgctxt "FM_ISO_COUNTRY_CODE2"
 msgid "This field does not contain an ISO country code"
 msgstr "O campo não contem um código ISO de um país"
 
-msgctxt "OPERATION_FM_US_STATE"
+msgctxt "FM_US_STATE"
 msgid "This doesn\\'t appear to be a valid 2-letter US state abbreviation"
 msgstr "Isto não parece ser a abreviação de um estado americano com 2 letras"
 
-msgctxt "OPERATION_FM_US_ZIPCODE"
+msgctxt "FM_US_ZIPCODE"
 msgid "US zip codes must contain 5 or 9 numbers"
 msgstr "O código zip americano tem que conter 5 ou 9 números"
 
-msgctxt "OPERATION_FM_MINLENGTH1"
+msgctxt "FM_MINLENGTH1"
 msgid "Minimum length has been specified meaninglessly as [_1]"
 msgstr "O tamanho mínimo foi especificado inespressivamente como {$minlength}"
 
-msgctxt "OPERATION_FM_MINLENGTH2"
+msgctxt "FM_MINLENGTH2"
 msgid "This field must be at least [_1] characters"
 msgstr "O campo tem que conter pelo menos {$minlength} caracteres"
 
-msgctxt "OPERATION_FM_MAXLENGTH1"
+msgctxt "FM_MAXLENGTH1"
 msgid "Maximum length has been specified meaninglessly as [_1]"
 msgstr "O tamanho mánimo foi especificado inespressivamente como {$maxlength}"
 
-msgctxt "OPERATION_FM_MAXLENGTH2"
+msgctxt "FM_MAXLENGTH2"
 msgid "This field must be no more than [_1] characters"
 msgstr "Este campo tem que conter não mais que {$maxlength} caracteres"
 
-msgctxt "OPERATION_FM_EXACTLENGTH1"
+msgctxt "FM_EXACTLENGTH1"
 msgid "You must specify the length for the field."
 msgstr "Você tem que especificar um tamanho para o campo."
 
-msgctxt "OPERATION_FM_EXACTLENGTH2"
+msgctxt "FM_EXACTLENGTH2"
 msgid "You must specify the exactlength of the field with an integer"
 msgstr ""
 "Você tem que especificar o comprimento máximo do campo como um número "
 "inteiro"
 
-msgctxt "OPERATION_FM_EXACTLENGTH3"
+msgctxt "FM_EXACTLENGTH3"
 msgid "This field must be exactly [_1] characters"
 msgstr "Este campo tem que ter exatamente {$exactlength} caracteres"
 
-msgctxt "OPERATION_FM_LENGTHRANGE1"
+msgctxt "FM_LENGTHRANGE1"
 msgid "You must specify the maximum and minimum length for the field."
 msgstr ""
 "Você tem que especificar os comprimentos máximo e o mínimo para o campo."
 
-msgctxt "OPERATION_FM_LENGTHRANGE2"
+msgctxt "FM_LENGTHRANGE2"
 msgid ""
 "You must specify the maximum and minimum lengths of the field with an "
 "integer"
@@ -477,53 +473,53 @@ msgstr ""
 "Você tem que especificar os comprimentos máximo e mínimo para o campo com "
 "número inteiro"
 
-msgctxt "OPERATION_FM_LENGTHRANGE3"
+msgctxt "FM_LENGTHRANGE3"
 msgid "This field must be between [_1] and [_2] characters"
 msgstr "Este campo tem que ter entre {$minlength} e {$maxlength} caracteres"
 
-msgctxt "OPERATION_FM_URL"
+msgctxt "FM_URL"
 msgid "This field must contain a URL starting with http:// or ftp://"
 msgstr "Este campo tem que conter uma URL começando com http:// ou ftp://"
 
-msgctxt "OPERATION_FM_EMAIL_SIMPLE1"
+msgctxt "FM_EMAIL_SIMPLE1"
 msgid "You must enter an email address."
 msgstr "Você tem que entrar um endereço de email."
 
-msgctxt "OPERATION_FM_EMAIL_SIMPLE2"
+msgctxt "FM_EMAIL_SIMPLE2"
 msgid "This field doesn\\'t look like an RFC822-compliant email address"
 msgstr ""
 "Este campo não parece ser um endereço de email compatível com a RFC822"
 
-msgctxt "OPERATION_FM_DOMAIN_NAME"
+msgctxt "FM_DOMAIN_NAME"
 msgid "This field doesn\\'t look like a valid Internet domain name or hostname."
 msgstr ""
 "Este campo não parece ser um endereço de domínio válido ou um nome de host."
 
-msgctxt "OPERATION_FM_IP_NUMBER1"
+msgctxt "FM_IP_NUMBER1"
 msgid "This field must contain a valid IP number and can not be left blank."
 msgstr ""
 "Este campo tem que conter um endereço IP e não pode ser deixado em branco."
 
-msgctxt "OPERATION_FM_IP_NUMBER2"
+msgctxt "FM_IP_NUMBER2"
 msgid "Invalid IP address format (expected X.X.X.X)"
 msgstr "Endereço IP inválido para início do DHCP"
 
-msgctxt "OPERATION_FM_IP_NUMBER3"
+msgctxt "FM_IP_NUMBER3"
 msgid "[_1] is more than 255"
 msgstr "{$octet} é maior que 255"
 
-msgctxt "OPERATION_FM_USERNAME"
+msgctxt "FM_USERNAME"
 msgid ""
 "This field must look like a valid username (3 to 8 letters and numbers)"
 msgstr ""
 "Este campo tem que parecer um nome de usuário válido (3 à 8 letras e "
 "números)"
 
-msgctxt "OPERATION_FM_PASSWORD1"
+msgctxt "FM_PASSWORD1"
 msgid "You must provide a password."
 msgstr "Você tem que fornecer uma senha."
 
-msgctxt "OPERATION_FM_PASSWORD2"
+msgctxt "FM_PASSWORD2"
 msgid ""
 "The password you provided was not a good password.A good password must "
 "contain all of the following: upper case letter, lower case letter, number, "
@@ -533,18 +529,18 @@ msgstr ""
 " tudo o que segue: letra maiúscula, minúscula, números e caracteres não "
 "alfabéticos, e ter pelo menos 7 caracteres."
 
-msgctxt "OPERATION_FM_MAC_ADDRESS1"
+msgctxt "FM_MAC_ADDRESS1"
 msgid "You must provide a MAC address."
 msgstr "Você tem que fornecer um endereço MAC."
 
-msgctxt "OPERATION_FM_MAC_ADDRESS2"
+msgctxt "FM_MAC_ADDRESS2"
 msgid "The MAC address you provided was not valid."
 msgstr "O endereço MAC fornecido não é válido."
 
-msgctxt "OPERATION_FM_ERR_UNEXPECTED_DESC"
+msgctxt "FM_ERR_UNEXPECTED_DESC"
 msgid "Error: unexpected or missing characters in description"
 msgstr "Erro: caracter inesperado ou faltando na descrição"
 
-msgctxt "OPERATION_CSRF_VALIDATION_FAILURE"
-msgid "Placeholder for missing original text"
+msgctxt "CSRF_VALIDATION_FAILURE"
+msgid "Error: CSRF token is invalid or outdated."
 msgstr "Error: CSRF token is invalid or outdated."
diff --git a/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/General/pofiles/general_ro.po b/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/General/pofiles/general_ro.po
index bb09a86..0b6ca64 100644
--- a/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/General/pofiles/general_ro.po
+++ b/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/General/pofiles/general_ro.po
@@ -5,99 +5,95 @@ msgstr ""
 "Language: None\n"
 "Content-Type: text/plain; charset=utf-8\n"
 
-msgctxt "OPERATION_Collaboration"
+msgctxt "Collaboration"
 msgid "Collaboration"
 msgstr "Collaboration"
 
-msgctxt "OPERATION_Administration"
+msgctxt "Administration"
 msgid "Administration"
 msgstr "Administrația"
 
-msgctxt "OPERATION_Security"
+msgctxt "Security"
 msgid "Security"
 msgstr "Security"
 
-msgctxt "OPERATION_Configuration"
+msgctxt "Configuration"
 msgid "Configuration"
 msgstr "Configurare"
 
-msgctxt "OPERATION_Miscellaneous"
+msgctxt "Miscellaneous"
 msgid "Miscellaneous"
 msgstr "Miscellaneous"
 
-msgctxt "OPERATION_Your Settings"
-msgid "Your Settings"
-msgstr "Your Settings"
-
-msgctxt "OPERATION_SAVE"
+msgctxt "SAVE"
 msgid "Save"
 msgstr "Salvează"
 
-msgctxt "OPERATION_CANCEL"
+msgctxt "CANCEL"
 msgid "Cancel"
 msgstr "Anulare"
 
-msgctxt "OPERATION_ENABLED"
+msgctxt "ENABLED"
 msgid "Enabled"
 msgstr "Activat"
 
-msgctxt "OPERATION_DISABLED"
+msgctxt "DISABLED"
 msgid "Disabled"
 msgstr "Disabled"
 
-msgctxt "OPERATION_NO"
+msgctxt "NO"
 msgid "No"
 msgstr "Nu"
 
-msgctxt "OPERATION_YES"
+msgctxt "YES"
 msgid "Yes"
 msgstr "Da"
 
-msgctxt "OPERATION_ADD"
+msgctxt "ADD"
 msgid "Add"
 msgstr "Adaugă"
 
-msgctxt "OPERATION_CREATE"
+msgctxt "CREATE"
 msgid "Create"
 msgstr "Create"
 
-msgctxt "OPERATION_MODIFY"
+msgctxt "MODIFY"
 msgid "Modify"
 msgstr "Modifică"
 
-msgctxt "OPERATION_REMOVE"
+msgctxt "REMOVE"
 msgid "Remove"
 msgstr "Eliminare"
 
-msgctxt "OPERATION_COMMENT"
+msgctxt "COMMENT"
 msgid "Comment"
 msgstr "Comment"
 
-msgctxt "OPERATION_NEXT"
+msgctxt "NEXT"
 msgid "Next"
 msgstr "Următorul"
 
-msgctxt "OPERATION_SELF"
+msgctxt "SELF"
 msgid "Self"
 msgstr "Self"
 
-msgctxt "OPERATION_REMOTE"
+msgctxt "REMOTE"
 msgid "Remote"
 msgstr "Eliminare"
 
-msgctxt "OPERATION_LOCAL"
+msgctxt "LOCAL"
 msgid "Local"
 msgstr "Local"
 
-msgctxt "OPERATION_ACTION"
+msgctxt "ACTION"
 msgid "Action"
 msgstr "Acțiune"
 
-msgctxt "OPERATION_NETWORK"
+msgctxt "NETWORK"
 msgid "Network"
 msgstr "Network"
 
-msgctxt "OPERATION_ROUTER"
+msgctxt "ROUTER"
 msgid "Router"
 msgstr "Router"
 
@@ -105,23 +101,23 @@ msgctxt "OPERATION_STATUS_REPORT"
 msgid "Operation status report"
 msgstr "Raport operațiune"
 
-msgctxt "OPERATION_ACCOUNT"
+msgctxt "ACCOUNT"
 msgid "Account"
 msgstr "Cont"
 
-msgctxt "OPERATION_GROUP"
+msgctxt "GROUP"
 msgid "Group"
 msgstr "Group"
 
-msgctxt "OPERATION_DESC_SECTIONBAR"
+msgctxt "DESC_SECTIONBAR"
 msgid "<hr class=\"sectionbar\"/>"
-msgstr " <hr class=\"sectionbar\"/> "
+msgstr "<hr class=\"sectionbar\"/>"
 
-msgctxt "OPERATION_NO_PIPES_ALLOWED"
+msgctxt "NO_PIPES_ALLOWED"
 msgid "Pipe symbols (|) are not permitted in this field"
 msgstr "Pipe symbols (|) are not permitted in this field"
 
-msgctxt "OPERATION_ERROR_BELOW"
+msgctxt "ERROR_BELOW"
 msgid ""
 "ERROR: There was an error in the validation of this page. Please scroll down"
 " and find the specific problem."
@@ -129,27 +125,27 @@ msgstr ""
 "ERROR: There was an error in the validation of this page. Please scroll down"
 " and find the specific problem."
 
-msgctxt "OPERATION_ACCESS"
+msgctxt "ACCESS"
 msgid "Access"
 msgstr "Access"
 
-msgctxt "OPERATION_ACCOUNT_LOCKED"
+msgctxt "ACCOUNT_LOCKED"
 msgid "Account is locked"
 msgstr "Account is locked"
 
-msgctxt "OPERATION_GROUP_ADD"
+msgctxt "GROUP_ADD"
 msgid "Add group"
 msgstr "Add group"
 
-msgctxt "OPERATION_NETWORKS_ALLOW_LOCAL"
+msgctxt "NETWORKS_ALLOW_LOCAL"
 msgid "Allow access only from local networks"
 msgstr "Allow access only from local networks"
 
-msgctxt "OPERATION_NETWORKS_ALLOW_PUBLIC"
+msgctxt "NETWORKS_ALLOW_PUBLIC"
 msgid "Allow public access (entire Internet)"
 msgstr "Allow public access (entire Internet)"
 
-msgctxt "OPERATION_ERROR_PASSWORD_CHANGE"
+msgctxt "ERROR_PASSWORD_CHANGE"
 msgid ""
 "An error occurred while attempting to change your password. Please make sure"
 " that the old password entered is correct."
@@ -157,317 +153,317 @@ msgstr ""
 "An error occurred while attempting to change your password. Please make sure"
 " that the old password entered is correct."
 
-msgctxt "OPERATION_BACK"
+msgctxt "BACK"
 msgid "Back"
 msgstr "Înapoi"
 
-msgctxt "OPERATION_BACKUP"
+msgctxt "BACKUP"
 msgid "Backup"
 msgstr "Backup"
 
-msgctxt "OPERATION_DESCRIPTION_BRIEF"
+msgctxt "DESCRIPTION_BRIEF"
 msgid "Brief description"
 msgstr "Brief description"
 
-msgctxt "OPERATION_PASSWORD_CHANGE"
+msgctxt "PASSWORD_CHANGE"
 msgid "Change Password"
-msgstr "Schimbaţi-vă parola "
+msgstr "Schimbaţi-vă parola"
 
-msgctxt "OPERATION_RESET_PASSWORD_TITLE"
+msgctxt "RESET_PASSWORD_TITLE"
 msgid "Reset user password"
 msgstr "Reset user password"
 
-msgctxt "OPERATION_ACCOUNT_PASSWORD_CHANGE"
+msgctxt "ACCOUNT_PASSWORD_CHANGE"
 msgid "Change account password"
 msgstr "Schimbă parola contului"
 
-msgctxt "OPERATION_CONTENT"
+msgctxt "CONTENT"
 msgid "Content"
 msgstr "Content"
 
-msgctxt "OPERATION_CREATE_GROUP"
+msgctxt "CREATE_GROUP"
 msgid "Create user group"
 msgstr "Create user group"
 
-msgctxt "OPERATION_USER_LIST_CURRENT"
+msgctxt "USER_LIST_CURRENT"
 msgid "Current list of users"
 msgstr "Current list of users"
 
-msgctxt "OPERATION_DESCRIPTION"
+msgctxt "DESCRIPTION"
 msgid "Description"
 msgstr "Descriere"
 
-msgctxt "OPERATION_DESTINATION"
+msgctxt "DESTINATION"
 msgid "Destination"
 msgstr "Destination"
 
-msgctxt "OPERATION_DOMAIN_NAME"
+msgctxt "DOMAIN_NAME"
 msgid "Domain name"
 msgstr "Domain name"
 
-msgctxt "OPERATION_DOMAIN"
+msgctxt "DOMAIN"
 msgid "Domain"
 msgstr "Domain"
 
-msgctxt "OPERATION_DOMAINS"
+msgctxt "DOMAINS"
 msgid "Domains"
 msgstr "Domains"
 
-msgctxt "OPERATION_DOWNLOAD"
+msgctxt "DOWNLOAD"
 msgid "Download"
 msgstr "Descarcă"
 
-msgctxt "OPERATION_ERROR_UPDATING_CONFIGURATION"
+msgctxt "ERROR_UPDATING_CONFIGURATION"
 msgid "Error occurred while updating system configuration."
 msgstr "Error occurred while updating system configuration."
 
-msgctxt "OPERATION_GROUP_MEMBERS"
+msgctxt "GROUP_MEMBERS"
 msgid "Group Members"
 msgstr "Group Members"
 
-msgctxt "OPERATION_GROUP_NAME"
+msgctxt "GROUP_NAME"
 msgid "Group Name"
 msgstr "Group Name"
 
-msgctxt "OPERATION_GROUPS"
+msgctxt "GROUPS"
 msgid "Groups"
 msgstr "Groups"
 
-msgctxt "OPERATION_IP_ADDRESS"
+msgctxt "IP_ADDRESS"
 msgid "IP Address"
 msgstr "Adresă e-mail"
 
-msgctxt "OPERATION_IP_ADDRESS_OR_FQDN"
+msgctxt "IP_ADDRESS_OR_FQDN"
 msgid "IP Address or FQDN"
 msgstr "IP Address or FQDN"
 
-msgctxt "OPERATION_USER_INVALID"
+msgctxt "USER_INVALID"
 msgid "Invalid user"
 msgstr "Invalid user"
 
-msgctxt "OPERATION_LOCATION"
+msgctxt "LOCATION"
 msgid "Location"
 msgstr "Location"
 
-msgctxt "OPERATION_MB"
+msgctxt "MB"
 msgid "Mb"
 msgstr "Mb (megaocteți)"
 
-msgctxt "OPERATION_MODIFY_USER_GROUP"
+msgctxt "MODIFY_USER_GROUP"
 msgid "Modify user group"
 msgstr "Modify user group"
 
-msgctxt "OPERATION_NAME"
+msgctxt "NAME"
 msgid "Name"
 msgstr "Nume"
 
-msgctxt "OPERATION_PASSWORD_VERIFY_NEW"
+msgctxt "PASSWORD_VERIFY_NEW"
 msgid "New password (verify):"
 msgstr "New password (verify):"
 
-msgctxt "OPERATION_PASSWORD_NEW"
+msgctxt "PASSWORD_NEW"
 msgid "New password:"
 msgstr "New password:"
 
-msgctxt "OPERATION_OFF"
+msgctxt "OFF"
 msgid "Off"
 msgstr "Off"
 
-msgctxt "OPERATION_OK"
+msgctxt "OK"
 msgid "Ok"
 msgstr "Ok"
 
-msgctxt "OPERATION_PASSWORD_OLD"
+msgctxt "PASSWORD_OLD"
 msgid "Old password:"
 msgstr "Old password:"
 
-msgctxt "OPERATION_ON"
+msgctxt "ON"
 msgid "On"
 msgstr "On"
 
-msgctxt "OPERATION_PASSWORD"
+msgctxt "PASSWORD"
 msgid "Password"
 msgstr "Parolă"
 
-msgctxt "OPERATION_PERFORM"
+msgctxt "PERFORM"
 msgid "Perform"
 msgstr "Execută"
 
-msgctxt "OPERATION_RECONFIGURE"
+msgctxt "RECONFIGURE"
 msgid "Reconfigure"
 msgstr "Reconfigurare"
 
-msgctxt "OPERATION_REMOVE_USER_GROUP"
+msgctxt "REMOVE_USER_GROUP"
 msgid "Remove user group"
 msgstr "Remove user group"
 
-msgctxt "OPERATION_PASSWORD_RESET"
+msgctxt "PASSWORD_RESET"
 msgid "Reset password"
 msgstr "Reset password"
 
-msgctxt "OPERATION_RESTORE"
+msgctxt "RESTORE"
 msgid "Restore"
 msgstr "Restore"
 
-msgctxt "OPERATION_SHUTDOWN"
+msgctxt "SHUTDOWN"
 msgid "Shutdown"
 msgstr "Închidere"
 
-msgctxt "OPERATION_SUCCESS"
+msgctxt "SUCCESS"
 msgid "Success"
 msgstr "Success"
 
-msgctxt "OPERATION_ACCOUNT_NAME_INVALID"
+msgctxt "ACCOUNT_NAME_INVALID"
 msgid "The account name entered is invalid."
 msgstr "The account name entered is invalid."
 
-msgctxt "OPERATION_ACCOUNT_NAME_INVALID_CHARS"
+msgctxt "ACCOUNT_NAME_INVALID_CHARS"
 msgid "The account name you entered contained invalid characters."
 msgstr "The account name you entered contained invalid characters."
 
-msgctxt "OPERATION_PASSWORD_OLD_INVALID_CHARS"
+msgctxt "PASSWORD_OLD_INVALID_CHARS"
 msgid "The old password you entered contained invalid characters."
 msgstr "The old password you entered contained invalid characters."
 
-msgctxt "OPERATION_PASSWORD_INVALID_CHARS"
+msgctxt "PASSWORD_INVALID_CHARS"
 msgid "The password you entered contained invalid characters."
 msgstr "The password you entered contained invalid characters."
 
-msgctxt "OPERATION_PASSWORD_VERIFY_ERROR"
+msgctxt "PASSWORD_VERIFY_ERROR"
 msgid "The passwords you entered did not match."
 msgstr "The passwords you entered did not match."
 
-msgctxt "OPERATION_ACCOUNT_USER_NONE"
+msgctxt "ACCOUNT_USER_NONE"
 msgid "There are no user accounts in the system."
 msgstr "There are no user accounts in the system."
 
-msgctxt "OPERATION_ACCOUNT_GROUP_NONE"
+msgctxt "ACCOUNT_GROUP_NONE"
 msgid "There are no user groups in the system."
 msgstr "There are no user groups in the system."
 
-msgctxt "OPERATION_ERROR_INVALID_CHARS"
+msgctxt "ERROR_INVALID_CHARS"
 msgid "Unexpected characters in description."
 msgstr "Unexpected characters in description."
 
-msgctxt "OPERATION_USER_NAME"
+msgctxt "USER_NAME"
 msgid "User Name"
 msgstr "User Name"
 
-msgctxt "OPERATION_YOUR_ACCOUNT"
+msgctxt "YOUR_ACCOUNT"
 msgid "Your account:"
 msgstr "Your account:"
 
-msgctxt "OPERATION_YOUR_ACCOUNT_INVALID"
+msgctxt "YOUR_ACCOUNT_INVALID"
 msgid "The account name entered is invalid."
 msgstr "The account name entered is invalid."
 
-msgctxt "OPERATION_PASSWORD_CHANGE_SUCCESS"
+msgctxt "PASSWORD_CHANGE_SUCCESS"
 msgid "Your password has been successfully changed."
 msgstr "Your password has been successfully changed."
 
-msgctxt "OPERATION_FM_NONBLANK"
+msgctxt "FM_NONBLANK"
 msgid "This field must not be left blank"
 msgstr "This field must not be left blank"
 
-msgctxt "OPERATION_FM_INTEGER"
+msgctxt "FM_INTEGER"
 msgid "This field must contain a positive integer"
 msgstr "This field must contain a positive integer"
 
-msgctxt "OPERATION_FM_NUMBER"
+msgctxt "FM_NUMBER"
 msgid "This field must contain a number"
 msgstr "This field must contain a number"
 
-msgctxt "OPERATION_FM_WORD"
+msgctxt "FM_WORD"
 msgid "This field must look like a single word."
 msgstr "This field must look like a single word."
 
-msgctxt "OPERATION_FM_DATE"
+msgctxt "FM_DATE"
 msgid "The data entered could not be parsed as a date"
 msgstr "The data entered could not be parsed as a date"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_NUMBER1"
+msgctxt "FM_CREDIT_CARD_NUMBER1"
 msgid "You must enter a credit card number"
 msgstr "You must enter a credit card number"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_NUMBER2"
+msgctxt "FM_CREDIT_CARD_NUMBER2"
 msgid ""
 "Credit card numbers shouldn\\'t have anything but numbers, spaces or dashes"
 msgstr ""
 "Credit card numbers shouldn\\'t have anything but numbers, spaces or dashes"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_NUMBER3"
+msgctxt "FM_CREDIT_CARD_NUMBER3"
 msgid "Must be at least 14 characters in length"
 msgstr "Must be at least 14 characters in length"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_NUMBER4"
+msgctxt "FM_CREDIT_CARD_NUMBER4"
 msgid "Doesn\\'t appear to be a valid credit card number"
 msgstr "Doesn\\'t appear to be a valid credit card number"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_EXPIRY1"
+msgctxt "FM_CREDIT_CARD_EXPIRY1"
 msgid "No expiry date entered."
 msgstr "No expiry date entered."
 
-msgctxt "OPERATION_FM_CREDIT_CARD_EXPIRY2"
+msgctxt "FM_CREDIT_CARD_EXPIRY2"
 msgid "Expiry date must be in the format MM/YY or MM/YYYY"
 msgstr "Expiry date must be in the format MM/YY or MM/YYYY"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_EXPIRY3"
+msgctxt "FM_CREDIT_CARD_EXPIRY3"
 msgid "This expiry date appears to have already passed"
 msgstr "This expiry date appears to have already passed"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_EXPIRY4"
+msgctxt "FM_CREDIT_CARD_EXPIRY4"
 msgid "This expiry date appears to be too far in the future"
 msgstr "This expiry date appears to be too far in the future"
 
-msgctxt "OPERATION_FM_ISO_COUNTRY_CODE1"
+msgctxt "FM_ISO_COUNTRY_CODE1"
 msgid "You must provide a country code"
 msgstr "You must provide a country code"
 
-msgctxt "OPERATION_FM_ISO_COUNTRY_CODE2"
+msgctxt "FM_ISO_COUNTRY_CODE2"
 msgid "This field does not contain an ISO country code"
 msgstr "This field does not contain an ISO country code"
 
-msgctxt "OPERATION_FM_US_STATE"
+msgctxt "FM_US_STATE"
 msgid "This doesn\\'t appear to be a valid 2-letter US state abbreviation"
 msgstr "This doesn\\'t appear to be a valid 2-letter US state abbreviation"
 
-msgctxt "OPERATION_FM_US_ZIPCODE"
+msgctxt "FM_US_ZIPCODE"
 msgid "US zip codes must contain 5 or 9 numbers"
 msgstr "US zip codes must contain 5 or 9 numbers"
 
-msgctxt "OPERATION_FM_MINLENGTH1"
+msgctxt "FM_MINLENGTH1"
 msgid "Minimum length has been specified meaninglessly as [_1]"
 msgstr "Minimum length has been specified meaninglessly as {$minlength}"
 
-msgctxt "OPERATION_FM_MINLENGTH2"
+msgctxt "FM_MINLENGTH2"
 msgid "This field must be at least [_1] characters"
 msgstr "This field must be at least {$minlength} characters"
 
-msgctxt "OPERATION_FM_MAXLENGTH1"
+msgctxt "FM_MAXLENGTH1"
 msgid "Maximum length has been specified meaninglessly as [_1]"
 msgstr "Maximum length has been specified meaninglessly as {$maxlength}"
 
-msgctxt "OPERATION_FM_MAXLENGTH2"
+msgctxt "FM_MAXLENGTH2"
 msgid "This field must be no more than [_1] characters"
 msgstr "This field must be no more than {$maxlength} characters"
 
-msgctxt "OPERATION_FM_EXACTLENGTH1"
+msgctxt "FM_EXACTLENGTH1"
 msgid "You must specify the length for the field."
 msgstr "You must specify the length for the field."
 
-msgctxt "OPERATION_FM_EXACTLENGTH2"
+msgctxt "FM_EXACTLENGTH2"
 msgid "You must specify the exactlength of the field with an integer"
 msgstr "You must specify the exactlength of the field with an integer"
 
-msgctxt "OPERATION_FM_EXACTLENGTH3"
+msgctxt "FM_EXACTLENGTH3"
 msgid "This field must be exactly [_1] characters"
 msgstr "This field must be exactly {$exactlength} characters"
 
-msgctxt "OPERATION_FM_LENGTHRANGE1"
+msgctxt "FM_LENGTHRANGE1"
 msgid "You must specify the maximum and minimum length for the field."
 msgstr "You must specify the maximum and minimum length for the field."
 
-msgctxt "OPERATION_FM_LENGTHRANGE2"
+msgctxt "FM_LENGTHRANGE2"
 msgid ""
 "You must specify the maximum and minimum lengths of the field with an "
 "integer"
@@ -475,50 +471,50 @@ msgstr ""
 "You must specify the maximum and minimum lengths of the field with an "
 "integer"
 
-msgctxt "OPERATION_FM_LENGTHRANGE3"
+msgctxt "FM_LENGTHRANGE3"
 msgid "This field must be between [_1] and [_2] characters"
 msgstr "This field must be between {$minlength} and {$maxlength} characters"
 
-msgctxt "OPERATION_FM_URL"
+msgctxt "FM_URL"
 msgid "This field must contain a URL starting with http:// or ftp://"
 msgstr "This field must contain a URL starting with http:// or ftp://"
 
-msgctxt "OPERATION_FM_EMAIL_SIMPLE1"
+msgctxt "FM_EMAIL_SIMPLE1"
 msgid "You must enter an email address."
 msgstr "You must enter an email address."
 
-msgctxt "OPERATION_FM_EMAIL_SIMPLE2"
+msgctxt "FM_EMAIL_SIMPLE2"
 msgid "This field doesn\\'t look like an RFC822-compliant email address"
 msgstr "This field doesn\\'t look like an RFC822-compliant email address"
 
-msgctxt "OPERATION_FM_DOMAIN_NAME"
+msgctxt "FM_DOMAIN_NAME"
 msgid "This field doesn\\'t look like a valid Internet domain name or hostname."
 msgstr ""
 "This field doesn\\'t look like a valid Internet domain name or hostname."
 
-msgctxt "OPERATION_FM_IP_NUMBER1"
+msgctxt "FM_IP_NUMBER1"
 msgid "This field must contain a valid IP number and can not be left blank."
 msgstr "This field must contain a valid IP number and can not be left blank."
 
-msgctxt "OPERATION_FM_IP_NUMBER2"
+msgctxt "FM_IP_NUMBER2"
 msgid "Invalid IP address format (expected X.X.X.X)"
 msgstr "Invalid IP address format (expected X.X.X.X)"
 
-msgctxt "OPERATION_FM_IP_NUMBER3"
+msgctxt "FM_IP_NUMBER3"
 msgid "[_1] is more than 255"
 msgstr "{$octet} is more than 255"
 
-msgctxt "OPERATION_FM_USERNAME"
+msgctxt "FM_USERNAME"
 msgid ""
 "This field must look like a valid username (3 to 8 letters and numbers)"
 msgstr ""
 "This field must look like a valid username (3 to 8 letters and numbers)"
 
-msgctxt "OPERATION_FM_PASSWORD1"
+msgctxt "FM_PASSWORD1"
 msgid "You must provide a password."
 msgstr "You must provide a password."
 
-msgctxt "OPERATION_FM_PASSWORD2"
+msgctxt "FM_PASSWORD2"
 msgid ""
 "The password you provided was not a good password.A good password must "
 "contain all of the following: upper case letter, lower case letter, number, "
@@ -528,18 +524,18 @@ msgstr ""
 "contain all of the following: upper case letter, lower case letter, number, "
 "non-alphanumeric character, be at least 7 characters long."
 
-msgctxt "OPERATION_FM_MAC_ADDRESS1"
+msgctxt "FM_MAC_ADDRESS1"
 msgid "You must provide a MAC address."
 msgstr "You must provide a MAC address."
 
-msgctxt "OPERATION_FM_MAC_ADDRESS2"
+msgctxt "FM_MAC_ADDRESS2"
 msgid "The MAC address you provided was not valid."
 msgstr "The MAC address you provided was not valid."
 
-msgctxt "OPERATION_FM_ERR_UNEXPECTED_DESC"
+msgctxt "FM_ERR_UNEXPECTED_DESC"
 msgid "Error: unexpected or missing characters in description"
 msgstr "Error: unexpected or missing characters in description"
 
-msgctxt "OPERATION_CSRF_VALIDATION_FAILURE"
-msgid "Placeholder for missing original text"
+msgctxt "CSRF_VALIDATION_FAILURE"
+msgid "Error: CSRF token is invalid or outdated."
 msgstr "Error: CSRF token is invalid or outdated."
diff --git a/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/General/pofiles/general_ru.po b/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/General/pofiles/general_ru.po
index d039ffb..bda57bf 100644
--- a/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/General/pofiles/general_ru.po
+++ b/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/General/pofiles/general_ru.po
@@ -5,99 +5,95 @@ msgstr ""
 "Language: None\n"
 "Content-Type: text/plain; charset=utf-8\n"
 
-msgctxt "OPERATION_Collaboration"
+msgctxt "Collaboration"
 msgid "Collaboration"
 msgstr "Совместная работа"
 
-msgctxt "OPERATION_Administration"
+msgctxt "Administration"
 msgid "Administration"
 msgstr "Администрирование"
 
-msgctxt "OPERATION_Security"
+msgctxt "Security"
 msgid "Security"
 msgstr "Безопасность"
 
-msgctxt "OPERATION_Configuration"
+msgctxt "Configuration"
 msgid "Configuration"
 msgstr "Конфигурация"
 
-msgctxt "OPERATION_Miscellaneous"
+msgctxt "Miscellaneous"
 msgid "Miscellaneous"
 msgstr "Разное"
 
-msgctxt "OPERATION_Your Settings"
-msgid "Your Settings"
-msgstr "Ваши настройки"
-
-msgctxt "OPERATION_SAVE"
+msgctxt "SAVE"
 msgid "Save"
 msgstr "Сохранить"
 
-msgctxt "OPERATION_CANCEL"
+msgctxt "CANCEL"
 msgid "Cancel"
 msgstr "Отмена"
 
-msgctxt "OPERATION_ENABLED"
+msgctxt "ENABLED"
 msgid "Enabled"
 msgstr "Включен"
 
-msgctxt "OPERATION_DISABLED"
+msgctxt "DISABLED"
 msgid "Disabled"
 msgstr "Отключен"
 
-msgctxt "OPERATION_NO"
+msgctxt "NO"
 msgid "No"
 msgstr "Нет"
 
-msgctxt "OPERATION_YES"
+msgctxt "YES"
 msgid "Yes"
 msgstr "Да"
 
-msgctxt "OPERATION_ADD"
+msgctxt "ADD"
 msgid "Add"
 msgstr "Добавить"
 
-msgctxt "OPERATION_CREATE"
+msgctxt "CREATE"
 msgid "Create"
 msgstr "Создать"
 
-msgctxt "OPERATION_MODIFY"
+msgctxt "MODIFY"
 msgid "Modify"
 msgstr "Изменить"
 
-msgctxt "OPERATION_REMOVE"
+msgctxt "REMOVE"
 msgid "Remove"
 msgstr "Удалить"
 
-msgctxt "OPERATION_COMMENT"
+msgctxt "COMMENT"
 msgid "Comment"
 msgstr "Комментарий"
 
-msgctxt "OPERATION_NEXT"
+msgctxt "NEXT"
 msgid "Next"
 msgstr "Далее"
 
-msgctxt "OPERATION_SELF"
+msgctxt "SELF"
 msgid "Self"
 msgstr "Лично"
 
-msgctxt "OPERATION_REMOTE"
+msgctxt "REMOTE"
 msgid "Remote"
 msgstr "Удалённый"
 
-msgctxt "OPERATION_LOCAL"
+msgctxt "LOCAL"
 msgid "Local"
 msgstr "Локальный"
 
-msgctxt "OPERATION_ACTION"
+msgctxt "ACTION"
 msgid "Action"
 msgstr "Действие"
 
-msgctxt "OPERATION_NETWORK"
+msgctxt "NETWORK"
 msgid "Network"
 msgstr "Сеть"
 
-msgctxt "OPERATION_ROUTER"
+msgctxt "ROUTER"
 msgid "Router"
 msgstr "Маршрутизатор"
 
@@ -105,23 +101,23 @@ msgctxt "OPERATION_STATUS_REPORT"
 msgid "Operation status report"
 msgstr "Данные о состоянии функционирования"
 
-msgctxt "OPERATION_ACCOUNT"
+msgctxt "ACCOUNT"
 msgid "Account"
 msgstr "Учётная запись"
 
-msgctxt "OPERATION_GROUP"
+msgctxt "GROUP"
 msgid "Group"
 msgstr "Группа"
 
-msgctxt "OPERATION_DESC_SECTIONBAR"
+msgctxt "DESC_SECTIONBAR"
 msgid "<hr class=\"sectionbar\"/>"
-msgstr " <hr class=\"sectionbar\"/> "
+msgstr "<hr class=\"sectionbar\"/>"
 
-msgctxt "OPERATION_NO_PIPES_ALLOWED"
+msgctxt "NO_PIPES_ALLOWED"
 msgid "Pipe symbols (|) are not permitted in this field"
 msgstr "Символы конвейеризации (|) не допустимы в этом поле"
 
-msgctxt "OPERATION_ERROR_BELOW"
+msgctxt "ERROR_BELOW"
 msgid ""
 "ERROR: There was an error in the validation of this page. Please scroll down"
 " and find the specific problem."
@@ -129,27 +125,27 @@ msgstr ""
 "ERROR: Ошибка проверки этой страницы. Пожалуйста, пролистайте вниз и найдите"
 " конкретную проблему."
 
-msgctxt "OPERATION_ACCESS"
+msgctxt "ACCESS"
 msgid "Access"
 msgstr "Доступ"
 
-msgctxt "OPERATION_ACCOUNT_LOCKED"
+msgctxt "ACCOUNT_LOCKED"
 msgid "Account is locked"
 msgstr "Учётная запись заблокирована"
 
-msgctxt "OPERATION_GROUP_ADD"
+msgctxt "GROUP_ADD"
 msgid "Add group"
 msgstr "Добавить группу"
 
-msgctxt "OPERATION_NETWORKS_ALLOW_LOCAL"
+msgctxt "NETWORKS_ALLOW_LOCAL"
 msgid "Allow access only from local networks"
 msgstr "Разрешить доступ только из локальных сетей"
 
-msgctxt "OPERATION_NETWORKS_ALLOW_PUBLIC"
+msgctxt "NETWORKS_ALLOW_PUBLIC"
 msgid "Allow public access (entire Internet)"
 msgstr "Разрешить свободный доступ (весь Интернет)"
 
-msgctxt "OPERATION_ERROR_PASSWORD_CHANGE"
+msgctxt "ERROR_PASSWORD_CHANGE"
 msgid ""
 "An error occurred while attempting to change your password. Please make sure"
 " that the old password entered is correct."
@@ -157,368 +153,368 @@ msgstr ""
 "Произошла ошибка при попытке изменить ваш пароль. Пожалуйста, "
 "удостоверьтесь, что введенный старый пароль правилен."
 
-msgctxt "OPERATION_BACK"
+msgctxt "BACK"
 msgid "Back"
 msgstr "Назад"
 
-msgctxt "OPERATION_BACKUP"
+msgctxt "BACKUP"
 msgid "Backup"
 msgstr "Резервная копия"
 
-msgctxt "OPERATION_DESCRIPTION_BRIEF"
+msgctxt "DESCRIPTION_BRIEF"
 msgid "Brief description"
 msgstr "Короткое описание"
 
-msgctxt "OPERATION_PASSWORD_CHANGE"
+msgctxt "PASSWORD_CHANGE"
 msgid "Change Password"
 msgstr "Изменить пароль"
 
-msgctxt "OPERATION_RESET_PASSWORD_TITLE"
+msgctxt "RESET_PASSWORD_TITLE"
 msgid "Reset user password"
 msgstr "Сброс пароля пользователя"
 
-msgctxt "OPERATION_ACCOUNT_PASSWORD_CHANGE"
+msgctxt "ACCOUNT_PASSWORD_CHANGE"
 msgid "Change account password"
 msgstr "Изменить пароль учётной записи"
 
-msgctxt "OPERATION_CONTENT"
+msgctxt "CONTENT"
 msgid "Content"
 msgstr "Содержимое"
 
-msgctxt "OPERATION_CREATE_GROUP"
+msgctxt "CREATE_GROUP"
 msgid "Create user group"
 msgstr "Создать группу пользователей"
 
-msgctxt "OPERATION_USER_LIST_CURRENT"
+msgctxt "USER_LIST_CURRENT"
 msgid "Current list of users"
 msgstr "Текущий список пользователей"
 
-msgctxt "OPERATION_DESCRIPTION"
+msgctxt "DESCRIPTION"
 msgid "Description"
 msgstr "Описание"
 
-msgctxt "OPERATION_DESTINATION"
+msgctxt "DESTINATION"
 msgid "Destination"
 msgstr "Назначение"
 
-msgctxt "OPERATION_DOMAIN_NAME"
+msgctxt "DOMAIN_NAME"
 msgid "Domain name"
 msgstr "Имя домена"
 
-msgctxt "OPERATION_DOMAIN"
+msgctxt "DOMAIN"
 msgid "Domain"
 msgstr "Домен"
 
-msgctxt "OPERATION_DOMAINS"
+msgctxt "DOMAINS"
 msgid "Domains"
 msgstr "Домены"
 
-msgctxt "OPERATION_DOWNLOAD"
+msgctxt "DOWNLOAD"
 msgid "Download"
 msgstr "Скачать"
 
-msgctxt "OPERATION_ERROR_UPDATING_CONFIGURATION"
+msgctxt "ERROR_UPDATING_CONFIGURATION"
 msgid "Error occurred while updating system configuration."
 msgstr "Произошла ошибка во время обновлении конфигурации системы."
 
-msgctxt "OPERATION_GROUP_MEMBERS"
+msgctxt "GROUP_MEMBERS"
 msgid "Group Members"
 msgstr "Члены группы"
 
-msgctxt "OPERATION_GROUP_NAME"
+msgctxt "GROUP_NAME"
 msgid "Group Name"
 msgstr "Имя группы"
 
-msgctxt "OPERATION_GROUPS"
+msgctxt "GROUPS"
 msgid "Groups"
 msgstr "Группы"
 
-msgctxt "OPERATION_IP_ADDRESS"
+msgctxt "IP_ADDRESS"
 msgid "IP Address"
 msgstr "IP адрес"
 
-msgctxt "OPERATION_IP_ADDRESS_OR_FQDN"
+msgctxt "IP_ADDRESS_OR_FQDN"
 msgid "IP Address or FQDN"
 msgstr "IP адрес или FQDN"
 
-msgctxt "OPERATION_USER_INVALID"
+msgctxt "USER_INVALID"
 msgid "Invalid user"
 msgstr "Неверный пользователь"
 
-msgctxt "OPERATION_LOCATION"
+msgctxt "LOCATION"
 msgid "Location"
 msgstr "Расположение"
 
-msgctxt "OPERATION_MB"
+msgctxt "MB"
 msgid "Mb"
 msgstr "Мб"
 
-msgctxt "OPERATION_MODIFY_USER_GROUP"
+msgctxt "MODIFY_USER_GROUP"
 msgid "Modify user group"
 msgstr "Изменить группу пользователей"
 
-msgctxt "OPERATION_NAME"
+msgctxt "NAME"
 msgid "Name"
 msgstr "Название"
 
-msgctxt "OPERATION_PASSWORD_VERIFY_NEW"
+msgctxt "PASSWORD_VERIFY_NEW"
 msgid "New password (verify):"
 msgstr "Новый пароль (ещё раз):"
 
-msgctxt "OPERATION_PASSWORD_NEW"
+msgctxt "PASSWORD_NEW"
 msgid "New password:"
 msgstr "Новый пароль:"
 
-msgctxt "OPERATION_OFF"
+msgctxt "OFF"
 msgid "Off"
 msgstr "Выкл."
 
-msgctxt "OPERATION_OK"
+msgctxt "OK"
 msgid "Ok"
 msgstr "Ok"
 
-msgctxt "OPERATION_PASSWORD_OLD"
+msgctxt "PASSWORD_OLD"
 msgid "Old password:"
 msgstr "Старый пароль:"
 
-msgctxt "OPERATION_ON"
+msgctxt "ON"
 msgid "On"
 msgstr "Вкл."
 
-msgctxt "OPERATION_PASSWORD"
+msgctxt "PASSWORD"
 msgid "Password"
 msgstr "Пароль"
 
-msgctxt "OPERATION_PERFORM"
+msgctxt "PERFORM"
 msgid "Perform"
 msgstr "Выполнить"
 
-msgctxt "OPERATION_RECONFIGURE"
+msgctxt "RECONFIGURE"
 msgid "Reconfigure"
 msgstr "Реконфигурировать"
 
-msgctxt "OPERATION_REMOVE_USER_GROUP"
+msgctxt "REMOVE_USER_GROUP"
 msgid "Remove user group"
 msgstr "Удалить группу пользователей"
 
-msgctxt "OPERATION_PASSWORD_RESET"
+msgctxt "PASSWORD_RESET"
 msgid "Reset password"
 msgstr "Сбросить пароль"
 
-msgctxt "OPERATION_RESTORE"
+msgctxt "RESTORE"
 msgid "Restore"
 msgstr "Восстановить"
 
-msgctxt "OPERATION_SHUTDOWN"
+msgctxt "SHUTDOWN"
 msgid "Shutdown"
 msgstr "Выключение"
 
-msgctxt "OPERATION_SUCCESS"
+msgctxt "SUCCESS"
 msgid "Success"
 msgstr "Успешно"
 
-msgctxt "OPERATION_ACCOUNT_NAME_INVALID"
+msgctxt "ACCOUNT_NAME_INVALID"
 msgid "The account name entered is invalid."
 msgstr "Введено недопустимое имя учетной записи."
 
-msgctxt "OPERATION_ACCOUNT_NAME_INVALID_CHARS"
+msgctxt "ACCOUNT_NAME_INVALID_CHARS"
 msgid "The account name you entered contained invalid characters."
 msgstr "Введённое вами имя учетной записи содержит недопустимые символы."
 
-msgctxt "OPERATION_PASSWORD_OLD_INVALID_CHARS"
+msgctxt "PASSWORD_OLD_INVALID_CHARS"
 msgid "The old password you entered contained invalid characters."
 msgstr "Введённый вами старый пароль содержит недопустимые символы."
 
-msgctxt "OPERATION_PASSWORD_INVALID_CHARS"
+msgctxt "PASSWORD_INVALID_CHARS"
 msgid "The password you entered contained invalid characters."
 msgstr "Введённый вами пароль содержит недопустимые символы."
 
-msgctxt "OPERATION_PASSWORD_VERIFY_ERROR"
+msgctxt "PASSWORD_VERIFY_ERROR"
 msgid "The passwords you entered did not match."
 msgstr "Введённые пароли не совпадают."
 
-msgctxt "OPERATION_ACCOUNT_USER_NONE"
+msgctxt "ACCOUNT_USER_NONE"
 msgid "There are no user accounts in the system."
 msgstr "В системе нет учетных записей пользователей."
 
-msgctxt "OPERATION_ACCOUNT_GROUP_NONE"
+msgctxt "ACCOUNT_GROUP_NONE"
 msgid "There are no user groups in the system."
 msgstr "В системе нет групп пользователей."
 
-msgctxt "OPERATION_ERROR_INVALID_CHARS"
+msgctxt "ERROR_INVALID_CHARS"
 msgid "Unexpected characters in description."
 msgstr "Непредвиденные символы в описании."
 
-msgctxt "OPERATION_USER_NAME"
+msgctxt "USER_NAME"
 msgid "User Name"
 msgstr "Имя пользователя"
 
-msgctxt "OPERATION_YOUR_ACCOUNT"
+msgctxt "YOUR_ACCOUNT"
 msgid "Your account:"
 msgstr "Ваша учётная запись:"
 
-msgctxt "OPERATION_YOUR_ACCOUNT_INVALID"
+msgctxt "YOUR_ACCOUNT_INVALID"
 msgid "The account name entered is invalid."
 msgstr "Введено недопустимое имя учетной записи."
 
-msgctxt "OPERATION_PASSWORD_CHANGE_SUCCESS"
+msgctxt "PASSWORD_CHANGE_SUCCESS"
 msgid "Your password has been successfully changed."
 msgstr "Ваш пароль успешно изменён."
 
-msgctxt "OPERATION_FM_NONBLANK"
+msgctxt "FM_NONBLANK"
 msgid "This field must not be left blank"
 msgstr "Это поле не может быть пустым"
 
-msgctxt "OPERATION_FM_INTEGER"
+msgctxt "FM_INTEGER"
 msgid "This field must contain a positive integer"
 msgstr "Это поле должно содержать положительное целое число"
 
-msgctxt "OPERATION_FM_NUMBER"
+msgctxt "FM_NUMBER"
 msgid "This field must contain a number"
 msgstr "Это поле должно содержать число"
 
-msgctxt "OPERATION_FM_WORD"
+msgctxt "FM_WORD"
 msgid "This field must look like a single word."
 msgstr "Это поле должно быть похоже на отдельное слово."
 
-msgctxt "OPERATION_FM_DATE"
+msgctxt "FM_DATE"
 msgid "The data entered could not be parsed as a date"
 msgstr "Введенные данные не могли быть разобраны как дата"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_NUMBER1"
+msgctxt "FM_CREDIT_CARD_NUMBER1"
 msgid "You must enter a credit card number"
 msgstr "Вы должны ввести номер кредитной карты"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_NUMBER2"
+msgctxt "FM_CREDIT_CARD_NUMBER2"
 msgid ""
 "Credit card numbers shouldn\\'t have anything but numbers, spaces or dashes"
 msgstr "Номер кредитной карты должен содержать только цифры, пробелы или тире"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_NUMBER3"
+msgctxt "FM_CREDIT_CARD_NUMBER3"
 msgid "Must be at least 14 characters in length"
 msgstr "Должен быть не менее 14 символов в длину"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_NUMBER4"
+msgctxt "FM_CREDIT_CARD_NUMBER4"
 msgid "Doesn\\'t appear to be a valid credit card number"
 msgstr "Судя по всему, неверный номер кредитной карточки"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_EXPIRY1"
+msgctxt "FM_CREDIT_CARD_EXPIRY1"
 msgid "No expiry date entered."
 msgstr "Не введена дата окончания."
 
-msgctxt "OPERATION_FM_CREDIT_CARD_EXPIRY2"
+msgctxt "FM_CREDIT_CARD_EXPIRY2"
 msgid "Expiry date must be in the format MM/YY or MM/YYYY"
 msgstr "Дата окончания должна быть в формате ММ/ГГ или ММ/ГГГГ"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_EXPIRY3"
+msgctxt "FM_CREDIT_CARD_EXPIRY3"
 msgid "This expiry date appears to have already passed"
 msgstr "Эта дата окончания уже прошла"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_EXPIRY4"
+msgctxt "FM_CREDIT_CARD_EXPIRY4"
 msgid "This expiry date appears to be too far in the future"
 msgstr "Эта дата окончания слишком далеко в будущем"
 
-msgctxt "OPERATION_FM_ISO_COUNTRY_CODE1"
+msgctxt "FM_ISO_COUNTRY_CODE1"
 msgid "You must provide a country code"
 msgstr "Вы должны указать код страны"
 
-msgctxt "OPERATION_FM_ISO_COUNTRY_CODE2"
+msgctxt "FM_ISO_COUNTRY_CODE2"
 msgid "This field does not contain an ISO country code"
 msgstr "Это поле не содержит ISO код страны"
 
-msgctxt "OPERATION_FM_US_STATE"
+msgctxt "FM_US_STATE"
 msgid "This doesn\\'t appear to be a valid 2-letter US state abbreviation"
 msgstr "Это, кажется, неправильное 2-буквенное сокращение штата США"
 
-msgctxt "OPERATION_FM_US_ZIPCODE"
+msgctxt "FM_US_ZIPCODE"
 msgid "US zip codes must contain 5 or 9 numbers"
 msgstr "Почтовый индекс США должен состоять из 5 или 9 цифр"
 
-msgctxt "OPERATION_FM_MINLENGTH1"
+msgctxt "FM_MINLENGTH1"
 msgid "Minimum length has been specified meaninglessly as [_1]"
 msgstr "Минимальная длина была бессмысленно указана как {$minlength}"
 
-msgctxt "OPERATION_FM_MINLENGTH2"
+msgctxt "FM_MINLENGTH2"
 msgid "This field must be at least [_1] characters"
 msgstr "Это поле должно быть не менее {$minlength} символов"
 
-msgctxt "OPERATION_FM_MAXLENGTH1"
+msgctxt "FM_MAXLENGTH1"
 msgid "Maximum length has been specified meaninglessly as [_1]"
 msgstr "Максимальная длина была бессмысленно указана как {$maxlength}"
 
-msgctxt "OPERATION_FM_MAXLENGTH2"
+msgctxt "FM_MAXLENGTH2"
 msgid "This field must be no more than [_1] characters"
 msgstr "Это поле должно быть не более {$minlength} символов"
 
-msgctxt "OPERATION_FM_EXACTLENGTH1"
+msgctxt "FM_EXACTLENGTH1"
 msgid "You must specify the length for the field."
 msgstr "Вы должны указать длину поля."
 
-msgctxt "OPERATION_FM_EXACTLENGTH2"
+msgctxt "FM_EXACTLENGTH2"
 msgid "You must specify the exactlength of the field with an integer"
 msgstr "Вы должны указать точную длину поля целым числом"
 
-msgctxt "OPERATION_FM_EXACTLENGTH3"
+msgctxt "FM_EXACTLENGTH3"
 msgid "This field must be exactly [_1] characters"
 msgstr "В этом поле должно быть точно {$exactlength} символов"
 
-msgctxt "OPERATION_FM_LENGTHRANGE1"
+msgctxt "FM_LENGTHRANGE1"
 msgid "You must specify the maximum and minimum length for the field."
 msgstr "Вы должны указать максимальную и минимальную длину поля."
 
-msgctxt "OPERATION_FM_LENGTHRANGE2"
+msgctxt "FM_LENGTHRANGE2"
 msgid ""
 "You must specify the maximum and minimum lengths of the field with an "
 "integer"
 msgstr ""
 "Вы должны указать максимальную и минимальную длину поля целыми числами"
 
-msgctxt "OPERATION_FM_LENGTHRANGE3"
+msgctxt "FM_LENGTHRANGE3"
 msgid "This field must be between [_1] and [_2] characters"
 msgstr "Длина этого поля должна быть от {$minlength} до {$maxlength} символов"
 
-msgctxt "OPERATION_FM_URL"
+msgctxt "FM_URL"
 msgid "This field must contain a URL starting with http:// or ftp://"
 msgstr "Это поле должно содержать URL начинающийся с http:// или ftp://"
 
-msgctxt "OPERATION_FM_EMAIL_SIMPLE1"
+msgctxt "FM_EMAIL_SIMPLE1"
 msgid "You must enter an email address."
 msgstr "Вы должны ввести email адрес."
 
-msgctxt "OPERATION_FM_EMAIL_SIMPLE2"
+msgctxt "FM_EMAIL_SIMPLE2"
 msgid "This field doesn\\'t look like an RFC822-compliant email address"
 msgstr "Это поле не похоже на RFC822-совместимый адрес электронной почты"
 
-msgctxt "OPERATION_FM_DOMAIN_NAME"
+msgctxt "FM_DOMAIN_NAME"
 msgid "This field doesn\\'t look like a valid Internet domain name or hostname."
 msgstr "Это поле не похоже на правильное интернет-имя домена или имя хоста."
 
-msgctxt "OPERATION_FM_IP_NUMBER1"
+msgctxt "FM_IP_NUMBER1"
 msgid "This field must contain a valid IP number and can not be left blank."
 msgstr ""
 "Это поле должно содержать действительный IP адрес и не может быть оставлено "
 "пустым."
 
-msgctxt "OPERATION_FM_IP_NUMBER2"
+msgctxt "FM_IP_NUMBER2"
 msgid "Invalid IP address format (expected X.X.X.X)"
 msgstr "Невеный формат IP-адреса (ожидался X.X.X.X)"
 
-msgctxt "OPERATION_FM_IP_NUMBER3"
+msgctxt "FM_IP_NUMBER3"
 msgid "[_1] is more than 255"
 msgstr "{$octet} больше чем 255"
 
-msgctxt "OPERATION_FM_USERNAME"
+msgctxt "FM_USERNAME"
 msgid ""
 "This field must look like a valid username (3 to 8 letters and numbers)"
 msgstr ""
 "Это поле должно быть похоже на правильное имя пользователя (от 3 до 8 букв и"
 " цифр)"
 
-msgctxt "OPERATION_FM_PASSWORD1"
+msgctxt "FM_PASSWORD1"
 msgid "You must provide a password."
 msgstr "Вы должны указать пароль."
 
-msgctxt "OPERATION_FM_PASSWORD2"
+msgctxt "FM_PASSWORD2"
 msgid ""
 "The password you provided was not a good password.A good password must "
 "contain all of the following: upper case letter, lower case letter, number, "
@@ -528,18 +524,18 @@ msgstr ""
 "заглавные буквы, прописные буквы, цифры, спецсимволы, его длина должна быть "
 "не менее 7 символов."
 
-msgctxt "OPERATION_FM_MAC_ADDRESS1"
+msgctxt "FM_MAC_ADDRESS1"
 msgid "You must provide a MAC address."
 msgstr "Вы должны указать MAC адрес."
 
-msgctxt "OPERATION_FM_MAC_ADDRESS2"
+msgctxt "FM_MAC_ADDRESS2"
 msgid "The MAC address you provided was not valid."
 msgstr "Недействительный MAC адрес."
 
-msgctxt "OPERATION_FM_ERR_UNEXPECTED_DESC"
+msgctxt "FM_ERR_UNEXPECTED_DESC"
 msgid "Error: unexpected or missing characters in description"
 msgstr "Ошибка: непредвиденные или отсутствующие символы в описании"
 
-msgctxt "OPERATION_CSRF_VALIDATION_FAILURE"
-msgid "Placeholder for missing original text"
+msgctxt "CSRF_VALIDATION_FAILURE"
+msgid "Error: CSRF token is invalid or outdated."
 msgstr "Error: CSRF token is invalid or outdated."
diff --git a/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/General/pofiles/general_sl.po b/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/General/pofiles/general_sl.po
index 6df1a30..21d71df 100644
--- a/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/General/pofiles/general_sl.po
+++ b/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/General/pofiles/general_sl.po
@@ -5,99 +5,95 @@ msgstr ""
 "Language: None\n"
 "Content-Type: text/plain; charset=utf-8\n"
 
-msgctxt "OPERATION_Collaboration"
+msgctxt "Collaboration"
 msgid "Collaboration"
 msgstr "Upravljanje"
 
-msgctxt "OPERATION_Administration"
+msgctxt "Administration"
 msgid "Administration"
 msgstr "Administracija"
 
-msgctxt "OPERATION_Security"
+msgctxt "Security"
 msgid "Security"
 msgstr "Varnost"
 
-msgctxt "OPERATION_Configuration"
+msgctxt "Configuration"
 msgid "Configuration"
 msgstr "Konfiguracija"
 
-msgctxt "OPERATION_Miscellaneous"
+msgctxt "Miscellaneous"
 msgid "Miscellaneous"
 msgstr "Mesano"
 
-msgctxt "OPERATION_Your Settings"
-msgid "Your Settings"
-msgstr "Your Settings"
-
-msgctxt "OPERATION_SAVE"
+msgctxt "SAVE"
 msgid "Save"
 msgstr "Shrani"
 
-msgctxt "OPERATION_CANCEL"
+msgctxt "CANCEL"
 msgid "Cancel"
 msgstr "Preklici"
 
-msgctxt "OPERATION_ENABLED"
+msgctxt "ENABLED"
 msgid "Enabled"
 msgstr "Omogoceno"
 
-msgctxt "OPERATION_DISABLED"
+msgctxt "DISABLED"
 msgid "Disabled"
 msgstr "Onemogoceno"
 
-msgctxt "OPERATION_NO"
+msgctxt "NO"
 msgid "No"
 msgstr "Ne"
 
-msgctxt "OPERATION_YES"
+msgctxt "YES"
 msgid "Yes"
 msgstr "Da"
 
-msgctxt "OPERATION_ADD"
+msgctxt "ADD"
 msgid "Add"
 msgstr "Dodaj"
 
-msgctxt "OPERATION_CREATE"
+msgctxt "CREATE"
 msgid "Create"
 msgstr "Kreiraj"
 
-msgctxt "OPERATION_MODIFY"
+msgctxt "MODIFY"
 msgid "Modify"
 msgstr "Uredi"
 
-msgctxt "OPERATION_REMOVE"
+msgctxt "REMOVE"
 msgid "Remove"
 msgstr "Odstrani"
 
-msgctxt "OPERATION_COMMENT"
+msgctxt "COMMENT"
 msgid "Comment"
 msgstr "Comment"
 
-msgctxt "OPERATION_NEXT"
+msgctxt "NEXT"
 msgid "Next"
 msgstr "Naprej"
 
-msgctxt "OPERATION_SELF"
+msgctxt "SELF"
 msgid "Self"
 msgstr "Self"
 
-msgctxt "OPERATION_REMOTE"
+msgctxt "REMOTE"
 msgid "Remote"
 msgstr "Odstrani"
 
-msgctxt "OPERATION_LOCAL"
+msgctxt "LOCAL"
 msgid "Local"
 msgstr "Local"
 
-msgctxt "OPERATION_ACTION"
+msgctxt "ACTION"
 msgid "Action"
 msgstr "Izvedi"
 
-msgctxt "OPERATION_NETWORK"
+msgctxt "NETWORK"
 msgid "Network"
 msgstr "Omrezje"
 
-msgctxt "OPERATION_ROUTER"
+msgctxt "ROUTER"
 msgid "Router"
 msgstr "Router"
 
@@ -105,23 +101,23 @@ msgctxt "OPERATION_STATUS_REPORT"
 msgid "Operation status report"
 msgstr "Porocilo o delovanju"
 
-msgctxt "OPERATION_ACCOUNT"
+msgctxt "ACCOUNT"
 msgid "Account"
 msgstr "Racun"
 
-msgctxt "OPERATION_GROUP"
+msgctxt "GROUP"
 msgid "Group"
 msgstr "Skupina"
 
-msgctxt "OPERATION_DESC_SECTIONBAR"
+msgctxt "DESC_SECTIONBAR"
 msgid "<hr class=\"sectionbar\"/>"
-msgstr " <hr class=\"sectionbar\"/> "
+msgstr "<hr class=\"sectionbar\"/>"
 
-msgctxt "OPERATION_NO_PIPES_ALLOWED"
+msgctxt "NO_PIPES_ALLOWED"
 msgid "Pipe symbols (|) are not permitted in this field"
 msgstr "Simboli, kot je (|) niso dovoljeni vnos v tem polju"
 
-msgctxt "OPERATION_ERROR_BELOW"
+msgctxt "ERROR_BELOW"
 msgid ""
 "ERROR: There was an error in the validation of this page. Please scroll down"
 " and find the specific problem."
@@ -129,27 +125,27 @@ msgstr ""
 "NAPAKA: Pri preverjanju te strani je prislo do napake. Prosimo premaknite se"
 " po strani navzdol in poiscite vzrok za napako."
 
-msgctxt "OPERATION_ACCESS"
+msgctxt "ACCESS"
 msgid "Access"
 msgstr "Ni dostopa"
 
-msgctxt "OPERATION_ACCOUNT_LOCKED"
+msgctxt "ACCOUNT_LOCKED"
 msgid "Account is locked"
 msgstr "Racun je zaklenjen"
 
-msgctxt "OPERATION_GROUP_ADD"
+msgctxt "GROUP_ADD"
 msgid "Add group"
 msgstr "Dodaj skupino"
 
-msgctxt "OPERATION_NETWORKS_ALLOW_LOCAL"
+msgctxt "NETWORKS_ALLOW_LOCAL"
 msgid "Allow access only from local networks"
 msgstr "Sprejmi geslo samo z lokalnega omrezja"
 
-msgctxt "OPERATION_NETWORKS_ALLOW_PUBLIC"
+msgctxt "NETWORKS_ALLOW_PUBLIC"
 msgid "Allow public access (entire Internet)"
 msgstr "Allow public access (entire Internet)"
 
-msgctxt "OPERATION_ERROR_PASSWORD_CHANGE"
+msgctxt "ERROR_PASSWORD_CHANGE"
 msgid ""
 "An error occurred while attempting to change your password. Please make sure"
 " that the old password entered is correct."
@@ -157,371 +153,371 @@ msgstr ""
 "Pri zamenjavi gesla je prislo do napake. Prosimo preverite, ce ste staro "
 "geslo vpisali pravilno."
 
-msgctxt "OPERATION_BACK"
+msgctxt "BACK"
 msgid "Back"
 msgstr "Nazaj"
 
-msgctxt "OPERATION_BACKUP"
+msgctxt "BACKUP"
 msgid "Backup"
 msgstr "Nazaj"
 
-msgctxt "OPERATION_DESCRIPTION_BRIEF"
+msgctxt "DESCRIPTION_BRIEF"
 msgid "Brief description"
 msgstr "Kratek opis"
 
-msgctxt "OPERATION_PASSWORD_CHANGE"
+msgctxt "PASSWORD_CHANGE"
 msgid "Change Password"
 msgstr "Zamenjaj geslo"
 
-msgctxt "OPERATION_RESET_PASSWORD_TITLE"
+msgctxt "RESET_PASSWORD_TITLE"
 msgid "Reset user password"
 msgstr "Resetiraj uporabnisko geslo"
 
-msgctxt "OPERATION_ACCOUNT_PASSWORD_CHANGE"
+msgctxt "ACCOUNT_PASSWORD_CHANGE"
 msgid "Change account password"
 msgstr "Spreminjanje gesla za uporabnisko ime"
 
-msgctxt "OPERATION_CONTENT"
+msgctxt "CONTENT"
 msgid "Content"
 msgstr "Vsebina"
 
-msgctxt "OPERATION_CREATE_GROUP"
+msgctxt "CREATE_GROUP"
 msgid "Create user group"
 msgstr "Ustvari novo skupino uporabnikov"
 
-msgctxt "OPERATION_USER_LIST_CURRENT"
+msgctxt "USER_LIST_CURRENT"
 msgid "Current list of users"
 msgstr "Trenutni seznam tiskalnikov"
 
-msgctxt "OPERATION_DESCRIPTION"
+msgctxt "DESCRIPTION"
 msgid "Description"
 msgstr "Opis"
 
-msgctxt "OPERATION_DESTINATION"
+msgctxt "DESTINATION"
 msgid "Destination"
 msgstr "St. ciljnih vrat"
 
-msgctxt "OPERATION_DOMAIN_NAME"
+msgctxt "DOMAIN_NAME"
 msgid "Domain name"
 msgstr "Ime domene"
 
-msgctxt "OPERATION_DOMAIN"
+msgctxt "DOMAIN"
 msgid "Domain"
 msgstr "Domena"
 
-msgctxt "OPERATION_DOMAINS"
+msgctxt "DOMAINS"
 msgid "Domains"
 msgstr "Domene"
 
-msgctxt "OPERATION_DOWNLOAD"
+msgctxt "DOWNLOAD"
 msgid "Download"
 msgstr "Prenesi LOG datoteko"
 
-msgctxt "OPERATION_ERROR_UPDATING_CONFIGURATION"
+msgctxt "ERROR_UPDATING_CONFIGURATION"
 msgid "Error occurred while updating system configuration."
 msgstr ""
 "Pri posodabljanju konfiguracijskih datotek iz ariva je prislo do napake."
 
-msgctxt "OPERATION_GROUP_MEMBERS"
+msgctxt "GROUP_MEMBERS"
 msgid "Group Members"
 msgstr "Clani skupine"
 
-msgctxt "OPERATION_GROUP_NAME"
+msgctxt "GROUP_NAME"
 msgid "Group Name"
 msgstr "Ime skupine"
 
-msgctxt "OPERATION_GROUPS"
+msgctxt "GROUPS"
 msgid "Groups"
 msgstr "Skupine"
 
-msgctxt "OPERATION_IP_ADDRESS"
+msgctxt "IP_ADDRESS"
 msgid "IP Address"
 msgstr "IP naslov"
 
-msgctxt "OPERATION_IP_ADDRESS_OR_FQDN"
+msgctxt "IP_ADDRESS_OR_FQDN"
 msgid "IP Address or FQDN"
 msgstr "IP naslov"
 
-msgctxt "OPERATION_USER_INVALID"
+msgctxt "USER_INVALID"
 msgid "Invalid user"
 msgstr "Nepravilno ime strežnika"
 
-msgctxt "OPERATION_LOCATION"
+msgctxt "LOCATION"
 msgid "Location"
 msgstr "Lokacija"
 
-msgctxt "OPERATION_MB"
+msgctxt "MB"
 msgid "Mb"
 msgstr "Mb"
 
-msgctxt "OPERATION_MODIFY_USER_GROUP"
+msgctxt "MODIFY_USER_GROUP"
 msgid "Modify user group"
 msgstr "Posodobi skupino uporabnikov"
 
-msgctxt "OPERATION_NAME"
+msgctxt "NAME"
 msgid "Name"
 msgstr "Ime"
 
-msgctxt "OPERATION_PASSWORD_VERIFY_NEW"
+msgctxt "PASSWORD_VERIFY_NEW"
 msgid "New password (verify):"
 msgstr "Novo geslo (se enkrat):"
 
-msgctxt "OPERATION_PASSWORD_NEW"
+msgctxt "PASSWORD_NEW"
 msgid "New password:"
 msgstr "Novo geslo:"
 
-msgctxt "OPERATION_OFF"
+msgctxt "OFF"
 msgid "Off"
 msgstr "Izklopljeno"
 
-msgctxt "OPERATION_OK"
+msgctxt "OK"
 msgid "Ok"
 msgstr "Ok"
 
-msgctxt "OPERATION_PASSWORD_OLD"
+msgctxt "PASSWORD_OLD"
 msgid "Old password:"
 msgstr "Staro geslo:"
 
-msgctxt "OPERATION_ON"
+msgctxt "ON"
 msgid "On"
 msgstr "Vklopljeno"
 
-msgctxt "OPERATION_PASSWORD"
+msgctxt "PASSWORD"
 msgid "Password"
 msgstr "Geslo"
 
-msgctxt "OPERATION_PERFORM"
+msgctxt "PERFORM"
 msgid "Perform"
 msgstr "Izvedi"
 
-msgctxt "OPERATION_RECONFIGURE"
+msgctxt "RECONFIGURE"
 msgid "Reconfigure"
 msgstr "Spremeni nastavitve"
 
-msgctxt "OPERATION_REMOVE_USER_GROUP"
+msgctxt "REMOVE_USER_GROUP"
 msgid "Remove user group"
 msgstr "Odstrani skupino uporabnikov"
 
-msgctxt "OPERATION_PASSWORD_RESET"
+msgctxt "PASSWORD_RESET"
 msgid "Reset password"
 msgstr "Resetiraj uporabnisko geslo"
 
-msgctxt "OPERATION_RESTORE"
+msgctxt "RESTORE"
 msgid "Restore"
 msgstr "Restavriraj"
 
-msgctxt "OPERATION_SHUTDOWN"
+msgctxt "SHUTDOWN"
 msgid "Shutdown"
 msgstr "Zaustavitev ali ponovni zagon"
 
-msgctxt "OPERATION_SUCCESS"
+msgctxt "SUCCESS"
 msgid "Success"
 msgstr "Ni dostopa"
 
-msgctxt "OPERATION_ACCOUNT_NAME_INVALID"
+msgctxt "ACCOUNT_NAME_INVALID"
 msgid "The account name entered is invalid."
 msgstr "Vneseno uporabnisko ime je napacno."
 
-msgctxt "OPERATION_ACCOUNT_NAME_INVALID_CHARS"
+msgctxt "ACCOUNT_NAME_INVALID_CHARS"
 msgid "The account name you entered contained invalid characters."
 msgstr "Pri vnosu uporabniskega imena ste vnesli neveljavne znake."
 
-msgctxt "OPERATION_PASSWORD_OLD_INVALID_CHARS"
+msgctxt "PASSWORD_OLD_INVALID_CHARS"
 msgid "The old password you entered contained invalid characters."
 msgstr "Pri vnosu starega gesla ste vnesli neveljavne znake."
 
-msgctxt "OPERATION_PASSWORD_INVALID_CHARS"
+msgctxt "PASSWORD_INVALID_CHARS"
 msgid "The password you entered contained invalid characters."
 msgstr "Vneseno geslo vsebuje neveljavne znake."
 
-msgctxt "OPERATION_PASSWORD_VERIFY_ERROR"
+msgctxt "PASSWORD_VERIFY_ERROR"
 msgid "The passwords you entered did not match."
 msgstr "Gesli se ne ujemata."
 
-msgctxt "OPERATION_ACCOUNT_USER_NONE"
+msgctxt "ACCOUNT_USER_NONE"
 msgid "There are no user accounts in the system."
 msgstr "Ta uporabniski racun ne obstaja."
 
-msgctxt "OPERATION_ACCOUNT_GROUP_NONE"
+msgctxt "ACCOUNT_GROUP_NONE"
 msgid "There are no user groups in the system."
 msgstr "V sistemu ni nobene skupine uporabnikov."
 
-msgctxt "OPERATION_ERROR_INVALID_CHARS"
+msgctxt "ERROR_INVALID_CHARS"
 msgid "Unexpected characters in description."
 msgstr "Nepricakovani znaki so v opisu."
 
-msgctxt "OPERATION_USER_NAME"
+msgctxt "USER_NAME"
 msgid "User Name"
 msgstr "Uporabnisko ime"
 
-msgctxt "OPERATION_YOUR_ACCOUNT"
+msgctxt "YOUR_ACCOUNT"
 msgid "Your account:"
 msgstr "Uporabnisko ime:"
 
-msgctxt "OPERATION_YOUR_ACCOUNT_INVALID"
+msgctxt "YOUR_ACCOUNT_INVALID"
 msgid "The account name entered is invalid."
 msgstr "Vneseno uporabnisko ime je napacno."
 
-msgctxt "OPERATION_PASSWORD_CHANGE_SUCCESS"
+msgctxt "PASSWORD_CHANGE_SUCCESS"
 msgid "Your password has been successfully changed."
 msgstr "Vase geslo je bilo uspesno spremenjeno."
 
-msgctxt "OPERATION_FM_NONBLANK"
+msgctxt "FM_NONBLANK"
 msgid "This field must not be left blank"
 msgstr "To polje je obvezen vnos"
 
-msgctxt "OPERATION_FM_INTEGER"
+msgctxt "FM_INTEGER"
 msgid "This field must contain a positive integer"
 msgstr "To polje lahko vsebuje le celo pozitivno število"
 
-msgctxt "OPERATION_FM_NUMBER"
+msgctxt "FM_NUMBER"
 msgid "This field must contain a number"
 msgstr "To polje lahko vsebuje le število"
 
-msgctxt "OPERATION_FM_WORD"
+msgctxt "FM_WORD"
 msgid "This field must look like a single word."
 msgstr "To polje lahko vsebuje samo eno besedo."
 
-msgctxt "OPERATION_FM_DATE"
+msgctxt "FM_DATE"
 msgid "The data entered could not be parsed as a date"
 msgstr "Vnesene stevilke ne moremo uporabiti za zapis datuma"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_NUMBER1"
+msgctxt "FM_CREDIT_CARD_NUMBER1"
 msgid "You must enter a credit card number"
 msgstr "Vpisati morate stevilko creditne kartice"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_NUMBER2"
+msgctxt "FM_CREDIT_CARD_NUMBER2"
 msgid ""
 "Credit card numbers shouldn\\'t have anything but numbers, spaces or dashes"
 msgstr ""
 "Stevilka kreditne kartice lahko vsebuje samo stevilke, presledke ali "
 "pomisljaje"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_NUMBER3"
+msgctxt "FM_CREDIT_CARD_NUMBER3"
 msgid "Must be at least 14 characters in length"
 msgstr "Dolzina zapisa mora biti najmanj 14 znakov"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_NUMBER4"
+msgctxt "FM_CREDIT_CARD_NUMBER4"
 msgid "Doesn\\'t appear to be a valid credit card number"
 msgstr "Vnesena stevilka ne izgleda, kot veljavna stevilka kreditne kartice"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_EXPIRY1"
+msgctxt "FM_CREDIT_CARD_EXPIRY1"
 msgid "No expiry date entered."
 msgstr "Manjka datum veljavnosti."
 
-msgctxt "OPERATION_FM_CREDIT_CARD_EXPIRY2"
+msgctxt "FM_CREDIT_CARD_EXPIRY2"
 msgid "Expiry date must be in the format MM/YY or MM/YYYY"
 msgstr "Datum veljavnosti mora biti v formatu: MM/LL ali MM/LLLL"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_EXPIRY3"
+msgctxt "FM_CREDIT_CARD_EXPIRY3"
 msgid "This expiry date appears to have already passed"
 msgstr "Vnesenei datum poteka je ze pretekel"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_EXPIRY4"
+msgctxt "FM_CREDIT_CARD_EXPIRY4"
 msgid "This expiry date appears to be too far in the future"
 msgstr "Vneseni datum poteka je predalec naprej"
 
-msgctxt "OPERATION_FM_ISO_COUNTRY_CODE1"
+msgctxt "FM_ISO_COUNTRY_CODE1"
 msgid "You must provide a country code"
 msgstr "Vnesti morate kodo drzave"
 
-msgctxt "OPERATION_FM_ISO_COUNTRY_CODE2"
+msgctxt "FM_ISO_COUNTRY_CODE2"
 msgid "This field does not contain an ISO country code"
 msgstr "To polje ne vsebuje veljavne kode drzave"
 
-msgctxt "OPERATION_FM_US_STATE"
+msgctxt "FM_US_STATE"
 msgid "This doesn\\'t appear to be a valid 2-letter US state abbreviation"
 msgstr "This doesn\\'t appear to be a valid 2-letter US state abbreviation"
 
-msgctxt "OPERATION_FM_US_ZIPCODE"
+msgctxt "FM_US_ZIPCODE"
 msgid "US zip codes must contain 5 or 9 numbers"
 msgstr "US zip codes must contain 5 or 9 numbers"
 
-msgctxt "OPERATION_FM_MINLENGTH1"
+msgctxt "FM_MINLENGTH1"
 msgid "Minimum length has been specified meaninglessly as [_1]"
 msgstr "Minimalna dolzina je bila dolocena kot {$minlength}"
 
-msgctxt "OPERATION_FM_MINLENGTH2"
+msgctxt "FM_MINLENGTH2"
 msgid "This field must be at least [_1] characters"
 msgstr "V tem polju mora biti najmanj {$minlength} znakov"
 
-msgctxt "OPERATION_FM_MAXLENGTH1"
+msgctxt "FM_MAXLENGTH1"
 msgid "Maximum length has been specified meaninglessly as [_1]"
 msgstr "Maksimalna dolzina je bila definirana kot {$maxlength}"
 
-msgctxt "OPERATION_FM_MAXLENGTH2"
+msgctxt "FM_MAXLENGTH2"
 msgid "This field must be no more than [_1] characters"
 msgstr "V tem polju ne sme biti vec kot {$maxlength} znakov"
 
-msgctxt "OPERATION_FM_EXACTLENGTH1"
+msgctxt "FM_EXACTLENGTH1"
 msgid "You must specify the length for the field."
 msgstr "Definirati morate dolzino tega polja."
 
-msgctxt "OPERATION_FM_EXACTLENGTH2"
+msgctxt "FM_EXACTLENGTH2"
 msgid "You must specify the exactlength of the field with an integer"
 msgstr "Definirati morate natancno dolzino polja s celim stevilom"
 
-msgctxt "OPERATION_FM_EXACTLENGTH3"
+msgctxt "FM_EXACTLENGTH3"
 msgid "This field must be exactly [_1] characters"
 msgstr "To polje mora biti dolgo natancno {$exactlength} znakov"
 
-msgctxt "OPERATION_FM_LENGTHRANGE1"
+msgctxt "FM_LENGTHRANGE1"
 msgid "You must specify the maximum and minimum length for the field."
 msgstr "Definirati morate maksimalno in minimalno dolzino polja."
 
-msgctxt "OPERATION_FM_LENGTHRANGE2"
+msgctxt "FM_LENGTHRANGE2"
 msgid ""
 "You must specify the maximum and minimum lengths of the field with an "
 "integer"
 msgstr ""
 "Definrati morate maksimalno in minimalno dolzino polja s celim stevilom"
 
-msgctxt "OPERATION_FM_LENGTHRANGE3"
+msgctxt "FM_LENGTHRANGE3"
 msgid "This field must be between [_1] and [_2] characters"
 msgstr ""
 "To polje mora biti dolgo minimalno {$minlength} in maksimalno {$maxlength} "
 "znakov"
 
-msgctxt "OPERATION_FM_URL"
+msgctxt "FM_URL"
 msgid "This field must contain a URL starting with http:// or ftp://"
 msgstr "To polje mora vsebovati URL ki se zacne z http:// ali ftp://"
 
-msgctxt "OPERATION_FM_EMAIL_SIMPLE1"
+msgctxt "FM_EMAIL_SIMPLE1"
 msgid "You must enter an email address."
 msgstr "Vpisati morate email naslov."
 
-msgctxt "OPERATION_FM_EMAIL_SIMPLE2"
+msgctxt "FM_EMAIL_SIMPLE2"
 msgid "This field doesn\\'t look like an RFC822-compliant email address"
 msgstr "Ta vnos ne izgleda, kot veljaven RFC822 email naslov"
 
-msgctxt "OPERATION_FM_DOMAIN_NAME"
+msgctxt "FM_DOMAIN_NAME"
 msgid "This field doesn\\'t look like a valid Internet domain name or hostname."
 msgstr ""
 "Ta vnos ne izgleda, kot veljavno ime Internetne domene ali ime racunalnika."
 
-msgctxt "OPERATION_FM_IP_NUMBER1"
+msgctxt "FM_IP_NUMBER1"
 msgid "This field must contain a valid IP number and can not be left blank."
 msgstr "To polje mora vsebovati veljavno IP stevilko in ne sme ostati prazno."
 
-msgctxt "OPERATION_FM_IP_NUMBER2"
+msgctxt "FM_IP_NUMBER2"
 msgid "Invalid IP address format (expected X.X.X.X)"
 msgstr "Napačen začetni IP naslov"
 
-msgctxt "OPERATION_FM_IP_NUMBER3"
+msgctxt "FM_IP_NUMBER3"
 msgid "[_1] is more than 255"
 msgstr "{$octet} je vecji od 255"
 
-msgctxt "OPERATION_FM_USERNAME"
+msgctxt "FM_USERNAME"
 msgid ""
 "This field must look like a valid username (3 to 8 letters and numbers)"
 msgstr ""
 "To polje mora izgledati kot veljavno uporabnisko ime (3 do 8 crk in stevilk)"
 
-msgctxt "OPERATION_FM_PASSWORD1"
+msgctxt "FM_PASSWORD1"
 msgid "You must provide a password."
 msgstr "Vnesti morate geslo."
 
-msgctxt "OPERATION_FM_PASSWORD2"
+msgctxt "FM_PASSWORD2"
 msgid ""
 "The password you provided was not a good password.A good password must "
 "contain all of the following: upper case letter, lower case letter, number, "
@@ -531,18 +527,18 @@ msgstr ""
 "veliko crko, eno malo crko, stevilko, ne-alfanumericni znak (npr: # $ %) in "
 "biti najmanj 7 znakov dolgo."
 
-msgctxt "OPERATION_FM_MAC_ADDRESS1"
+msgctxt "FM_MAC_ADDRESS1"
 msgid "You must provide a MAC address."
 msgstr "Vnesti morate MAC naslov."
 
-msgctxt "OPERATION_FM_MAC_ADDRESS2"
+msgctxt "FM_MAC_ADDRESS2"
 msgid "The MAC address you provided was not valid."
 msgstr "Vnesli ste neveljaven MAC naslov."
 
-msgctxt "OPERATION_FM_ERR_UNEXPECTED_DESC"
+msgctxt "FM_ERR_UNEXPECTED_DESC"
 msgid "Error: unexpected or missing characters in description"
 msgstr "Napaka: v opisu je nepricakovan ali manjkajoci znak"
 
-msgctxt "OPERATION_CSRF_VALIDATION_FAILURE"
-msgid "Placeholder for missing original text"
+msgctxt "CSRF_VALIDATION_FAILURE"
+msgid "Error: CSRF token is invalid or outdated."
 msgstr "Error: CSRF token is invalid or outdated."
diff --git a/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/General/pofiles/general_sv.po b/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/General/pofiles/general_sv.po
index db80c18..0ddc7cc 100644
--- a/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/General/pofiles/general_sv.po
+++ b/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/General/pofiles/general_sv.po
@@ -5,99 +5,95 @@ msgstr ""
 "Language: None\n"
 "Content-Type: text/plain; charset=utf-8\n"
 
-msgctxt "OPERATION_Collaboration"
+msgctxt "Collaboration"
 msgid "Collaboration"
 msgstr "Samarbete"
 
-msgctxt "OPERATION_Administration"
+msgctxt "Administration"
 msgid "Administration"
 msgstr "Administration"
 
-msgctxt "OPERATION_Security"
+msgctxt "Security"
 msgid "Security"
 msgstr "Säkerhet"
 
-msgctxt "OPERATION_Configuration"
+msgctxt "Configuration"
 msgid "Configuration"
 msgstr "Konfiguration"
 
-msgctxt "OPERATION_Miscellaneous"
+msgctxt "Miscellaneous"
 msgid "Miscellaneous"
 msgstr "Övrigt"
 
-msgctxt "OPERATION_Your Settings"
-msgid "Your Settings"
-msgstr "Dina inställningar"
-
-msgctxt "OPERATION_SAVE"
+msgctxt "SAVE"
 msgid "Save"
 msgstr "Spara"
 
-msgctxt "OPERATION_CANCEL"
+msgctxt "CANCEL"
 msgid "Cancel"
 msgstr "Avbryt"
 
-msgctxt "OPERATION_ENABLED"
+msgctxt "ENABLED"
 msgid "Enabled"
 msgstr "Tillåten"
 
-msgctxt "OPERATION_DISABLED"
+msgctxt "DISABLED"
 msgid "Disabled"
 msgstr "Ej tillåten"
 
-msgctxt "OPERATION_NO"
+msgctxt "NO"
 msgid "No"
 msgstr "Nej"
 
-msgctxt "OPERATION_YES"
+msgctxt "YES"
 msgid "Yes"
 msgstr "Ja"
 
-msgctxt "OPERATION_ADD"
+msgctxt "ADD"
 msgid "Add"
 msgstr "Lägg till"
 
-msgctxt "OPERATION_CREATE"
+msgctxt "CREATE"
 msgid "Create"
 msgstr "Skapa"
 
-msgctxt "OPERATION_MODIFY"
+msgctxt "MODIFY"
 msgid "Modify"
 msgstr "Ändra"
 
-msgctxt "OPERATION_REMOVE"
+msgctxt "REMOVE"
 msgid "Remove"
 msgstr "Radera"
 
-msgctxt "OPERATION_COMMENT"
+msgctxt "COMMENT"
 msgid "Comment"
 msgstr "Kommentar"
 
-msgctxt "OPERATION_NEXT"
+msgctxt "NEXT"
 msgid "Next"
 msgstr "Nästa"
 
-msgctxt "OPERATION_SELF"
+msgctxt "SELF"
 msgid "Self"
 msgstr "Själv"
 
-msgctxt "OPERATION_REMOTE"
+msgctxt "REMOTE"
 msgid "Remote"
 msgstr "Fjärr"
 
-msgctxt "OPERATION_LOCAL"
+msgctxt "LOCAL"
 msgid "Local"
 msgstr "Lokal"
 
-msgctxt "OPERATION_ACTION"
+msgctxt "ACTION"
 msgid "Action"
 msgstr "Verkställ"
 
-msgctxt "OPERATION_NETWORK"
+msgctxt "NETWORK"
 msgid "Network"
 msgstr "Nätverk"
 
-msgctxt "OPERATION_ROUTER"
+msgctxt "ROUTER"
 msgid "Router"
 msgstr "Router"
 
@@ -105,23 +101,23 @@ msgctxt "OPERATION_STATUS_REPORT"
 msgid "Operation status report"
 msgstr "Statusrapport över operationerna"
 
-msgctxt "OPERATION_ACCOUNT"
+msgctxt "ACCOUNT"
 msgid "Account"
 msgstr "Konto"
 
-msgctxt "OPERATION_GROUP"
+msgctxt "GROUP"
 msgid "Group"
 msgstr "Grupp"
 
-msgctxt "OPERATION_DESC_SECTIONBAR"
+msgctxt "DESC_SECTIONBAR"
 msgid "<hr class=\"sectionbar\"/>"
 msgstr ""
 
-msgctxt "OPERATION_NO_PIPES_ALLOWED"
+msgctxt "NO_PIPES_ALLOWED"
 msgid "Pipe symbols (|) are not permitted in this field"
 msgstr "Pipe symboler (|) är inte tillåtna i detta fält"
 
-msgctxt "OPERATION_ERROR_BELOW"
+msgctxt "ERROR_BELOW"
 msgid ""
 "ERROR: There was an error in the validation of this page. Please scroll down"
 " and find the specific problem."
@@ -129,27 +125,27 @@ msgstr ""
 "FEL: Det blev ett fel vid valideringen av denna sida. Skrolla ner på sidan "
 "och sök efter problemet."
 
-msgctxt "OPERATION_ACCESS"
+msgctxt "ACCESS"
 msgid "Access"
 msgstr "Åtkomst"
 
-msgctxt "OPERATION_ACCOUNT_LOCKED"
+msgctxt "ACCOUNT_LOCKED"
 msgid "Account is locked"
 msgstr "Kontot är låst"
 
-msgctxt "OPERATION_GROUP_ADD"
+msgctxt "GROUP_ADD"
 msgid "Add group"
 msgstr "Lägg till grupp"
 
-msgctxt "OPERATION_NETWORKS_ALLOW_LOCAL"
+msgctxt "NETWORKS_ALLOW_LOCAL"
 msgid "Allow access only from local networks"
 msgstr "Acceptera endast åtkomst från lokala nätverk"
 
-msgctxt "OPERATION_NETWORKS_ALLOW_PUBLIC"
+msgctxt "NETWORKS_ALLOW_PUBLIC"
 msgid "Allow public access (entire Internet)"
 msgstr "Tillåt publik åtkomst (hela Internet)"
 
-msgctxt "OPERATION_ERROR_PASSWORD_CHANGE"
+msgctxt "ERROR_PASSWORD_CHANGE"
 msgid ""
 "An error occurred while attempting to change your password. Please make sure"
 " that the old password entered is correct."
@@ -157,318 +153,318 @@ msgstr ""
 "Et fel uppstod vid försök att ändra ditt lösenord. Kontrollera att det gamla"
 " lösenordet som du angav är korrekt."
 
-msgctxt "OPERATION_BACK"
+msgctxt "BACK"
 msgid "Back"
 msgstr "Tillbaka"
 
-msgctxt "OPERATION_BACKUP"
+msgctxt "BACKUP"
 msgid "Backup"
 msgstr "Backup"
 
-msgctxt "OPERATION_DESCRIPTION_BRIEF"
+msgctxt "DESCRIPTION_BRIEF"
 msgid "Brief description"
 msgstr "Kort beskrivning"
 
-msgctxt "OPERATION_PASSWORD_CHANGE"
+msgctxt "PASSWORD_CHANGE"
 msgid "Change Password"
 msgstr "Ändra lösenord"
 
-msgctxt "OPERATION_RESET_PASSWORD_TITLE"
+msgctxt "RESET_PASSWORD_TITLE"
 msgid "Reset user password"
 msgstr "Återställ användarens lösenord"
 
-msgctxt "OPERATION_ACCOUNT_PASSWORD_CHANGE"
+msgctxt "ACCOUNT_PASSWORD_CHANGE"
 msgid "Change account password"
 msgstr "Ändra lösenord för konto"
 
-msgctxt "OPERATION_CONTENT"
+msgctxt "CONTENT"
 msgid "Content"
 msgstr "Innehåll"
 
-msgctxt "OPERATION_CREATE_GROUP"
+msgctxt "CREATE_GROUP"
 msgid "Create user group"
 msgstr "Skapa användargrupp"
 
-msgctxt "OPERATION_USER_LIST_CURRENT"
+msgctxt "USER_LIST_CURRENT"
 msgid "Current list of users"
 msgstr "Aktuell lista över användare"
 
-msgctxt "OPERATION_DESCRIPTION"
+msgctxt "DESCRIPTION"
 msgid "Description"
 msgstr "Beskrivning"
 
-msgctxt "OPERATION_DESTINATION"
+msgctxt "DESTINATION"
 msgid "Destination"
 msgstr "Destination"
 
-msgctxt "OPERATION_DOMAIN_NAME"
+msgctxt "DOMAIN_NAME"
 msgid "Domain name"
 msgstr "Domännamn"
 
-msgctxt "OPERATION_DOMAIN"
+msgctxt "DOMAIN"
 msgid "Domain"
 msgstr "Domän"
 
-msgctxt "OPERATION_DOMAINS"
+msgctxt "DOMAINS"
 msgid "Domains"
 msgstr "Domäner"
 
-msgctxt "OPERATION_DOWNLOAD"
+msgctxt "DOWNLOAD"
 msgid "Download"
 msgstr "Ladda ner"
 
-msgctxt "OPERATION_ERROR_UPDATING_CONFIGURATION"
+msgctxt "ERROR_UPDATING_CONFIGURATION"
 msgid "Error occurred while updating system configuration."
 msgstr "Ett fel inträffade under uppdateringen av systemets konfiguration."
 
-msgctxt "OPERATION_GROUP_MEMBERS"
+msgctxt "GROUP_MEMBERS"
 msgid "Group Members"
 msgstr "Gruppmedlemmar"
 
-msgctxt "OPERATION_GROUP_NAME"
+msgctxt "GROUP_NAME"
 msgid "Group Name"
 msgstr "Gruppnamn"
 
-msgctxt "OPERATION_GROUPS"
+msgctxt "GROUPS"
 msgid "Groups"
 msgstr "Grupper"
 
-msgctxt "OPERATION_IP_ADDRESS"
+msgctxt "IP_ADDRESS"
 msgid "IP Address"
 msgstr "IP-adress"
 
-msgctxt "OPERATION_IP_ADDRESS_OR_FQDN"
+msgctxt "IP_ADDRESS_OR_FQDN"
 msgid "IP Address or FQDN"
 msgstr "IP-adress eller FQDN"
 
-msgctxt "OPERATION_USER_INVALID"
+msgctxt "USER_INVALID"
 msgid "Invalid user"
 msgstr "Otillåten användare"
 
-msgctxt "OPERATION_LOCATION"
+msgctxt "LOCATION"
 msgid "Location"
 msgstr "Placering"
 
-msgctxt "OPERATION_MB"
+msgctxt "MB"
 msgid "Mb"
 msgstr "Mb"
 
-msgctxt "OPERATION_MODIFY_USER_GROUP"
+msgctxt "MODIFY_USER_GROUP"
 msgid "Modify user group"
 msgstr "Ändra användargrupp"
 
-msgctxt "OPERATION_NAME"
+msgctxt "NAME"
 msgid "Name"
 msgstr "Namn"
 
-msgctxt "OPERATION_PASSWORD_VERIFY_NEW"
+msgctxt "PASSWORD_VERIFY_NEW"
 msgid "New password (verify):"
 msgstr "Nytt lösenord (verifiering):"
 
-msgctxt "OPERATION_PASSWORD_NEW"
+msgctxt "PASSWORD_NEW"
 msgid "New password:"
 msgstr "Nytt lösenord:"
 
-msgctxt "OPERATION_OFF"
+msgctxt "OFF"
 msgid "Off"
 msgstr "Av"
 
-msgctxt "OPERATION_OK"
+msgctxt "OK"
 msgid "Ok"
 msgstr "Ok"
 
-msgctxt "OPERATION_PASSWORD_OLD"
+msgctxt "PASSWORD_OLD"
 msgid "Old password:"
 msgstr "Gammalt lösenord:"
 
-msgctxt "OPERATION_ON"
+msgctxt "ON"
 msgid "On"
 msgstr "Aktiverad"
 
-msgctxt "OPERATION_PASSWORD"
+msgctxt "PASSWORD"
 msgid "Password"
 msgstr "Lösenord"
 
-msgctxt "OPERATION_PERFORM"
+msgctxt "PERFORM"
 msgid "Perform"
 msgstr "Verkställ"
 
-msgctxt "OPERATION_RECONFIGURE"
+msgctxt "RECONFIGURE"
 msgid "Reconfigure"
 msgstr "Omkonfigurera"
 
-msgctxt "OPERATION_REMOVE_USER_GROUP"
+msgctxt "REMOVE_USER_GROUP"
 msgid "Remove user group"
 msgstr "Radera användargrupp"
 
-msgctxt "OPERATION_PASSWORD_RESET"
+msgctxt "PASSWORD_RESET"
 msgid "Reset password"
 msgstr "Återställ lösenord"
 
-msgctxt "OPERATION_RESTORE"
+msgctxt "RESTORE"
 msgid "Restore"
 msgstr "Återställ"
 
-msgctxt "OPERATION_SHUTDOWN"
+msgctxt "SHUTDOWN"
 msgid "Shutdown"
 msgstr "Stäng av"
 
-msgctxt "OPERATION_SUCCESS"
+msgctxt "SUCCESS"
 msgid "Success"
 msgstr "Genomfört"
 
-msgctxt "OPERATION_ACCOUNT_NAME_INVALID"
+msgctxt "ACCOUNT_NAME_INVALID"
 msgid "The account name entered is invalid."
 msgstr "Kontonamnet som angivits är ogiltigt."
 
-msgctxt "OPERATION_ACCOUNT_NAME_INVALID_CHARS"
+msgctxt "ACCOUNT_NAME_INVALID_CHARS"
 msgid "The account name you entered contained invalid characters."
 msgstr "Kontonamnet du angav innehåller ogiltiga tecken."
 
-msgctxt "OPERATION_PASSWORD_OLD_INVALID_CHARS"
+msgctxt "PASSWORD_OLD_INVALID_CHARS"
 msgid "The old password you entered contained invalid characters."
 msgstr "Det gamla lösenordet som du angav innehåller ogiltiga tecken."
 
-msgctxt "OPERATION_PASSWORD_INVALID_CHARS"
+msgctxt "PASSWORD_INVALID_CHARS"
 msgid "The password you entered contained invalid characters."
 msgstr "Lösenordet som du angav innehåller ogiltiga tecken."
 
-msgctxt "OPERATION_PASSWORD_VERIFY_ERROR"
+msgctxt "PASSWORD_VERIFY_ERROR"
 msgid "The passwords you entered did not match."
 msgstr "Lösenorden du angav stämmer inte överens."
 
-msgctxt "OPERATION_ACCOUNT_USER_NONE"
+msgctxt "ACCOUNT_USER_NONE"
 msgid "There are no user accounts in the system."
 msgstr "Det finns inga användarkonton på detta system."
 
-msgctxt "OPERATION_ACCOUNT_GROUP_NONE"
+msgctxt "ACCOUNT_GROUP_NONE"
 msgid "There are no user groups in the system."
 msgstr "Det finns inga användargrupper i systemet."
 
-msgctxt "OPERATION_ERROR_INVALID_CHARS"
+msgctxt "ERROR_INVALID_CHARS"
 msgid "Unexpected characters in description."
 msgstr "Otillåtna tecken i beskrivningen."
 
-msgctxt "OPERATION_USER_NAME"
+msgctxt "USER_NAME"
 msgid "User Name"
 msgstr "Användarnamn"
 
-msgctxt "OPERATION_YOUR_ACCOUNT"
+msgctxt "YOUR_ACCOUNT"
 msgid "Your account:"
 msgstr "Ditt konto:"
 
-msgctxt "OPERATION_YOUR_ACCOUNT_INVALID"
+msgctxt "YOUR_ACCOUNT_INVALID"
 msgid "The account name entered is invalid."
 msgstr "Kontonamnet som angivits är ogiltigt."
 
-msgctxt "OPERATION_PASSWORD_CHANGE_SUCCESS"
+msgctxt "PASSWORD_CHANGE_SUCCESS"
 msgid "Your password has been successfully changed."
 msgstr "Ditt lösenord har ändrats."
 
-msgctxt "OPERATION_FM_NONBLANK"
+msgctxt "FM_NONBLANK"
 msgid "This field must not be left blank"
 msgstr "Detta fält får inte vara tomt"
 
-msgctxt "OPERATION_FM_INTEGER"
+msgctxt "FM_INTEGER"
 msgid "This field must contain a positive integer"
 msgstr "Detta fält måste innehålla ett positivt heltal"
 
-msgctxt "OPERATION_FM_NUMBER"
+msgctxt "FM_NUMBER"
 msgid "This field must contain a number"
 msgstr "Detta fält måste innehålla en siffra"
 
-msgctxt "OPERATION_FM_WORD"
+msgctxt "FM_WORD"
 msgid "This field must look like a single word."
 msgstr "Detta fält måste innehålla ett ord."
 
-msgctxt "OPERATION_FM_DATE"
+msgctxt "FM_DATE"
 msgid "The data entered could not be parsed as a date"
 msgstr "Datan som angavs kunde inte hanteras som datum"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_NUMBER1"
+msgctxt "FM_CREDIT_CARD_NUMBER1"
 msgid "You must enter a credit card number"
 msgstr "Du måste ange ett kreditkortsnummer"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_NUMBER2"
+msgctxt "FM_CREDIT_CARD_NUMBER2"
 msgid ""
 "Credit card numbers shouldn\\'t have anything but numbers, spaces or dashes"
 msgstr ""
 "Kreditkortsnummer skall endast innehålla siffror, mellanslag eller streck"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_NUMBER3"
+msgctxt "FM_CREDIT_CARD_NUMBER3"
 msgid "Must be at least 14 characters in length"
 msgstr "Måste vara minst 14 tecken långt"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_NUMBER4"
+msgctxt "FM_CREDIT_CARD_NUMBER4"
 msgid "Doesn\\'t appear to be a valid credit card number"
 msgstr "Verkar inte vara ett giltligt kreditkortsnummer"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_EXPIRY1"
+msgctxt "FM_CREDIT_CARD_EXPIRY1"
 msgid "No expiry date entered."
 msgstr "Inget utgångsdatum angivet."
 
-msgctxt "OPERATION_FM_CREDIT_CARD_EXPIRY2"
+msgctxt "FM_CREDIT_CARD_EXPIRY2"
 msgid "Expiry date must be in the format MM/YY or MM/YYYY"
 msgstr "Utgångsdatumet måste vara i formatet MM/YY eller MM/YYYY"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_EXPIRY3"
+msgctxt "FM_CREDIT_CARD_EXPIRY3"
 msgid "This expiry date appears to have already passed"
 msgstr "Utgångsdatumet verkar ha passerat"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_EXPIRY4"
+msgctxt "FM_CREDIT_CARD_EXPIRY4"
 msgid "This expiry date appears to be too far in the future"
 msgstr "Utgångsdatumet verkar ligga för långt fram i framtiden"
 
-msgctxt "OPERATION_FM_ISO_COUNTRY_CODE1"
+msgctxt "FM_ISO_COUNTRY_CODE1"
 msgid "You must provide a country code"
 msgstr "Du måste ange en landskod"
 
-msgctxt "OPERATION_FM_ISO_COUNTRY_CODE2"
+msgctxt "FM_ISO_COUNTRY_CODE2"
 msgid "This field does not contain an ISO country code"
 msgstr "Fältet innehåller inte en landskod i ISO-format"
 
-msgctxt "OPERATION_FM_US_STATE"
+msgctxt "FM_US_STATE"
 msgid "This doesn\\'t appear to be a valid 2-letter US state abbreviation"
 msgstr ""
 "Detta verkar inte vara ett giltligt 2-bokstavs förkortning för en USA stat"
 
-msgctxt "OPERATION_FM_US_ZIPCODE"
+msgctxt "FM_US_ZIPCODE"
 msgid "US zip codes must contain 5 or 9 numbers"
 msgstr "Postkoder i USA måste innehålla 5 eller 9 siffror"
 
-msgctxt "OPERATION_FM_MINLENGTH1"
+msgctxt "FM_MINLENGTH1"
 msgid "Minimum length has been specified meaninglessly as [_1]"
 msgstr "Minimala längden har angivits till {$minlength}"
 
-msgctxt "OPERATION_FM_MINLENGTH2"
+msgctxt "FM_MINLENGTH2"
 msgid "This field must be at least [_1] characters"
 msgstr "Detta fält måste innehålla minst {$minlength} tecken"
 
-msgctxt "OPERATION_FM_MAXLENGTH1"
+msgctxt "FM_MAXLENGTH1"
 msgid "Maximum length has been specified meaninglessly as [_1]"
 msgstr "Maximala längden har angvits till {$maxlength}"
 
-msgctxt "OPERATION_FM_MAXLENGTH2"
+msgctxt "FM_MAXLENGTH2"
 msgid "This field must be no more than [_1] characters"
 msgstr "Detta fält får innehålla maximalt {$maxlength} tecken"
 
-msgctxt "OPERATION_FM_EXACTLENGTH1"
+msgctxt "FM_EXACTLENGTH1"
 msgid "You must specify the length for the field."
 msgstr "Du måste ange längden för detta fält."
 
-msgctxt "OPERATION_FM_EXACTLENGTH2"
+msgctxt "FM_EXACTLENGTH2"
 msgid "You must specify the exactlength of the field with an integer"
 msgstr "Du måste ange den exakta längden på fältet med ett heltal"
 
-msgctxt "OPERATION_FM_EXACTLENGTH3"
+msgctxt "FM_EXACTLENGTH3"
 msgid "This field must be exactly [_1] characters"
 msgstr "Detta fält måste innehålla exakt {$exactlength} tecken"
 
-msgctxt "OPERATION_FM_LENGTHRANGE1"
+msgctxt "FM_LENGTHRANGE1"
 msgid "You must specify the maximum and minimum length for the field."
 msgstr "Du måste ange den maximala och minimala längden för detta fält."
 
-msgctxt "OPERATION_FM_LENGTHRANGE2"
+msgctxt "FM_LENGTHRANGE2"
 msgid ""
 "You must specify the maximum and minimum lengths of the field with an "
 "integer"
@@ -476,55 +472,55 @@ msgstr ""
 "Du måste ange den maximala och minimala längden för detta fält med ett "
 "heltal"
 
-msgctxt "OPERATION_FM_LENGTHRANGE3"
+msgctxt "FM_LENGTHRANGE3"
 msgid "This field must be between [_1] and [_2] characters"
 msgstr ""
 "Detta fält måste ha en längd mellan {$minlength} och {$maxlength} tecken"
 
-msgctxt "OPERATION_FM_URL"
+msgctxt "FM_URL"
 msgid "This field must contain a URL starting with http:// or ftp://"
 msgstr "Detta fält måste innehålla en URL som börjar med http:// eller ftp://"
 
-msgctxt "OPERATION_FM_EMAIL_SIMPLE1"
+msgctxt "FM_EMAIL_SIMPLE1"
 msgid "You must enter an email address."
 msgstr "Du måste ange en e-postadress."
 
-msgctxt "OPERATION_FM_EMAIL_SIMPLE2"
+msgctxt "FM_EMAIL_SIMPLE2"
 msgid "This field doesn\\'t look like an RFC822-compliant email address"
 msgstr ""
 "Detta fält verkar inte innehålla en e-post som är kompatibel med RFC822"
 
-msgctxt "OPERATION_FM_DOMAIN_NAME"
+msgctxt "FM_DOMAIN_NAME"
 msgid "This field doesn\\'t look like a valid Internet domain name or hostname."
 msgstr ""
 "Detta fält verkar inte innehålla ett giltigt namn för en Internetdomän eller"
 " värd."
 
-msgctxt "OPERATION_FM_IP_NUMBER1"
+msgctxt "FM_IP_NUMBER1"
 msgid "This field must contain a valid IP number and can not be left blank."
 msgstr ""
 "Detta fält måste innehålla ett giltigt IP-nummer och kan inte lämnas tomt."
 
-msgctxt "OPERATION_FM_IP_NUMBER2"
+msgctxt "FM_IP_NUMBER2"
 msgid "Invalid IP address format (expected X.X.X.X)"
 msgstr "Ogiltig IP-adress format (förväntat X.X.X.X)"
 
-msgctxt "OPERATION_FM_IP_NUMBER3"
+msgctxt "FM_IP_NUMBER3"
 msgid "[_1] is more than 255"
 msgstr "{$octet} är mer än 255"
 
-msgctxt "OPERATION_FM_USERNAME"
+msgctxt "FM_USERNAME"
 msgid ""
 "This field must look like a valid username (3 to 8 letters and numbers)"
 msgstr ""
 "Detta fält måste se ut som ett giltigt användarnamn (3 till 8 bokstäver "
 "eller siffror)"
 
-msgctxt "OPERATION_FM_PASSWORD1"
+msgctxt "FM_PASSWORD1"
 msgid "You must provide a password."
 msgstr "Du måste ange ett lösenord."
 
-msgctxt "OPERATION_FM_PASSWORD2"
+msgctxt "FM_PASSWORD2"
 msgid ""
 "The password you provided was not a good password.A good password must "
 "contain all of the following: upper case letter, lower case letter, number, "
@@ -534,18 +530,18 @@ msgstr ""
 "innehålla allt av följande: versal, gemen, siffra, icke alfabetiskt tecken "
 "och vara minst 7 tecken långt."
 
-msgctxt "OPERATION_FM_MAC_ADDRESS1"
+msgctxt "FM_MAC_ADDRESS1"
 msgid "You must provide a MAC address."
 msgstr "Du måste ange en MAC-adress."
 
-msgctxt "OPERATION_FM_MAC_ADDRESS2"
+msgctxt "FM_MAC_ADDRESS2"
 msgid "The MAC address you provided was not valid."
 msgstr "MAC-adressen som du angav var inte giltig."
 
-msgctxt "OPERATION_FM_ERR_UNEXPECTED_DESC"
+msgctxt "FM_ERR_UNEXPECTED_DESC"
 msgid "Error: unexpected or missing characters in description"
 msgstr "Fel: oväntade eller saknade tecken i beskrivningen"
 
-msgctxt "OPERATION_CSRF_VALIDATION_FAILURE"
-msgid "Placeholder for missing original text"
+msgctxt "CSRF_VALIDATION_FAILURE"
+msgid "Error: CSRF token is invalid or outdated."
 msgstr "Error: CSRF token is invalid or outdated."
diff --git a/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/General/pofiles/general_th.po b/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/General/pofiles/general_th.po
index 63f42df..b128485 100644
--- a/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/General/pofiles/general_th.po
+++ b/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/General/pofiles/general_th.po
@@ -5,99 +5,95 @@ msgstr ""
 "Language: None\n"
 "Content-Type: text/plain; charset=utf-8\n"
 
-msgctxt "OPERATION_Collaboration"
+msgctxt "Collaboration"
 msgid "Collaboration"
 msgstr "การรวบรวม"
 
-msgctxt "OPERATION_Administration"
+msgctxt "Administration"
 msgid "Administration"
 msgstr "การบริหาร"
 
-msgctxt "OPERATION_Security"
+msgctxt "Security"
 msgid "Security"
 msgstr "ความปลอดภัย"
 
-msgctxt "OPERATION_Configuration"
+msgctxt "Configuration"
 msgid "Configuration"
 msgstr "การตั้งค่าของระบบ"
 
-msgctxt "OPERATION_Miscellaneous"
+msgctxt "Miscellaneous"
 msgid "Miscellaneous"
 msgstr "เบ็ดเตล็ด"
 
-msgctxt "OPERATION_Your Settings"
-msgid "Your Settings"
-msgstr "ค่าที่คุณตั้ง"
-
-msgctxt "OPERATION_SAVE"
+msgctxt "SAVE"
 msgid "Save"
 msgstr "บันทึก"
 
-msgctxt "OPERATION_CANCEL"
+msgctxt "CANCEL"
 msgid "Cancel"
 msgstr "ยกเลิก"
 
-msgctxt "OPERATION_ENABLED"
+msgctxt "ENABLED"
 msgid "Enabled"
 msgstr "เปิดใช้งาน"
 
-msgctxt "OPERATION_DISABLED"
+msgctxt "DISABLED"
 msgid "Disabled"
 msgstr "ปิดไม่ใช้งาน"
 
-msgctxt "OPERATION_NO"
+msgctxt "NO"
 msgid "No"
 msgstr "ไม่"
 
-msgctxt "OPERATION_YES"
+msgctxt "YES"
 msgid "Yes"
 msgstr "ใช่"
 
-msgctxt "OPERATION_ADD"
+msgctxt "ADD"
 msgid "Add"
 msgstr "เพิ่ม"
 
-msgctxt "OPERATION_CREATE"
+msgctxt "CREATE"
 msgid "Create"
 msgstr "สร้าง"
 
-msgctxt "OPERATION_MODIFY"
+msgctxt "MODIFY"
 msgid "Modify"
 msgstr "แก้ไข"
 
-msgctxt "OPERATION_REMOVE"
+msgctxt "REMOVE"
 msgid "Remove"
 msgstr "ลบ"
 
-msgctxt "OPERATION_COMMENT"
+msgctxt "COMMENT"
 msgid "Comment"
 msgstr "บันทึกเพิ่มเติม"
 
-msgctxt "OPERATION_NEXT"
+msgctxt "NEXT"
 msgid "Next"
 msgstr "ถัดไป"
 
-msgctxt "OPERATION_SELF"
+msgctxt "SELF"
 msgid "Self"
 msgstr "ตัวเอง"
 
-msgctxt "OPERATION_REMOTE"
+msgctxt "REMOTE"
 msgid "Remote"
 msgstr "การรีโมทจากภายนอก"
 
-msgctxt "OPERATION_LOCAL"
+msgctxt "LOCAL"
 msgid "Local"
 msgstr "เครือข่ายภายใน"
 
-msgctxt "OPERATION_ACTION"
+msgctxt "ACTION"
 msgid "Action"
 msgstr "การดำเนินการ"
 
-msgctxt "OPERATION_NETWORK"
+msgctxt "NETWORK"
 msgid "Network"
 msgstr "เครือข่าย"
 
-msgctxt "OPERATION_ROUTER"
+msgctxt "ROUTER"
 msgid "Router"
 msgstr "เราเตอร์"
 
@@ -105,23 +101,23 @@ msgctxt "OPERATION_STATUS_REPORT"
 msgid "Operation status report"
 msgstr "รายงานสถานะการทำงาน"
 
-msgctxt "OPERATION_ACCOUNT"
+msgctxt "ACCOUNT"
 msgid "Account"
 msgstr "บัญชีผู้ใช้"
 
-msgctxt "OPERATION_GROUP"
+msgctxt "GROUP"
 msgid "Group"
 msgstr "กลุ่มผู้ใช้"
 
-msgctxt "OPERATION_DESC_SECTIONBAR"
+msgctxt "DESC_SECTIONBAR"
 msgid "<hr class=\"sectionbar\"/>"
-msgstr " <hr class=\"sectionbar\"/> "
+msgstr "<hr class=\"sectionbar\"/>"
 
-msgctxt "OPERATION_NO_PIPES_ALLOWED"
+msgctxt "NO_PIPES_ALLOWED"
 msgid "Pipe symbols (|) are not permitted in this field"
 msgstr "ไม่อณุญาตให้ใช้เครื่องหมายไปป์ (|) ในฟิลด์นี้"
 
-msgctxt "OPERATION_ERROR_BELOW"
+msgctxt "ERROR_BELOW"
 msgid ""
 "ERROR: There was an error in the validation of this page. Please scroll down"
 " and find the specific problem."
@@ -129,27 +125,27 @@ msgstr ""
 "ผิดพลาด: ตรวจพบข้อมูลที่ไม่ถูกต้องในหน้านี้ "
 "กรุณาเลื่อนลงเพื่อดูรายการข้อผิดพลาด"
 
-msgctxt "OPERATION_ACCESS"
+msgctxt "ACCESS"
 msgid "Access"
 msgstr "สิทธิการเข้าถึง"
 
-msgctxt "OPERATION_ACCOUNT_LOCKED"
+msgctxt "ACCOUNT_LOCKED"
 msgid "Account is locked"
 msgstr "บัญชีถูกล็อค"
 
-msgctxt "OPERATION_GROUP_ADD"
+msgctxt "GROUP_ADD"
 msgid "Add group"
 msgstr "เพิ่มกลุ่มผู้ใช้"
 
-msgctxt "OPERATION_NETWORKS_ALLOW_LOCAL"
+msgctxt "NETWORKS_ALLOW_LOCAL"
 msgid "Allow access only from local networks"
 msgstr "ให้เข้าถึงได้เฉพาะจากเครือข่ายท้องถิ่นเท่านั้น"
 
-msgctxt "OPERATION_NETWORKS_ALLOW_PUBLIC"
+msgctxt "NETWORKS_ALLOW_PUBLIC"
 msgid "Allow public access (entire Internet)"
 msgstr "ให้สามารถเข้าถึงได้จากทุกที่ (ทั้งอินเทอร์เน็ต)"
 
-msgctxt "OPERATION_ERROR_PASSWORD_CHANGE"
+msgctxt "ERROR_PASSWORD_CHANGE"
 msgid ""
 "An error occurred while attempting to change your password. Please make sure"
 " that the old password entered is correct."
@@ -157,367 +153,367 @@ msgstr ""
 "เกิดข้อผิดพลาดขณะทำการเปลี่ยนรหัสผ่าน "
 "โปรดตรวจสอบว่ากรอกหัสผ่านเก่าถูกต้องแล้ว"
 
-msgctxt "OPERATION_BACK"
+msgctxt "BACK"
 msgid "Back"
 msgstr "ย้อนกลับ"
 
-msgctxt "OPERATION_BACKUP"
+msgctxt "BACKUP"
 msgid "Backup"
 msgstr "สำรองข้อมูล"
 
-msgctxt "OPERATION_DESCRIPTION_BRIEF"
+msgctxt "DESCRIPTION_BRIEF"
 msgid "Brief description"
 msgstr "คำอธิบายโดยย่อ"
 
-msgctxt "OPERATION_PASSWORD_CHANGE"
+msgctxt "PASSWORD_CHANGE"
 msgid "Change Password"
 msgstr "เปลี่ยนรหัสผ่าน"
 
-msgctxt "OPERATION_RESET_PASSWORD_TITLE"
+msgctxt "RESET_PASSWORD_TITLE"
 msgid "Reset user password"
 msgstr "รีเซ็ตรหัสผ่านของผู้ใช้"
 
-msgctxt "OPERATION_ACCOUNT_PASSWORD_CHANGE"
+msgctxt "ACCOUNT_PASSWORD_CHANGE"
 msgid "Change account password"
 msgstr "เปลี่ยนรหัสผ่าน"
 
-msgctxt "OPERATION_CONTENT"
+msgctxt "CONTENT"
 msgid "Content"
 msgstr "เนื้อหา"
 
-msgctxt "OPERATION_CREATE_GROUP"
+msgctxt "CREATE_GROUP"
 msgid "Create user group"
 msgstr "สร้างกลุ่มผู้ใช้"
 
-msgctxt "OPERATION_USER_LIST_CURRENT"
+msgctxt "USER_LIST_CURRENT"
 msgid "Current list of users"
 msgstr "รายชื่อผู้ใช้ที่มีอยู่ในปัจจุบัน"
 
-msgctxt "OPERATION_DESCRIPTION"
+msgctxt "DESCRIPTION"
 msgid "Description"
 msgstr "รายละเอียด"
 
-msgctxt "OPERATION_DESTINATION"
+msgctxt "DESTINATION"
 msgid "Destination"
 msgstr "ปลายทาง"
 
-msgctxt "OPERATION_DOMAIN_NAME"
+msgctxt "DOMAIN_NAME"
 msgid "Domain name"
 msgstr "ชื่อโดเมน"
 
-msgctxt "OPERATION_DOMAIN"
+msgctxt "DOMAIN"
 msgid "Domain"
 msgstr "โดเมน"
 
-msgctxt "OPERATION_DOMAINS"
+msgctxt "DOMAINS"
 msgid "Domains"
 msgstr "โดเมนส์"
 
-msgctxt "OPERATION_DOWNLOAD"
+msgctxt "DOWNLOAD"
 msgid "Download"
 msgstr "ดาวน์โหลด"
 
-msgctxt "OPERATION_ERROR_UPDATING_CONFIGURATION"
+msgctxt "ERROR_UPDATING_CONFIGURATION"
 msgid "Error occurred while updating system configuration."
 msgstr "เกิดข้อผิดพลาดขึ้นระหว่างการปรับปรุงค่าของระบบ"
 
-msgctxt "OPERATION_GROUP_MEMBERS"
+msgctxt "GROUP_MEMBERS"
 msgid "Group Members"
 msgstr "สมาชิกของกลุ่ม"
 
-msgctxt "OPERATION_GROUP_NAME"
+msgctxt "GROUP_NAME"
 msgid "Group Name"
 msgstr "ชื่อของกลุ่ม"
 
-msgctxt "OPERATION_GROUPS"
+msgctxt "GROUPS"
 msgid "Groups"
 msgstr "รายชื่อกลุ่มผู้ใช้"
 
-msgctxt "OPERATION_IP_ADDRESS"
+msgctxt "IP_ADDRESS"
 msgid "IP Address"
 msgstr "หมายเลข IP"
 
-msgctxt "OPERATION_IP_ADDRESS_OR_FQDN"
+msgctxt "IP_ADDRESS_OR_FQDN"
 msgid "IP Address or FQDN"
 msgstr "หมายเลข IP หรือ FQDN"
 
-msgctxt "OPERATION_USER_INVALID"
+msgctxt "USER_INVALID"
 msgid "Invalid user"
 msgstr "ชื่อผู้ใช้ไม่ถูกต้อง"
 
-msgctxt "OPERATION_LOCATION"
+msgctxt "LOCATION"
 msgid "Location"
 msgstr "สถานที่"
 
-msgctxt "OPERATION_MB"
+msgctxt "MB"
 msgid "Mb"
 msgstr "Mb"
 
-msgctxt "OPERATION_MODIFY_USER_GROUP"
+msgctxt "MODIFY_USER_GROUP"
 msgid "Modify user group"
 msgstr "ปรับปรุงกลุ่มผู้ใช้"
 
-msgctxt "OPERATION_NAME"
+msgctxt "NAME"
 msgid "Name"
 msgstr "ชื่อ"
 
-msgctxt "OPERATION_PASSWORD_VERIFY_NEW"
+msgctxt "PASSWORD_VERIFY_NEW"
 msgid "New password (verify):"
 msgstr "รหัสผ่านใหม่ (ยืนยัน):"
 
-msgctxt "OPERATION_PASSWORD_NEW"
+msgctxt "PASSWORD_NEW"
 msgid "New password:"
 msgstr "รหัสผ่านใหม่:"
 
-msgctxt "OPERATION_OFF"
+msgctxt "OFF"
 msgid "Off"
 msgstr "ปิด"
 
-msgctxt "OPERATION_OK"
+msgctxt "OK"
 msgid "Ok"
 msgstr "ตกลง"
 
-msgctxt "OPERATION_PASSWORD_OLD"
+msgctxt "PASSWORD_OLD"
 msgid "Old password:"
 msgstr "รหัสผ่านเก่า:"
 
-msgctxt "OPERATION_ON"
+msgctxt "ON"
 msgid "On"
 msgstr "เปิด"
 
-msgctxt "OPERATION_PASSWORD"
+msgctxt "PASSWORD"
 msgid "Password"
 msgstr "รหัสผ่าน"
 
-msgctxt "OPERATION_PERFORM"
+msgctxt "PERFORM"
 msgid "Perform"
 msgstr "ดำเนินงาน"
 
-msgctxt "OPERATION_RECONFIGURE"
+msgctxt "RECONFIGURE"
 msgid "Reconfigure"
 msgstr "กำหนดค่าใหม่"
 
-msgctxt "OPERATION_REMOVE_USER_GROUP"
+msgctxt "REMOVE_USER_GROUP"
 msgid "Remove user group"
 msgstr "ลบกลุ่มผู้ใช้"
 
-msgctxt "OPERATION_PASSWORD_RESET"
+msgctxt "PASSWORD_RESET"
 msgid "Reset password"
 msgstr "รีเซ็ตรหัสผ่าน"
 
-msgctxt "OPERATION_RESTORE"
+msgctxt "RESTORE"
 msgid "Restore"
 msgstr "นำข้อมูลสำรองมาใช้"
 
-msgctxt "OPERATION_SHUTDOWN"
+msgctxt "SHUTDOWN"
 msgid "Shutdown"
 msgstr "ปิดเครื่อง"
 
-msgctxt "OPERATION_SUCCESS"
+msgctxt "SUCCESS"
 msgid "Success"
 msgstr "เป็นผลสำเร็จ"
 
-msgctxt "OPERATION_ACCOUNT_NAME_INVALID"
+msgctxt "ACCOUNT_NAME_INVALID"
 msgid "The account name entered is invalid."
 msgstr "ชื่อบัญชีที่ป้อนไม่ถูกต้อง"
 
-msgctxt "OPERATION_ACCOUNT_NAME_INVALID_CHARS"
+msgctxt "ACCOUNT_NAME_INVALID_CHARS"
 msgid "The account name you entered contained invalid characters."
 msgstr "ชื่อบัญชีที่ป้อนมีตัวอักษรที่ห้ามนำมาใช้"
 
-msgctxt "OPERATION_PASSWORD_OLD_INVALID_CHARS"
+msgctxt "PASSWORD_OLD_INVALID_CHARS"
 msgid "The old password you entered contained invalid characters."
 msgstr "รหัสผ่านเก่าที่ป้อนมีตัวอักษรที่ห้ามนำมาใช้"
 
-msgctxt "OPERATION_PASSWORD_INVALID_CHARS"
+msgctxt "PASSWORD_INVALID_CHARS"
 msgid "The password you entered contained invalid characters."
 msgstr "รหัสผ่านที่ป้อนมีตัวอักษรที่ห้ามนำมาใช้"
 
-msgctxt "OPERATION_PASSWORD_VERIFY_ERROR"
+msgctxt "PASSWORD_VERIFY_ERROR"
 msgid "The passwords you entered did not match."
 msgstr "รหัสผ่านที่คุณใส่ไม่ตรงกัน"
 
-msgctxt "OPERATION_ACCOUNT_USER_NONE"
+msgctxt "ACCOUNT_USER_NONE"
 msgid "There are no user accounts in the system."
 msgstr "ไม่มีบัญชีผู้ใช้นี้ในระบบ"
 
-msgctxt "OPERATION_ACCOUNT_GROUP_NONE"
+msgctxt "ACCOUNT_GROUP_NONE"
 msgid "There are no user groups in the system."
 msgstr "ไม่มีกลุ่มผู้ใช้นี้ในระบบ"
 
-msgctxt "OPERATION_ERROR_INVALID_CHARS"
+msgctxt "ERROR_INVALID_CHARS"
 msgid "Unexpected characters in description."
 msgstr "มีบางตัวอักษรที่นำมาใช้ไม่ได้อยู่ในเนื้อหาของ \"รายละเอียด\""
 
-msgctxt "OPERATION_USER_NAME"
+msgctxt "USER_NAME"
 msgid "User Name"
 msgstr "ชื่อผู้ใช้"
 
-msgctxt "OPERATION_YOUR_ACCOUNT"
+msgctxt "YOUR_ACCOUNT"
 msgid "Your account:"
 msgstr "บัญชีของคุณ:"
 
-msgctxt "OPERATION_YOUR_ACCOUNT_INVALID"
+msgctxt "YOUR_ACCOUNT_INVALID"
 msgid "The account name entered is invalid."
 msgstr "ชื่อบัญชีที่ป้อนไม่ถูกต้อง"
 
-msgctxt "OPERATION_PASSWORD_CHANGE_SUCCESS"
+msgctxt "PASSWORD_CHANGE_SUCCESS"
 msgid "Your password has been successfully changed."
 msgstr "ระบบได้ทำการเปลี่ยนรหัสผ่านของคุณให้แล้ว"
 
-msgctxt "OPERATION_FM_NONBLANK"
+msgctxt "FM_NONBLANK"
 msgid "This field must not be left blank"
 msgstr "ฟิลด์นี้จะต้องไม่เว้นว่างไว้"
 
-msgctxt "OPERATION_FM_INTEGER"
+msgctxt "FM_INTEGER"
 msgid "This field must contain a positive integer"
 msgstr "ฟิลด์นี้ต้องเป็นจำนวนเต็มบวก"
 
-msgctxt "OPERATION_FM_NUMBER"
+msgctxt "FM_NUMBER"
 msgid "This field must contain a number"
 msgstr "ฟิลด์นี้จะต้องเป็นตัวเลข"
 
-msgctxt "OPERATION_FM_WORD"
+msgctxt "FM_WORD"
 msgid "This field must look like a single word."
 msgstr "ฟิลด์นี้จะต้องมีลักษณะเป็นคำๆ เดียว (ไม่เว้นวรรค)"
 
-msgctxt "OPERATION_FM_DATE"
+msgctxt "FM_DATE"
 msgid "The data entered could not be parsed as a date"
 msgstr "ข้อมูลที่ป้อนไม่สามารถแปลเป็นวันที่ได้"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_NUMBER1"
+msgctxt "FM_CREDIT_CARD_NUMBER1"
 msgid "You must enter a credit card number"
 msgstr "คุณต้องป้อนหมายเลขบัตรเครดิต"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_NUMBER2"
+msgctxt "FM_CREDIT_CARD_NUMBER2"
 msgid ""
 "Credit card numbers shouldn\\'t have anything but numbers, spaces or dashes"
 msgstr ""
 "หมายเลขบัตรเครดิตต้องไม่มีเครื่องหมายอื่นใดนอกจาก "
 "ตัวเลขและช่องว่างหรือเครื่องหมายขีดกลาง"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_NUMBER3"
+msgctxt "FM_CREDIT_CARD_NUMBER3"
 msgid "Must be at least 14 characters in length"
 msgstr "ต้องมีอย่างต่ำ 14 อักขระ"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_NUMBER4"
+msgctxt "FM_CREDIT_CARD_NUMBER4"
 msgid "Doesn\\'t appear to be a valid credit card number"
 msgstr "ตรวจพบว่าไม่น่าที่จะเป็นหมายเลขบัตรเครดิตที่ถูกต้อง"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_EXPIRY1"
+msgctxt "FM_CREDIT_CARD_EXPIRY1"
 msgid "No expiry date entered."
 msgstr "ไม่ได้ป้อนวันหมดอายุ"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_EXPIRY2"
+msgctxt "FM_CREDIT_CARD_EXPIRY2"
 msgid "Expiry date must be in the format MM/YY or MM/YYYY"
 msgstr "วันหมดอายุจะต้องอยู่ในรูปแบบ MM/YY หรือ MM/YYYY"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_EXPIRY3"
+msgctxt "FM_CREDIT_CARD_EXPIRY3"
 msgid "This expiry date appears to have already passed"
 msgstr "วันที่หมดอายุผ่านไปหรือหมดอายุไปแล้ว"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_EXPIRY4"
+msgctxt "FM_CREDIT_CARD_EXPIRY4"
 msgid "This expiry date appears to be too far in the future"
 msgstr "วันที่หมดอายุนานกว่าที่ระบบจะเข้าใจ"
 
-msgctxt "OPERATION_FM_ISO_COUNTRY_CODE1"
+msgctxt "FM_ISO_COUNTRY_CODE1"
 msgid "You must provide a country code"
 msgstr "โปรดกรอกรหัสประเทศ"
 
-msgctxt "OPERATION_FM_ISO_COUNTRY_CODE2"
+msgctxt "FM_ISO_COUNTRY_CODE2"
 msgid "This field does not contain an ISO country code"
 msgstr "ฟิลด์นี้ต้องใส่รหัสประเทศตามมาตฐาน ISO"
 
-msgctxt "OPERATION_FM_US_STATE"
+msgctxt "FM_US_STATE"
 msgid "This doesn\\'t appear to be a valid 2-letter US state abbreviation"
 msgstr "ไม่ใช่รหัสย่อ 2 ตัวของ \"รัฐ\" ของอเมริกา"
 
-msgctxt "OPERATION_FM_US_ZIPCODE"
+msgctxt "FM_US_ZIPCODE"
 msgid "US zip codes must contain 5 or 9 numbers"
 msgstr "รหัสไปรษณีย์ของสหรัฐอเมริกาต้องเป็นตัวเลข 5 หรือ 9 ตัว"
 
-msgctxt "OPERATION_FM_MINLENGTH1"
+msgctxt "FM_MINLENGTH1"
 msgid "Minimum length has been specified meaninglessly as [_1]"
 msgstr "ความยาวขั้นต่ำที่กำหนดไว้คือต้องไม่น้อยกว่า {$minlength}"
 
-msgctxt "OPERATION_FM_MINLENGTH2"
+msgctxt "FM_MINLENGTH2"
 msgid "This field must be at least [_1] characters"
 msgstr "ฟิลด์นี้ต้องยาวอย่างต่ำ {$minlength} ตัวอักษร"
 
-msgctxt "OPERATION_FM_MAXLENGTH1"
+msgctxt "FM_MAXLENGTH1"
 msgid "Maximum length has been specified meaninglessly as [_1]"
 msgstr "ความยาวสูงสุดที่กำหนดไว้คือต้องไม่เกินกว่า {$maxlength}"
 
-msgctxt "OPERATION_FM_MAXLENGTH2"
+msgctxt "FM_MAXLENGTH2"
 msgid "This field must be no more than [_1] characters"
 msgstr "ฟิลด์นี้จะต้องไม่ยาวเกิน {$maxlength} ตัวอักษร"
 
-msgctxt "OPERATION_FM_EXACTLENGTH1"
+msgctxt "FM_EXACTLENGTH1"
 msgid "You must specify the length for the field."
 msgstr "คุณต้องระบุความยาวของฟิลด์"
 
-msgctxt "OPERATION_FM_EXACTLENGTH2"
+msgctxt "FM_EXACTLENGTH2"
 msgid "You must specify the exactlength of the field with an integer"
 msgstr "คุณต้องระบุความยาวของฟิลด์เป็นเลขจำนวนเต็ม"
 
-msgctxt "OPERATION_FM_EXACTLENGTH3"
+msgctxt "FM_EXACTLENGTH3"
 msgid "This field must be exactly [_1] characters"
 msgstr "ฟิลด์นี้จะต้องมีความยาว {$exactlength} ตัวอักษร"
 
-msgctxt "OPERATION_FM_LENGTHRANGE1"
+msgctxt "FM_LENGTHRANGE1"
 msgid "You must specify the maximum and minimum length for the field."
 msgstr "คุณต้องระบุความยาวสูงสุดและต่ำสุดของฟิลด์"
 
-msgctxt "OPERATION_FM_LENGTHRANGE2"
+msgctxt "FM_LENGTHRANGE2"
 msgid ""
 "You must specify the maximum and minimum lengths of the field with an "
 "integer"
 msgstr "คุณต้องระบุความยาวสูงสุดและต่ำสุดของฟิลด์เป็นเลขจำนวนเต็ม 1 หลัก"
 
-msgctxt "OPERATION_FM_LENGTHRANGE3"
+msgctxt "FM_LENGTHRANGE3"
 msgid "This field must be between [_1] and [_2] characters"
 msgstr "ฟิลด์นี้จะต้องยาวระหว่าง {$minlength} และ {$maxlength} ตัวอักษร"
 
-msgctxt "OPERATION_FM_URL"
+msgctxt "FM_URL"
 msgid "This field must contain a URL starting with http:// or ftp://"
 msgstr "ฟิลด์นี้จะต้องเป็น URL และเริ่มต้นด้วย http:// หรือ ftp://"
 
-msgctxt "OPERATION_FM_EMAIL_SIMPLE1"
+msgctxt "FM_EMAIL_SIMPLE1"
 msgid "You must enter an email address."
 msgstr "คุณต้องป้อนที่อยู่อีเมล์"
 
-msgctxt "OPERATION_FM_EMAIL_SIMPLE2"
+msgctxt "FM_EMAIL_SIMPLE2"
 msgid "This field doesn\\'t look like an RFC822-compliant email address"
-msgstr "พบว่าฟิลด์นี้ไม่ใช่ที่อยู่อีเมล์ตามมาตรฐาน RFC822 "
+msgstr "พบว่าฟิลด์นี้ไม่ใช่ที่อยู่อีเมล์ตามมาตรฐาน RFC822"
 
-msgctxt "OPERATION_FM_DOMAIN_NAME"
+msgctxt "FM_DOMAIN_NAME"
 msgid "This field doesn\\'t look like a valid Internet domain name or hostname."
 msgstr "พบว่าฟิลด์นี้ไม่ใช่ชื่อโดเมนอินเทอร์เน็ตหรือชื่อโฮสต์ที่ถูกต้อง"
 
-msgctxt "OPERATION_FM_IP_NUMBER1"
+msgctxt "FM_IP_NUMBER1"
 msgid "This field must contain a valid IP number and can not be left blank."
 msgstr "ฟิลด์นี้จะต้องใส่หมายเลข IP ที่ถูกต้องและไม่สามารถเว้นว่างไว้"
 
-msgctxt "OPERATION_FM_IP_NUMBER2"
+msgctxt "FM_IP_NUMBER2"
 msgid "Invalid IP address format (expected X.X.X.X)"
 msgstr "รูปแบบหมายเลข IP ไม่ถูกต้อง (รูปแบบคือ X.X.X.X)"
 
-msgctxt "OPERATION_FM_IP_NUMBER3"
+msgctxt "FM_IP_NUMBER3"
 msgid "[_1] is more than 255"
 msgstr "ตัวเลขของชุด {$octet} มีค่าเกิน 255"
 
-msgctxt "OPERATION_FM_USERNAME"
+msgctxt "FM_USERNAME"
 msgid ""
 "This field must look like a valid username (3 to 8 letters and numbers)"
 msgstr ""
 "ฟิลด์นี้จะต้องเป็นชื่อผู้ใช้ที่ถูกต้องตามหลักการตั้งชื่อผู้ใช้ "
 "(ต้องเป็นตัวอักษรและตัวเลข ยาว 3-8 ตัวอักษรเท่านั้น)"
 
-msgctxt "OPERATION_FM_PASSWORD1"
+msgctxt "FM_PASSWORD1"
 msgid "You must provide a password."
 msgstr "คุณต้องกำหนดรหัสผ่าน"
 
-msgctxt "OPERATION_FM_PASSWORD2"
+msgctxt "FM_PASSWORD2"
 msgid ""
 "The password you provided was not a good password.A good password must "
 "contain all of the following: upper case letter, lower case letter, number, "
@@ -527,18 +523,18 @@ msgstr ""
 "อักษรตัวใหญ่, อักษรตัวเล็ก, อักขระพิเศษ (non-alphanumeric), "
 "และต้องยาวอย่างน้อย 7 ตัวอักษร"
 
-msgctxt "OPERATION_FM_MAC_ADDRESS1"
+msgctxt "FM_MAC_ADDRESS1"
 msgid "You must provide a MAC address."
 msgstr "คุณต้องระบุ MAC address"
 
-msgctxt "OPERATION_FM_MAC_ADDRESS2"
+msgctxt "FM_MAC_ADDRESS2"
 msgid "The MAC address you provided was not valid."
 msgstr "MAC address ที่ระบุไม่ถูกต้อง"
 
-msgctxt "OPERATION_FM_ERR_UNEXPECTED_DESC"
+msgctxt "FM_ERR_UNEXPECTED_DESC"
 msgid "Error: unexpected or missing characters in description"
 msgstr "ข้อผิดพลาด: ไม่ได้กรอกรายละเอียด"
 
-msgctxt "OPERATION_CSRF_VALIDATION_FAILURE"
-msgid "Placeholder for missing original text"
+msgctxt "CSRF_VALIDATION_FAILURE"
+msgid "Error: CSRF token is invalid or outdated."
 msgstr "Error: CSRF token is invalid or outdated."
diff --git a/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/General/pofiles/general_tr.po b/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/General/pofiles/general_tr.po
index d503743..38e8ecd 100644
--- a/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/General/pofiles/general_tr.po
+++ b/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/General/pofiles/general_tr.po
@@ -5,99 +5,95 @@ msgstr ""
 "Language: None\n"
 "Content-Type: text/plain; charset=utf-8\n"
 
-msgctxt "OPERATION_Collaboration"
+msgctxt "Collaboration"
 msgid "Collaboration"
 msgstr "Uyum (İşbirliği)"
 
-msgctxt "OPERATION_Administration"
+msgctxt "Administration"
 msgid "Administration"
 msgstr "Yönetim"
 
-msgctxt "OPERATION_Security"
+msgctxt "Security"
 msgid "Security"
 msgstr "Güvenlik"
 
-msgctxt "OPERATION_Configuration"
+msgctxt "Configuration"
 msgid "Configuration"
 msgstr "Konfigürasyon"
 
-msgctxt "OPERATION_Miscellaneous"
+msgctxt "Miscellaneous"
 msgid "Miscellaneous"
 msgstr "Çeşitli"
 
-msgctxt "OPERATION_Your Settings"
-msgid "Your Settings"
-msgstr "Ayarlarınız"
-
-msgctxt "OPERATION_SAVE"
+msgctxt "SAVE"
 msgid "Save"
 msgstr "Kaydet"
 
-msgctxt "OPERATION_CANCEL"
+msgctxt "CANCEL"
 msgid "Cancel"
 msgstr "İptal"
 
-msgctxt "OPERATION_ENABLED"
+msgctxt "ENABLED"
 msgid "Enabled"
 msgstr "Etkin"
 
-msgctxt "OPERATION_DISABLED"
+msgctxt "DISABLED"
 msgid "Disabled"
 msgstr "Etkin değil"
 
-msgctxt "OPERATION_NO"
+msgctxt "NO"
 msgid "No"
 msgstr "Hayır"
 
-msgctxt "OPERATION_YES"
+msgctxt "YES"
 msgid "Yes"
 msgstr "Evet"
 
-msgctxt "OPERATION_ADD"
+msgctxt "ADD"
 msgid "Add"
 msgstr "Ekle"
 
-msgctxt "OPERATION_CREATE"
+msgctxt "CREATE"
 msgid "Create"
 msgstr "Oluştur"
 
-msgctxt "OPERATION_MODIFY"
+msgctxt "MODIFY"
 msgid "Modify"
 msgstr "Değiştir"
 
-msgctxt "OPERATION_REMOVE"
+msgctxt "REMOVE"
 msgid "Remove"
 msgstr "Kaldır"
 
-msgctxt "OPERATION_COMMENT"
+msgctxt "COMMENT"
 msgid "Comment"
 msgstr "Açıklama"
 
-msgctxt "OPERATION_NEXT"
+msgctxt "NEXT"
 msgid "Next"
 msgstr "İleri"
 
-msgctxt "OPERATION_SELF"
+msgctxt "SELF"
 msgid "Self"
 msgstr "Kendi"
 
-msgctxt "OPERATION_REMOTE"
+msgctxt "REMOTE"
 msgid "Remote"
 msgstr "Uzaktan"
 
-msgctxt "OPERATION_LOCAL"
+msgctxt "LOCAL"
 msgid "Local"
 msgstr "Yerel"
 
-msgctxt "OPERATION_ACTION"
+msgctxt "ACTION"
 msgid "Action"
 msgstr "Eylem"
 
-msgctxt "OPERATION_NETWORK"
+msgctxt "NETWORK"
 msgid "Network"
 msgstr "Ağ"
 
-msgctxt "OPERATION_ROUTER"
+msgctxt "ROUTER"
 msgid "Router"
 msgstr "Yönlendirici"
 
@@ -105,23 +101,23 @@ msgctxt "OPERATION_STATUS_REPORT"
 msgid "Operation status report"
 msgstr "İşlem durum raporu"
 
-msgctxt "OPERATION_ACCOUNT"
+msgctxt "ACCOUNT"
 msgid "Account"
 msgstr "Hesap"
 
-msgctxt "OPERATION_GROUP"
+msgctxt "GROUP"
 msgid "Group"
 msgstr "Grup"
 
-msgctxt "OPERATION_DESC_SECTIONBAR"
+msgctxt "DESC_SECTIONBAR"
 msgid "<hr class=\"sectionbar\"/>"
-msgstr " <hr class=\"sectionbar\"/> "
+msgstr "<hr class=\"sectionbar\"/>"
 
-msgctxt "OPERATION_NO_PIPES_ALLOWED"
+msgctxt "NO_PIPES_ALLOWED"
 msgid "Pipe symbols (|) are not permitted in this field"
 msgstr "Boru sembolü ( | ) bu alanda kullanılamaz"
 
-msgctxt "OPERATION_ERROR_BELOW"
+msgctxt "ERROR_BELOW"
 msgid ""
 "ERROR: There was an error in the validation of this page. Please scroll down"
 " and find the specific problem."
@@ -129,27 +125,27 @@ msgstr ""
 "HATA: Bu sayfanın doğrulanmasında bir hata oluştu. Lütfen önce sayfanın "
 "aşağısına bakıp sorunu belirleyin."
 
-msgctxt "OPERATION_ACCESS"
+msgctxt "ACCESS"
 msgid "Access"
 msgstr "Giriş"
 
-msgctxt "OPERATION_ACCOUNT_LOCKED"
+msgctxt "ACCOUNT_LOCKED"
 msgid "Account is locked"
 msgstr "Hesap kilitli"
 
-msgctxt "OPERATION_GROUP_ADD"
+msgctxt "GROUP_ADD"
 msgid "Add group"
 msgstr "Grup ekle"
 
-msgctxt "OPERATION_NETWORKS_ALLOW_LOCAL"
+msgctxt "NETWORKS_ALLOW_LOCAL"
 msgid "Allow access only from local networks"
 msgstr "Sadece yerel ağadan erişime izin ver"
 
-msgctxt "OPERATION_NETWORKS_ALLOW_PUBLIC"
+msgctxt "NETWORKS_ALLOW_PUBLIC"
 msgid "Allow public access (entire Internet)"
 msgstr "Her yerden erişime izin ver (bütün internet)"
 
-msgctxt "OPERATION_ERROR_PASSWORD_CHANGE"
+msgctxt "ERROR_PASSWORD_CHANGE"
 msgid ""
 "An error occurred while attempting to change your password. Please make sure"
 " that the old password entered is correct."
@@ -157,367 +153,367 @@ msgstr ""
 "Şifrenizi değiştirmeye çalışırken bir hata oluştu. Lütfen eski şifrenizi "
 "doğru girdiğinizden emin olun."
 
-msgctxt "OPERATION_BACK"
+msgctxt "BACK"
 msgid "Back"
 msgstr "Geri"
 
-msgctxt "OPERATION_BACKUP"
+msgctxt "BACKUP"
 msgid "Backup"
 msgstr "Yedekleme"
 
-msgctxt "OPERATION_DESCRIPTION_BRIEF"
+msgctxt "DESCRIPTION_BRIEF"
 msgid "Brief description"
 msgstr "Kısa açıklama"
 
-msgctxt "OPERATION_PASSWORD_CHANGE"
+msgctxt "PASSWORD_CHANGE"
 msgid "Change Password"
 msgstr "Parolayı Değiştir"
 
-msgctxt "OPERATION_RESET_PASSWORD_TITLE"
+msgctxt "RESET_PASSWORD_TITLE"
 msgid "Reset user password"
 msgstr "Kullanıcı şifresini sıfırla"
 
-msgctxt "OPERATION_ACCOUNT_PASSWORD_CHANGE"
+msgctxt "ACCOUNT_PASSWORD_CHANGE"
 msgid "Change account password"
 msgstr "Hesap şifresini değiştir"
 
-msgctxt "OPERATION_CONTENT"
+msgctxt "CONTENT"
 msgid "Content"
 msgstr "İçerik"
 
-msgctxt "OPERATION_CREATE_GROUP"
+msgctxt "CREATE_GROUP"
 msgid "Create user group"
 msgstr "Kullanıcı gurubu oluştur"
 
-msgctxt "OPERATION_USER_LIST_CURRENT"
+msgctxt "USER_LIST_CURRENT"
 msgid "Current list of users"
 msgstr "Mevcut kullanıcıların listesi"
 
-msgctxt "OPERATION_DESCRIPTION"
+msgctxt "DESCRIPTION"
 msgid "Description"
 msgstr "Açıklama"
 
-msgctxt "OPERATION_DESTINATION"
+msgctxt "DESTINATION"
 msgid "Destination"
 msgstr "Hedef"
 
-msgctxt "OPERATION_DOMAIN_NAME"
+msgctxt "DOMAIN_NAME"
 msgid "Domain name"
 msgstr "Alan adı"
 
-msgctxt "OPERATION_DOMAIN"
+msgctxt "DOMAIN"
 msgid "Domain"
 msgstr "Etki alanı"
 
-msgctxt "OPERATION_DOMAINS"
+msgctxt "DOMAINS"
 msgid "Domains"
 msgstr "Etki alanları"
 
-msgctxt "OPERATION_DOWNLOAD"
+msgctxt "DOWNLOAD"
 msgid "Download"
 msgstr "İndirme"
 
-msgctxt "OPERATION_ERROR_UPDATING_CONFIGURATION"
+msgctxt "ERROR_UPDATING_CONFIGURATION"
 msgid "Error occurred while updating system configuration."
 msgstr "Sistem ayarları güncellenirken hata oluştu."
 
-msgctxt "OPERATION_GROUP_MEMBERS"
+msgctxt "GROUP_MEMBERS"
 msgid "Group Members"
 msgstr "Grup Üyeleri"
 
-msgctxt "OPERATION_GROUP_NAME"
+msgctxt "GROUP_NAME"
 msgid "Group Name"
 msgstr "Grup Adı"
 
-msgctxt "OPERATION_GROUPS"
+msgctxt "GROUPS"
 msgid "Groups"
 msgstr "Gruplar"
 
-msgctxt "OPERATION_IP_ADDRESS"
+msgctxt "IP_ADDRESS"
 msgid "IP Address"
 msgstr "IP Adresi"
 
-msgctxt "OPERATION_IP_ADDRESS_OR_FQDN"
+msgctxt "IP_ADDRESS_OR_FQDN"
 msgid "IP Address or FQDN"
 msgstr "IP Adresi veya FQDN"
 
-msgctxt "OPERATION_USER_INVALID"
+msgctxt "USER_INVALID"
 msgid "Invalid user"
 msgstr "Geçersiz kullanıcı"
 
-msgctxt "OPERATION_LOCATION"
+msgctxt "LOCATION"
 msgid "Location"
 msgstr "Konum"
 
-msgctxt "OPERATION_MB"
+msgctxt "MB"
 msgid "Mb"
 msgstr "Mb"
 
-msgctxt "OPERATION_MODIFY_USER_GROUP"
+msgctxt "MODIFY_USER_GROUP"
 msgid "Modify user group"
 msgstr "Kullanıcı gurubunu değiştir"
 
-msgctxt "OPERATION_NAME"
+msgctxt "NAME"
 msgid "Name"
 msgstr "İsim"
 
-msgctxt "OPERATION_PASSWORD_VERIFY_NEW"
+msgctxt "PASSWORD_VERIFY_NEW"
 msgid "New password (verify):"
 msgstr "Yeni şifre (doğrulayın):"
 
-msgctxt "OPERATION_PASSWORD_NEW"
+msgctxt "PASSWORD_NEW"
 msgid "New password:"
 msgstr "Yeni şifre:"
 
-msgctxt "OPERATION_OFF"
+msgctxt "OFF"
 msgid "Off"
 msgstr "Kapat"
 
-msgctxt "OPERATION_OK"
+msgctxt "OK"
 msgid "Ok"
 msgstr "Tamam"
 
-msgctxt "OPERATION_PASSWORD_OLD"
+msgctxt "PASSWORD_OLD"
 msgid "Old password:"
 msgstr "Eski şifre"
 
-msgctxt "OPERATION_ON"
+msgctxt "ON"
 msgid "On"
 msgstr "Aç"
 
-msgctxt "OPERATION_PASSWORD"
+msgctxt "PASSWORD"
 msgid "Password"
 msgstr "Şifre"
 
-msgctxt "OPERATION_PERFORM"
+msgctxt "PERFORM"
 msgid "Perform"
 msgstr "Uygula"
 
-msgctxt "OPERATION_RECONFIGURE"
+msgctxt "RECONFIGURE"
 msgid "Reconfigure"
 msgstr "Yeniden yapılandır"
 
-msgctxt "OPERATION_REMOVE_USER_GROUP"
+msgctxt "REMOVE_USER_GROUP"
 msgid "Remove user group"
 msgstr "Kullanıcı gurubunu sil"
 
-msgctxt "OPERATION_PASSWORD_RESET"
+msgctxt "PASSWORD_RESET"
 msgid "Reset password"
 msgstr "Şifreyi sıfırla"
 
-msgctxt "OPERATION_RESTORE"
+msgctxt "RESTORE"
 msgid "Restore"
 msgstr "Eski haline getir"
 
-msgctxt "OPERATION_SHUTDOWN"
+msgctxt "SHUTDOWN"
 msgid "Shutdown"
 msgstr "Kapat"
 
-msgctxt "OPERATION_SUCCESS"
+msgctxt "SUCCESS"
 msgid "Success"
 msgstr "Başarılı"
 
-msgctxt "OPERATION_ACCOUNT_NAME_INVALID"
+msgctxt "ACCOUNT_NAME_INVALID"
 msgid "The account name entered is invalid."
 msgstr "Girilen hesap adı geçersiz!"
 
-msgctxt "OPERATION_ACCOUNT_NAME_INVALID_CHARS"
+msgctxt "ACCOUNT_NAME_INVALID_CHARS"
 msgid "The account name you entered contained invalid characters."
 msgstr "Girilen hesap adı geçersiz karakterler içeriyor."
 
-msgctxt "OPERATION_PASSWORD_OLD_INVALID_CHARS"
+msgctxt "PASSWORD_OLD_INVALID_CHARS"
 msgid "The old password you entered contained invalid characters."
 msgstr "Girilen eski şifre geçersiz karakterler içeriyor."
 
-msgctxt "OPERATION_PASSWORD_INVALID_CHARS"
+msgctxt "PASSWORD_INVALID_CHARS"
 msgid "The password you entered contained invalid characters."
 msgstr "Girilen şifre geçersiz karakterler içeriyor."
 
-msgctxt "OPERATION_PASSWORD_VERIFY_ERROR"
+msgctxt "PASSWORD_VERIFY_ERROR"
 msgid "The passwords you entered did not match."
 msgstr "Girilen şifreler uyşmadı."
 
-msgctxt "OPERATION_ACCOUNT_USER_NONE"
+msgctxt "ACCOUNT_USER_NONE"
 msgid "There are no user accounts in the system."
 msgstr "Kullanıcı hesabı bulunamadı."
 
-msgctxt "OPERATION_ACCOUNT_GROUP_NONE"
+msgctxt "ACCOUNT_GROUP_NONE"
 msgid "There are no user groups in the system."
 msgstr "Kullanıcı grubu bulunamadı."
 
-msgctxt "OPERATION_ERROR_INVALID_CHARS"
+msgctxt "ERROR_INVALID_CHARS"
 msgid "Unexpected characters in description."
 msgstr "Açıklamada geçersiz karakterler bulundu."
 
-msgctxt "OPERATION_USER_NAME"
+msgctxt "USER_NAME"
 msgid "User Name"
 msgstr "Kullanıcı Adı"
 
-msgctxt "OPERATION_YOUR_ACCOUNT"
+msgctxt "YOUR_ACCOUNT"
 msgid "Your account:"
 msgstr "Hesabınız:"
 
-msgctxt "OPERATION_YOUR_ACCOUNT_INVALID"
+msgctxt "YOUR_ACCOUNT_INVALID"
 msgid "The account name entered is invalid."
 msgstr "Girilen hesap adı geçersiz!"
 
-msgctxt "OPERATION_PASSWORD_CHANGE_SUCCESS"
+msgctxt "PASSWORD_CHANGE_SUCCESS"
 msgid "Your password has been successfully changed."
 msgstr "Şifreniz başarıyla değiştirildi."
 
-msgctxt "OPERATION_FM_NONBLANK"
+msgctxt "FM_NONBLANK"
 msgid "This field must not be left blank"
 msgstr "Bu alan boş bırakılmamalı"
 
-msgctxt "OPERATION_FM_INTEGER"
+msgctxt "FM_INTEGER"
 msgid "This field must contain a positive integer"
 msgstr "Bu alanın pozitif tamsayı içermelidir"
 
-msgctxt "OPERATION_FM_NUMBER"
+msgctxt "FM_NUMBER"
 msgid "This field must contain a number"
 msgstr "Bu alan bir sayı içermelidir"
 
-msgctxt "OPERATION_FM_WORD"
+msgctxt "FM_WORD"
 msgid "This field must look like a single word."
 msgstr "Bu alanda bir tek kelime yer almalıdır."
 
-msgctxt "OPERATION_FM_DATE"
+msgctxt "FM_DATE"
 msgid "The data entered could not be parsed as a date"
 msgstr "Girilen değer tarih olarak algılanmadı"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_NUMBER1"
+msgctxt "FM_CREDIT_CARD_NUMBER1"
 msgid "You must enter a credit card number"
 msgstr "Kredi kartı numarası girmelisiniz"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_NUMBER2"
+msgctxt "FM_CREDIT_CARD_NUMBER2"
 msgid ""
 "Credit card numbers shouldn\\'t have anything but numbers, spaces or dashes"
 msgstr ""
 "Kredi kartı numaraları sadece rakamlardan oluşmalıdır. Boşluk yada tire "
 "olmamalıdır."
 
-msgctxt "OPERATION_FM_CREDIT_CARD_NUMBER3"
+msgctxt "FM_CREDIT_CARD_NUMBER3"
 msgid "Must be at least 14 characters in length"
 msgstr "Uzunluk en az 14 karakter olmalı"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_NUMBER4"
+msgctxt "FM_CREDIT_CARD_NUMBER4"
 msgid "Doesn\\'t appear to be a valid credit card number"
 msgstr "Geçersiz kredi kartı numarası"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_EXPIRY1"
+msgctxt "FM_CREDIT_CARD_EXPIRY1"
 msgid "No expiry date entered."
 msgstr "Son kullanma tarihi girilmedi."
 
-msgctxt "OPERATION_FM_CREDIT_CARD_EXPIRY2"
+msgctxt "FM_CREDIT_CARD_EXPIRY2"
 msgid "Expiry date must be in the format MM/YY or MM/YYYY"
 msgstr "Son kullanma tarihi AA/YY yada AA/YYYY şeklinde olmalıdır"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_EXPIRY3"
+msgctxt "FM_CREDIT_CARD_EXPIRY3"
 msgid "This expiry date appears to have already passed"
 msgstr "Son kullanma tarihi geçmiş"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_EXPIRY4"
+msgctxt "FM_CREDIT_CARD_EXPIRY4"
 msgid "This expiry date appears to be too far in the future"
 msgstr "Son kullana tarihi çok uzak"
 
-msgctxt "OPERATION_FM_ISO_COUNTRY_CODE1"
+msgctxt "FM_ISO_COUNTRY_CODE1"
 msgid "You must provide a country code"
 msgstr "Ülke kodunu girmelisiniz"
 
-msgctxt "OPERATION_FM_ISO_COUNTRY_CODE2"
+msgctxt "FM_ISO_COUNTRY_CODE2"
 msgid "This field does not contain an ISO country code"
 msgstr "Ülke kodunu ISO standartlarında girmelisiniz"
 
-msgctxt "OPERATION_FM_US_STATE"
+msgctxt "FM_US_STATE"
 msgid "This doesn\\'t appear to be a valid 2-letter US state abbreviation"
 msgstr "Bu geçerli 2 harfli ABD eyalet kısaltması olarak görünmüyor"
 
-msgctxt "OPERATION_FM_US_ZIPCODE"
+msgctxt "FM_US_ZIPCODE"
 msgid "US zip codes must contain 5 or 9 numbers"
 msgstr "ABD posta kodları 5 yada 9 rakamlı olmalıdır"
 
-msgctxt "OPERATION_FM_MINLENGTH1"
+msgctxt "FM_MINLENGTH1"
 msgid "Minimum length has been specified meaninglessly as [_1]"
 msgstr "Minimum uzunluk anlamalı belirtilmedi {$minlength}"
 
-msgctxt "OPERATION_FM_MINLENGTH2"
+msgctxt "FM_MINLENGTH2"
 msgid "This field must be at least [_1] characters"
 msgstr "En az {$minlength} karakter içermelidir"
 
-msgctxt "OPERATION_FM_MAXLENGTH1"
+msgctxt "FM_MAXLENGTH1"
 msgid "Maximum length has been specified meaninglessly as [_1]"
 msgstr "Mksimum uzunluk anlamalı belirtilmedi {$maxlength}"
 
-msgctxt "OPERATION_FM_MAXLENGTH2"
+msgctxt "FM_MAXLENGTH2"
 msgid "This field must be no more than [_1] characters"
 msgstr "En fazla {$maxlength} karakter içermelidir"
 
-msgctxt "OPERATION_FM_EXACTLENGTH1"
+msgctxt "FM_EXACTLENGTH1"
 msgid "You must specify the length for the field."
 msgstr "Bu alanın uzunluğu belirtmelisiniz."
 
-msgctxt "OPERATION_FM_EXACTLENGTH2"
+msgctxt "FM_EXACTLENGTH2"
 msgid "You must specify the exactlength of the field with an integer"
 msgstr "Bu alanın tam uzunluğunu sayıyla belirtmelisiniz"
 
-msgctxt "OPERATION_FM_EXACTLENGTH3"
+msgctxt "FM_EXACTLENGTH3"
 msgid "This field must be exactly [_1] characters"
 msgstr "Bu alan {$exactlength} karakterden oluşmalıdır"
 
-msgctxt "OPERATION_FM_LENGTHRANGE1"
+msgctxt "FM_LENGTHRANGE1"
 msgid "You must specify the maximum and minimum length for the field."
 msgstr "Alanaın maksimum ve minimum değerlerlini belirtmelisiniz."
 
-msgctxt "OPERATION_FM_LENGTHRANGE2"
+msgctxt "FM_LENGTHRANGE2"
 msgid ""
 "You must specify the maximum and minimum lengths of the field with an "
 "integer"
 msgstr "Alanaın maksimum ve minimum değerlerlini sayıyla belirtmelisiniz."
 
-msgctxt "OPERATION_FM_LENGTHRANGE3"
+msgctxt "FM_LENGTHRANGE3"
 msgid "This field must be between [_1] and [_2] characters"
 msgstr ""
 "Bu alan en az {$minlength} en fazla {$maxlength} karakterden oluşmalıdır"
 
-msgctxt "OPERATION_FM_URL"
+msgctxt "FM_URL"
 msgid "This field must contain a URL starting with http:// or ftp://"
 msgstr "Bu alan http:// veya tp:// ile başlayan bir URL içermelidir"
 
-msgctxt "OPERATION_FM_EMAIL_SIMPLE1"
+msgctxt "FM_EMAIL_SIMPLE1"
 msgid "You must enter an email address."
 msgstr "E-posta adresi girmelisiniz."
 
-msgctxt "OPERATION_FM_EMAIL_SIMPLE2"
+msgctxt "FM_EMAIL_SIMPLE2"
 msgid "This field doesn\\'t look like an RFC822-compliant email address"
 msgstr "RFC822 uyumlu bir e-posta adresi olarak görünmüyor"
 
-msgctxt "OPERATION_FM_DOMAIN_NAME"
+msgctxt "FM_DOMAIN_NAME"
 msgid "This field doesn\\'t look like a valid Internet domain name or hostname."
 msgstr "Bu alan, geçerli bir Internet web adresi gibi görünmüyor."
 
-msgctxt "OPERATION_FM_IP_NUMBER1"
+msgctxt "FM_IP_NUMBER1"
 msgid "This field must contain a valid IP number and can not be left blank."
 msgstr "Bu alan geçerli bir IP adresi içermelidir boş bırakılamaz."
 
-msgctxt "OPERATION_FM_IP_NUMBER2"
+msgctxt "FM_IP_NUMBER2"
 msgid "Invalid IP address format (expected X.X.X.X)"
 msgstr "Standart DHCP için geçersiz adres"
 
-msgctxt "OPERATION_FM_IP_NUMBER3"
+msgctxt "FM_IP_NUMBER3"
 msgid "[_1] is more than 255"
 msgstr "{$octet} 255 ten büyüktür"
 
-msgctxt "OPERATION_FM_USERNAME"
+msgctxt "FM_USERNAME"
 msgid ""
 "This field must look like a valid username (3 to 8 letters and numbers)"
 msgstr ""
 "Bu alan, geçerli bir kullanıcı adı gibi görünmelidir (3-8 harf ve rakam)"
 
-msgctxt "OPERATION_FM_PASSWORD1"
+msgctxt "FM_PASSWORD1"
 msgid "You must provide a password."
 msgstr "Şifre belirtmelisiniz."
 
-msgctxt "OPERATION_FM_PASSWORD2"
+msgctxt "FM_PASSWORD2"
 msgid ""
 "The password you provided was not a good password.A good password must "
 "contain all of the following: upper case letter, lower case letter, number, "
@@ -527,18 +523,18 @@ msgstr ""
 "harf, küçük harf, sayı, alfasayısal olmayan karakterler ve en az 7 karakter "
 "uzunluğunda olmalıdır."
 
-msgctxt "OPERATION_FM_MAC_ADDRESS1"
+msgctxt "FM_MAC_ADDRESS1"
 msgid "You must provide a MAC address."
 msgstr "MAC adresi belirtmelisiniz."
 
-msgctxt "OPERATION_FM_MAC_ADDRESS2"
+msgctxt "FM_MAC_ADDRESS2"
 msgid "The MAC address you provided was not valid."
 msgstr "Tanımladığınız MAC adresi geçerli değildir."
 
-msgctxt "OPERATION_FM_ERR_UNEXPECTED_DESC"
+msgctxt "FM_ERR_UNEXPECTED_DESC"
 msgid "Error: unexpected or missing characters in description"
 msgstr "Hata: açıklama geçersiz karakter içeriyor"
 
-msgctxt "OPERATION_CSRF_VALIDATION_FAILURE"
-msgid "Placeholder for missing original text"
+msgctxt "CSRF_VALIDATION_FAILURE"
+msgid "Error: CSRF token is invalid or outdated."
 msgstr "Error: CSRF token is invalid or outdated."
diff --git a/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/General/pofiles/general_zh-cn.po b/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/General/pofiles/general_zh-cn.po
index 4830731..d18d127 100644
--- a/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/General/pofiles/general_zh-cn.po
+++ b/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/General/pofiles/general_zh-cn.po
@@ -5,99 +5,95 @@ msgstr ""
 "Language: None\n"
 "Content-Type: text/plain; charset=utf-8\n"
 
-msgctxt "OPERATION_Collaboration"
+msgctxt "Collaboration"
 msgid "Collaboration"
 msgstr "协作"
 
-msgctxt "OPERATION_Administration"
+msgctxt "Administration"
 msgid "Administration"
 msgstr "管理"
 
-msgctxt "OPERATION_Security"
+msgctxt "Security"
 msgid "Security"
 msgstr "安全"
 
-msgctxt "OPERATION_Configuration"
+msgctxt "Configuration"
 msgid "Configuration"
 msgstr "配置"
 
-msgctxt "OPERATION_Miscellaneous"
+msgctxt "Miscellaneous"
 msgid "Miscellaneous"
 msgstr "杂项"
 
-msgctxt "OPERATION_Your Settings"
-msgid "Your Settings"
-msgstr "您的设置"
-
-msgctxt "OPERATION_SAVE"
+msgctxt "SAVE"
 msgid "Save"
 msgstr "保存"
 
-msgctxt "OPERATION_CANCEL"
+msgctxt "CANCEL"
 msgid "Cancel"
 msgstr "取消"
 
-msgctxt "OPERATION_ENABLED"
+msgctxt "ENABLED"
 msgid "Enabled"
 msgstr "启用"
 
-msgctxt "OPERATION_DISABLED"
+msgctxt "DISABLED"
 msgid "Disabled"
 msgstr "禁用"
 
-msgctxt "OPERATION_NO"
+msgctxt "NO"
 msgid "No"
 msgstr "否"
 
-msgctxt "OPERATION_YES"
+msgctxt "YES"
 msgid "Yes"
 msgstr "是"
 
-msgctxt "OPERATION_ADD"
+msgctxt "ADD"
 msgid "Add"
 msgstr "添加"
 
-msgctxt "OPERATION_CREATE"
+msgctxt "CREATE"
 msgid "Create"
 msgstr "创建"
 
-msgctxt "OPERATION_MODIFY"
+msgctxt "MODIFY"
 msgid "Modify"
 msgstr "修改"
 
-msgctxt "OPERATION_REMOVE"
+msgctxt "REMOVE"
 msgid "Remove"
 msgstr "移除"
 
-msgctxt "OPERATION_COMMENT"
+msgctxt "COMMENT"
 msgid "Comment"
 msgstr "备注"
 
-msgctxt "OPERATION_NEXT"
+msgctxt "NEXT"
 msgid "Next"
 msgstr "下一步"
 
-msgctxt "OPERATION_SELF"
+msgctxt "SELF"
 msgid "Self"
 msgstr "自己"
 
-msgctxt "OPERATION_REMOTE"
+msgctxt "REMOTE"
 msgid "Remote"
 msgstr "远程"
 
-msgctxt "OPERATION_LOCAL"
+msgctxt "LOCAL"
 msgid "Local"
 msgstr "本地"
 
-msgctxt "OPERATION_ACTION"
+msgctxt "ACTION"
 msgid "Action"
 msgstr "动作"
 
-msgctxt "OPERATION_NETWORK"
+msgctxt "NETWORK"
 msgid "Network"
 msgstr "网络"
 
-msgctxt "OPERATION_ROUTER"
+msgctxt "ROUTER"
 msgid "Router"
 msgstr "路由器"
 
@@ -105,429 +101,429 @@ msgctxt "OPERATION_STATUS_REPORT"
 msgid "Operation status report"
 msgstr "操作报告"
 
-msgctxt "OPERATION_ACCOUNT"
+msgctxt "ACCOUNT"
 msgid "Account"
 msgstr "帐号"
 
-msgctxt "OPERATION_GROUP"
+msgctxt "GROUP"
 msgid "Group"
 msgstr "组"
 
-msgctxt "OPERATION_DESC_SECTIONBAR"
+msgctxt "DESC_SECTIONBAR"
 msgid "<hr class=\"sectionbar\"/>"
-msgstr " <hr class=\"位置栏\"/> "
+msgstr "<hr class=\"位置栏\"/>"
 
-msgctxt "OPERATION_NO_PIPES_ALLOWED"
+msgctxt "NO_PIPES_ALLOWED"
 msgid "Pipe symbols (|) are not permitted in this field"
 msgstr "管道符号(|) 在此字段中是不允许的。"
 
-msgctxt "OPERATION_ERROR_BELOW"
+msgctxt "ERROR_BELOW"
 msgid ""
 "ERROR: There was an error in the validation of this page. Please scroll down"
 " and find the specific problem."
 msgstr "错误：验证页面时出现错误。请滚动页面并找到指定错误。"
 
-msgctxt "OPERATION_ACCESS"
+msgctxt "ACCESS"
 msgid "Access"
 msgstr "访问"
 
-msgctxt "OPERATION_ACCOUNT_LOCKED"
+msgctxt "ACCOUNT_LOCKED"
 msgid "Account is locked"
 msgstr "账户已被锁定"
 
-msgctxt "OPERATION_GROUP_ADD"
+msgctxt "GROUP_ADD"
 msgid "Add group"
 msgstr "添加组"
 
-msgctxt "OPERATION_NETWORKS_ALLOW_LOCAL"
+msgctxt "NETWORKS_ALLOW_LOCAL"
 msgid "Allow access only from local networks"
 msgstr "只允许本地网络访问"
 
-msgctxt "OPERATION_NETWORKS_ALLOW_PUBLIC"
+msgctxt "NETWORKS_ALLOW_PUBLIC"
 msgid "Allow public access (entire Internet)"
 msgstr "允许公开访问（整个因特网）"
 
-msgctxt "OPERATION_ERROR_PASSWORD_CHANGE"
+msgctxt "ERROR_PASSWORD_CHANGE"
 msgid ""
 "An error occurred while attempting to change your password. Please make sure"
 " that the old password entered is correct."
 msgstr "变更密码时出错。请确认输入的旧密码是否正确。"
 
-msgctxt "OPERATION_BACK"
+msgctxt "BACK"
 msgid "Back"
 msgstr "后退"
 
-msgctxt "OPERATION_BACKUP"
+msgctxt "BACKUP"
 msgid "Backup"
 msgstr "备份"
 
-msgctxt "OPERATION_DESCRIPTION_BRIEF"
+msgctxt "DESCRIPTION_BRIEF"
 msgid "Brief description"
 msgstr "简介"
 
-msgctxt "OPERATION_PASSWORD_CHANGE"
+msgctxt "PASSWORD_CHANGE"
 msgid "Change Password"
 msgstr "修改密码"
 
-msgctxt "OPERATION_RESET_PASSWORD_TITLE"
+msgctxt "RESET_PASSWORD_TITLE"
 msgid "Reset user password"
 msgstr "重置用户密码"
 
-msgctxt "OPERATION_ACCOUNT_PASSWORD_CHANGE"
+msgctxt "ACCOUNT_PASSWORD_CHANGE"
 msgid "Change account password"
 msgstr "修改账号密码"
 
-msgctxt "OPERATION_CONTENT"
+msgctxt "CONTENT"
 msgid "Content"
 msgstr "内容"
 
-msgctxt "OPERATION_CREATE_GROUP"
+msgctxt "CREATE_GROUP"
 msgid "Create user group"
 msgstr "创建用户组"
 
-msgctxt "OPERATION_USER_LIST_CURRENT"
+msgctxt "USER_LIST_CURRENT"
 msgid "Current list of users"
 msgstr "当前用户列表"
 
-msgctxt "OPERATION_DESCRIPTION"
+msgctxt "DESCRIPTION"
 msgid "Description"
 msgstr "描述"
 
-msgctxt "OPERATION_DESTINATION"
+msgctxt "DESTINATION"
 msgid "Destination"
 msgstr "目标"
 
-msgctxt "OPERATION_DOMAIN_NAME"
+msgctxt "DOMAIN_NAME"
 msgid "Domain name"
 msgstr "域名"
 
-msgctxt "OPERATION_DOMAIN"
+msgctxt "DOMAIN"
 msgid "Domain"
 msgstr "域名"
 
-msgctxt "OPERATION_DOMAINS"
+msgctxt "DOMAINS"
 msgid "Domains"
 msgstr "域"
 
-msgctxt "OPERATION_DOWNLOAD"
+msgctxt "DOWNLOAD"
 msgid "Download"
 msgstr "下载"
 
-msgctxt "OPERATION_ERROR_UPDATING_CONFIGURATION"
+msgctxt "ERROR_UPDATING_CONFIGURATION"
 msgid "Error occurred while updating system configuration."
 msgstr "更新系统配置时出错"
 
-msgctxt "OPERATION_GROUP_MEMBERS"
+msgctxt "GROUP_MEMBERS"
 msgid "Group Members"
 msgstr "组成员"
 
-msgctxt "OPERATION_GROUP_NAME"
+msgctxt "GROUP_NAME"
 msgid "Group Name"
 msgstr "组名称"
 
-msgctxt "OPERATION_GROUPS"
+msgctxt "GROUPS"
 msgid "Groups"
 msgstr "组"
 
-msgctxt "OPERATION_IP_ADDRESS"
+msgctxt "IP_ADDRESS"
 msgid "IP Address"
 msgstr "IP地址"
 
-msgctxt "OPERATION_IP_ADDRESS_OR_FQDN"
+msgctxt "IP_ADDRESS_OR_FQDN"
 msgid "IP Address or FQDN"
 msgstr "IP地址或域名全称"
 
-msgctxt "OPERATION_USER_INVALID"
+msgctxt "USER_INVALID"
 msgid "Invalid user"
 msgstr "无效的用户"
 
-msgctxt "OPERATION_LOCATION"
+msgctxt "LOCATION"
 msgid "Location"
 msgstr "位置"
 
-msgctxt "OPERATION_MB"
+msgctxt "MB"
 msgid "Mb"
 msgstr "Mb"
 
-msgctxt "OPERATION_MODIFY_USER_GROUP"
+msgctxt "MODIFY_USER_GROUP"
 msgid "Modify user group"
 msgstr "修改用户组"
 
-msgctxt "OPERATION_NAME"
+msgctxt "NAME"
 msgid "Name"
 msgstr "姓名"
 
-msgctxt "OPERATION_PASSWORD_VERIFY_NEW"
+msgctxt "PASSWORD_VERIFY_NEW"
 msgid "New password (verify):"
 msgstr "新密码（验证）："
 
-msgctxt "OPERATION_PASSWORD_NEW"
+msgctxt "PASSWORD_NEW"
 msgid "New password:"
 msgstr "新密码："
 
-msgctxt "OPERATION_OFF"
+msgctxt "OFF"
 msgid "Off"
 msgstr "关"
 
-msgctxt "OPERATION_OK"
+msgctxt "OK"
 msgid "Ok"
 msgstr "OK"
 
-msgctxt "OPERATION_PASSWORD_OLD"
+msgctxt "PASSWORD_OLD"
 msgid "Old password:"
 msgstr "旧密码："
 
-msgctxt "OPERATION_ON"
+msgctxt "ON"
 msgid "On"
 msgstr "开"
 
-msgctxt "OPERATION_PASSWORD"
+msgctxt "PASSWORD"
 msgid "Password"
 msgstr "密码"
 
-msgctxt "OPERATION_PERFORM"
+msgctxt "PERFORM"
 msgid "Perform"
 msgstr "执行"
 
-msgctxt "OPERATION_RECONFIGURE"
+msgctxt "RECONFIGURE"
 msgid "Reconfigure"
 msgstr "重新配置"
 
-msgctxt "OPERATION_REMOVE_USER_GROUP"
+msgctxt "REMOVE_USER_GROUP"
 msgid "Remove user group"
 msgstr "删除用户组"
 
-msgctxt "OPERATION_PASSWORD_RESET"
+msgctxt "PASSWORD_RESET"
 msgid "Reset password"
 msgstr "重置密码"
 
-msgctxt "OPERATION_RESTORE"
+msgctxt "RESTORE"
 msgid "Restore"
 msgstr "还原"
 
-msgctxt "OPERATION_SHUTDOWN"
+msgctxt "SHUTDOWN"
 msgid "Shutdown"
 msgstr "关机"
 
-msgctxt "OPERATION_SUCCESS"
+msgctxt "SUCCESS"
 msgid "Success"
 msgstr "成功"
 
-msgctxt "OPERATION_ACCOUNT_NAME_INVALID"
+msgctxt "ACCOUNT_NAME_INVALID"
 msgid "The account name entered is invalid."
 msgstr "输入的账号名称无效。"
 
-msgctxt "OPERATION_ACCOUNT_NAME_INVALID_CHARS"
+msgctxt "ACCOUNT_NAME_INVALID_CHARS"
 msgid "The account name you entered contained invalid characters."
 msgstr "您输入的账号名称中包含无效字符。"
 
-msgctxt "OPERATION_PASSWORD_OLD_INVALID_CHARS"
+msgctxt "PASSWORD_OLD_INVALID_CHARS"
 msgid "The old password you entered contained invalid characters."
 msgstr "您输入的旧密码中包含无效字符。"
 
-msgctxt "OPERATION_PASSWORD_INVALID_CHARS"
+msgctxt "PASSWORD_INVALID_CHARS"
 msgid "The password you entered contained invalid characters."
 msgstr "您输入的密码中包含无效字符。"
 
-msgctxt "OPERATION_PASSWORD_VERIFY_ERROR"
+msgctxt "PASSWORD_VERIFY_ERROR"
 msgid "The passwords you entered did not match."
 msgstr "您输入的密码不匹配。"
 
-msgctxt "OPERATION_ACCOUNT_USER_NONE"
+msgctxt "ACCOUNT_USER_NONE"
 msgid "There are no user accounts in the system."
 msgstr "当前系统中暂时还没有用户账户。"
 
-msgctxt "OPERATION_ACCOUNT_GROUP_NONE"
+msgctxt "ACCOUNT_GROUP_NONE"
 msgid "There are no user groups in the system."
 msgstr "当前系统中暂时还没有用户组。"
 
-msgctxt "OPERATION_ERROR_INVALID_CHARS"
+msgctxt "ERROR_INVALID_CHARS"
 msgid "Unexpected characters in description."
 msgstr "在描述中包含无效的字符。"
 
-msgctxt "OPERATION_USER_NAME"
+msgctxt "USER_NAME"
 msgid "User Name"
 msgstr "用户名称"
 
-msgctxt "OPERATION_YOUR_ACCOUNT"
+msgctxt "YOUR_ACCOUNT"
 msgid "Your account:"
 msgstr "您的账号："
 
-msgctxt "OPERATION_YOUR_ACCOUNT_INVALID"
+msgctxt "YOUR_ACCOUNT_INVALID"
 msgid "The account name entered is invalid."
 msgstr "输入的账号名称无效。"
 
-msgctxt "OPERATION_PASSWORD_CHANGE_SUCCESS"
+msgctxt "PASSWORD_CHANGE_SUCCESS"
 msgid "Your password has been successfully changed."
 msgstr "您的密码已修改。"
 
-msgctxt "OPERATION_FM_NONBLANK"
+msgctxt "FM_NONBLANK"
 msgid "This field must not be left blank"
 msgstr "此字段不能留空。"
 
-msgctxt "OPERATION_FM_INTEGER"
+msgctxt "FM_INTEGER"
 msgid "This field must contain a positive integer"
 msgstr "此字段必须包含一个正整数。"
 
-msgctxt "OPERATION_FM_NUMBER"
+msgctxt "FM_NUMBER"
 msgid "This field must contain a number"
 msgstr "此字段必须包含一个数字。"
 
-msgctxt "OPERATION_FM_WORD"
+msgctxt "FM_WORD"
 msgid "This field must look like a single word."
 msgstr "此字段必须看起来像一个单独的字。"
 
-msgctxt "OPERATION_FM_DATE"
+msgctxt "FM_DATE"
 msgid "The data entered could not be parsed as a date"
 msgstr "输入的数据无法解析为一个日期。"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_NUMBER1"
+msgctxt "FM_CREDIT_CARD_NUMBER1"
 msgid "You must enter a credit card number"
 msgstr "您必须输入一个信用卡号码"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_NUMBER2"
+msgctxt "FM_CREDIT_CARD_NUMBER2"
 msgid ""
 "Credit card numbers shouldn\\'t have anything but numbers, spaces or dashes"
 msgstr "信用卡号码不应该包含字母、空格分隔号之外的其他任何字符。"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_NUMBER3"
+msgctxt "FM_CREDIT_CARD_NUMBER3"
 msgid "Must be at least 14 characters in length"
 msgstr "长度必须至少为14个字符"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_NUMBER4"
+msgctxt "FM_CREDIT_CARD_NUMBER4"
 msgid "Doesn\\'t appear to be a valid credit card number"
 msgstr "这似乎不是一个有效的信用卡号码"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_EXPIRY1"
+msgctxt "FM_CREDIT_CARD_EXPIRY1"
 msgid "No expiry date entered."
 msgstr "没有输入过期日期"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_EXPIRY2"
+msgctxt "FM_CREDIT_CARD_EXPIRY2"
 msgid "Expiry date must be in the format MM/YY or MM/YYYY"
 msgstr "过期日期的格式必须为MM/YY或者MM/YYYY"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_EXPIRY3"
+msgctxt "FM_CREDIT_CARD_EXPIRY3"
 msgid "This expiry date appears to have already passed"
 msgstr "此过期日期似乎已经过了。"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_EXPIRY4"
+msgctxt "FM_CREDIT_CARD_EXPIRY4"
 msgid "This expiry date appears to be too far in the future"
 msgstr "这个期限似乎太遥远了。"
 
-msgctxt "OPERATION_FM_ISO_COUNTRY_CODE1"
+msgctxt "FM_ISO_COUNTRY_CODE1"
 msgid "You must provide a country code"
 msgstr "您必须提供一个国家代码"
 
-msgctxt "OPERATION_FM_ISO_COUNTRY_CODE2"
+msgctxt "FM_ISO_COUNTRY_CODE2"
 msgid "This field does not contain an ISO country code"
 msgstr "此字段不包含ISO国家代码"
 
-msgctxt "OPERATION_FM_US_STATE"
+msgctxt "FM_US_STATE"
 msgid "This doesn\\'t appear to be a valid 2-letter US state abbreviation"
 msgstr "这似乎不是一个有效的美国的州的 2个字母的缩写"
 
-msgctxt "OPERATION_FM_US_ZIPCODE"
+msgctxt "FM_US_ZIPCODE"
 msgid "US zip codes must contain 5 or 9 numbers"
 msgstr "美国邮编必须包含5或者9个数字。"
 
-msgctxt "OPERATION_FM_MINLENGTH1"
+msgctxt "FM_MINLENGTH1"
 msgid "Minimum length has been specified meaninglessly as [_1]"
 msgstr "指定的最小长度{$minlength}无意义。"
 
-msgctxt "OPERATION_FM_MINLENGTH2"
+msgctxt "FM_MINLENGTH2"
 msgid "This field must be at least [_1] characters"
 msgstr "此字段必须至少{$minlength}个字符。"
 
-msgctxt "OPERATION_FM_MAXLENGTH1"
+msgctxt "FM_MAXLENGTH1"
 msgid "Maximum length has been specified meaninglessly as [_1]"
 msgstr "指定的最大长度{$maxlength}无意义。"
 
-msgctxt "OPERATION_FM_MAXLENGTH2"
+msgctxt "FM_MAXLENGTH2"
 msgid "This field must be no more than [_1] characters"
 msgstr "此字段不能多于{$maxlength}个字符。"
 
-msgctxt "OPERATION_FM_EXACTLENGTH1"
+msgctxt "FM_EXACTLENGTH1"
 msgid "You must specify the length for the field."
 msgstr "您必须指定此字段长度。"
 
-msgctxt "OPERATION_FM_EXACTLENGTH2"
+msgctxt "FM_EXACTLENGTH2"
 msgid "You must specify the exactlength of the field with an integer"
 msgstr "您必须指定该整数字段的准确长度。"
 
-msgctxt "OPERATION_FM_EXACTLENGTH3"
+msgctxt "FM_EXACTLENGTH3"
 msgid "This field must be exactly [_1] characters"
 msgstr "此字段必须为确认为{$exactlength}个字符。"
 
-msgctxt "OPERATION_FM_LENGTHRANGE1"
+msgctxt "FM_LENGTHRANGE1"
 msgid "You must specify the maximum and minimum length for the field."
 msgstr "您必须指定该字段的最大和最小长度。"
 
-msgctxt "OPERATION_FM_LENGTHRANGE2"
+msgctxt "FM_LENGTHRANGE2"
 msgid ""
 "You must specify the maximum and minimum lengths of the field with an "
 "integer"
 msgstr "您必须此整数字段的最大和最小长度。"
 
-msgctxt "OPERATION_FM_LENGTHRANGE3"
+msgctxt "FM_LENGTHRANGE3"
 msgid "This field must be between [_1] and [_2] characters"
 msgstr "此字段长度必须是在{$minlength} 和 {$maxlength}个字符之间。"
 
-msgctxt "OPERATION_FM_URL"
+msgctxt "FM_URL"
 msgid "This field must contain a URL starting with http:// or ftp://"
 msgstr "此字段必须包含以 http:// 或 ftp://开头的URL"
 
-msgctxt "OPERATION_FM_EMAIL_SIMPLE1"
+msgctxt "FM_EMAIL_SIMPLE1"
 msgid "You must enter an email address."
 msgstr "您必须输入一个电子邮件地址。"
 
-msgctxt "OPERATION_FM_EMAIL_SIMPLE2"
+msgctxt "FM_EMAIL_SIMPLE2"
 msgid "This field doesn\\'t look like an RFC822-compliant email address"
 msgstr "此字段看上去不像与RTC822兼容的电子邮件地址。"
 
-msgctxt "OPERATION_FM_DOMAIN_NAME"
+msgctxt "FM_DOMAIN_NAME"
 msgid "This field doesn\\'t look like a valid Internet domain name or hostname."
 msgstr "此字段看上去不像一个有效的互联网域名或主机名。"
 
-msgctxt "OPERATION_FM_IP_NUMBER1"
+msgctxt "FM_IP_NUMBER1"
 msgid "This field must contain a valid IP number and can not be left blank."
 msgstr "此字段必须包含一个有效的IP且不能留空。"
 
-msgctxt "OPERATION_FM_IP_NUMBER2"
+msgctxt "FM_IP_NUMBER2"
 msgid "Invalid IP address format (expected X.X.X.X)"
 msgstr "无效的IP地址格式（例如X.X.X.X）"
 
-msgctxt "OPERATION_FM_IP_NUMBER3"
+msgctxt "FM_IP_NUMBER3"
 msgid "[_1] is more than 255"
 msgstr "{$octet}大于255"
 
-msgctxt "OPERATION_FM_USERNAME"
+msgctxt "FM_USERNAME"
 msgid ""
 "This field must look like a valid username (3 to 8 letters and numbers)"
 msgstr "此字段必须看上去像一个有效的用户名（3到8个字母和数字）"
 
-msgctxt "OPERATION_FM_PASSWORD1"
+msgctxt "FM_PASSWORD1"
 msgid "You must provide a password."
 msgstr "您必须提供一个密码。"
 
-msgctxt "OPERATION_FM_PASSWORD2"
+msgctxt "FM_PASSWORD2"
 msgid ""
 "The password you provided was not a good password.A good password must "
 "contain all of the following: upper case letter, lower case letter, number, "
 "non-alphanumeric character, be at least 7 characters long."
 msgstr "您提供的密码不是一个良好的密码，一个良好的密码必须包含以下这些：大写字母、小写字母、数字、非字母数字字符，至少7个字符长度。"
 
-msgctxt "OPERATION_FM_MAC_ADDRESS1"
+msgctxt "FM_MAC_ADDRESS1"
 msgid "You must provide a MAC address."
 msgstr "您必须提供一个MAC地址。"
 
-msgctxt "OPERATION_FM_MAC_ADDRESS2"
+msgctxt "FM_MAC_ADDRESS2"
 msgid "The MAC address you provided was not valid."
 msgstr "您提供的MAC地址无效。"
 
-msgctxt "OPERATION_FM_ERR_UNEXPECTED_DESC"
+msgctxt "FM_ERR_UNEXPECTED_DESC"
 msgid "Error: unexpected or missing characters in description"
 msgstr "错误：描述中包含未知字符或缺少字符。"
 
-msgctxt "OPERATION_CSRF_VALIDATION_FAILURE"
-msgid "Placeholder for missing original text"
+msgctxt "CSRF_VALIDATION_FAILURE"
+msgid "Error: CSRF token is invalid or outdated."
 msgstr "Error: CSRF token is invalid or outdated."
diff --git a/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/General/pofiles/general_zh-tw.po b/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/General/pofiles/general_zh-tw.po
index 0c76375..304113c 100644
--- a/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/General/pofiles/general_zh-tw.po
+++ b/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/General/pofiles/general_zh-tw.po
@@ -5,99 +5,95 @@ msgstr ""
 "Language: None\n"
 "Content-Type: text/plain; charset=utf-8\n"
 
-msgctxt "OPERATION_Collaboration"
+msgctxt "Collaboration"
 msgid "Collaboration"
 msgstr "協作"
 
-msgctxt "OPERATION_Administration"
+msgctxt "Administration"
 msgid "Administration"
 msgstr "管理"
 
-msgctxt "OPERATION_Security"
+msgctxt "Security"
 msgid "Security"
 msgstr "安全性"
 
-msgctxt "OPERATION_Configuration"
+msgctxt "Configuration"
 msgid "Configuration"
 msgstr "設定組態"
 
-msgctxt "OPERATION_Miscellaneous"
+msgctxt "Miscellaneous"
 msgid "Miscellaneous"
 msgstr "雜項"
 
-msgctxt "OPERATION_Your Settings"
-msgid "Your Settings"
-msgstr "您的設定"
-
-msgctxt "OPERATION_SAVE"
+msgctxt "SAVE"
 msgid "Save"
 msgstr "儲存"
 
-msgctxt "OPERATION_CANCEL"
+msgctxt "CANCEL"
 msgid "Cancel"
 msgstr "取消"
 
-msgctxt "OPERATION_ENABLED"
+msgctxt "ENABLED"
 msgid "Enabled"
 msgstr "啟用"
 
-msgctxt "OPERATION_DISABLED"
+msgctxt "DISABLED"
 msgid "Disabled"
 msgstr "禁用"
 
-msgctxt "OPERATION_NO"
+msgctxt "NO"
 msgid "No"
 msgstr "否"
 
-msgctxt "OPERATION_YES"
+msgctxt "YES"
 msgid "Yes"
 msgstr "是"
 
-msgctxt "OPERATION_ADD"
+msgctxt "ADD"
 msgid "Add"
 msgstr "新增"
 
-msgctxt "OPERATION_CREATE"
+msgctxt "CREATE"
 msgid "Create"
 msgstr "建立"
 
-msgctxt "OPERATION_MODIFY"
+msgctxt "MODIFY"
 msgid "Modify"
 msgstr "修改"
 
-msgctxt "OPERATION_REMOVE"
+msgctxt "REMOVE"
 msgid "Remove"
 msgstr "移除"
 
-msgctxt "OPERATION_COMMENT"
+msgctxt "COMMENT"
 msgid "Comment"
 msgstr "備註"
 
-msgctxt "OPERATION_NEXT"
+msgctxt "NEXT"
 msgid "Next"
 msgstr "下一步"
 
-msgctxt "OPERATION_SELF"
+msgctxt "SELF"
 msgid "Self"
 msgstr "自己"
 
-msgctxt "OPERATION_REMOTE"
+msgctxt "REMOTE"
 msgid "Remote"
 msgstr "遠端"
 
-msgctxt "OPERATION_LOCAL"
+msgctxt "LOCAL"
 msgid "Local"
 msgstr "本機"
 
-msgctxt "OPERATION_ACTION"
+msgctxt "ACTION"
 msgid "Action"
 msgstr "動作"
 
-msgctxt "OPERATION_NETWORK"
+msgctxt "NETWORK"
 msgid "Network"
 msgstr "網絡"
 
-msgctxt "OPERATION_ROUTER"
+msgctxt "ROUTER"
 msgid "Router"
 msgstr "路由器"
 
@@ -105,429 +101,429 @@ msgctxt "OPERATION_STATUS_REPORT"
 msgid "Operation status report"
 msgstr "運作狀態回報"
 
-msgctxt "OPERATION_ACCOUNT"
+msgctxt "ACCOUNT"
 msgid "Account"
 msgstr "帳號"
 
-msgctxt "OPERATION_GROUP"
+msgctxt "GROUP"
 msgid "Group"
 msgstr "群組"
 
-msgctxt "OPERATION_DESC_SECTIONBAR"
+msgctxt "DESC_SECTIONBAR"
 msgid "<hr class=\"sectionbar\"/>"
-msgstr " <hr class=\"sectionbar\"/> "
+msgstr "<hr class=\"sectionbar\"/>"
 
-msgctxt "OPERATION_NO_PIPES_ALLOWED"
+msgctxt "NO_PIPES_ALLOWED"
 msgid "Pipe symbols (|) are not permitted in this field"
 msgstr "管線符號（|）在此區塊中是不允許的"
 
-msgctxt "OPERATION_ERROR_BELOW"
+msgctxt "ERROR_BELOW"
 msgid ""
 "ERROR: There was an error in the validation of this page. Please scroll down"
 " and find the specific problem."
 msgstr "錯誤：網頁驗證時存在錯誤。請下拉頁面並找到指定錯誤。"
 
-msgctxt "OPERATION_ACCESS"
+msgctxt "ACCESS"
 msgid "Access"
 msgstr "存取"
 
-msgctxt "OPERATION_ACCOUNT_LOCKED"
+msgctxt "ACCOUNT_LOCKED"
 msgid "Account is locked"
 msgstr "帳號鎖定"
 
-msgctxt "OPERATION_GROUP_ADD"
+msgctxt "GROUP_ADD"
 msgid "Add group"
 msgstr "增加群組"
 
-msgctxt "OPERATION_NETWORKS_ALLOW_LOCAL"
+msgctxt "NETWORKS_ALLOW_LOCAL"
 msgid "Allow access only from local networks"
 msgstr "僅限區域網路存取"
 
-msgctxt "OPERATION_NETWORKS_ALLOW_PUBLIC"
+msgctxt "NETWORKS_ALLOW_PUBLIC"
 msgid "Allow public access (entire Internet)"
 msgstr "允許公開存取（全部網際網路）"
 
-msgctxt "OPERATION_ERROR_PASSWORD_CHANGE"
+msgctxt "ERROR_PASSWORD_CHANGE"
 msgid ""
 "An error occurred while attempting to change your password. Please make sure"
 " that the old password entered is correct."
 msgstr "試圖變更您的密碼時發生錯誤。請確認輸入的舊密碼是否正確。"
 
-msgctxt "OPERATION_BACK"
+msgctxt "BACK"
 msgid "Back"
 msgstr "返回"
 
-msgctxt "OPERATION_BACKUP"
+msgctxt "BACKUP"
 msgid "Backup"
 msgstr "備份"
 
-msgctxt "OPERATION_DESCRIPTION_BRIEF"
+msgctxt "DESCRIPTION_BRIEF"
 msgid "Brief description"
 msgstr "簡介"
 
-msgctxt "OPERATION_PASSWORD_CHANGE"
+msgctxt "PASSWORD_CHANGE"
 msgid "Change Password"
 msgstr "改變密碼"
 
-msgctxt "OPERATION_RESET_PASSWORD_TITLE"
+msgctxt "RESET_PASSWORD_TITLE"
 msgid "Reset user password"
 msgstr "重設使用者密碼"
 
-msgctxt "OPERATION_ACCOUNT_PASSWORD_CHANGE"
+msgctxt "ACCOUNT_PASSWORD_CHANGE"
 msgid "Change account password"
 msgstr "修改帳號密碼"
 
-msgctxt "OPERATION_CONTENT"
+msgctxt "CONTENT"
 msgid "Content"
 msgstr "內容"
 
-msgctxt "OPERATION_CREATE_GROUP"
+msgctxt "CREATE_GROUP"
 msgid "Create user group"
 msgstr "建立使用者群組"
 
-msgctxt "OPERATION_USER_LIST_CURRENT"
+msgctxt "USER_LIST_CURRENT"
 msgid "Current list of users"
 msgstr "當前使用者列表"
 
-msgctxt "OPERATION_DESCRIPTION"
+msgctxt "DESCRIPTION"
 msgid "Description"
 msgstr "介紹"
 
-msgctxt "OPERATION_DESTINATION"
+msgctxt "DESTINATION"
 msgid "Destination"
 msgstr "目的地"
 
-msgctxt "OPERATION_DOMAIN_NAME"
+msgctxt "DOMAIN_NAME"
 msgid "Domain name"
 msgstr "網域名稱"
 
-msgctxt "OPERATION_DOMAIN"
+msgctxt "DOMAIN"
 msgid "Domain"
 msgstr "網域"
 
-msgctxt "OPERATION_DOMAINS"
+msgctxt "DOMAINS"
 msgid "Domains"
 msgstr "眾網域"
 
-msgctxt "OPERATION_DOWNLOAD"
+msgctxt "DOWNLOAD"
 msgid "Download"
 msgstr "下載"
 
-msgctxt "OPERATION_ERROR_UPDATING_CONFIGURATION"
+msgctxt "ERROR_UPDATING_CONFIGURATION"
 msgid "Error occurred while updating system configuration."
 msgstr "更新系統設定時錯誤。"
 
-msgctxt "OPERATION_GROUP_MEMBERS"
+msgctxt "GROUP_MEMBERS"
 msgid "Group Members"
 msgstr "群組成員"
 
-msgctxt "OPERATION_GROUP_NAME"
+msgctxt "GROUP_NAME"
 msgid "Group Name"
 msgstr "群組名稱"
 
-msgctxt "OPERATION_GROUPS"
+msgctxt "GROUPS"
 msgid "Groups"
 msgstr "群組"
 
-msgctxt "OPERATION_IP_ADDRESS"
+msgctxt "IP_ADDRESS"
 msgid "IP Address"
 msgstr "IP 地址"
 
-msgctxt "OPERATION_IP_ADDRESS_OR_FQDN"
+msgctxt "IP_ADDRESS_OR_FQDN"
 msgid "IP Address or FQDN"
 msgstr "IP地址或FQDN"
 
-msgctxt "OPERATION_USER_INVALID"
+msgctxt "USER_INVALID"
 msgid "Invalid user"
 msgstr "無效使用者"
 
-msgctxt "OPERATION_LOCATION"
+msgctxt "LOCATION"
 msgid "Location"
 msgstr "位置"
 
-msgctxt "OPERATION_MB"
+msgctxt "MB"
 msgid "Mb"
 msgstr "百萬位元(Mb)"
 
-msgctxt "OPERATION_MODIFY_USER_GROUP"
+msgctxt "MODIFY_USER_GROUP"
 msgid "Modify user group"
 msgstr "修正使用者群組"
 
-msgctxt "OPERATION_NAME"
+msgctxt "NAME"
 msgid "Name"
 msgstr "名稱"
 
-msgctxt "OPERATION_PASSWORD_VERIFY_NEW"
+msgctxt "PASSWORD_VERIFY_NEW"
 msgid "New password (verify):"
 msgstr "新密碼（驗證）："
 
-msgctxt "OPERATION_PASSWORD_NEW"
+msgctxt "PASSWORD_NEW"
 msgid "New password:"
 msgstr "新密碼："
 
-msgctxt "OPERATION_OFF"
+msgctxt "OFF"
 msgid "Off"
 msgstr "關閉"
 
-msgctxt "OPERATION_OK"
+msgctxt "OK"
 msgid "Ok"
 msgstr "確定"
 
-msgctxt "OPERATION_PASSWORD_OLD"
+msgctxt "PASSWORD_OLD"
 msgid "Old password:"
 msgstr "舊密碼："
 
-msgctxt "OPERATION_ON"
+msgctxt "ON"
 msgid "On"
 msgstr "開啟"
 
-msgctxt "OPERATION_PASSWORD"
+msgctxt "PASSWORD"
 msgid "Password"
 msgstr "密碼"
 
-msgctxt "OPERATION_PERFORM"
+msgctxt "PERFORM"
 msgid "Perform"
 msgstr "執行"
 
-msgctxt "OPERATION_RECONFIGURE"
+msgctxt "RECONFIGURE"
 msgid "Reconfigure"
 msgstr "重新設定"
 
-msgctxt "OPERATION_REMOVE_USER_GROUP"
+msgctxt "REMOVE_USER_GROUP"
 msgid "Remove user group"
 msgstr "移除使用者群組"
 
-msgctxt "OPERATION_PASSWORD_RESET"
+msgctxt "PASSWORD_RESET"
 msgid "Reset password"
 msgstr "重設密碼"
 
-msgctxt "OPERATION_RESTORE"
+msgctxt "RESTORE"
 msgid "Restore"
 msgstr "還原"
 
-msgctxt "OPERATION_SHUTDOWN"
+msgctxt "SHUTDOWN"
 msgid "Shutdown"
 msgstr "關閉系統"
 
-msgctxt "OPERATION_SUCCESS"
+msgctxt "SUCCESS"
 msgid "Success"
 msgstr "成功"
 
-msgctxt "OPERATION_ACCOUNT_NAME_INVALID"
+msgctxt "ACCOUNT_NAME_INVALID"
 msgid "The account name entered is invalid."
 msgstr "輸入的帳號名稱無效。"
 
-msgctxt "OPERATION_ACCOUNT_NAME_INVALID_CHARS"
+msgctxt "ACCOUNT_NAME_INVALID_CHARS"
 msgid "The account name you entered contained invalid characters."
 msgstr "您輸入的帳號名稱包含無效字元。"
 
-msgctxt "OPERATION_PASSWORD_OLD_INVALID_CHARS"
+msgctxt "PASSWORD_OLD_INVALID_CHARS"
 msgid "The old password you entered contained invalid characters."
 msgstr "您輸入的舊密碼包含無效字元。"
 
-msgctxt "OPERATION_PASSWORD_INVALID_CHARS"
+msgctxt "PASSWORD_INVALID_CHARS"
 msgid "The password you entered contained invalid characters."
 msgstr "您輸入的密碼包含無效字元。"
 
-msgctxt "OPERATION_PASSWORD_VERIFY_ERROR"
+msgctxt "PASSWORD_VERIFY_ERROR"
 msgid "The passwords you entered did not match."
 msgstr "您輸入的密碼不符。"
 
-msgctxt "OPERATION_ACCOUNT_USER_NONE"
+msgctxt "ACCOUNT_USER_NONE"
 msgid "There are no user accounts in the system."
 msgstr "系統中無使用者帳號。"
 
-msgctxt "OPERATION_ACCOUNT_GROUP_NONE"
+msgctxt "ACCOUNT_GROUP_NONE"
 msgid "There are no user groups in the system."
 msgstr "系統中無使用者群組。"
 
-msgctxt "OPERATION_ERROR_INVALID_CHARS"
+msgctxt "ERROR_INVALID_CHARS"
 msgid "Unexpected characters in description."
 msgstr "描述涵蓋未預期字元。"
 
-msgctxt "OPERATION_USER_NAME"
+msgctxt "USER_NAME"
 msgid "User Name"
 msgstr "使用者名稱"
 
-msgctxt "OPERATION_YOUR_ACCOUNT"
+msgctxt "YOUR_ACCOUNT"
 msgid "Your account:"
 msgstr "您的帳號："
 
-msgctxt "OPERATION_YOUR_ACCOUNT_INVALID"
+msgctxt "YOUR_ACCOUNT_INVALID"
 msgid "The account name entered is invalid."
 msgstr "輸入的帳號名稱無效。"
 
-msgctxt "OPERATION_PASSWORD_CHANGE_SUCCESS"
+msgctxt "PASSWORD_CHANGE_SUCCESS"
 msgid "Your password has been successfully changed."
 msgstr "您的密碼已修改成功。"
 
-msgctxt "OPERATION_FM_NONBLANK"
+msgctxt "FM_NONBLANK"
 msgid "This field must not be left blank"
 msgstr "此區塊不能留白。"
 
-msgctxt "OPERATION_FM_INTEGER"
+msgctxt "FM_INTEGER"
 msgid "This field must contain a positive integer"
 msgstr "此區塊必須包含一個正整數。"
 
-msgctxt "OPERATION_FM_NUMBER"
+msgctxt "FM_NUMBER"
 msgid "This field must contain a number"
 msgstr "此區塊必須包含一個數字。"
 
-msgctxt "OPERATION_FM_WORD"
+msgctxt "FM_WORD"
 msgid "This field must look like a single word."
 msgstr "此區塊必須看起來像個單一的字。"
 
-msgctxt "OPERATION_FM_DATE"
+msgctxt "FM_DATE"
 msgid "The data entered could not be parsed as a date"
 msgstr "輸入的資料無法被解析為日期"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_NUMBER1"
+msgctxt "FM_CREDIT_CARD_NUMBER1"
 msgid "You must enter a credit card number"
 msgstr "您必須輸入信用卡號碼"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_NUMBER2"
+msgctxt "FM_CREDIT_CARD_NUMBER2"
 msgid ""
 "Credit card numbers shouldn\\'t have anything but numbers, spaces or dashes"
 msgstr "信用卡號碼不應該包含數字、空格或破折號以外的其他字元"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_NUMBER3"
+msgctxt "FM_CREDIT_CARD_NUMBER3"
 msgid "Must be at least 14 characters in length"
 msgstr "字元長度至少為14個"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_NUMBER4"
+msgctxt "FM_CREDIT_CARD_NUMBER4"
 msgid "Doesn\\'t appear to be a valid credit card number"
 msgstr "似非有效信用卡號碼"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_EXPIRY1"
+msgctxt "FM_CREDIT_CARD_EXPIRY1"
 msgid "No expiry date entered."
 msgstr "無輸入屆期日"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_EXPIRY2"
+msgctxt "FM_CREDIT_CARD_EXPIRY2"
 msgid "Expiry date must be in the format MM/YY or MM/YYYY"
 msgstr "屆期日格式須為MM/YY或MM/YYYY"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_EXPIRY3"
+msgctxt "FM_CREDIT_CARD_EXPIRY3"
 msgid "This expiry date appears to have already passed"
 msgstr "似乎已過屆期日"
 
-msgctxt "OPERATION_FM_CREDIT_CARD_EXPIRY4"
+msgctxt "FM_CREDIT_CARD_EXPIRY4"
 msgid "This expiry date appears to be too far in the future"
 msgstr "未來屆期日似乎太長"
 
-msgctxt "OPERATION_FM_ISO_COUNTRY_CODE1"
+msgctxt "FM_ISO_COUNTRY_CODE1"
 msgid "You must provide a country code"
 msgstr "您必須提供國碼"
 
-msgctxt "OPERATION_FM_ISO_COUNTRY_CODE2"
+msgctxt "FM_ISO_COUNTRY_CODE2"
 msgid "This field does not contain an ISO country code"
 msgstr "此欄位不包含ISO國碼"
 
-msgctxt "OPERATION_FM_US_STATE"
+msgctxt "FM_US_STATE"
 msgid "This doesn\\'t appear to be a valid 2-letter US state abbreviation"
 msgstr "此似非有效2位元美國州縮寫"
 
-msgctxt "OPERATION_FM_US_ZIPCODE"
+msgctxt "FM_US_ZIPCODE"
 msgid "US zip codes must contain 5 or 9 numbers"
 msgstr "美國郵遞區號必須包含5或9個數字"
 
-msgctxt "OPERATION_FM_MINLENGTH1"
+msgctxt "FM_MINLENGTH1"
 msgid "Minimum length has been specified meaninglessly as [_1]"
 msgstr "以{$minlength}指定的最小長度是無意義的。"
 
-msgctxt "OPERATION_FM_MINLENGTH2"
+msgctxt "FM_MINLENGTH2"
 msgid "This field must be at least [_1] characters"
 msgstr "此區段最少需要{$minlength}個字元。"
 
-msgctxt "OPERATION_FM_MAXLENGTH1"
+msgctxt "FM_MAXLENGTH1"
 msgid "Maximum length has been specified meaninglessly as [_1]"
 msgstr "以{$maxlength}指定的最大長度是無意義的。"
 
-msgctxt "OPERATION_FM_MAXLENGTH2"
+msgctxt "FM_MAXLENGTH2"
 msgid "This field must be no more than [_1] characters"
 msgstr "此區段不得超過{$maxlength}個字元。"
 
-msgctxt "OPERATION_FM_EXACTLENGTH1"
+msgctxt "FM_EXACTLENGTH1"
 msgid "You must specify the length for the field."
 msgstr "您必須為此區段指定長度。"
 
-msgctxt "OPERATION_FM_EXACTLENGTH2"
+msgctxt "FM_EXACTLENGTH2"
 msgid "You must specify the exactlength of the field with an integer"
 msgstr "您必須以整數為此區段指定準確長度。"
 
-msgctxt "OPERATION_FM_EXACTLENGTH3"
+msgctxt "FM_EXACTLENGTH3"
 msgid "This field must be exactly [_1] characters"
 msgstr "此區段必須確定為{$exactlength}個字元。"
 
-msgctxt "OPERATION_FM_LENGTHRANGE1"
+msgctxt "FM_LENGTHRANGE1"
 msgid "You must specify the maximum and minimum length for the field."
 msgstr "您必須為此區段指定最大與最小長度。"
 
-msgctxt "OPERATION_FM_LENGTHRANGE2"
+msgctxt "FM_LENGTHRANGE2"
 msgid ""
 "You must specify the maximum and minimum lengths of the field with an "
 "integer"
 msgstr "您必須以整數為此區段指定最大與最小長度。"
 
-msgctxt "OPERATION_FM_LENGTHRANGE3"
+msgctxt "FM_LENGTHRANGE3"
 msgid "This field must be between [_1] and [_2] characters"
 msgstr "此區段必須介於 {$minlength}與{$maxlength}個字元。"
 
-msgctxt "OPERATION_FM_URL"
+msgctxt "FM_URL"
 msgid "This field must contain a URL starting with http:// or ftp://"
 msgstr "此區段的URL必須以http://或ftp://開頭"
 
-msgctxt "OPERATION_FM_EMAIL_SIMPLE1"
+msgctxt "FM_EMAIL_SIMPLE1"
 msgid "You must enter an email address."
 msgstr "您必須輸入一個電郵地址。"
 
-msgctxt "OPERATION_FM_EMAIL_SIMPLE2"
+msgctxt "FM_EMAIL_SIMPLE2"
 msgid "This field doesn\\'t look like an RFC822-compliant email address"
 msgstr "此區段不似RFC822相容的電郵地址"
 
-msgctxt "OPERATION_FM_DOMAIN_NAME"
+msgctxt "FM_DOMAIN_NAME"
 msgid "This field doesn\\'t look like a valid Internet domain name or hostname."
 msgstr "此區段不似有效的網際網路網域名稱或主機名稱。"
 
-msgctxt "OPERATION_FM_IP_NUMBER1"
+msgctxt "FM_IP_NUMBER1"
 msgid "This field must contain a valid IP number and can not be left blank."
 msgstr "此區段必須包含一個有效的IP位址且不能留白。"
 
-msgctxt "OPERATION_FM_IP_NUMBER2"
+msgctxt "FM_IP_NUMBER2"
 msgid "Invalid IP address format (expected X.X.X.X)"
 msgstr "無效的IP位址格式（例如X.X.X.X）"
 
-msgctxt "OPERATION_FM_IP_NUMBER3"
+msgctxt "FM_IP_NUMBER3"
 msgid "[_1] is more than 255"
 msgstr "{$octet}大於255"
 
-msgctxt "OPERATION_FM_USERNAME"
+msgctxt "FM_USERNAME"
 msgid ""
 "This field must look like a valid username (3 to 8 letters and numbers)"
 msgstr "此區塊需類有效使用者名稱（3到8個字母和數字）"
 
-msgctxt "OPERATION_FM_PASSWORD1"
+msgctxt "FM_PASSWORD1"
 msgid "You must provide a password."
 msgstr "您需提供密碼。"
 
-msgctxt "OPERATION_FM_PASSWORD2"
+msgctxt "FM_PASSWORD2"
 msgid ""
 "The password you provided was not a good password.A good password must "
 "contain all of the following: upper case letter, lower case letter, number, "
 "non-alphanumeric character, be at least 7 characters long."
 msgstr "您提供的密碼不佳。良好的密碼需涵蓋以下：大小寫字母、數字、特殊字元，以及至少7個字元。"
 
-msgctxt "OPERATION_FM_MAC_ADDRESS1"
+msgctxt "FM_MAC_ADDRESS1"
 msgid "You must provide a MAC address."
 msgstr "您需提供MAC位址。"
 
-msgctxt "OPERATION_FM_MAC_ADDRESS2"
+msgctxt "FM_MAC_ADDRESS2"
 msgid "The MAC address you provided was not valid."
 msgstr "您提供的MAC位址無效。"
 
-msgctxt "OPERATION_FM_ERR_UNEXPECTED_DESC"
+msgctxt "FM_ERR_UNEXPECTED_DESC"
 msgid "Error: unexpected or missing characters in description"
 msgstr "錯誤：描述中涵蓋未知字元或遺失字元。"
 
-msgctxt "OPERATION_CSRF_VALIDATION_FAILURE"
-msgid "Placeholder for missing original text"
+msgctxt "CSRF_VALIDATION_FAILURE"
+msgid "Error: CSRF token is invalid or outdated."
 msgstr "Error: CSRF token is invalid or outdated."