diff --git a/bureau/class/m_bro.php b/bureau/class/m_bro.php
index 94008ed7..80aacadf 100644
--- a/bureau/class/m_bro.php
+++ b/bureau/class/m_bro.php
@@ -202,7 +202,7 @@ class m_bro {
$db->query("UPDATE browser SET lastdir='$dir' WHERE uid='$cuid';");
$absolute=$this->convertabsolute($dir,false);
if (!$absolute || !file_exists($absolute)) {
- $err->raise('bro',_("This directory do not exist."));
+ $err->raise('bro',_("This directory does not exist."));
return false;
}
if (!is_readable($absolute)) {
diff --git a/bureau/locales/fr_FR/LC_MESSAGES/messages.po b/bureau/locales/fr_FR/LC_MESSAGES/messages.po
index 2bc0dbb4..3f509502 100644
--- a/bureau/locales/fr_FR/LC_MESSAGES/messages.po
+++ b/bureau/locales/fr_FR/LC_MESSAGES/messages.po
@@ -224,9 +224,8 @@ msgid "Password"
msgstr "Mot de passe"
#: ../../awstats/bureau/admin/aws_users.php:57
-#, fuzzy
msgid "Create this new Awstats user"
-msgstr "Créer cet utilisateur"
+msgstr "Créer cet utilisateur de Awstats"
#: ../../awstats/bureau/admin/aws_users.php:86
msgid "Change password"
@@ -244,9 +243,8 @@ msgstr "Supprimer les comptes AlternC cochés"
#: ../../awstats/bureau/admin/menu_aws.php:39
#: ../../awstats/bureau/class/m_aws.php:59
-#, fuzzy
msgid "Web Statistics"
-msgstr "Statistiques web brutes"
+msgstr "Statistiques Web"
#: ../../awstats/bureau/class/m_aws.php:82
msgid ""
@@ -262,9 +260,8 @@ msgstr ""
"nombreuses langues."
#: ../../awstats/bureau/class/m_aws.php:123
-#, fuzzy
msgid "No statistics currently defined"
-msgstr "Aucun jeu de sélectionné !"
+msgstr "Aucun jeu de statistique pour l'instant"
#: ../../awstats/bureau/class/m_aws.php:162
#: ../../awstats/bureau/class/m_aws.php:325
@@ -2939,7 +2936,7 @@ msgid "Deletion pending"
msgstr "Suppression en attente"
#: ../admin/dom_edit.php:232
-#, fuzzy, php-format
+#, php-format
msgid "Add a subdomain to %s"
msgstr "Ajouter un sous-domaine à %s"
@@ -3180,7 +3177,6 @@ msgid "Editing a FTP account"
msgstr "Modification d'un compte FTP"
#: ../admin/ftp_edit.php:80
-#, fuzzy
msgid ""
"This is the root folder for this FTP user. i.e. this FTP user can access to "
"this folder and all its sub-folders."
@@ -3569,14 +3565,12 @@ msgid "Auto Reload"
msgstr ""
#: ../admin/logs_tail.php:69
-#, fuzzy
msgid "Last lines shown"
-msgstr "Dernière connexion"
+msgstr "Dernière lignes montrées"
#: ../admin/logs_tail.php:72
-#, fuzzy
msgid "Back to the logs list"
-msgstr "Retour à la liste des variables"
+msgstr "Retour à la liste des journaux"
#: ../admin/mail_del.php:54
msgid "Deleting mail accounts"
@@ -5209,12 +5203,10 @@ msgid "Go back to the file manager"
msgstr "Retour au gestionnaire de fichiers"
#: ../class/m_bro.php:205
-#, fuzzy
-msgid "This directory do not exist."
+msgid "This directory does not exist."
msgstr "Le dossier n'existe pas"
#: ../class/m_bro.php:209
-#, fuzzy
msgid "This directory is not readable."
msgstr "Le dossier n'existe pas"
@@ -5506,9 +5498,12 @@ msgid "Locally hosted"
msgstr "Hébergé localement"
#: ../class/m_dom.php:2203
-#, fuzzy
msgid "URL redirection"
-msgstr "Redirection vers l'URL : "
+msgstr "Redirection vers l'URL :"
+
+#: ../class/m_dom.php:2203
+msgid "URL redirection, HTTP & HTTPS"
+msgstr "Redirection HTTP & HTTPS vers l'URL :"
#: ../class/m_dom.php:2204
msgid "IPv4 redirect"
diff --git a/ssl/alternc-ssl.install.php b/ssl/alternc-ssl.install.php
index 1aa88112..561fe7bd 100644
--- a/ssl/alternc-ssl.install.php
+++ b/ssl/alternc-ssl.install.php
@@ -30,6 +30,9 @@ if ($argv[1] == "before-reload") {
$db->query("INSERT IGNORE INTO `domaines_type` (name, description, target, entry, compatibility, enable, only_dns, need_dns, advanced ) VALUES
('panel-ssl', 'HTTPS AlternC panel access', 'NONE', '%SUB% IN A @@PUBLIC_IP@@', 'ip,ipv6,cname,txt,mx,mx2,defmx,defmx2', 'ALL', 0, 0, 1);");
+ $db->query("INSERT IGNORE INTO `domaines_type` (name, description, target, entry, compatibility, enable, only_dns, need_dns, advanced ) VALUES
+ ('url-ssl', 'URL redirection, HTTP & HTTPS', 'NONE', '%SUB% IN A @@PUBLIC_IP@@', 'ip,ipv6,cname,txt,mx,mx2,defmx,defmx2', 'ALL', 0, 0, 1);");
+
$db->query("SELECT * FROM domaines_type WHERE name='roundcube';");
if ($db->next_record()) {
$db->query("INSERT IGNORE INTO `domaines_type` (name, description, target, entry, compatibility, enable, only_dns, need_dns, advanced ) VALUES
diff --git a/ssl/templates/url-ssl.conf b/ssl/templates/url-ssl.conf
new file mode 100644
index 00000000..0a6adae2
--- /dev/null
+++ b/ssl/templates/url-ssl.conf
@@ -0,0 +1,27 @@
+
+ ServerName %%fqdn%%
+ AssignUserId #%%UID%% #%%GID%%
+ SetEnv LOGIN "%%UID%%-%%LOGIN%%"
+
+ KeepAlive Off
+
+ RewriteEngine On
+ RewriteCond %{REQUEST_FILENAME} !/cgi-bin/
+ RewriteRule ^/(.*)$ %%redirect%%/$1 [R=301,L]
+
+
+
+ ServerName %%fqdn%%
+ AssignUserId #%%UID%% #%%GID%%
+ SetEnv LOGIN "%%UID%%-%%LOGIN%%"
+
+ SSLEngine On
+ SSLCertificateFile %%CRT%%
+ SSLCertificateKeyFile %%KEY%%
+ %%CHAINLINE%%
+
+ RewriteEngine On
+ RewriteCond %{REQUEST_FILENAME} !/cgi-bin/
+ RewriteRule ^/(.*)$ %%redirect%%/$1 [R=301,L]
+
+