From 0e84a0f42e509d5eeb6abafa93e2376915a9ac45 Mon Sep 17 00:00:00 2001
From: Ionescu Bogdan <ionescu-bogdan@users.noreply.github.com>
Date: Fri, 4 Dec 2015 22:44:41 +0200
Subject: [PATCH 1/4] Update add_package.html

---
 web/templates/admin/add_package.html | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/web/templates/admin/add_package.html b/web/templates/admin/add_package.html
index ec4e675c..16dbf529 100644
--- a/web/templates/admin/add_package.html
+++ b/web/templates/admin/add_package.html
@@ -302,20 +302,20 @@
                             <tr>
                                 <td>
                                     <input type="text" size="20" class="vst-input" name="v_ns1" <?php if (!empty($v_ns1)) echo "value=".htmlentities($v_ns1); ?>>
-                                    <span class="remove-ns additional-control delete">delete</span>
+                                    <span class="remove-ns additional-control delete"><?= __('delete') ?></span>
                                 </td>
                             </tr>
                             <tr>
                                 <td>
                                     <input type="text" size="20" class="vst-input" name="v_ns2" <?php if (!empty($v_ns2)) echo "value=".htmlentities($v_ns2); ?>>
-                                    <span class="remove-ns additional-control delete">delete</span>
+                                    <span class="remove-ns additional-control delete"><?= __('delete') ?></span>
                                 </td>
                             </tr>
                             <?  if($v_ns3)
                                   echo '<tr>
                                     <td>
                                         <input type="text" size="20" class="vst-input" name="v_ns3" value="'.htmlentities($v_ns3).'">
-                                        <span class="remove-ns additional-control delete">delete</span>
+                                        <span class="remove-ns additional-control delete">'.__('delete').'</span>
                                     </td>
                                 </tr>';
 
@@ -323,7 +323,7 @@
                                   echo '<tr>
                                     <td>
                                         <input type="text" size="20" class="vst-input" name="v_ns4" value="'.htmlentities($v_ns4).'">
-                                        <span class="remove-ns additional-control delete">delete</span>
+                                        <span class="remove-ns additional-control delete">'.__('delete').'</span>
                                     </td>
                                 </tr>';
 
@@ -331,7 +331,7 @@
                                   echo '<tr>
                                     <td>
                                         <input type="text" size="20" class="vst-input" name="v_ns5" value="'.htmlentities($v_ns5).'">
-                                        <span class="remove-ns additional-control delete">delete</span>
+                                        <span class="remove-ns additional-control delete">'.__('delete').'</span>
                                     </td>
                                 </tr>';
 
@@ -339,7 +339,7 @@
                                   echo '<tr>
                                     <td>
                                         <input type="text" size="20" class="vst-input" name="v_ns6" value="'.htmlentities($v_ns6).'">
-                                        <span class="remove-ns additional-control delete">delete</span>
+                                        <span class="remove-ns additional-control delete">'.__('delete').'</span>
                                     </td>
                                 </tr>';
 
@@ -347,7 +347,7 @@
                                   echo '<tr>
                                     <td>
                                         <input type="text" size="20" class="vst-input" name="v_ns7" value="'.htmlentities($v_ns7).'">
-                                        <span class="remove-ns additional-control delete">delete</span>
+                                        <span class="remove-ns additional-control delete">'.__('delete').'</span>
                                     </td>
                                 </tr>';
 
@@ -355,13 +355,13 @@
                                   echo '<tr>
                                     <td>
                                         <input type="text" size="20" class="vst-input" name="v_ns8" value="'.htmlentities($v_ns8).'">
-                                        <span class="remove-ns additional-control delete">delete</span>
+                                        <span class="remove-ns additional-control delete">'.__('delete').'</span>
                                     </td>
                                 </tr>';
                             ?>
                                 <tr class="add-ns" <? if($v_ns8) echo 'style="display:none;"'; ?> >
                                     <td class="step-top-small">
-                                      <span class="add-ns-button additional-control add">Add one more Name Server</span>
+                                      <span class="add-ns-button additional-control add"><?= __('Add one more Name Server') ?></span>
                                     </td>
                                 </tr>
                         </table>
@@ -410,4 +410,4 @@
                 })
 
             });
-        </script>
\ No newline at end of file
+        </script>

From 955d076f1e0d59753245b9e8901b7a90b59553d7 Mon Sep 17 00:00:00 2001
From: Ionescu Bogdan <ionescu-bogdan@users.noreply.github.com>
Date: Fri, 4 Dec 2015 22:54:55 +0200
Subject: [PATCH 2/4] Update edit_package.html

---
 web/templates/admin/edit_package.html | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/web/templates/admin/edit_package.html b/web/templates/admin/edit_package.html
index 6082af05..bbdcba30 100644
--- a/web/templates/admin/edit_package.html
+++ b/web/templates/admin/edit_package.html
@@ -42,7 +42,7 @@
                                     <a class="data-date"><?=$v_time?></a>
                                 </td>
                             </tr>
-                            <tr><td class="data-<?php echo $v_status ?>"><b><?php echo $v_status ?></b></td></tr>
+                            <tr><td class="data-<?php echo $v_status ?>"><b><?= __($v_status) ?></b></td></tr>
                         </table>
                     </td>
                     <td class="data-dotted">
@@ -305,13 +305,13 @@
                             <tr>
                                 <td>
                                     <input type="text" size="20" class="vst-input" name="v_ns1" <?php if (!empty($v_ns1)) echo "value=".htmlentities($v_ns1); ?>>
-                                    <span class="remove-ns additional-control delete">delete</span>
+                                    <span class="remove-ns additional-control delete"><?= __('delete') ?></span>
                                 </td>
                             </tr>
                             <tr>
                                 <td>
                                     <input type="text" size="20" class="vst-input" name="v_ns2" <?php if (!empty($v_ns2)) echo "value=".htmlentities($v_ns2); ?>>
-                                    <span class="remove-ns additional-control delete">delete</span>
+                                    <span class="remove-ns additional-control delete"><?= __('delete') ?></span>
                                 </td>
                             </tr>
 
@@ -319,7 +319,7 @@
                                   echo '<tr>
                                     <td>
                                         <input type="text" size="20" class="vst-input" name="v_ns3" value="'.htmlentities($v_ns3).'">
-                                        <span class="remove-ns additional-control delete">delete</span>
+                                        <span class="remove-ns additional-control delete">'.__('delete').'</span>
                                     </td>
                                 </tr>';
 
@@ -327,7 +327,7 @@
                                   echo '<tr>
                                     <td>
                                         <input type="text" size="20" class="vst-input" name="v_ns4" value="'.htmlentities($v_ns4).'">
-                                        <span class="remove-ns additional-control delete">delete</span>
+                                        <span class="remove-ns additional-control delete">'.__('delete').'</span>
                                     </td>
                                 </tr>';
 
@@ -335,7 +335,7 @@
                                   echo '<tr>
                                     <td>
                                         <input type="text" size="20" class="vst-input" name="v_ns5" value="'.htmlentities($v_ns5).'">
-                                        <span class="remove-ns additional-control delete">delete</span>
+                                        <span class="remove-ns additional-control delete">'.__('delete').'</span>
                                     </td>
                                 </tr>';
 
@@ -343,7 +343,7 @@
                                   echo '<tr>
                                     <td>
                                         <input type="text" size="20" class="vst-input" name="v_ns6" value="'.htmlentities($v_ns6).'">
-                                        <span class="remove-ns additional-control delete">delete</span>
+                                        <span class="remove-ns additional-control delete">'.__('delete').'</span>
                                     </td>
                                 </tr>';
 
@@ -351,7 +351,7 @@
                                   echo '<tr>
                                     <td>
                                         <input type="text" size="20" class="vst-input" name="v_ns7" value="'.htmlentities($v_ns7).'">
-                                        <span class="remove-ns additional-control delete">delete</span>
+                                        <span class="remove-ns additional-control delete">'.__('delete').'</span>
                                     </td>
                                 </tr>';
 
@@ -359,14 +359,14 @@
                                   echo '<tr>
                                     <td>
                                         <input type="text" size="20" class="vst-input" name="v_ns8" value="'.htmlentities($v_ns8).'">
-                                        <span class="remove-ns additional-control delete">delete</span>
+                                        <span class="remove-ns additional-control delete">'.__('delete').'</span>
                                     </td>
                                 </tr>';
                                 ?>
 
                                 <tr class="add-ns" <? if($v_ns8) echo 'style="display:none;"'; ?> >
                                     <td class="step-top-small">
-                                      <span class="add-ns-button additional-control add">Add one more Name Server</span>
+                                      <span class="add-ns-button additional-control add"><?= __('Add one more Name Server') ?></span>
                                     </td>
                                 </tr>
 
@@ -416,4 +416,4 @@
                 })
 
             });
-    </script>
\ No newline at end of file
+    </script>

From 95538111b9b7cb7fc0714da46ea3b12e053b7f7d Mon Sep 17 00:00:00 2001
From: Ionescu Bogdan <ionescu-bogdan@users.noreply.github.com>
Date: Fri, 4 Dec 2015 22:57:23 +0200
Subject: [PATCH 3/4] Update list_mail.html

---
 web/templates/admin/list_mail.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/templates/admin/list_mail.html b/web/templates/admin/list_mail.html
index 73ee54e1..2e1cf5de 100644
--- a/web/templates/admin/list_mail.html
+++ b/web/templates/admin/list_mail.html
@@ -78,7 +78,7 @@
           } else {
             $status = 'active';
             $spnd_action = 'suspend' ;
-            $spnd_confirmation = 'UNSUSPEND_DOMAIN_CONFIRMATION' ;
+            $spnd_confirmation = 'SUSPEND_DOMAIN_CONFIRMATION' ;
           }
           if (empty($data[$key]['CATCHALL'])) {
             $data[$key]['CATCHALL'] = '/dev/null';

From 28841c5c9dc6e5d1473d77e4a8b7be0ec2079d35 Mon Sep 17 00:00:00 2001
From: Ionescu Bogdan <ionescu-bogdan@users.noreply.github.com>
Date: Fri, 4 Dec 2015 23:01:58 +0200
Subject: [PATCH 4/4] Update add_firewall_banlist.html

---
 web/templates/admin/add_firewall_banlist.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/templates/admin/add_firewall_banlist.html b/web/templates/admin/add_firewall_banlist.html
index 9c09d8da..ddea27db 100644
--- a/web/templates/admin/add_firewall_banlist.html
+++ b/web/templates/admin/add_firewall_banlist.html
@@ -72,7 +72,7 @@
                             </tr>
                             <tr>
                                 <td class="vst-text input-label">
-                                    <?php print __('IP address');?> <span class="optional">(<?php print __('CDIR format is supported');?>)</span>
+                                    <?php print __('IP address');?> <span class="optional">(<?php print __('CIDR format is supported');?>)</span>
                                 </td>
                             </tr>
                             <tr>
@@ -95,4 +95,4 @@
                 </tr>
             </table>
         </from>
-      </div>
\ No newline at end of file
+      </div>