Commit bdc75044 authored by Thom's avatar Thom 🛠

Resolve merge conflict

parents 039e79be 23ac7007
......@@ -2841,9 +2841,9 @@ class installer_base {
// If this is a webserver
if($conf['nginx']['installed'] == true)
exec("$le_client $certonly $acme_version --nginx --email postmaster@$hostname $renew_hook");
exec("$le_client $certonly $acme_version --nginx --email postmaster@$hostname -d $hostname $renew_hook");
elseif($conf['apache']['installed'] == true)
exec("$le_client $certonly $acme_version --apache --email postmaster@$hostname $renew_hook");
exec("$le_client $certonly $acme_version --apache --email postmaster@$hostname -d $hostname $renew_hook");
// Else, it is not webserver, so we use standalone
else
exec("$le_client $certonly $acme_version --standalone --email postmaster@$hostname -d $hostname $hook");
......
################################################
# ISPConfig General Apache Options
################################################
ServerTokens ProductOnly
ServerSignature Off
################################################
# ISPConfig Logfile configuration for vlogger
......
<?php
$wb['server_config'] = 'Server Config';
$wb['config_for_txt'] = 'Configuration for';
$wb['server_config_error_not_updated'] = 'Error in Server Config: not updated';
$wb['server_config_error_section_not_updated'] = 'Error in Server Config: %s section not updated';
$wb['jailkit_chroot_home_txt'] = 'Jailkit chroot home';
......
......@@ -4,7 +4,7 @@ $wb['username_txt'] = 'Username';
$wb['username_err'] = 'The username is too long or contains invalid characters.';
$wb['username_empty'] = 'The username is empty.';
$wb['username_unique'] = 'There is already a user with this username.';
$wb['passwort_txt'] = 'Password';
$wb['password_txt'] = 'Password';
$wb['password_strength_txt'] = 'Password strength';
$wb['modules_txt'] = 'Module';
$wb['startmodule_txt'] = 'Startmodule';
......
......@@ -4,6 +4,6 @@ $wb['username_txt'] = 'Username';
$wb['client_id_txt'] = 'Client ID';
$wb['active_txt'] = 'Active';
$wb['add_new_record_txt'] = 'Add new user';
$wb['warning_txt'] = '<b>WARNING:</b> Do not edit or modify any user settings here. Use the Client- and Reseller settings in the Client module instead. Modifying or changing Users or groups here may cause data loss!';
$wb['warning_txt'] = '<b>WARNING:</b> Do not edit or modify any user settings here. Use the Client- and Reseller settings in the Client module instead. Modifying or changing users or groups here may cause data loss!';
$wb['groups_txt'] = 'Groups';
?>
<?php
$wb['server_config'] = 'Server Config';
$wb['config_for_txt'] = 'Configuration for';
$wb['server_config_error_not_updated'] = 'Error in Server Config: not updated';
$wb['server_config_error_section_not_updated'] = 'Error in Server Config: %s section not updated';
$wb['jailkit_chroot_home_txt'] = 'Jailkit chroot home';
......
......@@ -4,7 +4,7 @@ $wb['username_txt'] = 'Потребителско име';
$wb['username_err'] = 'Потребителското име е твърде дълго или съдържа непозволени символи.';
$wb['username_empty'] = 'Полето с потребителското име е празно.';
$wb['username_unique'] = 'Вече съществува потребител с това потребителско име.';
$wb['passwort_txt'] = 'Парола';
$wb['password_txt'] = 'Парола';
$wb['password_strength_txt'] = 'Сила на паролата';
$wb['modules_txt'] = 'Модул';
$wb['startmodule_txt'] = 'Старт модул';
......
<?php
$wb['server_config'] = 'Server Config';
$wb['config_for_txt'] = 'Configuration for';
$wb['server_config_error_not_updated'] = 'Error in Server Config: not updated';
$wb['server_config_error_section_not_updated'] = 'Error in Server Config: %s section not updated';
$wb['ufw_enable_txt'] = 'Habilitar';
......
......@@ -4,7 +4,7 @@ $wb['username_txt'] = 'Usuário';
$wb['username_err'] = 'O nome do usuário é muito longo ou contém caracteres inválidos.';
$wb['username_empty'] = 'O nome do usuário está em branco.';
$wb['username_unique'] = 'Já existe um usuário com este nome.';
$wb['passwort_txt'] = 'Senha';
$wb['password_txt'] = 'Senha';
$wb['password_strength_txt'] = 'Dificuldade da senha';
$wb['modules_txt'] = 'Módulo';
$wb['startmodule_txt'] = 'Módulo inicial';
......
<?php
$wb['server_config'] = 'Server Config';
$wb['config_for_txt'] = 'Configuration for';
$wb['server_config_error_not_updated'] = 'Error in Server Config: not updated';
$wb['server_config_error_section_not_updated'] = 'Error in Server Config: %s section not updated';
$wb['ufw_enable_txt'] = 'Enable';
......
......@@ -4,7 +4,7 @@ $wb['username_txt'] = 'Username';
$wb['username_err'] = 'The username is too long or contains invalid characters.';
$wb['username_empty'] = 'The username is empty.';
$wb['username_unique'] = 'There is already a user with this username.';
$wb['passwort_txt'] = 'Password';
$wb['password_txt'] = 'Password';
$wb['password_strength_txt'] = 'Password strength';
$wb['modules_txt'] = 'Module';
$wb['startmodule_txt'] = 'Startmodule';
......
......@@ -5,5 +5,5 @@ $wb['client_id_txt'] = 'User ID';
$wb['active_txt'] = 'Active';
$wb['groups_txt'] = 'Groups';
$wb['add_new_record_txt'] = 'Add new user';
$wb['warning_txt'] = '<b>WARNING:</b> Do not edit or modify any user settings here. Use the Client- and Reseller settings in the Client module instead. Modifying or changing Users or groups here may cause data loss!';
$wb['warning_txt'] = '<b>WARNING:</b> Do not edit or modify any user settings here. Use the Client- and Reseller settings in the Client module instead. Modifying or changing users or groups here may cause data loss!';
?>
<?php
$wb['server_config'] = 'Server Config';
$wb['config_for_txt'] = 'Configuration for';
$wb['server_config_error_not_updated'] = 'Error in Server Config: not updated';
$wb['server_config_error_section_not_updated'] = 'Error in Server Config: %s section not updated';
$wb['jailkit_chroot_home_txt'] = 'Jailkit chroot adresář';
......
......@@ -4,7 +4,7 @@ $wb['username_txt'] = 'Uživatelské jméno';
$wb['username_err'] = 'Uživatelské jméno je příliš dlouhé nebo obsahuje neplatné znaky.';
$wb['username_empty'] = 'Uživatelské jméno je prázdné.';
$wb['username_unique'] = 'Toto uživatelské jméno již existuje.';
$wb['passwort_txt'] = 'Heslo';
$wb['password_txt'] = 'Heslo';
$wb['password_strength_txt'] = 'Bezpečnost hesla';
$wb['modules_txt'] = 'Modul';
$wb['startmodule_txt'] = 'Výchozí modul';
......
<?php
$wb['server_config'] = 'Server Config';
$wb['config_for_txt'] = 'Configuration for';
$wb['server_config_error_not_updated'] = 'Error in Server Config: not updated';
$wb['server_config_error_section_not_updated'] = 'Error in Server Config: %s section not updated';
$wb['jailkit_chroot_home_txt'] = 'Jailkit Chroot home';
......
......@@ -2,7 +2,7 @@
$wb['users_txt'] = 'Users';
$wb['username_txt'] = 'Benutzername';
$wb['username_err'] = 'Der Benutzername enthält ungültige Zeichen.';
$wb['passwort_txt'] = 'Passwort';
$wb['password_txt'] = 'Passwort';
$wb['modules_txt'] = 'Module';
$wb['startmodule_txt'] = 'Startmodul';
$wb['app_theme_txt'] = 'Design';
......
<?php
$wb['server_config'] = 'Server Config';
$wb['config_for_txt'] = 'Configuration for';
$wb['server_config_error_not_updated'] = 'Error in Server Config: not updated';
$wb['server_config_error_section_not_updated'] = 'Error in Server Config: %s section not updated';
$wb['ufw_enable_txt'] = 'Enable';
......
......@@ -4,7 +4,7 @@ $wb['username_txt'] = 'Brugernavn';
$wb['username_err'] = 'Brugernavnet er for langt eller indeholder ugyldige karaktere.';
$wb['username_empty'] = 'Brugernavnet er tomt.';
$wb['username_unique'] = 'Der findes allerede en bruger med dette brugernavn.';
$wb['passwort_txt'] = 'Adgangskode';
$wb['password_txt'] = 'Adgangskode';
$wb['password_strength_txt'] = 'Adgangskode styrke';
$wb['modules_txt'] = 'Modul';
$wb['startmodule_txt'] = 'Startmodul';
......
<?php
$wb['server_config'] = 'Server Config';
$wb['config_for_txt'] = 'Configuration for';
$wb['server_config_error_not_updated'] = 'Error in Server Config: not updated';
$wb['server_config_error_section_not_updated'] = 'Error in Server Config: %s section not updated';
$wb['jailkit_chroot_home_txt'] = 'Jailkit chroot home';
......
......@@ -4,7 +4,7 @@ $wb['username_txt'] = 'Όνομα Χρήστη';
$wb['username_err'] = 'Το όνομα χρήστη είναι πολύ μεγάλο ή περιέχει μη επιτρεπόμενους χαρακτήρες';
$wb['username_empty'] = 'Το όνομα χρήστη δεν έχει οριστεί.';
$wb['username_unique'] = 'Υπάρχει ήδη ένας χρήστης με αυτό το όνομα χρήστη.';
$wb['passwort_txt'] = 'Συνθηματικό';
$wb['password_txt'] = 'Συνθηματικό';
$wb['password_strength_txt'] = 'Δύναμη Συνθηματικού';
$wb['modules_txt'] = 'Άρθρωμα';
$wb['startmodule_txt'] = 'Άρθρωμα Εκκίνησης';
......
<?php
$wb['server_config'] = 'Server Config';
$wb['config_for_txt'] = 'Configuration for';
$wb['server_config_error_not_updated'] = 'Error in Server Config: not updated';
$wb['server_config_error_section_not_updated'] = 'Error in Server Config: %s section not updated';
$wb["ufw_enable_txt"] = 'Enable';
......@@ -182,7 +183,7 @@ $wb["do_not_try_rescue_httpd_txt"] = 'Disable HTTPD monitoring';
$wb["do_not_try_rescue_mongodb_txt"] = 'Disable MongoDB monitoring';
$wb["do_not_try_rescue_mysql_txt"] = 'Disable MySQL monitoring';
$wb["do_not_try_rescue_mail_txt"] = 'Disable Email monitoring';
$wb["rescue_description_txt"] = '<b>Information:</b> If you want to shut down mysql you have to select the "Disable MySQL monitor" checkbox and then wait 2-3 minutes.<br>If you do not wait 2-3 minutes, rescue will try to restart mysql!';
$wb["rescue_description_txt"] = 'If you want to shut down MySQL you have to select the "Disable MySQL monitor" checkbox and then wait 2-3 minutes. If you do not wait 2-3 minutes, rescue will try to restart MySQL!';
$wb["enable_sni_txt"] = 'Enable SNI';
$wb["set_folder_permissions_on_update_txt"] = 'Set folder permissions on update';
$wb["add_web_users_to_sshusers_group_txt"] = 'Add web users to -sshusers- group';
......
......@@ -4,7 +4,7 @@ $wb["username_txt"] = 'Username';
$wb["username_err"] = 'The username is too long or contains invalid characters.';
$wb["username_empty"] = 'The username is empty.';
$wb["username_unique"] = 'There is already a user with this username.';
$wb["passwort_txt"] = 'Password';
$wb["password_txt"] = 'Password';
$wb["password_strength_txt"] = 'Password strength';
$wb["modules_txt"] = 'Module';
$wb["startmodule_txt"] = 'Startmodule';
......
......@@ -5,5 +5,5 @@ $wb["client_id_txt"] = 'User ID';
$wb["active_txt"] = 'Active';
$wb["groups_txt"] = 'Groups';
$wb["add_new_record_txt"] = 'Add new user';
$wb["warning_txt"] = '<b>WARNING:</b> Do not edit or modify any user settings here. Use the Client- and Reseller settings in the Client module instead. Modifying or changing Users or groups here may cause data loss!';
$wb["warning_txt"] = '<b>WARNING:</b> Do not edit or modify any user settings here. Use the Client- and Reseller settings in the Client module instead. Modifying or changing users or groups here may cause data loss!';
?>
\ No newline at end of file
<?php
$wb['server_config'] = 'Server Config';
$wb['config_for_txt'] = 'Configuration for';
$wb['server_config_error_not_updated'] = 'Error in Server Config: not updated';
$wb['server_config_error_section_not_updated'] = 'Error in Server Config: %s section not updated';
$wb['add_web_users_to_sshusers_group_txt'] = 'Añadir usuarios web al grupo -sshusers-';
......
......@@ -17,7 +17,7 @@ $wb['ort_txt'] = 'Ciudad';
$wb['password_match_txt'] = 'Las contraseñas coinciden.';
$wb['password_mismatch_txt'] = 'Las contraseñas no coinciden.';
$wb['password_strength_txt'] = 'Fortaleza de la contraseña';
$wb['passwort_txt'] = 'Contraseña';
$wb['password_txt'] = 'Contraseña';
$wb['plz_txt'] = 'Zona postal';
$wb['repeat_password_txt'] = 'Repetir contraseña';
$wb['startmodule_err'] = 'El módulo de inicio no se encuentra entre los módulos.';
......
<?php
$wb['server_config'] = 'Server Config';
$wb['config_for_txt'] = 'Configuration for';
$wb['server_config_error_not_updated'] = 'Error in Server Config: not updated';
$wb['server_config_error_section_not_updated'] = 'Error in Server Config: %s section not updated';
$wb['jailkit_chroot_home_txt'] = 'Jailkit chroot-kotikansio';
......
......@@ -4,7 +4,7 @@ $wb['username_txt'] = 'Käyttäjätunnus';
$wb['username_err'] = 'Käyttäjätunnus on liian pitkä tai sisältää kiellettyjä merkkejä.';
$wb['username_empty'] = 'Käyttäjätunnus on tyhjä.';
$wb['username_unique'] = 'Tämä käyttäjätunnus on jo olemassa.';
$wb['passwort_txt'] = 'Salasana';
$wb['password_txt'] = 'Salasana';
$wb['modules_txt'] = 'Ohjelmaosiot';
$wb['startmodule_txt'] = 'Aloitusosio';
$wb['app_theme_txt'] = 'Teema';
......
<?php
$wb['server_config'] = 'Server Config';
$wb['config_for_txt'] = 'Configuration for';
$wb['server_config_error_not_updated'] = 'Error in Server Config: not updated';
$wb['server_config_error_section_not_updated'] = 'Error in Server Config: %s section not updated';
$wb['jailkit_chroot_home_txt'] = 'Accueil du chroot Jailkit';
......
......@@ -2,7 +2,7 @@
$wb['users_txt'] = 'Users';
$wb['username_txt'] = 'Nom d’utilisateur';
$wb['username_err'] = 'Le nom d’utilisateur est trop long ou contient des caractères invalides.';
$wb['passwort_txt'] = 'Mot de passe';
$wb['password_txt'] = 'Mot de passe';
$wb['modules_txt'] = 'Module';
$wb['startmodule_txt'] = 'Module de démarrage';
$wb['app_theme_txt'] = 'Thème';
......
<?php
$wb['server_config'] = 'Server Config';
$wb['config_for_txt'] = 'Configuration for';
$wb['server_config_error_not_updated'] = 'Error in Server Config: not updated';
$wb['server_config_error_section_not_updated'] = 'Error in Server Config: %s section not updated';
$wb['jailkit_chroot_home_txt'] = 'Jailkit chroot direktorij';
......
......@@ -4,7 +4,7 @@ $wb['username_txt'] = 'Korisničko ime';
$wb['username_err'] = 'Korisničko ime je predugačko ili sadrži nedozvoljene znakove.';
$wb['username_empty'] = 'Korisničko ime je prazno.';
$wb['username_unique'] = 'Već postoji korisnik sa ovim korisničkim imenom.';
$wb['passwort_txt'] = 'Šifra';
$wb['password_txt'] = 'Šifra';
$wb['password_strength_txt'] = 'Jačina šifre';
$wb['modules_txt'] = 'Modul';
$wb['startmodule_txt'] = 'Početni modul';
......
<?php
$wb['server_config'] = 'Server Config';
$wb['config_for_txt'] = 'Configuration for';
$wb['server_config_error_not_updated'] = 'Error in Server Config: not updated';
$wb['server_config_error_section_not_updated'] = 'Error in Server Config: %s section not updated';
$wb['jailkit_chroot_home_txt'] = 'Jailkit chroot home';
......
......@@ -4,7 +4,7 @@ $wb['username_txt'] = 'Felhasználónév';
$wb['username_err'] = 'A Felhasználónév túl hosszú vagy érvénytelen karaktereket tartalmaz';
$wb['username_empty'] = 'A Felhasználónév üres.';
$wb['username_unique'] = 'Ez a Felhasználónév már foglalt.';
$wb['passwort_txt'] = 'Jelszó';
$wb['password_txt'] = 'Jelszó';
$wb['modules_txt'] = 'Modul';
$wb['startmodule_txt'] = 'Kezdőmodul';
$wb['app_theme_txt'] = 'Kinézet';
......
<?php
$wb['server_config'] = 'Server Config';
$wb['config_for_txt'] = 'Configuration for';
$wb['server_config_error_not_updated'] = 'Error in Server Config: not updated';
$wb['server_config_error_section_not_updated'] = 'Error in Server Config: %s section not updated';
$wb['jailkit_chroot_home_txt'] = 'Home chroot Jailkit';
......
......@@ -4,7 +4,7 @@ $wb['username_txt'] = 'Nama Pengguna';
$wb['username_err'] = 'Nama pengguna terlalu panjang atau mengandung karakter yang tidak valid.';
$wb['username_empty'] = 'Nama pengguna kosong.';
$wb['username_unique'] = 'Sudah ada pengguna yang memakai nama ini.';
$wb['passwort_txt'] = 'Kata Sandi';
$wb['password_txt'] = 'Kata Sandi';
$wb['password_strength_txt'] = 'Kekuatan sandi';
$wb['modules_txt'] = 'Modul';
$wb['startmodule_txt'] = 'Modul awal';
......
<?php
$wb['server_config'] = 'Server Config';
$wb['config_for_txt'] = 'Configuration for';
$wb['server_config_error_not_updated'] = 'Error in Server Config: not updated';
$wb['server_config_error_section_not_updated'] = 'Error in Server Config: %s section not updated';
$wb['jailkit_chroot_home_txt'] = 'Jailkit chroot home';
......
......@@ -4,7 +4,7 @@ $wb['username_txt'] = 'Nome utente';
$wb['username_err'] = 'Nome utente troppo lungo o avente caratteri non validi.';
$wb['username_empty'] = 'Nome utente mancante.';
$wb['username_unique'] = 'Nome utente già utilizzato.';
$wb['passwort_txt'] = 'Password';
$wb['password_txt'] = 'Password';
$wb['password_strength_txt'] = 'Solidità password';
$wb['modules_txt'] = 'Modulo';
$wb['startmodule_txt'] = 'Startmodule';
......
<?php
$wb['server_config'] = 'Server Config';
$wb['config_for_txt'] = 'Configuration for';
$wb['server_config_error_not_updated'] = 'Error in Server Config: not updated';
$wb['server_config_error_section_not_updated'] = 'Error in Server Config: %s section not updated';
$wb['jailkit_chroot_home_txt'] = 'chroot ホーム';
......
......@@ -4,7 +4,7 @@ $wb['username_txt'] = 'ユーザー名';
$wb['username_err'] = 'ユーザー名が長すぎるか、または不正な文字を含んでいます。';
$wb['username_empty'] = 'ユーザー名を入力してください。';
$wb['username_unique'] = '既に登録済みのユーザー名です。別の名前を選んでください。';
$wb['passwort_txt'] = 'パスワード';
$wb['password_txt'] = 'パスワード';
$wb['password_strength_txt'] = 'パスワードの強度';
$wb['modules_txt'] = 'モジュール';
$wb['startmodule_txt'] = 'ログイン直後のモジュール';
......
......@@ -4,6 +4,6 @@ $wb['username_txt'] = 'ユーザー名';
$wb['client_id_txt'] = 'Client ID';
$wb['active_txt'] = 'Active';
$wb['add_new_record_txt'] = 'ユーザーを追加する';
$wb['warning_txt'] = '<b>WARNING:</b> Do not edit or modify any user settings here. Use the Client- and Reseller settings in the Client module instead. Modifying or changing Users or groups here may cause data loss!';
$wb['warning_txt'] = '<b>WARNING:</b> Do not edit or modify any user settings here. Use the Client- and Reseller settings in the Client module instead. Modifying or changing users or groups here may cause data loss!';
$wb['groups_txt'] = 'Groups';
?>
<?php
$wb['server_config'] = 'Server Configuratie';
$wb['config_for_txt'] = 'Configuration for';
$wb['server_config_error_not_updated'] = 'Error in Server Config: not updated';
$wb['server_config_error_section_not_updated'] = 'Error in Server Config: %s section not updated';
$wb['jailkit_chroot_home_txt'] = 'Jailkit chroot home';
......
......@@ -4,7 +4,7 @@ $wb['username_txt'] = 'Gebruikersnaam';
$wb['username_err'] = 'De gebruikersnaam is te lang of bevat ongeldige karakters.';
$wb['username_empty'] = 'De gebruikersnaam is niet ingvuld.';
$wb['username_unique'] = 'Er is al een een gebruiker met deze gebruikersnaam.';
$wb['passwort_txt'] = 'Wachtwoord';
$wb['password_txt'] = 'Wachtwoord';
$wb['password_strength_txt'] = 'Wachtwoord sterkte';
$wb['modules_txt'] = 'Module';
$wb['startmodule_txt'] = 'Startmodule';
......
<?php
$wb['server_config'] = 'Server Config';
$wb['config_for_txt'] = 'Configuration for';
$wb['server_config_error_not_updated'] = 'Error in Server Config: not updated';
$wb['server_config_error_section_not_updated'] = 'Error in Server Config: %s section not updated';
$wb['jailkit_chroot_home_txt'] = 'Adres roota Jailkit';
......
......@@ -4,7 +4,7 @@ $wb['username_txt'] = 'Nazwa użytkownika';
$wb['username_err'] = 'Nazwa użytkownika jest za długa lub zawiera niedozwolone znaki.';
$wb['username_empty'] = 'Nazwa użytkownika jest pusta.';
$wb['username_unique'] = 'Istnieje już użytkownik o takiej nazwie.';
$wb['passwort_txt'] = 'Hasło';
$wb['password_txt'] = 'Hasło';
$wb['password_strength_txt'] = 'Siła hasła';
$wb['modules_txt'] = 'Moduł';
$wb['startmodule_txt'] = 'Moduł startowy';
......
<?php
$wb['server_config'] = 'Server Config';
$wb['config_for_txt'] = 'Configuration for';
$wb['server_config_error_not_updated'] = 'Error in Server Config: not updated';
$wb['server_config_error_section_not_updated'] = 'Error in Server Config: %s section not updated';
$wb['jailkit_chroot_home_txt'] = 'Raiz do Chroot Jailkit';
......
......@@ -4,7 +4,7 @@ $wb['username_txt'] = 'Utilizador ';
$wb['username_err'] = 'O Nome do utilizador é muito longo ou contém caracteres inválidos!';
$wb['username_empty'] = 'Por favor, entre com um nome de utilizador .';
$wb['username_unique'] = 'Já existe um utilizador com este nome!';
$wb['passwort_txt'] = 'Senha';
$wb['password_txt'] = 'Senha';
$wb['password_strength_txt'] = 'Segurança da Senha';
$wb['modules_txt'] = 'Módulos';
$wb['startmodule_txt'] = 'Módulo Inicial';
......
<?php
$wb['server_config'] = 'Server Config';
$wb['config_for_txt'] = 'Configuration for';
$wb['server_config_error_not_updated'] = 'Error in Server Config: not updated';
$wb['server_config_error_section_not_updated'] = 'Error in Server Config: %s section not updated';
$wb['jailkit_chroot_home_txt'] = 'Jailkit chroot home';
......
......@@ -4,7 +4,7 @@ $wb['username_txt'] = 'Username';
$wb['username_err'] = 'The username is too long or contains invalid characters.';
$wb['username_empty'] = 'The username is empty.';
$wb['username_unique'] = 'There is already a user with this username.';
$wb['passwort_txt'] = 'Password';
$wb['password_txt'] = 'Password';
$wb['password_strength_txt'] = 'Password strength';
$wb['modules_txt'] = 'Module';
$wb['startmodule_txt'] = 'Startmodule';
......
......@@ -4,6 +4,6 @@ $wb['username_txt'] = 'Username';
$wb['client_id_txt'] = 'Client ID';
$wb['active_txt'] = 'Active';
$wb['add_new_record_txt'] = 'Add user nou';
$wb['warning_txt'] = '<b>WARNING:</b> Do not edit or modify any user settings here. Use the Client- and Reseller settings in the Client module instead. Modifying or changing Users or groups here may cause data loss!';
$wb['warning_txt'] = '<b>WARNING:</b> Do not edit or modify any user settings here. Use the Client- and Reseller settings in the Client module instead. Modifying or changing users or groups here may cause data loss!';
$wb['groups_txt'] = 'Groups';
?>
<?php
$wb['server_config'] = 'Server Config';
$wb['config_for_txt'] = 'Configuration for';
$wb['server_config_error_not_updated'] = 'Error in Server Config: not updated';
$wb['server_config_error_section_not_updated'] = 'Error in Server Config: %s section not updated';
$wb['jailkit_chroot_home_txt'] = 'Путь к домашней папке Jailkit chroot';
......
......@@ -2,7 +2,7 @@
$wb['users_txt'] = 'Users';
$wb['username_txt'] = 'Логин';
$wb['username_err'] = 'Ошибка в логине';
$wb['passwort_txt'] = 'Пароль';
$wb['password_txt'] = 'Пароль';
$wb['modules_txt'] = 'Модуль';
$wb['startmodule_txt'] = 'Стартовый модуль';
$wb['app_theme_txt'] = 'Тема';
......
<?php
$wb['server_config'] = 'Server Config';
$wb['config_for_txt'] = 'Configuration for';
$wb['server_config_error_not_updated'] = 'Error in Server Config: not updated';
$wb['server_config_error_section_not_updated'] = 'Error in Server Config: %s section not updated';
$wb['jailkit_chroot_home_txt'] = 'Jailkit chroot home';
......
......@@ -2,7 +2,7 @@
$wb['users_txt'] = 'Users';
$wb['username_txt'] = 'Användarnamn';
$wb['username_err'] = 'användarnamn_fel';
$wb['passwort_txt'] = 'Lösenord';
$wb['password_txt'] = 'Lösenord';
$wb['modules_txt'] = 'Modul';
$wb['startmodule_txt'] = 'Startmodul';
$wb['app_theme_txt'] = 'Design';
......
......@@ -4,6 +4,6 @@ $wb['username_txt'] = 'Användarnamn';
$wb['client_id_txt'] = 'Kund-ID';
$wb['active_txt'] = 'Aktiv';
$wb['add_new_record_txt'] = 'Lägg till ny användare';
$wb['warning_txt'] = '<b>VARNING:</b> Ändra inte några användarinställningar här. Use the Client- and Reseller settings in the Client module instead. Modifying or changing Users or groups here may cause data loss!';
$wb['warning_txt'] = '<b>VARNING:</b> Ändra inte några användarinställningar här. Use the Client- and Reseller settings in the Client module instead. Modifying or changing users or groups here may cause data loss!';
$wb['groups_txt'] = 'Grupper';
?>
<?php
$wb['server_config'] = 'Server Config';
$wb['config_for_txt'] = 'Configuration for';
$wb['server_config_error_not_updated'] = 'Error in Server Config: not updated';
$wb['server_config_error_section_not_updated'] = 'Error in Server Config: %s section not updated';
$wb['jailkit_chroot_home_txt'] = 'Jailkit chroot domov';
......
......@@ -4,7 +4,7 @@ $wb['username_txt'] = 'Užívateľské meno';
$wb['username_err'] = 'Užívateľské meno je príliš dlhá alebo obsahuje neplatné znaky.';
$wb['username_empty'] = 'Užívateľské meno je prázdne.';
$wb['username_unique'] = 'V súčasnosti už existuje užívateľ s týmto užívateľským menom.';
$wb['passwort_txt'] = 'Heslo';
$wb['password_txt'] = 'Heslo';
$wb['password_strength_txt'] = 'Pevnosť hesla';
$wb['modules_txt'] = 'Modul';
$wb['startmodule_txt'] = 'Startmodul';
......
......@@ -4,6 +4,6 @@ $wb['username_txt'] = 'Užívateľské meno';
$wb['client_id_txt'] = 'Client ID';
$wb['active_txt'] = 'Active';
$wb['add_new_record_txt'] = 'Pridať nového užívateľa';
$wb['warning_txt'] = '<b>WARNING:</b> Do not edit or modify any user settings here. Use the Client- and Reseller settings in the Client module instead. Modifying or changing Users or groups here may cause data loss!';
$wb['warning_txt'] = '<b>WARNING:</b> Do not edit or modify any user settings here. Use the Client- and Reseller settings in the Client module instead. Modifying or changing users or groups here may cause data loss!';
$wb['groups_txt'] = 'Groups';
?>
<?php
$wb['server_config'] = 'Server Config';
$wb['config_for_txt'] = 'Configuration for';
$wb['server_config_error_not_updated'] = 'Error in Server Config: not updated';
$wb['server_config_error_section_not_updated'] = 'Error in Server Config: %s section not updated';
$wb['ufw_enable_txt'] = 'Etkin';
......
......@@ -4,7 +4,7 @@ $wb['username_txt'] = 'Kullanıcı Adı';
$wb['username_err'] = 'Kullanıcı adı çok uzun ya da geçersiz karakterler içeriyor.';
$wb['username_empty'] = 'Kullanıcı adı boş olamaz.';
$wb['username_unique'] = 'Bu adla bir kullanıcı zaten var.';
$wb['passwort_txt'] = 'Parola';
$wb['password_txt'] = 'Parola';
$wb['password_strength_txt'] = 'Parola Zorluğu';
$wb['modules_txt'] = 'Modül';
$wb['startmodule_txt'] = 'Başlangıç modülü';
......
<div class='page-header'>
<h1><tmpl_var name="list_head_txt"> {tmpl_var name='server_name'}</h1>
</div>
<p><tmpl_var name="list_desc_txt"></p>
<div class="alert alert-info"><h4 style="text-align:center"><tmpl_var name="config_for_txt"> {tmpl_var name='server_name'}</h4></div>
<div class="form-group">