From 8a5f76d74d457c89d4274168d767faa6f030218b Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 13 Sep 2009 19:29:26 -0400 Subject: [PATCH] merge changes from l10n --- po/underlays/basewiki/templates.fr.po | 6 ++--- .../directives/ikiwiki/directive/inline.da.po | 13 ++++++++-- .../ikiwiki/directive/pagestats.da.po | 25 ++++++++++++++++++- .../ikiwiki/directive/postsparkline.da.po | 12 ++++----- .../ikiwiki/directive/sparkline.da.po | 4 +-- 5 files changed, 45 insertions(+), 15 deletions(-) diff --git a/po/underlays/basewiki/templates.fr.po b/po/underlays/basewiki/templates.fr.po index 3321cc597..37d578ec8 100644 --- a/po/underlays/basewiki/templates.fr.po +++ b/po/underlays/basewiki/templates.fr.po @@ -6,7 +6,7 @@ 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" +"PO-Revision-Date: 2009-09-12 08:40+0200\n" "Last-Translator: Alexandre Dupas \n" "Language-Team: French \n" "MIME-Version: 1.0\n" @@ -76,9 +76,7 @@ msgstr "\t\\[[!template id=note text=\"\"\"Ici se trouve le texte à insérer da 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." +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: Plain text msgid "" diff --git a/po/underlays/directives/ikiwiki/directive/inline.da.po b/po/underlays/directives/ikiwiki/directive/inline.da.po index 5641508e2..9d9d6829d 100644 --- a/po/underlays/directives/ikiwiki/directive/inline.da.po +++ b/po/underlays/directives/ikiwiki/directive/inline.da.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki 3.15\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-22 11:17+0300\n" +"POT-Creation-Date: 2009-08-26 13:39-0300\n" "PO-Revision-Date: 2009-07-23 00:06+0200\n" "Last-Translator: Jonas Smedegaard \n" "Language-Team: None\n" @@ -151,7 +151,7 @@ msgstr "" #. type: Bullet: '* ' msgid "" -"`rootpage` - Enable the postform, and allows controling where newly posted " +"`rootpage` - Enables the postform, and allows controling where newly posted " "pages should go, by specifiying the page that they should be a [[SubPage]] " "of." msgstr "" @@ -273,6 +273,15 @@ msgid "" "not to use `usedirs`." msgstr "" +#. type: Bullet: '* ' +msgid "" +"`pagenames` - If given instead of `pages`, this is interpreted as a space-" +"separated list of links to pages (with the same [[SubPage/LinkingRules]] as " +"in a [[ikiwiki/WikiLink]]), and they are inlined in exactly the order given: " +"the `sort` and `pages` parameters cannot be used in conjunction with this " +"one." +msgstr "" + #. type: Plain text #, no-wrap msgid "[[!meta robots=\"noindex, follow\"]]\n" diff --git a/po/underlays/directives/ikiwiki/directive/pagestats.da.po b/po/underlays/directives/ikiwiki/directive/pagestats.da.po index 76474b217..6514e4e22 100644 --- a/po/underlays/directives/ikiwiki/directive/pagestats.da.po +++ b/po/underlays/directives/ikiwiki/directive/pagestats.da.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki 3.15\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-19 23:45+0200\n" +"POT-Creation-Date: 2009-08-15 18:54-0300\n" "PO-Revision-Date: 2009-07-23 00:06+0200\n" "Last-Translator: Jonas Smedegaard \n" "Language-Team: None\n" @@ -50,6 +50,29 @@ msgstr "Og sådan her dannes en tabel over alle sider i wikien:" msgid "\t\\[[!pagestats style=\"table\"]]\n" msgstr "\t\\[[!pagestats style=\"table\"]]\n" +#. type: Plain text +msgid "" +"The optional `among` parameter limits counting to pages that match a " +"[[ikiwiki/PageSpec]]. For instance, to display a cloud of tags used on blog " +"entries, you could use:" +msgstr "" + +#. type: Plain text +#, fuzzy, no-wrap +#| msgid "\t\\[[!pagestats pages=\"tags/*\"]]\n" +msgid "\t\\[[!pagestats pages=\"tags/*\" among=\"blog/posts/*\"]]\n" +msgstr "\t\\[[!pagestats pages=\"tags/*\"]]\n" + +#. type: Plain text +msgid "or to display a cloud of tags related to Linux, you could use:" +msgstr "" + +#. type: Plain text +#, fuzzy, no-wrap +#| msgid "\t\\[[!pagestats pages=\"tags/*\"]]\n" +msgid "\t\\[[!pagestats pages=\"tags/* and not tags/linux\" among=\"tagged(linux)\"]]\n" +msgstr "\t\\[[!pagestats pages=\"tags/*\"]]\n" + #. type: Plain text #, no-wrap msgid "[[!meta robots=\"noindex, follow\"]]\n" diff --git a/po/underlays/directives/ikiwiki/directive/postsparkline.da.po b/po/underlays/directives/ikiwiki/directive/postsparkline.da.po index 4725964c2..0c53cc956 100644 --- a/po/underlays/directives/ikiwiki/directive/postsparkline.da.po +++ b/po/underlays/directives/ikiwiki/directive/postsparkline.da.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki 3.15\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-22 11:17+0300\n" +"POT-Creation-Date: 2009-09-13 19:02-0300\n" "PO-Revision-Date: 2009-07-23 00:06+0200\n" "Last-Translator: Jonas Smedegaard \n" "Language-Team: None\n" @@ -66,7 +66,7 @@ msgstr "brug" #. type: Plain text msgid "" -"All options aside fron the `pages`, `max`, `formula`, `time`, and `color` " +"All options aside from the `pages`, `max`, `formula`, `time`, and `color` " "options are the same as in [[sparkline]] directive." msgstr "" @@ -81,7 +81,7 @@ msgstr "" #. type: Plain text msgid "" "The `formula` parameter controls the formula used to generate data points. " -"Available forumlae:" +"Available formulae:" msgstr "" #. type: Bullet: '* ' @@ -104,14 +104,14 @@ msgstr "" #. type: Bullet: '* ' msgid "" -"`peryear` - Each point represents a day; the height represents how many " +"`peryear` - Each point represents a year; the height represents how many " "posts were made that year." msgstr "" #. type: Plain text msgid "" -"The `time` parameter has a default value of \"ctime\", since forumae use the " -"creation times of pages by default. If you instead want them to use the " +"The `time` parameter has a default value of \"ctime\", since formulae use " +"the creation times of pages by default. If you instead want them to use the " "modification times of pages, set it to \"mtime\"." msgstr "" diff --git a/po/underlays/directives/ikiwiki/directive/sparkline.da.po b/po/underlays/directives/ikiwiki/directive/sparkline.da.po index 655b174e7..857b2a5c6 100644 --- a/po/underlays/directives/ikiwiki/directive/sparkline.da.po +++ b/po/underlays/directives/ikiwiki/directive/sparkline.da.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki 3.15\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-22 11:17+0300\n" +"POT-Creation-Date: 2009-09-13 19:02-0300\n" "PO-Revision-Date: 2009-07-23 00:06+0200\n" "Last-Translator: Jonas Smedegaard \n" "Language-Team: None\n" @@ -28,7 +28,7 @@ msgstr "" #. type: Plain text msgid "" "This directive allows for embedding sparklines into wiki pages. A sparkline " -"is a small word-size graphic chart, that is designed to be displayes " +"is a small word-size graphic chart, that is designed to be displayed " "alongside text." msgstr "" -- 2.32.0.93.g670b81a890