From c483e175a622766794d21fcca779adbc1eecfa3b Mon Sep 17 00:00:00 2001 From: Alexis Lahouze Date: Sat, 4 Jun 2011 15:10:11 +0000 Subject: [PATCH] Fixed merge error. --- bureau/locales/en_US/LC_MESSAGES/manual.po | 4 ---- bureau/locales/fr_FR/LC_MESSAGES/manual.po | 3 --- 2 files changed, 7 deletions(-) diff --git a/bureau/locales/en_US/LC_MESSAGES/manual.po b/bureau/locales/en_US/LC_MESSAGES/manual.po index 64419f98..549137f0 100644 --- a/bureau/locales/en_US/LC_MESSAGES/manual.po +++ b/bureau/locales/en_US/LC_MESSAGES/manual.po @@ -787,10 +787,6 @@ msgstr "-- Only administrators can access this page !! --" msgid "err_admin_18" msgstr "-- Only administrators can access this page !! --" -#, fuzzy -msgid "err_hta_12" -msgstr "An incompatible .htaccess file exists in this folder." - #, fuzzy msgid "err_mail_16" msgstr "ldap connexion impossible, please try again later." diff --git a/bureau/locales/fr_FR/LC_MESSAGES/manual.po b/bureau/locales/fr_FR/LC_MESSAGES/manual.po index 25b0f970..21a32d11 100644 --- a/bureau/locales/fr_FR/LC_MESSAGES/manual.po +++ b/bureau/locales/fr_FR/LC_MESSAGES/manual.po @@ -796,9 +796,6 @@ msgstr "" "selon votre politique de mot de passe (il n'en contient que %s), merci de " "vérifier" -msgid "err_hta_12" -msgstr "Le fichier .htpasswd n'existe pas" - msgid "err_mail_16" msgstr "Ce compte esclave MX existe déjà"