refactoring i18n

web/inc/i18n/en.php

@@ -345,15 +345,27 @@ $LANG['en'] = array(
     'PACKAGE_CREATED_OK'  => 'Package <a href="/edit/package/?package=%s"><b>%s</b></a> has been created successfully.',
     'Changes has been saved.'  => 'Changes has been saved.',
     'Confirmation'  => 'Confirmation',
-    'USER_ACTION_CONFIRMATION'  => 'Are you sure to %s user %s?',
-    'DOMAIN_ACTION_CONFIRMATION'  => 'Are you sure to %s domain %s?',
-    'RECORD_ACTION_CONFIRMATION'  => 'Are you sure to %s record %s?',
-    'MAIL_ACCOUNT_ACTION_CONFIRMATION'  => 'Are you sure to %s mail account %s?',
-    'DATABASE_ACTION_CONFIRMATION'  => 'Are you sure to %s database %s?',
-    'CRON_ACTION_CONFIRMATION'  => 'Are you sure to %s cron job?',
-    'BACKUP_DELETE_CONFIRMATION'  => 'Are you sure to delete %s backup?',
-    'PACKAGE_DELETE_CONFIRMATION'  => 'Are you sure to delete package %s?',
-    'IP_DELETE_CONFIRMATION'  => 'Are you sure to delere IP address %s?',
+    'DELETE_USER_CONFIRMATION' => 'Are you sure to delete user %s?',
+    'SUSPEND_USER_CONFIRMATION' => 'Are you sure to suspend user %s?',
+    'UNSUSPEND_USER_CONFIRMATION' => 'Are you sure to unsuspend user %s?',
+    'DELETE_DOMAIN_CONFIRMATION' => 'Are you sure to delete domain %s?',
+    'SUSPEND_DOMAIN_CONFIRMATION' => 'Are you sure to suspend domain %s?',
+    'UNSUSPEND_DOMAIN_CONFIRMATION' => 'Are you sure to unsuspend domain %s?',
+    'DELETE_RECORD_CONFIRMATION' => 'Are you sure to delete record %s?',
+    'SUSPEND_RECORD_CONFIRMATION' => 'Are you sure to suspend record %s?',
+    'UNSUSPEND_RECORD_CONFIRMATION' => 'Are you sure to unsuspend record %s?',
+    'DELETE_MAIL_ACCOUNT_CONFIRMATION' => 'Are you sure to delete %s?',
+    'SUSPEND_MAIL_ACCOUNT_CONFIRMATION' => 'Are you sure to suspend %s?',
+    'UNSUSPEND_MAIL_ACCOUNT_CONFIRMATION' => 'Are you sure to unsuspend %s?',
+    'DELETE_DATABASE_CONFIRMATION' => 'Are you sure to delete database %s?',
+    'SUSPEND_DATABASE_CONFIRMATION' => 'Are you sure to suspend database %s?',
+    'UNSUSPEND_DATABASE_CONFIRMATION' => 'Are you sure to unsuspend database %s?',
+    'DELETE_CRON_CONFIRMATION' => 'Are you sure to delete cron job?',
+    'SUSPEND_CRON_CONFIRMATION' => 'Are you sure to suspend cron job?',
+    'UNSUSPEND_CRON_CONFIRMATION' => 'Are you sure to unsuspend cron job?',
+    'DELETE_BACKUP_CONFIRMATION'  => 'Are you sure to delete %s backup?',
+    'DELETE_PACKAGE_CONFIRMATION'  => 'Are you sure to delete package %s?',
+    'DELETE_IP_CONFIRMATION'  => 'Are you sure to delere IP address %s?',
     'Welcome'  => 'Welcome',
     'LOGGED_IN_AS'  => 'Logged in as user %s',
     'Error'  => 'Error',

web/inc/i18n/es.php

@@ -344,15 +344,27 @@ $LANG['es'] = array(
     'PACKAGE_CREATED_OK'  => 'Plan <a href="/edit/package/?package=%s"><b>%s</b></a> ha sido creado correctamente.',
     'Changes has been saved.'  => 'Los cambios han sido guardados.',
     'Confirmation'  => 'Confirmación',
-    'USER_ACTION_CONFIRMATION'  => '¿Está seguro que desea %s el usuario %s?',
-    'DOMAIN_ACTION_CONFIRMATION'  => '¿Está seguro que desea %s el dominio %s?',
-    'RECORD_ACTION_CONFIRMATION'  => '¿Está seguro que desea %s el registro %s?',
-    'MAIL_ACCOUNT_ACTION_CONFIRMATION'  => '¿Está seguro que desea %s la cuenta de correo %s?',
-    'DATABASE_ACTION_CONFIRMATION'  => '¿Está seguro que desea %s la base de datos %s?',
-    'CRON_ACTION_CONFIRMATION'  => '¿Está seguro que desea eliminar el trabajo %s?',
-    'BACKUP_DELETE_CONFIRMATION'  => '¿Está seguro que desea eliminar el resplado %s?',
-    'PACKAGE_DELETE_CONFIRMATION'  => '¿Está seguor que desea eliminar el plan %s?',
-    'IP_DELETE_CONFIRMATION'  => '¿Está seguro que desea eliminar la dirección IP %s?',
+    'DELETE_USER_CONFIRMATION' => '¿Está seguro que desea eliminar el usuario %s?',
+    'SUSPEND_USER_CONFIRMATION' => '¿Está seguro que desea suspender el usuario %s?',
+    'UNSUSPEND_USER_CONFIRMATION' => '¿Está seguro que desea habilitar el usuario %s?',
+    'DELETE_DOMAIN_CONFIRMATION' => '¿Está seguro que desea eliminar el dominio %s?',
+    'SUSPEND_DOMAIN_CONFIRMATION' => '¿Está seguro que desea suspender el dominio %s?',
+    'UNSUSPEND_DOMAIN_CONFIRMATION' => '¿Está seguro que desea habilitar el dominio %s?',
+    'DELETE_RECORD_CONFIRMATION' => '¿Está seguro que desea eliminar el registro %s?',
+    'SUSPEND_RECORD_CONFIRMATION' => '¿Está seguro que desea suspender el registro %s?',
+    'UNSUSPEND_RECORD_CONFIRMATION' => '¿Está seguro que desea habilitar el registro %s?',
+    'DELETE_MAIL_ACCOUNT_CONFIRMATION' => '¿Está seguro que desea eliminar la cuenta de correo %s?',
+    'SUSPEND_MAIL_ACCOUNT_CONFIRMATION' => '¿Está seguro que desea suspender la cuenta de correo %s?',
+    'UNSUSPEND_MAIL_ACCOUNT_CONFIRMATION' => '¿Está seguro que desea habilitar la cuenta de correo %s?',
+    'DELETE_DATABASE_CONFIRMATION' => '¿Está seguro que desea eliminar la base de datos %s?',
+    'SUSPEND_DATABASE_CONFIRMATION' => '¿Está seguro que desea suspender la base de datos %s?',
+    'UNSUSPEND_DATABASE_CONFIRMATION' => '¿Está seguro que desea habilitar la base de datos %s?',
+    'DELETE_CRON_CONFIRMATION' => '¿Está seguro que desea eliminar el trabajo %s?',
+    'SUSPEND_CRON_CONFIRMATION' => '¿Está seguro que desea suspender el trabajo %s?',
+    'UNSUSPEND_CRON_CONFIRMATION' => '¿Está seguro que desea habilitar el trabajo %s?',
+    'DELETE_BACKUP_CONFIRMATION'  => '¿Está seguro que desea eliminar el resplado %s?',
+    'DELETE_PACKAGE_CONFIRMATION'  => '¿Está seguor que desea eliminar el plan %s?',
+    'DELETE_IP_CONFIRMATION'  => '¿Está seguro que desea eliminar la dirección IP %s?',
     'Welcome'  => 'Bienvenido',
     'LOGGED_IN_AS'  => 'Conectado como el usuario %s',
     'Error'  => 'Error',

web/inc/i18n/ru.php

@@ -346,15 +346,27 @@ $LANG['ru'] = array(
     'PACKAGE_CREATED_OK' => 'Пакет <a href="/edit/package/?package=%s"><b>%s</b></a> успешно создан.',
     'Changes has been saved.' => 'Изменения сохранены.',
     'Confirmation' => 'Подтверждение',
-    'USER_ACTION_CONFIRMATION' => 'Вы уверены, что хотите %s пользователя %s?',
-    'DOMAIN_ACTION_CONFIRMATION' => 'Вы уверены, что хотите %s домен %s?',
-    'RECORD_ACTION_CONFIRMATION' => 'Вы уверены, что хотите %s запись %s?',
-    'MAIL_ACCOUNT_ACTION_CONFIRMATION' => 'Вы уверены, что хотите %s почтовый ящик %s?',
-    'DATABASE_ACTION_CONFIRMATION' => 'Вы уверены, что хотите %s базу данных %s?',
-    'CRON_ACTION_CONFIRMATION' => 'Вы уверены, что хотите %s cron-задание?',
-    'BACKUP_DELETE_CONFIRMATION' => 'Вы уверены, что хотите удалить %s архив?',
-    'PACKAGE_DELETE_CONFIRMATION' => 'Вы уверены, что хотите удалить пакет %s?',
-    'IP_DELETE_CONFIRMATION' => 'Вы уверены, что хотите удалить IP адрес %s?',
+    'DELETE_USER_CONFIRMATION' => 'Вы уверены, что хотите удалить пользователя %s?',
+    'SUSPEND_USER_CONFIRMATION' => 'Вы уверены, что хотите заблокировать пользователя %s?',
+    'UNSUSPEND_USER_CONFIRMATION' => 'Вы уверены, что хотите разблокировать пользователя %s?',
+    'DELETE_DOMAIN_CONFIRMATION' => 'Вы уверены, что хотите удалить домен %s?',
+    'SUSPEND_DOMAIN_CONFIRMATION' => 'Вы уверены, что хотите заблокировать домен %s?',
+    'UNSUSPEND_DOMAIN_CONFIRMATION' => 'Вы уверены, что хотите разблокировать домен %s?',
+    'DELETE_RECORD_CONFIRMATION' => 'Вы уверены, что хотите удалить запись %s?',
+    'SUSPEND_RECORD_CONFIRMATION' => 'Вы уверены, что хотите заблокировать запись %s?',
+    'UNSUSPEND_RECORD_CONFIRMATION' => 'Вы уверены, что хотите разблокировать запись %s?',
+    'DELETE_MAIL_ACCOUNT_CONFIRMATION' => 'Вы уверены, что хотите удалить почтовый ящик %s?',
+    'SUSPEND_MAIL_ACCOUNT_CONFIRMATION' => 'Вы уверены, что хотите заблокировать почтовый ящик %s?',
+    'UNSUSPEND_MAIL_ACCOUNT_CONFIRMATION' => 'Вы уверены, что хотите разблокировать почтовый ящик %s?',
+    'DELETE_DATABASE_CONFIRMATION' => 'Вы уверены, что хотите удалить базу данных %s?',
+    'SUSPEND_DATABASE_CONFIRMATION' => 'Вы уверены, что хотите заблокировать базу данных %s?',
+    'UNSUSPEND_DATABASE_CONFIRMATION' => 'Вы уверены, что хотите разблокировать базу данных %s?',
+    'DELETE_CRON_CONFIRMATION' => 'Вы уверены, что хотите удалить cron-задание?',
+    'SUSPEND_CRON_CONFIRMATION' => 'Вы уверены, что хотите заблокировать cron-задание?',
+    'UNSUSPEND_CRON_CONFIRMATION' => 'Вы уверены, что хотите разблокировать cron-задание?',
+    'DELETE_BACKUP_CONFIRMATION' => 'Вы уверены, что хотите удалить архив %s?',
+    'DELETE_PACKAGE_CONFIRMATION' => 'Вы уверены, что хотите удалить пакет %s?',
+    'DELETE_IP_CONFIRMATION' => 'Вы уверены, что хотите удалить IP адрес %s?',
     'Welcome' => 'Добро пожаловать',
     'LOGGED_IN_AS' => 'Вы вошли как пользователь %s',
     'Error' => 'Ошибка',
@@ -393,5 +405,5 @@ $LANG['ru'] = array(
     'RESET_NOTICE' => '',
     'RESET_CODE_SENT' => 'Код для восстановления пароля был выслан на ваш электронный адрес.<br>',
     'MAIL_RESET_SUBJECT' => 'Восстановление пароля %s',
-    'PASSWORD_RESET_REQUEST'=>"Чтобы восстановить пароль, пройдите по ссылке:\nhttps://%s/reset/?action=confirm&user=%s&code=%s\n\nВы также можете октрыть страницу https://%s/reset/?action=code&user=%s и вручную ввести код для восстановления:\n%s\n\nЕсли вы не запрашивали процедуру восстановления пароля, пожалуйста проигнорируйте это письмо и примите наши извиниения.\n\n--\nПанель управления Vesta\n",
+    'PASSWORD_RESET_REQUEST'=>"Чтобы восстановить пароль, пройдите по ссылке:\nhttps://%s/reset/?action=confirm&user=%s&code=%s\n\nВы также можете октрыть страницу https://%s/reset/?action=code&user=%s и вручную ввести код для восстановления:\n%s\n\nЕсли вы не запрашивали процедуру восстановления пароля, пожалуйста проигнорируйте это письмо и примите наши извинения.\n\n--\nПанель управления Vesta\n",
 );

web/inc/i18n/ua.php

@@ -346,15 +346,27 @@ $LANG['ua'] = array(
     'PACKAGE_CREATED_OK' => 'Пакет <a href="/edit/package/?package=%s"><b>%s</b></a> успішно створений.',
     'Changes has been saved.' => 'Зміни збережені.',
     'Confirmation' => 'Підтвердження',
-    'USER_ACTION_CONFIRMATION' => 'Ви впевнені, що хочете %s користувача %s?',
-    'DOMAIN_ACTION_CONFIRMATION' => 'Ви впевнені, що хочете %s домен %s?',
-    'RECORD_ACTION_CONFIRMATION' => 'Ви впевнені, що хочете %s запис %s?',
-    'MAIL_ACCOUNT_ACTION_CONFIRMATION' => 'Ви впевнені, що хочете %s поштовий ящик %s?',
-    'DATABASE_ACTION_CONFIRMATION' => 'Ви впевнені, що хочете %s базу даних %s?',
-    'CRON_ACTION_CONFIRMATION' => 'Ви впевнені, що хочете %s cron-задание?',
-    'BACKUP_DELETE_CONFIRMATION' => 'Ви впевнені, що хочете видалити %s архив?',
-    'PACKAGE_DELETE_CONFIRMATION' => 'Ви впевнені, що хочете видалити пакет %s?',
-    'IP_DELETE_CONFIRMATION' => 'Ви впевнені, що хочете видалити IP адреса %s?',
+    'DELETE_USER_CONFIRMATION' => 'Ви впевнені, що хочете видалити користувача %s?',
+    'SUSPEND_USER_CONFIRMATION' => 'Ви впевнені, що хочете заблокувати користувача %s?',
+    'UNSUSPEND_USER_CONFIRMATION' => 'Ви впевнені, що хочете активувати користувача %s?',
+    'DELETE_DOMAIN_CONFIRMATION' => 'Ви впевнені, що хочете видалити домен %s?',
+    'SUSPEND_DOMAIN_CONFIRMATION' => 'Ви впевнені, що хочете заблокувати домен %s?',
+    'UNSUSPEND_DOMAIN_CONFIRMATION' => 'Ви впевнені, що хочете активувати домен %s?',
+    'DELETE_RECORD_CONFIRMATION' => 'Ви впевнені, що хочете видалити запис %s?',
+    'SUSPEND_RECORD_CONFIRMATION' => 'Ви впевнені, що хочете заблокувати запис %s?',
+    'UNSUSPEND_RECORD_CONFIRMATION' => 'Ви впевнені, що хочете активувати запис %s?',
+    'DELETE_MAIL_ACCOUNT_CONFIRMATION' => 'Ви впевнені, що хочете видалити поштовий ящик %s?',
+    'SUSPEND_MAIL_ACCOUNT_CONFIRMATION' => 'Ви впевнені, що хочете заблокувати поштовий ящик %s?',
+    'UNSUSPEND_MAIL_ACCOUNT_CONFIRMATION' => 'Ви впевнені, що хочете активувати поштовий ящик %s?',
+    'DELETE_DATABASE_CONFIRMATION' => 'Ви впевнені, що хочете видалити базу даних %s?',
+    'SUSPEND_DATABASE_CONFIRMATION' => 'Ви впевнені, що хочете заблокувати базу даних %s?',
+    'UNSUSPEND_DATABASE_CONFIRMATION' => 'Ви впевнені, що хочете активувати базу даних %s?',
+    'DELETE_CRON_CONFIRMATION' => 'Ви впевнені, що хочете видалити cron-задание?',
+    'SUSPEND_CRON_CONFIRMATION' => 'Ви впевнені, що хочете заблокувати cron-задание?',
+    'UNSUSPEND_CRON_CONFIRMATION' => 'Ви впевнені, що хочете активувати cron-задание?',
+    'DELETE_BACKUP_CONFIRMATION' => 'Ви впевнені, що хочете видалити %s архив?',
+    'DELETE_PACKAGE_CONFIRMATION' => 'Ви впевнені, що хочете видалити пакет %s?',
+    'DELETE_IP_CONFIRMATION' => 'Ви впевнені, що хочете видалити IP адреса %s?',
     'Welcome' => 'Ласкаво просимо',
     'LOGGED_IN_AS' => 'Ви ввійшли як користувач %s',
     'Error' => 'Помилка',

web/templates/admin/list_backup.html

@@ -88,7 +88,7 @@
                                             <?php print _('delete');?> 
                                             <input type="hidden" name="delete_url" value="/delete/backup/?backup=<?php echo "$key" ?>" />
                                             <div id="delete_dialog_<?php echo $i ?>" class="confirmation-text-delete hidden" title="<?php print _('Confirmation');?>">
-                                                <p class="counter-value"><?php print _('BACKUP_DELETE_CONFIRMATION',$key);?></p>
+                                                <p class="counter-value"><?php print _('DELETE_BACKUP_CONFIRMATION',$key);?></p>
                                             </div>
                                         </span>
                                     </a>

web/templates/admin/list_cron.html

@@ -36,10 +36,12 @@
                                     ++$i;
                                     if ($data[$key]['SUSPENDED'] == 'yes') {
                                         $status = 'suspended';
-                                        $spnd_action = 'unsuspend' ;
+                                        $spnd_action = 'unsuspend';
+                                        $spnd_confirmation = 'UNSUSPEND_CRON_CONFIRMATION' ;
                                     } else {
                                         $status = 'active';
                                         $spnd_action = 'suspend';
+                                        $spnd_confirmation = 'SUSPEND_CRON_CONFIRMATION' ;
                                     }
                             ?> 
 
@@ -58,7 +60,7 @@
                                             <?php print _('delete');?> 
                                             <input type="hidden" name="delete_url" value="/delete/cron/?job=<?php echo $data[$key]['JOB']; ?>" />
                                             <div id="delete_dialog_<?php echo $i ?>" class="confirmation-text-delete hidden" title="<?php print _('Confirmation');?>">
-                                                <p class="counter-value"><?php print _('CRON_ACTION_CONFIRMATION',_('delete'));?></p>
+                                                <p class="counter-value"><?php print _('DELETE_CRON_CONFIRMATION');?></p>
                                             </div>
                                         </span>
                                     </a>
@@ -68,7 +70,7 @@
                                             <?php echo _($spnd_action); ?> 
                                             <input type="hidden" name="<?php echo $spnd_action ?>_url" value="/<?php echo $spnd_action ?>/cron/?job=<?php echo $data[$key]['JOB']; ?>" />
                                             <div id="<?php echo $spnd_action ?>_dialog_<?php echo $i ?>" class="confirmation-text-suspention hidden" title="<?php print _('Confirmation');?>">
-                                                <p class="counter-value"><?php print _('CRON_ACTION_CONFIRMATION',_($spnd_action));?></p>
+                                                <p class="counter-value"><?php print _($spnd_confirmation);?></p>
                                             </div>
                                         </span>
                                     </a>

web/templates/admin/list_db.html

@@ -37,9 +37,11 @@
                                     if ($data[$key]['SUSPENDED'] == 'yes') {
                                         $status = 'suspended';
                                         $spnd_action = 'unsuspend' ;
+                                        $spnd_confirmation = 'UNSUSPEND_DATABASE_CONFIRMATION' ;
                                     } else {
                                         $status = 'active';
                                         $spnd_action = 'suspend' ;
+                                        $spnd_confirmation = 'SUSPEND_DATABASE_CONFIRMATION' ;
                                     }
                                     if ($data[$key]['HOST'] != 'localhost' ) $http_host = $data[$key]['HOST'];
                                     if ($data[$key]['TYPE'] == 'mysql') $db_admin = "phpMyAdmin";
@@ -62,7 +64,7 @@
                                             <?php echo _('delete') ?> 
                                             <input type="hidden" name="delete_url" value="/delete/db/?database=<?php echo "$key" ?>" />
                                             <div id="delete_dialog_<?php echo $i ?>" class="confirmation-text-delete hidden" title="<?php print _('Confirmation');?>">
-                                                <p class="counter-value"><?php print _('DATABASE_ACTION_CONFIRMATION',_('delete'),$key);?></p>
+                                                <p class="counter-value"><?php print _('DELETE_DATABASE_CONFIRMATION',$key);?></p>
                                             </div>
                                         </span>
                                     </a>
@@ -72,7 +74,7 @@
                                             <?php echo _($spnd_action) ?> 
                                             <input type="hidden" name="<?php echo $spnd_action ?>_url" value="/<?php echo $spnd_action ?>/db/?database=<?php echo "$key" ?>" />
                                             <div id="<?php echo $spnd_action ?>_dialog_<?php echo $i ?>" class="confirmation-text-suspention hidden" title="<?php print _('Confirmation');?>">
-                                                <p class="counter-value"><?php print _('DATABASE_ACTION_CONFIRMATION',_($spnd_action),$key);?></p>
+                                                <p class="counter-value"><?php print _($spnd_confirmation,$key);?></p>
                                             </div>
                                         </span>
                                     </a>

web/templates/admin/list_dns.html

@@ -36,9 +36,11 @@
                                     if ($data[$key]['SUSPENDED'] == 'yes') {
                                         $status = 'suspended';
                                         $spnd_action = 'unsuspend' ;
+                                        $spnd_confirmation = 'UNSUSPEND_DOMAIN_CONFIRMATION' ;
                                     } else {
                                         $status = 'active';
                                         $spnd_action = 'suspend' ;
+                                        $spnd_confirmation = 'SUSPEND_DOMAIN_CONFIRMATION' ;
                                     }
                             ?> 
                             <tr class="data-row">
@@ -56,7 +58,7 @@
                                             <?php print _('delete');?> 
                                             <input type="hidden" name="delete_url" value="/delete/dns/?domain=<?php echo $key ?>" />
                                             <div id="delete_dialog_<?php echo $i ?>" class="confirmation-text-delete hidden" title="<?php print _('Confirmation');?>">
-                                                <p class="counter-value"><?php print _('DOMAIN_ACTION_CONFIRMATION',_('delete'),$key);?></p>
+                                                <p class="counter-value"><?php print _('DELETE_DOMAIN_CONFIRMATION',$key);?></p>
                                             </div>
                                         </span>
                                     </a>
@@ -66,7 +68,7 @@
                                             <?php echo _($spnd_action); ?> 
                                             <input type="hidden" name="<?php echo $spnd_action ?>_url" value="/<?php echo $spnd_action ?>/dns/?domain=<?php echo $key ?>" />
                                             <div id="<?php echo $spnd_action ?>_dialog_<?php echo $i ?>" class="confirmation-text-suspention hidden" title="<?php print _('Confirmation');?>">
-                                                <p class="counter-value"><?php print _('DOMAIN_ACTION_CONFIRMATION',_($spnd_action),$key);?></p>
+                                                <p class="counter-value"><?php print _($spnd_confirmation,$key);?></p>
                                             </div>
                                         </span>
                                     </a>

web/templates/admin/list_dns_rec.html

@@ -44,9 +44,11 @@
                                         if ($data[$key]['SUSPENDED'] == 'yes') {
                                             $status = 'suspended';
                                             $spnd_action = 'unsuspend' ;
+                                            $spnd_confirmation = 'UNSUSPEND_RECORD_CONFIRMATION' ;
                                         } else {
                                             $status = 'active';
                                             $spnd_action = 'suspend' ;
+                                            $spnd_confirmation = 'UNSUSPEND_RECORD_CONFIRMATION' ;
                                         }
                                 ?> 
                                 <tr class="data-row">
@@ -63,7 +65,7 @@
                                                 <?php print _('delete');?>
                                                 <input type="hidden" name="delete_url" value="/delete/dns/?domain=<?php echo $_GET['domain'] ?>&record_id=<?php echo $data[$key]['ID'] ?>" />
                                                 <div id="delete_dialog_<?php echo $i ?>" class="confirmation-text-delete hidden" title="<?php print _('Confirmation');?>">
-                                                    <p class="counter-value"><?php print _('RECORD_ACTION_CONFIRMATION',_('delete'),$data[$key]['RECORD']);?></p>
+                                                    <p class="counter-value"><?php print _('DELETE_RECORD_CONFIRMATION',$data[$key]['RECORD']);?></p>
                                                 </div>
                                             </span>
                                         </a>

web/templates/admin/list_ip.html

@@ -75,7 +75,7 @@
                                             <?php print _('delete');?> 
                                             <input type="hidden" name="delete_url" value="/delete/ip/?ip=<?php echo "$key" ?>" />
                                             <div id="delete_dialog_<?php echo $i ?>" class="confirmation-text-delete hidden" title="<?php print _('Confirmation');?>">
-                                                <p class="counter-value"><?php print _('IP_DELETE_CONFIRMATION',$key);?></p>
+                                                <p class="counter-value"><?php print _('DELETE_IP_CONFIRMATION',$key);?></p>
                                             </div>
                                         </span>
                                     </a>

web/templates/admin/list_mail.html

@@ -36,9 +36,11 @@
                                     if ($data[$key]['SUSPENDED'] == 'yes') {
                                         $status = 'suspended';
                                         $spnd_action = 'unsuspend' ;
+                                        $spnd_confirmation = 'UNSUSPEND_DOMAIN_CONFIRMATION' ;
                                     } else {
                                         $status = 'active';
                                         $spnd_action = 'suspend' ;
+                                        $spnd_confirmation = 'UNSUSPEND_DOMAIN_CONFIRMATION' ;
                                     }
                                     if (empty($data[$key]['CATCHALL'])) {
                                         $data[$key]['CATCHALL'] = '/dev/null';
@@ -59,7 +61,7 @@
                                             <?php print _('delete');?> 
                                             <input type="hidden" name="delete_url" value="/delete/mail/?domain=<?php echo $key ?>" />
                                             <div id="delete_dialog_<?php echo $i ?>" class="confirmation-text-delete hidden" title="<?php print _('Confirmation');?>">
-                                                <p class="counter-value"><?php print _('DOMAIN_ACTION_CONFIRMATION',_('delete'),$key);?></p>
+                                                <p class="counter-value"><?php print _('DELETE_DOMAIN_CONFIRMATION',$key);?></p>
                                             </div>
                                         </span>
                                     </a>
@@ -69,7 +71,7 @@
                                             <?php echo _($spnd_action); ?> 
                                             <input type="hidden" name="<?php echo $spnd_action ?>_url" value="/<?php echo $spnd_action ?>/mail/?domain=<?php echo $key ?>" />
                                             <div id="<?php echo $spnd_action ?>_dialog_<?php echo $i ?>" class="confirmation-text-suspention hidden" title="<?php print _('Confirmation');?>">
-                                                <p class="counter-value"><?php print _('DOMAIN_ACTION_CONFIRMATION',_($spnd_action),$key);?></p>
+                                                <p class="counter-value"><?php print _($spnd_confirmation,$key);?></p>
                                             </div>
                                         </span>
                                     </a>

web/templates/admin/list_mail_acc.html

@@ -45,9 +45,11 @@
                                     if ($data[$key]['SUSPENDED'] == 'yes') {
                                         $status = 'suspended';
                                         $spnd_action = 'unsuspend' ;
+                                        $spnd_confirmation = 'UNSUSPEND_MAIL_ACCOUNT_CONFIRMATION' ;
                                     } else {
                                         $status = 'active';
                                         $spnd_action = 'suspend';
+                                        $spnd_confirmation = 'SUSPEND_MAIL_ACCOUNT_CONFIRMATION' ;
                                     }
                             ?>
 
@@ -66,7 +68,7 @@
                                             <?php print _('delete');?> 
                                             <input type="hidden" name="delete_url" value="/delete/mail/?domain=<?php echo $_GET['domain'] ?>&account=<?php echo $key ?>" />
                                             <div id="delete_dialog_<?php echo $i ?>" class="confirmation-text-delete hidden" title="<?php print _('Confirmation');?>">
-                                                <p class="counter-value"><?php print _('MAIL_ACCOUNT_ACTION_CONFIRMATION',_('delete'),$key);?></p>
+                                                <p class="counter-value"><?php print _('DELETE_MAIL_ACCOUNT_CONFIRMATION',$key);?></p>
                                             </div>
                                         </span>
                                     </a>
@@ -76,7 +78,7 @@
                                             <?php echo _($spnd_action); ?> 
                                             <input type="hidden" name="<?php echo $spnd_action ?>_url" value="/<?php echo $spnd_action ?>/mail/?domain=<?php echo $_GET['domain'] ?>&account=<?php echo $key ?>" />
                                             <div id="<?php echo $spnd_action ?>_dialog_<?php echo $i ?>" class="confirmation-text-suspention hidden" title="<?php print _('Confirmation');?>">
-                                                <p class="counter-value"><?php print _('MAIL_ACCOUNT_ACTION_CONFIRMATION',_($spnd_action),$key);?></p>
+                                                <p class="counter-value"><?php print _($spnd_confirmation,$key);?></p>
                                             </div>
                                         </span>
                                     </a>

web/templates/admin/list_packages.html

@@ -48,7 +48,7 @@
                                             <?php print _('delete');?> 
                                             <input type="hidden" name="delete_url" value="/delete/package/?package=<?php echo "$key" ?>" />
                                             <div id="delete_dialog_<?php echo $i ?>" class="confirmation-text-delete hidden" title="<?php print _('Confirmation');?>">
-                                                <p class="counter-value"><?php print _('PACKAGE_DELETE_CONFIRMATION',$key);?></p>
+                                                <p class="counter-value"><?php print _('DELETE_PACKAGE_CONFIRMATION',$key);?></p>
                                             </div>
                                         </span>
                                     </a>

web/templates/admin/list_user.html

@@ -50,9 +50,11 @@
                                     if ($data[$key]['SUSPENDED'] == 'yes') {
                                         $status = 'suspended';
                                         $spnd_action = 'unsuspend' ;
+                                        $spnd_confirmation = 'UNSUSPEND_USER_CONFIRMATION' ;
                                     } else {
                                         $status = 'active';
                                         $spnd_action = 'suspend' ;
+                                        $spnd_confirmation = 'SUSPEND_USER_CONFIRMATION' ;
                                     }
                                 ?> 
                             <tr class="data-row">
@@ -70,7 +72,7 @@
                                             <?php print _('delete');?> 
                                             <input type="hidden" name="delete_url" value="/delete/user/?user=<?php echo $key ?>" />
                                             <div id="delete_dialog_<?php echo $i ?>" class="confirmation-text-delete hidden" title="<?php print _('Confirmation');?>">
-                                                <p class="counter-value"><?php print _('USER_ACTION_CONFIRMATION',_('delete'),$key);?></p>
+                                                <p class="counter-value"><?php print _('DELETE_USER_CONFIRMATION',$key);?></p>
                                             </div>
                                         </span>
                                     </a>
@@ -80,7 +82,7 @@
                                             <?php echo _($spnd_action); ?> 
                                             <input type="hidden" name="<?php echo $spnd_action ?>_url" value="/<?php echo $spnd_action ?>/user/?user=<?php echo $key ?>" />
                                             <div id="<?php echo $spnd_action ?>_dialog_<?php echo $i ?>" class="confirmation-text-suspention hidden" title="<?php print _('Confirmation');?>">
-                                                <p class="counter-value"><?php print _('USER_ACTION_CONFIRMATION',_($spnd_action),$key);?></p>
+                                                <p class="counter-value"><?php print _($spnd_confirmation,$key);?></p>
                                             </div>
                                         </span>
                                     </a>

web/templates/admin/list_web.html

@@ -36,9 +36,11 @@
                                     if ($data[$key]['SUSPENDED'] == 'yes') {
                                         $status = 'suspended';
                                         $spnd_action = 'unsuspend' ;
+                                        $spnd_confirmation = 'UNSUSPEND_DOMAIN_CONFIRMATION' ;
                                     } else {
                                         $status = 'active';
                                         $spnd_action = 'suspend' ;
+                                        $spnd_confirmation = 'SUSPEND_DOMAIN_CONFIRMATION' ;
                                     }
                                     if (!empty($data[$key]['SSL_HOME'])) {
                                         if ($data[$key]['SSL_HOME'] == 'same') {
@@ -87,7 +89,7 @@
                                              <?php print _('delete');?> 
                                             <input type="hidden" name="delete_url" value="/delete/web/?domain=<?php echo $key ?>" />
                                             <div id="delete_dialog_<?php echo $i ?>" class="confirmation-text-delete hidden" title="<?php print _('Confirmation');?>">
-                                                <p class="counter-value"><?php print _('DOMAIN_ACTION_CONFIRMATION',_('delete'),$key);?></p>
+                                                <p class="counter-value"><?php print _('DELETE_DOMAIN_CONFIRMATION',$key);?></p>
                                             </div>
                                         </span>
                                     </a>
@@ -97,7 +99,7 @@
                                             <?php echo _($spnd_action); ?> 
                                             <input type="hidden" name="<?php echo $spnd_action ?>_url" value="/<?php echo $spnd_action ?>/web/?domain=<?php echo $key ?>" />
                                             <div id="<?php echo $spnd_action ?>_dialog_<?php echo $i ?>" class="confirmation-text-suspention hidden" title="<?php print _('Confirmation');?>">
-                                                <p class="counter-value"><?php print _('DOMAIN_ACTION_CONFIRMATION',_($spnd_action),$key);?></p>
+                                                <p class="counter-value"><?php print _($spnd_confirmation,$key);?></p>
                                             </div>
                                         </span>
                                     </a>

web/templates/user/list_cron.html

@@ -56,7 +56,7 @@
                                             <?php print _('delete');?> 
                                             <input type="hidden" name="delete_url" value="/delete/cron/?job=<?php echo $data[$key]['JOB']; ?>" />
                                             <div id="delete_dialog_<?php echo $i ?>" class="confirmation-text-delete hidden" title="<?php print _('Confirmation');?>">
-                                                <p class="counter-value"><?php print _('CRON_ACTION_CONFIRMATION',_('delete'));?></p>
+                                                <p class="counter-value"><?php print _('DELETE_CRON_CONFIRMATION');?></p>
                                             </div>
                                         </span>
                                     </a>

web/templates/user/list_db.html

@@ -60,7 +60,7 @@
                                             <?php echo _('delete') ?> 
                                             <input type="hidden" name="delete_url" value="/delete/db/?database=<?php echo "$key" ?>" />
                                             <div id="delete_dialog_<?php echo $i ?>" class="confirmation-text-delete hidden" title="<?php print _('Confirmation');?>">
-                                                <p class="counter-value"><?php print _('DATABASE_ACTION_CONFIRMATION',_('delete'),$key);?></p>
+                                                <p class="counter-value"><?php print _('DELETE_DATABASE_CONFIRMATION',$key);?></p>
                                             </div>
                                         </span>
                                     </a>

web/templates/user/list_dns.html

@@ -54,7 +54,7 @@
                                             <?php print _('delete');?> 
                                             <input type="hidden" name="delete_url" value="/delete/dns/?domain=<?php echo $key ?>" />
                                             <div id="delete_dialog_<?php echo $i ?>" class="confirmation-text-delete hidden" title="<?php print _('Confirmation');?>">
-                                                <p class="counter-value"><?php print _('DOMAIN_ACTION_CONFIRMATION',_('delete'),$key);?></p>
+                                                <p class="counter-value"><?php print _('DELETE_DOMAIN_CONFIRMATION',$key);?></p>
                                             </div>
                                         </span>
                                     </a>

web/templates/user/list_dns_rec.html

@@ -61,7 +61,7 @@
                                                 <?php print _('delete');?>
                                                 <input type="hidden" name="delete_url" value="/delete/dns/?domain=<?php echo $_GET['domain'] ?>&record_id=<?php echo $data[$key]['ID'] ?>" />
                                                 <div id="delete_dialog_<?php echo $i ?>" class="confirmation-text-delete hidden" title="<?php print _('Confirmation');?>">
-                                                    <p class="counter-value"><?php print _('RECORD_ACTION_CONFIRMATION',_('delete'),$data[$key]['RECORD']);?></p>
+                                                    <p class="counter-value"><?php print _('DELETE_RECORD_CONFIRMATION',$data[$key]['RECORD']);?></p>
                                                 </div>
                                             </span>
                                         </a>

web/templates/user/list_mail.html

@@ -58,7 +58,7 @@
                                             <?php print _('delete');?> 
                                             <input type="hidden" name="delete_url" value="/delete/mail/?domain=<?php echo $key ?>" />
                                             <div id="delete_dialog_<?php echo $i ?>" class="confirmation-text-delete hidden" title="<?php print _('Confirmation');?>">
-                                                <p class="counter-value"><?php print _('DOMAIN_ACTION_CONFIRMATION',_('delete'),$key);?></p>
+                                                <p class="counter-value"><?php print _('DELETE_DOMAIN_CONFIRMATION',$key);?></p>
                                             </div>
                                         </span>
                                     </a>

web/templates/user/list_mail_acc.html

@@ -65,7 +65,7 @@
                                             <?php print _('delete');?> 
                                             <input type="hidden" name="delete_url" value="/delete/mail/?domain=<?php echo $_GET['domain'] ?>&account=<?php echo $key ?>" />
                                             <div id="delete_dialog_<?php echo $i ?>" class="confirmation-text-delete hidden" title="<?php print _('Confirmation');?>">
-                                                <p class="counter-value"><?php print _('MAIL_ACCOUNT_ACTION_CONFIRMATION',_('delete'),$key);?></p>
+                                                <p class="counter-value"><?php print _('DELETE_MAIL_ACCOUNT_CONFIRMATION',$key);?></p>
                                             </div>
                                         </span>
                                     </a>

web/templates/user/list_search.html

@@ -47,23 +47,23 @@
                                     <?php
                                         if ($data[$key]['KEY'] == 'RECORD') {
                                             $delete_lnk = '/delete/'.$data[$key]['TYPE'].'/?domain='.$data[$key]['PARENT'].'&record_id='.$data[$key]['LINK'].'&user='.$data[$key]['USER'];
-                                            $cnfrm = 'RECORD_ACTION_CONFIRMATION';
+                                            $cnfrm = 'DELETE_RECORD_CONFIRMATION';
                                         }
                                         if ($data[$key]['KEY'] == 'ACCOUNT') {
                                             $delete_lnk = '/delete/'.$data[$key]['TYPE'].'/?domain='.$data[$key]['PARENT'].'&account='.$data[$key]['LINK'].'&user='.$data[$key]['USER'];
-                                            $cnfrm = 'USER_ACTION_CONFIRMATION';
+                                            $cnfrm = 'DELETE_USER_CONFIRMATION';
                                         }
                                         if ($data[$key]['KEY'] == 'JOB') {
                                             $delete_lnk = '/delete/'.$data[$key]['TYPE'].'/?job='.$data[$key]['LINK'].'&user='.$data[$key]['USER'];
-                                            $cnfrm = 'CRON_ACTION_CONFIRMATION';
+                                            $cnfrm = 'DELETE_CRON_CONFIRMATION';
                                         }
                                         if ($data[$key]['KEY'] == 'DATABASE') {
                                             $delete_lnk = '/delete/'.$data[$key]['TYPE'].'/?database='.$data[$key]['RESULT'].'&user='.$data[$key]['USER'];
-                                            $cnfrm = 'DATABASE_ACTION_CONFIRMATION';
+                                            $cnfrm = 'DELETE_DATABASE_CONFIRMATION';
                                         }
                                         if (($data[$key]['KEY'] != 'RECORD') && ($data[$key]['KEY'] != 'ACCOUNT') && ($data[$key]['KEY'] != 'JOB') && ($data[$key]['KEY'] != 'DATABASE') ) {
                                             $delete_lnk = '/delete/'.$data[$key]['TYPE'].'/?'.strtolower($data[$key]['KEY']).'='.$data[$key]['RESULT'].'&user='.$data[$key]['USER'];
-                                            $cnfrm = 'DOMAIN_ACTION_CONFIRMATION';
+                                            $cnfrm = 'DELETE_DOMAIN_CONFIRMATION';
                                         }
                                     ?> 
                                     <a id="delete_link_<?php echo $i ?>" class="do_delete">
@@ -72,7 +72,7 @@
                                             <?php print _('delete');?> 
                                             <input type="hidden" name="delete_url" value="<?php echo $delete_lnk; ?>" />
                                             <div id="delete_dialog_<?php echo $i ?>" class="confirmation-text-delete hidden" title="Confirmation">
-                                                <p class="counter-value"><?php print _($cnfrm,_('delete'),$data[$key]['RESULT']);?></p>
+                                                <p class="counter-value"><?php print _($cnfrm,$data[$key]['RESULT']);?></p>
                                             </div>
                                         </span>
                                     </a>

web/templates/user/list_web.html

@@ -86,7 +86,7 @@
                                              <?php print _('delete');?>
                                             <input type="hidden" name="delete_url" value="/delete/web/?domain=<?php echo $key ?>" />
                                             <div id="delete_dialog_<?php echo $i ?>" class="confirmation-text-delete hidden" title="<?php print _('Confirmation');?>">
-                                                <p class="counter-value"><?php print _('DOMAIN_ACTION_CONFIRMATION',_('delete'),$key);?></p>
+                                                <p class="counter-value"><?php print _('DELETE_DOMAIN_CONFIRMATION',$key);?></p>
                                             </div>
                                         </span>
                                     </a>