From e94a9fb5e4b6a2bc07e0bb4cf8ea35fc70c4bbf0 Mon Sep 17 00:00:00 2001 From: tbrehm <t.brehm@ispconfig.org> Date: Thu, 10 May 2012 12:31:27 -0400 Subject: [PATCH] Merged revisions 3049-3051,3053-3054,3058,3070,3074-3077,3082,3086-3088,3091-3092,3094-3095 from stable branch. --- interface/web/client/lib/lang/en_client.lng | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/interface/web/client/lib/lang/en_client.lng b/interface/web/client/lib/lang/en_client.lng index d912744..3a9f30e 100644 --- a/interface/web/client/lib/lang/en_client.lng +++ b/interface/web/client/lib/lang/en_client.lng @@ -109,6 +109,7 @@ $wb["limit_openvz_vm_error_notint"] = 'The virtual server limit must be a number.'; $wb["web_php_options_notempty"] = 'No PHP option(s) selected. Select at least one PHP option.'; $wb["ssh_chroot_notempty"] = 'No SSH chroot option selected. Select at least one SSH option.'; +$wb["username_error_collision"] = 'The username may not start with the word -web- or -web- followed by a number.'; $wb["bank_account_number_txt"] = 'Bank account no.'; $wb["bank_code_txt"] = 'Bank code'; $wb["bank_name_txt"] = 'Bank name'; -- Gitblit v1.9.1