diff options
| author | Joey Hess <joey@gnu.kitenet.net> | 2009-03-27 15:09:41 -0400 |
|---|---|---|
| committer | Joey Hess <joey@gnu.kitenet.net> | 2009-03-27 15:09:41 -0400 |
| commit | 825e2b1378b1def4980e36642ed84999599eb017 (patch) | |
| tree | 8c5225715c9cf7a3405dbc679f124f74ca9983e7 /po | |
| parent | f4a1732b0e65ea4459098e4e852dff10a5af9320 (diff) | |
| parent | c8237b4351f6023b3d3a661df2568c6d7488b8cf (diff) | |
Merge branch 'master' into po
Conflicts:
debian/control
Diffstat (limited to 'po')
| -rw-r--r-- | po/fr.po | 6 | ||||
| -rw-r--r-- | po/ikiwiki.pot | 14 |
2 files changed, 11 insertions, 9 deletions
@@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki 3.04\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-03-08 19:02-0400\n" -"PO-Revision-Date: 2009-02-26 21:28+0100\n" +"POT-Creation-Date: 2009-03-01 15:03-0500\n" +"PO-Revision-Date: 2009-03-15 16:10+0100\n" "Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n" "Language-Team: French <debian-l10n-french@lists.debian.org>\n" "MIME-Version: 1.0\n" @@ -26,6 +26,8 @@ msgid "" "probable misconfiguration: sslcookie is set, but you are attepting to login " "via http, not https" msgstr "" +"Erreur de configuration probable : sslcookie est positionné mais vous tentez " +"de vous connecter avec http et non https" #: ../IkiWiki/CGI.pm:149 msgid "login failed, perhaps you need to turn on cookies?" diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot index ffe2d09e3..94ea19f66 100644 --- a/po/ikiwiki.pot +++ b/po/ikiwiki.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-03-08 19:02-0400\n" +"POT-Creation-Date: 2009-03-15 17:56-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -54,7 +54,7 @@ msgstr "" msgid "You are banned." msgstr "" -#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1209 +#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1211 msgid "Error" msgstr "" @@ -327,18 +327,18 @@ msgstr "" msgid "fortune failed" msgstr "" -#: ../IkiWiki/Plugin/git.pm:624 ../IkiWiki/Plugin/git.pm:642 +#: ../IkiWiki/Plugin/git.pm:626 ../IkiWiki/Plugin/git.pm:644 #: ../IkiWiki/Receive.pm:129 #, perl-format msgid "you are not allowed to change %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:664 +#: ../IkiWiki/Plugin/git.pm:666 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:668 +#: ../IkiWiki/Plugin/git.pm:670 msgid "you are not allowed to change file modes" msgstr "" @@ -1018,12 +1018,12 @@ msgstr "" msgid "failed to load external plugin needed for %s plugin: %s" msgstr "" -#: ../IkiWiki.pm:1192 +#: ../IkiWiki.pm:1194 #, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "" -#: ../IkiWiki.pm:1730 +#: ../IkiWiki.pm:1732 msgid "yes" msgstr "" |