From 34526aa906074878896b183df5b51c22d8b8008b Mon Sep 17 00:00:00 2001 From: Benjamin Sonntag Date: Sat, 4 Jun 2011 13:56:10 +0000 Subject: [PATCH] fixing merge bug with trunk --- bureau/locales/en_US/LC_MESSAGES/manual.po | 4 ---- bureau/locales/fr_FR/LC_MESSAGES/manual.po | 3 --- debian/po/templates.pot | 4 ++-- 3 files changed, 2 insertions(+), 9 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à" diff --git a/debian/po/templates.pot b/debian/po/templates.pot index 0afee2e6..bfca4fed 100644 --- a/debian/po/templates.pot +++ b/debian/po/templates.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: alternc@packages.debian.org\n" -"POT-Creation-Date: 2011-06-04 10:33+0200\n" +"POT-Creation-Date: 2011-06-04 11:34+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -213,7 +213,7 @@ msgstr "" #. Type: select #. Description #: ../templates:11001 -msgid "The way backup rotation is executated" +msgid "The way backup rotation is executed" msgstr "" #. Type: select