summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAmitai Schlair <schmonz@magnetic-babysitter.(none)>2009-09-03 19:24:42 -0500
committerAmitai Schlair <schmonz@magnetic-babysitter.(none)>2009-09-03 19:24:42 -0500
commit1888464a0d9de9cf4ac40c298924018437758aa2 (patch)
treeb55aedb4983dd142e966ade8e270fd1d33fc2834
parent85844b8494dd5e032d06afd623c25b4bb4a72578 (diff)
parentf582457ea04a6ce66a2c54ec0731e2569aa30d3f (diff)
Merge branch 'master' of git://github.com/joeyh/ikiwiki
-rw-r--r--debian/changelog9
-rw-r--r--doc/bugs/map_fails_to_close_ul_element_for_empty_list.mdwn2
-rw-r--r--doc/git.mdwn1
-rw-r--r--doc/news/version_3.1415926.mdwn2
-rw-r--r--doc/plugins/contrib/cvs/discussion.mdwn29
-rw-r--r--doc/plugins/contrib/mailbox/discussion.mdwn3
-rw-r--r--doc/plugins/mdwn.mdwn12
-rw-r--r--doc/sandbox/test2.mdwn1
-rw-r--r--doc/security.mdwn2
-rw-r--r--doc/tips/ikiwiki_as_a_requirements_management_tool.mdwn95
-rw-r--r--doc/tips/ikiwiki_as_a_requirements_management_tool/discussion.mdwn18
-rw-r--r--doc/tips/upgrade_to_3.0.mdwn2
-rw-r--r--doc/todo/backlinks_result_is_lossy.mdwn1
-rw-r--r--doc/todo/generated_po_stuff_not_ignored_by_git.mdwn1
-rw-r--r--doc/todo/inline_plugin:_specifying_ordered_page_names.mdwn2
-rw-r--r--doc/todo/optimize_simple_dependencies.mdwn2
-rw-r--r--doc/todo/pagestats_among_a_subset_of_pages.mdwn1
-rw-r--r--doc/todo/should_optimise_pagespecs.mdwn4
-rw-r--r--doc/todo/source_link.mdwn2
-rw-r--r--doc/users/Will.mdwn2
-rw-r--r--po/underlay.setup2
-rw-r--r--po/underlays/basewiki/ikiwiki.fr.po69
-rw-r--r--po/underlays/basewiki/ikiwiki/directive.fr.po132
-rw-r--r--po/underlays/basewiki/ikiwiki/formatting.fr.po291
-rw-r--r--po/underlays/basewiki/ikiwiki/markdown.fr.po49
-rw-r--r--po/underlays/basewiki/ikiwiki/openid.fr.po118
-rw-r--r--po/underlays/basewiki/ikiwiki/pagespec.fr.po236
-rw-r--r--po/underlays/basewiki/ikiwiki/pagespec/attachment.fr.po114
-rw-r--r--po/underlays/basewiki/ikiwiki/pagespec/po.fr.po57
-rw-r--r--po/underlays/basewiki/ikiwiki/searching.fr.po87
-rw-r--r--po/underlays/basewiki/ikiwiki/subpage.fr.po51
-rw-r--r--po/underlays/basewiki/ikiwiki/subpage/linkingrules.fr.po103
-rw-r--r--po/underlays/basewiki/ikiwiki/wikilink.fr.po107
-rw-r--r--po/underlays/basewiki/index.fr.po26
-rw-r--r--po/underlays/basewiki/recentchanges.fr.po37
-rw-r--r--po/underlays/basewiki/sandbox.fr.po88
-rw-r--r--po/underlays/basewiki/shortcuts.fr.po224
-rw-r--r--po/underlays/basewiki/templates.fr.po241
-rw-r--r--po/underlays/basewiki/templates/note.fr.po40
-rw-r--r--po/underlays/basewiki/templates/popup.fr.po46
40 files changed, 2283 insertions, 26 deletions
diff --git a/debian/changelog b/debian/changelog
index ee8e74027..6109a7012 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ikiwiki (3.14159265) UNRELEASED; urgency=low
+
+ * Add French basewiki translation from the Debian French l10n team,
+ including Philippe Batailler, Alexandre Dupas, and Steve Petruzzello.
+
+ -- Joey Hess <joeyh@debian.org> Wed, 02 Sep 2009 15:01:27 -0400
+
ikiwiki (3.1415926) unstable; urgency=high
[ Joey Hess ]
@@ -43,7 +50,7 @@ ikiwiki (3.1415926) unstable; urgency=high
[ Josh Triplett ]
* teximg: Replace the insufficient blacklist with the built-in security
- mechanisms of TeX.
+ mechanisms of TeX. (CVE-2009-2944)
-- Joey Hess <joeyh@debian.org> Sun, 30 Aug 2009 15:20:46 -0400
diff --git a/doc/bugs/map_fails_to_close_ul_element_for_empty_list.mdwn b/doc/bugs/map_fails_to_close_ul_element_for_empty_list.mdwn
index 5e842ca7f..ad0f506f2 100644
--- a/doc/bugs/map_fails_to_close_ul_element_for_empty_list.mdwn
+++ b/doc/bugs/map_fails_to_close_ul_element_for_empty_list.mdwn
@@ -66,8 +66,6 @@ Patch:
>>>>>> The current arrangement looks fine to me. Thanks. --[[harishcm]]
-[[!template id=gitbranch author="[[harishcm]]" branch=smcv/ready/harishcm-map-fix]]
-
> [[merged|done]] --[[Joey]]
Patch:
diff --git a/doc/git.mdwn b/doc/git.mdwn
index 008f109df..16af30584 100644
--- a/doc/git.mdwn
+++ b/doc/git.mdwn
@@ -49,6 +49,7 @@ into [[Joey]]'s working tree. This is recommended. :-)
* [[chrysn]] `git://github.com/github076986099/ikiwiki.git`
* [[simonraven]] `git://github.com/kjikaqawej/ikiwiki-simon.git`
* [[schmonz]] `git://github.com/schmonz/ikiwiki.git`
+* [[will]] `http://www.cse.unsw.edu.au/~willu/ikiwiki.git`
## branches
diff --git a/doc/news/version_3.1415926.mdwn b/doc/news/version_3.1415926.mdwn
index c914c83cd..d31812c8e 100644
--- a/doc/news/version_3.1415926.mdwn
+++ b/doc/news/version_3.1415926.mdwn
@@ -50,4 +50,4 @@ ikiwiki 3.1415926 released with [[!toggle text="these changes"]]
larger in either dimension.
* [ Josh Triplett ]
* teximg: Replace the insufficient blacklist with the built-in security
- mechanisms of TeX."""]] \ No newline at end of file
+ mechanisms of TeX. ([[!cve CVE-2009-2944]])"""]]
diff --git a/doc/plugins/contrib/cvs/discussion.mdwn b/doc/plugins/contrib/cvs/discussion.mdwn
index e142452d0..b5f03ac6f 100644
--- a/doc/plugins/contrib/cvs/discussion.mdwn
+++ b/doc/plugins/contrib/cvs/discussion.mdwn
@@ -93,3 +93,32 @@ the "cvs add <directory>" call and avoid doing anything in that case?
>>> if a configured post-commit hook is missing, and it seems fine,
>>> probably also thanks to IPC::Cmd.
>>> --[[schmonz]]
+
+----
+
+
+Further review.. --[[Joey]]
+
+I don't understand what `cvs_shquote_commit` is
+trying to do with the test message, but it seems
+highly likely to be insecure; I never trust anything
+that relies on safely quoting user input passed to the shell.
+
+(As an aside, `shell_quote` can die on certian inputs.)
+
+Seems to me that, if `IPC::Cmd` exposes input to the shell
+(which I have not verified but its docs don't specify; a bad sign)
+you chose the wrong tool and ended up doing down the wrong
+route, dragging in shell quoting problems and fixes. Since you
+chose to use `IPC::Cmd` just because you wanted to shut
+up CVS stderr, my suggestion would be to use plain `system`
+to run the command, with stderr temporarily sent to /dev/null:
+
+ open(my $savederr, ">&STDERR");
+ open(STDERR, ">", "/dev/null");
+ my $ret=system("cvs", "-Q", @_);
+ open(STDERR, ">$savederr");
+
+`cvs_runcvs` should not take an array reference. It's
+usual for this type of function to take a list of parameters
+to pass to the command.
diff --git a/doc/plugins/contrib/mailbox/discussion.mdwn b/doc/plugins/contrib/mailbox/discussion.mdwn
index 00fb0c05f..9520fdd70 100644
--- a/doc/plugins/contrib/mailbox/discussion.mdwn
+++ b/doc/plugins/contrib/mailbox/discussion.mdwn
@@ -3,3 +3,6 @@
For some reason, `git fetch` from http://pivot.cs.unb.ca/git/ikimailbox.git/ didn't work very smoothly for me: it hung, and I had to restart it 3 times before the download was complete.
I'm writing this just to let you know that there might be some problems with such connections to your http-server. --Ivan Z.
+> I can't replicate this (two months later!)
+> I can suggest trying the git:// url for download if you can.
+> Also, if you really want to get my attention, send me email [[DavidBremner]]
diff --git a/doc/plugins/mdwn.mdwn b/doc/plugins/mdwn.mdwn
index 6ad1fb229..ce1b6097a 100644
--- a/doc/plugins/mdwn.mdwn
+++ b/doc/plugins/mdwn.mdwn
@@ -12,9 +12,9 @@ this plugin. The [original version of
markdown](http://daringfireball.net/projects/markdown/) can be used, or the
[[!cpan Text::Markdown]] perl module.
-[[!cpan Text::Markdown]] also includes a markdown variant called
-[multimarkdown](http://fletcherpenney.net/MultiMarkdown/), which supports
-tables, footnotes, and other new features. Multimarkdown is not enabled by
-default, but can be turned on via the `multimarkdown` option in the setup
-file. Note that multimarkdown's metadata and wikilinks features are
-disabled when it's used with ikiwiki.
+[[!cpan Text::MultiMarkdown]] can be used in order to use tables, footnotes,
+and other new features from the markdown variant called
+[multimarkdown](http://fletcherpenney.net/MultiMarkdown/). Multimarkdown is
+not enabled by default, but can be turned on via the `multimarkdown` option
+in the setup file. Note that multimarkdown's metadata and wikilinks
+features are disabled when it's used with ikiwiki.
diff --git a/doc/sandbox/test2.mdwn b/doc/sandbox/test2.mdwn
new file mode 100644
index 000000000..3e50e68f3
--- /dev/null
+++ b/doc/sandbox/test2.mdwn
@@ -0,0 +1 @@
+this is test two, being pushed by [[tips/untrusted_git_push]].
diff --git a/doc/security.mdwn b/doc/security.mdwn
index 200ae29e2..3924186c2 100644
--- a/doc/security.mdwn
+++ b/doc/security.mdwn
@@ -426,4 +426,4 @@ bypassed and used to read arbitrary files. This was fixed by
enabling TeX configuration options that disallow unsafe TeX commands.
The fix was released on 30 Aug 2009 in version 3.1415926, and was
backported to stable in version 2.53.4. If you use the teximg plugin,
-I recommend upgrading.
+I recommend upgrading. ([[!cve CVE-2009-2944]])
diff --git a/doc/tips/ikiwiki_as_a_requirements_management_tool.mdwn b/doc/tips/ikiwiki_as_a_requirements_management_tool.mdwn
new file mode 100644
index 000000000..6bef2619e
--- /dev/null
+++ b/doc/tips/ikiwiki_as_a_requirements_management_tool.mdwn
@@ -0,0 +1,95 @@
+[[!template id=note text="**Table of contents** [[!toc ]]"]]
+
+Introduction
+------------
+At work textual requirements and traceability are daily use terms, often used as contracts with clients or among stakeholders, but at the moment the only way we specify requirements is via a word processor, and traceability is managed manually (ouch!) unless we use a commercial UML (Unified Modeling Language) tool that handles office files, an also allows traceability from design, code and test artifacts. But functionality of that tool is less than basic for requirements.
+
+We are considering the use of a specific requirements management tool, but the problem and something that gets me really frustrated is the extremely expensive price of the licenses of the "de facto" commercial tools we should use. One floating license for both tools (requirements management and modeling) can go beyond $20,000. Of course we can purchase cheaper ones, but I'm tired of this licensing nightmare of worrying about how many licenses are being used, praying not to exceed the limit or restarting a dead license server. We pay companies to not trust us. Taking a look at the FLOSS world doesn't seem to add any reasonable alternative.
+
+These are the raw high level features of the tool I'd like to use:
+
+ * Requirements edition
+ * Requirements attributes edition
+ * Traceability: edition, coverage analysis and navigation
+ * External traceability: from requirements in one document/module to requirements in other one (eg: software requirements tracing to system requirements). Note: a set of requirements will be called "module" hereafter in this page.
+ * Requirements identifiers management
+ * Requirements history and diff/blame
+ * Team work
+ * Easy integration with other software lifecycle tools: modeling (eg. BOUML), project management (eg. Trac)
+ * Support for other formats such as HTML, office...
+ * Filtering and searching
+ * Export facilities to create standards compliant documentation.
+
+Initial idea was to develop a simple web solution using XHTML files. These files would be created in a web broser with existing WYSIWIM editors and store all the stuff in Subversion. All requirements would be stored at the same level (no hierarchies among requirements of the same module) and atomically accessible via a simple web browser. No server side programming would be needed to read requirements. Also special XHTML files (let's call it "views") would be necessary to group requirements hierarchically in a requirements document fashion, using xinclude.
+
+When I first played with ikiwiki I was so happy that many of the ideas I worked on were already in use in this marvelous piece of software, specially the decision to use well-known RCS software to manage history instead of reinventing the wheel, opening also one interesting feature: off-line edition. Other similarity was the absence of special processing for read-only navigation.
+
+So, let's now take all the features above and describe how to make them real using ikiwiki and some simple conventions. Some features would need new functionality and improvement, I'd really appreciate additional ideas on how to better get to the point.
+
+Requirements edition
+--------------------
+Suppose that all requirements would reside under a concrete folder. We will call it "reqs", and under "reqs" we add as folders as requirements modules we want to use for a system called "foo" (eg. "foo_sss" for system requirements, "foo_srs" for software requirements...). Index file for each document shall be a page summarizing the module: number of requirements, basic coverage information... Other similar pages under the "views" folder could be used in order to have different sets of requirements including additional stuff: introduction, document identification, etc... The rest of the files - actually requirements - shall be markdown files. So editing a requirement would be as simple as adding a page to the wiki.
+
+To create the summary and views, just [[ikiwiki/directive/inline]] and [[ikiwiki/directive/pagecount]] directives could provide nice pages. The uncomfortable part is having to use many [[pagespecs|ikiwiki/PageSpec]] to create the whole views, but it actually shoud work. One possible workaround would be an external tool to handle this and create directives automatically or graphically.
+
+Requirements attributes
+-----------------------
+There are lots of useful data to associate to a requirement. Eg:
+
+ * If it is traceable or not
+ * Its criticality level
+ * Its priority
+ * If it is funtional or not
+
+How to implement this? Using [[ikiwiki/directive/meta]] could be a solution, not tried yet, I'd rather keep requirements content alone. Storing this information in SVN it is easy, although ikiwiki does not provide a way to do it it would imply really little effort. The requirement in itself is the content of the file; attributes are stored as key-value pairs in the file's properties. AFAIK this is a feature available only in SVN, although git has something similar (gitattributes) although path based, but anyway whichever RCS is used, a ".properties" file could be created always when a requirement file is created.
+
+Traceability: edition, coverage analysis and navigation
+--------------------------------------------------------
+This is the most important feature of a requirements engineering tool. How to do this with ikiwiki? There are some ways, from extremely simple ones to more sophisticated:
+
+ * One simple solution: Links. Just link from one requirement to another one to create a traceable directional connection
+ * One harder: file attributes (see section about requirements just above)
+
+For coverage analysis , using [[ikiwiki/directive/pagecount]] is the perfect solution to summarize and show covered and uncovered requirements. We could add several pages per module - probably using template pages- with ready made coverage analysis reports... Wow!!! [[ikiwiki/directive/linkmap]] directive can show traceability information graphically.
+
+Navigating among requirements needs... Nothing!!! Just follow the links of referring pages that ikiwiki adds by default.
+
+External traceability
+---------------------
+Being just different folders under the wiki, external traceability is as easy as internal.
+
+Requirements identifiers management
+-----------------------------------
+Another useful convention: requirement identifier shall be the name of the requirements file. In ikiwiki page title is the same as requirement Id. No trouble, it works. I personally prefer to keep title as page title and create a short auto-increasing numeric codes with prefixes and/or suffixes as file name (eg. SRS_FOO_0001, SSS_FOO_002), hope to have somethig running soon.
+
+Requirements history and diff/blame
+-----------------------------------
+Out of the box! And really much more useful than average diffing components of requirement management tools. There are plenty online front ends to use and for offline work tools like meld are awesome.
+
+Team work
+---------
+Also no need to do anything, RCS software does it all. Also for experienced users merging and conflict solving can provide much more practical solutions (most requirements management tools work blocking).
+
+Easy integration with other software lifecycle tools
+----------------------------------------------------
+Modeling tools: as a general rule, store model elements in the most atomic parts: classes, enums, actors, use cases... and use again file attributes to store traceability information. Other way is transforming files representing these atomic model parts in independent mdwn files under, for example, a "mdl" folder
+
+Trac integration is so simple... As simple as any PM tool that acceses the same RCS as ikiwiki does. Diffing, blaming, even navigating directly to ikiwiki generated pages. Integration of a ticketing system will give awesome power to all the team.
+
+Support for other formats
+-------------------------
+Out of the box, at least for wiki and mathematical formats, and creating additional ones shouldn't be so difficult.
+
+Filtering and searching
+-----------------------
+Look that box in the top right corner?
+
+Export facilities
+-----------------
+Views with custom styles and html conversion tools would be enough for most purposes.
+
+That's all!
+
+One funny thing: our "de facto future" requirements management tool, after years of research included some years ago a really nice feature: a Discussion tag per each requirement... See this in ikiwiki? Again out of the box!!!
+
+Comments are really welcome!!!
diff --git a/doc/tips/ikiwiki_as_a_requirements_management_tool/discussion.mdwn b/doc/tips/ikiwiki_as_a_requirements_management_tool/discussion.mdwn
new file mode 100644
index 000000000..94f0f8b4b
--- /dev/null
+++ b/doc/tips/ikiwiki_as_a_requirements_management_tool/discussion.mdwn
@@ -0,0 +1,18 @@
+How about using tags/links to associate attributes with requirements?
+This could be as simple as adding a link, fo e.g. :
+
+ * If it is traceable or not
+ + \[[attributes/traceable]]
+ + \[[attributes/untraceable]]
+ * Its criticality level
+ + \[[attributes/level/critical]]
+ + \[[attributes/level/important]]
+ + etc.
+ * Its priority
+ + \[[attributes/priority/low]]
+ + \[[attributes/priority/high]]
+ * If it is functional or not
+ + \[[attributes/functional]]
+ + \[[attributes/non-functional]]
+
+You just have to create pages for each attribute you want and then pagespec could be used to filter requirements by attributes. I think something similar is used to trac bug with ikiwiki (linking to a \[[done]] page, etc.).
diff --git a/doc/tips/upgrade_to_3.0.mdwn b/doc/tips/upgrade_to_3.0.mdwn
index d22813bf2..05b6d6fbd 100644
--- a/doc/tips/upgrade_to_3.0.mdwn
+++ b/doc/tips/upgrade_to_3.0.mdwn
@@ -45,7 +45,7 @@ contain the above, then run `ikiwiki-transition prefix_directives your.setup`
## GlobLists
In 3.0, the old "GlobList" syntax for [[PageSpecs|ikiwiki/PageSpec]] is no
-longer supported. A GlobList contains multiple term, but does not separate
+longer supported. A GlobList contains multiple terms, but does not separate
them with "and" or "or":
sandbox !*/Discussion
diff --git a/doc/todo/backlinks_result_is_lossy.mdwn b/doc/todo/backlinks_result_is_lossy.mdwn
index 11b5fbcae..2a9fc4a0a 100644
--- a/doc/todo/backlinks_result_is_lossy.mdwn
+++ b/doc/todo/backlinks_result_is_lossy.mdwn
@@ -1,5 +1,4 @@
[[!tag patch patch/core]]
-[[!template id=gitbranch branch=smcv/ready/among author="[[smcv]]"]]
IkiWiki::backlinks returns a form of $backlinks{$page} that has undergone a
lossy transformation (to get it in the form that page templates want), making
diff --git a/doc/todo/generated_po_stuff_not_ignored_by_git.mdwn b/doc/todo/generated_po_stuff_not_ignored_by_git.mdwn
index 1d24fd385..29c017c5d 100644
--- a/doc/todo/generated_po_stuff_not_ignored_by_git.mdwn
+++ b/doc/todo/generated_po_stuff_not_ignored_by_git.mdwn
@@ -1,4 +1,3 @@
-[[!template id=gitbranch branch=smcv/gitignore author="[[smcv]]"]]
[[!tag patch]]
The recent merge of the po branch didn't come with a .gitignore.
diff --git a/doc/todo/inline_plugin:_specifying_ordered_page_names.mdwn b/doc/todo/inline_plugin:_specifying_ordered_page_names.mdwn
index bbde04f83..85bb4ff5a 100644
--- a/doc/todo/inline_plugin:_specifying_ordered_page_names.mdwn
+++ b/doc/todo/inline_plugin:_specifying_ordered_page_names.mdwn
@@ -1,5 +1,3 @@
-[[!template id=gitbranch branch=smcv/ready/inline-pagenames author="[[smcv]]"]]
-
A [[!taglink patch]] in my git repository (the inline-pagenames branch) adds
the following parameter to the [[ikiwiki/directive/inline]] directive:
diff --git a/doc/todo/optimize_simple_dependencies.mdwn b/doc/todo/optimize_simple_dependencies.mdwn
index 91e184c29..6f6284303 100644
--- a/doc/todo/optimize_simple_dependencies.mdwn
+++ b/doc/todo/optimize_simple_dependencies.mdwn
@@ -1,5 +1,3 @@
-[[!template id=gitbranch branch=smcv/ready/depends-exact author="[[smcv]]"]]
-
I'm still trying to optimize ikiwiki for a site using
[[plugins/contrib/album]], and checking which pages depend on which pages
is still taking too long. Here's another go at fixing that, using [[Will]]'s
diff --git a/doc/todo/pagestats_among_a_subset_of_pages.mdwn b/doc/todo/pagestats_among_a_subset_of_pages.mdwn
index fd15d6a42..33f9258fd 100644
--- a/doc/todo/pagestats_among_a_subset_of_pages.mdwn
+++ b/doc/todo/pagestats_among_a_subset_of_pages.mdwn
@@ -1,5 +1,4 @@
[[!tag patch plugins/pagestats]]
-[[!template id=gitbranch branch=smcv/ready/among author="[[smcv]]"]]
My `among` branch fixes [[todo/backlinks_result_is_lossy]], then uses that
to provide pagestats for links from a subset of pages. From the docs included
diff --git a/doc/todo/should_optimise_pagespecs.mdwn b/doc/todo/should_optimise_pagespecs.mdwn
index 4b4e267f0..728ab8994 100644
--- a/doc/todo/should_optimise_pagespecs.mdwn
+++ b/doc/todo/should_optimise_pagespecs.mdwn
@@ -79,8 +79,6 @@ I can think about reducung the size of my wiki source and making it available on
>
> --[[Joey]]
-[[!template id=gitbranch branch=smcv/ready/optimize-depends author="[[smcv]]"]]
-
>> I've been looking at optimizing ikiwiki for a site using
>> [[plugins/contrib/album]] (which produces a lot of pages) and it seems
>> that checking which pages depend on which pages does take a significant
@@ -100,8 +98,6 @@ I can think about reducung the size of my wiki source and making it available on
>>>> I haven't actually deleted it), because the "or" operation is now done in
>>>> the Perl code, rather than by merging pagespecs and translating. --[[smcv]]
-[[!template id=gitbranch branch=smcv/ready/remove-pagespec-merge author="[[smcv]]"]]
-
>>>>> I've now added a patch to the end of that branch that deletes
>>>>> `pagespec_merge` almost entirely (we do need to keep a copy around, in
>>>>> ikiwiki-transition, but that copy doesn't have to be optimal or support
diff --git a/doc/todo/source_link.mdwn b/doc/todo/source_link.mdwn
index dfc2766cc..cf3e69487 100644
--- a/doc/todo/source_link.mdwn
+++ b/doc/todo/source_link.mdwn
@@ -11,8 +11,6 @@ All of this code is licensed under the GPLv2+. -- [[Will]]
> by loading the index with IkiWiki::loadindex, like [[plugins/goto]] does?
> --[[smcv]]
-[[!template id=gitbranch branch=smcv/ready/getsource
- author="[[Will]]/[[smcv]]"]]
[[done]]
>> I've applied the patch below in a git branch, fixed my earlier criticism,
diff --git a/doc/users/Will.mdwn b/doc/users/Will.mdwn
index 9c46edc69..043203dc3 100644
--- a/doc/users/Will.mdwn
+++ b/doc/users/Will.mdwn
@@ -4,6 +4,8 @@ Lately I've been using Ikiwiki for other things and seem to be scratching a few
I generally use my [[ikiwiki/openid]] login when editing here: <http://www.cse.unsw.edu.au/~willu/>
+I have a git repository for some of my IkiWiki code: <http://www.cse.unsw.edu.au/~willu/ikiwiki.git>.
+
Generic License Grant
-----------------
diff --git a/po/underlay.setup b/po/underlay.setup
index 237acef5d..a7d307e71 100644
--- a/po/underlay.setup
+++ b/po/underlay.setup
@@ -7,9 +7,9 @@ use IkiWiki::Setup::Standard {
# Listing languages without active translations
# will excessively bloat things.
po_slave_languages => {
- #'fr' => 'Français',
#'es' => 'Español',
#'de' => 'Deutsch',
+ 'fr' => 'Français',
'da' => 'Dansk',
'cs' => 'česky',
},
diff --git a/po/underlays/basewiki/ikiwiki.fr.po b/po/underlays/basewiki/ikiwiki.fr.po
new file mode 100644
index 000000000..6fceab6f2
--- /dev/null
+++ b/po/underlays/basewiki/ikiwiki.fr.po
@@ -0,0 +1,69 @@
+# Traduction de ikiwiki
+# Copyright (C) 2009 Debian French l10n team <debian-l10n-french@lists.debian.org>
+# This file is distributed under the same license as the PACKAGE Ikiwiki.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: ikiwiki\n"
+"POT-Creation-Date: 2009-08-15 18:30-0300\n"
+"PO-Revision-Date: 2009-08-30 09:46+0200\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"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"This wiki is powered by [ikiwiki](http://ikiwiki.info/).\n"
+"[[!if test=\"enabled(version)\"\n"
+" then=\"(Currently running version [[!version ]].)\"\n"
+"]]\n"
+msgstr ""
+"Ce wiki est propulsé par [ikiwiki](http://ikiwiki.info/).\n"
+"[[!if test=\"enabled(version)\"\n"
+" then \"(version actuelle : [[!version ]].)\"\n"
+"]]\n"
+
+#. type: Plain text
+msgid "Some documentation on using ikiwiki:"
+msgstr "Voici quelques pages de documentation sur l'utilisation d'ikiwiki :"
+
+#. type: Bullet: '* '
+msgid "[[ikiwiki/formatting]]"
+msgstr "[[ikiwiki/formatting]]"
+
+#. type: Bullet: '* '
+msgid "[[ikiwiki/wikilink]]"
+msgstr "[[ikiwiki/wikilink]]"
+
+#. type: Bullet: '* '
+msgid "[[ikiwiki/subpage]]"
+msgstr "[[ikiwiki/subpage]]"
+
+#. type: Bullet: '* '
+msgid "[[ikiwiki/pagespec]]"
+msgstr "[[ikiwiki/pagespec]]"
+
+#. type: Bullet: '* '
+msgid "[[ikiwiki/directive]]"
+msgstr "[[ikiwiki/directive]]"
+
+#. type: Bullet: '* '
+msgid "[[ikiwiki/markdown]]"
+msgstr "[[ikiwiki/markdown]]"
+
+#. type: Bullet: '* '
+msgid "[[ikiwiki/openid]]"
+msgstr "[[ikiwiki/openid]]"
+
+#. type: Bullet: '* '
+msgid "[[ikiwiki/searching]]"
+msgstr "[[ikiwiki/searching]]"
diff --git a/po/underlays/basewiki/ikiwiki/directive.fr.po b/po/underlays/basewiki/ikiwiki/directive.fr.po
new file mode 100644
index 000000000..b4d7513c9
--- /dev/null
+++ b/po/underlays/basewiki/ikiwiki/directive.fr.po
@@ -0,0 +1,132 @@
+# Traduction de ikiwiki
+# Copyright (C) 2009 Debian French l10n team <debian-l10n-french@lists.debian.org>
+# This file is distributed under the same license as the PACKAGE Ikiwiki.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: ikiwiki\n"
+"POT-Creation-Date: 2009-08-15 18:30-0300\n"
+"PO-Revision-Date: 2009-08-25 11:25+0200\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"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bits\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
+
+#. type: Plain text
+msgid ""
+"Directives are similar to a [[ikiwiki/WikiLink]] in form, except they begin "
+"with `!` and may contain parameters. The general form is:"
+msgstr ""
+"Les directives sont semblables aux [[ikiwiki/WikiLink]] mais elles "
+"commencent par un `!` et peuvent contenir des paramètres. La forme d'une "
+"directive est la suivante :"
+
+#. type: Plain text
+#, no-wrap
+msgid "\t\\[[!directive param=\"value\" param=\"value\"]]\n"
+msgstr "\t\\[[!directive param=\"value\" param=\"value\"]]\n"
+
+#. type: Plain text
+msgid ""
+"This gets expanded before the rest of the page is processed, and can be used "
+"to transform the page in various ways."
+msgstr ""
+"Le contenu de cette directive est traité avant que la page ne soit traitée "
+"et cela peut être utilisé pour modifier cette page."
+
+#. type: Plain text
+msgid ""
+"The quotes around values can be omitted if the value is a simple word. "
+"Also, some directives may use parameters without values, for example:"
+msgstr ""
+"Les guillements autour des valeurs des paramètres peuvent être omis si cette "
+"valeur est un simple mot. D'autre part, certaines directives peuvent avoir "
+"des paramètres sans valeur, par exemple : "
+
+#. type: Plain text
+#, no-wrap
+msgid "\t\\[[!tag foo]]\n"
+msgstr "\t\\[[!tag foo]]\n"
+
+#. type: Plain text
+msgid ""
+"A directive does not need to all be on one line, it can be wrapped to "
+"multiple lines if you like:"
+msgstr ""
+"Il n'est pas nécessaire d'écrire une directive sur une seule ligne ; elle "
+"peut l'être sur plusieurs si vous préférez. Par exemple :"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"\t\\[[!directive foo=\"baldersnatch\"\n"
+"\tbar=\"supercalifragilisticexpialidocious\" baz=11]]\n"
+msgstr ""
+"\t\\[[!directive foo=\"baldersnatch\"\n"
+"\tbar=\"supercalifragilisticexpialidocious\" baz=11]]\n"
+
+#. type: Plain text
+msgid ""
+"Also, multiple lines of *quoted* text can be used for a value. To allow "
+"quote marks inside the quoted text, delimit the block of text with triple-"
+"quotes:"
+msgstr ""
+"De plus, une *citation* sur plusieurs lignes peut servir de valeur. Pour "
+"autoriser les guillemets du texte, il suffit de mettre trois séries de "
+"guillemets autour du texte :"
+
+#. type: Plain text
+#, no-wrap
+msgid "\t\\[[!directive text=\"\"\"\n"
+msgstr "\t\\[[!directive text=\"\"\"\n"
+
+#. type: Bullet: ' 1. '
+msgid "\"foo\""
+msgstr "\"foo\""
+
+#. type: Bullet: ' 2. '
+msgid "\"bar\""
+msgstr "\"bar\""
+
+#. type: Bullet: ' 3. '
+msgid "\"baz\""
+msgstr "\"baz\""
+
+#. type: Plain text
+msgid ""
+"ikiwiki also has an older syntax for directives, which requires a space in "
+"directives to distinguish them from [[wikilinks|ikiwiki/wikilink]]. This "
+"syntax has several disadvantages: it requires a space after directives with "
+"no parameters (such as `\\[[pagecount ]]`), and it prohibits spaces in "
+"[[wikilinks|ikiwiki/wikilink]]. ikiwiki now provides the `!`-prefixed "
+"syntax shown above as default. However, ikiwiki still supports wikis using "
+"the older syntax, if the `prefix_directives` option is disabled."
+msgstr ""
+"Il existe aussi une ancienne syntaxe pour les directives. Elle demande un "
+"espace dans la directive pour les distinguer des [[wikilinks|ikiwiki/"
+"wikilink]]. Cette syntaxe a plusieurs défauts : elle demande un espace après "
+"une directive sans paramètre, comme `\\[[pagecount ]]`, et elle interdit les "
+"espaces dans les [[wikilinks|ikiwiki/wikilink]]. Par défaut, ikiwiki utilise "
+"maintenant la syntaxe montrée plus haut, avec le `!`. Cependant, l'ancienne "
+"syntaxe est toujours acceptée, une fois que l'option `prefix_directives` est "
+"désactivée."
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!if test=\"enabled(listdirectives)\" then=\"\"\"\n"
+msgstr "[[!if test=\"enabled(listdirectives)\" then=\"\"\"\n"
+
+#. type: Plain text
+msgid "Here is a list of currently available directives in this wiki:"
+msgstr "Voici une liste des directives actuellement disponibles sur ce wiki :"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!listdirectives ]]\n"
+msgstr "[[!listdirectives ]]\n"
diff --git a/po/underlays/basewiki/ikiwiki/formatting.fr.po b/po/underlays/basewiki/ikiwiki/formatting.fr.po
new file mode 100644
index 000000000..05231364e
--- /dev/null
+++ b/po/underlays/basewiki/ikiwiki/formatting.fr.po
@@ -0,0 +1,291 @@
+# Traduction de ikiwiki
+# Copyright (C) 2009 Debian French l10n team <debian-l10n-french@lists.debian.org>
+# This file is distributed under the same license as the PACKAGE Ikiwiki.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: ikiwiki\n"
+"POT-Creation-Date: 2009-08-26 13:39-0300\n"
+"PO-Revision-Date: 2009-08-26 21:18+0200\n"
+"Last-Translator: Philippe Batailler <philippe.batailler@fre.fr>\n"
+"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bits\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta title=\"Formatting wiki pages\"]]\n"
+msgstr "[[!meta title=\"Formater les pages\"]]\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
+
+#. type: Plain text
+msgid ""
+"Text on this wiki is, by default, written in a form very close to how you "
+"might write text for an email message. This style of text formatting is "
+"called [[MarkDown]], and it works like this:"
+msgstr ""
+"Sur ce wiki, la mise en forme du texte est semblable à celle utilisée dans "
+"les courriels. Ce style de formatage s'appelle [[MarkDown]]. Voici comment "
+"il fonctionne :"
+
+#. type: Plain text
+msgid "Leave blank lines between paragraphs."
+msgstr "Lignes vides entre les paragraphes."
+
+#. type: Plain text
+msgid ""
+"You can *\\*emphasise\\** or **\\*\\*strongly emphasise\\*\\*** text by "
+"placing it in single or double asterisks."
+msgstr ""
+"Texte en *\\*italique\\** avec un astérisque ou texte en **\\*\\*gras\\*"
+"\\*** avec deux astérisques."
+
+#. type: Plain text
+msgid "To create a list, start each line with an asterisk:"
+msgstr "Une liste, chaque ligne commençant par un astérisque :"
+
+#. type: Bullet: '* '
+msgid "\"* this is my list\""
+msgstr "\"* ma liste\""
+
+#. type: Bullet: '* '
+msgid "\"* another item\""
+msgstr "\"* un autre élément\""
+
+#. type: Plain text
+msgid ""
+"To make a numbered list, start each line with a number (any number will do) "
+"followed by a period:"
+msgstr ""
+"Une liste numérotée, chaque ligne commençant par un chiffre (n'importe "
+"lequel), suivi d'un point :"
+
+#. type: Bullet: '1. '
+msgid "\"1. first line\""
+msgstr "\"1. première ligne\""
+
+#. type: Bullet: '2. '
+msgid "\"2. second line\""
+msgstr "\"2. deuxième ligne\""
+
+#. type: Bullet: '2. '
+msgid "\"2. third line\""
+msgstr "\"2. troisième ligne\""
+
+#. type: Plain text
+msgid ""
+"To create a header, start a line with one or more `#` characters followed by "
+"a space and the header text. The number of `#` characters controls the size "
+"of the header:"
+msgstr ""
+"Un titre, une ligne commençant par un ou plusieurs caractères `#` suivis "
+"d'un caractère espace et du texte du titre. Le nombre de `#` détermine la "
+"taille du titre :"
+
+#. type: Title #
+#, no-wrap
+msgid "# h1"
+msgstr "# h1"
+
+#. type: Title ##
+#, no-wrap
+msgid "## h2"
+msgstr "## h2"
+
+#. type: Title ###
+#, no-wrap
+msgid "### h3"
+msgstr "### h3"
+
+#. type: Title ####
+#, no-wrap
+msgid "#### h4"
+msgstr "#### h4"
+
+#. type: Title #####
+#, no-wrap
+msgid "##### h5"
+msgstr "##### h5"
+
+#. type: Title ######
+#, no-wrap
+msgid "###### h6"
+msgstr "###### h6"
+
+#. type: Plain text
+msgid ""
+"To create a horizontal rule, just write three or more dashes or stars on "
+"their own line:"
+msgstr ""
+"Une règle horizontale, au moins trois tirets ou étoiles sur la même ligne :"
+
+#. type: Plain text
+#, no-wrap
+msgid "To quote someone, prefix the quote with \">\":\n"
+msgstr "Pour citer quelqu'un, faire précéder la citation de \">\" :\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"> To be or not to be,\n"
+"> that is the question.\n"
+msgstr ""
+"> To be or not to be,\n"
+"> that is the question.\n"
+
+#. type: Plain text
+msgid "To write a code block, indent each line with a tab or 4 spaces:"
+msgstr ""
+"Un morceau de code, faire précéder chaque ligne par une tabulation ou quatre "
+"espaces :"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"\t10 PRINT \"Hello, world!\"\n"
+"\t20 GOTO 10\n"
+msgstr ""
+"\t10 PRINT \"Hello, world!\"\n"
+"\t20 GOTO 10\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"To link to an url or email address, you can just put the\n"
+"url in angle brackets: <<http://ikiwiki.info>>, or you can use the\n"
+"form \\[link text\\]\\(url\\)\n"
+msgstr ""
+"Pour créer un lien avec une URL ou une adresse électronique,\n"
+"mettre l'URL entre crochets, <<http://ikiwiki.info>>,\n"
+"ou utiliser la forme \\[texte du lien\\]\\(url\\)\n"
+
+#. type: Plain text
+msgid ""
+"In addition to basic html formatting using [[MarkDown]], this wiki lets you "
+"use the following additional features:"
+msgstr ""
+"En plus du formatage html élémentaire avec [[MarkDown]], ce wiki offre "
+"d'autres possibilités :"
+
+#. type: Bullet: '* '
+msgid ""
+"To link to another page on the wiki, place the page's name inside double "
+"square brackets. So you would use `\\[[WikiLink]]` to link to [[WikiLink]]."
+msgstr ""
+"Pour créer un lien vers une autre page du wiki, mettre le nom de la page "
+"entre deux paires de crochets. Ainsi, utilisez `\\[[WikiLink]]` pour un lien "
+"avec [[WikiLink]]."
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!if test=\"enabled(smiley) and smileys\" then=\"\"\"\n"
+msgstr "[[!if test=\"enabled(smiley) and smileys\" then=\"\"\"\n"
+
+#. type: Bullet: '* '
+msgid "Insert [[smileys]] and some other useful symbols. :-)"
+msgstr "Insérer des [[smileys]] et d'autres symboles très utiles :-)"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!if test=\"enabled(shortcut) and shortcuts\" then=\"\"\"\n"
+msgstr "[[!if test=\"enabled(shortcut) and shortcuts\" then=\"\"\"\n"
+
+#. type: Bullet: '* '
+msgid "Use [[shortcuts]] to link to common resources."
+msgstr "Utiliser des [[shortcuts]] pour renvoyer à des ressources communes."
+
+#. type: Plain text
+#, no-wrap
+msgid "\t\\[[!wikipedia War\\_of\\_1812]]\n"
+msgstr "\t\\[[!wikipedia War\\_of\\_1812]]\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!if test=\"enabled(template) and templates\" then=\"\"\"\n"
+msgstr "[[!if test=\"enabled(template) and templates\" then=\"\"\"\n"
+
+#. type: Bullet: '* '
+msgid ""
+"Create and fill out [[templates]] for repeated chunks of parameterized wiki "
+"text."
+msgstr ""
+"Créer et utiliser des modèles ([[templates]]) pour répéter des morceaux de "
+"texte standard."
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"* Insert various [[directives|directive]] onto a page to perform useful\n"
+" actions.\n"
+"[[!if test=\"enabled(toc) or enabled(meta) or enabled(inline)\" then=\"\"\"\n"
+msgstr ""
+"Insérer diverses [[directives|directive]] sur une page pour modifier cette page.\n"
+"[[!if test=\"enabled(toc) or enabled(meta) or enabled(inline)\" then=\"\"\"\n"
+
+#. type: Plain text
+#, no-wrap
+msgid " For example, you can:\n"
+msgstr " Par exemple, vous pouvez :\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!if test=\"enabled(toc)\" then=\"\"\"\n"
+msgstr "[[!if test=\"enabled(toc)\" then=\"\"\"\n"
+
+#. type: Bullet: ' * '
+msgid "Add a table of contents to a page:"
+msgstr "ajouter une table des matières sur une page :"
+
+#. type: Plain text
+#, no-wrap
+msgid "\t\\[[!toc]]\n"
+msgstr "\t\\[[!toc]]\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!if test=\"enabled(meta)\" then=\"\"\"\n"
+msgstr "[[!if test=\"enabled(meta)\" then=\"\"\"\n"
+
+#. type: Bullet: ' * '
+msgid "Change the title of a page:"
+msgstr "changer le titre d'une page :"
+
+#. type: Plain text
+#, no-wrap
+msgid "\t\\[[!meta title=\"full page title\"]]\n"
+msgstr "\t\\[[!meta title=\"titre complet de la page\"]]\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!if test=\"enabled(inline)\" then=\"\"\"\n"
+msgstr "[[!if test=\"enabled(inline)\" then=\"\"\"\n"
+
+#. type: Bullet: ' * '
+msgid "Create a blog by inlining a set of pages:"
+msgstr ""
+"créer un blog en enchaînant un ensemble de pages (directive « inline ») :"
+
+#. type: Plain text
+#, no-wrap
+msgid "\t\\[[!inline pages=\"blog/*\"]]\n"
+msgstr "\t\\[[!inline pages=\"blog/*\"]]\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!if test=\"enabled(listdirectives)\" then=\"\"\"\n"
+msgstr "[[!if test=\"enabled(listdirectives)\" then=\"\"\"\n"
+
+#. type: Plain text
+#, no-wrap
+msgid " Full list of [[directives|directive]] enabled for this wiki:\n"
+msgstr " Voici la liste complète des directives activées sur ce wiki :\n"
+
+#. type: Plain text
+#, no-wrap
+msgid " [[!listdirectives ]]\n"
+msgstr " [[!listdirectives ]]\n"
diff --git a/po/underlays/basewiki/ikiwiki/markdown.fr.po b/po/underlays/basewiki/ikiwiki/markdown.fr.po
new file mode 100644
index 000000000..71dc70c64
--- /dev/null
+++ b/po/underlays/basewiki/ikiwiki/markdown.fr.po
@@ -0,0 +1,49 @@
+# Traduction de ikiwiki
+# Copyright (C) 2009 Debian French l10n team <debian-l10n-french@lists.debian.org>
+# This file is distributed under the same license as the PACKAGE Ikiwiki.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: ikiwiki\n"
+"POT-Creation-Date: 2009-08-15 18:30-0300\n"
+"PO-Revision-Date: 2009-08-25 09:31+0200\n"
+"Last-Translator: Alexandre Dupas <alexandre.dupas@gmail.com>\n"
+"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bits\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
+
+#. type: Plain text
+msgid ""
+"[Markdown](http://daringfireball.net/projects/markdown/) is a minimal "
+"markup language that resembles plain text as used in email messages. It is "
+"the markup language used by this wiki by default."
+msgstr ""
+"[Markdown](http://daringfireball.net/projects/markdown/) est un langage de "
+"balisage élémentaire, comparable à celui utilisé dans la messagerie "
+"électronique. Il s'agit du langage de balisage utilisé par défaut dans ce "
+"wiki."
+
+#. type: Plain text
+msgid ""
+"For documentation about the markdown syntax, see [[formatting]] and "
+"[Markdown: syntax](http://daringfireball.net/projects/markdown/syntax)."
+msgstr ""
+"Référez vous à [[formatting]] et [Syntaxe Markdown](http://daringfireball."
+"net/projects/markdown/syntax) pour la documentation sur la syntaxe du langage "
+"markdown."
+
+#. type: Plain text
+msgid ""
+"Note that [[WikiLinks|WikiLink]] and [[directives|directive]] are not part "
+"of the markdown syntax, and are the only bit of markup that this wiki "
+"handles internally."
+msgstr ""
+"Notez que les [[WikiLinks|WikiLink]] et les [[directives|directive]] ne font "
+"pas partie de la syntaxe du langage markdown. Il s'agit des seules balises "
+"qui sont traitées en interne par ce wiki."
diff --git a/po/underlays/basewiki/ikiwiki/openid.fr.po b/po/underlays/basewiki/ikiwiki/openid.fr.po
new file mode 100644
index 000000000..81d36e068
--- /dev/null
+++ b/po/underlays/basewiki/ikiwiki/openid.fr.po
@@ -0,0 +1,118 @@
+# Traduction de ikiwiki
+# Copyright (C) 2009 Debian French l10n team <debian-l10n-french@lists.debian.org>
+# This file is distributed under the same license as the PACKAGE Ikiwiki.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: ikiwiki\n"
+"POT-Creation-Date: 2009-08-15 18:30-0300\n"
+"PO-Revision-Date: 2009-08-25 09:52+0200\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"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bits\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta title=\"OpenID\"]]\n"
+msgstr "[[!meta title=\"OpenID\"]]\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"[[!if test=\"enabled(openid)\"\n"
+" then=\"This wiki has OpenID **enabled**.\"\n"
+" else=\"This wiki has OpenID **disabled**.\"]]\n"
+msgstr ""
+"[[!if test=\"enabled(openid)\"\n"
+" then=\"OpenID est **activé** sur ce wiki.\"\n"
+" else=\"OpenID est **desactivé** sur ce wiki.\"]]\n"
+
+#. type: Plain text
+msgid ""
+"[OpenID](http://openid.net) is a decentralized authentication mechanism that "
+"allows you to have one login that you can use on a growing number of "
+"websites."
+msgstr ""
+"[OpenID](http://openid.net) est un système d'authentification décentralisé "
+"qui permet d'avoir un identifiant unique, utilisable sur un nombre croissant "
+"de sites internet."
+
+#. type: Plain text
+msgid ""
+"To sign up for an OpenID, visit one of the following identity providers:"
+msgstr ""
+"Pour obtenir un identifiant OpenID, visitez l'un des fournisseurs d'identité "
+"suivants :"
+
+#. type: Bullet: '* '
+msgid "[MyOpenID](https://www.myopenid.com/)"
+msgstr "[MyOpenID](https://www.myopenid.com/)"
+
+#. type: Bullet: '* '
+msgid "[GetOpenID](https://getopenid.com/)"
+msgstr "[GetOpenID](https://getopenid.com/)"
+
+#. type: Bullet: '* '
+msgid "[Videntity](http://videntity.org/)"
+msgstr "[Videntity](http://videntity.org/)"
+
+#. type: Bullet: '* '
+msgid "[LiveJournal](http://www.livejournal.com/openid/)"
+msgstr "[LiveJournal](http://www.livejournal.com/openid/)"
+
+#. type: Bullet: '* '
+msgid "[TrustBearer](https://openid.trustbearer.com/)"
+msgstr "[TrustBearer](https://openid.trustbearer.com/)"
+
+#. type: Bullet: '* '
+msgid ""
+"or any of the [many others out there](http://openiddirectory.com/openid-"
+"providers-c-1.html)"
+msgstr ""
+"ou n'importe lequel des [nombreux autres fournisseurs existants](http://"
+"openiddirectory.com/openid-providers-c-1.html)"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"Your OpenID is the URL that you are given when you sign up.\n"
+"[[!if test=\"enabled(openid)\" then=\"\"\"\n"
+msgstr ""
+"Votre identifiant OpenID est l'URL qui vous est attribuée lorsque vous vous inscrivez.\n"
+"[[!if test=\"enabled(openid)\" then=\"\"\"\n"
+
+#. type: Plain text
+msgid ""
+"To sign in to this wiki using OpenID, just enter it in the OpenID field in "
+"the signin form. You do not need to give this wiki a password or go through "
+"any registration process when using OpenID."
+msgstr ""
+"Pour vous connecter à ce wiki en utilisant OpenID, entrez simplement votre "
+"identifiant dans le champ OpenID du formulaire de connexion. Vous n'avez pas "
+"besoin de donner un mot de passe pour ce wiki ou de passer par le processus "
+"d'enregistrement lorsque vous utilisez OpenID."
+
+#. type: Plain text
+msgid ""
+"It's also possible to make a page in the wiki usable as an OpenID url, by "
+"delegating it to an openid server. Here's an example of how to do that:"
+msgstr ""
+"Il est également possible de faire une page dans le wiki utilisable comme un "
+"identifiant OpenID (URL) en la déléguant à un serveur OpenID. Voici un "
+"exemple permettant de faire cela :"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"\t\\[[!meta openid=\"http://yourid.myopenid.com/\"\n"
+"\t server=\"http://www.myopenid.com/server\"]]\n"
+msgstr ""
+"\t\\[[!meta openid=\"http://yourid.myopenid.com/\"\n"
+"\t server=\"http://www.myopenid.com/server\"]]\n"
diff --git a/po/underlays/basewiki/ikiwiki/pagespec.fr.po b/po/underlays/basewiki/ikiwiki/pagespec.fr.po
new file mode 100644
index 000000000..aeec3b95e
--- /dev/null
+++ b/po/underlays/basewiki/ikiwiki/pagespec.fr.po
@@ -0,0 +1,236 @@
+# Traduction de ikiwiki
+# Copyright (C) 2009 Debian French l10n team <debian-l10n-french@lists.debian.org>
+# This file is distributed under the same license as the ikiwiki package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: ikiwiki 3.141\n"
+"POT-Creation-Date: 2009-08-15 18:30-0300\n"
+"PO-Revision-Date: 2009-09-02 17:42+0200\n"
+"Last-Translator: Steve Petruzzello <dlist@bluewin.ch>\n"
+"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
+
+#. type: Plain text
+msgid ""
+"To select a set of pages, such as pages that are locked, pages whose commit "
+"emails you want subscribe to, or pages to combine into a blog, the wiki uses "
+"a PageSpec. This is an expression that matches a set of pages."
+msgstr ""
+"Le wiki utilise un concept de spécification de page « PageSpec » afin de "
+"choisir un ensemble de pages. Par exemple il est possible de choisir les "
+"pages verrouillées, les pages dont vous recevez par courriel les "
+"modifications ou des pages à regrouper pour faire blog. Une spécification "
+"correspond à un ensemble de pages."
+
+#. type: Plain text
+msgid ""
+"The simplest PageSpec is a simple list of pages. For example, this matches "
+"any of the three listed pages:"
+msgstr ""
+"La spécification la plus simple est la liste de pages. Par exemple, "
+"l'expression suivante correspond à l'une ou l'autre des trois pages listées :"
+
+#. type: Plain text
+#, no-wrap
+msgid "\tfoo or bar or baz\n"
+msgstr "\tfoo or bar or baz\n"
+
+#. type: Plain text
+msgid ""
+"More often you will want to match any pages that have a particular thing in "
+"their name. You can do this using a glob pattern. \"`*`\" stands for any "
+"part of a page name, and \"`?`\" for any single letter of a page name. So "
+"this matches all pages about music, and any [[SubPage]]s of the SandBox, but "
+"does not match the SandBox itself:"
+msgstr "La plupart du temps, vous voulez trouver les pages qui contiennent une expression particulière dans leur nom. Cela s'obtient en utilisant un motif (« glob pattern »). Le métacaractère « `*` » correspond à n'importe quelle partie du nom de la page et le métacaractère « `?` » à n'importe quelle lettre. Ainsi, l'expression suivante correspond à toutes les pages traitant de musique et à n'importe quelle sous-page [[SubPage]] de la *SandBox*, mais pas à la *SandBox* elle-même :"
+
+#. type: Plain text
+#, no-wrap
+msgid "\t*music* or SandBox/*\n"
+msgstr "\t*musique* or SandBox/*\n"
+
+#. type: Plain text
+msgid ""
+"You can also prefix an item with \"`!`\" to skip pages that match it. So to "
+"match all pages except for Discussion pages and the SandBox:"
+msgstr "Vous pouvez également préfixer un élément avec « `!` » pour ignorer les pages correspondantes. Ainsi pour trouver toutes les pages sauf les pages Discussion et la page *SandBox* :"
+
+#. type: Bullet: ' * '
+msgid "and !SandBox and !*/Discussion"
+msgstr "and !SandBox and !*/Discussion"
+
+#. type: Plain text
+msgid ""
+"Some more elaborate limits can be added to what matches using these "
+"functions:"
+msgstr ""
+"Des contraintes plus élaborées peuvent être ajoutées avec les fonctions "
+"suivantes :"
+
+#. type: Bullet: '* '
+msgid ""
+"\"`link(page)`\" - matches only pages that link to a given page (or glob)"
+msgstr "« `link(page)` » - correspond aux pages ayant un lien vers cette page (ou motif)"
+
+#. type: Bullet: '* '
+msgid ""
+"\"`tagged(tag)`\" - matches pages that are tagged or link to the given tag "
+"(or tags matched by a glob)"
+msgstr ""
+"« `tagged(tag)` » - correspond aux pages qui sont marquées ou qui sont liées "
+"à l'étiquette donnée (ou des étiquettes correspondant à un motif)."
+
+#. type: Bullet: '* '
+msgid "\"`backlink(page)`\" - matches only pages that a given page links to"
+msgstr ""
+"« `backlink(page)` » - correspond seulement aux pages qui sont pointées "
+"(lien) par la page donnée."
+
+#. type: Bullet: '* '
+msgid ""
+"\"`creation_month(month)`\" - matches only pages created on the given month"
+msgstr "« `creation_month(mois)` » - correspond aux pages créées durant ce mois"
+
+#. type: Bullet: '* '
+msgid "\"`creation_day(mday)`\" - or day of the month"
+msgstr "« `creation_day(jour)` » - ou au jour de ce mois"
+
+#. type: Bullet: '* '
+msgid "\"`creation_year(year)`\" - or year"
+msgstr "« `creation_year(année)` » - ou année"
+
+#. type: Bullet: '* '
+msgid ""
+"\"`created_after(page)`\" - matches only pages created after the given page "
+"was created"
+msgstr ""
+"« `created_after(page)` » - correspond aux pages créées après la page donnée"
+
+#. type: Bullet: '* '
+msgid ""
+"\"`created_before(page)`\" - matches only pages created before the given "
+"page was created"
+msgstr "« `created_before(page) » - correspond aux pages créées avant la page donnée"
+
+#. type: Bullet: '* '
+msgid ""
+"\"`glob(someglob)`\" - matches pages that match the given glob. Just writing "
+"the glob by itself is actually a shorthand for this function."
+msgstr ""
+"« `glob(motif)` » - correspond aux pages correspondantes au motif donné. "
+"N'écrire que le motif lui-même est un raccourci pour cette fonction."
+
+#. type: Bullet: '* '
+msgid ""
+"\"`internal(glob)`\" - like `glob()`, but matches even internal-use pages "
+"that globs do not usually match."
+msgstr ""
+"« `internal(motif)` » - pareil à `glob()`, mais correspond en plus aux pages "
+"à usage interne que la fonction glob ne trouve pas en général."
+
+#. type: Bullet: '* '
+msgid ""
+"\"`title(glob)`\", \"`author(glob)`\", \"`authorurl(glob)`\", \"`license"
+"(glob)`\", \"`copyright(glob)`\" - match pages that have the given metadata, "
+"matching the specified glob."
+msgstr ""
+"« `title(motif)`, `author(motif)`, `authorurl(motif)`, `license(motif)`, "
+"`copyright(motif)` » - renvoient les pages qui possèdent les métadonnées "
+"correspondant au motif donné."
+
+#. type: Bullet: '* '
+msgid ""
+"\"`user(username)`\" - tests whether a modification is being made by a user "
+"with the specified username. If openid is enabled, an openid can also be put "
+"here."
+msgstr ""
+"« `user(identifiant)` » - teste si une modification est faite par "
+"l'identifiant donné. Si openid est activé, on peut aussi l'utiliser."
+
+#. type: Bullet: '* '
+msgid ""
+"\"`admin()`\" - tests whether a modification is being made by one of the "
+"wiki admins."
+msgstr ""
+"« `admin()` » - teste si une modification par un administrateur est en cours."
+
+#. type: Bullet: '* '
+msgid ""
+"\"`ip(address)`\" - tests whether a modification is being made from the "
+"specified IP address."
+msgstr ""
+"« `ip(adresse)` » - teste si une modification par l'IP donnée est en cours."
+
+#. type: Bullet: '* '
+msgid ""
+"\"`postcomment(glob)`\" - matches only when comments are being posted to a "
+"page matching the specified glob"
+msgstr ""
+"« `postcomment(motif) » - ne correspond que si des commentaires sont postés "
+"vers une page correspondant au motif donné."
+
+#. type: Plain text
+msgid ""
+"For example, to match all pages in a blog that link to the page about music "
+"and were written in 2005:"
+msgstr ""
+"Par exemple, pour trouver toutes les pages d'un blog qui ont un lien vers la "
+"page traitant de musique et qui ont été créées en 2005 :"
+
+#. type: Plain text
+#, no-wrap
+msgid "\tblog/* and link(music) and creation_year(2005)\n"
+msgstr "\tblog/* and link(musique) and creation_year(2005)\n"
+
+#. type: Plain text
+msgid ""
+"Note the use of \"and\" in the above example, that means that only pages "
+"that match each of the three expressions match the whole. Use \"and\" when "
+"you want to combine expression like that; \"or\" when it's enough for a page "
+"to match one expression. Note that it doesn't make sense to say \"index and "
+"SandBox\", since no page can match both expressions."
+msgstr ""
+"Veuillez noter l'utilisation du « and » dans l'exemple ci-dessus. Seules les "
+"pages dont les trois conditions sont vraies seront trouvées. Utilisez « and » "
+"pour ce genre d'expression combinée. « or » est utilisé quand une seule des "
+"trois conditions est suffisante. Veuillez noter que « index and SandBox » n'a "
+"pas de sens puisqu'aucune page ne peut correspondre aux deux expressions."
+
+#. type: Plain text
+msgid ""
+"More complex expressions can also be created, by using parentheses for "
+"grouping. For example, to match pages in a blog that are tagged with either "
+"of two tags, use:"
+msgstr ""
+"On peut créer des expressions plus complexes à l'aide de parenthèses. Par "
+"exemple, pour trouver les pages d'un blog possédantl'une ou l'autre "
+"étiquette, on utiliserait :"
+
+#. type: Plain text
+#, no-wrap
+msgid "\tblog/* and (tagged(foo) or tagged(bar))\n"
+msgstr "\tblog/* and (tagged(foo) or tagged(bar))\n"
+
+#. type: Plain text
+msgid ""
+"Note that page names in PageSpecs are matched against the absolute filenames "
+"of the pages in the wiki, so a pagespec \"foo\" used on page \"a/b\" will "
+"not match a page named \"a/foo\" or \"a/b/foo\". To match relative to the "
+"directory of the page containing the pagespec, you can use \"./\". For "
+"example, \"./foo\" on page \"a/b\" matches page \"a/foo\"."
+msgstr ""
+"Veuillez noter que le nom d'une page dans une spécification de page "
+"correspond au nom absolu du fichier dans le wiki. Ainsi une expression "
+"« foo » utilisée sur une page « a/b » ne correspondra pas à une page nommée « a/"
+"foo » ni à une page « a/b/foo ». Pour une correspondance relative au "
+"répertoire de la page contenant la spécification, vous pouvez utiliser "
+"« ./ ». Par exemple, « ./foo » sur la page « a/b » correspondra à la page « a/"
+"foo »."
diff --git a/po/underlays/basewiki/ikiwiki/pagespec/attachment.fr.po b/po/underlays/basewiki/ikiwiki/pagespec/attachment.fr.po
new file mode 100644
index 000000000..10f942033
--- /dev/null
+++ b/po/underlays/basewiki/ikiwiki/pagespec/attachment.fr.po
@@ -0,0 +1,114 @@
+# Traduction de ikiwiki
+# Copyright (C) 2009 Debian French l10n team <debian-l10n-french@lists.debian.org>
+# This file is distributed under the same license as the PACKAGE Ikiwiki.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: ikiwiki\n"
+"POT-Creation-Date: 2009-08-15 18:30-0300\n"
+"PO-Revision-Date: 2009-08-26 14:46+0200\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"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bits\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"[[!if test=\"enabled(attachment)\"\n"
+" then=\"This wiki has attachments **enabled**.\"\n"
+" else=\"This wiki has attachments **disabled**.\"]]\n"
+msgstr ""
+"[[!if test=\"enabled(attachment)\"\n"
+" then=\"Les pièces jointes sont autorisées sur ce wiki.\"\n"
+" else=\"Les pièces jointes ne sont pas autorisées sur ce wiki.\"]]\n"
+
+#. type: Plain text
+msgid ""
+"If attachments are enabled, the wiki admin can control what types of "
+"attachments will be accepted, via the `allowed_attachments` configuration "
+"setting."
+msgstr ""
+"Quand les pièces jointes sont autorisées, l'administrateur du wiki peut "
+"contrôler le type des pièces acceptées, avec l'option de configuration "
+"`allowed_attachments`."
+
+#. type: Plain text
+msgid ""
+"For example, to limit arbitrary files to 50 kilobytes, but allow larger mp3 "
+"files to be uploaded by joey into a specific directory, and check all "
+"attachments for viruses, something like this could be used:"
+msgstr ""
+"Par exemple, pour limiter tous les fichiers à 50 kilooctets mais permettre "
+"que des fichiers mp3 plus grands soient envoyés par joey dans un répertoire "
+"donné et pour vérifier que toutes les pièces jointes sont sans virus, on "
+"peut utiliser quelque chose comme ça :"
+
+#. type: Plain text
+#, no-wrap
+msgid "\tvirusfree() and ((user(joey) and podcast/*.mp3 and mimetype(audio/mpeg) and maxsize(15mb)) or (!ispage() and maxsize(50kb)))\n"
+msgstr "\tvirusfree() and ((user(joey) and podcast/*.mp3 and mimetype(audio/mpeg) and maxsize(15mb)) or (!ispage() and maxsize(50kb)))\n"
+
+#. type: Plain text
+msgid ""
+"The regular [[ikiwiki/PageSpec]] syntax is expanded with the following "
+"additional tests:"
+msgstr ""
+"La syntaxe normale de [[ikiwiki/PageSpec]] est appliquée avec les tests "
+"supplémentaires suivants :"
+
+#. type: Bullet: '* '
+msgid ""
+"\"`maxsize(size)`\" - tests whether the attachment is no larger than the "
+"specified size. The size defaults to being in bytes, but \"kb\", \"mb\", \"gb"
+"\" etc can be used to specify the units."
+msgstr ""
+"`maxsize(size)` - teste si la taille de la pièce n'est pas plus grande que "
+"la taille donnée. La taille est mesurée en octet mais on peut l'indiquer en "
+"« ko », « mo », « go » etc."
+
+#. type: Bullet: '* '
+msgid ""
+"\"`minsize(size)`\" - tests whether the attachment is no smaller than the "
+"specified size."
+msgstr ""
+"`minsize(size)` - teste si la taille de la pièce n'est pas plus petite que "
+"la taille donnée."
+
+#. type: Bullet: '* '
+msgid ""
+"\"`ispage()`\" - tests whether the attachment will be treated by ikiwiki as "
+"a wiki page. (Ie, if it has an extension of \".mdwn\", or of any other "
+"enabled page format)."
+msgstr ""
+"`ispage()` - teste si la pièce jointe sera traitée comme page de wiki par "
+"ikiwiki, c'est-à-dire si son extension est « .mdwn » ou un autre format "
+"accepté."
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+" So, if you don't want to allow wiki pages to be uploaded as attachments,\n"
+" use `!ispage()` ; if you only want to allow wiki pages to be uploaded\n"
+" as attachments, use `ispage()`.\n"
+msgstr ""
+" Donc, si vous ne voulez pas que des pages de wiki puissent être envoyées en pièces jointes, utilisez `!ispage()`\n"
+" et dans le cas contraire, `ispage()`.\n"
+
+#. type: Bullet: '* '
+msgid ""
+"\"`mimetype(foo/bar)`\" - checks the MIME type of the attachment. You can "
+"include a glob in the type, for example `mimetype(image/*)`."
+msgstr ""
+"`mimetype(foo/bar)` - teste le type MIME de la pièce jointe. Vous pouvez "
+"inclure un motif dans le type, par exemple `mimetype(image/*)`."
+
+#. type: Bullet: '* '
+msgid "\"`virusfree()`\" - checks the attachment with an antiviral program."
+msgstr "`virusfree()` - teste la pièce jointe avec un programme antivirus."
diff --git a/po/underlays/basewiki/ikiwiki/pagespec/po.fr.po b/po/underlays/basewiki/ikiwiki/pagespec/po.fr.po
new file mode 100644
index 000000000..a771f6ef7
--- /dev/null
+++ b/po/underlays/basewiki/ikiwiki/pagespec/po.fr.po
@@ -0,0 +1,57 @@
+# Traduction de ikiwiki
+# Copyright (C) 2009 Debian French l10n team <debian-l10n-french@lists.debian.org>
+# This file is distributed under the same license as the PACKAGE Ikiwiki.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: ikiwiki\n"
+"POT-Creation-Date: 2009-08-15 18:30-0300\n"
+"PO-Revision-Date: 2009-08-30 09:37+0200\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"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bits\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"[[!if test=\"enabled(po)\"\n"
+" then=\"This wiki has po support **enabled**.\"\n"
+" else=\"This wiki has po support **disabled**.\"]]\n"
+msgstr ""
+"[[!if test=\"enabled(po)\"\n"
+" then=\"Ce wiki gère le mode po.\"\n"
+" else=\"Ce wiki ne gère pas le mode po.\"]]\n"
+
+#. type: Plain text
+msgid ""
+"If the [[!iki plugins/po desc=po]] plugin is enabled, the regular [[ikiwiki/"
+"PageSpec]] syntax is expanded with the following additional tests that can "
+"be used to improve user navigation in a multi-lingual wiki:"
+msgstr "Si le greffon [[!iki plugins/po desc=po]] est activé, la syntaxe normale de [[ikiwiki/PageSpec]] est développée avec les tests supplémentaires suivants qui peuvent améliorer la navigation d'un utilisateur de wiki plurilinguistique :"
+
+#. type: Bullet: '* '
+msgid ""
+"\"`lang(LL)`\" - tests whether a page is written in the language specified "
+"as a ISO639-1 (two-letter) language code."
+msgstr ""
+"`lang(LL)` - teste si la page est écrite dans la langue indiquée par le code "
+"ISO639-1 (deux lettres)."
+
+#. type: Bullet: '* '
+msgid ""
+"\"`currentlang()`\" - tests whether a page is written in the same language "
+"as the current page."
+msgstr ""
+"`currentlang()` - teste si une page est écrite dans la langue de la page "
+"donnée."
+
+#. type: Plain text
+msgid ""
+"Note that every non-po page is considered to be written in "
+"`po_master_language`, as specified in `ikiwiki.setup`."
+msgstr ""
+"Notez que chaque page qui n'est pas de type po est considérée comme une page "
+"écrite selon le `po_master_language`, tel que spécifié dans le fichier de "
+"configuration `ikiwiki.setup`."
diff --git a/po/underlays/basewiki/ikiwiki/searching.fr.po b/po/underlays/basewiki/ikiwiki/searching.fr.po
new file mode 100644
index 000000000..1fdee43dc
--- /dev/null
+++ b/po/underlays/basewiki/ikiwiki/searching.fr.po
@@ -0,0 +1,87 @@
+# Traduction de ikiwiki
+# Copyright (C) 2009 Debian French l10n team <debian-l10n-french@lists.debian.org>
+# This file is distributed under the same license as the PACKAGE Ikiwiki.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: ikiwiki\n"
+"POT-Creation-Date: 2009-08-15 18:30-0300\n"
+"PO-Revision-Date: 2009-08-25 10:10+0200\n"
+"Last-Translator: Alexandre Dupas <alexandre.dupas@gmail.com>\n"
+"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bits\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"[[!if test=\"enabled(search)\"\n"
+"then=\"This wiki has searching **enabled**.\"\n"
+"else=\"This wiki has searching **disabled**.\"]]\n"
+msgstr ""
+"[[!if test=\"enabled(search)\"\n"
+"then=\"La fonction de recherche est **activée** sur ce wiki.\"\n"
+"else=\"La fonction de recherche est **désactivée** sur ce wiki.\"]]\n"
+
+#. type: Plain text
+msgid ""
+"If searching is enabled, you can enter search terms in the search field, as "
+"you'd expect. There are a few special things you can do to construct more "
+"powerful searches."
+msgstr ""
+"Si la fonction de recherche est activée, vous pouvez saisir des mots clefs "
+"dans le champ de recherche, comme vous pouvez vous y attendre. Il y a "
+"quelques petits trucs que vous pouvez utiliser pour obtenir des résultats "
+"plus précis."
+
+#. type: Bullet: '* '
+msgid "To match a phrase, enclose it in double quotes."
+msgstr "Pour rechercher précisément une phrase, mettez-la entre guillemets."
+
+#. type: Bullet: '* '
+msgid "`AND` can be used to search for documents containing two expressions."
+msgstr ""
+"`AND` peut être utilisé pour rechercher des documents contenant deux "
+"expressions."
+
+#. type: Bullet: '* '
+msgid ""
+"`OR` can be used to search for documents containing either one of two "
+"expressions."
+msgstr ""
+"`OR` peut être utilisé pour rechercher des documents contenant l'une des "
+"deux expressions."
+
+#. type: Bullet: '* '
+msgid ""
+"Parentheses can be used to build up complicated search expressions. For "
+"example, \"(foo AND bar) OR (me AND you)\""
+msgstr ""
+"Les parenthèses peuvent être utilisées pour construire des requêtes plus "
+"compliquées, comme par exemple \"(foo AND bar) OR (me AND you)\""
+
+#. type: Bullet: '* '
+msgid ""
+"Prefix a search term with \"-\" to avoid it from appearing in the results. "
+"For example, \"-discussion\" will omit \"discussion\"."
+msgstr ""
+"Préfixez un mot clef avec \"-\" pour éviter que les pages contenant ce mot "
+"clef n'apparaissent dans les résultats. Par exemple, \"-discussion\" ne "
+"prendra pas en compte les pages contenant \"discussion\"."
+
+#. type: Bullet: '* '
+msgid "To search for a page with a given title, use \"title:foo\"."
+msgstr ""
+"Pour chercher une page dont le titre est connu, utilisez \"title:foo\"."
+
+#. type: Bullet: '* '
+msgid "To search for pages that contain a \"bar\" link, use \"link:bar\"."
+msgstr ""
+"Pour rechercher les pages contenant un lien vers une page \"truc\", utilisez "
+"\"link:truc\"."
diff --git a/po/underlays/basewiki/ikiwiki/subpage.fr.po b/po/underlays/basewiki/ikiwiki/subpage.fr.po
new file mode 100644
index 000000000..cf0e56cd9
--- /dev/null
+++ b/po/underlays/basewiki/ikiwiki/subpage.fr.po
@@ -0,0 +1,51 @@
+# Traduction de ikiwiki
+# Copyright (C) 2009 Debian French l10n team <debian-l10n-french@lists.debian.org>
+# This file is distributed under the same license as the PACKAGE Ikiwiki.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: ikiwiki\n"
+"POT-Creation-Date: 2009-08-15 18:30-0300\n"
+"PO-Revision-Date: 2009-08-25 10:31+0200\n"
+"Last-Translator: Alexandre Dupas <alexandre.dupas@gmail.com>\n"
+"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bits\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
+
+#. type: Plain text
+msgid ""
+"ikiwiki supports placing pages in a directory hierarchy. For example, this "
+"page, [[SubPage]] has some related pages placed under it, like [[SubPage/"
+"LinkingRules]]. This is a useful way to add some order to your wiki rather "
+"than just having a great big directory full of pages."
+msgstr ""
+"ikiwiki permet de ranger les pages dans une arborescence de répertoires. Par "
+"exemple cette page, [[SubPage]], est liée à des pages placées "
+"hiérarchiquement sous elle, comme la page [[SubPage/LinkingRules]]. C'est "
+"une façon pratique d'ordonner le wiki au lieu d'avoir un seul gros "
+"répertoire plein de pages."
+
+#. type: Plain text
+msgid ""
+"To add a SubPage, just make a subdirectory and put pages in it. For example, "
+"this page is SubPage.mdwn in this wiki's source, and there is also a SubPage "
+"subdirectory, which contains SubPage/LinkingRules.mdwn. Subpages can be "
+"nested as deeply as you'd like."
+msgstr ""
+"Pour ajouter une sous-page, faites simplement un sous-répertoire et mettez-y "
+"les pages. Par exemple, cette page est `subpage.mdwn` dans les sources de ce "
+"wiki et il y a également un sous-répertoire `subpage`, qui contient `subpage/"
+"linkingrules.mdwn`. Les sous-pages peuvent être emboîtées autant que vous le "
+"souhaitez."
+
+#. type: Plain text
+msgid "Linking to and from a SubPage is explained in [[LinkingRules]]."
+msgstr ""
+"Faire un lien depuis et vers une sous-page est expliqué dans "
+"[[LinkingRules]]."
diff --git a/po/underlays/basewiki/ikiwiki/subpage/linkingrules.fr.po b/po/underlays/basewiki/ikiwiki/subpage/linkingrules.fr.po
new file mode 100644
index 000000000..36f7ef96f
--- /dev/null
+++ b/po/underlays/basewiki/ikiwiki/subpage/linkingrules.fr.po
@@ -0,0 +1,103 @@
+# Traduction de ikiwiki
+# Copyright (C) 2009 Debian French l10n team <debian-l10n-french@lists.debian.org>
+# This file is distributed under the same license as the PACKAGE Ikiwiki.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: ikiwiki\n"
+"POT-Creation-Date: 2009-08-15 18:30-0300\n"
+"PO-Revision-Date: 2009-08-25 10:59+0200\n"
+"Last-Translator: Alexandre Dupas <alexandre.dupas@gmail.com>\n"
+"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bits\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
+
+#. type: Plain text
+msgid ""
+"To link to or from a [[SubPage]], you can normally use a regular "
+"[[WikiLink]] that does not contain the name of the parent directory of the "
+"[[SubPage]]. Ikiwiki descends the directory hierarchy looking for a page "
+"that matches your link."
+msgstr ""
+"Pour faire un lien depuis ou vers une sous-page ([[SubPage]]), vous pouvez "
+"normalement utiliser un [[WikiLink]] classique qui ne contient pas le nom du "
+"répertoire parent de la sous-page. Ikiwiki parcourt l'arborescence des "
+"répertoires pour trouver une page qui corresponde au lien."
+
+#. type: Plain text
+msgid ""
+"For example, if FooBar/SubPage links to \"OtherPage\", ikiwiki will first "
+"prefer pointing the link to FooBar/SubPage/OtherPage if it exists, next to "
+"FooBar/OtherPage and finally to OtherPage in the root of the wiki."
+msgstr ""
+"Par exemple, si FooBar/SubPage est liée à \"OtherPage\", ikiwiki préfèrera "
+"d'abord chercher la page dans FooBar/SubPage/OtherPage si elle existe, "
+"ensuite dans FooBar/OtherPage et finalement dans OtherPage à la racine du "
+"wiki."
+
+#. type: Plain text
+msgid ""
+"Note that this means that if a link on FooBar/SomePage to \"OtherPage\" "
+"currently links to OtherPage, in the root of the wiki, and FooBar/OtherPage "
+"is created, the link will _change_ to point to FooBar/OtherPage. On the "
+"other hand, a link from BazBar to \"OtherPage\" would be unchanged by this "
+"creation of a [[SubPage]] of FooBar."
+msgstr ""
+"Cela signifie que si un lien de FooBar/SomePage vers \"OtherPage\" pointe "
+"actuellement vers OtherPage à la racine du wiki, et que la page FooBar/"
+"OtherPage est créée, alors le lien _changera_ pour pointer vers la page "
+"FooBar/OtherPage. Cependant, un lien de BazBar vers \"OtherPage\" ne serait "
+"pas impacté par cette création d'une sous-page ([[SubPage]]) de FooBar."
+
+#. type: Plain text
+msgid ""
+"You can also specify a link that contains a directory name, like \"FooBar/"
+"OtherPage\" to more exactly specify what page to link to. This is the only "
+"way to link to an unrelated [[SubPage]]."
+msgstr ""
+"Vous pouvez également définir un lien qui contient le nom d'un répertoire, "
+"comme \"FooBar/OtherPage\" pour spécifier plus précisément vers quelle page "
+"il faut pointer. C'est le seul moyen de faire un lien vers une sous-page qui "
+"n'est pas apparentée."
+
+#. type: Plain text
+msgid ""
+"You can use this to, for example, to link from BazBar to \"FooBar/SubPage\", "
+"or from BazBar/SubPage to \"FooBar/SubPage\"."
+msgstr ""
+"Vous pouvez utiliser ceci pour, par exemple, faire un lien depuis BazBar "
+"vers \"FooBar/SubPage\", ou de BazBar/SubPage vers \"FooBar/SubPage\"."
+
+#. type: Plain text
+msgid ""
+"You can also use \"/\" at the start of a link, to specify exactly which page "
+"to link to, when there are multiple pages with similar names and the link "
+"goes to the wrong page by default. For example, linking from \"FooBar/SubPage"
+"\" to \"/OtherPage\" will link to the \"OtherPage\" in the root of the wiki, "
+"even if there is a \"FooBar/OtherPage\"."
+msgstr ""
+"Vous pouvez également utiliser \"/\" au début d'un lien pour indiquer "
+"précisément quelle page doit être pointée lorsqu'il y a plusieurs pages avec "
+"des noms identiques et que le lien ne pointe pas vers la bonne page par "
+"défaut. Par exemple, faire un lien depuis \"FooBar/SubPage\" vers \"/"
+"OtherPage\" pointera vers la page \"OtherPage\" à la racine du wiki même "
+"s'il existe une page \"FooBar/OtherPage\"."
+
+#. type: Plain text
+msgid ""
+"Also, if the wiki is configured with a userdir, you can link to pages within "
+"the userdir without specifying a path to them. This is to allow for easy "
+"linking to a user's page in the userdir, to sign a comment. These links are "
+"checked for last of all."
+msgstr ""
+"De plus, si le wiki est configuré avec un répertoire `userdir`, vous pouvez "
+"facilement faire des liens vers les pages dans `userdir` sans spécifier le "
+"chemin vers ces pages. Cela permet de facilement pointer vers la page d'un "
+"utilisateur dans `userdir` pour signer un commentaire. La correspondance des "
+"liens avec ces pages est testée en tout dernier lieu."
diff --git a/po/underlays/basewiki/ikiwiki/wikilink.fr.po b/po/underlays/basewiki/ikiwiki/wikilink.fr.po
new file mode 100644
index 000000000..ac464fb18
--- /dev/null
+++ b/po/underlays/basewiki/ikiwiki/wikilink.fr.po
@@ -0,0 +1,107 @@
+# Traduction de ikiwiki
+# Copyright (C) 2009 Debian French l10n team <debian-l10n-french@lists.debian.org>
+# This file is distributed under the same license as the PACKAGE Ikiwiki.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: ikiwiki\n"
+"POT-Creation-Date: 2009-08-15 18:30-0300\n"
+"PO-Revision-Date: 2009-08-28 16:05+0200\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"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bits\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
+
+#. type: Plain text
+msgid ""
+"WikiLinks provide easy linking between pages of the wiki. To create a "
+"[[WikiLink]], just put the name of the page to link to in double brackets. "
+"For example `\\[[WikiLink]]`."
+msgstr ""
+"Un WikiLink est un moyen simple de lier des pages entre elles. Pour créer un "
+"[[WikiLink]], il suffit de mettre le nom d'une page à lier entre double "
+"crochets. Par exemple, `\\[[WikiLink]]`."
+
+#. type: Plain text
+msgid ""
+"If you ever need to write something like `\\[[WikiLink]]` without creating a "
+"wikilink, just prefix it with a `\\`, like `\\\\[[WikiLink]]`."
+msgstr ""
+"Si jamais vous avez besoin d'écrire quelque chose comme `\\[[WikiLink]]` "
+"sans créer de lien, il suffit de préfixer le mot par une barre oblique `\\`, "
+"comme `\\\\[[WikiLink]]`."
+
+#. type: Plain text
+msgid ""
+"There are some special [[SubPage/LinkingRules]] that come into play when "
+"linking between [[SubPages|SubPage]]."
+msgstr ""
+"Quelques règles spéciales, [[SubPage/LinkingRules]], entrent en jeu pour "
+"lier des sous-pages, [[SubPages|SubPage]]."
+
+#. type: Plain text
+msgid ""
+"Also, if the file linked to by a WikiLink looks like an image, it will be "
+"displayed inline on the page."
+msgstr ""
+"De plus, quand le fichier pointé par un WikiLink ressemble à une image, il "
+"est affiché au fil du texte sur la page."
+
+#. type: Plain text
+msgid ""
+"WikiLinks are matched with page names in a case-insensitive manner, so you "
+"don't need to worry about getting the case the same, and can capitalise "
+"links at the start of a sentence, and so on."
+msgstr ""
+"La recherche de correspondance entre WikiLinks et noms de page ne tient pas "
+"compte de la casse des lettres. Inutile de s'embêter avec les majuscules et "
+"les minuscules et vous pouvez mettre une lettre capitale au lien qui se "
+"trouve en début de phrase, etc."
+
+#. type: Plain text
+msgid ""
+"It's also possible to write a WikiLink that uses something other than the "
+"page name as the link text. For example `\\[[foo_bar|SandBox]]` links to the "
+"SandBox page, but the link will appear like this: [[foo_bar|SandBox]]."
+msgstr ""
+"Il est aussi possible d'écrire un WikiLink dont le texte n'est pas un nom de "
+"page. Ainsi, `\\[[foo_bar|SandBox]]` pointe vers la page SandBox, mais le "
+"lien apparaît comme ceci : [[foo_bar|SandBox]]."
+
+#. type: Plain text
+msgid ""
+"To link to an anchor inside a page, you can use something like `"
+"\\[[WikiLink#foo]]` ."
+msgstr ""
+"Pour pointer vers une ancre à l'intérieur d'une page, vous pouvez utiliser "
+"quelque chose comme `\\[[WikiLink#foo]]`."
+
+#. type: Title ##
+#, no-wrap
+msgid "Directives and WikiLinks"
+msgstr "Directives et WikiLinks"
+
+#. type: Plain text
+msgid ""
+"ikiwiki has two syntaxes for [[directives|directive]]. The older syntax "
+"used spaces to distinguish between directives and wikilinks; as a result, "
+"with that syntax in use, you cannot use spaces in WikiLinks, and must "
+"replace spaces with underscores. The newer syntax, enabled with the "
+"`prefix_directives` option in an ikiwiki setup file, prefixes directives "
+"with `!`, and thus does not prevent links with spaces. Future versions of "
+"ikiwiki will turn this option on by default."
+msgstr ""
+"Il existe deux syntaxes pour les [[directives|directive]]. L'ancienne "
+"syntaxe se sert d'espaces pour différencier les directives et les Wikilinks. "
+"Ainsi, avec cette syntaxe, vous ne pouvez pas utiliser d'espaces dans les "
+"WikiLinks et vous devez les remplacer par des tirets bas `_`. La nouvelle "
+"syntaxe, activée par l'option `prefix_directives` dans le fichier de "
+"configuration d'ikiwiki, préfixe les directives par un `!`, ce qui permet "
+"l'utilisation d'espaces dans les liens. Dans les futures versions d'ikiwiki, "
+"cette option sera activée par défaut."
diff --git a/po/underlays/basewiki/index.fr.po b/po/underlays/basewiki/index.fr.po
new file mode 100644
index 000000000..c63ce98cd
--- /dev/null
+++ b/po/underlays/basewiki/index.fr.po
@@ -0,0 +1,26 @@
+# Traduction de ikiwiki
+# Copyright (C) 2009 Debian French l10n team <debian-l10n-french@lists.debian.org>
+# This file is distributed under the same license as the PACKAGE Ikiwiki.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: ikiwiki\n"
+"POT-Creation-Date: 2009-08-15 18:30-0300\n"
+"PO-Revision-Date: 2009-08-23 18:50+0200\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"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Plain text
+msgid "Welcome to your new wiki."
+msgstr "Bienvenue sur votre nouveau wiki."
+
+#. type: Plain text
+msgid "All wikis are supposed to have a [[SandBox]], so this one does too."
+msgstr "Comme tous les wikis, ce wiki possède une page [[SandBox]]."
+
+#. type: Plain text
+msgid "This wiki is powered by [[ikiwiki]]."
+msgstr "Ce wiki est propulsé par [[ikiwiki]]."
diff --git a/po/underlays/basewiki/recentchanges.fr.po b/po/underlays/basewiki/recentchanges.fr.po
new file mode 100644
index 000000000..8f12155bb
--- /dev/null
+++ b/po/underlays/basewiki/recentchanges.fr.po
@@ -0,0 +1,37 @@
+# Traduction de ikiwiki
+# Copyright (C) 2009 Debian French l10n team <debian-l10n-french@lists.debian.org>
+# This file is distributed under the same license as the PACKAGE Ikiwiki.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Ikiwiki\n"
+"POT-Creation-Date: 2009-08-15 18:30-0300\n"
+"PO-Revision-Date: 2009-08-23 09:32+0200\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"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!if test=\"enabled(meta)\" then=\"\"\"\n"
+msgstr "[[!if test=\"enabled(meta)\" then=\"\"\"\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta title=\"RecentChanges\"]]\n"
+msgstr "[[!meta title=\"RecentChanges\"]]\n"
+
+#. type: Plain text
+msgid "Recent changes to this wiki:"
+msgstr "Dernières modifications :"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"[[!inline pages=\"internal(recentchanges/change_*) and !*/Discussion\" \n"
+"template=recentchanges show=0]]\n"
+msgstr ""
+"[[!inline pages=\"internal(recentchanges/change_*) and !*/Discussion\" \n"
+"template=recentchanges show=0]]\n"
diff --git a/po/underlays/basewiki/sandbox.fr.po b/po/underlays/basewiki/sandbox.fr.po
new file mode 100644
index 000000000..ab24b8c7a
--- /dev/null
+++ b/po/underlays/basewiki/sandbox.fr.po
@@ -0,0 +1,88 @@
+# Traduction de ikiwiki
+# Copyright (C)2009 Debian French l10n team <debian-l10n-french@lists.debian.org>
+# This file is distributed under the same license as the PACKAGE Ikiwiki.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: ikiwiki\n"
+"POT-Creation-Date: 2009-08-15 18:30-0300\n"
+"PO-Revision-Date: 2009-08-26 21:07+0200\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"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bits\n"
+
+#. type: Plain text
+msgid ""
+"This is the SandBox, a page anyone can edit to learn how to use the wiki."
+msgstr "Voici le bac à sable, une page que tout le monde peut éditer pour apprendre à se servir du wiki."
+
+#. type: Plain text
+msgid "Here's a paragraph."
+msgstr "Voici un paragraphe."
+
+#. type: Plain text
+msgid "Here's another one with *emphasised* text."
+msgstr "Un autre avec du texte en *italique*."
+
+#. type: Title #
+#, no-wrap
+msgid "Header"
+msgstr "Titre"
+
+#. type: Title ##
+#, no-wrap
+msgid "Subheader"
+msgstr "Sous-titre"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"> This is a blockquote.\n"
+">\n"
+"> This is the first level of quoting.\n"
+">\n"
+"> > This is nested blockquote.\n"
+">\n"
+"> Back to the first level.\n"
+msgstr ""
+"> Un bloc de citation.\n"
+">\n"
+"> Le premier niveau de citation.\n"
+">\n"
+"> > Une citation imbriquée.\n"
+">\n"
+"> Retour au premier niveau.\n"
+
+#. type: Plain text
+msgid "Numbered list"
+msgstr "Liste numérotée"
+
+#. type: Bullet: '1. '
+msgid "First item."
+msgstr "Premier élément."
+
+#. type: Bullet: '1. '
+msgid "Another."
+msgstr "Un autre."
+
+#. type: Bullet: '1. '
+msgid "And another.."
+msgstr "Encore un autre..."
+
+#. type: Plain text
+msgid "Bulleted list"
+msgstr "Liste avec point"
+
+#. type: Bullet: '* '
+msgid "*item*"
+msgstr "*élement*"
+
+#. type: Bullet: '* '
+msgid "item"
+msgstr "élement"
+
+#. type: Plain text
+msgid "[[ikiwiki/WikiLink]]"
+msgstr "[[ikiwiki/WikiLink]]"
diff --git a/po/underlays/basewiki/shortcuts.fr.po b/po/underlays/basewiki/shortcuts.fr.po
new file mode 100644
index 000000000..3849918e4
--- /dev/null
+++ b/po/underlays/basewiki/shortcuts.fr.po
@@ -0,0 +1,224 @@
+# Traduction de ikiwiki
+# Copyright (C) 2009 Debian French l10n team <debian-l10n-french@lists.debian.org>
+# This file is distributed under the same license as the PACKAGE Ikiwiki.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: ikiwiki\n"
+"POT-Creation-Date: 2009-08-26 13:39-0300\n"
+"PO-Revision-Date: 2009-08-26 21:17+0200\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"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"[[!if test=\"enabled(shortcut)\"\n"
+" then=\"This wiki has shortcuts **enabled**.\"\n"
+" else=\"This wiki has shortcuts **disabled**.\"]]\n"
+msgstr ""
+"[[!if test=\"enabled(shortcut)\"\n"
+" then=\"Les raccourcis sont **activés** dans ce wiki.\"\n"
+" else=\"Les raccourcis sont **désactivés** dans ce wiki.\"]]\n"
+
+#. type: Plain text
+msgid "Some examples of using shortcuts include:"
+msgstr "Voici quelques exemples de raccourcis :"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"\t\\[[!google foo]]\n"
+"\t\\[[!wikipedia War_of_1812]]\n"
+"\t\\[[!debbug 12345]]\n"
+"\tCheck the \\[[!cia ikiwiki desc=\"CIA page for %s\"]].\n"
+msgstr ""
+"\t\\[[!google foo]]\n"
+"\t\\[[!wikipedia War_of_1812]]\n"
+"\t\\[[!debbug 12345]]\n"
+"\tConsultez la \\[[!cia ikiwiki desc=\"page du projet CIA pour %s\"]].\n"
+
+#. type: Plain text
+msgid "This page controls what shortcut links the wiki supports."
+msgstr "Cette page définit les raccourcis connus par ce wiki."
+
+#. type: Bullet: '* '
+msgid "[[!shortcut name=google url=\"http://www.google.com/search?q=%s\"]]"
+msgstr "[[!shortcut name=google url=\"http://www.google.com/search?q=%s\"]]"
+
+#. type: Bullet: '* '
+msgid "[[!shortcut name=archive url=\"http://web.archive.org/*/%S\"]]"
+msgstr "[[!shortcut name=archive url=\"http://web.archive.org/*/%S\"]]"
+
+#. type: Bullet: '* '
+msgid "[[!shortcut name=gmap url=\"http://maps.google.com/maps?q=%s\"]]"
+msgstr "[[!shortcut name=gmap url=\"http://maps.google.com/maps?q=%s\"]]"
+
+#. type: Bullet: '* '
+msgid "[[!shortcut name=gmsg url=\"http://groups.google.com/groups?selm=%s\"]]"
+msgstr ""
+"[[!shortcut name=gmsg url=\"http://groups.google.com/groups?selm=%s\"]]"
+
+#. type: Bullet: '* '
+msgid "[[!shortcut name=wikipedia url=\"http://en.wikipedia.org/wiki/%s\"]]"
+msgstr "[[!shortcut name=wikipedia url=\"http://en.wikipedia.org/wiki/%s\"]]"
+
+#. type: Bullet: '* '
+msgid "[[!shortcut name=wikitravel url=\"http://wikitravel.org/en/%s\"]]"
+msgstr "[[!shortcut name=wikitravel url=\"http://wikitravel.org/en/%s\"]]"
+
+#. type: Bullet: '* '
+msgid "[[!shortcut name=wiktionary url=\"http://en.wiktionary.org/wiki/%s\"]]"
+msgstr "[[!shortcut name=wiktionary url=\"http://en.wiktionary.org/wiki/%s\"]]"
+
+#. type: Bullet: '* '
+msgid ""
+"[[!shortcut name=debbug url=\"http://bugs.debian.org/%s\" desc=\"bug #%s\"]]"
+msgstr ""
+"[[!shortcut name=debbug url=\"http://bugs.debian.org/%s\" desc=\"bug #%s\"]]"
+
+#. type: Bullet: '* '
+msgid ""
+"[[!shortcut name=deblist url=\"http://lists.debian.org/debian-%s\" desc="
+"\"debian-%s@lists.debian.org\"]]"
+msgstr ""
+"[[!shortcut name=deblist url=\"http://lists.debian.org/debian-%s\" desc="
+"\"debian-%s@lists.debian.org\"]]"
+
+#. type: Bullet: '* '
+msgid "[[!shortcut name=debpkg url=\"http://packages.debian.org/%s\"]]"
+msgstr "[[!shortcut name=debpkg url=\"http://packages.debian.org/%s\"]]"
+
+#. type: Bullet: '* '
+msgid "[[!shortcut name=debpkgsid url=\"http://packages.debian.org/sid/%s\"]]"
+msgstr "[[!shortcut name=debpkgsid url=\"http://packages.debian.org/sid/%s\"]]"
+
+#. type: Bullet: '* '
+msgid "[[!shortcut name=debpts url=\"http://packages.qa.debian.org/%s\"]]"
+msgstr "[[!shortcut name=debpts url=\"http://packages.qa.debian.org/%s\"]]"
+
+#. type: Bullet: '* '
+msgid ""
+"[[!shortcut name=debmsg url=\"http://lists.debian.org/msgid-search/%s\"]]"
+msgstr ""
+"[[!shortcut name=debmsg url=\"http://lists.debian.org/msgid-search/%s\"]]"
+
+#. type: Bullet: '* '
+msgid ""
+"[[!shortcut name=debrt url=\"https://rt.debian.org/Ticket/Display.html?id=%s"
+"\"]]"
+msgstr ""
+"[[!shortcut name=debrt url=\"https://rt.debian.org/Ticket/Display.html?id=%s"
+"\"]]"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"* [[!shortcut name=debss url=\"http://snapshot.debian.net/package/%s\"]]\n"
+" * Usage: `\\[[!debss package]]`, `\\[[!debss package#version]]`, or `\\[[!debss package/version]]`. See http://snapshot.debian.net for details.\n"
+"* [[!shortcut name=debwiki url=\"http://wiki.debian.org/%s\"]]\n"
+"* [[!shortcut name=fdobug url=\"https://bugs.freedesktop.org/show_bug.cgi?id=%s\" desc=\"freedesktop.org bug #%s\"]]\n"
+"* [[!shortcut name=fdolist url=\"http://lists.freedesktop.org/mailman/listinfo/%s\" desc=\"%s@lists.freedesktop.org\"]]\n"
+"* [[!shortcut name=gnomebug url=\"http://bugzilla.gnome.org/show_bug.cgi?id=%s\" desc=\"GNOME bug #%s\"]]\n"
+"* [[!shortcut name=linuxbug url=\"http://bugzilla.kernel.org/show_bug.cgi?id=%s\" desc=\"Linux bug #%s\"]]\n"
+"* [[!shortcut name=mozbug url=\"https://bugzilla.mozilla.org/show_bug.cgi?id=%s\" desc=\"Mozilla bug #%s\"]]\n"
+"* [[!shortcut name=gnulist url=\"http://lists.gnu.org/mailman/listinfo/%s\" desc=\"%s@gnu.org\"]]\n"
+"* [[!shortcut name=marcmsg url=\"http://marc.info/?i=%s\"]]\n"
+"* [[!shortcut name=marclist url=\"http://marc.info/?l=%s\"]]\n"
+"* [[!shortcut name=gmane url=\"http://dir.gmane.org/gmane.%s\" desc=\"gmane.%s\"]]\n"
+"* [[!shortcut name=gmanemsg url=\"http://mid.gmane.org/%s\"]]\n"
+"* [[!shortcut name=cpan url=\"http://search.cpan.org/search?mode=dist&query=%s\"]]\n"
+"* [[!shortcut name=ctan url=\"http://tug.ctan.org/cgi-bin/ctanPackageInformation.py?id=%s\"]]\n"
+"* [[!shortcut name=hoogle url=\"http://haskell.org/hoogle/?q=%s\"]]\n"
+"* [[!shortcut name=iki url=\"http://ikiwiki.info/%S/\"]]\n"
+"* [[!shortcut name=ljuser url=\"http://%s.livejournal.com/\"]]\n"
+"* [[!shortcut name=rfc url=\"http://www.ietf.org/rfc/rfc%s.txt\" desc=\"RFC %s\"]]\n"
+"* [[!shortcut name=c2 url=\"http://c2.com/cgi/wiki?%s\"]]\n"
+"* [[!shortcut name=meatballwiki url=\"http://www.usemod.com/cgi-bin/mb.pl?%s\"]]\n"
+"* [[!shortcut name=emacswiki url=\"http://www.emacswiki.org/cgi-bin/wiki/%s\"]]\n"
+"* [[!shortcut name=haskellwiki url=\"http://haskell.org/haskellwiki/%s\"]]\n"
+"* [[!shortcut name=dict url=\"http://www.dict.org/bin/Dict?Form=Dict1&Strategy=*&Database=*&Query=%s\"]]\n"
+"* [[!shortcut name=imdb url=\"http://imdb.com/find?q=%s\"]]\n"
+"* [[!shortcut name=gpg url=\"http://pgpkeys.mit.edu:11371/pks/lookup?op=vindex&exact=on&search=0x%s\"]]\n"
+"* [[!shortcut name=perldoc url=\"http://perldoc.perl.org/search.html?q=%s\"]]\n"
+"* [[!shortcut name=whois url=\"http://reports.internic.net/cgi/whois?whois_nic=%s&type=domain\"]]\n"
+"* [[!shortcut name=cve url=\"http://cve.mitre.org/cgi-bin/cvename.cgi?name=%s\"]]\n"
+"* [[!shortcut name=cia url=\"http://cia.vc/stats/project/%s\"]]\n"
+"* [[!shortcut name=ciauser url=\"http://cia.vc/stats/user/%s\"]]\n"
+"* [[!shortcut name=flickr url=\"http://www.flickr.com/photos/%s\"]]\n"
+"* [[!shortcut name=man url=\"http://linux.die.net/man/%s\"]]\n"
+"* [[!shortcut name=ohloh url=\"http://www.ohloh.net/projects/%s\"]]\n"
+msgstr ""
+"* [[!shortcut name=debss url=\"http://snapshot.debian.net/package/%s\"]]\n"
+" * Usage : `\\[[!debss package]]`, `\\[[!debss package#version]]`, ou `\\[[!debss package/version]]`. Consultez http://snapshot.debian.net pour d'autres précisions.\n"
+"* [[!shortcut name=debwiki url=\"http://wiki.debian.org/%s\"]]\n"
+"* [[!shortcut name=fdobug url=\"https://bugs.freedesktop.org/show_bug.cgi?id=%s\" desc=\"freedesktop.org bug #%s\"]]\n"
+"* [[!shortcut name=fdolist url=\"http://lists.freedesktop.org/mailman/listinfo/%s\" desc=\"%s@lists.freedesktop.org\"]]\n"
+"* [[!shortcut name=gnomebug url=\"http://bugzilla.gnome.org/show_bug.cgi?id=%s\" desc=\"GNOME bug #%s\"]]\n"
+"* [[!shortcut name=linuxbug url=\"http://bugzilla.kernel.org/show_bug.cgi?id=%s\" desc=\\\"Linux bug #%s\"]]\n"
+"* [[!shortcut name=mozbug url=\"https://bugzilla.mozilla.org/show_bug.cgi?id=%s\" desc=\"Mozilla bug #%s\"]]\n"
+"* [[!shortcut name=gnulist url=\"http://lists.gnu.org/mailman/listinfo/%s\" desc=\"%s@gnu.org\"]]\n"
+"* [[!shortcut name=marcmsg url=\"http://marc.info/?i=%s\"]]\n"
+"* [[!shortcut name=marclist url=\"http://marc.info/?l=%s\"]]\n"
+"* [[!shortcut name=gmane url=\"http://dir.gmane.org/gmane.%s\" desc=\"gmane.%s\"]]\n"
+"* [[!shortcut name=gmanemsg url=\"http://mid.gmane.org/%s\"]]\n"
+"* [[!shortcut name=cpan url=\"http://search.cpan.org/search?mode=dist&query=%s\"]]\n"
+"* [[!shortcut name=ctan url=\"http://tug.ctan.org/cgi-bin/ctanPackageInformation.py?id=%s\"]]\n"
+"* [[!shortcut name=hoogle url=\"http://haskell.org/hoogle/?q=%s\"]]\n"
+"* [[!shortcut name=iki url=\"http://ikiwiki.info/%S/\"]]\n"
+"* [[!shortcut name=ljuser url=\"http://%s.livejournal.com/\"]]\n"
+"* [[!shortcut name=rfc url=\"http://www.ietf.org/rfc/rfc%s.txt\" desc=\"RFC %s\"]]\n"
+"* [[!shortcut name=c2 url=\"http://c2.com/cgi/wiki?%s\"]]\n"
+"* [[!shortcut name=meatballwiki url=\"http://www.usemod.com/cgi-bin/mb.pl?%s\"]]\n"
+"* [[!shortcut name=emacswiki url=\"http://www.emacswiki.org/cgi-bin/wiki/%s\"]]\n"
+"* [[!shortcut name=haskellwiki url=\"http://haskell.org/haskellwiki/%s\"]]\n"
+"* [[!shortcut name=dict url=\"http://www.dict.org/bin/Dict?Form=Dict1&Strategy=*&Database=*&Query=%s\"]]\n"
+"* [[!shortcut name=imdb url=\"http://imdb.com/find?q=%s\"]]\n"
+"* [[!shortcut name=gpg url=\"http://pgpkeys.mit.edu:11371/pks/lookup?op=vindex&exact=on&search=0x%s\"]]\n"
+"* [[!shortcut name=perldoc url=\"http://perldoc.perl.org/search.html?q=%s\"]]\n"
+"* [[!shortcut name=whois url=\"http://reports.internic.net/cgi/whois?whois_nic=%s&type=domain\"]]\n"
+"* [[!shortcut name=cve url=\"http://cve.mitre.org/cgi-bin/cvename.cgi?name=%s\"]]\n"
+"* [[!shortcut name=cia url=\"http://cia.vc/stats/project/%s\"]]\n"
+"* [[!shortcut name=ciauser url=\"http://cia.vc/stats/user/%s\"]]\n"
+"* [[!shortcut name=flickr url=\"http://www.flickr.com/photos/%s\"]]\n"
+"* [[!shortcut name=man url=\"http://linux.die.net/man/%s\"]]\n"
+"* [[!shortcut name=ohloh url=\"http://www.ohloh.net/projects/%s\"]]\n"
+
+#. type: Plain text
+msgid ""
+"To add a new shortcut, use the `shortcut` [[ikiwiki/directive]]. In the url, "
+"\"%s\" is replaced with the text passed to the named shortcut, after [[!"
+"wikipedia url_encoding]] it, and '%S' is replaced with the raw, non-encoded "
+"text. The optional `desc` parameter controls the description of the link."
+msgstr ""
+"Pour ajouter un raccourci, utilisez la [[ikiwiki/directive]] `shortcut`. "
+"Dans l'URL, \"%s\" est remplacé par le texte passé au raccourci, après "
+"l'avoir codé [[!\"wikipedia url_encoding]], et le \"%S\" est remplacé par le "
+"texte brut, non codé. La paramètre facultatif `desc` contrôle la description "
+"du lien."
+
+#. type: Plain text
+msgid ""
+"Remember that the `name` you give the shortcut will become a new [[ikiwiki/"
+"directive]]. Avoid using a `name` that conflicts with an existing "
+"directive. These directives also accept a `desc` parameter that will "
+"override the one provided at definition time."
+msgstr ""
+"N'oubliez pas que le paramètre `name` donné au raccourci devient une "
+"nouvelle [[ikiwiki/directive]]. Évitez de donner un nom qui entre en conflit "
+"avec une directive existante. Ces directives acceptent aussi un paramètre "
+"`desc` qui primera celui fourni au moment de la définition du raccourci."
+
+#. type: Plain text
+msgid ""
+"If you come up with a shortcut that you think others might find useful, "
+"consider contributing it to the [shortcuts page on the ikiwiki wiki](http://"
+"ikiwiki.info/shortcuts/), so that future versions of ikiwiki will include "
+"your shortcut in the standard underlay."
+msgstr ""
+"Si vous trouvez un raccourci qui vous paraît utile, proposez-le sur la [page "
+"des raccourcis du wiki d'ikiwiki](http://ikiwiki.info/shortcuts/). Ainsi les "
+"futures versions d'ikiwiki incluront automatiquement ce raccourci."
diff --git a/po/underlays/basewiki/templates.fr.po b/po/underlays/basewiki/templates.fr.po
new file mode 100644
index 000000000..3321cc597
--- /dev/null
+++ b/po/underlays/basewiki/templates.fr.po
@@ -0,0 +1,241 @@
+# Traduction de ikiwiki
+# Copyright (C) 2009 Debian French l10n team <debian-l10n-french@lists.debian.org>
+# This file is distributed under the same license as the PACKAGE Ikiwiki.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: ikiwiki\n"
+"POT-Creation-Date: 2009-08-15 18:30-0300\n"
+"PO-Revision-Date: 2009-08-23 21:20+0200\n"
+"Last-Translator: Alexandre Dupas <alexandre.dupas@gmail.com>\n"
+"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bits\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"[[!if test=\"enabled(template)\"\n"
+"then=\"This wiki has templates **enabled**.\"\n"
+"else=\"This wiki has templates **disabled**.\"\n"
+"]]\n"
+msgstr ""
+"[[!if test=\"enabled(template)\"\n"
+"then=\"Les modèles sont **activés** dans ce wiki.\"\n"
+"else=\"Les modèles sont **désactivés** dans ce wiki.\"\n"
+"]]\n"
+
+#. type: Plain text
+msgid ""
+"Templates are files that can be filled out and inserted into pages in the "
+"wiki."
+msgstr ""
+"Les modèles sont des fichiers pouvant être remplis et insérés dans les pages "
+"du wiki."
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!if test=\"enabled(template) and enabled(inline)\" then=\"\"\"\n"
+msgstr "[[!if test=\"enabled(template) and enabled(inline)\" then=\"\"\"\n"
+
+#. type: Plain text
+msgid ""
+"These templates are available for inclusion onto other pages in this wiki:"
+msgstr "Ces modèles peuvent être insérés dans d'autres pages de ce wiki :"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"[[!inline pages=\"templates/* and !*/discussion\" feeds=no archive=yes\n"
+"sort=title template=titlepage]]\n"
+msgstr ""
+"[[!inline pages=\"templates/* and !*/discussion\" feeds=no archive=yes\n"
+"sort=title template=titlepage]]\n"
+
+#. type: Title ##
+#, no-wrap
+msgid "Using a template"
+msgstr "Utiliser un modèle"
+
+#. type: Plain text
+msgid "Using a template works like this:"
+msgstr "Voici comment fonctionne un modèle :"
+
+#. type: Plain text
+#, no-wrap
+msgid "\t\\[[!template id=note text=\"\"\"Here is the text to insert into my note.\"\"\"]]\n"
+msgstr "\t\\[[!template id=note text=\"\"\"Ici se trouve le texte à insérer dans ma note.\"\"\"]]\n"
+
+#. type: Plain text
+msgid ""
+"This fills out the [[note]] template, filling in the `text` field with the "
+"specified value, and inserts the result into the page."
+msgstr ""
+"Ceci remplit le modèle [[note]], remplaçant le champ `text` par la valeur "
+"spécifiée, et insérant le résultat dans la page."
+
+#. type: Plain text
+msgid ""
+"Generally, a value can include any markup that would be allowed in the wiki "
+"page outside the template. Triple-quoting the value even allows quotes to be "
+"included in it. Combined with multi-line quoted values, this allows for "
+"large chunks of marked up text to be embedded into a template:"
+msgstr ""
+"Généralement, une valeur peut inclure n'importe quelle balise qui serait "
+"autorisée dans les pages du wiki. Tripler les guillemets autour de la valeur "
+"permet même d'y inclure des guillemets. Ainsi, avec des valeurs sur "
+"plusieurs lignes, de larges morceaux de texte mis en forme peuvent être "
+"intégrés dans un modèle :"
+
+#. type: Plain text
+#, no-wrap
+msgid " \\[[!template id=foo name=\"Sally\" color=\"green\" age=8 notes=\"\"\"\n"
+msgstr " \\[[!template id=foo name=\"Sally\" color=\"green\" age=8 notes=\"\"\"\n"
+
+#. type: Bullet: ' * '
+msgid "\\[[Charley]]'s sister."
+msgstr "soeur de \\[[Charley]]."
+
+#. type: Bullet: ' * '
+msgid "\"I want to be an astronaut when I grow up.\""
+msgstr "\"Je veux devenir une astronaute lorsque je serai grande.\""
+
+#. type: Bullet: ' * '
+msgid "Really 8 and a half."
+msgstr "Réellement 8 ans et demi."
+
+#. type: Title ##
+#, no-wrap
+msgid "Creating a template"
+msgstr "Créer un modèle"
+
+#. type: Plain text
+msgid ""
+"To create a template, simply add a template directive to a page, and the "
+"page will provide a link that can be used to create the template. The "
+"template is a regular wiki page, located in the `templates/` subdirectory "
+"inside the source directory of the wiki."
+msgstr ""
+"Pour créer un modèle, ajoutez simplement une directive `template` à une "
+"page. La page fournira alors un lien qui peut être utilisé pour créer le "
+"modèle. Le modèle est une page de wiki régulière, enregistrée dans le sous-"
+"répertoire `templates/` du répertoire source du wiki."
+
+#. type: Plain text
+msgid ""
+"The template uses the syntax used by the [[!cpan HTML::Template]] perl "
+"module, which allows for some fairly complex things to be done. Consult its "
+"documentation for the full syntax, but all you really need to know are a few "
+"things:"
+msgstr ""
+"Le modèle utilise la syntaxe définie par le module perl [[!cpan HTML::"
+"Template]], qui permet de faire des choses plutôt complexes. Consultez sa "
+"documentation pour obtenir la syntaxe complète. Cependant, vous n'avez "
+"réellement besoin que de quelques informations :"
+
+#. type: Bullet: '* '
+msgid ""
+"Each parameter you pass to the template directive will generate a template "
+"variable. There are also some pre-defined variables like PAGE and BASENAME."
+msgstr ""
+"Chaque paramètre que vous donnez à la directive `template` générera une "
+"variable dans le modèle. Il y a en plus quelques variables prédéfinies comme "
+"PAGE et BASENAME."
+
+#. type: Bullet: '* '
+msgid ""
+"To insert the value of a variable, use `<TMPL_VAR variable>`. Wiki markup in "
+"the value will first be converted to html."
+msgstr ""
+"Pour insérer la valeur d'une variable, utilisez `<TMPL_VAR variable>`. La "
+"syntaxe wiki dans la valeur sera d'abord transformée en html."
+
+#. type: Bullet: '* '
+msgid ""
+"To insert the raw value of a variable, with wiki markup not yet converted to "
+"html, use `<TMPL_VAR raw_variable>`."
+msgstr ""
+"Pour insérer la valeur brute d'une variable, sans que la syntaxe wiki soit "
+"convertie en html, utilisez `<TMPL_VAR raw_variable>`."
+
+#. type: Bullet: '* '
+msgid ""
+"To make a block of text conditional on a variable being set use `<TMPL_IF "
+"NAME=\"variable\">text</TMPL_IF>`."
+msgstr ""
+"Pour écrire un bloc de texte si une variable est définie, utilisez `<TMPL_IF "
+"NAME=\"variable\">texte</TMPL_IF>`."
+
+#. type: Bullet: '* '
+msgid ""
+"To use one block of text if a variable is set and a second if it's not, use "
+"`<TMPL_IF NAME=\"variable\">text<TMPL_ELSE>other text</TMPL_IF>`"
+msgstr ""
+"Pour utiliser un bloc de texte si une variable est définie et un autre dans "
+"le cas contraire, utilisez `<TMPL_IF NAME=\"variable\">texte<TMPL_ELSE>autre "
+"texte</TMPL_IF>`"
+
+#. type: Plain text
+msgid "Here's a sample template:"
+msgstr "Voici un exemple de modèle :"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+" <span class=\"infobox\">\n"
+" Name: \\[[<TMPL_VAR raw_name>]]<br />\n"
+" Age: <TMPL_VAR age><br />\n"
+" <TMPL_IF NAME=\"color\">\n"
+" Favorite color: <TMPL_VAR color><br />\n"
+" <TMPL_ELSE>\n"
+" No favorite color.<br />\n"
+" </TMPL_IF>\n"
+" <TMPL_IF NAME=\"notes\">\n"
+" <hr />\n"
+" <TMPL_VAR notes>\n"
+" </TMPL_IF>\n"
+" </span>\n"
+msgstr ""
+" <span class=\"infobox\">\n"
+" Nom : \\[[<TMPL_VAR raw_name>]]<br />\n"
+" Age : <TMPL_VAR age><br />\n"
+" <TMPL_IF NAME=\"color\">\n"
+" Couleur favorite : <TMPL_VAR color><br />\n"
+" <TMPL_ELSE>\n"
+" Pas de couleur favorite.<br />\n"
+" </TMPL_IF>\n"
+" <TMPL_IF NAME=\"notes\">\n"
+" <hr />\n"
+" <TMPL_VAR notes>\n"
+" </TMPL_IF>\n"
+" </span>\n"
+
+#. type: Plain text
+msgid ""
+"The filled out template will be formatted the same as the rest of the page "
+"that contains it, so you can include WikiLinks and all other forms of wiki "
+"markup in the template. Note though that such WikiLinks will not show up as "
+"backlinks to the page that uses the template."
+msgstr ""
+"Le modèle rempli sera mis en forme comme le reste de la page qui le "
+"contient. Vous pouvez donc inclure des WikiLinks et toutes les autres formes "
+"de balises wiki dans les modèles. Notez cependant que de tels WikiLinks "
+"n'apparaîtront pas dans les BackLinks de la page qui utilise le modèle."
+
+#. type: Plain text
+msgid ""
+"Note the use of \"raw_name\" inside the [[ikiwiki/WikiLink]] generator. This "
+"ensures that if the name contains something that might be mistaken for wiki "
+"markup, it's not converted to html before being processed as a [[ikiwiki/"
+"WikiLink]]."
+msgstr ""
+"Notez l'utilisation de \"raw_name\" à l'intérieur du générateur de [[ikiwiki/"
+"WikiLink]]. Cela assure que si le nom contient quelque chose pouvant être "
+"confondu avec une balise wiki, alors il n'est pas converti en html avant "
+"d'être traité comme un [[ikiwiki/WikiLink]]."
diff --git a/po/underlays/basewiki/templates/note.fr.po b/po/underlays/basewiki/templates/note.fr.po
new file mode 100644
index 000000000..b02e62e3b
--- /dev/null
+++ b/po/underlays/basewiki/templates/note.fr.po
@@ -0,0 +1,40 @@
+# Traduction de ikiwiki
+# Copyright (C) 2009 Debian French l10n team <debian-l10n-french@lists.debian.org>
+# This file is distributed under the same license as the PACKAGE Ikiwiki.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: ikiwiki\n"
+"POT-Creation-Date: 2009-08-15 18:30-0300\n"
+"PO-Revision-Date: 2009-08-24 00:18+0200\n"
+"Last-Translator: Alexandre Dupas <alexandre.dupas@gmail.com>\n"
+"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: ENCODING\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"<div class=\"notebox\">\n"
+"<TMPL_VAR text>\n"
+"</div>\n"
+"<TMPL_UNLESS NAME=\"text\">\n"
+"Use this template to insert a note into a page. The note will be styled to\n"
+"float to the right of other text on the page. This template has one\n"
+"parameter:\n"
+"<ul>\n"
+"<li>`text` - the text to display in the note\n"
+"</ul>\n"
+"</TMPL_UNLESS>\n"
+msgstr ""
+"<div class=\"notebox\">\n"
+"<TMPL_VAR text>\n"
+"</div>\n"
+"<TMPL_UNLESS NAME=\"text\">\n"
+"Utilisez ce modèle pour insérer une note dans une page. La note sera placée à la droite du texte de la page. Ce modèle possède un paramètre :\n"
+"<ul>\n"
+"<li>`text` - le texte à afficher dans la note\n"
+"</ul>\n"
+"</TMPL_UNLESS>\n"
diff --git a/po/underlays/basewiki/templates/popup.fr.po b/po/underlays/basewiki/templates/popup.fr.po
new file mode 100644
index 000000000..d2cd29118
--- /dev/null
+++ b/po/underlays/basewiki/templates/popup.fr.po
@@ -0,0 +1,46 @@
+# Traduction de ikiwiki
+# Copyright (C) 2009 Debian French l10n team <debian-l10n-french@lists.debian.org>
+# This file is distributed under the same license as the PACKAGE Ikiwiki.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: ikiwiki\n"
+"POT-Creation-Date: 2009-08-15 18:30-0300\n"
+"PO-Revision-Date: 2009-08-24 10:27+0200\n"
+"Last-Translator: Alexandre Dupas <alexandre.dupas@gmail.com>\n"
+"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: ENCODING\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"<TMPL_UNLESS NAME=\"mouseover\">\n"
+"Use this template to create a popup window that is displayed when the mouse\n"
+"is over part of the page. This template has two parameters:\n"
+"<ul>\n"
+"<li>`mouseover` - This is the text or other content that triggers the\n"
+"popup.\n"
+"<li>`popup` - This should be the content of the popup window. It can be\n"
+"anything, even images or a whole little wiki page, but should not be too\n"
+"large for good usability.\n"
+"</ul>\n"
+"Note that browsers that do not support the CSS will display the popup\n"
+"inline in the page, inside square brackets.\n"
+"</TMPL_UNLESS>\n"
+"<span class=\"popup\"><TMPL_VAR mouseover>\n"
+"<span class=\"paren\">[</span><span class=\"balloon\"><TMPL_VAR popup></span><span class=\"paren\">]</span>\n"
+"</span>\n"
+msgstr ""
+"<TMPL_UNLESS NAME=\"mouseover\">\n"
+"Utilisez ce modèle pour créer un popup qui est affiché lorsque la souris est au dessus d'une partie de la page. Ce modèle possède deux paramètres :\n"
+"<ul>\n"
+"<li>`mouseover` - Ce paramètre indique le contenu (texte ou autre) qui déclenche le popup.\n"
+"<li>`popup` - Ce paramètre est le contenu du popup. Il peut être quelconque, aussi bien des images qu'une page de wiki complète, mais ne doit pas être trop grand pour une bonne utilisabilité.\n"
+"</ul>\n"
+"Notez que les navigateurs qui ne gèrent pas les feuilles de style CSS afficheront le popup au fil du texte dans la page, entre crochets.\n"
+"</TMPL_UNLESS>\n"
+"<span class=\"popup\"><TMPL_VAR mouseover>\n"
+"<span class=\"paren\">[</span><span class=\"balloon\"><TMPL_VAR popup></span><span class=\"paren\">]</span>\n"
+"</span>\n"