mirror of
https://github.com/myvesta/vesta
synced 2025-07-16 10:03:23 -07:00
Merge branch 'master' of github.com:serghey-rodin/vesta
This commit is contained in:
Serghey Rodin
commit
c10c6598d2
4 changed files with 66 additions and 59 deletions
|
|
@ -91,7 +91,7 @@ sed -i "/ $user$/d" $VESTA/data/queue/traffic.pipe
|
|||
|
||||
# Deleting system user
|
||||
/usr/sbin/userdel -f $user >> /dev/null 2>&1
|
||||
/usr/sbin/userdel -f $user >> /dev/null 2>&1
|
||||
|
||||
if [ "$?" != 0 ]; then
|
||||
sed -i "/^$user:/d" /etc/passwd
|
||||
sed -i "/^$user:/d" /etc/shadow
|
||||
|
|
|
|||
|
|
@ -783,11 +783,6 @@ validate_format_common() {
|
|||
exit $E_INVALID
|
||||
fi
|
||||
if [[ $1 =~ \* ]]; then
|
||||
if [[ ! $1 =~ \*$ ]]; then
|
||||
echo "Error: * can be used only at the end"
|
||||
log_event "$E_INVALID" "$EVENT"
|
||||
exit $E_INVALID
|
||||
fi
|
||||
if [ "$(echo $1 | grep -o '*'|wc -l)" -gt 1 ]; then
|
||||
log_event "$E_INVALID" "$EVENT"
|
||||
echo "Error: * can be used only once"
|
||||
|
|
|
|||
|
|
@ -40,9 +40,9 @@ $LANG['de'] = array(
|
|||
'Add Package' => 'Paket erstellen',
|
||||
'Add IP' => 'IP hinzufügen',
|
||||
'Add Rule' => 'Regel hinzufügen',
|
||||
'Ban IP Address' => 'Blockieren IP',
|
||||
'Ban IP Address' => 'IP blockieren',
|
||||
'Search' => 'Suche',
|
||||
'Add one more FTP Account' => 'Fügen Sie eine weitere FTP-Konto',
|
||||
'Add one more FTP Account' => 'Ein weiteres FTP-Konto hinzufügen',
|
||||
'Overall Statistics' => 'Globale Statistik',
|
||||
'Daily' => 'Täglich',
|
||||
'Weekly' => 'Wöchentlich',
|
||||
|
|
@ -78,9 +78,9 @@ $LANG['de'] = array(
|
|||
'open webmail' => 'Webmail öffnen',
|
||||
'list fail2ban' => 'fail2ban',
|
||||
'open %s' => '%s öffnen',
|
||||
'download' => 'Reunterladen',
|
||||
'download' => 'Herunterladen',
|
||||
'restore' => 'Wiederherstellen',
|
||||
'configure restore settings' => 'Wiederherstellungs Einstellungen',
|
||||
'configure restore settings' => 'Wiederherstellungs-Einstellungen',
|
||||
'stop' => 'Anhalten',
|
||||
'start' => 'Starten',
|
||||
'restart' => 'Neustarten',
|
||||
|
|
@ -88,38 +88,38 @@ $LANG['de'] = array(
|
|||
'generate' => 'Generieren',
|
||||
'Generate CSR' => 'CSR generieren',
|
||||
'reread IP' => 'IP aktualisieren',
|
||||
'enable autoupdate' => 'autoupdate aktivieren',
|
||||
'disable autoupdate' => 'autoupdate deaktivieren',
|
||||
'turn on notifications' => 'benachrichtigung aktivieren',
|
||||
'turn off notifications' => 'benachrichtigungen abschalten',
|
||||
'enable autoupdate' => 'Autoupdate aktivieren',
|
||||
'disable autoupdate' => 'Autoupdate deaktivieren',
|
||||
'turn on notifications' => 'Benachrichtigungen aktivieren',
|
||||
'turn off notifications' => 'Benachrichtigungen deaktivieren',
|
||||
|
||||
'Adding User' => 'Benutzer anlegen',
|
||||
'Editing User' => 'Benutzer bearbeiten',
|
||||
'Adding Domain' => 'Domäne hinzufügen',
|
||||
'Editing Domain' => 'Domäne bearbeiten',
|
||||
'Adding DNS Domain' => 'Domäne hinzufügen',
|
||||
'Editing DNS Domain' => 'Domäne bearbeiten',
|
||||
'Adding DNS Record' => 'DNS Eintrag anlegen',
|
||||
'Editing DNS Record' => 'DNS Eintrag bearbeiten',
|
||||
'Adding Mail Domain' => 'Domäne hinzufügen',
|
||||
'Editing Mail Domain' => 'Domäne bearbeiten',
|
||||
'Adding Domain' => 'Domain hinzufügen',
|
||||
'Editing Domain' => 'Domain bearbeiten',
|
||||
'Adding DNS Domain' => 'Domain hinzufügen',
|
||||
'Editing DNS Domain' => 'Domain bearbeiten',
|
||||
'Adding DNS Record' => 'DNS-Eintrag anlegen',
|
||||
'Editing DNS Record' => 'DNS-Eintrag bearbeiten',
|
||||
'Adding Mail Domain' => 'Domain hinzufügen',
|
||||
'Editing Mail Domain' => 'Domain bearbeiten',
|
||||
'Adding Mail Account' => 'Konto hinzufügen',
|
||||
'Editing Mail Account' => 'Konto bearbeiten',
|
||||
'Adding database' => 'Datenbank hinzufügen',
|
||||
'Editing Cron Job' => 'Cron Job bearbeiten',
|
||||
'Adding Cron Job' => 'Cron Job hinzufügen',
|
||||
'Editing Database' => 'Datenbank bearbeiten',
|
||||
'Adding Package' => 'Packet hinzufügen',
|
||||
'Editing Package' => 'Packet bearbeiten',
|
||||
'Adding Package' => 'Paket hinzufügen',
|
||||
'Editing Package' => 'Paket bearbeiten',
|
||||
'Adding IP address' => 'IP hinzufügen',
|
||||
'Editing IP Address' => 'IP bearbeiten',
|
||||
'Editing Backup Exclusions' => 'Ausschlüsse bearbeiten',
|
||||
'Editing Backup Exclusions' => 'Backup-Ausschlüsse bearbeiten',
|
||||
'Generating CSR' => 'CSR generieren',
|
||||
'Listing' => 'Auflistung',
|
||||
'Search Results' => 'Suchergebnisse',
|
||||
'Adding Firewall Rule' => 'Hinzufügen von Firewall-Regel',
|
||||
'Editing Firewall Rule' => 'Bearbeiten von Firewall-Regel',
|
||||
'Adding IP Address to Banlist' => 'Hinzufügen von IP-Adresse der schwarzen Liste',
|
||||
'Adding IP Address to Banlist' => 'Hinzufügen von IP-Adresse zur schwarzen Liste',
|
||||
|
||||
'active' => 'Aktiv',
|
||||
'spnd' => 'Gesperrt',
|
||||
|
|
@ -143,7 +143,7 @@ $LANG['de'] = array(
|
|||
'hours' => 'Stunden',
|
||||
'minutes' => 'Minuten',
|
||||
'month' => 'Monat',
|
||||
'package' => 'Packet',
|
||||
'package' => 'Paket',
|
||||
'Bandwidth' => 'Datenvolumen',
|
||||
'Disk' => 'Speicher',
|
||||
'Web' => 'Web',
|
||||
|
|
@ -155,23 +155,22 @@ $LANG['de'] = array(
|
|||
'Backend Template' => 'Backend Template',
|
||||
'Proxy Template' =>'Proxy Template',
|
||||
'DNS Template' => 'DNS Template',
|
||||
'Web Domains' => 'Web Domäne',
|
||||
'SSL Domains' => 'SSL Domäne',
|
||||
'Web Domains' => 'Web Domains',
|
||||
'SSL Domains' => 'SSL Domains',
|
||||
'Web Aliases' => 'Web Aliase',
|
||||
'per domain' => 'pro Domäne',
|
||||
'DNS Domains' => 'DNS Domäne',
|
||||
'DNS Domains' => 'DNS Domäne',
|
||||
'per domain' => 'pro Domain',
|
||||
'DNS Domains' => 'DNS Domains',
|
||||
'DNS records' => 'DNS Einträge' ,
|
||||
'Name Servers' => 'Name Server',
|
||||
'Mail Domains' => 'Mail Domäne',
|
||||
'Mail Accounts' => 'Mail Konten',
|
||||
'Cron Jobs' => 'Cron Jobs',
|
||||
'SSH Access' => 'SSH Zugriff',
|
||||
'IP Addresses' => 'IP Adressen',
|
||||
'IP Addresses' => 'IP-Adressen',
|
||||
'Backups' => 'Backups',
|
||||
'Backup System' => 'Backup System',
|
||||
'backup exclusions' => 'ausschlüsse',
|
||||
'template' => 'template',
|
||||
'backup exclusions' => 'Ausschlüsse',
|
||||
'template' => 'Template',
|
||||
'SSL Support' => 'SSL Unterstützung',
|
||||
'SSL Home Directory' => 'SSL Homeverzeichnis',
|
||||
'Proxy Support' => 'Proxy Unterstützung',
|
||||
|
|
@ -232,7 +231,7 @@ $LANG['de'] = array(
|
|||
'CPU' => 'CPU',
|
||||
'Memory' => 'Arbeitsspeicher',
|
||||
'Uptime' => 'Betriebszeit',
|
||||
'core package' => 'Kern Packet',
|
||||
'core package' => 'Kern Paket',
|
||||
'php interpreter' => 'PHP Interpreter',
|
||||
'internal web server' => 'Interner Web Server',
|
||||
'Version' => 'Version',
|
||||
|
|
@ -243,14 +242,14 @@ $LANG['de'] = array(
|
|||
'Username' => 'Bentzername',
|
||||
'Password' => 'Passwort',
|
||||
'Email' => 'E-Mail',
|
||||
'Package' => 'Packet',
|
||||
'Package' => 'Paket',
|
||||
'Language' => 'Sprache',
|
||||
'First Name' => 'Vorname',
|
||||
'Last Name' => 'Nachname',
|
||||
'Send login credentials to email address' => 'Anmeldeinformationen an folgende Adresse senden',
|
||||
'Default Template' => 'Standard Template',
|
||||
'Default Name Servers' => 'Standard Name Server',
|
||||
'Domain' => 'Domäne',
|
||||
'Domain' => 'Domain',
|
||||
'DNS Support' => 'DNS Unterstützung',
|
||||
'Mail Support' => 'Mail Unterstützung',
|
||||
'Advanced options' => 'Erweiterte Optionen',
|
||||
|
|
@ -259,7 +258,7 @@ $LANG['de'] = array(
|
|||
'SSL Key' => 'SSL Schlüssel',
|
||||
'SSL Certificate Authority / Intermediate' => 'SSL Zertifikat Ersteller',
|
||||
'SSL CSR' => 'CSR-Anfrage',
|
||||
'optional' => 'Freiwillig',
|
||||
'optional' => 'optional',
|
||||
'internal' => 'Intern',
|
||||
'Statistics Authorization' => 'Statistik Autorisierung',
|
||||
'Statistics Auth' => 'Statistik Auth',
|
||||
|
|
@ -273,9 +272,9 @@ $LANG['de'] = array(
|
|||
'IP or Value' => 'IP oder Wert',
|
||||
'Priority' => 'Priorität',
|
||||
'Record Number' => 'Eintragsnummer',
|
||||
'in megabytes' => 'in Megabytes',
|
||||
'in megabytes' => 'in Megabyte',
|
||||
'Message' => 'Nachricht',
|
||||
'use local-part' => 'verwenden local-part',
|
||||
'use local-part' => 'verwende local-part',
|
||||
'one or more email addresses' => 'eine oder mehrere E-Mail Adressen',
|
||||
'Prefix will be automaticaly added to database name and database user' => 'Prefix %s wird automatisch zum Datenbanknamen und Benutzernamen hinzugefügt',
|
||||
'Database' => 'Datenbank',
|
||||
|
|
@ -287,13 +286,13 @@ $LANG['de'] = array(
|
|||
'Interface' => 'Interface',
|
||||
'Shared' => 'Gemeinsam genutzt',
|
||||
'Assigned user' => 'Benutzer zuordnen',
|
||||
'Assigned domain' => 'Domäne zuordnen',
|
||||
'Assigned domain' => 'Domain zuordnen',
|
||||
'NAT IP association' => 'NAT IP-Verband',
|
||||
'shell' => 'Shell',
|
||||
'web domains' => 'Web Domäne',
|
||||
'web aliases' => 'Web Aliase',
|
||||
'dns records' => 'DNS Einträge',
|
||||
'mail domains' => 'Mail Domäne',
|
||||
'mail domains' => 'Mail Domains',
|
||||
'mail accounts' => 'Mail Konten',
|
||||
'accounts' => 'Konten',
|
||||
'databases' => 'Datenbanken',
|
||||
|
|
@ -311,10 +310,10 @@ $LANG['de'] = array(
|
|||
'password' => 'Passwort',
|
||||
'type' => 'Typ',
|
||||
'charset' => 'Zeichensatz',
|
||||
'domain' => 'Domäne',
|
||||
'domain' => 'Domain',
|
||||
'ip' => 'IP',
|
||||
'ip address' => 'IP Adresse',
|
||||
'IP address' => 'IP Adresse',
|
||||
'ip address' => 'IP-Adresse',
|
||||
'IP address' => 'IP-Adresse',
|
||||
'netmask' => 'Netzmaske',
|
||||
'interface' => 'Interface',
|
||||
'assigned user' => 'Zugeordneter Benutzer',
|
||||
|
|
@ -325,7 +324,7 @@ $LANG['de'] = array(
|
|||
'first name' => 'Vorname',
|
||||
'last name' => 'Nachname',
|
||||
'account' => 'Konto',
|
||||
'ssl certificate' => 'SSL Zertifikat',
|
||||
'ssl certificate' => 'SSL-Zertifikat',
|
||||
'ssl key' => 'SSL Schlüssel',
|
||||
'stats user password' => 'Statistik Benutzer Passwort',
|
||||
'stats username' => 'Statistik Benutzername',
|
||||
|
|
@ -345,14 +344,14 @@ $LANG['de'] = array(
|
|||
'Port' => 'Port',
|
||||
'Comment' => 'Kommentar',
|
||||
'Banlist' => 'Bannliste',
|
||||
'ranges are acceptable' => 'Bereiche akzeptabel',
|
||||
'ranges are acceptable' => 'Bereiche sind akzeptabel',
|
||||
'CIDR format is supported' => 'CIDR-Format wird unterstützt',
|
||||
|
||||
'unlimited' => 'unlimited',
|
||||
'1 account' => '1 Konto',
|
||||
'%s accounts' => '%s Konten',
|
||||
'1 domain' => '1 Domäne',
|
||||
'%s domains' => '%s Domänen',
|
||||
'1 domain' => '1 Domain',
|
||||
'%s domains' => '%s Domains',
|
||||
'1 record' => '1 Eintrag',
|
||||
'%s records' => '%s Einträge',
|
||||
'1 mail account' => '1 Mail Konto',
|
||||
|
|
@ -379,7 +378,7 @@ $LANG['de'] = array(
|
|||
'There are no currently banned IP' => 'Es gibt keine aktuell gesperrte IP',
|
||||
|
||||
'USER_CREATED_OK' => 'Benutzer <a href="/edit/user/?user=%s"><b>%s</b></a> wurde erfolgreich angelegt.',
|
||||
'WEB_DOMAIN_CREATED_OK' => 'Domäne <a href="/edit/web/?domain=%s"><b>%s</b></a> wurde erfolgreich angelegt.',
|
||||
'WEB_DOMAIN_CREATED_OK' => 'Domain <a href="/edit/web/?domain=%s"><b>%s</b></a> wurde erfolgreich angelegt.',
|
||||
'DNS_DOMAIN_CREATED_OK' => 'DNS Domäne <a href="/list/dns/?domain=%s"><b>%s</b></a> wurde erfolgreich angelegt.',
|
||||
'DNS_RECORD_CREATED_OK' => 'Eintrag <b>%s.%s</b> wurde erfolgreich angelegt.',
|
||||
'MAIL_DOMAIN_CREATED_OK' => 'Mail Domäne <a href="/list/mail/?domain=%s"><b>%s</b></a> wurde erfolgreich angelegt.',
|
||||
|
|
@ -458,14 +457,14 @@ $LANG['de'] = array(
|
|||
'Database Credentials' => 'Datenbank Anmeldeinformationen',
|
||||
'DATABASE_READY' => "Datenbank wurde erfolgreich erstellt.\n\nDatenbank: %s\nBenutzername: %s\nPasswort: %s\n%s\n\n--\nVesta Control Panel\n",
|
||||
|
||||
'forgot password' => 'Password vergessen',
|
||||
'forgot password' => 'Passwort vergessen',
|
||||
'Confirm' => 'Bestätigen',
|
||||
'New Password' => 'Neues Password',
|
||||
'Confirm Password' => 'Password bestätigen',
|
||||
'Reset' => 'Reset',
|
||||
'Reset Code' => 'Reset Code',
|
||||
'New Password' => 'Neues Passwort',
|
||||
'Confirm Password' => 'Passwort bestätigen',
|
||||
'Reset' => 'Zurücksetzen',
|
||||
'Reset Code' => 'Zurücksetzen-Code',
|
||||
'RESET_NOTICE' => '',
|
||||
'RESET_CODE_SENT' => 'Passwort Reset Code wurde erfolgreich an Ihre Adresse gesandt<br>',
|
||||
'RESET_CODE_SENT' => 'Passwort Zurücksetzen-Code wurde erfolgreich an Ihre Adresse gesandt<br>',
|
||||
'MAIL_RESET_SUBJECT' => 'Passwort Reset für %s',
|
||||
'PASSWORD_RESET_REQUEST' => "Zum zurücksetzten Ihre Passwords, besuchen Sie bitten folgenden Link:\nhttps://%s/reset/?action=confirm&user=%s&code=%s\n\nAlternativ, können Sie auf https://%s/reset/?action=code&user=%s gehen und dort folgenden Reset Code eingeben:\n%s\n\nWenn Sie Ihr Passwort nicht zurücksetzen wollten, ignorieren Sie diese Nachricht und entschuldigen Sie uns die Unannehmlichkeiten.\n\n--\nVesta Control Panel\n",
|
||||
'PASSWORD_RESET_REQUEST' => "Zum Zurücksetzten Ihre Passwortes, besuchen Sie bitte folgenden Link:\nhttps://%s/reset/?action=confirm&user=%s&code=%s\n\nAlternativ, können Sie auf https://%s/reset/?action=code&user=%s gehen und dort folgenden Reset Code eingeben:\n%s\n\nWenn Sie Ihr Passwort nicht zurücksetzen wollten, ignorieren Sie diese Nachricht und entschuldigen Sie uns die Unannehmlichkeiten.\n\n--\nVesta Control Panel\n",
|
||||
);
|
||||
|
|
|
|||
|
|
@ -470,6 +470,19 @@ $LANG['ua'] = array(
|
|||
'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",
|
||||
);
|
||||
|
||||
'Jan' => 'Січ',
|
||||
'Feb' => 'Лют',
|
||||
'Mar' => 'Бер',
|
||||
'Apr' => 'Квіт',
|
||||
'May' => 'Трав',
|
||||
'Jun' => 'Черв',
|
||||
'Jul' => 'Лип',
|
||||
'Aug' => 'Серп',
|
||||
'Sep' => 'Вер',
|
||||
'Oct' => 'Жовт',
|
||||
'Nov' => 'Лист',
|
||||
'Dec' => 'Груд',
|
||||
|
||||
);
|
||||
?>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue