diff options
| -rw-r--r-- | debian/NEWS | 2 | ||||
| -rw-r--r-- | debian/changelog | 43 | ||||
| -rwxr-xr-x | debian/postinst | 2 | ||||
| -rw-r--r-- | doc/bugs/transitive_dependencies.mdwn | 26 | ||||
| -rw-r--r-- | doc/news/version_3.1415.mdwn | 7 | ||||
| -rw-r--r-- | doc/news/version_3.20091009.mdwn | 14 | ||||
| -rw-r--r-- | doc/todo/dependency_types.mdwn | 95 | ||||
| -rw-r--r-- | po/bg.po | 59 | ||||
| -rw-r--r-- | po/cs.po | 59 | ||||
| -rw-r--r-- | po/da.po | 59 | ||||
| -rw-r--r-- | po/de.po | 59 | ||||
| -rw-r--r-- | po/es.po | 59 | ||||
| -rw-r--r-- | po/fr.po | 59 | ||||
| -rw-r--r-- | po/gu.po | 59 | ||||
| -rw-r--r-- | po/ikiwiki.pot | 57 | ||||
| -rw-r--r-- | po/it.po | 59 | ||||
| -rw-r--r-- | po/pl.po | 59 | ||||
| -rw-r--r-- | po/sv.po | 59 | ||||
| -rw-r--r-- | po/vi.po | 59 |
19 files changed, 453 insertions, 442 deletions
diff --git a/debian/NEWS b/debian/NEWS index 520f38815..7c88ca733 100644 --- a/debian/NEWS +++ b/debian/NEWS @@ -1,4 +1,4 @@ -ikiwiki (3.14159266) UNRELEASED; urgency=low +ikiwiki (3.2009XXXX) UNRELEASED; urgency=low To take advantage of significant performance improvements, all wikis need to be rebuilt on upgrade to this version. If you diff --git a/debian/changelog b/debian/changelog index 5ff8e4ac5..442619b3b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,18 +1,9 @@ -ikiwiki (3.14159266) UNRELEASED; urgency=low +ikiwiki (3.2009XXXX) UNRELEASED; urgency=low - * parentlinks: Add has_parentlinks template parameter to allow styling - the toplevel index differently etc. - * img: Correct bug in image size calculation code. - * img: Fix dependency code for full size images. - * toggle, relativedate: Support templates that add attributes - to the body tag. - * Support RPC::XML 0.69's incompatable object instantiation method. - * mirrorlist: Display nothing if list is empty. - * Fix a bug that could lead to duplicate links being recorded - for tags. - * Added support framework for multiple types of dependencies. - * Allow declaring that a dependency is only affected by page presence - or changes to its links. + * Added support framework for multiple types of dependencies, including + dependncies that are only affected by page precence or link changes. + * Rebuild wikis on upgrade to this version to get improved dependency + info. * pagecount, calendar, postsparkline, progress: Use a presence dependency, which makes these directives much less expensive to use, since page edits will no longer trigger an unnecessary update. @@ -28,18 +19,32 @@ ikiwiki (3.14159266) UNRELEASED; urgency=low * linkmap: Use a combination of presence and link dependencies. This makes the map be regenerated much less frequently in many cases, so larger maps are more practical to use now. - * Transitive dependencies are now correctly supported. - * Rebuild wikis on upgrade to this version to get improved dependency - info. * Plugins providing PageSpec `match_*` functions should pass additional - influence information when creating result objects. + influence information when creating result objects. This allows correctly + handling many more complicated dependencies. * API change: `pagespec_match_list` has completly changed its interface. The old interface will be removed soon, and a warning will be printed if any plugins try to use it. + * Transitive dependencies are now correctly supported. + + -- Joey Hess <joeyh@debian.org> Fri, 09 Oct 2009 20:13:27 -0400 + +ikiwiki (3.20091009) unstable; urgency=low + + * parentlinks: Add has_parentlinks template parameter to allow styling + the toplevel index differently etc. + * img: Correct bug in image size calculation code. + * img: Fix dependency code for full size images. + * toggle, relativedate: Support templates that add attributes + to the body tag. + * Support RPC::XML 0.69's incompatible object instantiation method. + * mirrorlist: Display nothing if list is empty. + * Fix a bug that could lead to duplicate links being recorded + for tags. * Optimize away most expensive file prune checks, when refreshing, by only checking new files. - -- Joey Hess <joeyh@debian.org> Sun, 27 Sep 2009 17:40:03 -0400 + -- Joey Hess <joeyh@debian.org> Fri, 09 Oct 2009 19:53:50 -0400 ikiwiki (3.14159265) unstable; urgency=low diff --git a/debian/postinst b/debian/postinst index dd4be6e0e..bf1825ab7 100755 --- a/debian/postinst +++ b/debian/postinst @@ -4,7 +4,7 @@ set -e # Change this when some incompatible change is made that requires # rebuilding all wikis. -firstcompat=3.14159266 +firstcompat=3.20091010 if [ "$1" = configure ] && \ dpkg --compare-versions "$2" lt "$firstcompat"; then diff --git a/doc/bugs/transitive_dependencies.mdwn b/doc/bugs/transitive_dependencies.mdwn index 0a2e9ec28..c44fe7962 100644 --- a/doc/bugs/transitive_dependencies.mdwn +++ b/doc/bugs/transitive_dependencies.mdwn @@ -66,3 +66,29 @@ Downsides here: plugins, and could be solved by adding more dependency types.) [[done]] --[[Joey]] + +> Some questions/comments... I've thought about this a lot for [[todo/tracking_bugs_with_dependencies]]. +> +> * When you say that anything that causes a rebuild of B is treated as a change of B, are you: i) Treating +> any rebuild as a change, or ii) Treating any rebuild that gives a new result as a change? Option ii) would +> lead to fewer rebuilds. Implementation is easy: when you're about to rebuild a page, load the old rendered html in. Do the rebuild. Compare +> the new and old html. If there is a difference, then mark that page as having changed. If there is no difference +> then you don't need to mark that pages as changed, even though it has been rebuilt. (This would ignore pages in meta-data that don't +> cause changes in html, but I don't think that is a huge issue.) + +>> That is a good idea. I will have to look at it to see if the overhead of +>> reading back in the html of every page before building actually is a +>> win though. So far, I've focused on avoiding unnecessary rebuilds, and +>> there is still some room for more dependency types doing so. +>> (Particularly for metadata dependencies..) --[[Joey]] + +> * The second comment I have relates to cycles in transitive dependencies. At the moment I don't think this is +> possible, but with some additions it may well become so. This could be problematic as it could lead to a) +> updates that never complete, or b) it being theoretically unclear what the final result should be (i.e. you +> can construct logical paradoxes in the system). I think the point above about marking things as changed only when +> the output actually changes fixes any cases that are well defined. For logical paradoxes and infinite loops (e.g. +> two pages that include each other), you might want to put a limit on the number of times you'll rebuild a page in any +> given run of ikiwiki. Say, only allow a page to rebuild twice on any run, regardless of whether a page it depends on changes. +> This is not a perfect solution, but would be a good approximation. -- [[Will]] + +>> Ikiwiki only builds any given output file once per run, already. --[[Joey]] diff --git a/doc/news/version_3.1415.mdwn b/doc/news/version_3.1415.mdwn deleted file mode 100644 index 93310bc64..000000000 --- a/doc/news/version_3.1415.mdwn +++ /dev/null @@ -1,7 +0,0 @@ -ikiwiki 3.1415 released with [[!toggle text="these changes"]] -[[!toggleable text=""" - * img: Fix extra double quote with alt text. (smcv) - * Updated French debconf templates translation. Closes: #[535103](http://bugs.debian.org/535103) - * openid: Support Net::OpenID 2.x when pretty-printing - openids. (smcv) - * highlight: Fix utf-8 encoding bug. Closes: #[535028](http://bugs.debian.org/535028)"""]]
\ No newline at end of file diff --git a/doc/news/version_3.20091009.mdwn b/doc/news/version_3.20091009.mdwn new file mode 100644 index 000000000..9ab1299b9 --- /dev/null +++ b/doc/news/version_3.20091009.mdwn @@ -0,0 +1,14 @@ +ikiwiki 3.20091009 released with [[!toggle text="these changes"]] +[[!toggleable text=""" + * parentlinks: Add has\_parentlinks template parameter to allow styling + the toplevel index differently etc. + * img: Correct bug in image size calculation code. + * img: Fix dependency code for full size images. + * toggle, relativedate: Support templates that add attributes + to the body tag. + * Support RPC::XML 0.69's incompatible object instantiation method. + * mirrorlist: Display nothing if list is empty. + * Fix a bug that could lead to duplicate links being recorded + for tags. + * Optimize away most expensive file prune calls, when refreshing, + by only checking new files."""]]
\ No newline at end of file diff --git a/doc/todo/dependency_types.mdwn b/doc/todo/dependency_types.mdwn index d9e68841d..bf6a76d87 100644 --- a/doc/todo/dependency_types.mdwn +++ b/doc/todo/dependency_types.mdwn @@ -262,6 +262,8 @@ sigh. >>>>> like that would probably not support what you want to do. >>>>> --[[Joey]] +>>>>>> Yes - that's what I'm talking about - I'll add some comments there. -- [[Will]] + ---- ### Link dependencies @@ -338,11 +340,24 @@ can indirectly influence what pages a pagespec matches. > Trying to make a formal definition of this: (Note, I'm using the term sets rather than lists, but they're roughly equivalent) > > * Let the *matching set* for a pagespec be the set of existing pages that the pagespec matches. -> * Let a *influence set* for a pagespec be the set of all pages, *p*, whose alteration might: +> * Let the *missing document matching set* be the set of pages that would match the spec if they didn't exist. These pages may or may not currently exist. Note that membership of this set depends upon how the `match_()` functions react to non-existant pages. +> * Let the *indirect influence set* for a pagespec be the set of all pages, *p*, whose alteration might: > * cause the pagespec to include or exclude a page other than *p*, or -> * cause the pagespec to exclude *p*. +> * cause the pagespec to exclude *p*, unless the alteration is the removal of *p* and *p* is in the missing document matching set. +> +> Justification: The 'base dependency mechanism' is to compare changed pages against each pagespec. If the page matches, then rebuild the spec. For this comparison, creation and removal +> of pages are both considered changes. This base mechanism will catch: +> +> * The addition of any page to the matching set through its own modification/creation +> * The removal of any page *that would still match while non-existant* from the matching set through its own removal. (Note: The base mechanism cannot remove a page from the matching set because of that page's own modification (not deletion). If the page should be removed matching set, then it obviously cannot match the spec after the change.) +> * The modification (not deletion) of any page that still matches after the modification. > ->> \[Will snipped some stuff and edited the formal definition] +> The base mechanism may therefore not catch: +> +> * The addition or removal of any page from the matching set through the modification/addition/removal of any other page. +> * The removal of any page from the matching set through its own modification/removal if it does not still match after the change. +> +> The indirect influence set then should handle anything that the base mechanism will not catch. > > --[[Will]] @@ -379,10 +394,26 @@ can indirectly influence what pages a pagespec matches. #### Examples -* The pagespec "created_before(foo)" has an influence list that contains foo. +* The pagespec "created_before(foo)" has an indirect influence list that contains foo. The removal or (re)creation of foo changes what pages match it. Note that this is true even if the pagespec currently fails to match. +>>> This is an annoying example (hence well worth having :) ). I think the +>>> indirect influence list must contain 'foo' and all currently matching +>>> pages. `created_before(foo)` will not match +>>> a deleted page, and so the base mechanism would not cause a rebuild. The +>>> removal problem strikes. -- [[Will]] + +>>>> But `created_before` can in fact match a deleted page. Because the mtime +>>>> of a deleted page is temporarily set to 0 while the base mechanism runs to +>>>> find changes in deleted pages. (I verified this works by experiment, +>>>> also that `created_after` is triggered by a deleted page.) --[[Joey]] + +>>>>> Oh, okie. I looked at the source, saw the `if (exists $IkiWiki::pagectime{$testpage})` and assumed it would fail. +>>>>> Of course, having it succeed doesn't cure all the issues -- just moves them. With `created_before()` succeeding +>>>>> for deleted files, this pagespec will be match any removal in the entire wiki with the base mechanism. Whether this is +>>>>> better or worse than the longer indirect influence list is an empirical question. -- [[Will]] + * The pagespec "foo" has an empty influence list. This is because a modification/creation/removal of foo directly changes what the pagespec matches. @@ -401,6 +432,8 @@ can indirectly influence what pages a pagespec matches. >>>> pagespec, and see they used to match; and thus knows that the >>>> dependency has triggered. >>>> +>>>>> IkiWiki can only see that they used to match if they're in the glob matching set. -- [[Will]] +>>>> >>>> Maybe the thing to do is consider this an optimisation, where such >>>> pages are influences, but ikiwiki is able to implicitly find them, >>>> so they do not need to be explicitly stored. --[[Joey]] @@ -416,6 +449,9 @@ can indirectly influence what pages a pagespec matches. that contains index (because a change to index changes the backlinks). Note that this is true even if the backlink currently fails. +>>> This is another interesting example. The missing document matching set contains all links on the page index, and so +>>> the influence list only needs to contain 'index' itself. -- [[Will]] + * The pagespec "link(done)" has an influence list that contains every page that it matches. A change to any matching page can remove a link and make it not match any more, and so the list is needed @@ -534,57 +570,6 @@ SuccessReason(page, index) => right `HardFailReason() | SuccessReason(bugs/foo)` => `HardFailReason()` => right -#### High-level Calculation and Storage - -Naively calculating the full influence list for a pagespec requires trying -to match it against every page in the wiki. I'd like to avoid doing such -expensive matching redundantly. - -It may be possible, for some types of pagespecs, to just try matching a -single, arbitrary page against it, and know the full influence list has -been obtained. It seems to be that case that if a pagespec has any -influences, matching any page will return at least one. So if none are -returned, we can skip trying other pages. - -If the influence list does not include the page that was tried, we know -that the pagespec does not things like `link()` and `title()`, that are -influenced by the page's own content. So it *might* be safe to not try -matching any more pages in this case too. I think it would work for all -current pagespec terms. There might be a hypothetical term where this -optimisation doesn't work. We could add a special case to ensure it can -work: If a term declares it is unfluenced by "", then it means it is -always influenced by the matching page. - -Anyway, this seems worth doing: Add a `pagespec_match_all`, which returns a -list of all pages in the whole wiki that match the pagespec, and also adds -the pagespec as a dependency, and while it's at it, calculates and stores -the influence list. - -It could have an optional sort parameter, and limit parameter, to control -how many items to return and the sort order. So when inline wants to -display the 10 newest, only the influence lists for those ten are added. - -If `pagespec_match_depends` can be used by all plugins, then great, -influences are automatically calculated, no extra work needs to be done. - -If not, and some plugins still need to use `pagespec_match_list` or -`pagespec_match`, and `add_depends`, then I guess that `add_depends` can do -a slightly more expensive influence calculation. - -Bonus: If `add_depends` is doing an influence calculation, then I can remove -the nasty hack it currently uses to decide if a given pagespec is safe to use -with an existence or links dependency. - -Where to store the influence list? Well, it appears that we can just add -(content) dependencies for each item on the list, to the page's -regular list of simple dependencies. So, the data stored ends up looking -just like what is stored today by the explicit dependency hacks. Except, -it's calculated more smartly, and is added automatically. - -> I've implemented influence calculation in `add_depends`. As expected, -> it means rather a lot more work, and makes some things much slower. -> Optimisations next.. --[[Joey]] - #### Influence types Note that influences can also have types, same as dependency types. @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki-bg\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-24 18:53-0400\n" +"POT-Creation-Date: 2009-10-09 19:55-0400\n" "PO-Revision-Date: 2007-01-12 01:19+0200\n" "Last-Translator: Damyan Ivanov <dam@modsodtsys.com>\n" "Language-Team: Bulgarian <dict@fsa-bg.org>\n" @@ -55,7 +55,7 @@ msgstr "Предпочитанията са запазени." msgid "You are banned." msgstr "Достъпът ви е забранен." -#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1277 +#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1276 msgid "Error" msgstr "Грешка" @@ -402,28 +402,27 @@ msgstr "" msgid "htmltidy failed to parse this html" msgstr "няма разпознати усмивки; изключване на приставката „smiley”" -#: ../IkiWiki/Plugin/img.pm:63 +#: ../IkiWiki/Plugin/img.pm:64 #, fuzzy msgid "Image::Magick is not installed" msgstr "не е инсталиран polygen" +#: ../IkiWiki/Plugin/img.pm:68 ../IkiWiki/Plugin/img.pm:112 +#, fuzzy, perl-format +msgid "failed to read %s: %s" +msgstr "грешка при запис на файла „%s”: %s" + #: ../IkiWiki/Plugin/img.pm:74 #, perl-format msgid "wrong size format \"%s\" (should be WxH)" msgstr "" -#: ../IkiWiki/Plugin/img.pm:85 ../IkiWiki/Plugin/img.pm:89 -#: ../IkiWiki/Plugin/img.pm:135 -#, fuzzy, perl-format -msgid "failed to read %s: %s" -msgstr "грешка при запис на файла „%s”: %s" - -#: ../IkiWiki/Plugin/img.pm:100 +#: ../IkiWiki/Plugin/img.pm:120 #, fuzzy, perl-format msgid "failed to resize: %s" msgstr "грешка при запис на файла „%s”: %s" -#: ../IkiWiki/Plugin/img.pm:152 +#: ../IkiWiki/Plugin/img.pm:140 #, fuzzy, perl-format msgid "failed to determine size of image %s" msgstr "грешка при запис на файла „%s”: %s" @@ -508,11 +507,11 @@ msgstr "шаблонът „%s” не е намерен" msgid "redir cycle is not allowed" msgstr "шаблонът „%s” не е намерен" -#: ../IkiWiki/Plugin/mirrorlist.pm:42 +#: ../IkiWiki/Plugin/mirrorlist.pm:43 msgid "Mirrors" msgstr "Огледала" -#: ../IkiWiki/Plugin/mirrorlist.pm:42 +#: ../IkiWiki/Plugin/mirrorlist.pm:43 msgid "Mirror" msgstr "Огледало" @@ -618,7 +617,7 @@ msgstr "" msgid "rebuilding all pages to fix meta titles" msgstr "" -#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:428 +#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:431 #, fuzzy, perl-format msgid "building %s" msgstr "промяна на %s" @@ -1053,47 +1052,47 @@ msgid "" "allow this" msgstr "" -#: ../IkiWiki/Render.pm:289 ../IkiWiki/Render.pm:314 +#: ../IkiWiki/Render.pm:294 ../IkiWiki/Render.pm:321 #, perl-format msgid "skipping bad filename %s" msgstr "пропускане на невалидното име на файл „%s”" -#: ../IkiWiki/Render.pm:296 +#: ../IkiWiki/Render.pm:299 #, perl-format msgid "%s has multiple possible source pages" msgstr "" -#: ../IkiWiki/Render.pm:382 +#: ../IkiWiki/Render.pm:385 #, perl-format msgid "removing old page %s" msgstr "премахване на старата страница „%s”" -#: ../IkiWiki/Render.pm:423 +#: ../IkiWiki/Render.pm:426 #, perl-format msgid "scanning %s" msgstr "сканиране на „%s”" -#: ../IkiWiki/Render.pm:450 +#: ../IkiWiki/Render.pm:453 #, fuzzy, perl-format msgid "building %s, which links to %s" msgstr "обновяване на страницата „%s”, съдържаща препратки към „%s”" -#: ../IkiWiki/Render.pm:497 +#: ../IkiWiki/Render.pm:500 #, fuzzy, perl-format msgid "building %s, which depends on %s" msgstr "обновяване на страницата „%s”, зависеща от „%s”" -#: ../IkiWiki/Render.pm:533 +#: ../IkiWiki/Render.pm:536 #, fuzzy, perl-format msgid "building %s, to update its backlinks" msgstr "обновяване на „%s” и осъвременяване на обратните връзки" -#: ../IkiWiki/Render.pm:545 +#: ../IkiWiki/Render.pm:548 #, fuzzy, perl-format msgid "removing %s, no longer built by %s" msgstr "премахване на „%s” понеже не се генерира от „%s”" -#: ../IkiWiki/Render.pm:569 +#: ../IkiWiki/Render.pm:572 #, fuzzy, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: неуспех при обновяване на страницата „%s”" @@ -1172,35 +1171,35 @@ msgstr "обновяване на уики..." msgid "refreshing wiki.." msgstr "осъвременяване на уики..." -#: ../IkiWiki.pm:233 +#: ../IkiWiki.pm:232 msgid "Discussion" msgstr "Дискусия" -#: ../IkiWiki.pm:502 +#: ../IkiWiki.pm:501 msgid "Must specify url to wiki with --url when using --cgi" msgstr "" "При използване на пареметъра „--cgi” е необходимо да се укаже и " "местоположението на уикито чрез параметъра „--url”" -#: ../IkiWiki.pm:548 +#: ../IkiWiki.pm:547 msgid "cannot use multiple rcs plugins" msgstr "" -#: ../IkiWiki.pm:577 +#: ../IkiWiki.pm:576 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "" -#: ../IkiWiki.pm:1259 +#: ../IkiWiki.pm:1258 #, fuzzy, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "открита е циклична завидимост при %s на „%s” на дълбочина %i" -#: ../IkiWiki.pm:1817 +#: ../IkiWiki.pm:1820 msgid "yes" msgstr "" -#: ../IkiWiki.pm:1941 +#: ../IkiWiki.pm:1944 #, fuzzy, perl-format msgid "cannot match pages: %s" msgstr "грешка при четене на „%s”: %s" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-24 18:53-0400\n" +"POT-Creation-Date: 2009-10-09 19:55-0400\n" "PO-Revision-Date: 2009-09-11 20:23+0200\n" "Last-Translator: Miroslav Kure <kurem@debian.cz>\n" "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n" @@ -55,7 +55,7 @@ msgstr "Nastavení uloženo." msgid "You are banned." msgstr "Jste vyhoštěni." -#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1277 +#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1276 msgid "Error" msgstr "Chyba" @@ -393,27 +393,26 @@ msgstr "varování: perlový modul highlight není dostupný; pokračuji bez ně msgid "htmltidy failed to parse this html" msgstr "htmltidy se nepodařilo zpracovat toto html" -#: ../IkiWiki/Plugin/img.pm:63 +#: ../IkiWiki/Plugin/img.pm:64 msgid "Image::Magick is not installed" msgstr "Image::Magick není nainstalován" +#: ../IkiWiki/Plugin/img.pm:68 ../IkiWiki/Plugin/img.pm:112 +#, perl-format +msgid "failed to read %s: %s" +msgstr "nelze číst %s: %s" + #: ../IkiWiki/Plugin/img.pm:74 #, perl-format msgid "wrong size format \"%s\" (should be WxH)" msgstr "chybné rozměry „%s“ (formát má být ŠxV)" -#: ../IkiWiki/Plugin/img.pm:85 ../IkiWiki/Plugin/img.pm:89 -#: ../IkiWiki/Plugin/img.pm:135 -#, perl-format -msgid "failed to read %s: %s" -msgstr "nelze číst %s: %s" - -#: ../IkiWiki/Plugin/img.pm:100 +#: ../IkiWiki/Plugin/img.pm:120 #, perl-format msgid "failed to resize: %s" msgstr "nelze změnit velikost: %s" -#: ../IkiWiki/Plugin/img.pm:152 +#: ../IkiWiki/Plugin/img.pm:140 #, perl-format msgid "failed to determine size of image %s" msgstr "nelze určit velikost obrázku %s" @@ -488,11 +487,11 @@ msgstr "stránka, na kterou vede přesměrování, nebyla nalezena" msgid "redir cycle is not allowed" msgstr "cykly nejsou v přesměrování povoleny" -#: ../IkiWiki/Plugin/mirrorlist.pm:42 +#: ../IkiWiki/Plugin/mirrorlist.pm:43 msgid "Mirrors" msgstr "Zrcadla" -#: ../IkiWiki/Plugin/mirrorlist.pm:42 +#: ../IkiWiki/Plugin/mirrorlist.pm:43 msgid "Mirror" msgstr "Zrcadlo" @@ -598,7 +597,7 @@ msgstr "" msgid "rebuilding all pages to fix meta titles" msgstr "znovusestavuji všechny stránky, aby se opravily meta nadpisy" -#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:428 +#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:431 #, perl-format msgid "building %s" msgstr "sestavuji %s" @@ -1031,47 +1030,47 @@ msgstr "" "v cestě ke zdrojovému adresáři (%s) byl nalezen symbolický odkaz -- chcete-" "li to povolit, nastavte proměnnou allow_symlinks_before_srcdir" -#: ../IkiWiki/Render.pm:289 ../IkiWiki/Render.pm:314 +#: ../IkiWiki/Render.pm:294 ../IkiWiki/Render.pm:321 #, perl-format msgid "skipping bad filename %s" msgstr "přeskakuji chybné jméno souboru %s" -#: ../IkiWiki/Render.pm:296 +#: ../IkiWiki/Render.pm:299 #, perl-format msgid "%s has multiple possible source pages" msgstr "%s má několik možných zdrojových stránek" -#: ../IkiWiki/Render.pm:382 +#: ../IkiWiki/Render.pm:385 #, perl-format msgid "removing old page %s" msgstr "odstraňuji starou stránku %s" -#: ../IkiWiki/Render.pm:423 +#: ../IkiWiki/Render.pm:426 #, perl-format msgid "scanning %s" msgstr "prohledávám %s" -#: ../IkiWiki/Render.pm:450 +#: ../IkiWiki/Render.pm:453 #, perl-format msgid "building %s, which links to %s" msgstr "sestavuji %s, která odkazuje na %s" -#: ../IkiWiki/Render.pm:497 +#: ../IkiWiki/Render.pm:500 #, perl-format msgid "building %s, which depends on %s" msgstr "sestavuji %s, která závisí na %s" -#: ../IkiWiki/Render.pm:533 +#: ../IkiWiki/Render.pm:536 #, perl-format msgid "building %s, to update its backlinks" msgstr "sestavuji %s, aby se aktualizovaly zpětné odkazy" -#: ../IkiWiki/Render.pm:545 +#: ../IkiWiki/Render.pm:548 #, perl-format msgid "removing %s, no longer built by %s" msgstr "odstraňuji %s, již není sestavována pomocí %s" -#: ../IkiWiki/Render.pm:569 +#: ../IkiWiki/Render.pm:572 #, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: nelze sestavit %s" @@ -1150,33 +1149,33 @@ msgstr "znovusestavuji wiki..." msgid "refreshing wiki.." msgstr "obnovuji wiki..." -#: ../IkiWiki.pm:233 +#: ../IkiWiki.pm:232 msgid "Discussion" msgstr "Diskuse" -#: ../IkiWiki.pm:502 +#: ../IkiWiki.pm:501 msgid "Must specify url to wiki with --url when using --cgi" msgstr "Při použití --cgi musíte pomocí --url zadat url k wiki" -#: ../IkiWiki.pm:548 +#: ../IkiWiki.pm:547 msgid "cannot use multiple rcs plugins" msgstr "nelze použít několik rcs modulů" -#: ../IkiWiki.pm:577 +#: ../IkiWiki.pm:576 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "nepodařilo se nahrát externí modul vyžadovaný modulem %s: %s" -#: ../IkiWiki.pm:1259 +#: ../IkiWiki.pm:1258 #, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "Byla rozpoznána smyčka na %s v hloubce %i" -#: ../IkiWiki.pm:1817 +#: ../IkiWiki.pm:1820 msgid "yes" msgstr "ano" -#: ../IkiWiki.pm:1941 +#: ../IkiWiki.pm:1944 #, perl-format msgid "cannot match pages: %s" msgstr "nelze vybrat stránky: %s" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki 3.14159\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-24 18:53-0400\n" +"POT-Creation-Date: 2009-10-09 19:55-0400\n" "PO-Revision-Date: 2009-07-23 01:07+0200\n" "Last-Translator: Jonas Smedegaard <dr@jones.dk>\n" "Language-Team: None\n" @@ -59,7 +59,7 @@ msgstr "Indstillinger gemt" msgid "You are banned." msgstr "Du er banlyst." -#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1277 +#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1276 msgid "Error" msgstr "Fejl" @@ -404,27 +404,26 @@ msgstr "" msgid "htmltidy failed to parse this html" msgstr "afkodning af smileys mislykkedes" -#: ../IkiWiki/Plugin/img.pm:63 +#: ../IkiWiki/Plugin/img.pm:64 msgid "Image::Magick is not installed" msgstr "Image::Magick ikke installeret" +#: ../IkiWiki/Plugin/img.pm:68 ../IkiWiki/Plugin/img.pm:112 +#, perl-format +msgid "failed to read %s: %s" +msgstr "læsning af %s mislykkedes: %s" + #: ../IkiWiki/Plugin/img.pm:74 #, perl-format msgid "wrong size format \"%s\" (should be WxH)" msgstr "forkert størrelsesformat \"%s\" (burde være WxH)" -#: ../IkiWiki/Plugin/img.pm:85 ../IkiWiki/Plugin/img.pm:89 -#: ../IkiWiki/Plugin/img.pm:135 -#, perl-format -msgid "failed to read %s: %s" -msgstr "læsning af %s mislykkedes: %s" - -#: ../IkiWiki/Plugin/img.pm:100 +#: ../IkiWiki/Plugin/img.pm:120 #, perl-format msgid "failed to resize: %s" msgstr "Ændring af størrelse mislykkedes: %s" -#: ../IkiWiki/Plugin/img.pm:152 +#: ../IkiWiki/Plugin/img.pm:140 #, perl-format msgid "failed to determine size of image %s" msgstr "Vurdering af billedstørrelse mislykkedes: %s" @@ -501,11 +500,11 @@ msgstr "henvisningsside ikke fundet" msgid "redir cycle is not allowed" msgstr "ring af henvisninger er ikke tilladt" -#: ../IkiWiki/Plugin/mirrorlist.pm:42 +#: ../IkiWiki/Plugin/mirrorlist.pm:43 msgid "Mirrors" msgstr "Spejle" -#: ../IkiWiki/Plugin/mirrorlist.pm:42 +#: ../IkiWiki/Plugin/mirrorlist.pm:43 msgid "Mirror" msgstr "Spejl" @@ -614,7 +613,7 @@ msgstr "" msgid "rebuilding all pages to fix meta titles" msgstr "gendanner alle sider for at korrigere meta titler" -#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:428 +#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:431 #, perl-format msgid "building %s" msgstr "danner %s" @@ -1046,47 +1045,47 @@ msgstr "" "symbolsk lænke fundet i srcdir-sti (%s) -- sæt allow_symlinks_before_srcdir " "for at tillade dette" -#: ../IkiWiki/Render.pm:289 ../IkiWiki/Render.pm:314 +#: ../IkiWiki/Render.pm:294 ../IkiWiki/Render.pm:321 #, perl-format msgid "skipping bad filename %s" msgstr "udelader forkert filnavn %s" -#: ../IkiWiki/Render.pm:296 +#: ../IkiWiki/Render.pm:299 #, perl-format msgid "%s has multiple possible source pages" msgstr "%s har flere mulige kildesider" -#: ../IkiWiki/Render.pm:382 +#: ../IkiWiki/Render.pm:385 #, perl-format msgid "removing old page %s" msgstr "fjerner gammel side %s" -#: ../IkiWiki/Render.pm:423 +#: ../IkiWiki/Render.pm:426 #, perl-format msgid "scanning %s" msgstr "gennemlæser %s" -#: ../IkiWiki/Render.pm:450 +#: ../IkiWiki/Render.pm:453 #, perl-format msgid "building %s, which links to %s" msgstr "danner %s, som henviser til %s" -#: ../IkiWiki/Render.pm:497 +#: ../IkiWiki/Render.pm:500 #, perl-format msgid "building %s, which depends on %s" msgstr "danner %s, som afhænger af %s" -#: ../IkiWiki/Render.pm:533 +#: ../IkiWiki/Render.pm:536 #, perl-format msgid "building %s, to update its backlinks" msgstr "danner %s, for at opdatere dens krydshenvisninger (backlinks)" -#: ../IkiWiki/Render.pm:545 +#: ../IkiWiki/Render.pm:548 #, perl-format msgid "removing %s, no longer built by %s" msgstr "fjerner %s, ikke længere dannet af %s" -#: ../IkiWiki/Render.pm:569 +#: ../IkiWiki/Render.pm:572 #, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: kan ikke danne %s" @@ -1165,34 +1164,34 @@ msgstr "genopbygger wiki..." msgid "refreshing wiki.." msgstr "genopfrisker wiki..." -#: ../IkiWiki.pm:233 +#: ../IkiWiki.pm:232 msgid "Discussion" msgstr "Diskussion" -#: ../IkiWiki.pm:502 +#: ../IkiWiki.pm:501 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:548 +#: ../IkiWiki.pm:547 msgid "cannot use multiple rcs plugins" msgstr "kan ikke bruge flere samtidige RCS-udvidelser" -#: ../IkiWiki.pm:577 +#: ../IkiWiki.pm:576 #, 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:1259 +#: ../IkiWiki.pm:1258 #, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "forudberegningssløkke fundet på %s ved dybde %i" -#: ../IkiWiki.pm:1817 +#: ../IkiWiki.pm:1820 msgid "yes" msgstr "ja" -#: ../IkiWiki.pm:1941 +#: ../IkiWiki.pm:1944 #, perl-format msgid "cannot match pages: %s" msgstr "kan ikke få sider til at passe sammen: %s" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki 3.14159\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-24 18:53-0400\n" +"POT-Creation-Date: 2009-10-09 19:55-0400\n" "PO-Revision-Date: 2009-07-23 01:07+0100\n" "Last-Translator: Kurt Gramlich <kurt@skolelinux.de>\n" "Language-Team: German <debian-l10n-german@lists.debian.org>\n" @@ -56,7 +56,7 @@ msgstr "Einstellungen gespeichert." msgid "You are banned." msgstr "Sie sind ausgeschlossen worden." -#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1277 +#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1276 msgid "Error" msgstr "Fehler" @@ -402,27 +402,26 @@ msgstr "" msgid "htmltidy failed to parse this html" msgstr "Smileys konnten nicht ausgewertet werden" -#: ../IkiWiki/Plugin/img.pm:63 +#: ../IkiWiki/Plugin/img.pm:64 msgid "Image::Magick is not installed" msgstr "Image::Magick ist nicht installiert" +#: ../IkiWiki/Plugin/img.pm:68 ../IkiWiki/Plugin/img.pm:112 +#, perl-format +msgid "failed to read %s: %s" +msgstr "Lesen von %s fehlgeschlagen: %s" + #: ../IkiWiki/Plugin/img.pm:74 #, perl-format msgid "wrong size format \"%s\" (should be WxH)" msgstr "falsches Format in \"%s\" für size (sollte BxH sein)" -#: ../IkiWiki/Plugin/img.pm:85 ../IkiWiki/Plugin/img.pm:89 -#: ../IkiWiki/Plugin/img.pm:135 -#, perl-format -msgid "failed to read %s: %s" -msgstr "Lesen von %s fehlgeschlagen: %s" - -#: ../IkiWiki/Plugin/img.pm:100 +#: ../IkiWiki/Plugin/img.pm:120 #, perl-format msgid "failed to resize: %s" msgstr "Größenänderung fehlgeschlagen: %s" -#: ../IkiWiki/Plugin/img.pm:152 +#: ../IkiWiki/Plugin/img.pm:140 #, perl-format msgid "failed to determine size of image %s" msgstr "Größe des Bildes %s konnte nicht festgestellt werden." @@ -502,11 +501,11 @@ msgstr "Umleitungsseite nicht gefunden" msgid "redir cycle is not allowed" msgstr "Zyklische Umleitungen sind nicht erlaubt" -#: ../IkiWiki/Plugin/mirrorlist.pm:42 +#: ../IkiWiki/Plugin/mirrorlist.pm:43 msgid "Mirrors" msgstr "Spiegel" -#: ../IkiWiki/Plugin/mirrorlist.pm:42 +#: ../IkiWiki/Plugin/mirrorlist.pm:43 msgid "Mirror" msgstr "Spiegel" @@ -617,7 +616,7 @@ msgstr "" msgid "rebuilding all pages to fix meta titles" msgstr "um die meta-titeln zu reparieren werden alle Seiten neu erstellt" -#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:428 +#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:431 #, perl-format msgid "building %s" msgstr "erzeuge %s" @@ -1055,47 +1054,47 @@ msgstr "" "symbolischer Verweis im srcdir Pfad (%s) gefunden -- setzen Sie " "allow_symlinks_before_srcdir, um dies zu erlauben" -#: ../IkiWiki/Render.pm:289 ../IkiWiki/Render.pm:314 +#: ../IkiWiki/Render.pm:294 ../IkiWiki/Render.pm:321 #, perl-format msgid "skipping bad filename %s" msgstr "überspringe fehlerhaften Dateinamen %s" -#: ../IkiWiki/Render.pm:296 +#: ../IkiWiki/Render.pm:299 #, perl-format msgid "%s has multiple possible source pages" msgstr "%s hat mehrere mögliche Quellseiten" -#: ../IkiWiki/Render.pm:382 +#: ../IkiWiki/Render.pm:385 #, perl-format msgid "removing old page %s" msgstr "entferne alte Seite %s" -#: ../IkiWiki/Render.pm:423 +#: ../IkiWiki/Render.pm:426 #, perl-format msgid "scanning %s" msgstr "durchsuche %s" -#: ../IkiWiki/Render.pm:450 +#: ../IkiWiki/Render.pm:453 #, perl-format msgid "building %s, which links to %s" msgstr "erzeuge %s, die auf %s verweist" -#: ../IkiWiki/Render.pm:497 +#: ../IkiWiki/Render.pm:500 #, perl-format msgid "building %s, which depends on %s" msgstr "erzeuge %s, die von %s abhängt" -#: ../IkiWiki/Render.pm:533 +#: ../IkiWiki/Render.pm:536 #, perl-format msgid "building %s, to update its backlinks" msgstr "erzeuge %s, um dessen Rückverweise zu aktualisieren" -#: ../IkiWiki/Render.pm:545 +#: ../IkiWiki/Render.pm:548 #, perl-format msgid "removing %s, no longer built by %s" msgstr "entferne %s, wird nicht länger von %s erzeugt" -#: ../IkiWiki/Render.pm:569 +#: ../IkiWiki/Render.pm:572 #, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: kann %s nicht erzeugen" @@ -1177,36 +1176,36 @@ msgstr "erzeuge Wiki neu.." msgid "refreshing wiki.." msgstr "aktualisiere Wiki.." -#: ../IkiWiki.pm:233 +#: ../IkiWiki.pm:232 msgid "Discussion" msgstr "Diskussion" -#: ../IkiWiki.pm:502 +#: ../IkiWiki.pm:501 msgid "Must specify url to wiki with --url when using --cgi" msgstr "" "Es muss eine URL zum Wiki mit --url angegeben werden, wenn --cgi verwandt " "wird" -#: ../IkiWiki.pm:548 +#: ../IkiWiki.pm:547 msgid "cannot use multiple rcs plugins" msgstr "" "Es können nicht mehrere Versionskontrollsystem-Erweiterungen verwandt werden" -#: ../IkiWiki.pm:577 +#: ../IkiWiki.pm:576 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "Laden der für %s benötigten externen Erweiterung fehlgeschlagen: %s" -#: ../IkiWiki.pm:1259 +#: ../IkiWiki.pm:1258 #, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "Präprozessorschleife auf %s in Tiefe %i erkannt" -#: ../IkiWiki.pm:1817 +#: ../IkiWiki.pm:1820 msgid "yes" msgstr "ja" -#: ../IkiWiki.pm:1941 +#: ../IkiWiki.pm:1944 #, perl-format msgid "cannot match pages: %s" msgstr "Kann die Seiten nicht zuordnen: %s" @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: es\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-24 18:53-0400\n" +"POT-Creation-Date: 2009-10-09 19:55-0400\n" "PO-Revision-Date: 2009-06-14 12:32+0200\n" "Last-Translator: Victor Moral <victor@taquiones.net>\n" "Language-Team: <en@li.org>\n" @@ -60,7 +60,7 @@ msgstr "Las preferencias se han guardado." msgid "You are banned." msgstr "Ha sido expulsado." -#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1277 +#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1276 msgid "Error" msgstr "Error" @@ -407,27 +407,26 @@ msgstr "" msgid "htmltidy failed to parse this html" msgstr "Algunos emoticonos tienen errores" -#: ../IkiWiki/Plugin/img.pm:63 +#: ../IkiWiki/Plugin/img.pm:64 msgid "Image::Magick is not installed" msgstr "El complemento Image::Magick no ha sido instalado" +#: ../IkiWiki/Plugin/img.pm:68 ../IkiWiki/Plugin/img.pm:112 +#, perl-format +msgid "failed to read %s: %s" +msgstr "no puedo leer de %s: %s " + #: ../IkiWiki/Plugin/img.pm:74 #, perl-format msgid "wrong size format \"%s\" (should be WxH)" msgstr "" -#: ../IkiWiki/Plugin/img.pm:85 ../IkiWiki/Plugin/img.pm:89 -#: ../IkiWiki/Plugin/img.pm:135 -#, perl-format -msgid "failed to read %s: %s" -msgstr "no puedo leer de %s: %s " - -#: ../IkiWiki/Plugin/img.pm:100 +#: ../IkiWiki/Plugin/img.pm:120 #, perl-format msgid "failed to resize: %s" msgstr "dimensionamiento fallido: %s" -#: ../IkiWiki/Plugin/img.pm:152 +#: ../IkiWiki/Plugin/img.pm:140 #, perl-format msgid "failed to determine size of image %s" msgstr "no he podido determinar el tamaño de la imagen %s" @@ -508,11 +507,11 @@ msgstr "falta la página a donde redirigir" msgid "redir cycle is not allowed" msgstr "ciclo de redirección no permitido" -#: ../IkiWiki/Plugin/mirrorlist.pm:42 +#: ../IkiWiki/Plugin/mirrorlist.pm:43 msgid "Mirrors" msgstr "Réplicas" -#: ../IkiWiki/Plugin/mirrorlist.pm:42 +#: ../IkiWiki/Plugin/mirrorlist.pm:43 msgid "Mirror" msgstr "Réplica" @@ -621,7 +620,7 @@ msgstr "" msgid "rebuilding all pages to fix meta titles" msgstr "" -#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:428 +#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:431 #, fuzzy, perl-format msgid "building %s" msgstr "Informaremos a %s" @@ -1055,49 +1054,49 @@ msgstr "" "encontrado un enlace simbólico en la ruta del directorio fuente (%s) -- use " "la directiva allow_symlinks_before_srcdir para permitir la acción" -#: ../IkiWiki/Render.pm:289 ../IkiWiki/Render.pm:314 +#: ../IkiWiki/Render.pm:294 ../IkiWiki/Render.pm:321 #, perl-format msgid "skipping bad filename %s" msgstr "ignorando el archivo %s porque su nombre no es correcto" -#: ../IkiWiki/Render.pm:296 +#: ../IkiWiki/Render.pm:299 #, perl-format msgid "%s has multiple possible source pages" msgstr "%s tiene mútiples páginas fuente posibles" -#: ../IkiWiki/Render.pm:382 +#: ../IkiWiki/Render.pm:385 #, perl-format msgid "removing old page %s" msgstr "eliminando la antigua página %s" -#: ../IkiWiki/Render.pm:423 +#: ../IkiWiki/Render.pm:426 #, perl-format msgid "scanning %s" msgstr "explorando %s" -#: ../IkiWiki/Render.pm:450 +#: ../IkiWiki/Render.pm:453 #, fuzzy, perl-format msgid "building %s, which links to %s" msgstr "convirtiendo la página %s, la cual referencia a %s" -#: ../IkiWiki/Render.pm:497 +#: ../IkiWiki/Render.pm:500 #, fuzzy, perl-format msgid "building %s, which depends on %s" msgstr "convirtiendo la página %s, la cual depende de %s" -#: ../IkiWiki/Render.pm:533 +#: ../IkiWiki/Render.pm:536 #, fuzzy, perl-format msgid "building %s, to update its backlinks" msgstr "" "convirtiendo la página %s para actualizar la lista de páginas que hacen " "referencia a ella." -#: ../IkiWiki/Render.pm:545 +#: ../IkiWiki/Render.pm:548 #, fuzzy, perl-format msgid "removing %s, no longer built by %s" msgstr "eliminando la página %s puesto que ya no se deriva de %s" -#: ../IkiWiki/Render.pm:569 +#: ../IkiWiki/Render.pm:572 #, fuzzy, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: no puedo convertir la página %s" @@ -1178,37 +1177,37 @@ msgstr "reconstruyendo el wiki.." msgid "refreshing wiki.." msgstr "actualizando el wiki.." -#: ../IkiWiki.pm:233 +#: ../IkiWiki.pm:232 msgid "Discussion" msgstr "Comentarios" -#: ../IkiWiki.pm:502 +#: ../IkiWiki.pm:501 msgid "Must specify url to wiki with --url when using --cgi" msgstr "" "Es obligatorio especificar un url al wiki con el parámetro --url si se " "utiliza el parámetro --cgi" -#: ../IkiWiki.pm:548 +#: ../IkiWiki.pm:547 msgid "cannot use multiple rcs plugins" msgstr "no puedo emplear varios complementos rcs" -#: ../IkiWiki.pm:577 +#: ../IkiWiki.pm:576 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "no he podido cargar el complemento externo %s necesario para %s" -#: ../IkiWiki.pm:1259 +#: ../IkiWiki.pm:1258 #, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "" "se ha detectado en la página %s un bucle de preprocesado en la iteración " "número %i" -#: ../IkiWiki.pm:1817 +#: ../IkiWiki.pm:1820 msgid "yes" msgstr "si" -#: ../IkiWiki.pm:1941 +#: ../IkiWiki.pm:1944 #, perl-format msgid "cannot match pages: %s" msgstr "no encuentro páginas coincidentes: %s" @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki 3.141\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-24 18:53-0400\n" +"POT-Creation-Date: 2009-10-09 19:55-0400\n" "PO-Revision-Date: 2009-08-17 10:06+0200\n" "Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n" "Language-Team: French <debian-l10n-french@lists.debian.org>\n" @@ -57,7 +57,7 @@ msgstr "Les préférences ont été enregistrées." msgid "You are banned." msgstr "Vous avez été banni." -#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1277 +#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1276 msgid "Error" msgstr "Erreur" @@ -398,27 +398,26 @@ msgstr "" msgid "htmltidy failed to parse this html" msgstr "Aucun smiley n'a pu être analysé" -#: ../IkiWiki/Plugin/img.pm:63 +#: ../IkiWiki/Plugin/img.pm:64 msgid "Image::Magick is not installed" msgstr "Image::Magick n'est pas installé" +#: ../IkiWiki/Plugin/img.pm:68 ../IkiWiki/Plugin/img.pm:112 +#, perl-format +msgid "failed to read %s: %s" +msgstr "Échec de la lecture de %s : %s" + #: ../IkiWiki/Plugin/img.pm:74 #, perl-format msgid "wrong size format \"%s\" (should be WxH)" msgstr "Format de la taille incorrect \"%s\", (devrait être LxH)" -#: ../IkiWiki/Plugin/img.pm:85 ../IkiWiki/Plugin/img.pm:89 -#: ../IkiWiki/Plugin/img.pm:135 -#, perl-format -msgid "failed to read %s: %s" -msgstr "Échec de la lecture de %s : %s" - -#: ../IkiWiki/Plugin/img.pm:100 +#: ../IkiWiki/Plugin/img.pm:120 #, perl-format msgid "failed to resize: %s" msgstr "Échec du redimensionnement : %s" -#: ../IkiWiki/Plugin/img.pm:152 +#: ../IkiWiki/Plugin/img.pm:140 #, perl-format msgid "failed to determine size of image %s" msgstr "Échec de la détermination de la taille de l'image : %s" @@ -496,11 +495,11 @@ msgstr "Page de redirection introuvable" msgid "redir cycle is not allowed" msgstr "Redirection cyclique non autorisée" -#: ../IkiWiki/Plugin/mirrorlist.pm:42 +#: ../IkiWiki/Plugin/mirrorlist.pm:43 msgid "Mirrors" msgstr "Miroirs" -#: ../IkiWiki/Plugin/mirrorlist.pm:42 +#: ../IkiWiki/Plugin/mirrorlist.pm:43 msgid "Mirror" msgstr "Miroir" @@ -616,7 +615,7 @@ msgstr "" "Reconstruction de toutes les pages pour corriger les titres (greffon " "« meta »)." -#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:428 +#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:431 #, perl-format msgid "building %s" msgstr "construction de %s" @@ -1051,47 +1050,47 @@ msgstr "" "Lien symbolique trouvé dans l'adresse de srcdir (%s) -- pour l'autoriser, " "activez le paramètre « allow_symlinks_before_srcdir »." -#: ../IkiWiki/Render.pm:289 ../IkiWiki/Render.pm:314 +#: ../IkiWiki/Render.pm:294 ../IkiWiki/Render.pm:321 #, perl-format msgid "skipping bad filename %s" msgstr "Omission du fichier au nom incorrect %s" -#: ../IkiWiki/Render.pm:296 +#: ../IkiWiki/Render.pm:299 #, perl-format msgid "%s has multiple possible source pages" msgstr "%s peut être associé à plusieurs pages source." -#: ../IkiWiki/Render.pm:382 +#: ../IkiWiki/Render.pm:385 #, perl-format msgid "removing old page %s" msgstr "Suppression de l'ancienne page %s" -#: ../IkiWiki/Render.pm:423 +#: ../IkiWiki/Render.pm:426 #, perl-format msgid "scanning %s" msgstr "Examen de %s" -#: ../IkiWiki/Render.pm:450 +#: ../IkiWiki/Render.pm:453 #, perl-format msgid "building %s, which links to %s" msgstr "Reconstruction de %s, qui est lié à %s" -#: ../IkiWiki/Render.pm:497 +#: ../IkiWiki/Render.pm:500 #, perl-format msgid "building %s, which depends on %s" msgstr "Reconstruction de %s, qui dépend de %s" -#: ../IkiWiki/Render.pm:533 +#: ../IkiWiki/Render.pm:536 #, perl-format msgid "building %s, to update its backlinks" msgstr "Reconstruction de %s, afin de mettre à jour ses rétroliens" -#: ../IkiWiki/Render.pm:545 +#: ../IkiWiki/Render.pm:548 #, perl-format msgid "removing %s, no longer built by %s" msgstr "Suppression de %s, qui n'est plus rendu par %s" -#: ../IkiWiki/Render.pm:569 +#: ../IkiWiki/Render.pm:572 #, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki : impossible de reconstruire %s" @@ -1175,34 +1174,34 @@ msgstr "Reconstruction du wiki..." msgid "refreshing wiki.." msgstr "Rafraîchissement du wiki..." -#: ../IkiWiki.pm:233 +#: ../IkiWiki.pm:232 msgid "Discussion" msgstr "Discussion" -#: ../IkiWiki.pm:502 +#: ../IkiWiki.pm:501 msgid "Must specify url to wiki with --url when using --cgi" msgstr "" "Vous devez indiquer l'URL du wiki par --url lors de l'utilisation de --cgi" -#: ../IkiWiki.pm:548 +#: ../IkiWiki.pm:547 msgid "cannot use multiple rcs plugins" msgstr "Impossible d'utiliser plusieurs systèmes de contrôle des versions" -#: ../IkiWiki.pm:577 +#: ../IkiWiki.pm:576 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "Impossible de charger le greffon externe nécessaire au greffon %s : %s" -#: ../IkiWiki.pm:1259 +#: ../IkiWiki.pm:1258 #, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "Une boucle de prétraitement a été détectée sur %s à hauteur de %i" -#: ../IkiWiki.pm:1817 +#: ../IkiWiki.pm:1820 msgid "yes" msgstr "oui" -#: ../IkiWiki.pm:1941 +#: ../IkiWiki.pm:1944 #, perl-format msgid "cannot match pages: %s" msgstr "Impossible de trouver les pages %s" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki-gu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-24 18:53-0400\n" +"POT-Creation-Date: 2009-10-09 19:55-0400\n" "PO-Revision-Date: 2007-01-11 16:05+0530\n" "Last-Translator: Kartik Mistry <kartik.mistry@gmail.com>\n" "Language-Team: Gujarati <team@utkarsh.org>\n" @@ -54,7 +54,7 @@ msgstr "પ્રાથમિકતાઓ સંગ્રહાઇ." msgid "You are banned." msgstr "તમારા પર પ્રતિબંધ છે." -#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1277 +#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1276 msgid "Error" msgstr "ક્ષતિ" @@ -399,28 +399,27 @@ msgstr "" msgid "htmltidy failed to parse this html" msgstr "કોઇપણ સ્માઇલીઓ ઉકેલવામાં નિષ્ફળ" -#: ../IkiWiki/Plugin/img.pm:63 +#: ../IkiWiki/Plugin/img.pm:64 #, fuzzy msgid "Image::Magick is not installed" msgstr "પોલિગોન સ્થાપિત નથી" +#: ../IkiWiki/Plugin/img.pm:68 ../IkiWiki/Plugin/img.pm:112 +#, perl-format +msgid "failed to read %s: %s" +msgstr "%s વાંચવામાં નિષ્ફળ: %s" + #: ../IkiWiki/Plugin/img.pm:74 #, perl-format msgid "wrong size format \"%s\" (should be WxH)" msgstr "" -#: ../IkiWiki/Plugin/img.pm:85 ../IkiWiki/Plugin/img.pm:89 -#: ../IkiWiki/Plugin/img.pm:135 -#, perl-format -msgid "failed to read %s: %s" -msgstr "%s વાંચવામાં નિષ્ફળ: %s" - -#: ../IkiWiki/Plugin/img.pm:100 +#: ../IkiWiki/Plugin/img.pm:120 #, perl-format msgid "failed to resize: %s" msgstr "માપ બદલવામાં નિષ્ફળ: %s" -#: ../IkiWiki/Plugin/img.pm:152 +#: ../IkiWiki/Plugin/img.pm:140 #, fuzzy, perl-format msgid "failed to determine size of image %s" msgstr "માપ બદલવામાં નિષ્ફળ: %s" @@ -498,11 +497,11 @@ msgstr "ફીડ મળ્યું નહી" msgid "redir cycle is not allowed" msgstr "ફીડ મળ્યું નહી" -#: ../IkiWiki/Plugin/mirrorlist.pm:42 +#: ../IkiWiki/Plugin/mirrorlist.pm:43 msgid "Mirrors" msgstr "મિરરો" -#: ../IkiWiki/Plugin/mirrorlist.pm:42 +#: ../IkiWiki/Plugin/mirrorlist.pm:43 msgid "Mirror" msgstr "મિરર" @@ -608,7 +607,7 @@ msgstr "" msgid "rebuilding all pages to fix meta titles" msgstr "" -#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:428 +#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:431 #, fuzzy, perl-format msgid "building %s" msgstr "%s સુધારે છે" @@ -1039,47 +1038,47 @@ msgid "" "allow this" msgstr "" -#: ../IkiWiki/Render.pm:289 ../IkiWiki/Render.pm:314 +#: ../IkiWiki/Render.pm:294 ../IkiWiki/Render.pm:321 #, perl-format msgid "skipping bad filename %s" msgstr "ખરાબ ફાઇલ નામ છોડી દે છે %s" -#: ../IkiWiki/Render.pm:296 +#: ../IkiWiki/Render.pm:299 #, perl-format msgid "%s has multiple possible source pages" msgstr "" -#: ../IkiWiki/Render.pm:382 +#: ../IkiWiki/Render.pm:385 #, perl-format msgid "removing old page %s" msgstr "જુનાં પાનાં દૂર કરે છે %s" -#: ../IkiWiki/Render.pm:423 +#: ../IkiWiki/Render.pm:426 #, perl-format msgid "scanning %s" msgstr "%s શોધે છે" -#: ../IkiWiki/Render.pm:450 +#: ../IkiWiki/Render.pm:453 #, fuzzy, perl-format msgid "building %s, which links to %s" msgstr "રેન્ડર કરે છે %s, જે %s સાથે જોડાણ ધરાવે છે" -#: ../IkiWiki/Render.pm:497 +#: ../IkiWiki/Render.pm:500 #, fuzzy, perl-format msgid "building %s, which depends on %s" msgstr "રેન્ડર કરે છે %s, જે %s પર આધારિત છે" -#: ../IkiWiki/Render.pm:533 +#: ../IkiWiki/Render.pm:536 #, fuzzy, perl-format msgid "building %s, to update its backlinks" msgstr "રેન્ડર કરે છે %s, તેનાં પાછળનાં જોડાણો સુધારવા માટે" -#: ../IkiWiki/Render.pm:545 +#: ../IkiWiki/Render.pm:548 #, fuzzy, perl-format msgid "removing %s, no longer built by %s" msgstr "દૂર કરે છે %s, હવે %s વડે રેન્ડર કરાતું નથી" -#: ../IkiWiki/Render.pm:569 +#: ../IkiWiki/Render.pm:572 #, fuzzy, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: %s રેન્ડર કરી શકાતું નથી" @@ -1158,33 +1157,33 @@ msgstr "વીકી ફરીથી બનાવે છે.." msgid "refreshing wiki.." msgstr "વીકીને તાજી કરે છે.." -#: ../IkiWiki.pm:233 +#: ../IkiWiki.pm:232 msgid "Discussion" msgstr "ચર્ચા" -#: ../IkiWiki.pm:502 +#: ../IkiWiki.pm:501 msgid "Must specify url to wiki with --url when using --cgi" msgstr "જ્યારે --cgi ઉપયોગ કરતાં હોય ત્યારે વીકીનું યુઆરએલ સ્પષ્ટ કરવું જ પડશે" -#: ../IkiWiki.pm:548 +#: ../IkiWiki.pm:547 msgid "cannot use multiple rcs plugins" msgstr "" -#: ../IkiWiki.pm:577 +#: ../IkiWiki.pm:576 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "" -#: ../IkiWiki.pm:1259 +#: ../IkiWiki.pm:1258 #, fuzzy, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "%s પર શોધાયેલ લુપ %s પર ચલાવે છે %i ઉંડાણ પર" -#: ../IkiWiki.pm:1817 +#: ../IkiWiki.pm:1820 msgid "yes" msgstr "" -#: ../IkiWiki.pm:1941 +#: ../IkiWiki.pm:1944 #, fuzzy, perl-format msgid "cannot match pages: %s" msgstr "વાંચી શકાતી નથી %s: %s" diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot index 1190ffd52..d073af70d 100644 --- a/po/ikiwiki.pot +++ b/po/ikiwiki.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-24 18:53-0400\n" +"POT-Creation-Date: 2009-10-09 19:55-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -54,7 +54,7 @@ msgstr "" msgid "You are banned." msgstr "" -#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1277 +#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1276 msgid "Error" msgstr "" @@ -390,27 +390,26 @@ msgstr "" msgid "htmltidy failed to parse this html" msgstr "" -#: ../IkiWiki/Plugin/img.pm:63 +#: ../IkiWiki/Plugin/img.pm:64 msgid "Image::Magick is not installed" msgstr "" -#: ../IkiWiki/Plugin/img.pm:74 +#: ../IkiWiki/Plugin/img.pm:68 ../IkiWiki/Plugin/img.pm:112 #, perl-format -msgid "wrong size format \"%s\" (should be WxH)" +msgid "failed to read %s: %s" msgstr "" -#: ../IkiWiki/Plugin/img.pm:85 ../IkiWiki/Plugin/img.pm:89 -#: ../IkiWiki/Plugin/img.pm:135 +#: ../IkiWiki/Plugin/img.pm:74 #, perl-format -msgid "failed to read %s: %s" +msgid "wrong size format \"%s\" (should be WxH)" msgstr "" -#: ../IkiWiki/Plugin/img.pm:100 +#: ../IkiWiki/Plugin/img.pm:120 #, perl-format msgid "failed to resize: %s" msgstr "" -#: ../IkiWiki/Plugin/img.pm:152 +#: ../IkiWiki/Plugin/img.pm:140 #, perl-format msgid "failed to determine size of image %s" msgstr "" @@ -484,11 +483,11 @@ msgstr "" msgid "redir cycle is not allowed" msgstr "" -#: ../IkiWiki/Plugin/mirrorlist.pm:42 +#: ../IkiWiki/Plugin/mirrorlist.pm:43 msgid "Mirrors" msgstr "" -#: ../IkiWiki/Plugin/mirrorlist.pm:42 +#: ../IkiWiki/Plugin/mirrorlist.pm:43 msgid "Mirror" msgstr "" @@ -592,7 +591,7 @@ msgstr "" msgid "rebuilding all pages to fix meta titles" msgstr "" -#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:428 +#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:431 #, perl-format msgid "building %s" msgstr "" @@ -1013,47 +1012,47 @@ msgid "" "allow this" msgstr "" -#: ../IkiWiki/Render.pm:289 ../IkiWiki/Render.pm:314 +#: ../IkiWiki/Render.pm:294 ../IkiWiki/Render.pm:321 #, perl-format msgid "skipping bad filename %s" msgstr "" -#: ../IkiWiki/Render.pm:296 +#: ../IkiWiki/Render.pm:299 #, perl-format msgid "%s has multiple possible source pages" msgstr "" -#: ../IkiWiki/Render.pm:382 +#: ../IkiWiki/Render.pm:385 #, perl-format msgid "removing old page %s" msgstr "" -#: ../IkiWiki/Render.pm:423 +#: ../IkiWiki/Render.pm:426 #, perl-format msgid "scanning %s" msgstr "" -#: ../IkiWiki/Render.pm:450 +#: ../IkiWiki/Render.pm:453 #, perl-format msgid "building %s, which links to %s" msgstr "" -#: ../IkiWiki/Render.pm:497 +#: ../IkiWiki/Render.pm:500 #, perl-format msgid "building %s, which depends on %s" msgstr "" -#: ../IkiWiki/Render.pm:533 +#: ../IkiWiki/Render.pm:536 #, perl-format msgid "building %s, to update its backlinks" msgstr "" -#: ../IkiWiki/Render.pm:545 +#: ../IkiWiki/Render.pm:548 #, perl-format msgid "removing %s, no longer built by %s" msgstr "" -#: ../IkiWiki/Render.pm:569 +#: ../IkiWiki/Render.pm:572 #, perl-format msgid "ikiwiki: cannot build %s" msgstr "" @@ -1132,33 +1131,33 @@ msgstr "" msgid "refreshing wiki.." msgstr "" -#: ../IkiWiki.pm:233 +#: ../IkiWiki.pm:232 msgid "Discussion" msgstr "" -#: ../IkiWiki.pm:502 +#: ../IkiWiki.pm:501 msgid "Must specify url to wiki with --url when using --cgi" msgstr "" -#: ../IkiWiki.pm:548 +#: ../IkiWiki.pm:547 msgid "cannot use multiple rcs plugins" msgstr "" -#: ../IkiWiki.pm:577 +#: ../IkiWiki.pm:576 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "" -#: ../IkiWiki.pm:1259 +#: ../IkiWiki.pm:1258 #, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "" -#: ../IkiWiki.pm:1817 +#: ../IkiWiki.pm:1820 msgid "yes" msgstr "" -#: ../IkiWiki.pm:1941 +#: ../IkiWiki.pm:1944 #, perl-format msgid "cannot match pages: %s" msgstr "" @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: Ikiwiki\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-24 18:53-0400\n" +"POT-Creation-Date: 2009-10-09 19:55-0400\n" "PO-Revision-Date: 2009-08-16 11:01+0100\n" "Last-Translator: Luca Bruno <lucab@debian.org>\n" "Language-Team: Italian TP <tp@lists.linux.it>\n" @@ -53,7 +53,7 @@ msgstr "Preferenze salvate." msgid "You are banned." msgstr "Avete ricevuto un ban." -#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1277 +#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1276 msgid "Error" msgstr "Errore" @@ -396,27 +396,26 @@ msgstr "" msgid "htmltidy failed to parse this html" msgstr "impossibile interpretare gli smile" -#: ../IkiWiki/Plugin/img.pm:63 +#: ../IkiWiki/Plugin/img.pm:64 msgid "Image::Magick is not installed" msgstr "Image::Magick non è installato" +#: ../IkiWiki/Plugin/img.pm:68 ../IkiWiki/Plugin/img.pm:112 +#, perl-format +msgid "failed to read %s: %s" +msgstr "impossibile leggere %s: %s" + #: ../IkiWiki/Plugin/img.pm:74 #, perl-format msgid "wrong size format \"%s\" (should be WxH)" msgstr "Formato dimensione «%s» non valido (dovrebbe essere LxA)" -#: ../IkiWiki/Plugin/img.pm:85 ../IkiWiki/Plugin/img.pm:89 -#: ../IkiWiki/Plugin/img.pm:135 -#, perl-format -msgid "failed to read %s: %s" -msgstr "impossibile leggere %s: %s" - -#: ../IkiWiki/Plugin/img.pm:100 +#: ../IkiWiki/Plugin/img.pm:120 #, perl-format msgid "failed to resize: %s" msgstr "impossibile ridimensionare: %s" -#: ../IkiWiki/Plugin/img.pm:152 +#: ../IkiWiki/Plugin/img.pm:140 #, perl-format msgid "failed to determine size of image %s" msgstr "impossibile determinare la dimensione dell'immagine %s" @@ -493,11 +492,11 @@ msgstr "pagina di reindirizzamento non trovata" msgid "redir cycle is not allowed" msgstr "ciclo di reindirizzamento non ammesso" -#: ../IkiWiki/Plugin/mirrorlist.pm:42 +#: ../IkiWiki/Plugin/mirrorlist.pm:43 msgid "Mirrors" msgstr "Mirror" -#: ../IkiWiki/Plugin/mirrorlist.pm:42 +#: ../IkiWiki/Plugin/mirrorlist.pm:43 msgid "Mirror" msgstr "Mirror" @@ -609,7 +608,7 @@ msgstr "" msgid "rebuilding all pages to fix meta titles" msgstr "rigenerazione di tutte le pagine per sistemare i meta-titoli" -#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:428 +#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:431 #, perl-format msgid "building %s" msgstr "compilazione di %s" @@ -1044,47 +1043,47 @@ msgstr "" "collegamento simbolico trovato nel percorso srcdir (%s) -- impostare " "allow_symlinks_before_srcdir per abilitare questa configurazione" -#: ../IkiWiki/Render.pm:289 ../IkiWiki/Render.pm:314 +#: ../IkiWiki/Render.pm:294 ../IkiWiki/Render.pm:321 #, perl-format msgid "skipping bad filename %s" msgstr "ignorato il file dal nome scorretto %s" -#: ../IkiWiki/Render.pm:296 +#: ../IkiWiki/Render.pm:299 #, perl-format msgid "%s has multiple possible source pages" msgstr "%s ha diverse pagine sorgenti possibili" -#: ../IkiWiki/Render.pm:382 +#: ../IkiWiki/Render.pm:385 #, perl-format msgid "removing old page %s" msgstr "rimozione della vecchia pagina %s" -#: ../IkiWiki/Render.pm:423 +#: ../IkiWiki/Render.pm:426 #, perl-format msgid "scanning %s" msgstr "scansione %s" -#: ../IkiWiki/Render.pm:450 +#: ../IkiWiki/Render.pm:453 #, perl-format msgid "building %s, which links to %s" msgstr "compilazione di %s, che è collegato a %s" -#: ../IkiWiki/Render.pm:497 +#: ../IkiWiki/Render.pm:500 #, perl-format msgid "building %s, which depends on %s" msgstr "compilazione di %s, che dipende da %s" -#: ../IkiWiki/Render.pm:533 +#: ../IkiWiki/Render.pm:536 #, perl-format msgid "building %s, to update its backlinks" msgstr "compilazione di %s, per aggiornare i collegamenti ai precedenti" -#: ../IkiWiki/Render.pm:545 +#: ../IkiWiki/Render.pm:548 #, perl-format msgid "removing %s, no longer built by %s" msgstr "rimozione di %s, non più richiesto da %s" -#: ../IkiWiki/Render.pm:569 +#: ../IkiWiki/Render.pm:572 #, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: impossibile compilare %s" @@ -1164,33 +1163,33 @@ msgstr "ricostruzione wiki..." msgid "refreshing wiki.." msgstr "aggiornamento wiki..." -#: ../IkiWiki.pm:233 +#: ../IkiWiki.pm:232 msgid "Discussion" msgstr "Discussione" -#: ../IkiWiki.pm:502 +#: ../IkiWiki.pm:501 msgid "Must specify url to wiki with --url when using --cgi" msgstr "Occorre specificare l'url del wiki tramite --url quando si usa --cgi" -#: ../IkiWiki.pm:548 +#: ../IkiWiki.pm:547 msgid "cannot use multiple rcs plugins" msgstr "impossibile usare più plugin rcs" -#: ../IkiWiki.pm:577 +#: ../IkiWiki.pm:576 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "impossibile caricare il plugin esterno per il plugin %s: %s" -#: ../IkiWiki.pm:1259 +#: ../IkiWiki.pm:1258 #, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "ciclo del preprocessore individuato su %s alla profondità %i" -#: ../IkiWiki.pm:1817 +#: ../IkiWiki.pm:1820 msgid "yes" msgstr "sì" -#: ../IkiWiki.pm:1941 +#: ../IkiWiki.pm:1944 #, perl-format msgid "cannot match pages: %s" msgstr "impossibile trovare pagine corrispondenti: %s" @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki 1.51\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-24 18:53-0400\n" +"POT-Creation-Date: 2009-10-09 19:55-0400\n" "PO-Revision-Date: 2007-04-27 22:05+0200\n" "Last-Translator: Pawel Tecza <ptecza@net.icm.edu.pl>\n" "Language-Team: Debian L10n Polish <debian-l10n-polish@lists.debian.org>\n" @@ -57,7 +57,7 @@ msgstr "Preferencje zapisane." msgid "You are banned." msgstr "Twój dostęp został zabroniony przez administratora." -#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1277 +#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1276 msgid "Error" msgstr "Błąd" @@ -404,28 +404,27 @@ msgstr "" msgid "htmltidy failed to parse this html" msgstr "awaria w trakcie przetwarzania emitoikonki" -#: ../IkiWiki/Plugin/img.pm:63 +#: ../IkiWiki/Plugin/img.pm:64 #, fuzzy msgid "Image::Magick is not installed" msgstr "wtyczka polygen nie jest zainstalowana" +#: ../IkiWiki/Plugin/img.pm:68 ../IkiWiki/Plugin/img.pm:112 +#, fuzzy, perl-format +msgid "failed to read %s: %s" +msgstr "awaria w trakcie odczytu %s: %s" + #: ../IkiWiki/Plugin/img.pm:74 #, perl-format msgid "wrong size format \"%s\" (should be WxH)" msgstr "" -#: ../IkiWiki/Plugin/img.pm:85 ../IkiWiki/Plugin/img.pm:89 -#: ../IkiWiki/Plugin/img.pm:135 -#, fuzzy, perl-format -msgid "failed to read %s: %s" -msgstr "awaria w trakcie odczytu %s: %s" - -#: ../IkiWiki/Plugin/img.pm:100 +#: ../IkiWiki/Plugin/img.pm:120 #, fuzzy, perl-format msgid "failed to resize: %s" msgstr "awaria w trakcie zmiany rozmiaru: %s" -#: ../IkiWiki/Plugin/img.pm:152 +#: ../IkiWiki/Plugin/img.pm:140 #, fuzzy, perl-format msgid "failed to determine size of image %s" msgstr "awaria w trakcie zmiany rozmiaru: %s" @@ -511,11 +510,11 @@ msgstr "nieznaleziony kanał RSS" msgid "redir cycle is not allowed" msgstr "nieznaleziony kanał RSS" -#: ../IkiWiki/Plugin/mirrorlist.pm:42 +#: ../IkiWiki/Plugin/mirrorlist.pm:43 msgid "Mirrors" msgstr "Kopie lustrzane" -#: ../IkiWiki/Plugin/mirrorlist.pm:42 +#: ../IkiWiki/Plugin/mirrorlist.pm:43 msgid "Mirror" msgstr "Kopia lustrzana" @@ -621,7 +620,7 @@ msgstr "" msgid "rebuilding all pages to fix meta titles" msgstr "" -#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:428 +#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:431 #, fuzzy, perl-format msgid "building %s" msgstr "edycja %s" @@ -1061,47 +1060,47 @@ msgid "" "allow this" msgstr "" -#: ../IkiWiki/Render.pm:289 ../IkiWiki/Render.pm:314 +#: ../IkiWiki/Render.pm:294 ../IkiWiki/Render.pm:321 #, perl-format msgid "skipping bad filename %s" msgstr "pomijanie nieprawidłowej nazwy pliku %s" -#: ../IkiWiki/Render.pm:296 +#: ../IkiWiki/Render.pm:299 #, perl-format msgid "%s has multiple possible source pages" msgstr "" -#: ../IkiWiki/Render.pm:382 +#: ../IkiWiki/Render.pm:385 #, perl-format msgid "removing old page %s" msgstr "usuwanie starej strony %s" -#: ../IkiWiki/Render.pm:423 +#: ../IkiWiki/Render.pm:426 #, perl-format msgid "scanning %s" msgstr "skanowanie %s" -#: ../IkiWiki/Render.pm:450 +#: ../IkiWiki/Render.pm:453 #, fuzzy, perl-format msgid "building %s, which links to %s" msgstr "renderowanie %s z odnośnikiem do %s" -#: ../IkiWiki/Render.pm:497 +#: ../IkiWiki/Render.pm:500 #, fuzzy, perl-format msgid "building %s, which depends on %s" msgstr "renderowanie %s zależącego od %s" -#: ../IkiWiki/Render.pm:533 +#: ../IkiWiki/Render.pm:536 #, fuzzy, perl-format msgid "building %s, to update its backlinks" msgstr "renderowanie %s w celu aktualizacji powrotnych odnośników" -#: ../IkiWiki/Render.pm:545 +#: ../IkiWiki/Render.pm:548 #, fuzzy, perl-format msgid "removing %s, no longer built by %s" msgstr "usuwanie %s nie tworzonego już przez %s" -#: ../IkiWiki/Render.pm:569 +#: ../IkiWiki/Render.pm:572 #, fuzzy, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: awaria w trakcie tworzenia %s" @@ -1180,35 +1179,35 @@ msgstr "przebudowywanie wiki..." msgid "refreshing wiki.." msgstr "odświeżanie wiki..." -#: ../IkiWiki.pm:233 +#: ../IkiWiki.pm:232 msgid "Discussion" msgstr "Dyskusja" -#: ../IkiWiki.pm:502 +#: ../IkiWiki.pm:501 msgid "Must specify url to wiki with --url when using --cgi" msgstr "" "Użycie parametru --cgi wymaga podania adresu URL do wiki za pomocą parametru " "--url" -#: ../IkiWiki.pm:548 +#: ../IkiWiki.pm:547 msgid "cannot use multiple rcs plugins" msgstr "" -#: ../IkiWiki.pm:577 +#: ../IkiWiki.pm:576 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "" -#: ../IkiWiki.pm:1259 +#: ../IkiWiki.pm:1258 #, fuzzy, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "polecenie preprocesora %s wykryte w %s na głębokości %i" -#: ../IkiWiki.pm:1817 +#: ../IkiWiki.pm:1820 msgid "yes" msgstr "" -#: ../IkiWiki.pm:1941 +#: ../IkiWiki.pm:1944 #, fuzzy, perl-format msgid "cannot match pages: %s" msgstr "awaria w trakcie odczytu %s: %s" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-24 18:53-0400\n" +"POT-Creation-Date: 2009-10-09 19:55-0400\n" "PO-Revision-Date: 2007-01-10 23:47+0100\n" "Last-Translator: Daniel Nylander <po@danielnylander.se>\n" "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n" @@ -54,7 +54,7 @@ msgstr "Inställningar sparades." msgid "You are banned." msgstr "Du är bannlyst." -#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1277 +#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1276 msgid "Error" msgstr "Fel" @@ -401,28 +401,27 @@ msgstr "" msgid "htmltidy failed to parse this html" msgstr "misslyckades med att tolka smilisar, inaktiverar instick" -#: ../IkiWiki/Plugin/img.pm:63 +#: ../IkiWiki/Plugin/img.pm:64 #, fuzzy msgid "Image::Magick is not installed" msgstr "polygen inte installerad" +#: ../IkiWiki/Plugin/img.pm:68 ../IkiWiki/Plugin/img.pm:112 +#, fuzzy, perl-format +msgid "failed to read %s: %s" +msgstr "misslyckades med att skriva %s: %s" + #: ../IkiWiki/Plugin/img.pm:74 #, perl-format msgid "wrong size format \"%s\" (should be WxH)" msgstr "" -#: ../IkiWiki/Plugin/img.pm:85 ../IkiWiki/Plugin/img.pm:89 -#: ../IkiWiki/Plugin/img.pm:135 -#, fuzzy, perl-format -msgid "failed to read %s: %s" -msgstr "misslyckades med att skriva %s: %s" - -#: ../IkiWiki/Plugin/img.pm:100 +#: ../IkiWiki/Plugin/img.pm:120 #, fuzzy, perl-format msgid "failed to resize: %s" msgstr "misslyckades med att skriva %s: %s" -#: ../IkiWiki/Plugin/img.pm:152 +#: ../IkiWiki/Plugin/img.pm:140 #, fuzzy, perl-format msgid "failed to determine size of image %s" msgstr "misslyckades med att skriva %s: %s" @@ -504,11 +503,11 @@ msgstr "mallen %s hittades inte" msgid "redir cycle is not allowed" msgstr "mallen %s hittades inte" -#: ../IkiWiki/Plugin/mirrorlist.pm:42 +#: ../IkiWiki/Plugin/mirrorlist.pm:43 msgid "Mirrors" msgstr "Speglar" -#: ../IkiWiki/Plugin/mirrorlist.pm:42 +#: ../IkiWiki/Plugin/mirrorlist.pm:43 msgid "Mirror" msgstr "Spegel" @@ -614,7 +613,7 @@ msgstr "" msgid "rebuilding all pages to fix meta titles" msgstr "" -#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:428 +#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:431 #, fuzzy, perl-format msgid "building %s" msgstr "redigerar %s" @@ -1048,47 +1047,47 @@ msgid "" "allow this" msgstr "" -#: ../IkiWiki/Render.pm:289 ../IkiWiki/Render.pm:314 +#: ../IkiWiki/Render.pm:294 ../IkiWiki/Render.pm:321 #, perl-format msgid "skipping bad filename %s" msgstr "hoppar över felaktigt filnamn %s" -#: ../IkiWiki/Render.pm:296 +#: ../IkiWiki/Render.pm:299 #, perl-format msgid "%s has multiple possible source pages" msgstr "" -#: ../IkiWiki/Render.pm:382 +#: ../IkiWiki/Render.pm:385 #, perl-format msgid "removing old page %s" msgstr "tar bort gammal sida %s" -#: ../IkiWiki/Render.pm:423 +#: ../IkiWiki/Render.pm:426 #, perl-format msgid "scanning %s" msgstr "söker av %s" -#: ../IkiWiki/Render.pm:450 +#: ../IkiWiki/Render.pm:453 #, fuzzy, perl-format msgid "building %s, which links to %s" msgstr "ritar upp %s, vilken länkar till %s" -#: ../IkiWiki/Render.pm:497 +#: ../IkiWiki/Render.pm:500 #, fuzzy, perl-format msgid "building %s, which depends on %s" msgstr "ritar upp %s, vilken är beroende av %s" -#: ../IkiWiki/Render.pm:533 +#: ../IkiWiki/Render.pm:536 #, fuzzy, perl-format msgid "building %s, to update its backlinks" msgstr "ritar upp %s, för att uppdatera dess bakåtlänkar" -#: ../IkiWiki/Render.pm:545 +#: ../IkiWiki/Render.pm:548 #, fuzzy, perl-format msgid "removing %s, no longer built by %s" msgstr "tar bort %s, som inte längre ritas upp av %s" -#: ../IkiWiki/Render.pm:569 +#: ../IkiWiki/Render.pm:572 #, fuzzy, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: kan inte rita upp %s" @@ -1167,33 +1166,33 @@ msgstr "bygger om wiki.." msgid "refreshing wiki.." msgstr "uppdaterar wiki.." -#: ../IkiWiki.pm:233 +#: ../IkiWiki.pm:232 msgid "Discussion" msgstr "Diskussion" -#: ../IkiWiki.pm:502 +#: ../IkiWiki.pm:501 msgid "Must specify url to wiki with --url when using --cgi" msgstr "Måste ange url till wiki med --url när --cgi används" -#: ../IkiWiki.pm:548 +#: ../IkiWiki.pm:547 msgid "cannot use multiple rcs plugins" msgstr "" -#: ../IkiWiki.pm:577 +#: ../IkiWiki.pm:576 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "" -#: ../IkiWiki.pm:1259 +#: ../IkiWiki.pm:1258 #, fuzzy, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "%s förbehandlingsslinga detekterades på %s, djup %i" -#: ../IkiWiki.pm:1817 +#: ../IkiWiki.pm:1820 msgid "yes" msgstr "" -#: ../IkiWiki.pm:1941 +#: ../IkiWiki.pm:1944 #, fuzzy, perl-format msgid "cannot match pages: %s" msgstr "kan inte läsa %s: %s" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-24 18:53-0400\n" +"POT-Creation-Date: 2009-10-09 19:55-0400\n" "PO-Revision-Date: 2007-01-13 15:31+1030\n" "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n" "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n" @@ -55,7 +55,7 @@ msgstr "Tùy thích đã được lưu." msgid "You are banned." msgstr "Bạn bị cấm ra." -#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1277 +#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1276 msgid "Error" msgstr "Lỗi" @@ -402,28 +402,27 @@ msgstr "" msgid "htmltidy failed to parse this html" msgstr "lỗi phân tách hình cười nào nên tắt bổ sung" -#: ../IkiWiki/Plugin/img.pm:63 +#: ../IkiWiki/Plugin/img.pm:64 #, fuzzy msgid "Image::Magick is not installed" msgstr "chưa cài đặt polygen" +#: ../IkiWiki/Plugin/img.pm:68 ../IkiWiki/Plugin/img.pm:112 +#, fuzzy, perl-format +msgid "failed to read %s: %s" +msgstr "lỗi ghi %s: %s" + #: ../IkiWiki/Plugin/img.pm:74 #, perl-format msgid "wrong size format \"%s\" (should be WxH)" msgstr "" -#: ../IkiWiki/Plugin/img.pm:85 ../IkiWiki/Plugin/img.pm:89 -#: ../IkiWiki/Plugin/img.pm:135 -#, fuzzy, perl-format -msgid "failed to read %s: %s" -msgstr "lỗi ghi %s: %s" - -#: ../IkiWiki/Plugin/img.pm:100 +#: ../IkiWiki/Plugin/img.pm:120 #, fuzzy, perl-format msgid "failed to resize: %s" msgstr "lỗi ghi %s: %s" -#: ../IkiWiki/Plugin/img.pm:152 +#: ../IkiWiki/Plugin/img.pm:140 #, fuzzy, perl-format msgid "failed to determine size of image %s" msgstr "lỗi ghi %s: %s" @@ -505,11 +504,11 @@ msgstr "không tìm thấy mẫu %s" msgid "redir cycle is not allowed" msgstr "không tìm thấy mẫu %s" -#: ../IkiWiki/Plugin/mirrorlist.pm:42 +#: ../IkiWiki/Plugin/mirrorlist.pm:43 msgid "Mirrors" msgstr "Nhân bản" -#: ../IkiWiki/Plugin/mirrorlist.pm:42 +#: ../IkiWiki/Plugin/mirrorlist.pm:43 msgid "Mirror" msgstr "Nhân bản" @@ -615,7 +614,7 @@ msgstr "" msgid "rebuilding all pages to fix meta titles" msgstr "" -#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:428 +#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:431 #, fuzzy, perl-format msgid "building %s" msgstr "đang sửa %s" @@ -1049,47 +1048,47 @@ msgid "" "allow this" msgstr "" -#: ../IkiWiki/Render.pm:289 ../IkiWiki/Render.pm:314 +#: ../IkiWiki/Render.pm:294 ../IkiWiki/Render.pm:321 #, perl-format msgid "skipping bad filename %s" msgstr "đang bỏ qua tên tập tin sai %s" -#: ../IkiWiki/Render.pm:296 +#: ../IkiWiki/Render.pm:299 #, perl-format msgid "%s has multiple possible source pages" msgstr "" -#: ../IkiWiki/Render.pm:382 +#: ../IkiWiki/Render.pm:385 #, perl-format msgid "removing old page %s" msgstr "đang gỡ bỏ trang cũ %s" -#: ../IkiWiki/Render.pm:423 +#: ../IkiWiki/Render.pm:426 #, perl-format msgid "scanning %s" msgstr "đang quét %s" -#: ../IkiWiki/Render.pm:450 +#: ../IkiWiki/Render.pm:453 #, fuzzy, perl-format msgid "building %s, which links to %s" msgstr "đang vẽ %s mà liên kết tới %s" -#: ../IkiWiki/Render.pm:497 +#: ../IkiWiki/Render.pm:500 #, fuzzy, perl-format msgid "building %s, which depends on %s" msgstr "đang vẽ %s mà phụ thuộc vào %s" -#: ../IkiWiki/Render.pm:533 +#: ../IkiWiki/Render.pm:536 #, fuzzy, perl-format msgid "building %s, to update its backlinks" msgstr "đang vẽ %s để cập nhật các liên kết ngược của nó" -#: ../IkiWiki/Render.pm:545 +#: ../IkiWiki/Render.pm:548 #, fuzzy, perl-format msgid "removing %s, no longer built by %s" msgstr "đang gỡ bỏ %s, không còn được vẽ lại bởi %s" -#: ../IkiWiki/Render.pm:569 +#: ../IkiWiki/Render.pm:572 #, fuzzy, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: không thể vẽ %s" @@ -1168,33 +1167,33 @@ msgstr "đang xây dựng lại wiki.." msgid "refreshing wiki.." msgstr "đang làm tươi wiki.." -#: ../IkiWiki.pm:233 +#: ../IkiWiki.pm:232 msgid "Discussion" msgstr "Thảo luận" -#: ../IkiWiki.pm:502 +#: ../IkiWiki.pm:501 msgid "Must specify url to wiki with --url when using --cgi" msgstr "Cần phải xác định địa chỉ URL tới wiki với « --url » khi dùng « --cgi »" -#: ../IkiWiki.pm:548 +#: ../IkiWiki.pm:547 msgid "cannot use multiple rcs plugins" msgstr "" -#: ../IkiWiki.pm:577 +#: ../IkiWiki.pm:576 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "" -#: ../IkiWiki.pm:1259 +#: ../IkiWiki.pm:1258 #, fuzzy, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "vòng lặp tiền xử lý %s được phát hiện trên %s ở độ sâu %i" -#: ../IkiWiki.pm:1817 +#: ../IkiWiki.pm:1820 msgid "yes" msgstr "" -#: ../IkiWiki.pm:1941 +#: ../IkiWiki.pm:1944 #, fuzzy, perl-format msgid "cannot match pages: %s" msgstr "không thể đọc %s: %s" |