Merge branch 'master' of github.com:serghey-rodin/vesta

bin/v-add-letsencrypt-domain

@@ -190,7 +190,7 @@ for auth in $authz; do
         nonce=$(echo "$answer" |grep Nonce |cut -f2 -d \ |tr -d '\r\n')
         status=$(echo "$answer"|grep HTTP/1.1 |tail -n1 |cut -f 2 -d ' ')
         if [[ "$status" -ne 200 ]]; then
-            check_result $E_CONNECT "Let's Encrypt vvalidation status $status"
+            check_result $E_CONNECT "Let's Encrypt validation status $status"
         fi
 
         i=$((i + 1))

web/inc/i18n/de.php

@@ -214,7 +214,7 @@ $LANG['de'] = array(
     'Quota'  => 'Kontingent',
     'Autoreply'  => 'Autoreply',
     'Forward to'  => 'Weiterleiten zu',
-    'Do not store forwarded mail' => 'Weiterleitungs Adresse nicht speichern',
+    'Do not store forwarded mail' => 'Weitergeleitete E-Mails nicht speichern',
     'IMAP hostname'  => 'IMAP hostname',
     'IMAP port'  => 'IMAP port',
     'IMAP security'  => 'IMAP security',

web/templates/admin/edit_server.html

@@ -790,7 +790,7 @@
                                                                     <a href="https://vestacp.com/checkout/2co.php?product_id=6&referer='.$_SERVER['HTTP_HOST'].'" class="purchase">'.__('Buy Licence').' 3$/'.__('month').'</a>
                                                                 </li>
                                                                 <li>
-                                                                    <a href="https://vestacp.com/checkout/2co.php?product_id=9&referer='.$_SERVER['HTTP_HOST'].'" class="purchase">'.__('Buy Lifetime License').' 18$</a>
+                                                                    <a href="https://vestacp.com/checkout/2co.php?product_id=9&referer='.$_SERVER['HTTP_HOST'].'" class="purchase">'.__('Buy Lifetime License').' 21$</a>
                                                                 </li>
                                                             </ul>
                                                             <span class="twoco">2Checkout.com Inc. (Ohio, USA) is a payment facilitator for goods and services provided by vestacp.com.</span>';
@@ -835,10 +835,10 @@
                                                             </div>
                                                             <ul>
                                                                 <li>
-                                                                    <a href="https://vestacp.com/checkout/2co.php?product_id=7&referer='.$_SERVER['HTTP_HOST'].'" class="purchase">'.__('Buy Licence').' 5$/'.__('month').'</a>
+                                                                    <a href="https://vestacp.com/checkout/2co.php?product_id=7&referer='.$_SERVER['HTTP_HOST'].'" class="purchase">'.__('Buy Licence').' 3$/'.__('month').'</a>
                                                                 </li>
                                                                 <li>
-                                                                    <a href="https://vestacp.com/checkout/2co.php?product_id=8&referer='.$_SERVER['HTTP_HOST'].'" class="purchase">'.__('Buy Lifetime License').' 50$</a>
+                                                                    <a href="https://vestacp.com/checkout/2co.php?product_id=8&referer='.$_SERVER['HTTP_HOST'].'" class="purchase">'.__('Buy Lifetime License').' 28$</a>
                                                                 </li>
                                                             </ul>
                                                             <span class="twoco">2Checkout.com Inc. (Ohio, USA) is a payment facilitator for goods and services provided by vestacp.com.</span>';