From: intrigeri Date: Wed, 3 Dec 2008 09:44:20 +0000 (+0100) Subject: Merge commit 'upstream/master' into pub/master X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/2c19ce29ee915b0646a7676771902bd3933c5650?hp=0d3a41e39d35fc6f1b5edcffc674e1be40b85619 Merge commit 'upstream/master' into pub/master --- diff --git a/debian/changelog b/debian/changelog index 649dfeb0a..8d2b6661f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,7 @@ ikiwiki (2.71) UNRELEASED; urgency=low * Spanish translation update from Victor Moral. * Fix handling of wrappergroup option. * Correct --dumpsetup to include the srcdir in the setup file. + * German translation update from Kai Wasserbäch. Closes: #507056 -- Joey Hess Mon, 17 Nov 2008 14:02:10 -0500 diff --git a/doc/bugs/Spaces_in_link_text_for_ikiwiki_links.mdwn b/doc/bugs/Spaces_in_link_text_for_ikiwiki_links.mdwn index f6dbacad7..8aea5cd29 100644 --- a/doc/bugs/Spaces_in_link_text_for_ikiwiki_links.mdwn +++ b/doc/bugs/Spaces_in_link_text_for_ikiwiki_links.mdwn @@ -44,7 +44,7 @@ reported in [[index/discussion#index11h1]]. >> >> If there was ever a future, syntax-breaking major release of ikiwiki >> (similar to python3000) I'd like to see this fixed as part of that. ->> --[[JonDowland]] +>> --[[users/Jon]] >>> You can enable `prefix_directives` and get the disambiguated behavior >>> and spaces in wikilinks today. It will become the default in 3.0. diff --git a/doc/bugs/inline_sort_order_and_meta_date_value.mdwn b/doc/bugs/inline_sort_order_and_meta_date_value.mdwn new file mode 100644 index 000000000..e8befe8d5 --- /dev/null +++ b/doc/bugs/inline_sort_order_and_meta_date_value.mdwn @@ -0,0 +1,28 @@ +I have a directory containing two files. f1 () has + + meta date="2008-07-02 14:13:17" + +f2 () has + + meta date="2008-07-02 21:04:21" + +They have both been modified recently: + + >>> stat(f1) + (33188, 459250L, 65027L, 1, 1000, 1000, 1686L, 1227967177, 1227966706, 1227966706) + >>> stat(f2) + (33188, 458868L, 65027L, 1, 1000, 1000, 938L, 1227967187, 1227966705, 1227966705) + +Note that f1 is fractionally newer than f2 in terms of ctime and mtime, but f2 is much newer in terms of the meta information. + +Another page includes them both via inline: + + inline pages="blog/*" show=5 + +The resulting page is rendered with f1 above f2, seemingly not using the meta directive information: . The footer in the inline pages does use the correct time e.g. Posted Wed 02 Jul 2008 14:13:17 BST. + +If I instead include them using creation_year in the pagespec, they are ordered correctly. + + contains the src used to reproduce this, the precise ikiwiki invocation (inside Makefile) and the results (dest). + +-- [[users/Jon]] diff --git a/doc/bugs/lockedit_plugin_should_alert_user_about_an_invalid_pagespec_in_preferences.mdwn b/doc/bugs/lockedit_plugin_should_alert_user_about_an_invalid_pagespec_in_preferences.mdwn index c835d9f98..b8023ce87 100644 --- a/doc/bugs/lockedit_plugin_should_alert_user_about_an_invalid_pagespec_in_preferences.mdwn +++ b/doc/bugs/lockedit_plugin_should_alert_user_about_an_invalid_pagespec_in_preferences.mdwn @@ -1,4 +1,4 @@ -[[plugins/lockedit]] adds the form fields for a [[pagespec]] to preferences. This pagespec should be supplied "raw"; i.e., without quotes around it. Inexperienced users (such as [[myself|jondowland]]) may provide an invalid pagespec, such as one with quotes on it. This will be merrily accepted by the form, but will cause no locking to take place. +[[plugins/lockedit]] adds the form fields for a [[pagespec]] to preferences. This pagespec should be supplied "raw"; i.e., without quotes around it. Inexperienced users (such as [[myself|users/jon]]) may provide an invalid pagespec, such as one with quotes on it. This will be merrily accepted by the form, but will cause no locking to take place. Perhaps some validation should be performed on the pagespec and the form-submission return include "warning: this pagespec is invalid" or "warning: this pagespec does not match any existing pages" or similar. @@ -15,3 +15,7 @@ Perhaps some validation should be performed on the pagespec and the form-submiss > There are small classes of invalid pagespecs. For example, `(foo or bar` > is invalid due to having unbalanced parens, while `foo or and bar` > has invalid syntax. It's possible to detect these, I guess ... --[[Joey]] + +>> Having moved it to the .setup file makes things more obvious I think. +>> Anyway I consider this [[done]], please de-done this if you disagree. +>> --[[Jon]] diff --git a/doc/bugs/markdown_bug:_email_escaping_and_plus_addresses.mdwn b/doc/bugs/markdown_bug:_email_escaping_and_plus_addresses.mdwn index 5c04dce03..6fccc5c86 100644 --- a/doc/bugs/markdown_bug:_email_escaping_and_plus_addresses.mdwn +++ b/doc/bugs/markdown_bug:_email_escaping_and_plus_addresses.mdwn @@ -8,7 +8,7 @@ compare: It seems putting a '+' in there throws it. Maybe it's a markdown bug, or maybe the obfuscation markdown applies to email-links is being caught by the HTML sanitizer. - -- [[JonDowland]] + -- [[users/Jon]] > It's a markdown bug. For some reason, markdown doesn't recognize the email with a '+' as an email: > diff --git a/doc/bugs/output_of_successful_rename_should_list_the_full_path_to_affected_pages.mdwn b/doc/bugs/output_of_successful_rename_should_list_the_full_path_to_affected_pages.mdwn new file mode 100644 index 000000000..2d9677e7f --- /dev/null +++ b/doc/bugs/output_of_successful_rename_should_list_the_full_path_to_affected_pages.mdwn @@ -0,0 +1,12 @@ +I've just renamed a page and received the following as a result: + +

+Successfully renamed users/jondowland.mdwn to users/jon.mdwn. +

+

+ +The following pages have been automatically modified to update their links to users/jon.mdwn: +

... + +In this situation I think the link to pages should be expanded to show the entire path, since there is quite likely to be a lot of things like "discussion". -- [[users/Jon]] diff --git a/doc/bugs/textile_plugin_dies_if_input_has_a_non-utf8_character.mdwn b/doc/bugs/textile_plugin_dies_if_input_has_a_non-utf8_character.mdwn index 7ec1edc4e..bdd07210e 100644 --- a/doc/bugs/textile_plugin_dies_if_input_has_a_non-utf8_character.mdwn +++ b/doc/bugs/textile_plugin_dies_if_input_has_a_non-utf8_character.mdwn @@ -9,6 +9,6 @@ The first two complaints happen if textile is not loaded, the third fatal one ha 0x92 is "single quote" in the evil windows default codepage. It would be nice to handle this gracefully and not abort ikiwiki at this point, or alternatively, die fatally but mention which input page caused the error. -Interestingly enough, in my case, the input file has several other bad windows characters (0xFC, u-umlaut) which have not caused ikiwiki to abort. ikiwiki version 2.50. -- [[JonDowland]] +Interestingly enough, in my case, the input file has several other bad windows characters (0xFC, u-umlaut) which have not caused ikiwiki to abort. ikiwiki version 2.50. -- [[users/Jon]] > Fixed in git. [[done]] --[[Joey]] diff --git a/doc/forum/discussion.mdwn b/doc/forum/discussion.mdwn index 1e55d3f57..93cf4656e 100644 --- a/doc/forum/discussion.mdwn +++ b/doc/forum/discussion.mdwn @@ -1,4 +1,4 @@ -I like the idea of this forum heirarchy -- but I think a map would be clearer than inlining the sub-pages. -- [[JonDowland]] +I like the idea of this forum heirarchy -- but I think a map would be clearer than inlining the sub-pages. -- [[users/Jon]] > The easier way to accomplish this is to set archive=yes in the inline. > Switching to archive view can be useful when there are a lot of long diff --git a/doc/ikiwiki/directive/tag.mdwn b/doc/ikiwiki/directive/tag.mdwn index 267aee660..64736f8cd 100644 --- a/doc/ikiwiki/directive/tag.mdwn +++ b/doc/ikiwiki/directive/tag.mdwn @@ -21,6 +21,10 @@ located under a base directory, such as "tags/". This is a useful way to avoid having to write the full path to tags, if you want to keep them grouped together out of the way. +Bear in mind that specifying a tagbase means you will need to incorporate it +into the `link()` [[ikiwiki/PageSpec]] you use: e.g., if your tagbase is +`tag`, you would match pages tagged "foo" with `link(tag/foo)`. + If you want to override the tagbase for a particular tag, you can use something like this: diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn index 7d8e41826..263e8583a 100644 --- a/doc/ikiwikiusers.mdwn +++ b/doc/ikiwikiusers.mdwn @@ -101,7 +101,7 @@ Personal sites and blogs * [Olivier Berger's professional homepage](http://www-public.it-sudparis.eu/~berger_o/) * [Andrey Tarantsov's homepage](http://www.tarantsov.com/) * [Don Marti's blog](http://zgp.org/~dmarti/) -* [[JonDowland]]'s [homepage](http://jmtd.net/) +* [[users/Jon]]'s [homepage](http://jmtd.net/) * [[xma]] is using ikiwiki () * [[JanWalzer|jwalzer]]'s [homepage](http://wa.lzer.net/) -- Work in Progress * [[Adam_Trickett|ajt]]'s home intranet/sanbox system ([Internet site & blog](http://www.iredale.net/) -- not ikiwiki yet) diff --git a/doc/install/discussion.mdwn b/doc/install/discussion.mdwn index 2b88f6e66..b5757070f 100644 --- a/doc/install/discussion.mdwn +++ b/doc/install/discussion.mdwn @@ -172,9 +172,9 @@ Not sure how to provide proper version information for you.--[[vibrog]] --- -I've tried a couple of times and my cpan has never recognised Bundle::IkiWiki. Is that section of the page still accurate? -- [[JonDowland]] +I've tried a couple of times and my cpan has never recognised Bundle::IkiWiki. Is that section of the page still accurate? -- [[users/Jon]] > Are you running perl with the environemnt settings specified on the page? > Can you show how it fails to find the bundle? --[[Joey]] ->> I was not. Next time I build I will have to try that (I'll need to tweak it as I already override PERL5LIB; also I need to specify http proxies). Thanks for your help! -- [[JonDowland]] +>> I was not. Next time I build I will have to try that (I'll need to tweak it as I already override PERL5LIB; also I need to specify http proxies). Thanks for your help! -- [[users/Jon]] diff --git a/doc/news/openid/discussion.mdwn b/doc/news/openid/discussion.mdwn index 3d5e9dc22..aa9f3f0be 100644 --- a/doc/news/openid/discussion.mdwn +++ b/doc/news/openid/discussion.mdwn @@ -42,7 +42,7 @@ only Apache/iptables rules for this? Maybe it's related to > Error: /srv/web/ikiwiki.info/todo/Configurable_minimum_length_of_log_message_for_web_edits/index.html independently created, not overwriting with version from todo/Configurable_minimum_length_of_log_message_for_web_edits -[[jondowland]] +[[users/jon]] ---- diff --git a/doc/plugins/write/discussion.mdwn b/doc/plugins/write/discussion.mdwn index 9a36d7b0b..24a556ffe 100644 --- a/doc/plugins/write/discussion.mdwn +++ b/doc/plugins/write/discussion.mdwn @@ -43,4 +43,4 @@ distributed wiki. --- -I would find this page clearer split up into sub-pages. Does anyone agree/disagree? -- [[JonDowland]] +I would find this page clearer split up into sub-pages. Does anyone agree/disagree? -- [[users/Jon]] diff --git a/doc/sandbox/castle/discussion/jon_tests_too.mdwn b/doc/sandbox/castle/discussion/jon_tests_too.mdwn index 864f38c0d..bc051b008 100644 --- a/doc/sandbox/castle/discussion/jon_tests_too.mdwn +++ b/doc/sandbox/castle/discussion/jon_tests_too.mdwn @@ -1,3 +1,3 @@ -I recall testing this too, but I'm not sure where the test went. Let's try again. -- [[JonDowland]] +I recall testing this too, but I'm not sure where the test went. Let's try again. -- [[users/Jon]] Context: [[todo/discussion_page_as_blog/discussion/castle]] diff --git a/doc/setup/discussion.mdwn b/doc/setup/discussion.mdwn index ba74c5771..3ec123eb5 100644 --- a/doc/setup/discussion.mdwn +++ b/doc/setup/discussion.mdwn @@ -145,3 +145,7 @@ How do I set up cgi editing? In setup I have: * cgi_wrapper => 'edit.cgi' But I don't get an edit link on my pages? What am I doing wrong? + +> Assuming you don't have the editpage plugin disabled, all you should need +> to so is re-run `ikiwiki -setup` with the above config and it should +> rebuild your wiki and add the edit links to pages. --[[Joey]] diff --git a/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn b/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn index 6e5f1668a..0a332f8ba 100644 --- a/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn +++ b/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn @@ -11,4 +11,7 @@ there are some variations on the approach that might be useful: Also, some detail on converting mediawiki transclusion to ikiwiki inlines... --- [[JonDowland]] +-- [[users/Jon]] + +> "Who knows, the remote site might disappear.". Right now, it appears to +> have done just that. -- [[users/Jon]] diff --git a/doc/tips/inside_dot_ikiwiki/discussion.mdwn b/doc/tips/inside_dot_ikiwiki/discussion.mdwn index c05e7a3e0..8ff3ad552 100644 --- a/doc/tips/inside_dot_ikiwiki/discussion.mdwn +++ b/doc/tips/inside_dot_ikiwiki/discussion.mdwn @@ -16,3 +16,47 @@ No idea how this happened. I've blown it away and recreated it but, for future >>> --getctime does. --[[Joey]] >> Alas, I seem to have lost the bad index file to periodic /tmp wiping; I'll send it to you if it happens again. --[[sabr]] + + + +## Lost password for an user + +This morning, a person has lost its password. I was able to do something to make another password. This is the way I take : + +### Locate the user database + +As tips show us, the user database is in the source file, for an example : + + src/.ikiwiki/userdb + +### See which user to modify + +Because I don't know the real login of the user, I have to read all the database : + + perl -le 'use Storable; my $index=Storable::retrieve("userdb"); use Data::Dumper; print Dumper $index' + +Then I was able to find this : + + 'Utilisateur' => { + 'email' => 'user@pl.fr', + 'cryptresettoken' => '$2a$10$cfVeOoVbFw9VzMlgEbPMsu34pwHIFP84mWlkrs2RCKknZYPZkPffm', + 'password' => '', + 'resettoken' => '', + 'cryptpassword' => '$2a$10$H8bYq.dlb68wpnfJgVZQhOdsF9JQ06cteRfhPQPB5eHKnD5Y3u7au', + 'regdate' => '1226574052' + }, + +Let's have a look to modify lines. + +### Modify the line + +When you have found the line to modify, take the user name, and change its password to **sc** (for an example) : + + perl -le 'use Storable; my $userinfo=Storable::retrieve("userdb"); $userinfo->{"Utilisateur"}->{cryptpassword}=q{$2a$10$7viOHCrUkdAVL135Kr6one1mpZQ/FWYC773G1yZ0EtQciI11sSDRS}; Storable::lock_nstore($userinfo, "userdb")' + perl -le 'use Storable; my $userinfo=Storable::retrieve("userdb"); $userinfo->{"Utilisateur"}->{cryptresettoken}=q{}; Storable::lock_nstore($userinfo, "userdb")' + +Because I don't know how suppress cryptresettoken and resettoken fields, I change their content with *null*. + +After all these modifications, the user *Utilisateur* could connect to its account with the password **sc**, and go to Preferences, then change its password. + + diff --git a/doc/tips/untrusted_git_push/discussion.mdwn b/doc/tips/untrusted_git_push/discussion.mdwn index e85625a1b..d95c01ecf 100644 --- a/doc/tips/untrusted_git_push/discussion.mdwn +++ b/doc/tips/untrusted_git_push/discussion.mdwn @@ -24,10 +24,10 @@ Note that the user for the commit is 'jon', and the link points at cgi to create users/jon. I was wondering if that is configurable for users pushing via git. It would be nice perhaps to specify it in some way, perhaps via a git-config setting (user.name?). I'm not too familiar with exactly what the -changeset contains. -- [[JonDowland]] +changeset contains. -- [[users/Jon]] > All ikiwiki can do it look at who git has recorded as the author of > the change (and it looks at the username part of the email address). > You can set `user.email` in `.git/config`. --[[Joey]] -> > Ah, excellent. In which case this *should* DTRT... -- [[JonDowland]] +> > Ah, excellent. In which case this *should* DTRT... -- [[users/Jon]] diff --git a/doc/tips/vim_syntax_highlighting/discussion.mdwn b/doc/tips/vim_syntax_highlighting/discussion.mdwn index 038854b9f..72cb52aab 100644 --- a/doc/tips/vim_syntax_highlighting/discussion.mdwn +++ b/doc/tips/vim_syntax_highlighting/discussion.mdwn @@ -1,4 +1,4 @@ -I'm going to look at merging this with potwiki.vim (a vim-based personal wiki) so that you can follow wiki-links and auto-create pages etc., direct from vim. (I'm writing this incase I don't get around to it) -- [[JonDowland]] +I'm going to look at merging this with potwiki.vim (a vim-based personal wiki) so that you can follow wiki-links and auto-create pages etc., direct from vim. (I'm writing this incase I don't get around to it) -- [[users/Jon]] ---- diff --git a/doc/todo/clear_page_to_delete.mdwn b/doc/todo/clear_page_to_delete.mdwn index 50ae246bb..6bab6ef27 100644 --- a/doc/todo/clear_page_to_delete.mdwn +++ b/doc/todo/clear_page_to_delete.mdwn @@ -4,7 +4,7 @@ cleared to be entirely empty (or only have whitespace)? Discuss. --[[Joey]] I'd say so; yes. A method of deleting pages via the web would be great; I can't think of a use of keeping blank pages around. What about vandalism -- if someone blanks a page and deletes it and someone else wishes to restore -it; or is undoing edits via the web a bigger issue? -- [[JonDowland]] +it; or is undoing edits via the web a bigger issue? -- [[users/Jon]] Of course there's already a way to delete pages (remove plugin). So the question is really: @@ -30,4 +30,4 @@ keyword and if there were no page editions since XX days. Here, I use pages that can be empty everyday and filled all day long. It does not make sense to me to delete these pages :). --[[xma]] -I was not aware of [[plugins/remove]]. I don't think another method is necessary -- [[JonDowland]] +I was not aware of [[plugins/remove]]. I don't think another method is necessary -- [[users/Jon]] diff --git a/doc/todo/source_link.mdwn b/doc/todo/source_link.mdwn index 93791c81a..5d6cb89e8 100644 --- a/doc/todo/source_link.mdwn +++ b/doc/todo/source_link.mdwn @@ -1,6 +1,6 @@ How about a direct link from the page header to the source of the latest version, to avoid the need to either use edit or navigate to the current version via the history link? - I'd like this too (and might try to implement it). -- [[jondowland]] + I'd like this too (and might try to implement it). -- [[users/jon]] I just implemented this. There is one [[patch]] to the default page template, and a new plugin. -- [[Will]] diff --git a/doc/todo/toc_plugin:_set_a_header_ceiling___40__opposite_of_levels__61____41__.mdwn b/doc/todo/toc_plugin:_set_a_header_ceiling___40__opposite_of_levels__61____41__.mdwn new file mode 100644 index 000000000..547c7a80a --- /dev/null +++ b/doc/todo/toc_plugin:_set_a_header_ceiling___40__opposite_of_levels__61____41__.mdwn @@ -0,0 +1,3 @@ +It would be nice if the [[plugins/toc]] plugin let you specify a header level "ceiling" above which (or above and including which) the headers would not be incorporated into the toc. + +Currently, the levels=X parameter lets you tweak how deep it will go for small headers, but I'd like to chop off the h1's (as I use them for my page title) -- [[Jon]] diff --git a/doc/users/jon.mdwn b/doc/users/jon.mdwn new file mode 100644 index 000000000..72f04e593 --- /dev/null +++ b/doc/users/jon.mdwn @@ -0,0 +1,15 @@ +I'm looking at ikiwiki both for my personal site but also as a +team-documentation management system for a small-sized group of UNIX +sysadmins. + +* my edits should appear either as 'Jon' (if I've used + [[tips/untrusted_git_push]]) or 'alcopop.org/me/openid/'. +* My [homepage](http://jmtd.net/) is powered by ikiwiki (replacing my [older homepage](http://alcopop.org/), which was a mess of scripts) + +I gave a talk at the [UK UNIX User's Group](http://www.ukuug.org/) annual +[Linux conference](http://www.ukuug.org/events/linux2008/) about organising +system administrator documentation. Roughly a third of this talk was +discussing IkiWiki in some technical detail and suggesting it as a good piece +of software for this task. + + * slides at . diff --git a/doc/users/jondowland.mdwn b/doc/users/jondowland.mdwn deleted file mode 100644 index 8bfa3dd76..000000000 --- a/doc/users/jondowland.mdwn +++ /dev/null @@ -1,13 +0,0 @@ -I'm looking at ikiwiki both for my personal site but also as a -team-documentation management system for a small-sized group of UNIX -sysadmins. - -* My [homepage](http://jmtd.net/) is powered by ikiwiki (replacing my [older homepage](http://alcopop.org/), which was a mess of scripts) - -I gave a talk at the [UK UNIX User's Group](http://www.ukuug.org/) annual -[Linux conference](http://www.ukuug.org/events/linux2008/) about organising -system administrator documentation. Roughly a third of this talk was -discussing IkiWiki in some technical detail and suggesting it as a good piece -of software for this task. - - * slides at . diff --git a/po/de.po b/po/de.po index 022fbfef1..55234a909 100644 --- a/po/de.po +++ b/po/de.po @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: ikiwiki 2.40\n" -"Report-Msgid-Bugs-To: \n" +"Project-Id-Version: ikiwiki 2.70\n" +"Report-Msgid-Bugs-To: ikiwiki@packages.debian.org\n" "POT-Creation-Date: 2008-10-31 16:37-0400\n" -"PO-Revision-Date: 2008-03-03 21:22+0100\n" +"PO-Revision-Date: 2008-11-20 19:58+0100\n" "Last-Translator: Kai Wasserbäch \n" "Language-Team: German \n" "MIME-Version: 1.0\n" @@ -25,7 +25,7 @@ msgstr "" #: ../IkiWiki/CGI.pm:163 ../IkiWiki/Plugin/editpage.pm:350 msgid "Your login session has expired." -msgstr "" +msgstr "Ihre Anmeldung für die aktuelle Sitzung ist abgelaufen." #: ../IkiWiki/CGI.pm:184 msgid "Login" @@ -53,11 +53,11 @@ msgstr "Fehler" #: ../IkiWiki/Plugin/aggregate.pm:80 msgid "Aggregation triggered via web." -msgstr "" +msgstr "Feed-Erstellung wurde über das Web ausgelöst." #: ../IkiWiki/Plugin/aggregate.pm:89 msgid "Nothing to do right now, all feeds are up-to-date!" -msgstr "" +msgstr "Derzeit nichts zu tun, alle Feeds sind auf dem neusten Stand!" #: ../IkiWiki/Plugin/aggregate.pm:216 #, perl-format @@ -89,7 +89,7 @@ msgstr "%s läuft aus" #: ../IkiWiki/Plugin/aggregate.pm:463 #, perl-format msgid "last checked %s" -msgstr "" +msgstr "zuletzt überprüft am %s" #: ../IkiWiki/Plugin/aggregate.pm:467 #, perl-format @@ -108,12 +108,12 @@ msgstr "Feed nicht gefunden" #: ../IkiWiki/Plugin/aggregate.pm:498 #, perl-format msgid "(invalid UTF-8 stripped from feed)" -msgstr "(ungültiges UTF-8 wurde aus dem Feed entfernt)" +msgstr "(ungültiges UTF-8-Zeichen wurde aus dem Feed entfernt)" #: ../IkiWiki/Plugin/aggregate.pm:504 #, perl-format msgid "(feed entities escaped)" -msgstr "(Feedentitäten maskiert)" +msgstr "(Feed-Entitäten maskiert)" #: ../IkiWiki/Plugin/aggregate.pm:510 msgid "feed crashed XML::Feed!" @@ -126,7 +126,7 @@ msgstr "erstelle neue Seite %s" #: ../IkiWiki/Plugin/amazon_s3.pm:31 msgid "deleting bucket.." -msgstr "" +msgstr "Lösche Bucket..." #: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:206 msgid "done" @@ -135,42 +135,40 @@ msgstr "fertig" #: ../IkiWiki/Plugin/amazon_s3.pm:97 #, perl-format msgid "Must specify %s" -msgstr "" +msgstr "%s muss angegeben werden" #: ../IkiWiki/Plugin/amazon_s3.pm:136 msgid "Failed to create bucket in S3: " -msgstr "" +msgstr "Konnte keinen Bucket in S3 erstellen: " #: ../IkiWiki/Plugin/amazon_s3.pm:221 -#, fuzzy msgid "Failed to save file to S3: " -msgstr "Es konnte keine E-Mail versandt werden" +msgstr "Konnte Datei nicht bei S3 speichern: " #: ../IkiWiki/Plugin/amazon_s3.pm:243 -#, fuzzy msgid "Failed to delete file from S3: " -msgstr "konnte kein Bild aus dem Code erzeugen" +msgstr "Konnte Datei nicht bei S3 löschen: " #: ../IkiWiki/Plugin/attachment.pm:49 #, perl-format msgid "there is already a page named %s" -msgstr "" +msgstr "eine Seite mit dem Namen %s existiert bereits" #: ../IkiWiki/Plugin/attachment.pm:82 msgid "prohibited by allowed_attachments" -msgstr "" +msgstr "durch allowed_attachements verboten" #: ../IkiWiki/Plugin/attachment.pm:190 msgid "bad attachment filename" -msgstr "" +msgstr "fehlerhafter Dateiname für Anhang" #: ../IkiWiki/Plugin/attachment.pm:232 msgid "attachment upload" -msgstr "" +msgstr "Anhang hochladen" #: ../IkiWiki/Plugin/autoindex.pm:105 msgid "automatic index generation" -msgstr "" +msgstr "automatische Index-Erstellung" #: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:261 #: ../IkiWiki/Plugin/inline.pm:327 ../IkiWiki/Plugin/opendiscussion.pm:26 @@ -197,21 +195,21 @@ msgstr "der Parameter %s wird benötigt" #: ../IkiWiki/Plugin/cutpaste.pm:66 msgid "no text was copied in this page" -msgstr "" +msgstr "es wurde kein Text in diese Seite kopiert" #: ../IkiWiki/Plugin/cutpaste.pm:69 #, perl-format msgid "no text was copied in this page with id %s" -msgstr "" +msgstr "es wurde kein Text in die Seite mit der ID %s kopiert" #: ../IkiWiki/Plugin/editpage.pm:40 -#, fuzzy, perl-format +#, perl-format msgid "removing old preview %s" -msgstr "entferne alte Seite %s" +msgstr "entferne alte Vorschau %s" #: ../IkiWiki/Plugin/editpage.pm:125 msgid "bad page name" -msgstr "" +msgstr "fehlerhafter Seitenname" #: ../IkiWiki/Plugin/editpage.pm:141 #, perl-format @@ -249,12 +247,12 @@ msgstr "Bearbeitung fehlgeschlagen" #: ../IkiWiki/Plugin/format.pm:22 msgid "must specify format and text" -msgstr "" +msgstr "Format und Text muss spezifiziert werden" #: ../IkiWiki/Plugin/format.pm:25 #, perl-format msgid "unsupported page format %s" -msgstr "" +msgstr "nicht unterstütztes Seitenformat %s" #: ../IkiWiki/Plugin/fortune.pm:27 msgid "fortune failed" @@ -264,25 +262,26 @@ msgstr "»fortune« fehlgeschlagen" #: ../IkiWiki/Receive.pm:129 #, perl-format msgid "you are not allowed to change %s" -msgstr "" +msgstr "es ist Ihnen nicht erlaubt, %s zu ändern" #: ../IkiWiki/Plugin/git.pm:658 #, perl-format msgid "you cannot act on a file with mode %s" -msgstr "" +msgstr "Sie können Dateien mit den Zugriffsrechten %s nicht verändern" #: ../IkiWiki/Plugin/git.pm:662 msgid "you are not allowed to change file modes" -msgstr "" +msgstr "Es ist Ihnen nicht erlaubt, Dateizugriffsrechte zu ändern" #: ../IkiWiki/Plugin/google.pm:27 -#, fuzzy, perl-format +#, perl-format msgid "Must specify %s when using the google search plugin" -msgstr "%s muss angegeben werden, wenn die Sucherweiterung verwandt wird" +msgstr "%s muss angegeben werden, wenn die Google-Sucherweiterung verwandt wird" #: ../IkiWiki/Plugin/google.pm:31 msgid "Failed to parse url, cannot determine domain name" msgstr "" +"Verarbeiten der URL fehlgeschlagen, konnte Domainnamen nicht feststellen" #: ../IkiWiki/Plugin/googlecalendar.pm:32 msgid "failed to find url in html" @@ -297,14 +296,13 @@ msgid "prog not a valid graphviz program" msgstr "prog ist kein gültiges graphviz-Programm" #: ../IkiWiki/Plugin/img.pm:62 -#, fuzzy msgid "Image::Magick is not installed" -msgstr "polygen ist nicht installiert" +msgstr "Image::Magick ist nicht installiert" #: ../IkiWiki/Plugin/img.pm:69 #, perl-format msgid "bad size \"%s\"" -msgstr "falsche Größe \"%s\"" +msgstr "falsche Größe »%s«" #: ../IkiWiki/Plugin/img.pm:80 ../IkiWiki/Plugin/img.pm:84 #: ../IkiWiki/Plugin/img.pm:101 @@ -329,14 +327,12 @@ msgstr "" "genutzt wird" #: ../IkiWiki/Plugin/inline.pm:139 -#, fuzzy msgid "page editing not allowed" -msgstr "Zyklische Umleitungen sind nicht erlaubt" +msgstr "Seitenbearbeitungen sind nicht erlaubt" #: ../IkiWiki/Plugin/inline.pm:156 -#, fuzzy msgid "missing pages parameter" -msgstr "Parameter %s fehlt" +msgstr "Fehlender Seitenparameter" #: ../IkiWiki/Plugin/inline.pm:204 #, perl-format @@ -358,26 +354,27 @@ msgstr "Diskussion" #: ../IkiWiki/Plugin/inline.pm:572 msgid "RPC::XML::Client not found, not pinging" -msgstr "RPC::XML::Client nicht gefunden, pinge nicht" +msgstr "RPC::XML::Client nicht gefunden, führe Ping nicht aus" #: ../IkiWiki/Plugin/linkmap.pm:106 msgid "failed to run dot" msgstr "dot konnte nicht ausgeführt werden" #: ../IkiWiki/Plugin/lockedit.pm:49 ../IkiWiki/Plugin/lockedit.pm:66 -#, fuzzy, perl-format +#, perl-format msgid "%s is locked and cannot be edited" -msgstr "%s wurde von %s gesperrt und kann nicht bearbeitet werden" +msgstr "%s wurde gesperrt und kann nicht bearbeitet werden" #: ../IkiWiki/Plugin/mdwn.pm:44 msgid "multimarkdown is enabled, but Text::MultiMarkdown is not installed" msgstr "" +"»multimarkdown« ist aktiviert, aber Text::MultiMarkdown ist nicht installiert" #: ../IkiWiki/Plugin/mdwn.pm:67 #, perl-format msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)" msgstr "" -"Laden des des Perl-Moduls »Markdown.pm« (%s) oder von »/usr/bin/markdown« (%s) " +"Laden des Perl-Moduls »Markdown.pm« (%s) oder »/usr/bin/markdown« (%s) " "fehlgeschlagen" #: ../IkiWiki/Plugin/meta.pm:150 @@ -435,6 +432,8 @@ msgstr "Konto konnte nicht erstellt werden." #: ../IkiWiki/Plugin/passwordauth.pm:257 msgid "No email address, so cannot email password reset instructions." msgstr "" +"Keine E-Mail-Adresse angegeben; deshalb können keine Anweisungen zum " +"Zurücksetzen des Passworts via E-Mail versandt werden." #: ../IkiWiki/Plugin/passwordauth.pm:291 msgid "Failed to send mail" @@ -442,38 +441,37 @@ msgstr "Es konnte keine E-Mail versandt werden" #: ../IkiWiki/Plugin/passwordauth.pm:293 msgid "You have been mailed password reset instructions." -msgstr "" +msgstr "Ihnen wurden Anweisungen zum Zurücksetzen des Passworts zugesandt." #: ../IkiWiki/Plugin/passwordauth.pm:328 msgid "incorrect password reset url" -msgstr "" +msgstr "Fehlerhafte URL zum Zurücksetzen des Passworts" #: ../IkiWiki/Plugin/passwordauth.pm:331 msgid "password reset denied" -msgstr "" +msgstr "Zurücksetzen des Passworts verboten" #: ../IkiWiki/Plugin/pingee.pm:30 msgid "Ping received." -msgstr "" +msgstr "Ping empfangen." #: ../IkiWiki/Plugin/pinger.pm:53 msgid "requires 'from' and 'to' parameters" -msgstr "" +msgstr "erfordert die Parameter »from« und »to«" #: ../IkiWiki/Plugin/pinger.pm:58 -#, fuzzy, perl-format +#, perl-format msgid "Will ping %s" -msgstr "bearbeite %s" +msgstr "Werde Ping %s senden" #: ../IkiWiki/Plugin/pinger.pm:61 #, perl-format msgid "Ignoring ping directive for wiki %s (this wiki is %s)" -msgstr "" +msgstr "Ignoriere Ping-Direktiven für Wiki %s (dies ist Wiki %s)" #: ../IkiWiki/Plugin/pinger.pm:77 -#, fuzzy msgid "LWP not found, not pinging" -msgstr "RPC::XML::Client nicht gefunden, pinge nicht" +msgstr "LWP nicht gefunden, führe Ping nicht aus" #: ../IkiWiki/Plugin/poll.pm:69 msgid "vote" @@ -488,9 +486,8 @@ msgid "polygen not installed" msgstr "polygen ist nicht installiert" #: ../IkiWiki/Plugin/polygen.pm:60 -#, fuzzy msgid "command failed" -msgstr "»fortune« fehlgeschlagen" +msgstr "Befehl fehlgeschlagen" #: ../IkiWiki/Plugin/postsparkline.pm:41 msgid "missing formula" @@ -506,11 +503,11 @@ msgstr "unbekannte Formel" #. translators: %A- is the name of the previous day. #: ../IkiWiki/Plugin/prettydate.pm:15 msgid "late %A- night" -msgstr "spät am %A- in der Nacht" +msgstr "%A- spät in der Nacht" #: ../IkiWiki/Plugin/prettydate.pm:17 msgid "in the wee hours of %A- night" -msgstr "in den frühen Morgenstunden %A-" +msgstr "%A- in den frühen Morgenstunden" #: ../IkiWiki/Plugin/prettydate.pm:20 msgid "terribly early %A morning" @@ -562,16 +559,18 @@ msgstr "um Mitternacht" #: ../IkiWiki/Plugin/prettydate.pm:108 msgid "at noon on %A" -msgstr "am Nachmittag des %A" +msgstr "%A am Nachmittag" #: ../IkiWiki/Plugin/progress.pm:34 #, perl-format msgid "illegal percent value %s" -msgstr "" +msgstr "Unzulässiger Prozentwert (%s)" #: ../IkiWiki/Plugin/progress.pm:59 msgid "need either `percent` or `totalpages` and `donepages` parameters" msgstr "" +"Benötige entweder »percent«- oder »totalpages«- und " +"»donepages«-Parameter" #: ../IkiWiki/Plugin/recentchanges.pm:100 msgid "missing page" @@ -580,91 +579,91 @@ msgstr "fehlende Seite" #: ../IkiWiki/Plugin/recentchanges.pm:102 #, perl-format msgid "The page %s does not exist." -msgstr "Die Seite %s exisitiert nicht." +msgstr "Die Seite %s existiert nicht." #: ../IkiWiki/Plugin/recentchangesdiff.pm:36 msgid "(Diff truncated)" -msgstr "" +msgstr "(Diff beschnitten)" #: ../IkiWiki/Plugin/remove.pm:31 ../IkiWiki/Plugin/rename.pm:36 -#, fuzzy, perl-format +#, perl-format msgid "%s does not exist" -msgstr "Die Seite %s exisitiert nicht." +msgstr "%s existiert nicht" #: ../IkiWiki/Plugin/remove.pm:38 -#, fuzzy, perl-format +#, perl-format msgid "%s is not in the srcdir, so it cannot be deleted" -msgstr "%s wurde von %s gesperrt und kann nicht bearbeitet werden" +msgstr "%s ist nicht im Quellverzeichnis und kann deshalb nicht gelöscht werden" #: ../IkiWiki/Plugin/remove.pm:41 ../IkiWiki/Plugin/rename.pm:45 -#, fuzzy, perl-format +#, perl-format msgid "%s is not a file" -msgstr "%s ist keine bearbeitbare Seite" +msgstr "%s ist keine Datei" #: ../IkiWiki/Plugin/remove.pm:115 #, perl-format msgid "confirm removal of %s" -msgstr "" +msgstr "Bestätigen Sie die Entfernung von %s" #: ../IkiWiki/Plugin/remove.pm:152 msgid "Please select the attachments to remove." -msgstr "" +msgstr "Bitte wählen Sie die zu entfernenden Anhänge aus." #: ../IkiWiki/Plugin/remove.pm:192 msgid "removed" -msgstr "" +msgstr "entfernt" #: ../IkiWiki/Plugin/rename.pm:42 #, perl-format msgid "%s is not in the srcdir, so it cannot be renamed" msgstr "" +"%s ist nicht im Quellverzeichnis und kann deshalb nicht umbenannt werden" #: ../IkiWiki/Plugin/rename.pm:62 -#, fuzzy msgid "no change to the file name was specified" -msgstr "Dateiname des Wrappers nicht angegeben" +msgstr "Es wurde keine Änderung des Dateinames angegeben" #: ../IkiWiki/Plugin/rename.pm:68 #, perl-format msgid "illegal name" -msgstr "" +msgstr "unzulässiger Name" #: ../IkiWiki/Plugin/rename.pm:73 #, perl-format msgid "%s already exists" -msgstr "" +msgstr "%s existiert bereits" #: ../IkiWiki/Plugin/rename.pm:79 #, perl-format msgid "%s already exists on disk" -msgstr "" +msgstr "%s existiert bereits auf der Festplatte" #: ../IkiWiki/Plugin/rename.pm:101 -#, fuzzy, perl-format +#, perl-format msgid "rename %s" -msgstr "erzeuge %s" +msgstr "benenne %s um" #: ../IkiWiki/Plugin/rename.pm:138 msgid "Also rename SubPages and attachments" -msgstr "" +msgstr "Auch SubPages und Anhänge umbenennen" #: ../IkiWiki/Plugin/rename.pm:224 msgid "Only one attachment can be renamed at a time." -msgstr "" +msgstr "Es kann immer nur ein Anhang zur Zeit umbenannt werden." #: ../IkiWiki/Plugin/rename.pm:227 msgid "Please select the attachment to rename." -msgstr "" +msgstr "Bitte wählen Sie den umzubenennenden Anhang aus." #: ../IkiWiki/Plugin/rename.pm:338 #, perl-format msgid "rename %s to %s" -msgstr "" +msgstr "Benenne %s in %s um" #: ../IkiWiki/Plugin/rename.pm:490 #, perl-format msgid "update for rename of %s to %s" -msgstr "" +msgstr "Aktualisierung für Umbenennung von %s in %s" #: ../IkiWiki/Plugin/search.pm:36 #, perl-format @@ -674,15 +673,15 @@ msgstr "%s muss angegeben werden, wenn die Sucherweiterung verwandt wird" #: ../IkiWiki/Plugin/search.pm:182 #, perl-format msgid "need Digest::SHA1 to index %s" -msgstr "" +msgstr "Benötige Digest::SHA1, um %s zu indexieren" #: ../IkiWiki/Plugin/search.pm:217 msgid "search" -msgstr "" +msgstr "suchen" #: ../IkiWiki/Plugin/shortcut.pm:28 msgid "shortcut plugin will not work without a shortcuts.mdwn" -msgstr "das »shortcut«-Plugin funktioniert nicht ohne eine »shortcuts.mdwn«" +msgstr "die »shortcut«-Erweiterung funktioniert nicht ohne eine »shortcuts.mdwn«" #: ../IkiWiki/Plugin/shortcut.pm:38 msgid "missing name or url parameter" @@ -698,11 +697,11 @@ msgstr "Shortcut %s zeigt auf %s" #: ../IkiWiki/Plugin/smiley.pm:43 msgid "failed to parse any smileys" -msgstr "Smileys konnten nicht geparst werden" +msgstr "Smileys konnten nicht verarbeitet werden" #: ../IkiWiki/Plugin/sparkline.pm:72 msgid "parse error" -msgstr "Parse-Fehler" +msgstr "Verarbeitungsfehler" #: ../IkiWiki/Plugin/sparkline.pm:78 msgid "bad featurepoint diameter" @@ -751,7 +750,7 @@ msgstr "Direkter Daten-Download" #: ../IkiWiki/Plugin/table.pm:134 #, perl-format msgid "parse fail at line %d: %s" -msgstr "Parse-Fehler in Zeile %d: %s" +msgstr "Verarbeitungsfehler in Zeile %d: %s" #: ../IkiWiki/Plugin/template.pm:28 msgid "missing id parameter" @@ -780,55 +779,59 @@ msgstr "konnte kein Bild aus dem Code erzeugen" #: ../IkiWiki/Plugin/websetup.pm:89 msgid "plugin" -msgstr "" +msgstr "Erweiterung" #: ../IkiWiki/Plugin/websetup.pm:108 #, perl-format msgid "enable %s?" -msgstr "" +msgstr "%s aktivieren?" #: ../IkiWiki/Plugin/websetup.pm:236 msgid "you are not logged in as an admin" -msgstr "" +msgstr "Sie sind nicht als Administrator angemeldet" #: ../IkiWiki/Plugin/websetup.pm:240 msgid "setup file for this wiki is not known" -msgstr "" +msgstr "Die Einrichtungsdatei für dieses Wiki ist unbekannt" #: ../IkiWiki/Plugin/websetup.pm:256 -#, fuzzy msgid "main" -msgstr "Administrator" +msgstr "Hauptseite" #: ../IkiWiki/Plugin/websetup.pm:257 msgid "plugins" -msgstr "" +msgstr "Erweiterungen" #: ../IkiWiki/Plugin/websetup.pm:395 msgid "" "The configuration changes shown below require a wiki rebuild to take effect." msgstr "" +"Die unten aufgeführten Konfigurationsänderungen erfordern eine erneute " +"Erzeugung des Wikis, um aktiv zu werden." #: ../IkiWiki/Plugin/websetup.pm:399 msgid "" "For the configuration changes shown below to fully take effect, you may need " "to rebuild the wiki." msgstr "" +"Damit die unten aufgeführten Konfigurationsänderungen aktiv werden, kann es " +"erforderlich sein, das Wiki neu zu erzeugen." #: ../IkiWiki/Plugin/websetup.pm:433 #, perl-format msgid "

Error: %s exited nonzero (%s)" msgstr "" +"

Fehler: %s beendete sich mit einem Wert ungleich Null (%s)" #: ../IkiWiki/Receive.pm:35 #, perl-format msgid "cannot determine id of untrusted committer %s" -msgstr "" +msgstr "Kann ID des nicht vertrauenswürdigen Bearbeiters %s nicht feststellen" #: ../IkiWiki/Receive.pm:85 -#, fuzzy, perl-format +#, perl-format msgid "bad file name %s" -msgstr "überspringe fehlerhaften Dateinamen %s" +msgstr "fehlerhafter Dateiname %s" #: ../IkiWiki/Render.pm:253 #, perl-format @@ -836,6 +839,8 @@ msgid "" "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to " "allow this" msgstr "" +"Symbolischer Verweis im Quellverzeichnis (%s) gefunden -- setzen Sie " +"allow_symlinks_before_srcdir, um dies zu erlauben" #: ../IkiWiki/Render.pm:277 ../IkiWiki/Render.pm:302 #, perl-format @@ -845,7 +850,7 @@ msgstr "überspringe fehlerhaften Dateinamen %s" #: ../IkiWiki/Render.pm:284 #, perl-format msgid "%s has multiple possible source pages" -msgstr "" +msgstr "%s hat mehrere mögliche Quellseiten" #: ../IkiWiki/Render.pm:360 #, perl-format @@ -865,12 +870,12 @@ msgstr "erzeuge %s" #: ../IkiWiki/Render.pm:426 #, perl-format msgid "rendering %s, which links to %s" -msgstr "erzeuge %s, was auf %s verweist" +msgstr "erzeuge %s, die auf %s verweist" #: ../IkiWiki/Render.pm:447 #, perl-format msgid "rendering %s, which depends on %s" -msgstr "erzeuge %s, das von %s abhängt" +msgstr "erzeuge %s, die von %s abhängt" #: ../IkiWiki/Render.pm:486 #, perl-format @@ -897,15 +902,16 @@ msgstr "kann %s nicht lesen: %s" #: ../IkiWiki/Setup/Automator.pm:33 msgid "you must enter a wikiname (that contains alphanumerics)" msgstr "" +"Sie müssen einen Wiki-Namen eingeben (der alphanumerische Zeichen enthält)" #: ../IkiWiki/Setup/Automator.pm:67 #, perl-format msgid "unsupported revision control system %s" -msgstr "" +msgstr "Nicht unterstütztes Versionskontrollsystem %s" #: ../IkiWiki/Setup/Automator.pm:83 msgid "failed to set up the repository with ikiwiki-makerepo" -msgstr "" +msgstr "Erstellen des Depots mit ikiwiki-makerepo ist fehlgeschlagen" #: ../IkiWiki/Wrapper.pm:16 #, perl-format @@ -925,13 +931,13 @@ msgstr "Dateiname des Wrappers nicht angegeben" #: ../IkiWiki/Wrapper.pm:79 #, perl-format msgid "failed to write %s: %s" -msgstr "schreiben von %s fehlgeschlagen: %s" +msgstr "Schreiben von %s fehlgeschlagen: %s" #. translators: The parameter is a C filename. #: ../IkiWiki/Wrapper.pm:135 #, perl-format msgid "failed to compile %s" -msgstr "erzeugen von %s fehlgeschlagen" +msgstr "Erzeugen von %s fehlgeschlagen" #. translators: The parameter is a filename. #: ../IkiWiki/Wrapper.pm:155 @@ -945,7 +951,7 @@ msgstr "Benutzung: ikiwiki [Optionen] Quelle Ziel" #: ../ikiwiki.in:14 msgid " ikiwiki --setup configfile" -msgstr "" +msgstr " ikiwiki --setup Konfigurationsdatei " #: ../ikiwiki.in:90 msgid "usage: --set var=value" @@ -953,15 +959,15 @@ msgstr "Benutzung: --set Variable=Wert" #: ../ikiwiki.in:138 msgid "generating wrappers.." -msgstr "erzeuge Wrapper.." +msgstr "erzeuge Wrapper..." #: ../ikiwiki.in:195 msgid "rebuilding wiki.." -msgstr "erzeuge Wiki neu.." +msgstr "erzeuge Wiki neu..." #: ../ikiwiki.in:198 msgid "refreshing wiki.." -msgstr "aktualisiere Wiki.." +msgstr "aktualisiere Wiki..." #: ../IkiWiki.pm:466 msgid "Must specify url to wiki with --url when using --cgi" @@ -971,56 +977,40 @@ msgstr "" #: ../IkiWiki.pm:512 msgid "cannot use multiple rcs plugins" -msgstr "" +msgstr "Kann nicht mehrere Versionskontrollsystem-Erweiterungen verwenden" #: ../IkiWiki.pm:541 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" -msgstr "" +msgstr "Laden der für %s benötigten externen Erweiterung fehlgeschlagen: %s" #: ../IkiWiki.pm:1165 -#, fuzzy, perl-format +#, perl-format msgid "preprocessing loop detected on %s at depth %i" -msgstr "Präprozessorschleife %s auf Seite %s in Tiefe %i erkannt" +msgstr "Präprozessorschleife auf %s in Tiefe %i erkannt" #: ../IkiWiki.pm:1678 msgid "yes" -msgstr "" +msgstr "ja" #: ../auto.setup:16 msgid "What will the wiki be named?" -msgstr "" +msgstr "Wie soll das Wiki heißen?" #: ../auto.setup:16 msgid "wiki" -msgstr "" +msgstr "Wiki" #: ../auto.setup:18 msgid "What revision control system to use?" -msgstr "" +msgstr "Welches Versionskontrollsystem soll verwandt werden?" #: ../auto.setup:20 msgid "What wiki user (or openid) will be wiki admin?" msgstr "" +"Welcher Wiki-Benutzer (oder welche OpenID) soll der Administrator des Wikis " +"sein?" #: ../auto.setup:23 msgid "What is the domain name of the web server?" -msgstr "" - -#~ msgid "processed ok at %s" -#~ msgstr "normal verarbeitet um %s" - -#~ msgid "Your password has been emailed to you." -#~ msgstr "Ihr Passwort wurde Ihnen via E-Mail zugesandt." - -#~ msgid "polygen failed" -#~ msgstr "polygen fehlgeschlagen" - -#~ msgid "cleaning hyperestraier search index" -#~ msgstr "bereinige hyperestraier-Suchindex" - -#~ msgid "updating hyperestraier search index" -#~ msgstr "aktualisiere hyperestraier-Suchindex" - -#~ msgid "(not toggleable in preview mode)" -#~ msgstr "(nicht aus-/einklappbar im Vorschaumodus)" +msgstr "Wie lautet der Domainname des Webservers?"