Merge remote branch 'intrigeri/po'

diff --git a/IkiWiki.pm b/IkiWiki.pm
index df8abe2c2711281c220a604aa0ddca09ec915a02..6da281999f0b4c035805626f11d6e244c105d69f 100644 (file)
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -2402,10 +2402,16 @@ sub derel ($$) {
        my $path=shift;
        my $from=shift;
 
-       if ($path =~ m!^\./!) {
-               $from=~s#/?[^/]+$## if defined $from;
-               $path=~s#^\./##;
-               $path="$from/$path" if defined $from && length $from;
+       if ($path =~ m!^\.(/|$)!) {
+               if ($1) {
+                       $from=~s#/?[^/]+$## if defined $from;
+                       $path=~s#^\./##;
+                       $path="$from/$path" if defined $from && length $from;
+               }
+               else {
+                       $path = $from;
+                       $path = "" unless defined $path;
+               }
        }
 
        return $path;

diff --git a/IkiWiki/Plugin/highlight.pm b/IkiWiki/Plugin/highlight.pm
index e517ac5c06aa425771dcac7256a8e3127da8d3bb..d4ade0a7b3f788c71472c82b1e359b5572731d74 100644 (file)
--- a/IkiWiki/Plugin/highlight.pm
+++ b/IkiWiki/Plugin/highlight.pm
@@ -6,10 +6,6 @@ use strict;
 use IkiWiki 3.00;
 use Encode;
 
-# locations of highlight's files
-my $filetypes="/etc/highlight/filetypes.conf";
-my $langdefdir="/usr/share/highlight/langDefs";
-
 sub import {
        hook(type => "getsetup", id => "highlight",  call => \&getsetup);
        hook(type => "checkconfig", id => "highlight", call => \&checkconfig);
@@ -32,9 +28,29 @@ sub getsetup () {
                        safe => 1,
                        rebuild => 1,
                },
+               filetypes_conf => {
+                       type => "string",
+                       example => "/etc/highlight/filetypes.conf",
+                       description => "location of highlight's filetypes.conf",
+                       safe => 0,
+                       rebuild => undef,
+               },
+               langdefdir => {
+                       type => "string",
+                       example => "/usr/share/highlight/langDefs",
+                       description => "location of highlight's langDefs directory",
+                       safe => 0,
+                       rebuild => undef,
+               },
 }
 
 sub checkconfig () {
+       if (! exists $config{filetypes_conf}) {
+               $config{filetypes_conf}="/etc/highlight/filetypes.conf";
+       }
+       if (! exists $config{langdefdir}) {
+               $config{langdefdir}="/usr/share/highlight/langDefs";
+       }
        if (exists $config{tohighlight}) {
                foreach my $file (split ' ', $config{tohighlight}) {
                        my @opts = $file=~s/^\.// ?
@@ -80,7 +96,7 @@ my %highlighters;
 
 # Parse highlight's config file to get extension => language mappings.
 sub read_filetypes () {
-       open (IN, $filetypes) || error("$filetypes: $!");
+       open (IN, $config{filetypes_conf}) || error("$config{filetypes_conf}: $!");
        while (<IN>) {
                chomp;
                if (/^\$ext\((.*)\)=(.*)$/) {
@@ -97,12 +113,12 @@ sub read_filetypes () {
 sub ext2langfile ($) {
        my $ext=shift;
 
-       my $langfile="$langdefdir/$ext.lang";
+       my $langfile="$config{langdefdir}/$ext.lang";
        return $langfile if exists $highlighters{$langfile};
 
        read_filetypes() unless $filetypes_read;
        if (exists $ext2lang{$ext}) {
-               return "$langdefdir/$ext2lang{$ext}.lang";
+               return "$config{langdefdir}/$ext2lang{$ext}.lang";
        }
        # If a language only has one common extension, it will not
        # be listed in filetypes, so check the langfile.

diff --git a/debian/changelog b/debian/changelog
index fb445a3fffdbaa93f9ea58aadf43659aa84a6384..eba38c4d15eed86d5848b74efbdf7115f7a243aa 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,10 @@ ikiwiki (3.20100816) UNRELEASED; urgency=low
     the bug and providing access to debug it.
   * style.css: Use relative, not absolute font sizes. Thanks, Giuseppe Bilotta.
   * htmlscrubber: Do not scrub url anchors that contain colons.
+  * Danish translation update. Closes: #594673
+  * highlight: Make location of highlight's files configurable in setup
+    file to allow for nonstandard installations.
+  * Allow "link(.)" and similar PageSpecs. Thanks, Giuseppe Bilotta.
 
  -- Joey Hess <joeyh@debian.org>  Sun, 15 Aug 2010 11:45:48 -0400
 

diff --git a/doc/bugs/Highlight_extension_uses_hard_coded_paths.mdwn b/doc/bugs/Highlight_extension_uses_hard_coded_paths.mdwn
new file mode 100644 (file)
index 0000000..275661f
--- /dev/null
+++ b/doc/bugs/Highlight_extension_uses_hard_coded_paths.mdwn
@@ -0,0 +1,3 @@
+The [[plugins/highlight]] plugin hard codes some paths up the top of the plugin.  This means that you need to edit the ikiwiki source if you have highlight installed in a non-standard location (e.g. if you have done a user-level install of the highlight package).
+
+> configurable now, [[done]] --[[Joey]] 

diff --git a/doc/bugs/po:_po_files_instead_of_html_files.mdwn b/doc/bugs/po:_po_files_instead_of_html_files.mdwn
index 933e348c40d0333de1d43e2e5edbb78c976240b6..6e12b51be25a3e9c01331b4c19ee7f11427092db 100644 (file)
--- a/doc/bugs/po:_po_files_instead_of_html_files.mdwn
+++ b/doc/bugs/po:_po_files_instead_of_html_files.mdwn
@@ -4,3 +4,9 @@ Links: index index.fr templates templates.fr
 When i click on "templates.fr", i get the po.file instead of html.  
    
     Sorry for the noise! I set "po_master_language" to fr and all was ok. [[done]].
+
+> Any chance you could be a bit more verbose about what the
+> misconfiguration was? I don't think the po plugin should behave like that
+> in any configuration. Unless, perhaps, it was just not configured to
+> support any languages at all, and so the po file was treated as a raw
+> file. --[[Joey]] 

diff --git a/doc/forum/Can__39__t_get_comments_plugin_working.mdwn b/doc/forum/Can__39__t_get_comments_plugin_working.mdwn
new file mode 100644 (file)
index 0000000..f189d9b
--- /dev/null
+++ b/doc/forum/Can__39__t_get_comments_plugin_working.mdwn
@@ -0,0 +1,16 @@
+I feel like I must be missing something.
+
+My blog is based on Ikiwiki, and uses /yyyy/mm/dd/title/ for blog posts.
+Because I use the plugin that generates index pages for subdirectories, I
+have to use /????/??/??/* to identify posts and avoid missing the index
+pages for years, months and days.
+
+I've enabled the comments plugin, but no matter what I do, I can't seem to make the comment form appear on my posts. I've removed the entire site and have rebuilt. I've set the pagespec to /????/??/??/* and ./????/??/??/*, but neither seems to work. I don't see any output, or anything else to indicate that pages aren't working.
+
+Are there any other plugins that need to be enabled for this to work? I think I've locked things down such that anonymous users can't edit by enabling signinedit and setting a lock, but this may be blocking the ability to comment (though I don't recall seeing anything in the docs about needing additional plugins.)
+
+> Just use '????/??/??/*' , and it will work.
+> [[Pagespecs|ikiwiki/pagespec]] are automatically matched absolute to the
+> top of the site, and adding a leading "/" is not necessary and will 
+> make the PageSpec not match. (And the relative PageSpec with "./" is
+> not right in this case either). --[[Joey]] 

diff --git a/doc/forum/editing_a_comment.mdwn b/doc/forum/editing_a_comment.mdwn
index 8bddab3fbcfd13ebe7ab60c8728f7cc46180617e..eb534365ee33acbf770dda431e19cbc6642b097b 100644 (file)
--- a/doc/forum/editing_a_comment.mdwn
+++ b/doc/forum/editing_a_comment.mdwn
@@ -1 +1,11 @@
 Is it possible to edit a comment? I did not find any button for it.
+
+> It was a design decision to not allow editing comments via the web
+> interface. The thinking being that comments on blogs tend to not allow
+> editing, and allowing wiki-style editing by anyone would sort of defeat
+> the purpose of comments.
+> 
+> I do think there is room to support more forum-style comments in ikiwiki.
+> As long as the comment is not posted by an anonymous user, it would be
+> possible to open up editing to the original commenter. One day, perhaps..
+> --[[Joey]] 

diff --git a/doc/ikiwiki/pagespec.mdwn b/doc/ikiwiki/pagespec.mdwn
index c66395f8441397764124e4fe693a17f18dc5767a..6aec561ae7f34ff986792cac4b3f38679a9d8cfb 100644 (file)
--- a/doc/ikiwiki/pagespec.mdwn
+++ b/doc/ikiwiki/pagespec.mdwn
@@ -78,3 +78,7 @@ 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".
+
+To indicate the name of the page the PageSpec is used in, you can
+use a single dot. For example, `link(.)` matches all the pages
+linking to the page containing the PageSpec.

diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
index e76d547cc4b5c081279695dae21c74f2495647bc..2f70c67b7af4bd4cf5fa47b5487d808e6ab69ed1 100644 (file)
--- a/doc/ikiwikiusers.mdwn
+++ b/doc/ikiwikiusers.mdwn
@@ -158,6 +158,7 @@ Personal sites and blogs
 * [Nicolas Schodet](http://ni.fr.eu.org/)
 * [weakish](http://weakish.github.com)
 * [Thomas Kane](http://planetkane.org/)
+* [Marco Silva](http://marcot.eti.br/) a weblog + wiki using the [darcs](http://darcs.net) backend
 
 Please feel free to add your own ikiwiki site!
 

diff --git a/doc/plugins/contrib/ymlfront/discussion.mdwn b/doc/plugins/contrib/ymlfront/discussion.mdwn
index b1fd65fffbacc0f8272d7e579ca1e9c25f60ba27..bf9780048032376050e156a528e6df494f1aeee2 100644 (file)
--- a/doc/plugins/contrib/ymlfront/discussion.mdwn
+++ b/doc/plugins/contrib/ymlfront/discussion.mdwn
@@ -4,3 +4,9 @@ Now that I have implemented a \[[!ymlfront ...]] directive, I would like to remo
 * it is non-standard
 
 Any objections?
+
+> Well, I don't have much standing since I have been too lame to integrate
+> ymlfront into ikiwiki yet. Buy, my opinion is, I liked the old
+> format of putting the YAML literally at the front of the file. It
+> seemed to allow parsing the file as YAML, using any arbitrary YAML
+> processer. And it was nice how it avoided boilerplate. --[[Joey]] 

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 01308dae4dfbbb92146132a77e7e776cdaf249b4..365cb3321c17a107fbba29da998730a15078ef74 100644 (file)
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -49,8 +49,10 @@ Bulleted list
 * <test.html>
 
 <google.de>
+<http://www.perl.it>
 ----
 
 This **SandBox** is also a [[blog]]!
+[[!inline  pages="blog/* and !*/Discussion" show="10" rootpage="blog"]]
 
 [[!inline pages="sandbox/* and !*/Discussion" rootpage="sandbox" show="4" archive="yes"]]

diff --git a/doc/setup.mdwn b/doc/setup.mdwn
index 266222cc3aad37950cacee3b88f7f66b5af259a9..83409228c3b2a8379686be1cff2284495cafccb3 100644 (file)
--- a/doc/setup.mdwn
+++ b/doc/setup.mdwn
@@ -68,6 +68,7 @@ source. (Remember to replace "foo" with the real directory name.)
        cvs -d `pwd`/foo get -P ikiwiki
        bzr clone foo foo.src
        hg clone foo foo.src
+       darcs get foo foo.src
        # TODO monotone, tla
 
 Now to edit pages by hand, go into the directory you checked out (ie,

diff --git a/doc/tips/spam_and_softwaresites/discussion.mdwn b/doc/tips/spam_and_softwaresites/discussion.mdwn
new file mode 100644 (file)
index 0000000..21f0a5d
--- /dev/null
+++ b/doc/tips/spam_and_softwaresites/discussion.mdwn
@@ -0,0 +1,8 @@
+In the cleanup spam section:
+
+> Caveat: if there are no commits you want to keep (i.e. all the commits since the last merge into master are either spam or spam reverts) then git rebase will abort.
+
+Wouldn't it be enough then to use `git reset --hard` to the desired last good commit?
+
+regards,
+iustin

diff --git a/doc/todo/Add_nicer_math_formatting.mdwn b/doc/todo/Add_nicer_math_formatting.mdwn
index 041eaee11a6880bbdb37528e9226b29aa89f782a..6e082c102fc07a60e135e65b91c64d1b9bae4747 100644 (file)
--- a/doc/todo/Add_nicer_math_formatting.mdwn
+++ b/doc/todo/Add_nicer_math_formatting.mdwn
@@ -1,5 +1,24 @@
-It would be nice to add nicer math formatting.  I currently use the [[plugins/teximg]] plugin, but I wonder if [jsMath](http://www.math.union.edu/~dpvc/jsMath/) wouldn't be a better option.
+It would be nice to add nicer math formatting.  I currently use the
+[[plugins/teximg]] plugin, but I wonder if
+[jsMath](http://www.math.union.edu/~dpvc/jsMath/) wouldn't be a better option.
 
 [[Will]]
 
+> I've looked at jsmath (which is nicely packaged in Debian), and 
+> I agree that this is nicer than TeX images. That text-mode browsers
+> get to see LaTeX as a fallback is actually a nice feature (better
+> than nothing, right? :) That browsers w/o javascript will not be able to
+> see the math either is probably ok.
+> 
+> A plugin would probably be a pretty trivial thing to write.
+> It just needs to include the javascript files,
+> and slap a `<div class="math"> avound the user's code`, then 
+> call `jsMath.Process(document);` at the end of the page.
+> 
+> My only concern is security: Has jsMath's parser been written 
+> to be safe when processing untrusted input? Could a user abuse the 
+> parser to cause it to emit/run arbitrary javascript code?
+> I've posted a question about this to its forum:  --[[Joey]] 
+> <https://sourceforge.net/projects/jsmath/forums/forum/592273/topic/3831574> 
+
 [[!tag wishlist]]

diff --git a/doc/todo/edit_form:_no_fixed_size_for_textarea.mdwn b/doc/todo/edit_form:_no_fixed_size_for_textarea.mdwn
index 577c3dad89823784db6b299a03af730a8306bf5c..77e46049fae7ce0a412411f7893f2030dc77ddb5 100644 (file)
--- a/doc/todo/edit_form:_no_fixed_size_for_textarea.mdwn
+++ b/doc/todo/edit_form:_no_fixed_size_for_textarea.mdwn
@@ -40,3 +40,13 @@ browsers emulate it. [[done]]
 --[[Joey]]
 
 Wouldn't it be possible to just implement an integer-valued setting for this, accessible via the "Setup" wiki page? This would require a wiki regen, but such a setting would not be changed frequently I suppose. Also, Mediawiki has this implemented as a per-user setting (two settings, actually, -- number of rows and columns of the edit area); such a per-user setting would be the best possible implementation, but I'm not sure if ikiwiki already supports per-user settings. Please consider implementing this as the current 20 rows is a great PITA for any non-trivial page.
+
+> I don't think it would need a wiki rebuild, as the textarea is generated dynamically by the CGI when you perform a CGI action, and (as far as I know) is not cooked into any static content. -- [[Jon]]
+
+>> There is no need for a configuration setting for this -- to change
+>> the default height from 20 rows to something else, you can just put
+>> something like this in your `local.css`: --[[Joey]] 
+
+       #editcontent {
+               height: 50em;
+       }

diff --git a/doc/todo/po:_remove_po_files_when_disabling_plugin.mdwn b/doc/todo/po:_remove_po_files_when_disabling_plugin.mdwn
index 0801f7fcd823a0733586ca18b1e869458cf2fce2..5d0318ae10f66363642ac49539d3f2c7dbd9a6e4 100644 (file)
--- a/doc/todo/po:_remove_po_files_when_disabling_plugin.mdwn
+++ b/doc/todo/po:_remove_po_files_when_disabling_plugin.mdwn
@@ -9,3 +9,5 @@ files from the source repository when it has been disabled?
 >> in most cases, it is not, thanks to .gitignore or similar, but we
 >> can't be sure. So I just can't decide it is needed to call
 >> `rcs_remove` rather than a good old `unlink`. --[[intrigeri]]
+
+>>> I guess you could call `rcs_remove` followed by `unlink`. --[[Joey]] 

diff --git a/doc/todo/support_link__40__.__41___in_pagespec.mdwn b/doc/todo/support_link__40__.__41___in_pagespec.mdwn
index 79809662a671c2502ab81441ab6b9a2cb39a6616..653db1ff21552cd00c8f1937b0af35b73b9d878b 100644 (file)
--- a/doc/todo/support_link__40__.__41___in_pagespec.mdwn
+++ b/doc/todo/support_link__40__.__41___in_pagespec.mdwn
@@ -11,3 +11,11 @@ IkiWiki.pm is the best way to do it".
 > I implemented this suggestion in the simplest possible way, [[!taglink patch]] available [[here|http://git.oblomov.eu/ikiwiki/patch/f4a52de556436fdee00fd92ca9a3b46e876450fa]].
 > An alternative approach, very similar, would be to make the empty page parameter mean current page (e.g. `link()` would mean pages linking here). The patch would be very similar.
 > -- GB
+
+>> Thanks for this, and also for your recent spam-fighting.
+>> Huh, I was right about changing derel, didn't realize it would be
+>> so obvious a change. :) Oh well, I managed to complicate it
+>> some in optimisation pass.. ;)
+>>
+>> Note that your git-daemon on git.oblomov.eu seems down.
+>> I pulled the patch from gitweb, [[done]] --[[Joey]]

diff --git a/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn b/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn
index 5f17e3ae036b61d5ff7c2572b6721c552ace1d99..63fd3d11dfce804b457578fb74509321e1c68fe1 100644 (file)
--- a/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn
+++ b/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn
@@ -12,20 +12,47 @@ It would be good if relative paths could be used instead, so the transport metho
 > "../../", and "../". The only absolute links are to CGIs and the w3c DTD.
 > --[[Joey]]
 
->> The problem is within the CGI script. The links within the HTML page are all absolute, including links to the css file.
->> Having a http links within a HTML page retrieved using https upset most browsers (I think). Also if I push cancel on the edit page in https, I end up at at http page. -- Brian May
+>> The problem is within the CGI script. The links within the HTML page are all
+>> absolute, including links to the css file. Having a http links within a HTML
+>> page retrieved using https upset most browsers (I think). Also if I push cancel
+>> on the edit page in https, I end up at at http page. -- Brian May
 
 >>> Ikiwiki does not hardcode http links anywhere. If you don't want
 >>> it to use such links, change your configuration to use https
 >>> consistently. --[[Joey]]
 
-Errr... That is not a solution, that is a work around. ikiwiki does not hard code the absolute paths, but absolute paths are hard coded in the configuration file. If you want to serve your website so that the majority of users can see it as http, including in rss feeds (this allows proxy caches to cache the contents and has reduced load requirements), but editing is done via https for increased security, it is not possible. I have some ideas how this can be implemented (as ikiwiki has the absolute path to the CGI script and the absolute path to the destination, it should be possible to generate a relative path from one to the other), although some minor issues still need to be resolved. -- Brian May
-
-I noticed the links to the images on <http://ikiwiki.info/recentchanges/> are also absolute, that is <http://ikiwiki.info/wikiicons/diff.png>; this seems surprising, as the change.tmpl file uses &lt;TMPL_VAR BASEURL&gt;
-which seems to do the right thing in page.tmpl, but not for change.tmpl. Where is BASEURL set? -- Brian May
+Errr... That is not a solution, that is a work around. ikiwiki does not hard
+code the absolute paths, but absolute paths are hard coded in the configuration
+file. If you want to serve your website so that the majority of users can see
+it as http, including in rss feeds (this allows proxy caches to cache the
+contents and has reduced load requirements), but editing is done via https for
+increased security, it is not possible. I have some ideas how this can be
+implemented (as ikiwiki has the absolute path to the CGI script and the
+absolute path to the destination, it should be possible to generate a relative
+path from one to the other), although some minor issues still need to be
+resolved. -- Brian May
+
+I noticed the links to the images on <http://ikiwiki.info/recentchanges/> are
+also absolute, that is <http://ikiwiki.info/wikiicons/diff.png>; this seems
+surprising, as the change.tmpl file uses &lt;TMPL_VAR BASEURL&gt; which seems
+to do the right thing in page.tmpl, but not for change.tmpl. Where is BASEURL
+set? -- Brian May
 
 > The use of an absolute baseurl in change.tmpl is a special case. --[[Joey]]
 
-So I'm facing this same issue. I have a wiki which needs to be accessed on three different URLs(!) and the hard coding of the URL from the setup file is becoming a problem for me. Is there anything I can do here? --[[Perry]]
+So I'm facing this same issue. I have a wiki which needs to be accessed on
+three different URLs(!) and the hard coding of the URL from the setup file is
+becoming a problem for me. Is there anything I can do here? --[[Perry]]
+
+> I remain puzzled by the problem that Brian is discussing. I don't see
+> why you can't just set the cgiurl and url to a https url, and serve
+> the site using both http and https.
+> 
+> Just for example, <https://kitenet.net/> is an ikiwiki, and it is accessible
+> via https or http, and if you use https, links will remain on https (except
+> for links using the cgi, which I could fix by changing the cgiurl to https).
+> 
+> I think it's possible ikiwiki used to have some
+> absolute urls that have been fixed since Brian filed the bug. --[[Joey]]  
 
 [[wishlist]]

diff --git a/po/da.po b/po/da.po
index c3178a7eab255e8e27f4737475cd9fab2a8d9e13..4d289b8af871b83ba430532f2ac64fc204c951b0 100644 (file)
--- a/po/da.po
+++ b/po/da.po
@@ -1,17 +1,17 @@
 # Danish translations for ikiwiki package
-# Copyright (C) 2008 Jonas Smedegaard <dr@jones.dk>
+# Copyright (C) 2008, 2009, 2010, Jonas Smedegaard <dr@jones.dk>
 # This file is distributed under the same license as the ikiwiki package.
-# Jonas Smedegaard <dr@jones.dk>, 2008.
 #
+# Jonas Smedegaard <dr@jones.dk>, 2008-2010.
 msgid ""
 msgstr ""
-"Project-Id-Version: ikiwiki 3.14159\n"
+"Project-Id-Version: ikiwiki 3.20100518\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-04 09:22-0400\n"
-"PO-Revision-Date: 2009-07-23 01:07+0200\n"
+"POT-Creation-Date: 2010-05-18 14:18-0400\n"
+"PO-Revision-Date: 2010-08-27 12:45+0200\n"
 "Last-Translator: Jonas Smedegaard <dr@jones.dk>\n"
 "Language-Team: None\n"
-"Language: \n"
+"Language: da\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -56,7 +56,7 @@ msgstr "Indstillinger gemt"
 msgid "You are banned."
 msgstr "Du er banlyst."
 
-#: ../IkiWiki/CGI.pm:426 ../IkiWiki/CGI.pm:427 ../IkiWiki.pm:1370
+#: ../IkiWiki/CGI.pm:426 ../IkiWiki/CGI.pm:427 ../IkiWiki.pm:1316
 msgid "Error"
 msgstr "Fejl"
 
@@ -85,50 +85,50 @@ msgstr "indlæg"
 msgid "new"
 msgstr "nyt"
 
-#: ../IkiWiki/Plugin/aggregate.pm:455
+#: ../IkiWiki/Plugin/aggregate.pm:441
 #, perl-format
 msgid "expiring %s (%s days old)"
 msgstr "udløber %s (%s dage gammel)"
 
-#: ../IkiWiki/Plugin/aggregate.pm:462
+#: ../IkiWiki/Plugin/aggregate.pm:448
 #, perl-format
 msgid "expiring %s"
 msgstr "udløber %s"
 
-#: ../IkiWiki/Plugin/aggregate.pm:489
+#: ../IkiWiki/Plugin/aggregate.pm:475
 #, perl-format
 msgid "last checked %s"
 msgstr "senest undersøgt %s"
 
-#: ../IkiWiki/Plugin/aggregate.pm:493
+#: ../IkiWiki/Plugin/aggregate.pm:479
 #, perl-format
 msgid "checking feed %s ..."
 msgstr "undersøger fødning %s ..."
 
-#: ../IkiWiki/Plugin/aggregate.pm:498
+#: ../IkiWiki/Plugin/aggregate.pm:484
 #, perl-format
 msgid "could not find feed at %s"
 msgstr "kunne ikke finde fødning ved %s"
 
-#: ../IkiWiki/Plugin/aggregate.pm:517
+#: ../IkiWiki/Plugin/aggregate.pm:503
 msgid "feed not found"
 msgstr "fødning ikke fundet"
 
-#: ../IkiWiki/Plugin/aggregate.pm:528
+#: ../IkiWiki/Plugin/aggregate.pm:514
 #, perl-format
 msgid "(invalid UTF-8 stripped from feed)"
 msgstr "(defekt UTF-8 fjernet fra fødning)"
 
-#: ../IkiWiki/Plugin/aggregate.pm:536
+#: ../IkiWiki/Plugin/aggregate.pm:522
 #, perl-format
 msgid "(feed entities escaped)"
 msgstr "(fødningselementer omgået (escaped))"
 
-#: ../IkiWiki/Plugin/aggregate.pm:544
+#: ../IkiWiki/Plugin/aggregate.pm:530
 msgid "feed crashed XML::Feed!"
 msgstr "fødning fik XML::Feed til at bryde sammen!"
 
-#: ../IkiWiki/Plugin/aggregate.pm:630
+#: ../IkiWiki/Plugin/aggregate.pm:616
 #, perl-format
 msgid "creating new page %s"
 msgstr "opretter ny side %s"
@@ -137,7 +137,7 @@ msgstr "opretter ny side %s"
 msgid "deleting bucket.."
 msgstr "sletter bundt.."
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:229
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:231
 msgid "done"
 msgstr "færdig"
 
@@ -147,17 +147,14 @@ msgid "Must specify %s"
 msgstr "Skal angive %s"
 
 #: ../IkiWiki/Plugin/amazon_s3.pm:140
-#, fuzzy
 msgid "Failed to create S3 bucket: "
-msgstr "Oprettelse af bundt i S3 mislykkedes: "
+msgstr "Oprettelse af S3 bundt mislykkedes: "
 
 #: ../IkiWiki/Plugin/amazon_s3.pm:225
-#, fuzzy
 msgid "Failed to save file to S3: "
-msgstr "Arkivering af fil i S3 mislykkedes: "
+msgstr "Arkivering af fil til S3 mislykkedes: "
 
 #: ../IkiWiki/Plugin/amazon_s3.pm:247
-#, fuzzy
 msgid "Failed to delete file from S3: "
 msgstr "Sletning af fil fra S3 mislykkedes: "
 
@@ -170,19 +167,19 @@ msgstr "der er allerede en side ved navn %s"
 msgid "prohibited by allowed_attachments"
 msgstr "forhindret af allowed_attachments"
 
-#: ../IkiWiki/Plugin/attachment.pm:144
+#: ../IkiWiki/Plugin/attachment.pm:141
 msgid "bad attachment filename"
 msgstr "dårligt vedhæftningsfilnavn"
 
-#: ../IkiWiki/Plugin/attachment.pm:188
+#: ../IkiWiki/Plugin/attachment.pm:183
 msgid "attachment upload"
 msgstr "vedhæftningsoplægning"
 
-#: ../IkiWiki/Plugin/autoindex.pm:120
+#: ../IkiWiki/Plugin/autoindex.pm:117
 msgid "automatic index generation"
 msgstr "automatisk indeks-dannelse"
 
-#: ../IkiWiki/Plugin/blogspam.pm:110
+#: ../IkiWiki/Plugin/blogspam.pm:109
 msgid ""
 "Sorry, but that looks like spam to <a href=\"http://blogspam.net/"
 "\">blogspam</a>: "
@@ -199,96 +196,89 @@ msgstr "%s fra %s"
 msgid "There are no broken links!"
 msgstr "Ingen henvisninger der ikker fungerer!"
 
-#: ../IkiWiki/Plugin/comments.pm:113
-#, fuzzy, perl-format
+#: ../IkiWiki/Plugin/comments.pm:112
+#, perl-format
 msgid "this comment needs %s"
-msgstr "kommenterer på %s"
+msgstr "denne kommentar kræver %s"
 
-#: ../IkiWiki/Plugin/comments.pm:116
-#, fuzzy
+#: ../IkiWiki/Plugin/comments.pm:115
 msgid "moderation"
-msgstr "Kommentarmoderering"
+msgstr "moderering"
 
-#: ../IkiWiki/Plugin/comments.pm:137 ../IkiWiki/Plugin/format.pm:48
+#: ../IkiWiki/Plugin/comments.pm:136 ../IkiWiki/Plugin/format.pm:48
 #, perl-format
 msgid "unsupported page format %s"
 msgstr "Ikke-understøttet sideformat %s"
 
-#: ../IkiWiki/Plugin/comments.pm:142
+#: ../IkiWiki/Plugin/comments.pm:141
 msgid "comment must have content"
 msgstr "kommentar skal have indhold"
 
-#: ../IkiWiki/Plugin/comments.pm:195
+#: ../IkiWiki/Plugin/comments.pm:196
 msgid "Anonymous"
 msgstr "Anonym"
 
-#: ../IkiWiki/Plugin/comments.pm:256
-#, fuzzy
-msgid "Comment Moderation"
-msgstr "Kommentarmoderering"
-
-#: ../IkiWiki/Plugin/comments.pm:372 ../IkiWiki/Plugin/editpage.pm:98
+#: ../IkiWiki/Plugin/comments.pm:357 ../IkiWiki/Plugin/editpage.pm:98
 msgid "bad page name"
 msgstr "dårligt sidenavn"
 
-#: ../IkiWiki/Plugin/comments.pm:377
+#: ../IkiWiki/Plugin/comments.pm:362
 #, perl-format
 msgid "commenting on %s"
 msgstr "kommenterer på %s"
 
-#: ../IkiWiki/Plugin/comments.pm:395
+#: ../IkiWiki/Plugin/comments.pm:380
 #, perl-format
 msgid "page '%s' doesn't exist, so you can't comment"
 msgstr "siden '%s' eksisterer ikke, så du kan ikke kommentere"
 
-#: ../IkiWiki/Plugin/comments.pm:402
+#: ../IkiWiki/Plugin/comments.pm:387
 #, perl-format
 msgid "comments on page '%s' are closed"
 msgstr "kommentarer på side '%s' er lukket"
 
-#: ../IkiWiki/Plugin/comments.pm:510
+#: ../IkiWiki/Plugin/comments.pm:490
 msgid "comment stored for moderation"
 msgstr "kommentar gemt for moderering"
 
-#: ../IkiWiki/Plugin/comments.pm:512
+#: ../IkiWiki/Plugin/comments.pm:492
 msgid "Your comment will be posted after moderator review"
 msgstr "Din kommentar vil blive tilføjet efter moderatorgenemsyn"
 
-#: ../IkiWiki/Plugin/comments.pm:525
+#: ../IkiWiki/Plugin/comments.pm:505
 msgid "Added a comment"
 msgstr "Tilføjede en kommentar"
 
-#: ../IkiWiki/Plugin/comments.pm:529
+#: ../IkiWiki/Plugin/comments.pm:509
 #, perl-format
 msgid "Added a comment: %s"
 msgstr "Tilføjede en kommentar: %s"
 
-#: ../IkiWiki/Plugin/comments.pm:573 ../IkiWiki/Plugin/websetup.pm:268
+#: ../IkiWiki/Plugin/comments.pm:551 ../IkiWiki/Plugin/websetup.pm:272
 msgid "you are not logged in as an admin"
 msgstr "du er ikke logget på som en administrator"
 
-#: ../IkiWiki/Plugin/comments.pm:625
+#: ../IkiWiki/Plugin/comments.pm:602
 msgid "Comment moderation"
 msgstr "Kommentarmoderering"
 
-#: ../IkiWiki/Plugin/comments.pm:665
+#: ../IkiWiki/Plugin/comments.pm:640
 msgid "comment moderation"
 msgstr "kommentarkoderering"
 
-#: ../IkiWiki/Plugin/comments.pm:822
-#, fuzzy, perl-format
+#: ../IkiWiki/Plugin/comments.pm:789
+#, perl-format
 msgid "%i comment"
 msgid_plural "%i comments"
-msgstr[0] "Kommentarer"
-msgstr[1] "Kommentarer"
+msgstr[0] "%i kommentar"
+msgstr[1] "%i kommentarer"
 
 #. translators: Here "Comment" is a verb;
 #. translators: the user clicks on it to
 #. translators: post a comment.
-#: ../IkiWiki/Plugin/comments.pm:832
-#, fuzzy
+#: ../IkiWiki/Plugin/comments.pm:799
 msgid "Comment"
-msgstr "Kommentarer"
+msgstr "Kommentér"
 
 #: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:31
 #: ../IkiWiki/Plugin/cutpaste.pm:46 ../IkiWiki/Plugin/cutpaste.pm:62
@@ -321,9 +311,9 @@ msgstr "%s er ikke en redigérbar side"
 msgid "creating %s"
 msgstr "opretter %s"
 
-#: ../IkiWiki/Plugin/editpage.pm:312 ../IkiWiki/Plugin/editpage.pm:332
-#: ../IkiWiki/Plugin/editpage.pm:343 ../IkiWiki/Plugin/editpage.pm:388
-#: ../IkiWiki/Plugin/editpage.pm:430
+#: ../IkiWiki/Plugin/editpage.pm:312 ../IkiWiki/Plugin/editpage.pm:331
+#: ../IkiWiki/Plugin/editpage.pm:341 ../IkiWiki/Plugin/editpage.pm:385
+#: ../IkiWiki/Plugin/editpage.pm:424
 #, perl-format
 msgid "editing %s"
 msgstr "redigerer %s"
@@ -336,16 +326,15 @@ msgstr "skabelon %s ikke angivet"
 msgid "match not specified"
 msgstr "sammenligning ikke angivet"
 
-#: ../IkiWiki/Plugin/edittemplate.pm:70
+#: ../IkiWiki/Plugin/edittemplate.pm:64
 #, perl-format
 msgid "edittemplate %s registered for %s"
 msgstr "redigeringsskabelon %s registreret for %s"
 
-#: ../IkiWiki/Plugin/edittemplate.pm:131 ../IkiWiki/Plugin/inline.pm:339
+#: ../IkiWiki/Plugin/edittemplate.pm:125 ../IkiWiki/Plugin/inline.pm:339
 #: ../IkiWiki/Plugin/template.pm:44
-#, fuzzy
 msgid "failed to process template:"
-msgstr "dannelsen mislykkedes:"
+msgstr "beandling af skabelon mislykkedes:"
 
 #: ../IkiWiki/Plugin/format.pm:30
 msgid "must specify format and text"
@@ -355,42 +344,41 @@ msgstr "skal angive format og tekst"
 msgid "fortune failed"
 msgstr "spådom (fortune) fejlede"
 
-#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:59
+#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:58
 msgid "missing page"
 msgstr "manglende side"
 
-#: ../IkiWiki/Plugin/getsource.pm:66 ../IkiWiki/Plugin/goto.pm:61
+#: ../IkiWiki/Plugin/getsource.pm:66 ../IkiWiki/Plugin/goto.pm:60
 #, perl-format
 msgid "The page %s does not exist."
 msgstr "Siden %s eksisterer ikke."
 
 #: ../IkiWiki/Plugin/getsource.pm:75
-#, fuzzy
 msgid "not a page"
-msgstr "kan ikke få sider til at passe sammen: %s"
+msgstr "ikke en side"
 
 #: ../IkiWiki/Plugin/getsource.pm:77
-#, fuzzy, perl-format
+#, perl-format
 msgid "%s is an attachment, not a page."
-msgstr "%s er ikke en redigérbar side"
+msgstr "%s er en vedhæftning, ikke en side."
 
-#: ../IkiWiki/Plugin/git.pm:742 ../IkiWiki/Plugin/git.pm:760
-#: ../IkiWiki/Receive.pm:129
+#: ../IkiWiki/Plugin/git.pm:687 ../IkiWiki/Plugin/git.pm:705
+#: ../IkiWiki/Receive.pm:130
 #, perl-format
 msgid "you are not allowed to change %s"
 msgstr "Du har ikke lov til at ændre %s"
 
-#: ../IkiWiki/Plugin/git.pm:782
+#: ../IkiWiki/Plugin/git.pm:727
 #, perl-format
 msgid "you cannot act on a file with mode %s"
 msgstr "du kan ikke påvirke en fil med modus %s"
 
-#: ../IkiWiki/Plugin/git.pm:786
+#: ../IkiWiki/Plugin/git.pm:731
 msgid "you are not allowed to change file modes"
 msgstr "du har ikke lov til at ændre modus for filer"
 
-#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:137
-#: ../IkiWiki/Plugin/search.pm:38
+#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:134
+#: ../IkiWiki/Plugin/search.pm:37
 #, perl-format
 msgid "Must specify %s when using the %s plugin"
 msgstr "Skal angive %s når udvidelsen %s bruges"
@@ -399,7 +387,7 @@ msgstr "Skal angive %s når udvidelsen %s bruges"
 msgid "failed to run graphviz"
 msgstr "graphviz-kørsel mislykkedes"
 
-#: ../IkiWiki/Plugin/graphviz.pm:91
+#: ../IkiWiki/Plugin/graphviz.pm:90
 msgid "prog not a valid graphviz program"
 msgstr "prog er ikke et gyldigt graphviz-program"
 
@@ -421,9 +409,8 @@ msgstr ""
 "gennemkørsel"
 
 #: ../IkiWiki/Plugin/htmltidy.pm:50
-#, fuzzy
 msgid "htmltidy failed to parse this html"
-msgstr "afkodning af smileys mislykkedes"
+msgstr "htmltidy kunne ikke afkode dette html"
 
 #: ../IkiWiki/Plugin/img.pm:69
 msgid "Image::Magick is not installed"
@@ -439,12 +426,12 @@ msgstr "læsning af %s mislykkedes: %s"
 msgid "wrong size format \"%s\" (should be WxH)"
 msgstr "forkert størrelsesformat \"%s\" (burde være WxH)"
 
-#: ../IkiWiki/Plugin/img.pm:122
+#: ../IkiWiki/Plugin/img.pm:125
 #, perl-format
 msgid "failed to resize: %s"
 msgstr "Ændring af størrelse mislykkedes: %s"
 
-#: ../IkiWiki/Plugin/img.pm:146
+#: ../IkiWiki/Plugin/img.pm:145
 #, perl-format
 msgid "failed to determine size of image %s"
 msgstr "Vurdering af billedstørrelse mislykkedes: %s"
@@ -464,7 +451,7 @@ msgstr "mangler pages-parametren"
 #: ../IkiWiki/Plugin/inline.pm:192
 #, perl-format
 msgid "the %s and %s parameters cannot be used together"
-msgstr ""
+msgstr "parametrene %s og %s kan ikke anvendes sammen"
 
 #: ../IkiWiki/Plugin/inline.pm:313
 msgid "Add a new post titled:"
@@ -486,7 +473,7 @@ msgstr "dot-kørsel mislykkedes"
 
 #: ../IkiWiki/Plugin/linkmap.pm:85
 msgid "linkmap"
-msgstr ""
+msgstr "henvisningskort"
 
 #: ../IkiWiki/Plugin/lockedit.pm:49
 #, perl-format
@@ -517,10 +504,9 @@ msgstr "henvisningsside ikke fundet"
 msgid "redir cycle is not allowed"
 msgstr "ring af henvisninger er ikke tilladt"
 
-#: ../IkiWiki/Plugin/meta.pm:395
-#, fuzzy
+#: ../IkiWiki/Plugin/meta.pm:387
 msgid "sort=meta requires a parameter"
-msgstr "kræver 'from'- og 'to'-parametre"
+msgstr "sort=meta kræver en parameter"
 
 #: ../IkiWiki/Plugin/mirrorlist.pm:44
 msgid "Mirrors"
@@ -531,18 +517,17 @@ msgid "Mirror"
 msgstr "Spejl"
 
 #: ../IkiWiki/Plugin/moderatedcomments.pm:57
-#, fuzzy
 msgid "comment needs moderation"
-msgstr "kommentarkoderering"
+msgstr "kommentar kræver moderering"
 
 #: ../IkiWiki/Plugin/more.pm:8
 msgid "more"
 msgstr "mere"
 
-#: ../IkiWiki/Plugin/openid.pm:70
-#, fuzzy, perl-format
+#: ../IkiWiki/Plugin/openid.pm:58
+#, perl-format
 msgid "failed to load openid module: "
-msgstr "kompilering af %s mislykkedes"
+msgstr "indlæsning af openid-modul mislykkedes: "
 
 #: ../IkiWiki/Plugin/orphans.pm:56
 msgid "All pages have other pages linking to them."
@@ -554,11 +539,11 @@ msgstr "dårlig eller manglende skabelon"
 
 #: ../IkiWiki/Plugin/passwordauth.pm:231
 msgid "Your user page: "
-msgstr ""
+msgstr "Din brugerside: "
 
 #: ../IkiWiki/Plugin/passwordauth.pm:238
 msgid "Create your user page"
-msgstr ""
+msgstr "Opret din brugerside"
 
 #: ../IkiWiki/Plugin/passwordauth.pm:268
 msgid "Account creation successful. Now you can Login."
@@ -613,19 +598,14 @@ msgstr "LWP ikke fundet, pinger ikke"
 
 #: ../IkiWiki/Plugin/po.pm:15
 msgid "warning: Old po4a detected! Recommend upgrade to 0.35."
-msgstr ""
-
-#: ../IkiWiki/Plugin/po.pm:147
-#, perl-format
-msgid "%s has invalid syntax: must use CODE|NAME"
-msgstr ""
+msgstr "advarsel: Gammel po4a detekteret. Anbefaler opgradering til 0.35."
 
-#: ../IkiWiki/Plugin/po.pm:166
+#: ../IkiWiki/Plugin/po.pm:142
 #, perl-format
 msgid "%s is not a valid language code"
 msgstr "%s er ikke en gyldig sprogkode"
 
-#: ../IkiWiki/Plugin/po.pm:178
+#: ../IkiWiki/Plugin/po.pm:154
 #, perl-format
 msgid ""
 "%s is not a valid value for po_link_to, falling back to po_link_to=default"
@@ -633,7 +613,7 @@ msgstr ""
 "%s er ikke en gyldig værdi for po_link_to, falder tilbage til "
 "po_link_to=default"
 
-#: ../IkiWiki/Plugin/po.pm:183
+#: ../IkiWiki/Plugin/po.pm:159
 msgid ""
 "po_link_to=negotiated requires usedirs to be enabled, falling back to "
 "po_link_to=default"
@@ -641,21 +621,21 @@ msgstr ""
 "po_link_to=negotiated kræver at usedirs er aktiveret, falder tilbage til "
 "po_link_to=default"
 
-#: ../IkiWiki/Plugin/po.pm:414
+#: ../IkiWiki/Plugin/po.pm:390
 #, perl-format
 msgid "rebuilding all pages to fix meta titles"
 msgstr "gendanner alle sider for at korrigere meta titler"
 
-#: ../IkiWiki/Plugin/po.pm:418 ../IkiWiki/Render.pm:784
+#: ../IkiWiki/Plugin/po.pm:394 ../IkiWiki/Render.pm:769
 #, perl-format
 msgid "building %s"
 msgstr "danner %s"
 
-#: ../IkiWiki/Plugin/po.pm:456
+#: ../IkiWiki/Plugin/po.pm:432
 msgid "updated PO files"
 msgstr "opdaterer PO-filer"
 
-#: ../IkiWiki/Plugin/po.pm:479
+#: ../IkiWiki/Plugin/po.pm:456
 msgid ""
 "Can not remove a translation. If the master page is removed, however, its "
 "translations will be removed as well."
@@ -663,7 +643,7 @@ msgstr ""
 "Kan ikke fjerne en oversættelse. Fjern i stedet hovedsiden, så fjernes dens "
 "oversættelser også."
 
-#: ../IkiWiki/Plugin/po.pm:499
+#: ../IkiWiki/Plugin/po.pm:476
 msgid ""
 "Can not rename a translation. If the master page is renamed, however, its "
 "translations will be renamed as well."
@@ -671,50 +651,50 @@ msgstr ""
 "Kan ikke omdøbe en oversættelse. Omdøb i stedet hovedsiden, så omdøbes dens "
 "oversættelser også."
 
-#: ../IkiWiki/Plugin/po.pm:924
+#: ../IkiWiki/Plugin/po.pm:876
 #, perl-format
 msgid "POT file (%s) does not exist"
 msgstr "POT-filen %s eksisterer ikke"
 
-#: ../IkiWiki/Plugin/po.pm:938
-#, fuzzy, perl-format
+#: ../IkiWiki/Plugin/po.pm:890
+#, perl-format
 msgid "failed to copy underlay PO file to %s"
-msgstr "kopiering af POT-filen til %s mislykkedes"
+msgstr "kopiering af underlags-PO-fil til %s mislykkedes"
 
-#: ../IkiWiki/Plugin/po.pm:947
+#: ../IkiWiki/Plugin/po.pm:899
 #, perl-format
 msgid "failed to update %s"
 msgstr "opdatering af %s mislykkedes"
 
-#: ../IkiWiki/Plugin/po.pm:953
+#: ../IkiWiki/Plugin/po.pm:905
 #, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr "kopiering af POT-filen til %s mislykkedes"
 
-#: ../IkiWiki/Plugin/po.pm:989
+#: ../IkiWiki/Plugin/po.pm:941
 msgid "N/A"
 msgstr "N/A"
 
-#: ../IkiWiki/Plugin/po.pm:1000
+#: ../IkiWiki/Plugin/po.pm:954
 #, perl-format
 msgid "failed to translate %s"
 msgstr "oversættelse af %s mislykkedes"
 
-#: ../IkiWiki/Plugin/po.pm:1079
+#: ../IkiWiki/Plugin/po.pm:1038
 msgid "removed obsolete PO files"
 msgstr "forældede PO filer fjernet"
 
-#: ../IkiWiki/Plugin/po.pm:1136 ../IkiWiki/Plugin/po.pm:1148
-#: ../IkiWiki/Plugin/po.pm:1187
+#: ../IkiWiki/Plugin/po.pm:1094 ../IkiWiki/Plugin/po.pm:1108
+#: ../IkiWiki/Plugin/po.pm:1147
 #, perl-format
 msgid "failed to write %s"
 msgstr "skrivning af %s mislykkedes"
 
-#: ../IkiWiki/Plugin/po.pm:1146
+#: ../IkiWiki/Plugin/po.pm:1106
 msgid "failed to translate"
 msgstr "oversættelse mislykkedes"
 
-#: ../IkiWiki/Plugin/po.pm:1199
+#: ../IkiWiki/Plugin/po.pm:1159
 msgid "invalid gettext data, go back to previous page to continue edit"
 msgstr ""
 "forkert gettext-data, gå tilbage til forrige side og fortsæt redigering"
@@ -844,7 +824,7 @@ msgstr "bekræft at %s bliver fjernet"
 msgid "Please select the attachments to remove."
 msgstr "Vælg vedhæftning der skal slettes."
 
-#: ../IkiWiki/Plugin/remove.pm:217
+#: ../IkiWiki/Plugin/remove.pm:216
 msgid "removed"
 msgstr "fjernet"
 
@@ -894,27 +874,27 @@ msgstr "Vælg vedhæftningen som skal omdøbes."
 msgid "rename %s to %s"
 msgstr "omdøb %s til %s"
 
-#: ../IkiWiki/Plugin/rename.pm:577
+#: ../IkiWiki/Plugin/rename.pm:576
 #, perl-format
 msgid "update for rename of %s to %s"
 msgstr "opdatering til omdøbning af %s til %s"
 
 #: ../IkiWiki/Plugin/rsync.pm:37
-#, fuzzy, perl-format
+#, perl-format
 msgid "failed to execute rsync_command: %s"
-msgstr "læsning af %s mislykkedes"
+msgstr "afvikling af rsync_command mislykkedes: %s"
 
 #: ../IkiWiki/Plugin/rsync.pm:40
 #, perl-format
 msgid "rsync_command exited %d"
-msgstr ""
+msgstr "rsync_command sluttede (exit code) %d"
 
-#: ../IkiWiki/Plugin/search.pm:195
-#, fuzzy, perl-format
-msgid "need Digest::SHA to index %s"
+#: ../IkiWiki/Plugin/search.pm:194
+#, perl-format
+msgid "need Digest::SHA1 to index %s"
 msgstr "behøver Digest::SHA1 til indeks %s"
 
-#: ../IkiWiki/Plugin/search.pm:232
+#: ../IkiWiki/Plugin/search.pm:231
 msgid "search"
 msgstr "søg"
 
@@ -993,18 +973,18 @@ msgid "parse fail at line %d: %s"
 msgstr "afkodningsfejl på linje %d: %s"
 
 #: ../IkiWiki/Plugin/tag.pm:83
-#, fuzzy, perl-format
+#, perl-format
 msgid "creating tag page %s"
-msgstr "opretter ny side %s"
+msgstr "opretter mærkatside %s"
 
 #: ../IkiWiki/Plugin/template.pm:33
 msgid "missing id parameter"
 msgstr "manglende id-parameter"
 
 #: ../IkiWiki/Plugin/template.pm:47
-#, fuzzy, perl-format
+#, perl-format
 msgid "%s not found"
-msgstr "fødning ikke fundet"
+msgstr "%s ikke fundet"
 
 #: ../IkiWiki/Plugin/teximg.pm:72
 msgid "missing tex code"
@@ -1015,36 +995,36 @@ msgid "failed to generate image from code"
 msgstr "billedopbygning fra kode mislykkedes"
 
 #: ../IkiWiki/Plugin/websetup.pm:105
-#, fuzzy, perl-format
+#, perl-format
 msgid "%s plugin:"
-msgstr "udvidelse"
+msgstr "%s udvidelse:"
 
 #: ../IkiWiki/Plugin/websetup.pm:121
-#, fuzzy, perl-format
+#, perl-format
 msgid "%s plugins"
-msgstr "udvidelser"
+msgstr "%s udvidelser"
 
 #: ../IkiWiki/Plugin/websetup.pm:135
 #, perl-format
 msgid "enable %s?"
 msgstr "aktivér %s?"
 
-#: ../IkiWiki/Plugin/websetup.pm:272
+#: ../IkiWiki/Plugin/websetup.pm:276
 msgid "setup file for this wiki is not known"
 msgstr "opsætningsfilen for denne wiki er ukendt"
 
-#: ../IkiWiki/Plugin/websetup.pm:288
+#: ../IkiWiki/Plugin/websetup.pm:292
 msgid "main"
 msgstr "primær"
 
-#: ../IkiWiki/Plugin/websetup.pm:431
+#: ../IkiWiki/Plugin/websetup.pm:435
 msgid ""
 "The configuration changes shown below require a wiki rebuild to take effect."
 msgstr ""
 "Opsætningsændringerne vist nedenfor kræver wiki-genopbygning for at træde i "
 "kraft."
 
-#: ../IkiWiki/Plugin/websetup.pm:435
+#: ../IkiWiki/Plugin/websetup.pm:439
 msgid ""
 "For the configuration changes shown below to fully take effect, you may need "
 "to rebuild the wiki."
@@ -1052,7 +1032,7 @@ msgstr ""
 "For at opsætningsændringerne vist nedenfor træder fuldt ud i kraft, skal du "
 "muligvis genopbygge wikien."
 
-#: ../IkiWiki/Plugin/websetup.pm:472
+#: ../IkiWiki/Plugin/websetup.pm:476
 #, perl-format
 msgid "Error: %s exited nonzero (%s). Discarding setup changes."
 msgstr "Fejl: %s returnerede ikke-nul (%s). Dropper opsætningsændringer."
@@ -1062,7 +1042,7 @@ msgstr "Fejl: %s returnerede ikke-nul (%s). Dropper opsætningsændringer."
 msgid "cannot determine id of untrusted committer %s"
 msgstr "kan ikke afgøre id for ikke-tillidsfulde skribent %s"
 
-#: ../IkiWiki/Receive.pm:85
+#: ../IkiWiki/Receive.pm:86
 #, perl-format
 msgid "bad file name %s"
 msgstr "dårligt filnavn %s"
@@ -1081,47 +1061,47 @@ msgstr ""
 "symbolsk lænke fundet i srcdir-sti (%s) -- sæt allow_symlinks_before_srcdir "
 "for at tillade dette"
 
-#: ../IkiWiki/Render.pm:316
+#: ../IkiWiki/Render.pm:311
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr "udelader forkert filnavn %s"
 
-#: ../IkiWiki/Render.pm:332
+#: ../IkiWiki/Render.pm:327
 #, perl-format
 msgid "%s has multiple possible source pages"
 msgstr "%s har flere mulige kildesider"
 
-#: ../IkiWiki/Render.pm:372
+#: ../IkiWiki/Render.pm:369
 #, perl-format
 msgid "querying %s for file creation and modification times.."
-msgstr ""
+msgstr "anmoder %s om oprettelses- og redigeringstider for fil.."
 
-#: ../IkiWiki/Render.pm:446
-#, fuzzy, perl-format
+#: ../IkiWiki/Render.pm:431
+#, perl-format
 msgid "removing obsolete %s"
-msgstr "fjerner gammel side %s"
+msgstr "fjerner forældet %s"
 
-#: ../IkiWiki/Render.pm:520
+#: ../IkiWiki/Render.pm:505
 #, perl-format
 msgid "building %s, which links to %s"
 msgstr "danner %s, som henviser til %s"
 
-#: ../IkiWiki/Render.pm:529
+#: ../IkiWiki/Render.pm:514
 #, perl-format
 msgid "removing %s, no longer built by %s"
 msgstr "fjerner %s, ikke længere dannet af %s"
 
-#: ../IkiWiki/Render.pm:612 ../IkiWiki/Render.pm:694
+#: ../IkiWiki/Render.pm:597 ../IkiWiki/Render.pm:679
 #, perl-format
 msgid "building %s, which depends on %s"
 msgstr "danner %s, som afhænger af %s"
 
-#: ../IkiWiki/Render.pm:707
+#: ../IkiWiki/Render.pm:692
 #, perl-format
 msgid "building %s, to update its backlinks"
 msgstr "danner %s, for at opdatere dens krydshenvisninger (backlinks)"
 
-#: ../IkiWiki/Render.pm:836
+#: ../IkiWiki/Render.pm:821
 #, perl-format
 msgid "ikiwiki: cannot build %s"
 msgstr "ikiwiki: kan ikke danne %s"
@@ -1134,14 +1114,14 @@ msgid "cannot read %s: %s"
 msgstr "kan ikke læse %s: %s"
 
 #: ../IkiWiki/Setup.pm:34
-#, fuzzy, perl-format
+#, perl-format
 msgid "cannot load %s in safe mode"
-msgstr "kan ikke læse %s: %s"
+msgstr "kan ikke læse %s i sikker tilstand"
 
-#: ../IkiWiki/Setup.pm:47
-#, fuzzy, perl-format
+#: ../IkiWiki/Setup.pm:46
+#, perl-format
 msgid "failed to parse %s"
-msgstr "opdatering af %s mislykkedes"
+msgstr "afkodning af %s mislykkedes"
 
 #: ../IkiWiki/Setup/Automator.pm:34
 msgid "you must enter a wikiname (that contains alphanumerics)"
@@ -1161,31 +1141,27 @@ msgstr "opsætning af depotet med ikiwiki-makerepo mislykkedes"
 msgid "** Disabling plugin %s, since it is failing with this message:"
 msgstr "** Deaktiverer udvidelse %s, da den fejler med denne besked:"
 
-#: ../IkiWiki/Wrapper.pm:12
-msgid "generating wrappers.."
-msgstr "bygger wrappers.."
-
-#: ../IkiWiki/Wrapper.pm:36
+#: ../IkiWiki/Wrapper.pm:16
 #, perl-format
 msgid "%s doesn't seem to be executable"
 msgstr "%s ser ikke ud til at kunne afvikles"
 
-#: ../IkiWiki/Wrapper.pm:40
+#: ../IkiWiki/Wrapper.pm:20
 msgid "cannot create a wrapper that uses a setup file"
 msgstr "kan ikke oprette en wrapper som bruger en opsætningsfil"
 
-#: ../IkiWiki/Wrapper.pm:44
+#: ../IkiWiki/Wrapper.pm:24
 msgid "wrapper filename not specified"
 msgstr "wrapper-navn ikke angivet"
 
 #. translators: The parameter is a C filename.
-#: ../IkiWiki/Wrapper.pm:218
+#: ../IkiWiki/Wrapper.pm:160
 #, perl-format
 msgid "failed to compile %s"
 msgstr "kompilering af %s mislykkedes"
 
 #. translators: The parameter is a filename.
-#: ../IkiWiki/Wrapper.pm:238
+#: ../IkiWiki/Wrapper.pm:180
 #, perl-format
 msgid "successfully generated %s"
 msgstr "Korrekt bygget %s"
@@ -1198,20 +1174,23 @@ msgstr "brug: ikiwiki [valg] kilde mål"
 msgid "       ikiwiki --setup configfile"
 msgstr "       ikiwiki --setup opsætningsfil"
 
-#: ../ikiwiki.in:105
+#: ../ikiwiki.in:96
 msgid "usage: --set var=value"
 msgstr "brug: --set var=værdi"
 
-#: ../ikiwiki.in:112
-#, fuzzy
+#: ../ikiwiki.in:103
 msgid "usage: --set-yaml var=value"
-msgstr "brug: --set var=værdi"
+msgstr "brug: --set-yaml var=værdi"
 
-#: ../ikiwiki.in:218
+#: ../ikiwiki.in:157
+msgid "generating wrappers.."
+msgstr "bygger wrappers.."
+
+#: ../ikiwiki.in:220
 msgid "rebuilding wiki.."
 msgstr "genopbygger wiki..."
 
-#: ../ikiwiki.in:221
+#: ../ikiwiki.in:223
 msgid "refreshing wiki.."
 msgstr "genopfrisker wiki..."
 
@@ -1219,40 +1198,40 @@ msgstr "genopfrisker wiki..."
 msgid "Discussion"
 msgstr "Diskussion"
 
-#: ../IkiWiki.pm:538
+#: ../IkiWiki.pm:531
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr "Skal angive url til wiki med --url når der bruges --cgi"
 
-#: ../IkiWiki.pm:584
+#: ../IkiWiki.pm:577
 msgid "cannot use multiple rcs plugins"
 msgstr "kan ikke bruge flere samtidige RCS-udvidelser"
 
-#: ../IkiWiki.pm:614
+#: ../IkiWiki.pm:606
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 "indlæsning af ekstern udvidelse krævet af udvidelsen %s mislykkedes: %s"
 
-#: ../IkiWiki.pm:1352
+#: ../IkiWiki.pm:1298
 #, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "forudberegningssløkke fundet på %s ved dybde %i"
 
-#: ../IkiWiki.pm:2053
+#: ../IkiWiki.pm:1984
 msgid "yes"
 msgstr "ja"
 
-#: ../IkiWiki.pm:2130
-#, fuzzy, perl-format
+#: ../IkiWiki.pm:2061
+#, perl-format
 msgid "invalid sort type %s"
-msgstr "ukendt sorteringsform %s"
+msgstr "forkert sorteringstype %s"
 
-#: ../IkiWiki.pm:2151
+#: ../IkiWiki.pm:2082
 #, perl-format
 msgid "unknown sort type %s"
 msgstr "ukendt sorteringsform %s"
 
-#: ../IkiWiki.pm:2287
+#: ../IkiWiki.pm:2218
 #, perl-format
 msgid "cannot match pages: %s"
 msgstr "kan ikke få sider til at passe sammen: %s"
@@ -1276,36 +1255,3 @@ msgstr "Hvilken bruger (wiki konto eller openid) skal være administrator?"
 #: ../auto.setup:24
 msgid "What is the domain name of the web server?"
 msgstr "Hvad er webserverens domænenavn?"
-
-#~ msgid "You need to log in first."
-#~ msgstr "Du skal først logge på."
-
-#~ msgid "Log in with"
-#~ msgstr "Log på med"
-
-#~ msgid "Get an OpenID"
-#~ msgstr "Skaf en OpenID"
-
-#~ msgid "failed to process"
-#~ msgstr "dannelsen mislykkedes"
-
-#~ msgid "nonexistant template %s"
-#~ msgstr "ikke-eksisterende skabelon: %s"
-
-#~ msgid "getctime not implemented"
-#~ msgstr "getctime ikke implementeret"
-
-#~ msgid "Sort::Naturally needed for title_natural sort"
-#~ msgstr "Sort::Naturally krævet for title_natural sortering"
-
-#~ msgid "failed to read %s"
-#~ msgstr "læsning af %s mislykkedes"
-
-#~ msgid "Failed to parse url, cannot determine domain name"
-#~ msgstr "Tolkning af URL mislykkedes, kan ikke afgøre domænenavn"
-
-#~ msgid "code includes disallowed latex commands"
-#~ msgstr "kode indeholder ikke-tilladte latec-kommandoer"
-
-#~ msgid "discussion"
-#~ msgstr "diskussion"

diff --git a/t/pagespec_match.t b/t/pagespec_match.t
index 97bcc969c4068a958024658dc90f1801304dd2fd..c14f6d052e80a248fab724ab6fce1a2ac65d5a62 100755 (executable)
--- a/t/pagespec_match.t
+++ b/t/pagespec_match.t
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 use warnings;
 use strict;
-use Test::More tests => 85;
+use Test::More tests => 86;
 
 BEGIN { use_ok("IkiWiki"); }
 
@@ -82,6 +82,7 @@ ok(! pagespec_match("foo.png", "page(foo*)"), "page() fails on non-page glob");
 ok(pagespec_match("foo", "page(foo)"), "page() glob");
 ok(pagespec_match("foo", "page(f*)"), "page() glob fail");
 ok(pagespec_match("foo", "link(bar)"), "link");
+ok(pagespec_match("foo", "link(.)", location => "bar"), "link with .");
 ok(pagespec_match("foo", "link(ba?)"), "glob link");
 ok(! pagespec_match("foo", "link(quux)"), "failed link");
 ok(! pagespec_match("foo", "link(qu*)"), "failed glob link");