Changeset 2992


Ignore:
Timestamp:
06/04/11 15:56:10 (2 years ago)
Author:
benjamin
Message:

fixing merge bug with trunk

Location:
alternc/branches/stable-1.0
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • alternc/branches/stable-1.0/bureau/locales/en_US/LC_MESSAGES/manual.po

    r2987 r2992  
    789789 
    790790#, fuzzy 
    791 msgid "err_hta_12" 
    792 msgstr "An incompatible .htaccess file exists in this folder." 
    793  
    794 #, fuzzy 
    795791msgid "err_mail_16" 
    796792msgstr "ldap connexion impossible, please try again later." 

  • alternc/branches/stable-1.0/bureau/locales/fr_FR/LC_MESSAGES/manual.po

    r2987 r2992  
    797797"vérifier" 
    798798 
    799 msgid "err_hta_12" 
    800 msgstr "Le fichier .htpasswd n'existe pas" 
    801  
    802799msgid "err_mail_16" 
    803800msgstr "Ce compte esclave MX existe déjà" 

  • alternc/branches/stable-1.0/debian/po/templates.pot

    r2973 r2992  
    99"Project-Id-Version: PACKAGE VERSION\n" 
    1010"Report-Msgid-Bugs-To: alternc@packages.debian.org\n" 
    11 "POT-Creation-Date: 2011-06-04 10:33+0200\n" 
     11"POT-Creation-Date: 2011-06-04 11:34+0200\n" 
    1212"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 
    1313"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 
    … …  
    214214#. Description 
    215215#: ../templates:11001 
    216 msgid "The way backup rotation is executated" 
     216msgid "The way backup rotation is executed" 
    217217msgstr "" 
    218218 
Note: See TracChangeset for help on using the changeset viewer.