kienan
/
AlternC
mirror of https://github.com/kienanstewart/AlternC.git
1
0
Fork 0
Code Issues Releases Wiki Activity

fixing merge bug with trunk

This commit is contained in:
Benjamin Sonntag 2011-06-04 13:56:10 +00:00
parent f8dfd2b4b8
commit 34526aa906
3 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bureau/locales/en_US/LC_MESSAGES/manual.po
View File

@ -787,10 +787,6 @@ msgstr "-- Only administrators can access this page !! --"
msgid "err_admin_18" msgid "err_admin_18"
msgstr "-- Only administrators can access this page !! --" msgstr "-- Only administrators can access this page !! --"
#, fuzzy
msgid "err_hta_12"
msgstr "An incompatible .htaccess file exists in this folder."
#, fuzzy #, fuzzy
msgid "err_mail_16" msgid "err_mail_16"
msgstr "ldap connexion impossible, please try again later." msgstr "ldap connexion impossible, please try again later."

3
bureau/locales/fr_FR/LC_MESSAGES/manual.po
View File

@ -796,9 +796,6 @@ msgstr ""
"selon votre politique de mot de passe (il n'en contient que %s), merci de " "selon votre politique de mot de passe (il n'en contient que %s), merci de "
"vérifier" "vérifier"
msgid "err_hta_12"
msgstr "Le fichier .htpasswd n'existe pas"
msgid "err_mail_16" msgid "err_mail_16"
msgstr "Ce compte esclave MX existe déjà" msgstr "Ce compte esclave MX existe déjà"

4
debian/po/templates.pot vendored
View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: alternc@packages.debian.org\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" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -213,7 +213,7 @@ msgstr ""
#. Type: select #. Type: select
#. Description #. Description
#: ../templates:11001 #: ../templates:11001
msgid "The way backup rotation is executated" msgid "The way backup rotation is executed"
msgstr "" msgstr ""
#. Type: select #. Type: select