* Add "template" option to inline plugin to allow for use of customised

  templates.

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index ebfcee9edec79cd743832684adb6183697293f75..2db39f777664d135b5cc86852feb04a77b058199 100644 (file)
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -77,6 +77,12 @@ sub preprocess_inline (@) { #{{{
                $desc = $config{wikiname};
        }
        my $actions=yesno($params{actions});
                $desc = $config{wikiname};
        }
        my $actions=yesno($params{actions});

+       if (exists $params{template}) {
+               $params{template}=~s/[^-_a-zA-Z0-9]+//g;
+       }
+       else {
+               $params{template} = $archive ? "archivepage" : "inlinepage";
+       }

 
        my @list;
        foreach my $page (keys %pagesources) {
 
        my @list;
        foreach my $page (keys %pagesources) {


@@ -131,10 +137,11 @@ sub preprocess_inline (@) { #{{{
                $ret.=$linktemplate->output;
        }
        
                $ret.=$linktemplate->output;
        }
        

-       my $template=template(
-               ($archive ? "inlinepagetitle.tmpl" : "inlinepage.tmpl"),
-               blind_cache => 1,
-       ) unless $raw;
+       my @params=IkiWiki::template_params($params{template}.".tmpl", blind_cache => 1);
+       if (! @params) {
+               return sprintf(gettext("nonexistant template %s @params"), $params{template});
+       }
+       my $template=HTML::Template->new(@params) unless $raw;

        
        foreach my $page (@list) {
                my $file = $pagesources{$page};
        
        foreach my $page (@list) {
                my $file = $pagesources{$page};

diff --git a/debian/changelog b/debian/changelog
index 77333b0ec04d7d223aa2aeedfb3df9bd000cc2a5..e00ec0bfbf1d89d4a554514e7574486ef5727098 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,10 @@ ikiwiki (1.45) UNRELEASED; urgency=low
   * Allow for underscores to appear in page titles, if encoded appropriately
     (__95__) in filenames. Previously, all underscores were replaced with
     spaces. Thanks, Enrico Zini for noticing that bug.
   * Allow for underscores to appear in page titles, if encoded appropriately
     (__95__) in filenames. Previously, all underscores were replaced with
     spaces. Thanks, Enrico Zini for noticing that bug.

+  * Add "template" option to inline plugin to allow for use of customised
+    templates.

 
 

- -- Joey Hess <joeyh@debian.org>  Thu,  1 Mar 2007 19:30:36 -0500
+ -- Joey Hess <joeyh@debian.org>  Thu,  1 Mar 2007 22:55:35 -0500

 
 ikiwiki (1.44) unstable; urgency=low
 
 
 ikiwiki (1.44) unstable; urgency=low
 

diff --git a/doc/plugins/inline.mdwn b/doc/plugins/inline.mdwn
index a607474df4c251a5eccb57ba378cc995a12dc586..5cb8383c1ed6104b9a91f1e6caa62c4ff7c05950 100644 (file)
--- a/doc/plugins/inline.mdwn
+++ b/doc/plugins/inline.mdwn
@@ -34,6 +34,11 @@ directive:
   full controls.
 * `quick` - Build archives in quick mode, without reading page contents for
   metadata. By default, this also turns off generation of any feeds.
   full controls.
 * `quick` - Build archives in quick mode, without reading page contents for
   metadata. By default, this also turns off generation of any feeds.

+* `template` - Specifies the template to fill out to display each inlined
+  page. By default the `inlinepage` [[template|templates]] is used, while
+  the `archivepage` template is used for archives. Set this parameter to
+  use some other, custom template. Note that you should still set
+  `archive=yes` if your custom template does not include the page content.

 * `raw` - Rather than the default behavior of creating a [[blog]],
   if raw is set to "yes", the page will be included raw, without additional
   markup around it, as if it were a literal part of the source of the 
 * `raw` - Rather than the default behavior of creating a [[blog]],
   if raw is set to "yes", the page will be included raw, without additional
   markup around it, as if it were a literal part of the source of the 

diff --git a/doc/templates.mdwn b/doc/templates.mdwn
index 05fdc4426b6d4a1d4380c73b3af431595d4357c4..1f98334c9ff32d8c090b4e3f933bfbd0eca5798e 100644 (file)
--- a/doc/templates.mdwn
+++ b/doc/templates.mdwn
@@ -4,7 +4,8 @@ to learn.
 
 The aim is to keep almost all html out of ikiwiki and in the templates.
 
 
 The aim is to keep almost all html out of ikiwiki and in the templates.
 

-It ships with some basic templates which can be customised:
+It ships with some basic templates which can be customised. These are
+located in /usr/share/ikiwiki/templates by default.

 
 * `page.tmpl` - Used for displaying all regular wiki pages.
 * `misc.tmpl` - Generic template used for any page that doesn't
 
 * `page.tmpl` - Used for displaying all regular wiki pages.
 * `misc.tmpl` - Generic template used for any page that doesn't


@@ -22,8 +23,7 @@ It ships with some basic templates which can be customised:
 * `atomitem.tmpl` - Used for generating individual items on atom feeds.
 * `inlinepage.tmpl` - Used for adding a page inline in a blog
   page.
 * `atomitem.tmpl` - Used for generating individual items on atom feeds.
 * `inlinepage.tmpl` - Used for adding a page inline in a blog
   page.

-* `inlinepagetitle.tmpl` - Used for listing a page inline in a blog
-  archive page.
+* `archivepage.tmpl` - Used for listing a page in a blog archive page.

 * `estseek.conf` - Not a html template, this is actually a template for
   a config file for the [[HyperEstraier]] search engine. If you like you
   can read the [[HyperEstraier]] docs and configure it using this.
 * `estseek.conf` - Not a html template, this is actually a template for
   a config file for the [[HyperEstraier]] search engine. If you like you
   can read the [[HyperEstraier]] docs and configure it using this.

diff --git a/doc/todo/Option_to_disable_date_footer_for_inlines.mdwn b/doc/todo/Option_to_disable_date_footer_for_inlines.mdwn
index 9575fdb81ed47db3890b1243e6870897d25b800d..7d3438b2e8855cc5e73e9c84d64d6c5c238e2927 100644 (file)
--- a/doc/todo/Option_to_disable_date_footer_for_inlines.mdwn
+++ b/doc/todo/Option_to_disable_date_footer_for_inlines.mdwn
@@ -14,3 +14,6 @@ instance. --[[JoshTriplett]]
 >> In a related note, I'd like an option to include the creation date on some non-inlined pages too. I suppose
 >> that's doable with some template hook in a plugin, and a command-line parameter pagespec (suffices for me),
 >> but I haven't got around to that yet. --[[tuomov]]
 >> In a related note, I'd like an option to include the creation date on some non-inlined pages too. I suppose
 >> that's doable with some template hook in a plugin, and a command-line parameter pagespec (suffices for me),
 >> but I haven't got around to that yet. --[[tuomov]]

+
+Customised templates can now be specified with the `templates` parameter,
+so [[todo/done]] --[[Joey]]

diff --git a/po/bg.po b/po/bg.po
index fa7cdd735744d5639689307006855c9c663df5dc..54ba5491d414c20c8c1ec762f6ae58b91e579e69 100644 (file)
--- a/po/bg.po
+++ b/po/bg.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki-bg\n"
 "Report-Msgid-Bugs-To: \n"
 msgstr ""
 "Project-Id-Version: ikiwiki-bg\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2007-02-19 21:47-0500\n"
+"POT-Creation-Date: 2007-03-01 22:55-0500\n"

 "PO-Revision-Date: 2007-01-12 01:19+0200\n"
 "Last-Translator: Damyan Ivanov <dam@modsodtsys.com>\n"
 "Language-Team: Bulgarian <dict@fsa-bg.org>\n"
 "PO-Revision-Date: 2007-01-12 01:19+0200\n"
 "Last-Translator: Damyan Ivanov <dam@modsodtsys.com>\n"
 "Language-Team: Bulgarian <dict@fsa-bg.org>\n"


@@ -20,37 +20,37 @@ msgstr ""
 msgid "You need to log in first."
 msgstr "Първо трябва да влезете."
 
 msgid "You need to log in first."
 msgstr "Първо трябва да влезете."
 

-#: ../IkiWiki/CGI.pm:267
+#: ../IkiWiki/CGI.pm:274

 msgid "Preferences saved."
 msgstr "Предпочитанията са запазени."
 
 msgid "Preferences saved."
 msgstr "Предпочитанията са запазени."
 

-#: ../IkiWiki/CGI.pm:332
+#: ../IkiWiki/CGI.pm:340

 #, perl-format
 msgid "%s is not an editable page"
 msgstr ""
 
 #, perl-format
 msgid "%s is not an editable page"
 msgstr ""
 

-#: ../IkiWiki/CGI.pm:420 ../IkiWiki/Plugin/brokenlinks.pm:24
-#: ../IkiWiki/Plugin/inline.pm:164 ../IkiWiki/Plugin/opendiscussion.pm:17
+#: ../IkiWiki/CGI.pm:428 ../IkiWiki/Plugin/brokenlinks.pm:24
+#: ../IkiWiki/Plugin/inline.pm:171 ../IkiWiki/Plugin/opendiscussion.pm:17

 #: ../IkiWiki/Plugin/orphans.pm:28 ../IkiWiki/Render.pm:97
 #: ../IkiWiki/Render.pm:165
 msgid "discussion"
 msgstr "дискусия"
 
 #: ../IkiWiki/Plugin/orphans.pm:28 ../IkiWiki/Render.pm:97
 #: ../IkiWiki/Render.pm:165
 msgid "discussion"
 msgstr "дискусия"
 

-#: ../IkiWiki/CGI.pm:465
+#: ../IkiWiki/CGI.pm:474

 #, perl-format
 msgid "creating %s"
 msgstr "създаване на %s"
 
 #, perl-format
 msgid "creating %s"
 msgstr "създаване на %s"
 

-#: ../IkiWiki/CGI.pm:482 ../IkiWiki/CGI.pm:510 ../IkiWiki/CGI.pm:543
+#: ../IkiWiki/CGI.pm:491 ../IkiWiki/CGI.pm:527 ../IkiWiki/CGI.pm:571

 #, perl-format
 msgid "editing %s"
 msgstr "промяна на %s"
 
 #, perl-format
 msgid "editing %s"
 msgstr "промяна на %s"
 

-#: ../IkiWiki/CGI.pm:651
+#: ../IkiWiki/CGI.pm:668

 msgid "You are banned."
 msgstr "Достъпът ви е забранен."
 
 msgid "You are banned."
 msgstr "Достъпът ви е забранен."
 

-#: ../IkiWiki/CGI.pm:683
+#: ../IkiWiki/CGI.pm:700

 msgid "login failed, perhaps you need to turn on cookies?"
 msgstr ""
 
 msgid "login failed, perhaps you need to turn on cookies?"
 msgstr ""
 


@@ -123,16 +123,21 @@ msgstr ""
 "Когато се използва „--rss” или „--atom” трябва да се укаже и "
 "местоположението на уикито посредством параметъра „--url”"
 
 "Когато се използва „--rss” или „--atom” трябва да се укаже и "
 "местоположението на уикито посредством параметъра „--url”"
 

-#: ../IkiWiki/Plugin/inline.pm:96
+#: ../IkiWiki/Plugin/inline.pm:102

 #, perl-format
 msgid "unknown sort type %s"
 msgstr "непознат вид сортиране „%s”"
 
 #, perl-format
 msgid "unknown sort type %s"
 msgstr "непознат вид сортиране „%s”"
 

-#: ../IkiWiki/Plugin/inline.pm:172 ../IkiWiki/Render.pm:101
+#: ../IkiWiki/Plugin/inline.pm:142
+#, perl-format
+msgid "nonexistant template %s"
+msgstr ""
+
+#: ../IkiWiki/Plugin/inline.pm:179 ../IkiWiki/Render.pm:101

 msgid "Discussion"
 msgstr "Дискусия"
 
 msgid "Discussion"
 msgstr "Дискусия"
 

-#: ../IkiWiki/Plugin/inline.pm:387
+#: ../IkiWiki/Plugin/inline.pm:394

 msgid "RPC::XML::Client not found, not pinging"
 msgstr "модулът „RPC::XML::Client” не е намерен; източникът не е проверен"
 
 msgid "RPC::XML::Client not found, not pinging"
 msgstr "модулът „RPC::XML::Client” не е намерен; източникът не е проверен"
 


@@ -387,15 +392,15 @@ msgstr "грешка при четене на „%s”: %s"
 msgid "generating wrappers.."
 msgstr "генериране на обвивки..."
 
 msgid "generating wrappers.."
 msgstr "генериране на обвивки..."
 

-#: ../IkiWiki/Setup/Standard.pm:68
+#: ../IkiWiki/Setup/Standard.pm:71

 msgid "rebuilding wiki.."
 msgstr "обновяване на уики..."
 
 msgid "rebuilding wiki.."
 msgstr "обновяване на уики..."
 

-#: ../IkiWiki/Setup/Standard.pm:71
+#: ../IkiWiki/Setup/Standard.pm:74

 msgid "refreshing wiki.."
 msgstr "осъвременяване на уики..."
 
 msgid "refreshing wiki.."
 msgstr "осъвременяване на уики..."
 

-#: ../IkiWiki/Setup/Standard.pm:80
+#: ../IkiWiki/Setup/Standard.pm:83

 msgid "done"
 msgstr "готово"
 
 msgid "done"
 msgstr "готово"
 


@@ -444,13 +449,13 @@ msgstr "успешно генериране на %s"
 msgid "usage: ikiwiki [options] source dest"
 msgstr "формат: ikiwiki [опции] източник местоназначение"
 
 msgid "usage: ikiwiki [options] source dest"
 msgstr "формат: ikiwiki [опции] източник местоназначение"
 

-#: ../IkiWiki.pm:103
+#: ../IkiWiki.pm:104

 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr ""
 "При използване на пареметъра „--cgi” е необходимо да се укаже и "
 "местоположението на уикито чрез параметъра „--url”"
 
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr ""
 "При използване на пареметъра „--cgi” е необходимо да се укаже и "
 "местоположението на уикито чрез параметъра „--url”"
 

-#: ../IkiWiki.pm:150 ../IkiWiki.pm:151
+#: ../IkiWiki.pm:151 ../IkiWiki.pm:152

 msgid "Error"
 msgstr "Грешка"
 
 msgid "Error"
 msgstr "Грешка"
 


@@ -458,7 +463,7 @@ msgstr "Грешка"
 #. translators: preprocessor directive name,
 #. translators: the second a page name, the
 #. translators: third a number.
 #. translators: preprocessor directive name,
 #. translators: the second a page name, the
 #. translators: third a number.

-#: ../IkiWiki.pm:558
+#: ../IkiWiki.pm:559

 #, perl-format
 msgid "%s preprocessing loop detected on %s at depth %i"
 msgstr "открита е циклична завидимост при %s на „%s” на дълбочина %i"
 #, perl-format
 msgid "%s preprocessing loop detected on %s at depth %i"
 msgstr "открита е циклична завидимост при %s на „%s” на дълбочина %i"

diff --git a/po/cs.po b/po/cs.po
index 0851166f4c2dc85a43400a8167e57de9e28d5d1e..e346af02cca7db26ceeaa4fee9f0902acb219b34 100644 (file)
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
 "Report-Msgid-Bugs-To: \n"
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2007-02-19 21:47-0500\n"
+"POT-Creation-Date: 2007-03-01 22:55-0500\n"

 "PO-Revision-Date: 2007-02-17 12:07+0100\n"
 "Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
 "PO-Revision-Date: 2007-02-17 12:07+0100\n"
 "Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"


@@ -19,37 +19,37 @@ msgstr ""
 msgid "You need to log in first."
 msgstr "Nejprve se musíte přihlásit."
 
 msgid "You need to log in first."
 msgstr "Nejprve se musíte přihlásit."
 

-#: ../IkiWiki/CGI.pm:267
+#: ../IkiWiki/CGI.pm:274

 msgid "Preferences saved."
 msgstr "Nastavení uloženo."
 
 msgid "Preferences saved."
 msgstr "Nastavení uloženo."
 

-#: ../IkiWiki/CGI.pm:332
+#: ../IkiWiki/CGI.pm:340

 #, perl-format
 msgid "%s is not an editable page"
 msgstr "%s není editovatelná stránka"
 
 #, perl-format
 msgid "%s is not an editable page"
 msgstr "%s není editovatelná stránka"
 

-#: ../IkiWiki/CGI.pm:420 ../IkiWiki/Plugin/brokenlinks.pm:24
-#: ../IkiWiki/Plugin/inline.pm:164 ../IkiWiki/Plugin/opendiscussion.pm:17
+#: ../IkiWiki/CGI.pm:428 ../IkiWiki/Plugin/brokenlinks.pm:24
+#: ../IkiWiki/Plugin/inline.pm:171 ../IkiWiki/Plugin/opendiscussion.pm:17

 #: ../IkiWiki/Plugin/orphans.pm:28 ../IkiWiki/Render.pm:97
 #: ../IkiWiki/Render.pm:165
 msgid "discussion"
 msgstr "diskuse"
 
 #: ../IkiWiki/Plugin/orphans.pm:28 ../IkiWiki/Render.pm:97
 #: ../IkiWiki/Render.pm:165
 msgid "discussion"
 msgstr "diskuse"
 

-#: ../IkiWiki/CGI.pm:465
+#: ../IkiWiki/CGI.pm:474

 #, perl-format
 msgid "creating %s"
 msgstr "vytvářím %s"
 
 #, perl-format
 msgid "creating %s"
 msgstr "vytvářím %s"
 

-#: ../IkiWiki/CGI.pm:482 ../IkiWiki/CGI.pm:510 ../IkiWiki/CGI.pm:543
+#: ../IkiWiki/CGI.pm:491 ../IkiWiki/CGI.pm:527 ../IkiWiki/CGI.pm:571

 #, perl-format
 msgid "editing %s"
 msgstr "upravuji %s"
 
 #, perl-format
 msgid "editing %s"
 msgstr "upravuji %s"
 

-#: ../IkiWiki/CGI.pm:651
+#: ../IkiWiki/CGI.pm:668

 msgid "You are banned."
 msgstr "Jste vyhoštěni."
 
 msgid "You are banned."
 msgstr "Jste vyhoštěni."
 

-#: ../IkiWiki/CGI.pm:683
+#: ../IkiWiki/CGI.pm:700

 msgid "login failed, perhaps you need to turn on cookies?"
 msgstr "přihlášení selhalo; možná si musíte povolit cookies?"
 
 msgid "login failed, perhaps you need to turn on cookies?"
 msgstr "přihlášení selhalo; možná si musíte povolit cookies?"
 


@@ -120,16 +120,21 @@ msgstr "googlecalendar v html nenalezl url"
 msgid "Must specify url to wiki with --url when using --rss or --atom"
 msgstr "Při používání --rss nebo --atom musíte pomocí --url zadat url k wiki"
 
 msgid "Must specify url to wiki with --url when using --rss or --atom"
 msgstr "Při používání --rss nebo --atom musíte pomocí --url zadat url k wiki"
 

-#: ../IkiWiki/Plugin/inline.pm:96
+#: ../IkiWiki/Plugin/inline.pm:102

 #, perl-format
 msgid "unknown sort type %s"
 msgstr "neznámý typ řazení %s"
 
 #, perl-format
 msgid "unknown sort type %s"
 msgstr "neznámý typ řazení %s"
 

-#: ../IkiWiki/Plugin/inline.pm:172 ../IkiWiki/Render.pm:101
+#: ../IkiWiki/Plugin/inline.pm:142
+#, perl-format
+msgid "nonexistant template %s"
+msgstr ""
+
+#: ../IkiWiki/Plugin/inline.pm:179 ../IkiWiki/Render.pm:101

 msgid "Discussion"
 msgstr "Diskuse"
 
 msgid "Discussion"
 msgstr "Diskuse"
 

-#: ../IkiWiki/Plugin/inline.pm:387
+#: ../IkiWiki/Plugin/inline.pm:394

 msgid "RPC::XML::Client not found, not pinging"
 msgstr "RPC::XML::Client nebyl nalezen, nepinkám"
 
 msgid "RPC::XML::Client not found, not pinging"
 msgstr "RPC::XML::Client nebyl nalezen, nepinkám"
 


@@ -382,15 +387,15 @@ msgstr "nemohu číst %s: %s"
 msgid "generating wrappers.."
 msgstr "generuji obaly..."
 
 msgid "generating wrappers.."
 msgstr "generuji obaly..."
 

-#: ../IkiWiki/Setup/Standard.pm:68
+#: ../IkiWiki/Setup/Standard.pm:71

 msgid "rebuilding wiki.."
 msgstr "znovu vytvářím wiki..."
 
 msgid "rebuilding wiki.."
 msgstr "znovu vytvářím wiki..."
 

-#: ../IkiWiki/Setup/Standard.pm:71
+#: ../IkiWiki/Setup/Standard.pm:74

 msgid "refreshing wiki.."
 msgstr "obnovuji wiki..."
 
 msgid "refreshing wiki.."
 msgstr "obnovuji wiki..."
 

-#: ../IkiWiki/Setup/Standard.pm:80
+#: ../IkiWiki/Setup/Standard.pm:83

 msgid "done"
 msgstr "hotovo"
 
 msgid "done"
 msgstr "hotovo"
 


@@ -439,11 +444,11 @@ msgstr "%s byl úspěšně vytvořen"
 msgid "usage: ikiwiki [options] source dest"
 msgstr "použití: ikiwiki [volby] zdroj cíl"
 
 msgid "usage: ikiwiki [options] source dest"
 msgstr "použití: ikiwiki [volby] zdroj cíl"
 

-#: ../IkiWiki.pm:103
+#: ../IkiWiki.pm:104

 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr "Při použití --cgi musíte pomocí --url zadat url k wiki"
 
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr "Při použití --cgi musíte pomocí --url zadat url k wiki"
 

-#: ../IkiWiki.pm:150 ../IkiWiki.pm:151
+#: ../IkiWiki.pm:151 ../IkiWiki.pm:152

 msgid "Error"
 msgstr "Chyba"
 
 msgid "Error"
 msgstr "Chyba"
 


@@ -451,7 +456,7 @@ msgstr "Chyba"
 #. translators: preprocessor directive name,
 #. translators: the second a page name, the
 #. translators: third a number.
 #. translators: preprocessor directive name,
 #. translators: the second a page name, the
 #. translators: third a number.

-#: ../IkiWiki.pm:558
+#: ../IkiWiki.pm:559

 #, perl-format
 msgid "%s preprocessing loop detected on %s at depth %i"
 msgstr "Byla rozpoznána smyčka direktivy %s na %s v hloubce %i"
 #, perl-format
 msgid "%s preprocessing loop detected on %s at depth %i"
 msgstr "Byla rozpoznána smyčka direktivy %s na %s v hloubce %i"

diff --git a/po/es.po b/po/es.po
index 7fba5acfc1b6655b3e268181eaeb8893cded9d96..e0ee7e5f619148f9490be04ac00506b1eab91b9a 100644 (file)
--- a/po/es.po
+++ b/po/es.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: es\n"
 "Report-Msgid-Bugs-To: \n"
 msgstr ""
 "Project-Id-Version: es\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2007-02-19 21:47-0500\n"
+"POT-Creation-Date: 2007-03-01 22:55-0500\n"

 "PO-Revision-Date: 2007-02-12 10:31+0100\n"
 "Last-Translator: Víctor Moral <victor@taquiones.net>\n"
 "Language-Team: spanish <es@li.org>\n"
 "PO-Revision-Date: 2007-02-12 10:31+0100\n"
 "Last-Translator: Víctor Moral <victor@taquiones.net>\n"
 "Language-Team: spanish <es@li.org>\n"


@@ -20,37 +20,37 @@ msgstr ""
 msgid "You need to log in first."
 msgstr "Antes es necesario identificarse."
 
 msgid "You need to log in first."
 msgstr "Antes es necesario identificarse."
 

-#: ../IkiWiki/CGI.pm:267
+#: ../IkiWiki/CGI.pm:274

 msgid "Preferences saved."
 msgstr "Las preferencias se han guardado."
 
 msgid "Preferences saved."
 msgstr "Las preferencias se han guardado."
 

-#: ../IkiWiki/CGI.pm:332
+#: ../IkiWiki/CGI.pm:340

 #, perl-format
 msgid "%s is not an editable page"
 msgstr "la página %s no es modificable"
 
 #, perl-format
 msgid "%s is not an editable page"
 msgstr "la página %s no es modificable"
 

-#: ../IkiWiki/CGI.pm:420 ../IkiWiki/Plugin/brokenlinks.pm:24
-#: ../IkiWiki/Plugin/inline.pm:164 ../IkiWiki/Plugin/opendiscussion.pm:17
+#: ../IkiWiki/CGI.pm:428 ../IkiWiki/Plugin/brokenlinks.pm:24
+#: ../IkiWiki/Plugin/inline.pm:171 ../IkiWiki/Plugin/opendiscussion.pm:17

 #: ../IkiWiki/Plugin/orphans.pm:28 ../IkiWiki/Render.pm:97
 #: ../IkiWiki/Render.pm:165
 msgid "discussion"
 msgstr "comentarios"
 
 #: ../IkiWiki/Plugin/orphans.pm:28 ../IkiWiki/Render.pm:97
 #: ../IkiWiki/Render.pm:165
 msgid "discussion"
 msgstr "comentarios"
 

-#: ../IkiWiki/CGI.pm:465
+#: ../IkiWiki/CGI.pm:474

 #, perl-format
 msgid "creating %s"
 msgstr "creando página %s"
 
 #, perl-format
 msgid "creating %s"
 msgstr "creando página %s"
 

-#: ../IkiWiki/CGI.pm:482 ../IkiWiki/CGI.pm:510 ../IkiWiki/CGI.pm:543
+#: ../IkiWiki/CGI.pm:491 ../IkiWiki/CGI.pm:527 ../IkiWiki/CGI.pm:571

 #, perl-format
 msgid "editing %s"
 msgstr "modificando página %s"
 
 #, perl-format
 msgid "editing %s"
 msgstr "modificando página %s"
 

-#: ../IkiWiki/CGI.pm:651
+#: ../IkiWiki/CGI.pm:668

 msgid "You are banned."
 msgstr "Ha sido expulsado."
 
 msgid "You are banned."
 msgstr "Ha sido expulsado."
 

-#: ../IkiWiki/CGI.pm:683
+#: ../IkiWiki/CGI.pm:700

 msgid "login failed, perhaps you need to turn on cookies?"
 msgstr ""
 "registro fallido, ¿ tal vez es necesario activar las cookies en el "
 msgid "login failed, perhaps you need to turn on cookies?"
 msgstr ""
 "registro fallido, ¿ tal vez es necesario activar las cookies en el "


@@ -126,16 +126,21 @@ msgstr ""
 "Es obligatorio indicar un url al wiki cuando se usan los parámetros --rss ó "
 "--atom"
 
 "Es obligatorio indicar un url al wiki cuando se usan los parámetros --rss ó "
 "--atom"
 

-#: ../IkiWiki/Plugin/inline.pm:96
+#: ../IkiWiki/Plugin/inline.pm:102

 #, perl-format
 msgid "unknown sort type %s"
 msgstr "no conozco este tipo de ordenación %s"
 
 #, perl-format
 msgid "unknown sort type %s"
 msgstr "no conozco este tipo de ordenación %s"
 

-#: ../IkiWiki/Plugin/inline.pm:172 ../IkiWiki/Render.pm:101
+#: ../IkiWiki/Plugin/inline.pm:142
+#, perl-format
+msgid "nonexistant template %s"
+msgstr ""
+
+#: ../IkiWiki/Plugin/inline.pm:179 ../IkiWiki/Render.pm:101

 msgid "Discussion"
 msgstr "Comentarios"
 
 msgid "Discussion"
 msgstr "Comentarios"
 

-#: ../IkiWiki/Plugin/inline.pm:387
+#: ../IkiWiki/Plugin/inline.pm:394

 msgid "RPC::XML::Client not found, not pinging"
 msgstr "No he encontrado el componente RPC::XML::Client, no envío señal alguna"
 
 msgid "RPC::XML::Client not found, not pinging"
 msgstr "No he encontrado el componente RPC::XML::Client, no envío señal alguna"
 


@@ -391,15 +396,15 @@ msgstr "no puedo leer el archivo %s: %s"
 msgid "generating wrappers.."
 msgstr "generando programas auxiliares.."
 
 msgid "generating wrappers.."
 msgstr "generando programas auxiliares.."
 

-#: ../IkiWiki/Setup/Standard.pm:68
+#: ../IkiWiki/Setup/Standard.pm:71

 msgid "rebuilding wiki.."
 msgstr "reconstruyendo el wiki.."
 
 msgid "rebuilding wiki.."
 msgstr "reconstruyendo el wiki.."
 

-#: ../IkiWiki/Setup/Standard.pm:71
+#: ../IkiWiki/Setup/Standard.pm:74

 msgid "refreshing wiki.."
 msgstr "actualizando el wiki.."
 
 msgid "refreshing wiki.."
 msgstr "actualizando el wiki.."
 

-#: ../IkiWiki/Setup/Standard.pm:80
+#: ../IkiWiki/Setup/Standard.pm:83

 msgid "done"
 msgstr "completado"
 
 msgid "done"
 msgstr "completado"
 


@@ -449,13 +454,13 @@ msgstr "creado con éxito el programa envoltorio %s"
 msgid "usage: ikiwiki [options] source dest"
 msgstr "uso: ikiwiki [opciones] origen destino"
 
 msgid "usage: ikiwiki [options] source dest"
 msgstr "uso: ikiwiki [opciones] origen destino"
 

-#: ../IkiWiki.pm:103
+#: ../IkiWiki.pm:104

 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr ""
 "Es obligatorio especificar un url al wiki con el parámetro --url si se "
 "utiliza el parámetro --cgi"
 
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr ""
 "Es obligatorio especificar un url al wiki con el parámetro --url si se "
 "utiliza el parámetro --cgi"
 

-#: ../IkiWiki.pm:150 ../IkiWiki.pm:151
+#: ../IkiWiki.pm:151 ../IkiWiki.pm:152

 msgid "Error"
 msgstr "Error"
 
 msgid "Error"
 msgstr "Error"
 


@@ -463,7 +468,7 @@ msgstr "Error"
 #. translators: preprocessor directive name,
 #. translators: the second a page name, the
 #. translators: third a number.
 #. translators: preprocessor directive name,
 #. translators: the second a page name, the
 #. translators: third a number.

-#: ../IkiWiki.pm:558
+#: ../IkiWiki.pm:559

 #, perl-format
 msgid "%s preprocessing loop detected on %s at depth %i"
 msgstr ""
 #, perl-format
 msgid "%s preprocessing loop detected on %s at depth %i"
 msgstr ""

diff --git a/po/fr.po b/po/fr.po
index 585a2ecd8afee6476aefbd455b549028aaaea397..dba93b7ec2e4c9bc0301d96c72677bafe86e6f95 100644 (file)
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
 "Report-Msgid-Bugs-To: \n"
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2007-02-23 19:44-0500\n"
+"POT-Creation-Date: 2007-03-01 22:55-0500\n"

 "PO-Revision-Date: 2007-02-13 13:02+0100\n"
 "Last-Translator: Jean-Luc Coulon (f5ibh) <jean-luc.coulon@wanadoo.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
 "PO-Revision-Date: 2007-02-13 13:02+0100\n"
 "Last-Translator: Jean-Luc Coulon (f5ibh) <jean-luc.coulon@wanadoo.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"


@@ -31,7 +31,7 @@ msgid "%s is not an editable page"
 msgstr "%s n'est pas une page éditable"
 
 #: ../IkiWiki/CGI.pm:428 ../IkiWiki/Plugin/brokenlinks.pm:24
 msgstr "%s n'est pas une page éditable"
 
 #: ../IkiWiki/CGI.pm:428 ../IkiWiki/Plugin/brokenlinks.pm:24

-#: ../IkiWiki/Plugin/inline.pm:164 ../IkiWiki/Plugin/opendiscussion.pm:17
+#: ../IkiWiki/Plugin/inline.pm:171 ../IkiWiki/Plugin/opendiscussion.pm:17

 #: ../IkiWiki/Plugin/orphans.pm:28 ../IkiWiki/Render.pm:97
 #: ../IkiWiki/Render.pm:165
 msgid "discussion"
 #: ../IkiWiki/Plugin/orphans.pm:28 ../IkiWiki/Render.pm:97
 #: ../IkiWiki/Render.pm:165
 msgid "discussion"


@@ -125,16 +125,21 @@ msgstr ""
 "Vous devez indiquer l'url du wiki par --url lors de l'utilisation de --rss "
 "ou --atom"
 
 "Vous devez indiquer l'url du wiki par --url lors de l'utilisation de --rss "
 "ou --atom"
 

-#: ../IkiWiki/Plugin/inline.pm:96
+#: ../IkiWiki/Plugin/inline.pm:102

 #, perl-format
 msgid "unknown sort type %s"
 msgstr "Type de tri %s inconnu"
 
 #, perl-format
 msgid "unknown sort type %s"
 msgstr "Type de tri %s inconnu"
 

-#: ../IkiWiki/Plugin/inline.pm:172 ../IkiWiki/Render.pm:101
+#: ../IkiWiki/Plugin/inline.pm:142
+#, perl-format
+msgid "nonexistant template %s"
+msgstr ""
+
+#: ../IkiWiki/Plugin/inline.pm:179 ../IkiWiki/Render.pm:101

 msgid "Discussion"
 msgstr "Discussion"
 
 msgid "Discussion"
 msgstr "Discussion"
 

-#: ../IkiWiki/Plugin/inline.pm:387
+#: ../IkiWiki/Plugin/inline.pm:394

 msgid "RPC::XML::Client not found, not pinging"
 msgstr "RPC::XML::Client introuvable, pas de réponse au ping"
 
 msgid "RPC::XML::Client not found, not pinging"
 msgstr "RPC::XML::Client introuvable, pas de réponse au ping"
 


@@ -461,7 +466,7 @@ msgstr "Erreur"
 #. translators: preprocessor directive name,
 #. translators: the second a page name, the
 #. translators: third a number.
 #. translators: preprocessor directive name,
 #. translators: the second a page name, the
 #. translators: third a number.

-#: ../IkiWiki.pm:561
+#: ../IkiWiki.pm:559

 #, perl-format
 msgid "%s preprocessing loop detected on %s at depth %i"
 msgstr ""
 #, perl-format
 msgid "%s preprocessing loop detected on %s at depth %i"
 msgstr ""

diff --git a/po/gu.po b/po/gu.po
index 5645690883d123a1d2779dddfc9b86b244b0771d..33a8065eb394005b51524ce33dda048e277018fe 100644 (file)
--- a/po/gu.po
+++ b/po/gu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki-gu\n"
 "Report-Msgid-Bugs-To: \n"
 msgstr ""
 "Project-Id-Version: ikiwiki-gu\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2007-02-19 21:47-0500\n"
+"POT-Creation-Date: 2007-03-01 22:55-0500\n"

 "PO-Revision-Date: 2007-01-11 16:05+0530\n"
 "Last-Translator: Kartik Mistry <kartik.mistry@gmail.com>\n"
 "Language-Team: Gujarati <team@utkarsh.org>\n"
 "PO-Revision-Date: 2007-01-11 16:05+0530\n"
 "Last-Translator: Kartik Mistry <kartik.mistry@gmail.com>\n"
 "Language-Team: Gujarati <team@utkarsh.org>\n"


@@ -19,37 +19,37 @@ msgstr ""
 msgid "You need to log in first."
 msgstr "તમારે પ્રથમ લોગ ઇન થવું પડશે."
 
 msgid "You need to log in first."
 msgstr "તમારે પ્રથમ લોગ ઇન થવું પડશે."
 

-#: ../IkiWiki/CGI.pm:267
+#: ../IkiWiki/CGI.pm:274

 msgid "Preferences saved."
 msgstr "પ્રાથમિકતાઓ સંગ્રહાઇ."
 
 msgid "Preferences saved."
 msgstr "પ્રાથમિકતાઓ સંગ્રહાઇ."
 

-#: ../IkiWiki/CGI.pm:332
+#: ../IkiWiki/CGI.pm:340

 #, perl-format
 msgid "%s is not an editable page"
 msgstr ""
 
 #, perl-format
 msgid "%s is not an editable page"
 msgstr ""
 

-#: ../IkiWiki/CGI.pm:420 ../IkiWiki/Plugin/brokenlinks.pm:24
-#: ../IkiWiki/Plugin/inline.pm:164 ../IkiWiki/Plugin/opendiscussion.pm:17
+#: ../IkiWiki/CGI.pm:428 ../IkiWiki/Plugin/brokenlinks.pm:24
+#: ../IkiWiki/Plugin/inline.pm:171 ../IkiWiki/Plugin/opendiscussion.pm:17

 #: ../IkiWiki/Plugin/orphans.pm:28 ../IkiWiki/Render.pm:97
 #: ../IkiWiki/Render.pm:165
 msgid "discussion"
 msgstr "ચર્ચા"
 
 #: ../IkiWiki/Plugin/orphans.pm:28 ../IkiWiki/Render.pm:97
 #: ../IkiWiki/Render.pm:165
 msgid "discussion"
 msgstr "ચર્ચા"
 

-#: ../IkiWiki/CGI.pm:465
+#: ../IkiWiki/CGI.pm:474

 #, perl-format
 msgid "creating %s"
 msgstr "%s બનાવે છે"
 
 #, perl-format
 msgid "creating %s"
 msgstr "%s બનાવે છે"
 

-#: ../IkiWiki/CGI.pm:482 ../IkiWiki/CGI.pm:510 ../IkiWiki/CGI.pm:543
+#: ../IkiWiki/CGI.pm:491 ../IkiWiki/CGI.pm:527 ../IkiWiki/CGI.pm:571

 #, perl-format
 msgid "editing %s"
 msgstr "%s સુધારે છે"
 
 #, perl-format
 msgid "editing %s"
 msgstr "%s સુધારે છે"
 

-#: ../IkiWiki/CGI.pm:651
+#: ../IkiWiki/CGI.pm:668

 msgid "You are banned."
 msgstr "તમારા પર પ્રતિબંધ છે."
 
 msgid "You are banned."
 msgstr "તમારા પર પ્રતિબંધ છે."
 

-#: ../IkiWiki/CGI.pm:683
+#: ../IkiWiki/CGI.pm:700

 msgid "login failed, perhaps you need to turn on cookies?"
 msgstr ""
 
 msgid "login failed, perhaps you need to turn on cookies?"
 msgstr ""
 


@@ -120,16 +120,21 @@ msgstr "ગુગલકેલેન્ડરને htmlમાં યુઆરએ
 msgid "Must specify url to wiki with --url when using --rss or --atom"
 msgstr "--rss અથવા --atom ઉપયોગ કરતી વખતે વીકીમાં --url ઉપયોગ કરવું જ પડશે"
 
 msgid "Must specify url to wiki with --url when using --rss or --atom"
 msgstr "--rss અથવા --atom ઉપયોગ કરતી વખતે વીકીમાં --url ઉપયોગ કરવું જ પડશે"
 

-#: ../IkiWiki/Plugin/inline.pm:96
+#: ../IkiWiki/Plugin/inline.pm:102

 #, perl-format
 msgid "unknown sort type %s"
 msgstr "અજાણ્યો ગોઠવણી પ્રકાર %s"
 
 #, perl-format
 msgid "unknown sort type %s"
 msgstr "અજાણ્યો ગોઠવણી પ્રકાર %s"
 

-#: ../IkiWiki/Plugin/inline.pm:172 ../IkiWiki/Render.pm:101
+#: ../IkiWiki/Plugin/inline.pm:142
+#, perl-format
+msgid "nonexistant template %s"
+msgstr ""
+
+#: ../IkiWiki/Plugin/inline.pm:179 ../IkiWiki/Render.pm:101

 msgid "Discussion"
 msgstr "ચર્ચા"
 
 msgid "Discussion"
 msgstr "ચર્ચા"
 

-#: ../IkiWiki/Plugin/inline.pm:387
+#: ../IkiWiki/Plugin/inline.pm:394

 msgid "RPC::XML::Client not found, not pinging"
 msgstr "RPC::XML::Client મળ્યું નહી, પિંગ કરવામાં આવતું નથી"
 
 msgid "RPC::XML::Client not found, not pinging"
 msgstr "RPC::XML::Client મળ્યું નહી, પિંગ કરવામાં આવતું નથી"
 


@@ -379,15 +384,15 @@ msgstr "વાંચી શકાતી નથી %s: %s"
 msgid "generating wrappers.."
 msgstr "આવરણ બનાવે છે.."
 
 msgid "generating wrappers.."
 msgstr "આવરણ બનાવે છે.."
 

-#: ../IkiWiki/Setup/Standard.pm:68
+#: ../IkiWiki/Setup/Standard.pm:71

 msgid "rebuilding wiki.."
 msgstr "વીકી ફરીથી બનાવે છે.."
 
 msgid "rebuilding wiki.."
 msgstr "વીકી ફરીથી બનાવે છે.."
 

-#: ../IkiWiki/Setup/Standard.pm:71
+#: ../IkiWiki/Setup/Standard.pm:74

 msgid "refreshing wiki.."
 msgstr "વીકીને તાજી કરે છે.."
 
 msgid "refreshing wiki.."
 msgstr "વીકીને તાજી કરે છે.."
 

-#: ../IkiWiki/Setup/Standard.pm:80
+#: ../IkiWiki/Setup/Standard.pm:83

 msgid "done"
 msgstr "સંપૂર્ણ"
 
 msgid "done"
 msgstr "સંપૂર્ણ"
 


@@ -436,11 +441,11 @@ msgstr "સફળતાપૂર્વક પેદા કરેલ છે %s"
 msgid "usage: ikiwiki [options] source dest"
 msgstr "ઉપયોગ: ikiwiki [વિકલ્પો] source dest"
 
 msgid "usage: ikiwiki [options] source dest"
 msgstr "ઉપયોગ: ikiwiki [વિકલ્પો] source dest"
 

-#: ../IkiWiki.pm:103
+#: ../IkiWiki.pm:104

 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr "જ્યારે --cgi ઉપયોગ કરતાં હોય ત્યારે વીકીનું યુઆરએલ સ્પષ્ટ કરવું જ પડશે"
 
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr "જ્યારે --cgi ઉપયોગ કરતાં હોય ત્યારે વીકીનું યુઆરએલ સ્પષ્ટ કરવું જ પડશે"
 

-#: ../IkiWiki.pm:150 ../IkiWiki.pm:151
+#: ../IkiWiki.pm:151 ../IkiWiki.pm:152

 msgid "Error"
 msgstr "ક્ષતિ"
 
 msgid "Error"
 msgstr "ક્ષતિ"
 


@@ -448,7 +453,7 @@ msgstr "ક્ષતિ"
 #. translators: preprocessor directive name,
 #. translators: the second a page name, the
 #. translators: third a number.
 #. translators: preprocessor directive name,
 #. translators: the second a page name, the
 #. translators: third a number.

-#: ../IkiWiki.pm:558
+#: ../IkiWiki.pm:559

 #, perl-format
 msgid "%s preprocessing loop detected on %s at depth %i"
 msgstr "%s પર શોધાયેલ લુપ  %s પર ચલાવે છે %i ઉંડાણ પર"
 #, perl-format
 msgid "%s preprocessing loop detected on %s at depth %i"
 msgstr "%s પર શોધાયેલ લુપ  %s પર ચલાવે છે %i ઉંડાણ પર"

diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot
index ece8ff38839c79ad0e7c682609cd7c05b572cb87..8a9b77cec340a23d7f97945178cf93d5488e0eb4 100644 (file)
--- a/po/ikiwiki.pot
+++ b/po/ikiwiki.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2007-02-24 20:17-0500\n"
+"POT-Creation-Date: 2007-03-01 22:55-0500\n"

 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"


@@ -30,7 +30,7 @@ msgid "%s is not an editable page"
 msgstr ""
 
 #: ../IkiWiki/CGI.pm:428 ../IkiWiki/Plugin/brokenlinks.pm:24
 msgstr ""
 
 #: ../IkiWiki/CGI.pm:428 ../IkiWiki/Plugin/brokenlinks.pm:24

-#: ../IkiWiki/Plugin/inline.pm:164 ../IkiWiki/Plugin/opendiscussion.pm:17
+#: ../IkiWiki/Plugin/inline.pm:171 ../IkiWiki/Plugin/opendiscussion.pm:17

 #: ../IkiWiki/Plugin/orphans.pm:28 ../IkiWiki/Render.pm:97
 #: ../IkiWiki/Render.pm:165
 msgid "discussion"
 #: ../IkiWiki/Plugin/orphans.pm:28 ../IkiWiki/Render.pm:97
 #: ../IkiWiki/Render.pm:165
 msgid "discussion"


@@ -121,16 +121,21 @@ msgstr ""
 msgid "Must specify url to wiki with --url when using --rss or --atom"
 msgstr ""
 
 msgid "Must specify url to wiki with --url when using --rss or --atom"
 msgstr ""
 

-#: ../IkiWiki/Plugin/inline.pm:96
+#: ../IkiWiki/Plugin/inline.pm:102

 #, perl-format
 msgid "unknown sort type %s"
 msgstr ""
 
 #, perl-format
 msgid "unknown sort type %s"
 msgstr ""
 

-#: ../IkiWiki/Plugin/inline.pm:172 ../IkiWiki/Render.pm:101
+#: ../IkiWiki/Plugin/inline.pm:142
+#, perl-format
+msgid "nonexistant template %s"
+msgstr ""
+
+#: ../IkiWiki/Plugin/inline.pm:179 ../IkiWiki/Render.pm:101

 msgid "Discussion"
 msgstr ""
 
 msgid "Discussion"
 msgstr ""
 

-#: ../IkiWiki/Plugin/inline.pm:387
+#: ../IkiWiki/Plugin/inline.pm:394

 msgid "RPC::XML::Client not found, not pinging"
 msgstr ""
 
 msgid "RPC::XML::Client not found, not pinging"
 msgstr ""
 


@@ -449,7 +454,7 @@ msgstr ""
 #. translators: preprocessor directive name,
 #. translators: the second a page name, the
 #. translators: third a number.
 #. translators: preprocessor directive name,
 #. translators: the second a page name, the
 #. translators: third a number.

-#: ../IkiWiki.pm:561
+#: ../IkiWiki.pm:559

 #, perl-format
 msgid "%s preprocessing loop detected on %s at depth %i"
 msgstr ""
 #, perl-format
 msgid "%s preprocessing loop detected on %s at depth %i"
 msgstr ""

diff --git a/po/pl.po b/po/pl.po
index 53cc06f660cb8ac0d07f8a5abef230439d5de760..9b335cbdb3a4730f4d2d46eb7a240380b81a6ed2 100644 (file)
--- a/po/pl.po
+++ b/po/pl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 1.37\n"
 "Report-Msgid-Bugs-To: \n"
 msgstr ""
 "Project-Id-Version: ikiwiki 1.37\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2007-02-19 21:47-0500\n"
+"POT-Creation-Date: 2007-03-01 22:55-0500\n"

 "PO-Revision-Date: 2007-01-05 16:33+100\n"
 "Last-Translator: Paweł Tęcza <ptecza@net.icm.edu.pl>\n"
 "Language-Team: Debian L10n Polish <debian-l10n-polish@lists.debian.org>\n"
 "PO-Revision-Date: 2007-01-05 16:33+100\n"
 "Last-Translator: Paweł Tęcza <ptecza@net.icm.edu.pl>\n"
 "Language-Team: Debian L10n Polish <debian-l10n-polish@lists.debian.org>\n"


@@ -20,37 +20,37 @@ msgstr ""
 msgid "You need to log in first."
 msgstr "Konieczne jest zalogowanie się."
 
 msgid "You need to log in first."
 msgstr "Konieczne jest zalogowanie się."
 

-#: ../IkiWiki/CGI.pm:267
+#: ../IkiWiki/CGI.pm:274

 msgid "Preferences saved."
 msgstr "Ustawienia zostały zapisane."
 
 msgid "Preferences saved."
 msgstr "Ustawienia zostały zapisane."
 

-#: ../IkiWiki/CGI.pm:332
+#: ../IkiWiki/CGI.pm:340

 #, perl-format
 msgid "%s is not an editable page"
 msgstr ""
 
 #, perl-format
 msgid "%s is not an editable page"
 msgstr ""
 

-#: ../IkiWiki/CGI.pm:420 ../IkiWiki/Plugin/brokenlinks.pm:24
-#: ../IkiWiki/Plugin/inline.pm:164 ../IkiWiki/Plugin/opendiscussion.pm:17
+#: ../IkiWiki/CGI.pm:428 ../IkiWiki/Plugin/brokenlinks.pm:24
+#: ../IkiWiki/Plugin/inline.pm:171 ../IkiWiki/Plugin/opendiscussion.pm:17

 #: ../IkiWiki/Plugin/orphans.pm:28 ../IkiWiki/Render.pm:97
 #: ../IkiWiki/Render.pm:165
 msgid "discussion"
 msgstr "dyskusja"
 
 #: ../IkiWiki/Plugin/orphans.pm:28 ../IkiWiki/Render.pm:97
 #: ../IkiWiki/Render.pm:165
 msgid "discussion"
 msgstr "dyskusja"
 

-#: ../IkiWiki/CGI.pm:465
+#: ../IkiWiki/CGI.pm:474

 #, perl-format
 msgid "creating %s"
 msgstr "tworzenie strony %s"
 
 #, perl-format
 msgid "creating %s"
 msgstr "tworzenie strony %s"
 

-#: ../IkiWiki/CGI.pm:482 ../IkiWiki/CGI.pm:510 ../IkiWiki/CGI.pm:543
+#: ../IkiWiki/CGI.pm:491 ../IkiWiki/CGI.pm:527 ../IkiWiki/CGI.pm:571

 #, perl-format
 msgid "editing %s"
 msgstr "edycja strony %s"
 
 #, perl-format
 msgid "editing %s"
 msgstr "edycja strony %s"
 

-#: ../IkiWiki/CGI.pm:651
+#: ../IkiWiki/CGI.pm:668

 msgid "You are banned."
 msgstr "Dostęp został zabroniony przez administratora."
 
 msgid "You are banned."
 msgstr "Dostęp został zabroniony przez administratora."
 

-#: ../IkiWiki/CGI.pm:683
+#: ../IkiWiki/CGI.pm:700

 msgid "login failed, perhaps you need to turn on cookies?"
 msgstr ""
 
 msgid "login failed, perhaps you need to turn on cookies?"
 msgstr ""
 


@@ -125,16 +125,21 @@ msgstr ""
 "Użycie parametru --rss lub --atom wymaga podania adresu URL do wiki za "
 "pomocą parametru --url"
 
 "Użycie parametru --rss lub --atom wymaga podania adresu URL do wiki za "
 "pomocą parametru --url"
 

-#: ../IkiWiki/Plugin/inline.pm:96
+#: ../IkiWiki/Plugin/inline.pm:102

 #, perl-format
 msgid "unknown sort type %s"
 msgstr "nieznany sposób sortowania %s"
 
 #, perl-format
 msgid "unknown sort type %s"
 msgstr "nieznany sposób sortowania %s"
 

-#: ../IkiWiki/Plugin/inline.pm:172 ../IkiWiki/Render.pm:101
+#: ../IkiWiki/Plugin/inline.pm:142
+#, perl-format
+msgid "nonexistant template %s"
+msgstr ""
+
+#: ../IkiWiki/Plugin/inline.pm:179 ../IkiWiki/Render.pm:101

 msgid "Discussion"
 msgstr "Dyskusja"
 
 msgid "Discussion"
 msgstr "Dyskusja"
 

-#: ../IkiWiki/Plugin/inline.pm:387
+#: ../IkiWiki/Plugin/inline.pm:394

 msgid "RPC::XML::Client not found, not pinging"
 msgstr "Niezainstalowany moduł RPC::XML::Client, brak możliwości pingowania"
 
 msgid "RPC::XML::Client not found, not pinging"
 msgstr "Niezainstalowany moduł RPC::XML::Client, brak możliwości pingowania"
 


@@ -391,15 +396,15 @@ msgstr "awaria w trakcie czytania strony %s: %s"
 msgid "generating wrappers.."
 msgstr "tworzenie osłon..."
 
 msgid "generating wrappers.."
 msgstr "tworzenie osłon..."
 

-#: ../IkiWiki/Setup/Standard.pm:68
+#: ../IkiWiki/Setup/Standard.pm:71

 msgid "rebuilding wiki.."
 msgstr "przebudowywanie wiki..."
 
 msgid "rebuilding wiki.."
 msgstr "przebudowywanie wiki..."
 

-#: ../IkiWiki/Setup/Standard.pm:71
+#: ../IkiWiki/Setup/Standard.pm:74

 msgid "refreshing wiki.."
 msgstr "odświeżanie wiki..."
 
 msgid "refreshing wiki.."
 msgstr "odświeżanie wiki..."
 

-#: ../IkiWiki/Setup/Standard.pm:80
+#: ../IkiWiki/Setup/Standard.pm:83

 msgid "done"
 msgstr "gotowe"
 
 msgid "done"
 msgstr "gotowe"
 


@@ -448,13 +453,13 @@ msgstr "strona pomyślnie utworzona %s"
 msgid "usage: ikiwiki [options] source dest"
 msgstr "użycie: ikiwiki [parametry] źródło cel"
 
 msgid "usage: ikiwiki [options] source dest"
 msgstr "użycie: ikiwiki [parametry] źródło cel"
 

-#: ../IkiWiki.pm:103
+#: ../IkiWiki.pm:104

 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr ""
 "Użycie parametru --cgi wymaga podania adresu URL do wiki za pomocą parametru "
 "--url"
 
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr ""
 "Użycie parametru --cgi wymaga podania adresu URL do wiki za pomocą parametru "
 "--url"
 

-#: ../IkiWiki.pm:150 ../IkiWiki.pm:151
+#: ../IkiWiki.pm:151 ../IkiWiki.pm:152

 msgid "Error"
 msgstr "Błąd"
 
 msgid "Error"
 msgstr "Błąd"
 


@@ -462,7 +467,7 @@ msgstr "Błąd"
 #. translators: preprocessor directive name,
 #. translators: the second a page name, the
 #. translators: third a number.
 #. translators: preprocessor directive name,
 #. translators: the second a page name, the
 #. translators: third a number.

-#: ../IkiWiki.pm:558
+#: ../IkiWiki.pm:559

 #, perl-format
 msgid "%s preprocessing loop detected on %s at depth %i"
 msgstr "polecenie preprocesora %s wykryte w %s na głębokości %i"
 #, perl-format
 msgid "%s preprocessing loop detected on %s at depth %i"
 msgstr "polecenie preprocesora %s wykryte w %s na głębokości %i"

diff --git a/po/sv.po b/po/sv.po
index aa6c15934a2fd32eeee3cc0504003f33cc0318b5..473b6df7ee3bfc4bb617adeadd9686edcb852ce3 100644 (file)
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
 "Report-Msgid-Bugs-To: \n"
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2007-02-19 21:47-0500\n"
+"POT-Creation-Date: 2007-03-01 22:55-0500\n"

 "PO-Revision-Date: 2007-01-10 23:47+0100\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "PO-Revision-Date: 2007-01-10 23:47+0100\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"


@@ -19,37 +19,37 @@ msgstr ""
 msgid "You need to log in first."
 msgstr "Du måste logga in först."
 
 msgid "You need to log in first."
 msgstr "Du måste logga in först."
 

-#: ../IkiWiki/CGI.pm:267
+#: ../IkiWiki/CGI.pm:274

 msgid "Preferences saved."
 msgstr "Inställningar sparades."
 
 msgid "Preferences saved."
 msgstr "Inställningar sparades."
 

-#: ../IkiWiki/CGI.pm:332
+#: ../IkiWiki/CGI.pm:340

 #, perl-format
 msgid "%s is not an editable page"
 msgstr ""
 
 #, perl-format
 msgid "%s is not an editable page"
 msgstr ""
 

-#: ../IkiWiki/CGI.pm:420 ../IkiWiki/Plugin/brokenlinks.pm:24
-#: ../IkiWiki/Plugin/inline.pm:164 ../IkiWiki/Plugin/opendiscussion.pm:17
+#: ../IkiWiki/CGI.pm:428 ../IkiWiki/Plugin/brokenlinks.pm:24
+#: ../IkiWiki/Plugin/inline.pm:171 ../IkiWiki/Plugin/opendiscussion.pm:17

 #: ../IkiWiki/Plugin/orphans.pm:28 ../IkiWiki/Render.pm:97
 #: ../IkiWiki/Render.pm:165
 msgid "discussion"
 msgstr "diskussion"
 
 #: ../IkiWiki/Plugin/orphans.pm:28 ../IkiWiki/Render.pm:97
 #: ../IkiWiki/Render.pm:165
 msgid "discussion"
 msgstr "diskussion"
 

-#: ../IkiWiki/CGI.pm:465
+#: ../IkiWiki/CGI.pm:474

 #, perl-format
 msgid "creating %s"
 msgstr "skapar %s"
 
 #, perl-format
 msgid "creating %s"
 msgstr "skapar %s"
 

-#: ../IkiWiki/CGI.pm:482 ../IkiWiki/CGI.pm:510 ../IkiWiki/CGI.pm:543
+#: ../IkiWiki/CGI.pm:491 ../IkiWiki/CGI.pm:527 ../IkiWiki/CGI.pm:571

 #, perl-format
 msgid "editing %s"
 msgstr "redigerar %s"
 
 #, perl-format
 msgid "editing %s"
 msgstr "redigerar %s"
 

-#: ../IkiWiki/CGI.pm:651
+#: ../IkiWiki/CGI.pm:668

 msgid "You are banned."
 msgstr "Du är bannlyst."
 
 msgid "You are banned."
 msgstr "Du är bannlyst."
 

-#: ../IkiWiki/CGI.pm:683
+#: ../IkiWiki/CGI.pm:700

 msgid "login failed, perhaps you need to turn on cookies?"
 msgstr ""
 
 msgid "login failed, perhaps you need to turn on cookies?"
 msgstr ""
 


@@ -120,16 +120,21 @@ msgstr "googlecalendar misslyckades med att hitta url i html"
 msgid "Must specify url to wiki with --url when using --rss or --atom"
 msgstr "Måste ange url till wiki med --url när --rss eller --atom används"
 
 msgid "Must specify url to wiki with --url when using --rss or --atom"
 msgstr "Måste ange url till wiki med --url när --rss eller --atom används"
 

-#: ../IkiWiki/Plugin/inline.pm:96
+#: ../IkiWiki/Plugin/inline.pm:102

 #, perl-format
 msgid "unknown sort type %s"
 msgstr "okänd sorteringstyp %s"
 
 #, perl-format
 msgid "unknown sort type %s"
 msgstr "okänd sorteringstyp %s"
 

-#: ../IkiWiki/Plugin/inline.pm:172 ../IkiWiki/Render.pm:101
+#: ../IkiWiki/Plugin/inline.pm:142
+#, perl-format
+msgid "nonexistant template %s"
+msgstr ""
+
+#: ../IkiWiki/Plugin/inline.pm:179 ../IkiWiki/Render.pm:101

 msgid "Discussion"
 msgstr "Diskussion"
 
 msgid "Discussion"
 msgstr "Diskussion"
 

-#: ../IkiWiki/Plugin/inline.pm:387
+#: ../IkiWiki/Plugin/inline.pm:394

 msgid "RPC::XML::Client not found, not pinging"
 msgstr "RPC::XML::Client hittades inte, pingar inte"
 
 msgid "RPC::XML::Client not found, not pinging"
 msgstr "RPC::XML::Client hittades inte, pingar inte"
 


@@ -383,15 +388,15 @@ msgstr "kan inte läsa %s: %s"
 msgid "generating wrappers.."
 msgstr "genererar wrappers.."
 
 msgid "generating wrappers.."
 msgstr "genererar wrappers.."
 

-#: ../IkiWiki/Setup/Standard.pm:68
+#: ../IkiWiki/Setup/Standard.pm:71

 msgid "rebuilding wiki.."
 msgstr "bygger om wiki.."
 
 msgid "rebuilding wiki.."
 msgstr "bygger om wiki.."
 

-#: ../IkiWiki/Setup/Standard.pm:71
+#: ../IkiWiki/Setup/Standard.pm:74

 msgid "refreshing wiki.."
 msgstr "uppdaterar wiki.."
 
 msgid "refreshing wiki.."
 msgstr "uppdaterar wiki.."
 

-#: ../IkiWiki/Setup/Standard.pm:80
+#: ../IkiWiki/Setup/Standard.pm:83

 msgid "done"
 msgstr "klar"
 
 msgid "done"
 msgstr "klar"
 


@@ -440,11 +445,11 @@ msgstr "generering av %s lyckades"
 msgid "usage: ikiwiki [options] source dest"
 msgstr "användning: ikiwiki [flaggor] källa mål"
 
 msgid "usage: ikiwiki [options] source dest"
 msgstr "användning: ikiwiki [flaggor] källa mål"
 

-#: ../IkiWiki.pm:103
+#: ../IkiWiki.pm:104

 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr "Måste ange url till wiki med --url när --cgi används"
 
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr "Måste ange url till wiki med --url när --cgi används"
 

-#: ../IkiWiki.pm:150 ../IkiWiki.pm:151
+#: ../IkiWiki.pm:151 ../IkiWiki.pm:152

 msgid "Error"
 msgstr "Fel"
 
 msgid "Error"
 msgstr "Fel"
 


@@ -452,7 +457,7 @@ msgstr "Fel"
 #. translators: preprocessor directive name,
 #. translators: the second a page name, the
 #. translators: third a number.
 #. translators: preprocessor directive name,
 #. translators: the second a page name, the
 #. translators: third a number.

-#: ../IkiWiki.pm:558
+#: ../IkiWiki.pm:559

 #, perl-format
 msgid "%s preprocessing loop detected on %s at depth %i"
 msgstr "%s förbehandlingsslinga detekterades på %s, djup %i"
 #, perl-format
 msgid "%s preprocessing loop detected on %s at depth %i"
 msgstr "%s förbehandlingsslinga detekterades på %s, djup %i"

diff --git a/po/vi.po b/po/vi.po
index d889b61cb3bd74b8ccfab4c71e851f64354a7463..8fd8a4d5e5a098238e166a2d655e106a28e08dd8 100644 (file)
--- a/po/vi.po
+++ b/po/vi.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
 "Report-Msgid-Bugs-To: \n"
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2007-02-19 21:47-0500\n"
+"POT-Creation-Date: 2007-03-01 22:55-0500\n"

 "PO-Revision-Date: 2007-01-13 15:31+1030\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
 "PO-Revision-Date: 2007-01-13 15:31+1030\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"


@@ -20,37 +20,37 @@ msgstr ""
 msgid "You need to log in first."
 msgstr "Trước tiên bạn cần phải đăng nhập."
 
 msgid "You need to log in first."
 msgstr "Trước tiên bạn cần phải đăng nhập."
 

-#: ../IkiWiki/CGI.pm:267
+#: ../IkiWiki/CGI.pm:274

 msgid "Preferences saved."
 msgstr "Tùy thích đã được lưu."
 
 msgid "Preferences saved."
 msgstr "Tùy thích đã được lưu."
 

-#: ../IkiWiki/CGI.pm:332
+#: ../IkiWiki/CGI.pm:340

 #, perl-format
 msgid "%s is not an editable page"
 msgstr ""
 
 #, perl-format
 msgid "%s is not an editable page"
 msgstr ""
 

-#: ../IkiWiki/CGI.pm:420 ../IkiWiki/Plugin/brokenlinks.pm:24
-#: ../IkiWiki/Plugin/inline.pm:164 ../IkiWiki/Plugin/opendiscussion.pm:17
+#: ../IkiWiki/CGI.pm:428 ../IkiWiki/Plugin/brokenlinks.pm:24
+#: ../IkiWiki/Plugin/inline.pm:171 ../IkiWiki/Plugin/opendiscussion.pm:17

 #: ../IkiWiki/Plugin/orphans.pm:28 ../IkiWiki/Render.pm:97
 #: ../IkiWiki/Render.pm:165
 msgid "discussion"
 msgstr "thảo luận"
 
 #: ../IkiWiki/Plugin/orphans.pm:28 ../IkiWiki/Render.pm:97
 #: ../IkiWiki/Render.pm:165
 msgid "discussion"
 msgstr "thảo luận"
 

-#: ../IkiWiki/CGI.pm:465
+#: ../IkiWiki/CGI.pm:474

 #, perl-format
 msgid "creating %s"
 msgstr "đang tạo %s"
 
 #, perl-format
 msgid "creating %s"
 msgstr "đang tạo %s"
 

-#: ../IkiWiki/CGI.pm:482 ../IkiWiki/CGI.pm:510 ../IkiWiki/CGI.pm:543
+#: ../IkiWiki/CGI.pm:491 ../IkiWiki/CGI.pm:527 ../IkiWiki/CGI.pm:571

 #, perl-format
 msgid "editing %s"
 msgstr "đang sửa %s"
 
 #, perl-format
 msgid "editing %s"
 msgstr "đang sửa %s"
 

-#: ../IkiWiki/CGI.pm:651
+#: ../IkiWiki/CGI.pm:668

 msgid "You are banned."
 msgstr "Bạn bị cấm ra."
 
 msgid "You are banned."
 msgstr "Bạn bị cấm ra."
 

-#: ../IkiWiki/CGI.pm:683
+#: ../IkiWiki/CGI.pm:700

 msgid "login failed, perhaps you need to turn on cookies?"
 msgstr ""
 
 msgid "login failed, perhaps you need to turn on cookies?"
 msgstr ""
 


@@ -123,16 +123,21 @@ msgstr ""
 "Cần phải xác định địa chỉ URL tới wiki với « --url » khi dùng « --rss » hay "
 "« --atom »"
 
 "Cần phải xác định địa chỉ URL tới wiki với « --url » khi dùng « --rss » hay "
 "« --atom »"
 

-#: ../IkiWiki/Plugin/inline.pm:96
+#: ../IkiWiki/Plugin/inline.pm:102

 #, perl-format
 msgid "unknown sort type %s"
 msgstr "kiểu sắp xếp không rõ %s"
 
 #, perl-format
 msgid "unknown sort type %s"
 msgstr "kiểu sắp xếp không rõ %s"
 

-#: ../IkiWiki/Plugin/inline.pm:172 ../IkiWiki/Render.pm:101
+#: ../IkiWiki/Plugin/inline.pm:142
+#, perl-format
+msgid "nonexistant template %s"
+msgstr ""
+
+#: ../IkiWiki/Plugin/inline.pm:179 ../IkiWiki/Render.pm:101

 msgid "Discussion"
 msgstr "Thảo luận"
 
 msgid "Discussion"
 msgstr "Thảo luận"
 

-#: ../IkiWiki/Plugin/inline.pm:387
+#: ../IkiWiki/Plugin/inline.pm:394

 msgid "RPC::XML::Client not found, not pinging"
 msgstr "Không tìm thấy RPC::XML::Client nên không gửi gói tin ping"
 
 msgid "RPC::XML::Client not found, not pinging"
 msgstr "Không tìm thấy RPC::XML::Client nên không gửi gói tin ping"
 


@@ -383,15 +388,15 @@ msgstr "không thể đọc %s: %s"
 msgid "generating wrappers.."
 msgstr "đang tạo ra các bộ bao bọc.."
 
 msgid "generating wrappers.."
 msgstr "đang tạo ra các bộ bao bọc.."
 

-#: ../IkiWiki/Setup/Standard.pm:68
+#: ../IkiWiki/Setup/Standard.pm:71

 msgid "rebuilding wiki.."
 msgstr "đang xây dựng lại wiki.."
 
 msgid "rebuilding wiki.."
 msgstr "đang xây dựng lại wiki.."
 

-#: ../IkiWiki/Setup/Standard.pm:71
+#: ../IkiWiki/Setup/Standard.pm:74

 msgid "refreshing wiki.."
 msgstr "đang làm tươi wiki.."
 
 msgid "refreshing wiki.."
 msgstr "đang làm tươi wiki.."
 

-#: ../IkiWiki/Setup/Standard.pm:80
+#: ../IkiWiki/Setup/Standard.pm:83

 msgid "done"
 msgstr "xong"
 
 msgid "done"
 msgstr "xong"
 


@@ -440,12 +445,12 @@ msgstr "%s đã được tạo ra"
 msgid "usage: ikiwiki [options] source dest"
 msgstr "cách sử dụng: ikiwiki [tùy chọn] nguồn đích"
 
 msgid "usage: ikiwiki [options] source dest"
 msgstr "cách sử dụng: ikiwiki [tùy chọn] nguồn đích"
 

-#: ../IkiWiki.pm:103
+#: ../IkiWiki.pm:104

 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr ""
 "Cần phải xác định địa chỉ URL tới wiki với « --url » khi dùng « --cgi »"
 
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr ""
 "Cần phải xác định địa chỉ URL tới wiki với « --url » khi dùng « --cgi »"
 

-#: ../IkiWiki.pm:150 ../IkiWiki.pm:151
+#: ../IkiWiki.pm:151 ../IkiWiki.pm:152

 msgid "Error"
 msgstr "Lỗi"
 
 msgid "Error"
 msgstr "Lỗi"
 


@@ -453,7 +458,7 @@ msgstr "Lỗi"
 #. translators: preprocessor directive name,
 #. translators: the second a page name, the
 #. translators: third a number.
 #. translators: preprocessor directive name,
 #. translators: the second a page name, the
 #. translators: third a number.

-#: ../IkiWiki.pm:558
+#: ../IkiWiki.pm:559

 #, perl-format
 msgid "%s preprocessing loop detected on %s at depth %i"
 msgstr "vòng lặp tiền xử lý %s được phát hiện trên %s ở độ sâu %i"
 #, perl-format
 msgid "%s preprocessing loop detected on %s at depth %i"
 msgstr "vòng lặp tiền xử lý %s được phát hiện trên %s ở độ sâu %i"

diff --git a/templates/inlinepagetitle.tmpl b/templates/archivepage.tmpl
similarity index 100%
rename from templates/inlinepagetitle.tmpl
rename to templates/archivepage.tmpl