* Patch based on a patch from Ethan to support relative matching in

  PageSpecs, by using "./". pagespec_match() has grown a new third parameter
  to support this.

diff --git a/IkiWiki.pm b/IkiWiki.pm
index dfd2240628141a08e6a9b0d538266b94015b73f6..8b3109a3471d2ac5dc826264b9fb353c4b19341e 100644 (file)
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -854,23 +854,35 @@ sub pagespec_translate ($) { #{{{
                        $code.=" match_$1(\$page, ".safequote($2).")";
                }
                else {
                        $code.=" match_$1(\$page, ".safequote($2).")";
                }
                else {

-                       $code.=" match_glob(\$page, ".safequote($word).")";
+                       $code.=" match_glob(\$page, ".safequote($word).", \$from)";

                }
        }
 
        return $code;
 } #}}}
 
                }
        }
 
        return $code;
 } #}}}
 

-sub pagespec_match ($$) { #{{{
+sub pagespec_match ($$;$) { #{{{

        my $page=shift;
        my $spec=shift;
        my $page=shift;
        my $spec=shift;

+       my $from=shift;
+       if (! defined $from){
+               $from = "";
+       }

 
        return eval pagespec_translate($spec);
 } #}}}
 
 
        return eval pagespec_translate($spec);
 } #}}}
 

-sub match_glob ($$) { #{{{
+sub match_glob ($$$) { #{{{

        my $page=shift;
        my $glob=shift;
        my $page=shift;
        my $glob=shift;

+       my $from=shift;
+
+       # relative matching
+       if ($glob =~ m!^\./!) {
+               $from=~s!/?[^/]+$!!;
+               $glob=~s!^\./!!;a
+               $glob="$from/$glob";
+       }

 
        # turn glob into safe regexp
        $glob=quotemeta($glob);
 
        # turn glob into safe regexp
        $glob=quotemeta($glob);

diff --git a/IkiWiki/Plugin/brokenlinks.pm b/IkiWiki/Plugin/brokenlinks.pm
index a23436fd0bbbb19ad687db7a9b30d3f6940a23a4..af2418ff4b5f917e6932761ec9553dd426419212 100644 (file)
--- a/IkiWiki/Plugin/brokenlinks.pm
+++ b/IkiWiki/Plugin/brokenlinks.pm
@@ -20,7 +20,7 @@ sub preprocess (@) { #{{{
        
        my @broken;
        foreach my $page (keys %links) {
        
        my @broken;
        foreach my $page (keys %links) {

-               if (pagespec_match($page, $params{pages})) {
+               if (pagespec_match($page, $params{pages}, $params{page})) {

                        my $discussion=gettext("discussion");
                        foreach my $link (@{$links{$page}}) {
                                next if $link =~ /.*\/\Q$discussion\E/i && $config{discussion};
                        my $discussion=gettext("discussion");
                        foreach my $link (@{$links{$page}}) {
                                next if $link =~ /.*\/\Q$discussion\E/i && $config{discussion};

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index 06b74b3fab0442654e6ecd25772cf19efd0bab5f..13876b56fdc24472380978ce1965901fdf6fe2b3 100644 (file)
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -81,7 +81,7 @@ sub preprocess_inline (@) { #{{{
        my @list;
        foreach my $page (keys %pagesources) {
                next if $page eq $params{page};
        my @list;
        foreach my $page (keys %pagesources) {
                next if $page eq $params{page};

-               if (pagespec_match($page, $params{pages})) {
+               if (pagespec_match($page, $params{pages}, $params{page})) {

                        push @list, $page;
                }
        }
                        push @list, $page;
                }
        }

diff --git a/IkiWiki/Plugin/linkmap.pm b/IkiWiki/Plugin/linkmap.pm
index e0c5fb475748c2bed09a4095acb061460143dc6b..528d51697fa74e37f2fcefaa15113d94d40e6027 100644 (file)
--- a/IkiWiki/Plugin/linkmap.pm
+++ b/IkiWiki/Plugin/linkmap.pm
@@ -48,7 +48,7 @@ sub genmap ($) { #{{{
        # Get all the items to map.
        my %mapitems = ();
        foreach my $item (keys %links) {
        # Get all the items to map.
        my %mapitems = ();
        foreach my $item (keys %links) {

-               if (pagespec_match($item, $params{pages})) {
+               if (pagespec_match($item, $params{pages}, $params{page})) {

                        my $link=htmlpage($item);
                        $link=IkiWiki::abs2rel($link, IkiWiki::dirname($params{page}));
                        $mapitems{$item}=$link;
                        my $link=htmlpage($item);
                        $link=IkiWiki::abs2rel($link, IkiWiki::dirname($params{page}));
                        $mapitems{$item}=$link;

diff --git a/IkiWiki/Plugin/lockedit.pm b/IkiWiki/Plugin/lockedit.pm
index 587f7ee540b573d84ceb21ab88fc1ae8c28f7005..2b72fabe539e18f14e181cddc5bcdf3ccb060874 100644 (file)
--- a/IkiWiki/Plugin/lockedit.pm
+++ b/IkiWiki/Plugin/lockedit.pm
@@ -20,7 +20,7 @@ sub canedit ($$) { #{{{
        return undef if defined $user && IkiWiki::is_admin($user);
 
        foreach my $admin (@{$config{adminuser}}) {
        return undef if defined $user && IkiWiki::is_admin($user);
 
        foreach my $admin (@{$config{adminuser}}) {

-               if (pagespec_match($page, IkiWiki::userinfo_get($admin, "locked_pages"))) {
+               if (pagespec_match($page, IkiWiki::userinfo_get($admin, "locked_pages"), "")) {

                        return sprintf(gettext("%s is locked by %s and cannot be edited"),
                                htmllink("", "", $page, 1),
                                IkiWiki::userlink($admin));
                        return sprintf(gettext("%s is locked by %s and cannot be edited"),
                                htmllink("", "", $page, 1),
                                IkiWiki::userlink($admin));

diff --git a/IkiWiki/Plugin/map.pm b/IkiWiki/Plugin/map.pm
index 96daf39fcdf9debd255eec245bba57d1432747fc..3c41194f47f32cf51f782c72a1c74a085a98e21e 100644 (file)
--- a/IkiWiki/Plugin/map.pm
+++ b/IkiWiki/Plugin/map.pm
@@ -26,7 +26,7 @@ sub preprocess (@) { #{{{
        # Get all the items to map.
        my @mapitems = ();
        foreach my $page (keys %links) {
        # Get all the items to map.
        my @mapitems = ();
        foreach my $page (keys %links) {

-               if (pagespec_match($page, $params{pages})) {
+               if (pagespec_match($page, $params{pages}, $params{page})) {

                        push @mapitems, $page;
                }
        }
                        push @mapitems, $page;
                }
        }

diff --git a/IkiWiki/Plugin/orphans.pm b/IkiWiki/Plugin/orphans.pm
index def8e92d67eb7440c4a22f9ecf61211b9c65893b..39d836a01df36adeeece842547101e271ae145eb 100644 (file)
--- a/IkiWiki/Plugin/orphans.pm
+++ b/IkiWiki/Plugin/orphans.pm
@@ -28,7 +28,7 @@ sub preprocess (@) { #{{{
        my $discussion=gettext("discussion");
        foreach my $page (keys %renderedfiles) {
                next if $linkedto{$page};
        my $discussion=gettext("discussion");
        foreach my $page (keys %renderedfiles) {
                next if $linkedto{$page};

-               next unless pagespec_match($page, $params{pages});
+               next unless pagespec_match($page, $params{pages}, $params{page});

                # If the page has a link to some other page, it's
                # indirectly linked to a page via that page's backlinks.
                next if grep { 
                # If the page has a link to some other page, it's
                # indirectly linked to a page via that page's backlinks.
                next if grep { 

diff --git a/IkiWiki/Plugin/pagecount.pm b/IkiWiki/Plugin/pagecount.pm
index 7ced159823fff8cf8139392d9b6d81e903f3390f..5ba7ee50b0bd61df0f9c75ea44761795cb65749a 100644 (file)
--- a/IkiWiki/Plugin/pagecount.pm
+++ b/IkiWiki/Plugin/pagecount.pm
@@ -22,7 +22,7 @@ sub preprocess (@) { #{{{
        return $#pages+1 if $params{pages} eq "*"; # optimisation
        my $count=0;
        foreach my $page (@pages) {
        return $#pages+1 if $params{pages} eq "*"; # optimisation
        my $count=0;
        foreach my $page (@pages) {

-               $count++ if pagespec_match($page, $params{pages});
+               $count++ if pagespec_match($page, $params{pages}, $params{page});

        }
        return $count;
 } # }}}
        }
        return $count;
 } # }}}

diff --git a/IkiWiki/Plugin/pagestats.pm b/IkiWiki/Plugin/pagestats.pm
index 79b3292c6c7a67f0007a65a6bf8a435ae3671b11..f9a54ab56628ad4ac69fa72ea1e86c5d19194700 100644 (file)
--- a/IkiWiki/Plugin/pagestats.pm
+++ b/IkiWiki/Plugin/pagestats.pm
@@ -33,7 +33,7 @@ sub preprocess (@) { #{{{
        my %counts;
        my $max = 0;
        foreach my $page (keys %links) {
        my %counts;
        my $max = 0;
        foreach my $page (keys %links) {

-               if (pagespec_match($page, $params{pages})) {
+               if (pagespec_match($page, $params{pages}, $params{page})) {

                        use IkiWiki::Render;
                        my @bl = IkiWiki::backlinks($page);
                        $counts{$page} = scalar(@bl);
                        use IkiWiki::Render;
                        my @bl = IkiWiki::backlinks($page);
                        $counts{$page} = scalar(@bl);

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index 2ad80ced3354457cb4e79c217e36be37f0f52b90..d8bc5a9d90267d1357f5187ec9bc3420964030d5 100644 (file)
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -360,7 +360,7 @@ sub refresh () { #{{{
                                foreach my $file (keys %rendered, @del) {
                                        next if $f eq $file;
                                        my $page=pagename($file);
                                foreach my $file (keys %rendered, @del) {
                                        next if $f eq $file;
                                        my $page=pagename($file);

-                                       if (pagespec_match($page, $depends{$p})) {
+                                       if (pagespec_match($page, $depends{$p}, $p)) {

                                                debug(sprintf(gettext("rendering %s, which depends on %s"), $f, $page));
                                                render($f);
                                                $rendered{$f}=1;
                                                debug(sprintf(gettext("rendering %s, which depends on %s"), $f, $page));
                                                render($f);
                                                $rendered{$f}=1;

diff --git a/IkiWiki/UserInfo.pm b/IkiWiki/UserInfo.pm
index 267f5d9cd980d41b21750072bd92652564e2479a..115a263ce09481d073837f878aa64ab347019f11 100644 (file)
--- a/IkiWiki/UserInfo.pm
+++ b/IkiWiki/UserInfo.pm
@@ -101,7 +101,7 @@ sub commit_notify_list ($@) { #{{{
                    length $userinfo->{$user}->{subscriptions} &&
                    exists $userinfo->{$user}->{email} &&
                    length $userinfo->{$user}->{email} &&
                    length $userinfo->{$user}->{subscriptions} &&
                    exists $userinfo->{$user}->{email} &&
                    length $userinfo->{$user}->{email} &&

-                   grep { pagespec_match($_, $userinfo->{$user}->{subscriptions}) } @pages) {
+                   grep { pagespec_match($_, $userinfo->{$user}->{subscriptions}, "") } @pages) {

                        push @ret, $userinfo->{$user}->{email};
                }
        }
                        push @ret, $userinfo->{$user}->{email};
                }
        }

diff --git a/basewiki/pagespec.mdwn b/basewiki/pagespec.mdwn
index b2b913537da700808994beac6861a0942facff28..53519e7f02d798976311c847beca3c8e188e1891 100644 (file)
--- a/basewiki/pagespec.mdwn
+++ b/basewiki/pagespec.mdwn
@@ -45,6 +45,12 @@ of two tags, use:
 
        blog/* and (link(tag/foo) or link(tag/bar))
 
 
        blog/* and (link(tag/foo) or link(tag/bar))
 

+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".
+

 ## Old syntax
 
 The old PageSpec syntax was called a "GlobList", and worked differently in
 ## Old syntax
 
 The old PageSpec syntax was called a "GlobList", and worked differently in

diff --git a/debian/NEWS b/debian/NEWS
index bb3bf2272d78ee4c3c2c1749b45385b9597c689a..5057ceabea027c01965b6990aaef51780ea187e0 100644 (file)
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -4,6 +4,10 @@ ikiwiki (1.42) unstable; urgency=low
   httpauth support on your wiki, you should now enable the anonok plugin,
   instead.
 
   httpauth support on your wiki, you should now enable the anonok plugin,
   instead.
 

+  Third-party plugins that use pagespec_match() should be updated to pass
+  the new third parameter (from) to that function. This is needed for the
+  new relative glob matching to work.
+

  -- Joey Hess <joeyh@debian.org>  Thu,  1 Feb 2007 16:57:59 -0500
 
 ikiwiki (1.34) unstable; urgency=low
  -- Joey Hess <joeyh@debian.org>  Thu,  1 Feb 2007 16:57:59 -0500
 
 ikiwiki (1.34) unstable; urgency=low

diff --git a/debian/changelog b/debian/changelog
index fb3afc21e50b6054a87e47b7214082530564c9a3..ce0829f9c50c9838b589cdafc42d91a474b136b8 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,8 +17,11 @@ ikiwiki (1.42) UNRELEASED; urgency=low
     Yes, you can keep videos in the wiki..
   * Add feedshow option to allow reducing the number of items included in
     an rss or atom feed.
     Yes, you can keep videos in the wiki..
   * Add feedshow option to allow reducing the number of items included in
     an rss or atom feed.

+  * Patch based on a patch from Ethan to support relative matching in
+    PageSpecs, by using "./". pagespec_match() has grown a new third parameter
+    to support this.

 
 

- -- Joey Hess <joeyh@debian.org>  Mon,  5 Feb 2007 16:51:10 -0500
+ -- Joey Hess <joeyh@debian.org>  Tue,  6 Feb 2007 15:49:06 -0500

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

diff --git a/doc/examples/blog/index.mdwn b/doc/examples/blog/index.mdwn
index 201abed20845837daf13d90dcfd2ecec4e7fbb53..0a4eb7307023b5e9805753be7e84d09137ce747f 100644 (file)
--- a/doc/examples/blog/index.mdwn
+++ b/doc/examples/blog/index.mdwn
@@ -1,10 +1,10 @@
 [[meta title="example blog"]]
 
 [[meta title="example blog"]]
 

-[[pagestats pages="*blog/tags/*"]]
+[[pagestats pages="./tags/*"]]

 
 Welcome to my blog. Have a look at the most recent posts below, or
 browse the tag cloud on the right. An archive of all [[posts]] is also
 available.
 
 
 Welcome to my blog. Have a look at the most recent posts below, or
 browse the tag cloud on the right. An archive of all [[posts]] is also
 available.
 

-[[inline pages="*blog/posts/* and !*/Discussion" show="10"
-actions=yes rootpage="*blog/posts"]]
+[[inline pages="./posts/* and !*/Discussion" show="10"
+actions=yes rootpage="./posts"]]

diff --git a/doc/examples/blog/posts.mdwn b/doc/examples/blog/posts.mdwn
index f5b128df00a7890c773cb344c1659fc3de44120e..71eb9f1b16656b7a9ae52894dbfab5aadfcc130a 100644 (file)
--- a/doc/examples/blog/posts.mdwn
+++ b/doc/examples/blog/posts.mdwn
@@ -1,3 +1,3 @@
 Here is a full list of posts to my [[blog|index]].
 
 Here is a full list of posts to my [[blog|index]].
 

-[[inline pages="*blog/posts/* and !*/Discussion" archive=yes feedshow=10 quick=yes]]
+[[inline pages="./posts/* and !*/Discussion" archive=yes feedshow=10 quick=yes]]

diff --git a/doc/examples/blog/sidebar.mdwn b/doc/examples/blog/sidebar.mdwn
index 203d2e0c665f2c5566c451e5ade24facec66afb1..e9a76c19bb134b5e230531aa52926b42f916b396 100644 (file)
--- a/doc/examples/blog/sidebar.mdwn
+++ b/doc/examples/blog/sidebar.mdwn
@@ -1,4 +1,4 @@
 Example sidebar
 
 Categories:
 Example sidebar
 
 Categories:

-[[map pages="*blog/tags/* and !*/Discussion"]]
+[[map pages="./tags/* and !*/Discussion"]]

diff --git a/doc/examples/blog/tags.mdwn b/doc/examples/blog/tags.mdwn
index 08e7e5c57cce89f230361e1bed0ac1dd00fc7261..daf77549afcd4cf8fedb46702e55942d075f407f 100644 (file)
--- a/doc/examples/blog/tags.mdwn
+++ b/doc/examples/blog/tags.mdwn
@@ -1,3 +1,3 @@
-[[pagestats pages="*blog/tags/*"]]
+[[pagestats pages="./tags/*"]]

 
 On the right you can see the tag cloud for this blog.
 
 On the right you can see the tag cloud for this blog.

diff --git a/doc/examples/blog/tags/life.mdwn b/doc/examples/blog/tags/life.mdwn
index b6cf801e1e7ffbd270164af3a00301df03a96219..2f7a573795216a815b8e840cb55fb49584dfd2ea 100644 (file)
--- a/doc/examples/blog/tags/life.mdwn
+++ b/doc/examples/blog/tags/life.mdwn
@@ -1,4 +1,4 @@
 This feed contains pages in the "life" category.
 
 This feed contains pages in the "life" category.
 

-[[inline pages="link(tags/life) and *blog/posts/* and !*/Discussion"
+[[inline pages="link(tags/life) and ./posts/* and !*/Discussion"

 show="10" actions=yes]]
 show="10" actions=yes]]

diff --git a/doc/examples/softwaresite/news.mdwn b/doc/examples/softwaresite/news.mdwn
index cdee4fa59636e788bd05d57ac6f3e470fb13cc1f..20642c203e3d85667a3fcee2365b3ab5bda41d8f 100644 (file)
--- a/doc/examples/softwaresite/news.mdwn
+++ b/doc/examples/softwaresite/news.mdwn
@@ -2,4 +2,4 @@ This is where annoucements of new releases, features, and other news is
 posted. FooBar users are recommended to subscribe to this page's RSS
 feed.
 
 posted. FooBar users are recommended to subscribe to this page's RSS
 feed.
 

-[[inline pages="*softwaresite/news/* and !*/Discussion" rootpage="news" show="30"]]
+[[inline pages="./news/* and !*/Discussion" rootpage="news" show="30"]]

diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn
index d0f256ca293aaeaf21fd398906771f9db8cd831f..d822408c2d49e856c802578ac7d267979a713472 100644 (file)
--- a/doc/plugins/write.mdwn
+++ b/doc/plugins/write.mdwn
@@ -312,10 +312,12 @@ page created from it. (Ie, it appends ".html".)
 
 Makes the specified page depend on the specified [[PageSpec]].
 
 
 Makes the specified page depend on the specified [[PageSpec]].
 

-#### `pagespec_match($$)`
+#### `pagespec_match($$;$)`

 
 

-Passed a page name, and a [[PageSpec]], returns true if the [[PageSpec]]
-matches the page.
+Passed a page name, a [[PageSpec]], and the location the glob should be
+matched against, returns true if the [[PageSpec]] matches the page. (If the
+third parameter is not passed, relative PageSpecs will match relative to
+the top of the wiki.)

 
 #### `bestlink($$)`
 
 
 #### `bestlink($$)`
 

diff --git a/doc/todo/pagespec_expansions.mdwn b/doc/todo/pagespec_expansions.mdwn
index 74fe9c13c441364d94e89f2a2aa0f347761e5d8d..111217948df05193cbc77ca2c275694375f62bd5 100644 (file)
--- a/doc/todo/pagespec_expansions.mdwn
+++ b/doc/todo/pagespec_expansions.mdwn
@@ -40,12 +40,31 @@ now that I was mistaken.. "four or fewer levels deep" would be
 "@ or @/@ or @/@/@ or @/@/@/@". Well, I think it has a certain appeal but
 I can see why it might not be much of an improvement. :) --Ethan
 
 "@ or @/@ or @/@/@ or @/@/@/@". Well, I think it has a certain appeal but
 I can see why it might not be much of an improvement. :) --Ethan
 

-> OK, I took a shot at implementing the changes. I was thinking about making
-> pagespecs relative by default but I couldn't decide whether page
-> `foo/bar` inlining `*` should match `foo/bar/*` or `foo/*`.
-> So I punted and left things as absolute, with `./*` matching
-> `foo/bar/*`, which I think is pretty clear.
-> The patch is at [ikidev](http://ikidev.betacantrips.com/patches/pagespec_enhancements.patch)
-> and you can see it work at 
-> [this page](http://ikidev.betacantrips.com/one/two/three/index.html) or
-> [this page](http://ikidev.betacantrips.com/one/two/three/princess.html) --Ethan
\ No newline at end of file
+> Seems to me that ".." would be the natural thing to use, not "@". --[[Joey]]
+
+OK, I took a shot at implementing the changes. I was thinking about making
+pagespecs relative by default but I couldn't decide whether page
+`foo/bar` inlining `*` should match `foo/bar/*` or `foo/*`.
+So I punted and left things as absolute, with `./*` matching
+`foo/bar/*`, which I think is pretty clear.
+The patch is at [ikidev](http://ikidev.betacantrips.com/patches/pagespec_enhancements.patch)
+and you can see it work at 
+[this page](http://ikidev.betacantrips.com/one/two/three/index.html) or
+[this page](http://ikidev.betacantrips.com/one/two/three/princess.html) --Ethan
+
+> Nice patch, though I see the following problems with it:
+> * The sole pagespec_match in IkiWiki::Render probably should have `$p`
+>   as its third parameter. This will allow add_depends to add a
+>   dependency on a pagespec that matches relative to the page. I made this
+>   changes and it seems to work, new pages are noticed in updates.
+> * `! $from` fails to match pages named "0" :-)
+> * '/./ matches any letter, not just "." :-) :-)
+> * One other major problem. If you look at the doc/examples/blog/index.mdwn
+>   I changed it to use relative globs like "./posts/*", but they didn't work,
+>   because it looked for examples/blog/indexposts/* instead of
+>   examples/blog/index/posts/*. And, of course, what I really expected it to
+>   look for was examples/blog/posts/*. I think you may have made the wrong
+>   choice about that, so I changed it to go the other way. What do you think?
+>
+> I've committed support for ./ to ikiwiki now, based on your patch.
+> --[[Joey]]

diff --git a/po/bg.po b/po/bg.po
index de05863072660b0167a137096822547bcfdd22dd..1ec018b6154c89ca5f5a0b82fb977d8a8e9fa3a4 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-01 21:27-0500\n"
+"POT-Creation-Date: 2007-02-06 15:06-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"


@@ -127,7 +127,7 @@ msgstr "непознат вид сортиране „%s”"
 msgid "Discussion"
 msgstr "Дискусия"
 
 msgid "Discussion"
 msgstr "Дискусия"
 

-#: ../IkiWiki/Plugin/inline.pm:372
+#: ../IkiWiki/Plugin/inline.pm:378

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


@@ -258,47 +258,47 @@ msgstr ""
 "Променливата от обкръжението „REV” не е указана. Програмата не се изпълнява "
 "като „svn post-commit hook”. Няма да бъдат разпратени известявания"
 
 "Променливата от обкръжението „REV” не е указана. Програмата не се изпълнява "
 "като „svn post-commit hook”. Няма да бъдат разпратени известявания"
 

-#: ../IkiWiki/Render.pm:232 ../IkiWiki/Render.pm:252
+#: ../IkiWiki/Render.pm:247 ../IkiWiki/Render.pm:267

 #, perl-format
 msgid "skipping bad filename %s"
 msgstr "пропускане на невалидното име на файл „%s”"
 
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr "пропускане на невалидното име на файл „%s”"
 

-#: ../IkiWiki/Render.pm:292
+#: ../IkiWiki/Render.pm:307

 #, perl-format
 msgid "removing old page %s"
 msgstr "премахване на старата страница „%s”"
 
 #, perl-format
 msgid "removing old page %s"
 msgstr "премахване на старата страница „%s”"
 

-#: ../IkiWiki/Render.pm:311
+#: ../IkiWiki/Render.pm:326

 #, perl-format
 msgid "scanning %s"
 msgstr "сканиране на „%s”"
 
 #, perl-format
 msgid "scanning %s"
 msgstr "сканиране на „%s”"
 

-#: ../IkiWiki/Render.pm:320
+#: ../IkiWiki/Render.pm:335

 #, perl-format
 msgid "rendering %s"
 msgstr "обновяване на страницата „%s”"
 
 #, perl-format
 msgid "rendering %s"
 msgstr "обновяване на страницата „%s”"
 

-#: ../IkiWiki/Render.pm:332
+#: ../IkiWiki/Render.pm:347

 #, perl-format
 msgid "rendering %s, which links to %s"
 msgstr "обновяване на страницата „%s”, съдържаща препратки към „%s”"
 
 #, perl-format
 msgid "rendering %s, which links to %s"
 msgstr "обновяване на страницата „%s”, съдържаща препратки към „%s”"
 

-#: ../IkiWiki/Render.pm:349
+#: ../IkiWiki/Render.pm:364

 #, perl-format
 msgid "rendering %s, which depends on %s"
 msgstr "обновяване на страницата „%s”, зависеща от „%s”"
 
 #, perl-format
 msgid "rendering %s, which depends on %s"
 msgstr "обновяване на страницата „%s”, зависеща от „%s”"
 

-#: ../IkiWiki/Render.pm:387
+#: ../IkiWiki/Render.pm:402

 #, perl-format
 msgid "rendering %s, to update its backlinks"
 msgstr "обновяване на „%s” и осъвременяване на обратните връзки"
 
 #, perl-format
 msgid "rendering %s, to update its backlinks"
 msgstr "обновяване на „%s” и осъвременяване на обратните връзки"
 

-#: ../IkiWiki/Render.pm:399
+#: ../IkiWiki/Render.pm:414

 #, perl-format
 msgid "removing %s, no longer rendered by %s"
 msgstr "премахване на „%s” понеже не се генерира от „%s”"
 
 #, perl-format
 msgid "removing %s, no longer rendered by %s"
 msgstr "премахване на „%s” понеже не се генерира от „%s”"
 

-#: ../IkiWiki/Render.pm:425
+#: ../IkiWiki/Render.pm:440

 #, perl-format
 msgid "ikiwiki: cannot render %s"
 msgstr "ikiwiki: неуспех при обновяване на страницата „%s”"
 #, perl-format
 msgid "ikiwiki: cannot render %s"
 msgstr "ikiwiki: неуспех при обновяване на страницата „%s”"


@@ -385,7 +385,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:527
+#: ../IkiWiki.pm:531

 #, 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 5cc90a512496ced05226b43aae7de49a92985321..523c3b4a7ad205a75ba9231d893391fe6cb2137d 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-01 21:27-0500\n"
+"POT-Creation-Date: 2007-02-06 15:06-0500\n"

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


@@ -124,7 +124,7 @@ msgstr "neznámý typ řazení %s"
 msgid "Discussion"
 msgstr "Diskuse"
 
 msgid "Discussion"
 msgstr "Diskuse"
 

-#: ../IkiWiki/Plugin/inline.pm:372
+#: ../IkiWiki/Plugin/inline.pm:378

 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"
 


@@ -252,47 +252,47 @@ msgid ""
 msgstr ""
 "REV není nastavena, není spuštěna ze svn post-commit, nemohu zaslat oznámení"
 
 msgstr ""
 "REV není nastavena, není spuštěna ze svn post-commit, nemohu zaslat oznámení"
 

-#: ../IkiWiki/Render.pm:232 ../IkiWiki/Render.pm:252
+#: ../IkiWiki/Render.pm:247 ../IkiWiki/Render.pm:267

 #, perl-format
 msgid "skipping bad filename %s"
 msgstr "přeskakuji chybné jméno souboru %s"
 
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr "přeskakuji chybné jméno souboru %s"
 

-#: ../IkiWiki/Render.pm:292
+#: ../IkiWiki/Render.pm:307

 #, perl-format
 msgid "removing old page %s"
 msgstr "odstraňuji starou stránku %s"
 
 #, perl-format
 msgid "removing old page %s"
 msgstr "odstraňuji starou stránku %s"
 

-#: ../IkiWiki/Render.pm:311
+#: ../IkiWiki/Render.pm:326

 #, perl-format
 msgid "scanning %s"
 msgstr "prohledávám %s"
 
 #, perl-format
 msgid "scanning %s"
 msgstr "prohledávám %s"
 

-#: ../IkiWiki/Render.pm:320
+#: ../IkiWiki/Render.pm:335

 #, perl-format
 msgid "rendering %s"
 msgstr "zpracovávám %s"
 
 #, perl-format
 msgid "rendering %s"
 msgstr "zpracovávám %s"
 

-#: ../IkiWiki/Render.pm:332
+#: ../IkiWiki/Render.pm:347

 #, perl-format
 msgid "rendering %s, which links to %s"
 msgstr "zpracovávám %s, která odkazuje na %s"
 
 #, perl-format
 msgid "rendering %s, which links to %s"
 msgstr "zpracovávám %s, která odkazuje na %s"
 

-#: ../IkiWiki/Render.pm:349
+#: ../IkiWiki/Render.pm:364

 #, perl-format
 msgid "rendering %s, which depends on %s"
 msgstr "zpracovávám %s, která závisí na %s"
 
 #, perl-format
 msgid "rendering %s, which depends on %s"
 msgstr "zpracovávám %s, která závisí na %s"
 

-#: ../IkiWiki/Render.pm:387
+#: ../IkiWiki/Render.pm:402

 #, perl-format
 msgid "rendering %s, to update its backlinks"
 msgstr "zpracovávám %s, aby se aktualizovaly zpětné odkazy"
 
 #, perl-format
 msgid "rendering %s, to update its backlinks"
 msgstr "zpracovávám %s, aby se aktualizovaly zpětné odkazy"
 

-#: ../IkiWiki/Render.pm:399
+#: ../IkiWiki/Render.pm:414

 #, perl-format
 msgid "removing %s, no longer rendered by %s"
 msgstr "odstraňuji %s, již není zpracovávána %s"
 
 #, perl-format
 msgid "removing %s, no longer rendered by %s"
 msgstr "odstraňuji %s, již není zpracovávána %s"
 

-#: ../IkiWiki/Render.pm:425
+#: ../IkiWiki/Render.pm:440

 #, perl-format
 msgid "ikiwiki: cannot render %s"
 msgstr "ikiwiki: nelze zpracovat %s"
 #, perl-format
 msgid "ikiwiki: cannot render %s"
 msgstr "ikiwiki: nelze zpracovat %s"


@@ -377,7 +377,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:527
+#: ../IkiWiki.pm:531

 #, 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 75387d161dbb17117098f833842db68c98a27db8..ce94334d6c0dadfd2db459c13fe797989152d9a3 100644 (file)
--- a/po/es.po
+++ b/po/es.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-01 21:27-0500\n"
+"POT-Creation-Date: 2007-02-06 15:06-0500\n"

 "PO-Revision-Date: 2007-01-03 09:37+0100\n"
 "Last-Translator: Víctor Moral <victor@taquiones.net>\n"
 "Language-Team: spanish <es@li.org>\n"
 "PO-Revision-Date: 2007-01-03 09:37+0100\n"
 "Last-Translator: Víctor Moral <victor@taquiones.net>\n"
 "Language-Team: spanish <es@li.org>\n"


@@ -128,7 +128,7 @@ msgstr "no conozco este tipo de ordenación %s"
 msgid "Discussion"
 msgstr "Comentarios"
 
 msgid "Discussion"
 msgstr "Comentarios"
 

-#: ../IkiWiki/Plugin/inline.pm:372
+#: ../IkiWiki/Plugin/inline.pm:378

 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"
 


@@ -258,49 +258,49 @@ msgstr ""
 "La variable de entorno REV no está definida, por lo que no puede funcionar "
 "svn post-commit; no puedo enviar notificación alguna."
 
 "La variable de entorno REV no está definida, por lo que no puede funcionar "
 "svn post-commit; no puedo enviar notificación alguna."
 

-#: ../IkiWiki/Render.pm:232 ../IkiWiki/Render.pm:252
+#: ../IkiWiki/Render.pm:247 ../IkiWiki/Render.pm:267

 #, perl-format
 msgid "skipping bad filename %s"
 msgstr "ignorando el archivo %s porque su no nombre no es correcto"
 
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr "ignorando el archivo %s porque su no nombre no es correcto"
 

-#: ../IkiWiki/Render.pm:292
+#: ../IkiWiki/Render.pm:307

 #, perl-format
 msgid "removing old page %s"
 msgstr "eliminando la antigua página %s"
 
 #, perl-format
 msgid "removing old page %s"
 msgstr "eliminando la antigua página %s"
 

-#: ../IkiWiki/Render.pm:311
+#: ../IkiWiki/Render.pm:326

 #, perl-format
 msgid "scanning %s"
 msgstr "explorando %s"
 
 #, perl-format
 msgid "scanning %s"
 msgstr "explorando %s"
 

-#: ../IkiWiki/Render.pm:320
+#: ../IkiWiki/Render.pm:335

 #, perl-format
 msgid "rendering %s"
 msgstr "convirtiendo %s"
 
 #, perl-format
 msgid "rendering %s"
 msgstr "convirtiendo %s"
 

-#: ../IkiWiki/Render.pm:332
+#: ../IkiWiki/Render.pm:347

 #, perl-format
 msgid "rendering %s, which links to %s"
 msgstr "convirtiendo la página %s, la cual referencia a %s"
 
 #, perl-format
 msgid "rendering %s, which links to %s"
 msgstr "convirtiendo la página %s, la cual referencia a %s"
 

-#: ../IkiWiki/Render.pm:349
+#: ../IkiWiki/Render.pm:364

 #, perl-format
 msgid "rendering %s, which depends on %s"
 msgstr "convirtiendo la página %s, la cual depende de %s"
 
 #, perl-format
 msgid "rendering %s, which depends on %s"
 msgstr "convirtiendo la página %s, la cual depende de %s"
 

-#: ../IkiWiki/Render.pm:387
+#: ../IkiWiki/Render.pm:402

 #, perl-format
 msgid "rendering %s, to update its backlinks"
 msgstr ""
 "convirtiendo la página %s para poner al día su lista de páginas que la "
 "referencian"
 
 #, perl-format
 msgid "rendering %s, to update its backlinks"
 msgstr ""
 "convirtiendo la página %s para poner al día su lista de páginas que la "
 "referencian"
 

-#: ../IkiWiki/Render.pm:399
+#: ../IkiWiki/Render.pm:414

 #, perl-format
 msgid "removing %s, no longer rendered by %s"
 msgstr "eliminando la página %s puesto que ya no se deriva de %s"
 
 #, perl-format
 msgid "removing %s, no longer rendered by %s"
 msgstr "eliminando la página %s puesto que ya no se deriva de %s"
 

-#: ../IkiWiki/Render.pm:425
+#: ../IkiWiki/Render.pm:440

 #, perl-format
 msgid "ikiwiki: cannot render %s"
 msgstr "ikwiki: no puedo convertir la página %s"
 #, perl-format
 msgid "ikiwiki: cannot render %s"
 msgstr "ikwiki: no puedo convertir la página %s"


@@ -388,7 +388,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:527
+#: ../IkiWiki.pm:531

 #, 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 9a7ebdc8f573eac6950dba5da6f36c9038e2662b..da62f2a74d07a434a83e457a8254ac7b296f56f2 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-01 21:27-0500\n"
+"POT-Creation-Date: 2007-02-06 15:06-0500\n"

 "PO-Revision-Date: 2007-01-22 22:12+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-01-22 22:12+0100\n"
 "Last-Translator: Jean-Luc Coulon (f5ibh) <jean-luc.coulon@wanadoo.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"


@@ -129,7 +129,7 @@ msgstr "Type de tri %s inconnu"
 msgid "Discussion"
 msgstr "Discussion"
 
 msgid "Discussion"
 msgstr "Discussion"
 

-#: ../IkiWiki/Plugin/inline.pm:372
+#: ../IkiWiki/Plugin/inline.pm:378

 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"
 


@@ -260,47 +260,47 @@ msgstr ""
 "après un commit sur le svn (« hook post-commit »), impossible d'envoyer des "
 "notifications"
 
 "après un commit sur le svn (« hook post-commit »), impossible d'envoyer des "
 "notifications"
 

-#: ../IkiWiki/Render.pm:232 ../IkiWiki/Render.pm:252
+#: ../IkiWiki/Render.pm:247 ../IkiWiki/Render.pm:267

 #, perl-format
 msgid "skipping bad filename %s"
 msgstr "Saut du nom de fichier incorrect %s"
 
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr "Saut du nom de fichier incorrect %s"
 

-#: ../IkiWiki/Render.pm:292
+#: ../IkiWiki/Render.pm:307

 #, perl-format
 msgid "removing old page %s"
 msgstr "Suppression de l'ancienne page %s"
 
 #, perl-format
 msgid "removing old page %s"
 msgstr "Suppression de l'ancienne page %s"
 

-#: ../IkiWiki/Render.pm:311
+#: ../IkiWiki/Render.pm:326

 #, perl-format
 msgid "scanning %s"
 msgstr "Parcours de %s"
 
 #, perl-format
 msgid "scanning %s"
 msgstr "Parcours de %s"
 

-#: ../IkiWiki/Render.pm:320
+#: ../IkiWiki/Render.pm:335

 #, perl-format
 msgid "rendering %s"
 msgstr "Rendu de %s"
 
 #, perl-format
 msgid "rendering %s"
 msgstr "Rendu de %s"
 

-#: ../IkiWiki/Render.pm:332
+#: ../IkiWiki/Render.pm:347

 #, perl-format
 msgid "rendering %s, which links to %s"
 msgstr "Rendu de %s, qui est lié à %s"
 
 #, perl-format
 msgid "rendering %s, which links to %s"
 msgstr "Rendu de %s, qui est lié à %s"
 

-#: ../IkiWiki/Render.pm:349
+#: ../IkiWiki/Render.pm:364

 #, perl-format
 msgid "rendering %s, which depends on %s"
 msgstr "Rendu de %s, qui dépend de %s"
 
 #, perl-format
 msgid "rendering %s, which depends on %s"
 msgstr "Rendu de %s, qui dépend de %s"
 

-#: ../IkiWiki/Render.pm:387
+#: ../IkiWiki/Render.pm:402

 #, perl-format
 msgid "rendering %s, to update its backlinks"
 msgstr "Rendu de %s, afin de mettre à jour ses rétroliens"
 
 #, perl-format
 msgid "rendering %s, to update its backlinks"
 msgstr "Rendu de %s, afin de mettre à jour ses rétroliens"
 

-#: ../IkiWiki/Render.pm:399
+#: ../IkiWiki/Render.pm:414

 #, perl-format
 msgid "removing %s, no longer rendered by %s"
 msgstr "Suppression de %s, qui n'est plus rendu par %s"
 
 #, perl-format
 msgid "removing %s, no longer rendered by %s"
 msgstr "Suppression de %s, qui n'est plus rendu par %s"
 

-#: ../IkiWiki/Render.pm:425
+#: ../IkiWiki/Render.pm:440

 #, perl-format
 msgid "ikiwiki: cannot render %s"
 msgstr "ikiwiki : impossible d'effectuer le rendu de %s"
 #, perl-format
 msgid "ikiwiki: cannot render %s"
 msgstr "ikiwiki : impossible d'effectuer le rendu de %s"


@@ -388,7 +388,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:527
+#: ../IkiWiki.pm:531

 #, 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 59ae104b9d66b888d0c00eadd52a2c4b4accca2c..e9b06baef6b6824576f89248292e93d73d030b78 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-01 21:27-0500\n"
+"POT-Creation-Date: 2007-02-06 15:06-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"


@@ -124,7 +124,7 @@ msgstr "અજાણ્યો ગોઠવણી પ્રકાર %s"
 msgid "Discussion"
 msgstr "ચર્ચા"
 
 msgid "Discussion"
 msgstr "ચર્ચા"
 

-#: ../IkiWiki/Plugin/inline.pm:372
+#: ../IkiWiki/Plugin/inline.pm:378

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


@@ -250,47 +250,47 @@ msgid ""
 "notifications"
 msgstr "REV ગોઠવેલ નથી, svn post-commit hook માંથી ચાલતું નથી, નોંધ મોકલી શકાશે નહી"
 
 "notifications"
 msgstr "REV ગોઠવેલ નથી, svn post-commit hook માંથી ચાલતું નથી, નોંધ મોકલી શકાશે નહી"
 

-#: ../IkiWiki/Render.pm:232 ../IkiWiki/Render.pm:252
+#: ../IkiWiki/Render.pm:247 ../IkiWiki/Render.pm:267

 #, perl-format
 msgid "skipping bad filename %s"
 msgstr "ખરાબ ફાઇલ નામ છોડી દે છે %s"
 
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr "ખરાબ ફાઇલ નામ છોડી દે છે %s"
 

-#: ../IkiWiki/Render.pm:292
+#: ../IkiWiki/Render.pm:307

 #, perl-format
 msgid "removing old page %s"
 msgstr "જુનાં પાનાં દૂર કરે છે %s"
 
 #, perl-format
 msgid "removing old page %s"
 msgstr "જુનાં પાનાં દૂર કરે છે %s"
 

-#: ../IkiWiki/Render.pm:311
+#: ../IkiWiki/Render.pm:326

 #, perl-format
 msgid "scanning %s"
 msgstr "%s શોધે છે"
 
 #, perl-format
 msgid "scanning %s"
 msgstr "%s શોધે છે"
 

-#: ../IkiWiki/Render.pm:320
+#: ../IkiWiki/Render.pm:335

 #, perl-format
 msgid "rendering %s"
 msgstr "રેન્ડર કરે છે %s"
 
 #, perl-format
 msgid "rendering %s"
 msgstr "રેન્ડર કરે છે %s"
 

-#: ../IkiWiki/Render.pm:332
+#: ../IkiWiki/Render.pm:347

 #, perl-format
 msgid "rendering %s, which links to %s"
 msgstr "રેન્ડર કરે છે %s, જે %s સાથે જોડાણ ધરાવે છે"
 
 #, perl-format
 msgid "rendering %s, which links to %s"
 msgstr "રેન્ડર કરે છે %s, જે %s સાથે જોડાણ ધરાવે છે"
 

-#: ../IkiWiki/Render.pm:349
+#: ../IkiWiki/Render.pm:364

 #, perl-format
 msgid "rendering %s, which depends on %s"
 msgstr "રેન્ડર કરે છે %s, જે %s પર આધારિત છે"
 
 #, perl-format
 msgid "rendering %s, which depends on %s"
 msgstr "રેન્ડર કરે છે %s, જે %s પર આધારિત છે"
 

-#: ../IkiWiki/Render.pm:387
+#: ../IkiWiki/Render.pm:402

 #, perl-format
 msgid "rendering %s, to update its backlinks"
 msgstr "રેન્ડર કરે છે %s, તેનાં પાછળનાં જોડાણો સુધારવા માટે"
 
 #, perl-format
 msgid "rendering %s, to update its backlinks"
 msgstr "રેન્ડર કરે છે %s, તેનાં પાછળનાં જોડાણો સુધારવા માટે"
 

-#: ../IkiWiki/Render.pm:399
+#: ../IkiWiki/Render.pm:414

 #, perl-format
 msgid "removing %s, no longer rendered by %s"
 msgstr "દૂર કરે છે %s, હવે %s વડે રેન્ડર કરાતું નથી"
 
 #, perl-format
 msgid "removing %s, no longer rendered by %s"
 msgstr "દૂર કરે છે %s, હવે %s વડે રેન્ડર કરાતું નથી"
 

-#: ../IkiWiki/Render.pm:425
+#: ../IkiWiki/Render.pm:440

 #, perl-format
 msgid "ikiwiki: cannot render %s"
 msgstr "ikiwiki: %s રેન્ડર કરી શકાતું નથી"
 #, perl-format
 msgid "ikiwiki: cannot render %s"
 msgstr "ikiwiki: %s રેન્ડર કરી શકાતું નથી"


@@ -375,7 +375,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:527
+#: ../IkiWiki.pm:531

 #, 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 a77f9d8838dd36a0eef56609d8119c12d6806497..7ec22a68928237e256188a68b0b27424a6f6b30e 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-01 21:30-0500\n"
+"POT-Creation-Date: 2007-02-06 15:59-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"


@@ -125,7 +125,7 @@ msgstr ""
 msgid "Discussion"
 msgstr ""
 
 msgid "Discussion"
 msgstr ""
 

-#: ../IkiWiki/Plugin/inline.pm:372
+#: ../IkiWiki/Plugin/inline.pm:378

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


@@ -251,47 +251,47 @@ msgid ""
 "notifications"
 msgstr ""
 
 "notifications"
 msgstr ""
 

-#: ../IkiWiki/Render.pm:232 ../IkiWiki/Render.pm:252
+#: ../IkiWiki/Render.pm:247 ../IkiWiki/Render.pm:267

 #, perl-format
 msgid "skipping bad filename %s"
 msgstr ""
 
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr ""
 

-#: ../IkiWiki/Render.pm:292
+#: ../IkiWiki/Render.pm:307

 #, perl-format
 msgid "removing old page %s"
 msgstr ""
 
 #, perl-format
 msgid "removing old page %s"
 msgstr ""
 

-#: ../IkiWiki/Render.pm:311
+#: ../IkiWiki/Render.pm:326

 #, perl-format
 msgid "scanning %s"
 msgstr ""
 
 #, perl-format
 msgid "scanning %s"
 msgstr ""
 

-#: ../IkiWiki/Render.pm:320
+#: ../IkiWiki/Render.pm:335

 #, perl-format
 msgid "rendering %s"
 msgstr ""
 
 #, perl-format
 msgid "rendering %s"
 msgstr ""
 

-#: ../IkiWiki/Render.pm:332
+#: ../IkiWiki/Render.pm:347

 #, perl-format
 msgid "rendering %s, which links to %s"
 msgstr ""
 
 #, perl-format
 msgid "rendering %s, which links to %s"
 msgstr ""
 

-#: ../IkiWiki/Render.pm:349
+#: ../IkiWiki/Render.pm:364

 #, perl-format
 msgid "rendering %s, which depends on %s"
 msgstr ""
 
 #, perl-format
 msgid "rendering %s, which depends on %s"
 msgstr ""
 

-#: ../IkiWiki/Render.pm:387
+#: ../IkiWiki/Render.pm:402

 #, perl-format
 msgid "rendering %s, to update its backlinks"
 msgstr ""
 
 #, perl-format
 msgid "rendering %s, to update its backlinks"
 msgstr ""
 

-#: ../IkiWiki/Render.pm:399
+#: ../IkiWiki/Render.pm:414

 #, perl-format
 msgid "removing %s, no longer rendered by %s"
 msgstr ""
 
 #, perl-format
 msgid "removing %s, no longer rendered by %s"
 msgstr ""
 

-#: ../IkiWiki/Render.pm:425
+#: ../IkiWiki/Render.pm:440

 #, perl-format
 msgid "ikiwiki: cannot render %s"
 msgstr ""
 #, perl-format
 msgid "ikiwiki: cannot render %s"
 msgstr ""


@@ -376,7 +376,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:527
+#: ../IkiWiki.pm:531

 #, 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 a93c76167946290bdb5ab92171d5b806c937a082..a9f55dfc000cf2b266f33b6001ec7e8d329448cb 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-01 21:27-0500\n"
+"POT-Creation-Date: 2007-02-06 15:06-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"


@@ -129,7 +129,7 @@ msgstr "nieznany sposób sortowania %s"
 msgid "Discussion"
 msgstr "Dyskusja"
 
 msgid "Discussion"
 msgstr "Dyskusja"
 

-#: ../IkiWiki/Plugin/inline.pm:372
+#: ../IkiWiki/Plugin/inline.pm:378

 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"
 


@@ -262,47 +262,47 @@ msgstr ""
 "Brak możliwości wysłania powiadomień przez post-commit SVN-a z powodu "
 "nieustawionego parametru REV"
 
 "Brak możliwości wysłania powiadomień przez post-commit SVN-a z powodu "
 "nieustawionego parametru REV"
 

-#: ../IkiWiki/Render.pm:232 ../IkiWiki/Render.pm:252
+#: ../IkiWiki/Render.pm:247 ../IkiWiki/Render.pm:267

 #, perl-format
 msgid "skipping bad filename %s"
 msgstr "pomijanie nieprawidłowego pliku %s"
 
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr "pomijanie nieprawidłowego pliku %s"
 

-#: ../IkiWiki/Render.pm:292
+#: ../IkiWiki/Render.pm:307

 #, perl-format
 msgid "removing old page %s"
 msgstr "usuwanie starej strony %s"
 
 #, perl-format
 msgid "removing old page %s"
 msgstr "usuwanie starej strony %s"
 

-#: ../IkiWiki/Render.pm:311
+#: ../IkiWiki/Render.pm:326

 #, perl-format
 msgid "scanning %s"
 msgstr "przeszukiwanie strony %s"
 
 #, perl-format
 msgid "scanning %s"
 msgstr "przeszukiwanie strony %s"
 

-#: ../IkiWiki/Render.pm:320
+#: ../IkiWiki/Render.pm:335

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

-#: ../IkiWiki/Render.pm:332
+#: ../IkiWiki/Render.pm:347

 #, perl-format
 msgid "rendering %s, which links to %s"
 msgstr "tworzenie strony %s z odnośnikiem do strony %s"
 
 #, perl-format
 msgid "rendering %s, which links to %s"
 msgstr "tworzenie strony %s z odnośnikiem do strony %s"
 

-#: ../IkiWiki/Render.pm:349
+#: ../IkiWiki/Render.pm:364

 #, perl-format
 msgid "rendering %s, which depends on %s"
 msgstr "tworzenie strony %s zależącej od strony %s"
 
 #, perl-format
 msgid "rendering %s, which depends on %s"
 msgstr "tworzenie strony %s zależącej od strony %s"
 

-#: ../IkiWiki/Render.pm:387
+#: ../IkiWiki/Render.pm:402

 #, perl-format
 msgid "rendering %s, to update its backlinks"
 msgstr "tworzenie strony %s w celu aktualizacji jej powrotnych odnośników"
 
 #, perl-format
 msgid "rendering %s, to update its backlinks"
 msgstr "tworzenie strony %s w celu aktualizacji jej powrotnych odnośników"
 

-#: ../IkiWiki/Render.pm:399
+#: ../IkiWiki/Render.pm:414

 #, perl-format
 msgid "removing %s, no longer rendered by %s"
 msgstr "usuwanie strony %s nie tworzonej już przez %s"
 
 #, perl-format
 msgid "removing %s, no longer rendered by %s"
 msgstr "usuwanie strony %s nie tworzonej już przez %s"
 

-#: ../IkiWiki/Render.pm:425
+#: ../IkiWiki/Render.pm:440

 #, perl-format
 msgid "ikiwiki: cannot render %s"
 msgstr "ikiwiki: awaria w trakcie tworzenie strony %s"
 #, perl-format
 msgid "ikiwiki: cannot render %s"
 msgstr "ikiwiki: awaria w trakcie tworzenie strony %s"


@@ -389,7 +389,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:527
+#: ../IkiWiki.pm:531

 #, 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 df9c1055beea4e103abf596cd8a2a887a15f8e6b..dfb972f815a2771de0af78b6e941295d4abd9458 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-01 21:27-0500\n"
+"POT-Creation-Date: 2007-02-06 15:06-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"


@@ -124,7 +124,7 @@ msgstr "okänd sorteringstyp %s"
 msgid "Discussion"
 msgstr "Diskussion"
 
 msgid "Discussion"
 msgstr "Diskussion"
 

-#: ../IkiWiki/Plugin/inline.pm:372
+#: ../IkiWiki/Plugin/inline.pm:378

 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"
 


@@ -254,47 +254,47 @@ msgstr ""
 "REV är inte inställt, kör inte från svn post-commit-hook, kan inte skicka "
 "notifieringar"
 
 "REV är inte inställt, kör inte från svn post-commit-hook, kan inte skicka "
 "notifieringar"
 

-#: ../IkiWiki/Render.pm:232 ../IkiWiki/Render.pm:252
+#: ../IkiWiki/Render.pm:247 ../IkiWiki/Render.pm:267

 #, perl-format
 msgid "skipping bad filename %s"
 msgstr "hoppar över felaktigt filnamn %s"
 
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr "hoppar över felaktigt filnamn %s"
 

-#: ../IkiWiki/Render.pm:292
+#: ../IkiWiki/Render.pm:307

 #, perl-format
 msgid "removing old page %s"
 msgstr "tar bort gammal sida %s"
 
 #, perl-format
 msgid "removing old page %s"
 msgstr "tar bort gammal sida %s"
 

-#: ../IkiWiki/Render.pm:311
+#: ../IkiWiki/Render.pm:326

 #, perl-format
 msgid "scanning %s"
 msgstr "söker av %s"
 
 #, perl-format
 msgid "scanning %s"
 msgstr "söker av %s"
 

-#: ../IkiWiki/Render.pm:320
+#: ../IkiWiki/Render.pm:335

 #, perl-format
 msgid "rendering %s"
 msgstr "ritar upp %s"
 
 #, perl-format
 msgid "rendering %s"
 msgstr "ritar upp %s"
 

-#: ../IkiWiki/Render.pm:332
+#: ../IkiWiki/Render.pm:347

 #, perl-format
 msgid "rendering %s, which links to %s"
 msgstr "ritar upp %s, vilken länkar till %s"
 
 #, perl-format
 msgid "rendering %s, which links to %s"
 msgstr "ritar upp %s, vilken länkar till %s"
 

-#: ../IkiWiki/Render.pm:349
+#: ../IkiWiki/Render.pm:364

 #, perl-format
 msgid "rendering %s, which depends on %s"
 msgstr "ritar upp %s, vilken är beroende av %s"
 
 #, perl-format
 msgid "rendering %s, which depends on %s"
 msgstr "ritar upp %s, vilken är beroende av %s"
 

-#: ../IkiWiki/Render.pm:387
+#: ../IkiWiki/Render.pm:402

 #, perl-format
 msgid "rendering %s, to update its backlinks"
 msgstr "ritar upp %s, för att uppdatera dess bakåtlänkar"
 
 #, perl-format
 msgid "rendering %s, to update its backlinks"
 msgstr "ritar upp %s, för att uppdatera dess bakåtlänkar"
 

-#: ../IkiWiki/Render.pm:399
+#: ../IkiWiki/Render.pm:414

 #, perl-format
 msgid "removing %s, no longer rendered by %s"
 msgstr "tar bort %s, som inte längre ritas upp av %s"
 
 #, perl-format
 msgid "removing %s, no longer rendered by %s"
 msgstr "tar bort %s, som inte längre ritas upp av %s"
 

-#: ../IkiWiki/Render.pm:425
+#: ../IkiWiki/Render.pm:440

 #, perl-format
 msgid "ikiwiki: cannot render %s"
 msgstr "ikiwiki: kan inte rita upp %s"
 #, perl-format
 msgid "ikiwiki: cannot render %s"
 msgstr "ikiwiki: kan inte rita upp %s"


@@ -379,7 +379,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:527
+#: ../IkiWiki.pm:531

 #, 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 32d386856aa02bab3b4756dc3991eca8b0ae5954..297bab716a1cb69c54626344554ba297ac237c1c 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-01 21:27-0500\n"
+"POT-Creation-Date: 2007-02-06 15:06-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"


@@ -127,7 +127,7 @@ msgstr "kiểu sắp xếp không rõ %s"
 msgid "Discussion"
 msgstr "Thảo luận"
 
 msgid "Discussion"
 msgstr "Thảo luận"
 

-#: ../IkiWiki/Plugin/inline.pm:372
+#: ../IkiWiki/Plugin/inline.pm:378

 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"
 


@@ -254,47 +254,47 @@ msgid ""
 msgstr ""
 "Chưa đặt REV, không chạy từ móc sau gài vào nên không thể gửi thông báo"
 
 msgstr ""
 "Chưa đặt REV, không chạy từ móc sau gài vào nên không thể gửi thông báo"
 

-#: ../IkiWiki/Render.pm:232 ../IkiWiki/Render.pm:252
+#: ../IkiWiki/Render.pm:247 ../IkiWiki/Render.pm:267

 #, perl-format
 msgid "skipping bad filename %s"
 msgstr "đang bỏ qua tên tập tin sai %s"
 
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr "đang bỏ qua tên tập tin sai %s"
 

-#: ../IkiWiki/Render.pm:292
+#: ../IkiWiki/Render.pm:307

 #, perl-format
 msgid "removing old page %s"
 msgstr "đang gỡ bỏ trang cũ %s"
 
 #, perl-format
 msgid "removing old page %s"
 msgstr "đang gỡ bỏ trang cũ %s"
 

-#: ../IkiWiki/Render.pm:311
+#: ../IkiWiki/Render.pm:326

 #, perl-format
 msgid "scanning %s"
 msgstr "đang quét %s"
 
 #, perl-format
 msgid "scanning %s"
 msgstr "đang quét %s"
 

-#: ../IkiWiki/Render.pm:320
+#: ../IkiWiki/Render.pm:335

 #, perl-format
 msgid "rendering %s"
 msgstr "đang vẽ %s"
 
 #, perl-format
 msgid "rendering %s"
 msgstr "đang vẽ %s"
 

-#: ../IkiWiki/Render.pm:332
+#: ../IkiWiki/Render.pm:347

 #, perl-format
 msgid "rendering %s, which links to %s"
 msgstr "đang vẽ %s mà liên kết tới %s"
 
 #, perl-format
 msgid "rendering %s, which links to %s"
 msgstr "đang vẽ %s mà liên kết tới %s"
 

-#: ../IkiWiki/Render.pm:349
+#: ../IkiWiki/Render.pm:364

 #, perl-format
 msgid "rendering %s, which depends on %s"
 msgstr "đang vẽ %s mà phụ thuộc vào %s"
 
 #, perl-format
 msgid "rendering %s, which depends on %s"
 msgstr "đang vẽ %s mà phụ thuộc vào %s"
 

-#: ../IkiWiki/Render.pm:387
+#: ../IkiWiki/Render.pm:402

 #, perl-format
 msgid "rendering %s, to update its backlinks"
 msgstr "đang vẽ %s để cập nhật các liên kết ngược của nó"
 
 #, perl-format
 msgid "rendering %s, to update its backlinks"
 msgstr "đang vẽ %s để cập nhật các liên kết ngược của nó"
 

-#: ../IkiWiki/Render.pm:399
+#: ../IkiWiki/Render.pm:414

 #, perl-format
 msgid "removing %s, no longer rendered by %s"
 msgstr "đang gỡ bỏ %s, không còn được vẽ lại bởi %s"
 
 #, perl-format
 msgid "removing %s, no longer rendered by %s"
 msgstr "đang gỡ bỏ %s, không còn được vẽ lại bởi %s"
 

-#: ../IkiWiki/Render.pm:425
+#: ../IkiWiki/Render.pm:440

 #, perl-format
 msgid "ikiwiki: cannot render %s"
 msgstr "ikiwiki: không thể vẽ %s"
 #, perl-format
 msgid "ikiwiki: cannot render %s"
 msgstr "ikiwiki: không thể vẽ %s"


@@ -380,7 +380,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:527
+#: ../IkiWiki.pm:531

 #, 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/t/pagespec_match.t b/t/pagespec_match.t
index bf6c8cbdf90bd1e3ce8273fcdedacf43058b9bd0..1b814357735c435b2bf8a23dd2459b511826a139 100755 (executable)
--- a/t/pagespec_match.t
+++ b/t/pagespec_match.t
@@ -1,29 +1,34 @@
 #!/usr/bin/perl
 use warnings;
 use strict;
 #!/usr/bin/perl
 use warnings;
 use strict;

-use Test::More tests => 35;
+use Test::More tests => 40;

 
 BEGIN { use_ok("IkiWiki"); }
 
 
 BEGIN { use_ok("IkiWiki"); }
 

-ok(pagespec_match("foo", "*"));
-ok(pagespec_match("page", "?ag?"));
-ok(! pagespec_match("page", "?a?g?"));
-ok(pagespec_match("foo.png", "*.*"));
-ok(! pagespec_match("foo", "*.*"));
-ok(pagespec_match("foo", "foo or bar"), "simple list");
-ok(pagespec_match("bar", "foo or bar"), "simple list 2");
-ok(pagespec_match("foo", "f?? and !foz"));
-ok(! pagespec_match("foo", "f?? and !foo"));
-ok(! pagespec_match("foo", "* and !foo"));
-ok(! pagespec_match("foo", "foo and !foo"));
-ok(! pagespec_match("foo.png", "* and !*.*"));
-ok(pagespec_match("foo", "(bar or ((meep and foo) or (baz or foo) or beep))"));
+ok(pagespec_match("foo", "*", ""));
+ok(pagespec_match("page", "?ag?", ""));
+ok(! pagespec_match("page", "?a?g?", ""));
+ok(pagespec_match("foo.png", "*.*", ""));
+ok(! pagespec_match("foo", "*.*", ""));
+ok(pagespec_match("foo", "foo or bar", ""), "simple list");
+ok(pagespec_match("bar", "foo or bar", ""), "simple list 2");
+ok(pagespec_match("foo", "f?? and !foz", ""));
+ok(! pagespec_match("foo", "f?? and !foo", ""));
+ok(! pagespec_match("foo", "* and !foo", ""));
+ok(! pagespec_match("foo", "foo and !foo", ""));
+ok(! pagespec_match("foo.png", "* and !*.*", ""));
+ok(pagespec_match("foo", "(bar or ((meep and foo) or (baz or foo) or beep))", ""));
+ok(! pagespec_match("foo/bar", "./*", "foo"), "relative fail");
+ok(! pagespec_match("a/foo", "./*", "a/b"), "relative");
+ok(! pagespec_match("a/b/foo", "./*", "a/b"), "relative fail");
+ok(! pagespec_match("foo", "./*", "a"), "relative toplevel");
+ok(pagespec_match("foo/bar", "*", "baz"), "absolute");

 
 $links{foo}=[qw{bar baz}];
 
 $links{foo}=[qw{bar baz}];

-ok(pagespec_match("foo", "link(bar)"));
-ok(! pagespec_match("foo", "link(quux)"));
-ok(pagespec_match("bar", "backlink(foo)"));
-ok(! pagespec_match("quux", "backlink(foo)"));
+ok(pagespec_match("foo", "link(bar)", ""));
+ok(! pagespec_match("foo", "link(quux)", ""));
+ok(pagespec_match("bar", "backlink(foo)", ""));
+ok(! pagespec_match("quux", "backlink(foo)", ""));

 
 $IkiWiki::pagectime{foo}=1154532692; # Wed Aug  2 11:26 EDT 2006
 $IkiWiki::pagectime{bar}=1154532695; # after
 
 $IkiWiki::pagectime{foo}=1154532692; # Wed Aug  2 11:26 EDT 2006
 $IkiWiki::pagectime{bar}=1154532695; # after