merge updated translations from l10n

This includes an (almost) up-to-date French basewiki translation.

1 files changed, 161 insertions, 12 deletions

diff --git a/po/underlays/directives/ikiwiki/directive/template.fr.po b/po/underlays/directives/ikiwiki/directive/template.fr.po
index 96a91ad23..2e6b2dbe4 100644
--- a/po/underlays/directives/ikiwiki/directive/template.fr.po
+++ b/po/underlays/directives/ikiwiki/directive/template.fr.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
-"POT-Creation-Date: 2009-08-15 18:30-0300\n"
+"POT-Creation-Date: 2010-07-18 22:29+0000\n"
 "PO-Revision-Date: 2009-09-12 08:39+0200\n"
 "Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bits\n"
@@ -17,18 +18,38 @@ msgstr ""
 msgid ""
 "The `template` directive is supplied by the [[!iki plugins/template "
 "desc=template]] plugin."
-msgstr "La directive `template` est fournie par le module d'extension [[!iki plugins/template desc=template]]."
+msgstr ""
+"La directive `template` est fournie par le module d'extension [[!iki plugins/"
+"template desc=template]]."
 
 #. type: Plain text
 msgid ""
-"[[Templates]] are files that can be filled out and inserted into pages in "
-"the wiki, by using the template directive. The directive has an `id` "
-"parameter that identifies the template to use. The remaining parameters are "
-"used to fill out the template."
-msgstr "Les modèles de page [[Templates]] sont des fichiers pouvant être remplis et insérés dans les pages du wiki, avec la directive template. Cette directive possède un paramètre `id` qui identifie le modèle à utiliser. Les autres paramètres servent à remplir le modèle."
+"The template directive allows wiki pages to be used as templates.  These "
+"templates can be filled out and inserted into other pages in the wiki using "
+"the directive. The [[templates]] page lists templates that can be used with "
+"this directive."
+msgstr ""
 
 #. type: Plain text
-msgid "Example:"
+#, fuzzy
+#| msgid ""
+#| "[[Templates]] are files that can be filled out and inserted into pages in "
+#| "the wiki, by using the template directive. The directive has an `id` "
+#| "parameter that identifies the template to use. The remaining parameters "
+#| "are used to fill out the template."
+msgid ""
+"The directive has an `id` parameter that identifies the template to use. The "
+"remaining parameters are used to fill out the template."
+msgstr ""
+"Les modèles de page [[Templates]] sont des fichiers pouvant être remplis et "
+"insérés dans les pages du wiki, avec la directive template. Cette directive "
+"possède un paramètre `id` qui identifie le modèle à utiliser. Les autres "
+"paramètres servent à remplir le modèle."
+
+#. type: Title ##
+#, fuzzy, no-wrap
+#| msgid "Example:"
+msgid "Example"
 msgstr "Exemple :"
 
 #. type: Plain text
@@ -40,15 +61,143 @@ msgstr "\t\\[[!template id=note text=\"\"\"Here is the text to insert into my no
 msgid ""
 "This fills out the `note` template, filling in the `text` field with the "
 "specified value, and inserts the result into the page."
-msgstr "Cette expression 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."
+msgstr ""
+"Cette expression 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: Title ##
+#, no-wrap
+msgid "Using a template"
+msgstr ""
 
 #. type: Plain text
 msgid ""
-"For a list of available templates, and details about how to create more, see "
-"the [[templates]] page."
-msgstr "Consultez la page [[templates]] pour connaître les modèles de page disponibles et la manière d'en créer d'autres."
+"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 ""
+
+#. type: Plain text
+#, no-wrap
+msgid "        \\[[!template id=foo name=\"Sally\" color=\"green\" age=8 notes=\"\"\"\n"
+msgstr ""
+
+#. type: Bullet: '        * '
+msgid "\\[[Charley]]'s sister."
+msgstr ""
+
+#. type: Bullet: '        * '
+msgid "\"I want to be an astronaut when I grow up.\""
+msgstr ""
+
+#. type: Bullet: '        * '
+msgid "Really 8 and a half."
+msgstr ""
+
+#. type: Title ##
+#, no-wrap
+msgid "Creating a template"
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"The template is a regular wiki page, located in the `templates/` "
+"subdirectory inside the source directory of the wiki."
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"(Alternatively, templates can be stored in a directory outside the wiki, as "
+"files with the extension \".tmpl\".  By default, these are searched for in `/"
+"usr/share/ikiwiki/templates`; the `templatedir` setting can be used to make "
+"another directory be searched first.)"
+msgstr ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. type: Bullet: '* '
+msgid ""
+"To make a block of text conditional on a variable being set use `<TMPL_IF "
+"variable>text</TMPL_IF>`."
+msgstr ""
+
+#. type: Bullet: '* '
+msgid ""
+"To use one block of text if a variable is set and a second if it's not, use "
+"`<TMPL_IF variable>text<TMPL_ELSE>other text</TMPL_IF>`"
+msgstr ""
+
+#. type: Plain text
+msgid "Here's a sample template:"
+msgstr ""
+
+#. 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 color>\n"
+"        Favorite color: <TMPL_VAR color><br />\n"
+"        <TMPL_ELSE>\n"
+"        No favorite color.<br />\n"
+"        </TMPL_IF>\n"
+"        <TMPL_IF notes>\n"
+"        <hr />\n"
+"        <TMPL_VAR notes>\n"
+"        </TMPL_IF>\n"
+"        </span>\n"
+msgstr ""
+
+#. 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 ""
+
+#. type: Plain text
+msgid ""
+"Note the use of \"raw_name\" inside the [[ikiwiki/WikiLink]] generator in "
+"the example above. 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 ""
 
 #. type: Plain text
 #, no-wrap
 msgid "[[!meta robots=\"noindex, follow\"]]\n"
 msgstr "[[!meta robots=\"noindex, follow\"]]\n"
+
+#~ msgid ""
+#~ "For a list of available templates, and details about how to create more, "
+#~ "see the [[templates]] page."
+#~ msgstr ""
+#~ "Consultez la page [[templates]] pour connaître les modèles de page "
+#~ "disponibles et la manière d'en créer d'autres."