From 422d552cc82604aea5962e2bf6868db69c812c56 Mon Sep 17 00:00:00 2001
From: ZonD Eighty <zond80@gmail.com>
Date: Wed, 16 Jan 2013 17:03:41 +0400
Subject: [PATCH] Translation fixes 1

---
 web/add/db/index.php               | 4 +++-
 web/inc/i18n/en.php                | 2 ++
 web/inc/i18n/ru.php                | 4 +++-
 web/templates/admin/add_web.html   | 4 ++--
 web/templates/admin/edit_mail.html | 2 +-
 web/templates/admin/list_user.html | 2 +-
 web/templates/user/add_web.html    | 4 ++--
 7 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/web/add/db/index.php b/web/add/db/index.php
index 1438f953..9f14d25f 100644
--- a/web/add/db/index.php
+++ b/web/add/db/index.php
@@ -66,7 +66,8 @@ if (!empty($_POST['ok'])) {
                 $_SESSION['error_msg'] = $error;
                 unset($v_password);
                 unset($output);
-            } else {
+            }
+            else {
             if (empty($v_notify)) {
                 list($http_host, $port) = explode(':', $_SERVER["HTTP_HOST"]);
                 if ($_POST['v_type'] == 'mysql') $db_admin_link = "http://".$http_host."/phpMyAdmin/";
@@ -93,6 +94,7 @@ if (!empty($_POST['ok'])) {
         }
     }
 }
+}
 exec (VESTA_CMD."v-list-database-types 'json'", $output, $return_var);
 $db_types = json_decode(implode('', $output), true);
 unset($output);
diff --git a/web/inc/i18n/en.php b/web/inc/i18n/en.php
index 81b754f1..554243f3 100644
--- a/web/inc/i18n/en.php
+++ b/web/inc/i18n/en.php
@@ -340,6 +340,8 @@ $LANG = array(
     'SERVICE_ACTION_FAILED'=>'Error: Oparaion "%s" for service "%s" has been failed',
     'Memory Usage'=>'Memory Usage',
     'Bandwidth Usage'=>'Bandwidth Usage',
+    'IP Address'=>'IP Address',
+    'Accounts'=>'Accounts',
 );
 
 /*error_reporting(E_ALL);
diff --git a/web/inc/i18n/ru.php b/web/inc/i18n/ru.php
index a8f0dccc..63678cc5 100644
--- a/web/inc/i18n/ru.php
+++ b/web/inc/i18n/ru.php
@@ -38,6 +38,7 @@ $LANG = array(
     'DOMAIN_CREATED_OK'=>'Успех: Домен <a href="/list/dns/?domain=%s"><b>%s</b></a> успешно создан.',
     'RECORD_CREATED_OK'=>'Успех: Запись <b>%s.%s</b> успешно создана.',
     'ip address'=>'IP-адрес',
+    'IP Address'=>'IP-адрес',
     'netmask'=>'маска подсети',
     'Netmask'=>'Маска подсети',
     'interface'=>'интерфейс',
@@ -63,6 +64,7 @@ $LANG = array(
     'dns records'=>'DNS записи',
     'mail domains'=>'домены с почтой',
     'mail accounts'=>'почтовые аккаунты',
+    'Accounts'=>'Аккаунты',
     'Mail Domains'=>'Домены с Почтой',
     'Mail Accounts'=>'Почтовые Аккаунты',
     'accounts'=>'аккаунты',
@@ -177,7 +179,7 @@ $LANG = array(
     'Packages'=>'Пакеты',
     'IP Addresses'=>'IP адреса',
     'RRD Graphics'=>'Графики',
-    'jobs'=>'Задания',
+    'jobs'=>'задания',
     'Reset Code'=>'Код сброса',
     'disk'=>'место',
     'Disk'=>'Место',
diff --git a/web/templates/admin/add_web.html b/web/templates/admin/add_web.html
index 531dfbe1..37ee76eb 100644
--- a/web/templates/admin/add_web.html
+++ b/web/templates/admin/add_web.html
@@ -264,7 +264,7 @@
                                     </tr>
                                     <tr>
                                         <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                            <?php print _('Statisitcs');?>
+                                            <?php print _('Statistics');?>
                                         </td>
                                     </tr>
                                     <tr>
@@ -286,7 +286,7 @@
                                     </tr>
                                     <tr>
                                         <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                            <?php print _('Statisitcs Authorization');?>
+                                            <?php print _('Statistics Authorization');?>
                                         </td>
                                     </tr>
                                     <tr>
diff --git a/web/templates/admin/edit_mail.html b/web/templates/admin/edit_mail.html
index 4cc95658..9a1c4048 100644
--- a/web/templates/admin/edit_mail.html
+++ b/web/templates/admin/edit_mail.html
@@ -33,7 +33,7 @@
                                     <table class="data-col1">
                                         <tr><td style="padding: 24px 0 2px 4px;"><a class="data-date" ?><?php echo date("d M Y", strtotime($v_date))?></a></td></tr>
                                         <tr><td style="padding: 0 0 6px 4px;"><a class="data-date" ?><?php echo $v_time?></a></td></tr>
-                                        <tr><td style="padding: 0 0 0 21px;" class="data-<?php echo $v_status ?>"><b><?php echo $v_status ?></b></td></tr>
+                                        <tr><td style="padding: 0 0 0 21px;" class="data-<?php echo $v_status ?>"><b><?php echo _($v_status); ?></b></td></tr>
                                     </table>
                                 </td>
                                 <td class="data-dotted" width="830px" style="vertical-align:top;">
diff --git a/web/templates/admin/list_user.html b/web/templates/admin/list_user.html
index 9c22513b..df16bf65 100644
--- a/web/templates/admin/list_user.html
+++ b/web/templates/admin/list_user.html
@@ -71,7 +71,7 @@
                                             <td class="data-controls" width="70px">
                                                 <?php
                                                     if ($key == $user) {
-                                                        echo "<a href=\"/logout/\"><img src=\"/images/login-as.png\" width=\"7px\" height=\"8px\"> <?php print _('logout');?></a>";
+                                                        echo "<a href=\"/logout/\"><img src=\"/images/login-as.png\" width=\"7px\" height=\"8px\"> ". _('logout')."</a>";
                                                         if (!empty($_SESSION['look_alert'])) {
                                                 ?> 
                                                     <script type="text/javascript">
diff --git a/web/templates/user/add_web.html b/web/templates/user/add_web.html
index 99f1c6fd..e246b36b 100644
--- a/web/templates/user/add_web.html
+++ b/web/templates/user/add_web.html
@@ -254,7 +254,7 @@
                                     </tr>
                                     <tr>
                                         <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                            <?php print _('Statisitcs');?>
+                                            <?php print _('Statistics');?>
                                         </td>
                                     </tr>
                                     <tr>
@@ -276,7 +276,7 @@
                                     </tr>
                                     <tr>
                                         <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                            <?php print _('Statisitcs Authorization');?>
+                                            <?php print _('Statistics Authorization');?>
                                         </td>
                                     </tr>
                                     <tr>