summaryrefslogtreecommitdiff
path: root/po
diff options
context:
space:
mode:
Diffstat (limited to 'po')
-rw-r--r--po/bg.po271
-rw-r--r--po/cs.po274
-rw-r--r--po/da.po408
-rw-r--r--po/de.po275
-rw-r--r--po/es.po272
-rw-r--r--po/fr.po324
-rw-r--r--po/gu.po270
-rw-r--r--po/ikiwiki.pot267
-rw-r--r--po/it.po275
-rw-r--r--po/pl.po271
-rwxr-xr-xpo/po2wiki3
-rw-r--r--po/sv.po271
-rw-r--r--po/tr.po265
-rw-r--r--po/underlay.setup16
-rw-r--r--po/vi.po271
15 files changed, 1986 insertions, 1747 deletions
diff --git a/po/bg.po b/po/bg.po
index 8534c6d85..0d631d812 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ikiwiki-bg\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-04 09:22-0400\n"
+"POT-Creation-Date: 2010-10-23 17:21-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"
@@ -64,77 +64,82 @@ msgstr ""
msgid "Nothing to do right now, all feeds are up-to-date!"
msgstr ""
-#: ../IkiWiki/Plugin/aggregate.pm:220
+#: ../IkiWiki/Plugin/aggregate.pm:222
#, fuzzy, perl-format
msgid "missing %s parameter"
msgstr "липсващ параметър „id” на шаблона"
-#: ../IkiWiki/Plugin/aggregate.pm:255
+#: ../IkiWiki/Plugin/aggregate.pm:257
msgid "new feed"
msgstr "нов източник"
-#: ../IkiWiki/Plugin/aggregate.pm:269
+#: ../IkiWiki/Plugin/aggregate.pm:271
msgid "posts"
msgstr "съобщения"
-#: ../IkiWiki/Plugin/aggregate.pm:271
+#: ../IkiWiki/Plugin/aggregate.pm:273
msgid "new"
msgstr "ново"
-#: ../IkiWiki/Plugin/aggregate.pm:455
+#: ../IkiWiki/Plugin/aggregate.pm:457
#, perl-format
msgid "expiring %s (%s days old)"
msgstr "премахване на „%s” (на %s дни)"
-#: ../IkiWiki/Plugin/aggregate.pm:462
+#: ../IkiWiki/Plugin/aggregate.pm:464
#, perl-format
msgid "expiring %s"
msgstr "премахване на „%s”"
-#: ../IkiWiki/Plugin/aggregate.pm:489
+#: ../IkiWiki/Plugin/aggregate.pm:491
#, perl-format
msgid "last checked %s"
msgstr ""
-#: ../IkiWiki/Plugin/aggregate.pm:493
+#: ../IkiWiki/Plugin/aggregate.pm:495
#, perl-format
msgid "checking feed %s ..."
msgstr "проверка на източника „%s”"
-#: ../IkiWiki/Plugin/aggregate.pm:498
+#: ../IkiWiki/Plugin/aggregate.pm:500
#, perl-format
msgid "could not find feed at %s"
msgstr "не е намерен източник на адрес „%s”"
-#: ../IkiWiki/Plugin/aggregate.pm:517
+#: ../IkiWiki/Plugin/aggregate.pm:519
#, fuzzy
msgid "feed not found"
msgstr "шаблонът „%s” не е намерен"
-#: ../IkiWiki/Plugin/aggregate.pm:528
+#: ../IkiWiki/Plugin/aggregate.pm:530
#, perl-format
msgid "(invalid UTF-8 stripped from feed)"
msgstr ""
-#: ../IkiWiki/Plugin/aggregate.pm:536
+#: ../IkiWiki/Plugin/aggregate.pm:538
#, perl-format
msgid "(feed entities escaped)"
msgstr ""
-#: ../IkiWiki/Plugin/aggregate.pm:544
+#: ../IkiWiki/Plugin/aggregate.pm:546
msgid "feed crashed XML::Feed!"
msgstr "данните от източника предизвикаха грешка в модула XML::Feed!"
-#: ../IkiWiki/Plugin/aggregate.pm:630
+#: ../IkiWiki/Plugin/aggregate.pm:632
#, perl-format
msgid "creating new page %s"
msgstr "създаване на нова страницa „%s”"
+#: ../IkiWiki/Plugin/aggregate.pm:652 ../IkiWiki/Plugin/edittemplate.pm:133
+#, fuzzy
+msgid "failed to process template:"
+msgstr "грешка при обработване на шаблона"
+
#: ../IkiWiki/Plugin/amazon_s3.pm:31
msgid "deleting bucket.."
msgstr ""
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:229
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:226
msgid "done"
msgstr "готово"
@@ -179,7 +184,7 @@ msgstr ""
msgid "automatic index generation"
msgstr ""
-#: ../IkiWiki/Plugin/blogspam.pm:110
+#: ../IkiWiki/Plugin/blogspam.pm:112
msgid ""
"Sorry, but that looks like spam to <a href=\"http://blogspam.net/"
"\">blogspam</a>: "
@@ -256,7 +261,7 @@ msgstr ""
msgid "Added a comment: %s"
msgstr ""
-#: ../IkiWiki/Plugin/comments.pm:573 ../IkiWiki/Plugin/websetup.pm:268
+#: ../IkiWiki/Plugin/comments.pm:573 ../IkiWiki/Plugin/websetup.pm:269
msgid "you are not logged in as an admin"
msgstr ""
@@ -282,18 +287,18 @@ msgstr[1] ""
msgid "Comment"
msgstr ""
-#: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:31
-#: ../IkiWiki/Plugin/cutpaste.pm:46 ../IkiWiki/Plugin/cutpaste.pm:62
+#: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:46
+#: ../IkiWiki/Plugin/cutpaste.pm:60 ../IkiWiki/Plugin/cutpaste.pm:75
#: ../IkiWiki/Plugin/testpagespec.pm:26
#, perl-format
msgid "%s parameter is required"
msgstr ""
-#: ../IkiWiki/Plugin/cutpaste.pm:67
+#: ../IkiWiki/Plugin/cutpaste.pm:80
msgid "no text was copied in this page"
msgstr ""
-#: ../IkiWiki/Plugin/cutpaste.pm:70
+#: ../IkiWiki/Plugin/cutpaste.pm:83
#, perl-format
msgid "no text was copied in this page with id %s"
msgstr ""
@@ -320,27 +325,21 @@ msgstr "създаване на %s"
msgid "editing %s"
msgstr "промяна на %s"
-#: ../IkiWiki/Plugin/edittemplate.pm:52
+#: ../IkiWiki/Plugin/edittemplate.pm:54
#, fuzzy
msgid "template not specified"
msgstr "шаблонът „%s” не е намерен"
-#: ../IkiWiki/Plugin/edittemplate.pm:55
+#: ../IkiWiki/Plugin/edittemplate.pm:57
#, fuzzy
msgid "match not specified"
msgstr "не е указан файл на обвивката"
-#: ../IkiWiki/Plugin/edittemplate.pm:70
+#: ../IkiWiki/Plugin/edittemplate.pm:72
#, perl-format
msgid "edittemplate %s registered for %s"
msgstr ""
-#: ../IkiWiki/Plugin/edittemplate.pm:131 ../IkiWiki/Plugin/inline.pm:339
-#: ../IkiWiki/Plugin/template.pm:44
-#, fuzzy
-msgid "failed to process template:"
-msgstr "грешка при обработване на шаблона"
-
#: ../IkiWiki/Plugin/format.pm:30
msgid "must specify format and text"
msgstr ""
@@ -369,23 +368,31 @@ msgstr "грешка при четене на „%s”: %s"
msgid "%s is an attachment, not a page."
msgstr ""
-#: ../IkiWiki/Plugin/git.pm:742 ../IkiWiki/Plugin/git.pm:760
-#: ../IkiWiki/Receive.pm:129
+#: ../IkiWiki/Plugin/git.pm:764 ../IkiWiki/Plugin/git.pm:827
+#: ../IkiWiki.pm:1580
#, perl-format
msgid "you are not allowed to change %s"
msgstr ""
-#: ../IkiWiki/Plugin/git.pm:782
+#: ../IkiWiki/Plugin/git.pm:786
#, perl-format
msgid "you cannot act on a file with mode %s"
msgstr ""
-#: ../IkiWiki/Plugin/git.pm:786
+#: ../IkiWiki/Plugin/git.pm:790
msgid "you are not allowed to change file modes"
msgstr ""
-#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:137
-#: ../IkiWiki/Plugin/search.pm:38
+#: ../IkiWiki/Plugin/git.pm:861
+msgid "you are not allowed to revert a merge"
+msgstr ""
+
+#: ../IkiWiki/Plugin/git.pm:877
+#, fuzzy, perl-format
+msgid "Failed to revert commit %s"
+msgstr "крешка при компилиране на файла %s"
+
+#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/search.pm:38
#, fuzzy, perl-format
msgid "Must specify %s when using the %s plugin"
msgstr "При използване на приеставката „search” е необходимо е да се укаже %s"
@@ -399,22 +406,22 @@ msgstr "приставката „linkmap”: грешка при изпълне
msgid "prog not a valid graphviz program"
msgstr ""
-#: ../IkiWiki/Plugin/highlight.pm:48
+#: ../IkiWiki/Plugin/highlight.pm:64
#, perl-format
msgid "tohighlight contains unknown file type '%s'"
msgstr ""
-#: ../IkiWiki/Plugin/highlight.pm:59
+#: ../IkiWiki/Plugin/highlight.pm:75
#, perl-format
msgid "Source code: %s"
msgstr ""
-#: ../IkiWiki/Plugin/highlight.pm:124
+#: ../IkiWiki/Plugin/highlight.pm:140
msgid ""
"warning: highlight perl module not available; falling back to pass through"
msgstr ""
-#: ../IkiWiki/Plugin/htmltidy.pm:50
+#: ../IkiWiki/Plugin/htmltidy.pm:62
#, fuzzy
msgid "htmltidy failed to parse this html"
msgstr "няма разпознати усмивки; изключване на приставката „smiley”"
@@ -469,12 +476,12 @@ msgstr ""
msgid "Add a new post titled:"
msgstr ""
-#: ../IkiWiki/Plugin/inline.pm:342
-#, perl-format
-msgid "template %s not found"
-msgstr "шаблонът „%s” не е намерен"
+#: ../IkiWiki/Plugin/inline.pm:339 ../IkiWiki/Plugin/template.pm:44
+#, fuzzy, perl-format
+msgid "failed to process template %s"
+msgstr "грешка при обработване на шаблона"
-#: ../IkiWiki/Plugin/inline.pm:633
+#: ../IkiWiki/Plugin/inline.pm:630
msgid "RPC::XML::Client not found, not pinging"
msgstr "модулът „RPC::XML::Client” не е намерен; източникът не е проверен"
@@ -505,22 +512,22 @@ msgstr ""
"грешка при зареждането на perl-модула „Markdown.pm” (%s) или „/usr/bin/"
"markdown” (%s)"
-#: ../IkiWiki/Plugin/meta.pm:174
+#: ../IkiWiki/Plugin/meta.pm:175
#, fuzzy
msgid "stylesheet not found"
msgstr "шаблонът „%s” не е намерен"
-#: ../IkiWiki/Plugin/meta.pm:212
+#: ../IkiWiki/Plugin/meta.pm:217
#, fuzzy
msgid "redir page not found"
msgstr "шаблонът „%s” не е намерен"
-#: ../IkiWiki/Plugin/meta.pm:226
+#: ../IkiWiki/Plugin/meta.pm:231
#, fuzzy
msgid "redir cycle is not allowed"
msgstr "шаблонът „%s” не е намерен"
-#: ../IkiWiki/Plugin/meta.pm:395
+#: ../IkiWiki/Plugin/meta.pm:400
msgid "sort=meta requires a parameter"
msgstr ""
@@ -594,21 +601,21 @@ msgstr ""
msgid "Ping received."
msgstr ""
-#: ../IkiWiki/Plugin/pinger.pm:53
+#: ../IkiWiki/Plugin/pinger.pm:54
msgid "requires 'from' and 'to' parameters"
msgstr ""
-#: ../IkiWiki/Plugin/pinger.pm:58
+#: ../IkiWiki/Plugin/pinger.pm:59
#, fuzzy, perl-format
msgid "Will ping %s"
msgstr "промяна на %s"
-#: ../IkiWiki/Plugin/pinger.pm:61
+#: ../IkiWiki/Plugin/pinger.pm:62
#, perl-format
msgid "Ignoring ping directive for wiki %s (this wiki is %s)"
msgstr ""
-#: ../IkiWiki/Plugin/pinger.pm:77
+#: ../IkiWiki/Plugin/pinger.pm:78
#, fuzzy
msgid "LWP not found, not pinging"
msgstr "модулът „RPC::XML::Client” не е намерен; източникът не е проверен"
@@ -617,102 +624,92 @@ msgstr "модулът „RPC::XML::Client” не е намерен; източ
msgid "warning: Old po4a detected! Recommend upgrade to 0.35."
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:147
-#, perl-format
-msgid "%s has invalid syntax: must use CODE|NAME"
-msgstr ""
-
-#: ../IkiWiki/Plugin/po.pm:166
+#: ../IkiWiki/Plugin/po.pm:175
#, perl-format
msgid "%s is not a valid language code"
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:178
+#: ../IkiWiki/Plugin/po.pm:187
#, perl-format
msgid ""
"%s is not a valid value for po_link_to, falling back to po_link_to=default"
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:183
+#: ../IkiWiki/Plugin/po.pm:192
msgid ""
"po_link_to=negotiated requires usedirs to be enabled, falling back to "
"po_link_to=default"
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:414
-#, perl-format
-msgid "rebuilding all pages to fix meta titles"
-msgstr ""
-
-#: ../IkiWiki/Plugin/po.pm:418 ../IkiWiki/Render.pm:784
-#, fuzzy, perl-format
-msgid "building %s"
-msgstr "промяна на %s"
-
-#: ../IkiWiki/Plugin/po.pm:456
+#: ../IkiWiki/Plugin/po.pm:455
msgid "updated PO files"
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:479
+#: ../IkiWiki/Plugin/po.pm:478
msgid ""
"Can not remove a translation. If the master page is removed, however, its "
"translations will be removed as well."
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:499
+#: ../IkiWiki/Plugin/po.pm:498
msgid ""
"Can not rename a translation. If the master page is renamed, however, its "
"translations will be renamed as well."
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:924
+#: ../IkiWiki/Plugin/po.pm:935
#, perl-format
msgid "POT file (%s) does not exist"
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:938
+#: ../IkiWiki/Plugin/po.pm:949
#, fuzzy, perl-format
msgid "failed to copy underlay PO file to %s"
msgstr "крешка при компилиране на файла %s"
-#: ../IkiWiki/Plugin/po.pm:947
+#: ../IkiWiki/Plugin/po.pm:958
#, fuzzy, perl-format
msgid "failed to update %s"
msgstr "крешка при компилиране на файла %s"
-#: ../IkiWiki/Plugin/po.pm:953
+#: ../IkiWiki/Plugin/po.pm:964
#, fuzzy, perl-format
msgid "failed to copy the POT file to %s"
msgstr "крешка при компилиране на файла %s"
-#: ../IkiWiki/Plugin/po.pm:989
+#: ../IkiWiki/Plugin/po.pm:1000
msgid "N/A"
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:1000
+#: ../IkiWiki/Plugin/po.pm:1011
#, fuzzy, perl-format
msgid "failed to translate %s"
msgstr "грешка при запис на файла „%s”: %s"
-#: ../IkiWiki/Plugin/po.pm:1079
+#: ../IkiWiki/Plugin/po.pm:1090
msgid "removed obsolete PO files"
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:1136 ../IkiWiki/Plugin/po.pm:1148
-#: ../IkiWiki/Plugin/po.pm:1187
+#: ../IkiWiki/Plugin/po.pm:1147 ../IkiWiki/Plugin/po.pm:1159
+#: ../IkiWiki/Plugin/po.pm:1198
#, fuzzy, perl-format
msgid "failed to write %s"
msgstr "грешка при запис на файла „%s”: %s"
-#: ../IkiWiki/Plugin/po.pm:1146
+#: ../IkiWiki/Plugin/po.pm:1157
#, fuzzy
msgid "failed to translate"
msgstr "приставката „linkmap”: грешка при изпълнение на „dot”"
-#: ../IkiWiki/Plugin/po.pm:1199
+#: ../IkiWiki/Plugin/po.pm:1210
msgid "invalid gettext data, go back to previous page to continue edit"
msgstr ""
+#: ../IkiWiki/Plugin/po.pm:1252
+#, perl-format
+msgid "%s has invalid syntax: must use CODE|NAME"
+msgstr ""
+
#: ../IkiWiki/Plugin/poll.pm:70
msgid "vote"
msgstr "гласуване"
@@ -811,6 +808,16 @@ msgstr ""
msgid "need either `percent` or `totalpages` and `donepages` parameters"
msgstr ""
+#: ../IkiWiki/Plugin/recentchanges.pm:104
+#, perl-format
+msgid "This reverts commit %s"
+msgstr ""
+
+#: ../IkiWiki/Plugin/recentchanges.pm:123
+#, perl-format
+msgid "confirm reversion of %s"
+msgstr ""
+
#: ../IkiWiki/Plugin/recentchangesdiff.pm:37
msgid "(Diff truncated)"
msgstr ""
@@ -831,12 +838,12 @@ msgstr ""
msgid "%s is not a file"
msgstr ""
-#: ../IkiWiki/Plugin/remove.pm:137
+#: ../IkiWiki/Plugin/remove.pm:136
#, perl-format
msgid "confirm removal of %s"
msgstr ""
-#: ../IkiWiki/Plugin/remove.pm:174
+#: ../IkiWiki/Plugin/remove.pm:173
msgid "Please select the attachments to remove."
msgstr ""
@@ -869,29 +876,29 @@ msgstr ""
msgid "%s already exists on disk"
msgstr ""
-#: ../IkiWiki/Plugin/rename.pm:122
+#: ../IkiWiki/Plugin/rename.pm:123
#, fuzzy, perl-format
msgid "rename %s"
msgstr "обновяване на страницата „%s”"
-#: ../IkiWiki/Plugin/rename.pm:163
+#: ../IkiWiki/Plugin/rename.pm:164
msgid "Also rename SubPages and attachments"
msgstr ""
-#: ../IkiWiki/Plugin/rename.pm:250
+#: ../IkiWiki/Plugin/rename.pm:251
msgid "Only one attachment can be renamed at a time."
msgstr ""
-#: ../IkiWiki/Plugin/rename.pm:253
+#: ../IkiWiki/Plugin/rename.pm:254
msgid "Please select the attachment to rename."
msgstr ""
-#: ../IkiWiki/Plugin/rename.pm:352
+#: ../IkiWiki/Plugin/rename.pm:353
#, perl-format
msgid "rename %s to %s"
msgstr ""
-#: ../IkiWiki/Plugin/rename.pm:577
+#: ../IkiWiki/Plugin/rename.pm:578
#, fuzzy, perl-format
msgid "update for rename of %s to %s"
msgstr "обновяване на страниците от уики „%s”: %s от потребител „%s”"
@@ -933,7 +940,12 @@ msgstr "препратката няма указани параметрите
msgid "shortcut %s points to <i>%s</i>"
msgstr "препратката „%s” сочи към „%s”"
-#: ../IkiWiki/Plugin/smiley.pm:43
+#: ../IkiWiki/Plugin/smiley.pm:30
+#, perl-format
+msgid "smiley plugin will not work without %s"
+msgstr ""
+
+#: ../IkiWiki/Plugin/smiley.pm:50
#, fuzzy
msgid "failed to parse any smileys"
msgstr "няма разпознати усмивки; изключване на приставката „smiley”"
@@ -1006,16 +1018,11 @@ msgstr "създаване на нова страницa „%s”"
msgid "missing id parameter"
msgstr "липсващ параметър „id” на шаблона"
-#: ../IkiWiki/Plugin/template.pm:47
-#, fuzzy, perl-format
-msgid "%s not found"
-msgstr "шаблонът „%s” не е намерен"
-
-#: ../IkiWiki/Plugin/teximg.pm:72
+#: ../IkiWiki/Plugin/teximg.pm:73
msgid "missing tex code"
msgstr ""
-#: ../IkiWiki/Plugin/teximg.pm:124
+#: ../IkiWiki/Plugin/teximg.pm:125
#, fuzzy
msgid "failed to generate image from code"
msgstr "грешка при запис на файла „%s”: %s"
@@ -1035,26 +1042,26 @@ msgstr ""
msgid "enable %s?"
msgstr ""
-#: ../IkiWiki/Plugin/websetup.pm:272
+#: ../IkiWiki/Plugin/websetup.pm:273
msgid "setup file for this wiki is not known"
msgstr ""
-#: ../IkiWiki/Plugin/websetup.pm:288
+#: ../IkiWiki/Plugin/websetup.pm:289
msgid "main"
msgstr ""
-#: ../IkiWiki/Plugin/websetup.pm:431
+#: ../IkiWiki/Plugin/websetup.pm:433
msgid ""
"The configuration changes shown below require a wiki rebuild to take effect."
msgstr ""
-#: ../IkiWiki/Plugin/websetup.pm:435
+#: ../IkiWiki/Plugin/websetup.pm:437
msgid ""
"For the configuration changes shown below to fully take effect, you may need "
"to rebuild the wiki."
msgstr ""
-#: ../IkiWiki/Plugin/websetup.pm:472
+#: ../IkiWiki/Plugin/websetup.pm:474
#, perl-format
msgid "Error: %s exited nonzero (%s). Discarding setup changes."
msgstr ""
@@ -1064,11 +1071,6 @@ msgstr ""
msgid "cannot determine id of untrusted committer %s"
msgstr ""
-#: ../IkiWiki/Receive.pm:85
-#, fuzzy, perl-format
-msgid "bad file name %s"
-msgstr "пропускане на невалидното име на файл „%s”"
-
#: ../IkiWiki/Render.pm:158
#, perl-format
msgid "scanning %s"
@@ -1121,7 +1123,12 @@ msgstr "обновяване на страницата „%s”, зависещ
msgid "building %s, to update its backlinks"
msgstr "обновяване на „%s” и осъвременяване на обратните връзки"
-#: ../IkiWiki/Render.pm:836
+#: ../IkiWiki/Render.pm:787
+#, fuzzy, perl-format
+msgid "building %s"
+msgstr "промяна на %s"
+
+#: ../IkiWiki/Render.pm:839
#, fuzzy, perl-format
msgid "ikiwiki: cannot build %s"
msgstr "ikiwiki: неуспех при обновяване на страницата „%s”"
@@ -1179,38 +1186,38 @@ msgid "wrapper filename not specified"
msgstr "не е указан файл на обвивката"
#. translators: The parameter is a C filename.
-#: ../IkiWiki/Wrapper.pm:218
+#: ../IkiWiki/Wrapper.pm:219
#, perl-format
msgid "failed to compile %s"
msgstr "крешка при компилиране на файла %s"
#. translators: The parameter is a filename.
-#: ../IkiWiki/Wrapper.pm:238
+#: ../IkiWiki/Wrapper.pm:239
#, perl-format
msgid "successfully generated %s"
msgstr "успешно генериране на %s"
-#: ../ikiwiki.in:13
+#: ../ikiwiki.in:10
msgid "usage: ikiwiki [options] source dest"
msgstr "формат: ikiwiki [опции] източник местоназначение"
-#: ../ikiwiki.in:14
+#: ../ikiwiki.in:11
msgid " ikiwiki --setup configfile"
msgstr ""
-#: ../ikiwiki.in:105
+#: ../ikiwiki.in:102
msgid "usage: --set var=value"
msgstr ""
-#: ../ikiwiki.in:112
+#: ../ikiwiki.in:109
msgid "usage: --set-yaml var=value"
msgstr ""
-#: ../ikiwiki.in:218
+#: ../ikiwiki.in:215
msgid "rebuilding wiki.."
msgstr "обновяване на уики..."
-#: ../ikiwiki.in:221
+#: ../ikiwiki.in:218
msgid "refreshing wiki.."
msgstr "осъвременяване на уики..."
@@ -1238,21 +1245,31 @@ msgstr ""
msgid "preprocessing loop detected on %s at depth %i"
msgstr "открита е циклична завидимост при %s на „%s” на дълбочина %i"
-#: ../IkiWiki.pm:2053
+#: ../IkiWiki.pm:1536
+#, fuzzy, perl-format
+msgid "bad file name %s"
+msgstr "пропускане на невалидното име на файл „%s”"
+
+#: ../IkiWiki.pm:1836
+#, perl-format
+msgid "template %s not found"
+msgstr "шаблонът „%s” не е намерен"
+
+#: ../IkiWiki.pm:2118
msgid "yes"
msgstr ""
-#: ../IkiWiki.pm:2130
+#: ../IkiWiki.pm:2195
#, fuzzy, perl-format
msgid "invalid sort type %s"
msgstr "непознат вид сортиране „%s”"
-#: ../IkiWiki.pm:2151
+#: ../IkiWiki.pm:2216
#, perl-format
msgid "unknown sort type %s"
msgstr "непознат вид сортиране „%s”"
-#: ../IkiWiki.pm:2287
+#: ../IkiWiki.pm:2352
#, fuzzy, perl-format
msgid "cannot match pages: %s"
msgstr "грешка при четене на „%s”: %s"
@@ -1277,6 +1294,10 @@ msgstr ""
msgid "What is the domain name of the web server?"
msgstr ""
+#, fuzzy
+#~ msgid "%s not found"
+#~ msgstr "шаблонът „%s” не е намерен"
+
#~ msgid "You need to log in first."
#~ msgstr "Първо трябва да влезете."
diff --git a/po/cs.po b/po/cs.po
index 11f1d05ed..e4fbe0d11 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ikiwiki\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-04 09:22-0400\n"
+"POT-Creation-Date: 2010-10-23 17:21-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"
@@ -64,76 +64,81 @@ msgstr "Agregace spuštěna přes web."
msgid "Nothing to do right now, all feeds are up-to-date!"
msgstr "Není třeba nic dělat, všechny kanály jsou aktuální!"
-#: ../IkiWiki/Plugin/aggregate.pm:220
+#: ../IkiWiki/Plugin/aggregate.pm:222
#, perl-format
msgid "missing %s parameter"
msgstr "chybí parametr %s"
-#: ../IkiWiki/Plugin/aggregate.pm:255
+#: ../IkiWiki/Plugin/aggregate.pm:257
msgid "new feed"
msgstr "nový kanál"
-#: ../IkiWiki/Plugin/aggregate.pm:269
+#: ../IkiWiki/Plugin/aggregate.pm:271
msgid "posts"
msgstr "příspěvky"
-#: ../IkiWiki/Plugin/aggregate.pm:271
+#: ../IkiWiki/Plugin/aggregate.pm:273
msgid "new"
msgstr "nový"
-#: ../IkiWiki/Plugin/aggregate.pm:455
+#: ../IkiWiki/Plugin/aggregate.pm:457
#, perl-format
msgid "expiring %s (%s days old)"
msgstr "expiruji %s (stará %s dnů)"
-#: ../IkiWiki/Plugin/aggregate.pm:462
+#: ../IkiWiki/Plugin/aggregate.pm:464
#, perl-format
msgid "expiring %s"
msgstr "expiruji %s"
-#: ../IkiWiki/Plugin/aggregate.pm:489
+#: ../IkiWiki/Plugin/aggregate.pm:491
#, perl-format
msgid "last checked %s"
msgstr "poslední kontrola %s"
-#: ../IkiWiki/Plugin/aggregate.pm:493
+#: ../IkiWiki/Plugin/aggregate.pm:495
#, perl-format
msgid "checking feed %s ..."
msgstr "kontroluji kanál %s ..."
-#: ../IkiWiki/Plugin/aggregate.pm:498
+#: ../IkiWiki/Plugin/aggregate.pm:500
#, perl-format
msgid "could not find feed at %s"
msgstr "nemohu najít kanál na %s"
-#: ../IkiWiki/Plugin/aggregate.pm:517
+#: ../IkiWiki/Plugin/aggregate.pm:519
msgid "feed not found"
msgstr "kanál nebyl nalezen"
-#: ../IkiWiki/Plugin/aggregate.pm:528
+#: ../IkiWiki/Plugin/aggregate.pm:530
#, perl-format
msgid "(invalid UTF-8 stripped from feed)"
msgstr "(neplatné UTF-8 bylo z kanálu odstraněno)"
-#: ../IkiWiki/Plugin/aggregate.pm:536
+#: ../IkiWiki/Plugin/aggregate.pm:538
#, perl-format
msgid "(feed entities escaped)"
msgstr "(entity byly v kanálu zakódovány)"
-#: ../IkiWiki/Plugin/aggregate.pm:544
+#: ../IkiWiki/Plugin/aggregate.pm:546
msgid "feed crashed XML::Feed!"
msgstr "kanál shodil XML::Feed!"
-#: ../IkiWiki/Plugin/aggregate.pm:630
+#: ../IkiWiki/Plugin/aggregate.pm:632
#, perl-format
msgid "creating new page %s"
msgstr "vytvářím novou stránku %s"
+#: ../IkiWiki/Plugin/aggregate.pm:652 ../IkiWiki/Plugin/edittemplate.pm:133
+#, fuzzy
+msgid "failed to process template:"
+msgstr "nepodařilo se zpracovat:"
+
#: ../IkiWiki/Plugin/amazon_s3.pm:31
msgid "deleting bucket.."
msgstr "mažu bucket..."
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:229
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:226
msgid "done"
msgstr "hotovo"
@@ -175,7 +180,7 @@ msgstr "příloha nahrána"
msgid "automatic index generation"
msgstr "automatické vytváření indexu"
-#: ../IkiWiki/Plugin/blogspam.pm:110
+#: ../IkiWiki/Plugin/blogspam.pm:112
msgid ""
"Sorry, but that looks like spam to <a href=\"http://blogspam.net/"
"\">blogspam</a>: "
@@ -256,7 +261,7 @@ msgstr "Přidán komentář"
msgid "Added a comment: %s"
msgstr "Přidán komentář: %s"
-#: ../IkiWiki/Plugin/comments.pm:573 ../IkiWiki/Plugin/websetup.pm:268
+#: ../IkiWiki/Plugin/comments.pm:573 ../IkiWiki/Plugin/websetup.pm:269
msgid "you are not logged in as an admin"
msgstr "nejste přihlášeni jako správce"
@@ -283,18 +288,18 @@ msgstr[1] "Komentáře"
msgid "Comment"
msgstr "Komentáře"
-#: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:31
-#: ../IkiWiki/Plugin/cutpaste.pm:46 ../IkiWiki/Plugin/cutpaste.pm:62
+#: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:46
+#: ../IkiWiki/Plugin/cutpaste.pm:60 ../IkiWiki/Plugin/cutpaste.pm:75
#: ../IkiWiki/Plugin/testpagespec.pm:26
#, perl-format
msgid "%s parameter is required"
msgstr "parametr %s je povinný"
-#: ../IkiWiki/Plugin/cutpaste.pm:67
+#: ../IkiWiki/Plugin/cutpaste.pm:80
msgid "no text was copied in this page"
msgstr "na této stránce nebyl zkopírován žádný text"
-#: ../IkiWiki/Plugin/cutpaste.pm:70
+#: ../IkiWiki/Plugin/cutpaste.pm:83
#, perl-format
msgid "no text was copied in this page with id %s"
msgstr "na této stránce nebyl zkopírován žádný text s id %s"
@@ -321,25 +326,19 @@ msgstr "vytvářím %s"
msgid "editing %s"
msgstr "upravuji %s"
-#: ../IkiWiki/Plugin/edittemplate.pm:52
+#: ../IkiWiki/Plugin/edittemplate.pm:54
msgid "template not specified"
msgstr "nebyl zadán parametr template"
-#: ../IkiWiki/Plugin/edittemplate.pm:55
+#: ../IkiWiki/Plugin/edittemplate.pm:57
msgid "match not specified"
msgstr "nebyl zadán parametr match"
-#: ../IkiWiki/Plugin/edittemplate.pm:70
+#: ../IkiWiki/Plugin/edittemplate.pm:72
#, perl-format
msgid "edittemplate %s registered for %s"
msgstr "edittemplate %s byla zaregistrována pro %s"
-#: ../IkiWiki/Plugin/edittemplate.pm:131 ../IkiWiki/Plugin/inline.pm:339
-#: ../IkiWiki/Plugin/template.pm:44
-#, fuzzy
-msgid "failed to process template:"
-msgstr "nepodařilo se zpracovat:"
-
#: ../IkiWiki/Plugin/format.pm:30
msgid "must specify format and text"
msgstr "musíte zadat formát a text"
@@ -366,23 +365,32 @@ msgstr "není stránkou"
msgid "%s is an attachment, not a page."
msgstr "%s není ani příloha, ani stránka."
-#: ../IkiWiki/Plugin/git.pm:742 ../IkiWiki/Plugin/git.pm:760
-#: ../IkiWiki/Receive.pm:129
+#: ../IkiWiki/Plugin/git.pm:764 ../IkiWiki/Plugin/git.pm:827
+#: ../IkiWiki.pm:1580
#, perl-format
msgid "you are not allowed to change %s"
msgstr "nejste oprávněni měnit %s"
-#: ../IkiWiki/Plugin/git.pm:782
+#: ../IkiWiki/Plugin/git.pm:786
#, perl-format
msgid "you cannot act on a file with mode %s"
msgstr "nemůžete pracovat se souborem s přístupovým oprávněními %s"
-#: ../IkiWiki/Plugin/git.pm:786
+#: ../IkiWiki/Plugin/git.pm:790
msgid "you are not allowed to change file modes"
msgstr "nejste oprávněni měnit přístupová oprávnění souborů"
-#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:137
-#: ../IkiWiki/Plugin/search.pm:38
+#: ../IkiWiki/Plugin/git.pm:861
+#, fuzzy
+msgid "you are not allowed to revert a merge"
+msgstr "nejste oprávněni měnit %s"
+
+#: ../IkiWiki/Plugin/git.pm:877
+#, fuzzy, perl-format
+msgid "Failed to revert commit %s"
+msgstr "nelze zkompilovat %s"
+
+#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/search.pm:38
#, perl-format
msgid "Must specify %s when using the %s plugin"
msgstr "%s musíte zadat při každém použití modulu %s"
@@ -395,22 +403,22 @@ msgstr "nepodařilo se spustit graphviz"
msgid "prog not a valid graphviz program"
msgstr "program není platným programem graphviz"
-#: ../IkiWiki/Plugin/highlight.pm:48
+#: ../IkiWiki/Plugin/highlight.pm:64
#, perl-format
msgid "tohighlight contains unknown file type '%s'"
msgstr "tohighlight obsahuje neznámý typ souboru „%s“"
-#: ../IkiWiki/Plugin/highlight.pm:59
+#: ../IkiWiki/Plugin/highlight.pm:75
#, perl-format
msgid "Source code: %s"
msgstr "Zdrojový kód: %s"
-#: ../IkiWiki/Plugin/highlight.pm:124
+#: ../IkiWiki/Plugin/highlight.pm:140
msgid ""
"warning: highlight perl module not available; falling back to pass through"
msgstr "varování: perlový modul highlight není dostupný; pokračuji bez něj"
-#: ../IkiWiki/Plugin/htmltidy.pm:50
+#: ../IkiWiki/Plugin/htmltidy.pm:62
msgid "htmltidy failed to parse this html"
msgstr "htmltidy se nepodařilo zpracovat toto html"
@@ -459,12 +467,12 @@ msgstr "parametry %s a %s nelze použít zároveň"
msgid "Add a new post titled:"
msgstr "Přidat nový příspěvek nazvaný:"
-#: ../IkiWiki/Plugin/inline.pm:342
-#, perl-format
-msgid "template %s not found"
-msgstr "šablona %s nebyla nalezena"
+#: ../IkiWiki/Plugin/inline.pm:339 ../IkiWiki/Plugin/template.pm:44
+#, fuzzy, perl-format
+msgid "failed to process template %s"
+msgstr "nepodařilo se zpracovat:"
-#: ../IkiWiki/Plugin/inline.pm:633
+#: ../IkiWiki/Plugin/inline.pm:630
msgid "RPC::XML::Client not found, not pinging"
msgstr "RPC::XML::Client nebyl nalezen, nepinkám"
@@ -492,19 +500,19 @@ msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)"
msgstr ""
"selhalo nahrání perlového modulu Markdown.pm (%s) nebo /usr/bin/markdown (%s)"
-#: ../IkiWiki/Plugin/meta.pm:174
+#: ../IkiWiki/Plugin/meta.pm:175
msgid "stylesheet not found"
msgstr "styl nebyl nalezen"
-#: ../IkiWiki/Plugin/meta.pm:212
+#: ../IkiWiki/Plugin/meta.pm:217
msgid "redir page not found"
msgstr "stránka, na kterou vede přesměrování, nebyla nalezena"
-#: ../IkiWiki/Plugin/meta.pm:226
+#: ../IkiWiki/Plugin/meta.pm:231
msgid "redir cycle is not allowed"
msgstr "cykly nejsou v přesměrování povoleny"
-#: ../IkiWiki/Plugin/meta.pm:395
+#: ../IkiWiki/Plugin/meta.pm:400
#, fuzzy
msgid "sort=meta requires a parameter"
msgstr "vyžaduje parametry „from“ a „to“"
@@ -579,21 +587,21 @@ msgstr "resetování hesla bylo zamítnuto"
msgid "Ping received."
msgstr "Obdrženo pinknutí."
-#: ../IkiWiki/Plugin/pinger.pm:53
+#: ../IkiWiki/Plugin/pinger.pm:54
msgid "requires 'from' and 'to' parameters"
msgstr "vyžaduje parametry „from“ a „to“"
-#: ../IkiWiki/Plugin/pinger.pm:58
+#: ../IkiWiki/Plugin/pinger.pm:59
#, perl-format
msgid "Will ping %s"
msgstr "Pinknu %s"
-#: ../IkiWiki/Plugin/pinger.pm:61
+#: ../IkiWiki/Plugin/pinger.pm:62
#, perl-format
msgid "Ignoring ping directive for wiki %s (this wiki is %s)"
msgstr "Ignoruji direktivu ping pro wiki %s (toto je wiki %s)"
-#: ../IkiWiki/Plugin/pinger.pm:77
+#: ../IkiWiki/Plugin/pinger.pm:78
msgid "LWP not found, not pinging"
msgstr "LWP nebyl nalezen, nepinkám"
@@ -601,45 +609,30 @@ msgstr "LWP nebyl nalezen, nepinkám"
msgid "warning: Old po4a detected! Recommend upgrade to 0.35."
msgstr "varování: rozpoznána stará verze po4a, doporučen přechod na 0.35."
-#: ../IkiWiki/Plugin/po.pm:147
-#, perl-format
-msgid "%s has invalid syntax: must use CODE|NAME"
-msgstr ""
-
-#: ../IkiWiki/Plugin/po.pm:166
+#: ../IkiWiki/Plugin/po.pm:175
#, perl-format
msgid "%s is not a valid language code"
msgstr "%s není platným kódem jazyka"
-#: ../IkiWiki/Plugin/po.pm:178
+#: ../IkiWiki/Plugin/po.pm:187
#, perl-format
msgid ""
"%s is not a valid value for po_link_to, falling back to po_link_to=default"
msgstr ""
"%s není platnou hodnotou parametru po_link_to, používám po_link_to=default"
-#: ../IkiWiki/Plugin/po.pm:183
+#: ../IkiWiki/Plugin/po.pm:192
msgid ""
"po_link_to=negotiated requires usedirs to be enabled, falling back to "
"po_link_to=default"
msgstr ""
"po_link_to=negotiated vyžaduje zapnuté usedirs, používám po_link_to=default"
-#: ../IkiWiki/Plugin/po.pm:414
-#, perl-format
-msgid "rebuilding all pages to fix meta titles"
-msgstr "znovusestavuji všechny stránky, aby se opravily meta nadpisy"
-
-#: ../IkiWiki/Plugin/po.pm:418 ../IkiWiki/Render.pm:784
-#, perl-format
-msgid "building %s"
-msgstr "sestavuji %s"
-
-#: ../IkiWiki/Plugin/po.pm:456
+#: ../IkiWiki/Plugin/po.pm:455
msgid "updated PO files"
msgstr "aktualizovány PO soubory"
-#: ../IkiWiki/Plugin/po.pm:479
+#: ../IkiWiki/Plugin/po.pm:478
msgid ""
"Can not remove a translation. If the master page is removed, however, its "
"translations will be removed as well."
@@ -647,7 +640,7 @@ msgstr ""
"Nemohu odstranit překlad. Nicméně pokud bude odstraněna hlavní stránka, "
"budou odstraněny také její překlady."
-#: ../IkiWiki/Plugin/po.pm:499
+#: ../IkiWiki/Plugin/po.pm:498
msgid ""
"Can not rename a translation. If the master page is renamed, however, its "
"translations will be renamed as well."
@@ -655,55 +648,60 @@ msgstr ""
"Nemohu přejmenovat překlad. Nicméně pokud bude přejmenována hlavní stránka, "
"budou přejmenovány také její překlady."
-#: ../IkiWiki/Plugin/po.pm:924
+#: ../IkiWiki/Plugin/po.pm:935
#, perl-format
msgid "POT file (%s) does not exist"
msgstr "POT soubor (%s) neexistuje"
-#: ../IkiWiki/Plugin/po.pm:938
+#: ../IkiWiki/Plugin/po.pm:949
#, perl-format
msgid "failed to copy underlay PO file to %s"
msgstr "nepodařilo se zkopírovat PO soubor na %s"
-#: ../IkiWiki/Plugin/po.pm:947
+#: ../IkiWiki/Plugin/po.pm:958
#, perl-format
msgid "failed to update %s"
msgstr "nepodařilo se aktualizovat %s"
-#: ../IkiWiki/Plugin/po.pm:953
+#: ../IkiWiki/Plugin/po.pm:964
#, perl-format
msgid "failed to copy the POT file to %s"
msgstr "nepodařilo se zkopírovat POT soubor na %s"
-#: ../IkiWiki/Plugin/po.pm:989
+#: ../IkiWiki/Plugin/po.pm:1000
msgid "N/A"
msgstr "N/A"
-#: ../IkiWiki/Plugin/po.pm:1000
+#: ../IkiWiki/Plugin/po.pm:1011
#, perl-format
msgid "failed to translate %s"
msgstr "nepodařilo se přeložit %s"
-#: ../IkiWiki/Plugin/po.pm:1079
+#: ../IkiWiki/Plugin/po.pm:1090
msgid "removed obsolete PO files"
msgstr "odstraněny zastaralé PO soubory"
-#: ../IkiWiki/Plugin/po.pm:1136 ../IkiWiki/Plugin/po.pm:1148
-#: ../IkiWiki/Plugin/po.pm:1187
+#: ../IkiWiki/Plugin/po.pm:1147 ../IkiWiki/Plugin/po.pm:1159
+#: ../IkiWiki/Plugin/po.pm:1198
#, perl-format
msgid "failed to write %s"
msgstr "nepodařilo se zapsat %s"
-#: ../IkiWiki/Plugin/po.pm:1146
+#: ../IkiWiki/Plugin/po.pm:1157
msgid "failed to translate"
msgstr "překlad se nezdařil"
-#: ../IkiWiki/Plugin/po.pm:1199
+#: ../IkiWiki/Plugin/po.pm:1210
msgid "invalid gettext data, go back to previous page to continue edit"
msgstr ""
"neplatná gettext data, pro pokračování v úpravách se vraťte na předchozí "
"stránku"
+#: ../IkiWiki/Plugin/po.pm:1252
+#, perl-format
+msgid "%s has invalid syntax: must use CODE|NAME"
+msgstr ""
+
#: ../IkiWiki/Plugin/poll.pm:70
msgid "vote"
msgstr "hlasovat"
@@ -801,6 +799,16 @@ msgstr "neplatná procentuální hodnota %s"
msgid "need either `percent` or `totalpages` and `donepages` parameters"
msgstr "potřebuji buď parametr `percent`, nebo `totalpages` a `donepages`"
+#: ../IkiWiki/Plugin/recentchanges.pm:104
+#, perl-format
+msgid "This reverts commit %s"
+msgstr ""
+
+#: ../IkiWiki/Plugin/recentchanges.pm:123
+#, fuzzy, perl-format
+msgid "confirm reversion of %s"
+msgstr "potvrďte odstranění %s"
+
#: ../IkiWiki/Plugin/recentchangesdiff.pm:37
msgid "(Diff truncated)"
msgstr "(Diff oříznut)"
@@ -820,12 +828,12 @@ msgstr "%s není ve zdrojovém adresáři a proto nelze smazat"
msgid "%s is not a file"
msgstr "%s není souborem"
-#: ../IkiWiki/Plugin/remove.pm:137
+#: ../IkiWiki/Plugin/remove.pm:136
#, perl-format
msgid "confirm removal of %s"
msgstr "potvrďte odstranění %s"
-#: ../IkiWiki/Plugin/remove.pm:174
+#: ../IkiWiki/Plugin/remove.pm:173
msgid "Please select the attachments to remove."
msgstr "Vyberte prosím přílohy, které se mají odstranit."
@@ -857,29 +865,29 @@ msgstr "%s již existuje"
msgid "%s already exists on disk"
msgstr "%s již na disku existuje"
-#: ../IkiWiki/Plugin/rename.pm:122
+#: ../IkiWiki/Plugin/rename.pm:123
#, perl-format
msgid "rename %s"
msgstr "přejmenování %s"
-#: ../IkiWiki/Plugin/rename.pm:163
+#: ../IkiWiki/Plugin/rename.pm:164
msgid "Also rename SubPages and attachments"
msgstr "Také přejmenovat podstránky a přílohy"
-#: ../IkiWiki/Plugin/rename.pm:250
+#: ../IkiWiki/Plugin/rename.pm:251
msgid "Only one attachment can be renamed at a time."
msgstr "Najednou lze přejmenovat pouze jednu přílohu."
-#: ../IkiWiki/Plugin/rename.pm:253
+#: ../IkiWiki/Plugin/rename.pm:254
msgid "Please select the attachment to rename."
msgstr "Vyberte přílohu, kterou chcete přejmenovat."
-#: ../IkiWiki/Plugin/rename.pm:352
+#: ../IkiWiki/Plugin/rename.pm:353
#, perl-format
msgid "rename %s to %s"
msgstr "přejmenování %s na %s"
-#: ../IkiWiki/Plugin/rename.pm:577
+#: ../IkiWiki/Plugin/rename.pm:578
#, perl-format
msgid "update for rename of %s to %s"
msgstr "aktualizace pro přejmenování %s na %s"
@@ -920,7 +928,12 @@ msgstr "chybí parametr jméno nebo url"
msgid "shortcut %s points to <i>%s</i>"
msgstr "zkratka %s odkazuje na <i>%s</i>"
-#: ../IkiWiki/Plugin/smiley.pm:43
+#: ../IkiWiki/Plugin/smiley.pm:30
+#, fuzzy, perl-format
+msgid "smiley plugin will not work without %s"
+msgstr "Modul shortcut nebude pracovat bez %s"
+
+#: ../IkiWiki/Plugin/smiley.pm:50
msgid "failed to parse any smileys"
msgstr "nepodařilo se rozpoznat žádné smajlíky"
@@ -986,16 +999,11 @@ msgstr "vytvářím novou stránku %s"
msgid "missing id parameter"
msgstr "chybí parametr id"
-#: ../IkiWiki/Plugin/template.pm:47
-#, perl-format
-msgid "%s not found"
-msgstr "%s nenalezen"
-
-#: ../IkiWiki/Plugin/teximg.pm:72
+#: ../IkiWiki/Plugin/teximg.pm:73
msgid "missing tex code"
msgstr "chybí TeXový kód"
-#: ../IkiWiki/Plugin/teximg.pm:124
+#: ../IkiWiki/Plugin/teximg.pm:125
msgid "failed to generate image from code"
msgstr "z kódu se nepodařilo vygenerovat obrázek"
@@ -1014,20 +1022,20 @@ msgstr "moduly"
msgid "enable %s?"
msgstr "povolit %s?"
-#: ../IkiWiki/Plugin/websetup.pm:272
+#: ../IkiWiki/Plugin/websetup.pm:273
msgid "setup file for this wiki is not known"
msgstr "konfigurační soubor této wiki je neznámý"
-#: ../IkiWiki/Plugin/websetup.pm:288
+#: ../IkiWiki/Plugin/websetup.pm:289
msgid "main"
msgstr "hlavní"
-#: ../IkiWiki/Plugin/websetup.pm:431
+#: ../IkiWiki/Plugin/websetup.pm:433
msgid ""
"The configuration changes shown below require a wiki rebuild to take effect."
msgstr "Níže uvedené změny v konfiguraci se projeví až po znovusestavení wiki."
-#: ../IkiWiki/Plugin/websetup.pm:435
+#: ../IkiWiki/Plugin/websetup.pm:437
msgid ""
"For the configuration changes shown below to fully take effect, you may need "
"to rebuild the wiki."
@@ -1035,7 +1043,7 @@ msgstr ""
"Aby se níže uvedené změny v konfiguraci zcela projevily, budete možná muset "
"znovusestavit wiki."
-#: ../IkiWiki/Plugin/websetup.pm:472
+#: ../IkiWiki/Plugin/websetup.pm:474
#, perl-format
msgid "Error: %s exited nonzero (%s). Discarding setup changes."
msgstr ""
@@ -1047,11 +1055,6 @@ msgstr ""
msgid "cannot determine id of untrusted committer %s"
msgstr "nemohu určit identitu nedůvěryhodného uživatele %s"
-#: ../IkiWiki/Receive.pm:85
-#, perl-format
-msgid "bad file name %s"
-msgstr "chybné jméno souboru %s"
-
#: ../IkiWiki/Render.pm:158
#, perl-format
msgid "scanning %s"
@@ -1106,7 +1109,12 @@ msgstr "sestavuji %s, která závisí na %s"
msgid "building %s, to update its backlinks"
msgstr "sestavuji %s, aby se aktualizovaly zpětné odkazy"
-#: ../IkiWiki/Render.pm:836
+#: ../IkiWiki/Render.pm:787
+#, perl-format
+msgid "building %s"
+msgstr "sestavuji %s"
+
+#: ../IkiWiki/Render.pm:839
#, perl-format
msgid "ikiwiki: cannot build %s"
msgstr "ikiwiki: nelze sestavit %s"
@@ -1164,39 +1172,39 @@ msgid "wrapper filename not specified"
msgstr "jméno souboru s obalem nebylo zadáno"
#. translators: The parameter is a C filename.
-#: ../IkiWiki/Wrapper.pm:218
+#: ../IkiWiki/Wrapper.pm:219
#, perl-format
msgid "failed to compile %s"
msgstr "nelze zkompilovat %s"
#. translators: The parameter is a filename.
-#: ../IkiWiki/Wrapper.pm:238
+#: ../IkiWiki/Wrapper.pm:239
#, perl-format
msgid "successfully generated %s"
msgstr "%s byl úspěšně vytvořen"
-#: ../ikiwiki.in:13
+#: ../ikiwiki.in:10
msgid "usage: ikiwiki [options] source dest"
msgstr "použití: ikiwiki [volby] zdroj cíl"
-#: ../ikiwiki.in:14
+#: ../ikiwiki.in:11
msgid " ikiwiki --setup configfile"
msgstr " ikiwiki --setup konfigurační.soubor"
-#: ../ikiwiki.in:105
+#: ../ikiwiki.in:102
msgid "usage: --set var=value"
msgstr "použití: --set proměnná=hodnota"
-#: ../ikiwiki.in:112
+#: ../ikiwiki.in:109
#, fuzzy
msgid "usage: --set-yaml var=value"
msgstr "použití: --set proměnná=hodnota"
-#: ../ikiwiki.in:218
+#: ../ikiwiki.in:215
msgid "rebuilding wiki.."
msgstr "znovusestavuji wiki..."
-#: ../ikiwiki.in:221
+#: ../ikiwiki.in:218
msgid "refreshing wiki.."
msgstr "obnovuji wiki..."
@@ -1222,21 +1230,31 @@ msgstr "nepodařilo se nahrát externí modul vyžadovaný modulem %s: %s"
msgid "preprocessing loop detected on %s at depth %i"
msgstr "Byla rozpoznána smyčka na %s v hloubce %i"
-#: ../IkiWiki.pm:2053
+#: ../IkiWiki.pm:1536
+#, perl-format
+msgid "bad file name %s"
+msgstr "chybné jméno souboru %s"
+
+#: ../IkiWiki.pm:1836
+#, perl-format
+msgid "template %s not found"
+msgstr "šablona %s nebyla nalezena"
+
+#: ../IkiWiki.pm:2118
msgid "yes"
msgstr "ano"
-#: ../IkiWiki.pm:2130
+#: ../IkiWiki.pm:2195
#, fuzzy, perl-format
msgid "invalid sort type %s"
msgstr "neznámý typ řazení %s"
-#: ../IkiWiki.pm:2151
+#: ../IkiWiki.pm:2216
#, perl-format
msgid "unknown sort type %s"
msgstr "neznámý typ řazení %s"
-#: ../IkiWiki.pm:2287
+#: ../IkiWiki.pm:2352
#, perl-format
msgid "cannot match pages: %s"
msgstr "nelze vybrat stránky: %s"
@@ -1261,6 +1279,12 @@ msgstr "Který uživatel (wiki účet nebo openid) bude správce?"
msgid "What is the domain name of the web server?"
msgstr "Jaké je doménové jméno webového serveru?"
+#~ msgid "%s not found"
+#~ msgstr "%s nenalezen"
+
+#~ msgid "rebuilding all pages to fix meta titles"
+#~ msgstr "znovusestavuji všechny stránky, aby se opravily meta nadpisy"
+
#~ msgid "You need to log in first."
#~ msgstr "Nejprve se musíte přihlásit."
diff --git a/po/da.po b/po/da.po
index c3178a7ea..49dd1de7e 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1,17 +1,17 @@
# Danish translations for ikiwiki package
-# Copyright (C) 2008 Jonas Smedegaard <dr@jones.dk>
+# Copyright (C) 2008, 2009, 2010, Jonas Smedegaard <dr@jones.dk>
# This file is distributed under the same license as the ikiwiki package.
-# Jonas Smedegaard <dr@jones.dk>, 2008.
#
+# Jonas Smedegaard <dr@jones.dk>, 2008-2010.
msgid ""
msgstr ""
-"Project-Id-Version: ikiwiki 3.14159\n"
+"Project-Id-Version: ikiwiki 3.20100518\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-04 09:22-0400\n"
-"PO-Revision-Date: 2009-07-23 01:07+0200\n"
+"POT-Creation-Date: 2010-10-23 17:21-0400\n"
+"PO-Revision-Date: 2010-08-27 12:45+0200\n"
"Last-Translator: Jonas Smedegaard <dr@jones.dk>\n"
"Language-Team: None\n"
-"Language: \n"
+"Language: da\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -68,76 +68,80 @@ msgstr "Indsamling udløst via web."
msgid "Nothing to do right now, all feeds are up-to-date!"
msgstr "Intet at gøre lige nu, alle fødninger er tidssvarende!"
-#: ../IkiWiki/Plugin/aggregate.pm:220
+#: ../IkiWiki/Plugin/aggregate.pm:222
#, perl-format
msgid "missing %s parameter"
msgstr "mangler parametren %s"
-#: ../IkiWiki/Plugin/aggregate.pm:255
+#: ../IkiWiki/Plugin/aggregate.pm:257
msgid "new feed"
msgstr "ny fødning"
-#: ../IkiWiki/Plugin/aggregate.pm:269
+#: ../IkiWiki/Plugin/aggregate.pm:271
msgid "posts"
msgstr "indlæg"
-#: ../IkiWiki/Plugin/aggregate.pm:271
+#: ../IkiWiki/Plugin/aggregate.pm:273
msgid "new"
msgstr "nyt"
-#: ../IkiWiki/Plugin/aggregate.pm:455
+#: ../IkiWiki/Plugin/aggregate.pm:457
#, perl-format
msgid "expiring %s (%s days old)"
msgstr "udløber %s (%s dage gammel)"
-#: ../IkiWiki/Plugin/aggregate.pm:462
+#: ../IkiWiki/Plugin/aggregate.pm:464
#, perl-format
msgid "expiring %s"
msgstr "udløber %s"
-#: ../IkiWiki/Plugin/aggregate.pm:489
+#: ../IkiWiki/Plugin/aggregate.pm:491
#, perl-format
msgid "last checked %s"
msgstr "senest undersøgt %s"
-#: ../IkiWiki/Plugin/aggregate.pm:493
+#: ../IkiWiki/Plugin/aggregate.pm:495
#, perl-format
msgid "checking feed %s ..."
msgstr "undersøger fødning %s ..."
-#: ../IkiWiki/Plugin/aggregate.pm:498
+#: ../IkiWiki/Plugin/aggregate.pm:500
#, perl-format
msgid "could not find feed at %s"
msgstr "kunne ikke finde fødning ved %s"
-#: ../IkiWiki/Plugin/aggregate.pm:517
+#: ../IkiWiki/Plugin/aggregate.pm:519
msgid "feed not found"
msgstr "fødning ikke fundet"
-#: ../IkiWiki/Plugin/aggregate.pm:528
+#: ../IkiWiki/Plugin/aggregate.pm:530
#, perl-format
msgid "(invalid UTF-8 stripped from feed)"
msgstr "(defekt UTF-8 fjernet fra fødning)"
-#: ../IkiWiki/Plugin/aggregate.pm:536
+#: ../IkiWiki/Plugin/aggregate.pm:538
#, perl-format
msgid "(feed entities escaped)"
msgstr "(fødningselementer omgået (escaped))"
-#: ../IkiWiki/Plugin/aggregate.pm:544
+#: ../IkiWiki/Plugin/aggregate.pm:546
msgid "feed crashed XML::Feed!"
msgstr "fødning fik XML::Feed til at bryde sammen!"
-#: ../IkiWiki/Plugin/aggregate.pm:630
+#: ../IkiWiki/Plugin/aggregate.pm:632
#, perl-format
msgid "creating new page %s"
msgstr "opretter ny side %s"
+#: ../IkiWiki/Plugin/aggregate.pm:652 ../IkiWiki/Plugin/edittemplate.pm:133
+msgid "failed to process template:"
+msgstr "beandling af skabelon mislykkedes:"
+
#: ../IkiWiki/Plugin/amazon_s3.pm:31
msgid "deleting bucket.."
msgstr "sletter bundt.."
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:229
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:226
msgid "done"
msgstr "færdig"
@@ -147,17 +151,14 @@ msgid "Must specify %s"
msgstr "Skal angive %s"
#: ../IkiWiki/Plugin/amazon_s3.pm:140
-#, fuzzy
msgid "Failed to create S3 bucket: "
-msgstr "Oprettelse af bundt i S3 mislykkedes: "
+msgstr "Oprettelse af S3 bundt mislykkedes: "
#: ../IkiWiki/Plugin/amazon_s3.pm:225
-#, fuzzy
msgid "Failed to save file to S3: "
-msgstr "Arkivering af fil i S3 mislykkedes: "
+msgstr "Arkivering af fil til S3 mislykkedes: "
#: ../IkiWiki/Plugin/amazon_s3.pm:247
-#, fuzzy
msgid "Failed to delete file from S3: "
msgstr "Sletning af fil fra S3 mislykkedes: "
@@ -182,7 +183,7 @@ msgstr "vedhæftningsoplægning"
msgid "automatic index generation"
msgstr "automatisk indeks-dannelse"
-#: ../IkiWiki/Plugin/blogspam.pm:110
+#: ../IkiWiki/Plugin/blogspam.pm:112
msgid ""
"Sorry, but that looks like spam to <a href=\"http://blogspam.net/"
"\">blogspam</a>: "
@@ -200,14 +201,13 @@ msgid "There are no broken links!"
msgstr "Ingen henvisninger der ikker fungerer!"
#: ../IkiWiki/Plugin/comments.pm:113
-#, fuzzy, perl-format
+#, perl-format
msgid "this comment needs %s"
-msgstr "kommenterer på %s"
+msgstr "denne kommentar kræver %s"
#: ../IkiWiki/Plugin/comments.pm:116
-#, fuzzy
msgid "moderation"
-msgstr "Kommentarmoderering"
+msgstr "moderering"
#: ../IkiWiki/Plugin/comments.pm:137 ../IkiWiki/Plugin/format.pm:48
#, perl-format
@@ -263,7 +263,7 @@ msgstr "Tilføjede en kommentar"
msgid "Added a comment: %s"
msgstr "Tilføjede en kommentar: %s"
-#: ../IkiWiki/Plugin/comments.pm:573 ../IkiWiki/Plugin/websetup.pm:268
+#: ../IkiWiki/Plugin/comments.pm:573 ../IkiWiki/Plugin/websetup.pm:269
msgid "you are not logged in as an admin"
msgstr "du er ikke logget på som en administrator"
@@ -276,32 +276,31 @@ msgid "comment moderation"
msgstr "kommentarkoderering"
#: ../IkiWiki/Plugin/comments.pm:822
-#, fuzzy, perl-format
+#, perl-format
msgid "%i comment"
msgid_plural "%i comments"
-msgstr[0] "Kommentarer"
-msgstr[1] "Kommentarer"
+msgstr[0] "%i kommentar"
+msgstr[1] "%i kommentarer"
#. translators: Here "Comment" is a verb;
#. translators: the user clicks on it to
#. translators: post a comment.
#: ../IkiWiki/Plugin/comments.pm:832
-#, fuzzy
msgid "Comment"
-msgstr "Kommentarer"
+msgstr "Kommentér"
-#: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:31
-#: ../IkiWiki/Plugin/cutpaste.pm:46 ../IkiWiki/Plugin/cutpaste.pm:62
+#: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:46
+#: ../IkiWiki/Plugin/cutpaste.pm:60 ../IkiWiki/Plugin/cutpaste.pm:75
#: ../IkiWiki/Plugin/testpagespec.pm:26
#, perl-format
msgid "%s parameter is required"
msgstr "parametren %s er krævet"
-#: ../IkiWiki/Plugin/cutpaste.pm:67
+#: ../IkiWiki/Plugin/cutpaste.pm:80
msgid "no text was copied in this page"
msgstr "ingen tekst blev kopieret i denne side"
-#: ../IkiWiki/Plugin/cutpaste.pm:70
+#: ../IkiWiki/Plugin/cutpaste.pm:83
#, perl-format
msgid "no text was copied in this page with id %s"
msgstr "ingen tekst blev kopieret i denne side med id %s"
@@ -328,25 +327,19 @@ msgstr "opretter %s"
msgid "editing %s"
msgstr "redigerer %s"
-#: ../IkiWiki/Plugin/edittemplate.pm:52
+#: ../IkiWiki/Plugin/edittemplate.pm:54
msgid "template not specified"
msgstr "skabelon %s ikke angivet"
-#: ../IkiWiki/Plugin/edittemplate.pm:55
+#: ../IkiWiki/Plugin/edittemplate.pm:57
msgid "match not specified"
msgstr "sammenligning ikke angivet"
-#: ../IkiWiki/Plugin/edittemplate.pm:70
+#: ../IkiWiki/Plugin/edittemplate.pm:72
#, perl-format
msgid "edittemplate %s registered for %s"
msgstr "redigeringsskabelon %s registreret for %s"
-#: ../IkiWiki/Plugin/edittemplate.pm:131 ../IkiWiki/Plugin/inline.pm:339
-#: ../IkiWiki/Plugin/template.pm:44
-#, fuzzy
-msgid "failed to process template:"
-msgstr "dannelsen mislykkedes:"
-
#: ../IkiWiki/Plugin/format.pm:30
msgid "must specify format and text"
msgstr "skal angive format og tekst"
@@ -365,32 +358,40 @@ msgid "The page %s does not exist."
msgstr "Siden %s eksisterer ikke."
#: ../IkiWiki/Plugin/getsource.pm:75
-#, fuzzy
msgid "not a page"
-msgstr "kan ikke få sider til at passe sammen: %s"
+msgstr "ikke en side"
#: ../IkiWiki/Plugin/getsource.pm:77
-#, fuzzy, perl-format
+#, perl-format
msgid "%s is an attachment, not a page."
-msgstr "%s er ikke en redigérbar side"
+msgstr "%s er en vedhæftning, ikke en side."
-#: ../IkiWiki/Plugin/git.pm:742 ../IkiWiki/Plugin/git.pm:760
-#: ../IkiWiki/Receive.pm:129
+#: ../IkiWiki/Plugin/git.pm:764 ../IkiWiki/Plugin/git.pm:827
+#: ../IkiWiki.pm:1580
#, perl-format
msgid "you are not allowed to change %s"
msgstr "Du har ikke lov til at ændre %s"
-#: ../IkiWiki/Plugin/git.pm:782
+#: ../IkiWiki/Plugin/git.pm:786
#, perl-format
msgid "you cannot act on a file with mode %s"
msgstr "du kan ikke påvirke en fil med modus %s"
-#: ../IkiWiki/Plugin/git.pm:786
+#: ../IkiWiki/Plugin/git.pm:790
msgid "you are not allowed to change file modes"
msgstr "du har ikke lov til at ændre modus for filer"
-#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:137
-#: ../IkiWiki/Plugin/search.pm:38
+#: ../IkiWiki/Plugin/git.pm:861
+#, fuzzy
+msgid "you are not allowed to revert a merge"
+msgstr "Du har ikke lov til at ændre %s"
+
+#: ../IkiWiki/Plugin/git.pm:877
+#, fuzzy, perl-format
+msgid "Failed to revert commit %s"
+msgstr "kompilering af %s mislykkedes"
+
+#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/search.pm:38
#, perl-format
msgid "Must specify %s when using the %s plugin"
msgstr "Skal angive %s når udvidelsen %s bruges"
@@ -403,27 +404,26 @@ msgstr "graphviz-kørsel mislykkedes"
msgid "prog not a valid graphviz program"
msgstr "prog er ikke et gyldigt graphviz-program"
-#: ../IkiWiki/Plugin/highlight.pm:48
+#: ../IkiWiki/Plugin/highlight.pm:64
#, perl-format
msgid "tohighlight contains unknown file type '%s'"
msgstr "tohighlight indeholder ukendt filtype '%s'"
-#: ../IkiWiki/Plugin/highlight.pm:59
+#: ../IkiWiki/Plugin/highlight.pm:75
#, perl-format
msgid "Source code: %s"
msgstr "Kildekode: %s"
-#: ../IkiWiki/Plugin/highlight.pm:124
+#: ../IkiWiki/Plugin/highlight.pm:140
msgid ""
"warning: highlight perl module not available; falling back to pass through"
msgstr ""
"advarsel: highlight perl modul ikke tilgængelig: falder tilbage til simpel "
"gennemkørsel"
-#: ../IkiWiki/Plugin/htmltidy.pm:50
-#, fuzzy
+#: ../IkiWiki/Plugin/htmltidy.pm:62
msgid "htmltidy failed to parse this html"
-msgstr "afkodning af smileys mislykkedes"
+msgstr "htmltidy kunne ikke afkode dette html"
#: ../IkiWiki/Plugin/img.pm:69
msgid "Image::Magick is not installed"
@@ -464,18 +464,18 @@ msgstr "mangler pages-parametren"
#: ../IkiWiki/Plugin/inline.pm:192
#, perl-format
msgid "the %s and %s parameters cannot be used together"
-msgstr ""
+msgstr "parametrene %s og %s kan ikke anvendes sammen"
#: ../IkiWiki/Plugin/inline.pm:313
msgid "Add a new post titled:"
msgstr "Tilføj nyt indlæg med følgende titel:"
-#: ../IkiWiki/Plugin/inline.pm:342
-#, perl-format
-msgid "template %s not found"
-msgstr "skabelon %s ikke fundet"
+#: ../IkiWiki/Plugin/inline.pm:339 ../IkiWiki/Plugin/template.pm:44
+#, fuzzy, perl-format
+msgid "failed to process template %s"
+msgstr "beandling af skabelon mislykkedes:"
-#: ../IkiWiki/Plugin/inline.pm:633
+#: ../IkiWiki/Plugin/inline.pm:630
msgid "RPC::XML::Client not found, not pinging"
msgstr "RPC::XML::Client ikke fundet, pinger ikke"
@@ -486,7 +486,7 @@ msgstr "dot-kørsel mislykkedes"
#: ../IkiWiki/Plugin/linkmap.pm:85
msgid "linkmap"
-msgstr ""
+msgstr "henvisningskort"
#: ../IkiWiki/Plugin/lockedit.pm:49
#, perl-format
@@ -505,22 +505,21 @@ msgstr ""
"Indlæsning af perl-modulet Markdown.pm (%s) eller /usr/bin/markdown (%s) "
"mislykkedes"
-#: ../IkiWiki/Plugin/meta.pm:174
+#: ../IkiWiki/Plugin/meta.pm:175
msgid "stylesheet not found"
msgstr "stilsnit (stylesheet) ikke fundet"
-#: ../IkiWiki/Plugin/meta.pm:212
+#: ../IkiWiki/Plugin/meta.pm:217
msgid "redir page not found"
msgstr "henvisningsside ikke fundet"
-#: ../IkiWiki/Plugin/meta.pm:226
+#: ../IkiWiki/Plugin/meta.pm:231
msgid "redir cycle is not allowed"
msgstr "ring af henvisninger er ikke tilladt"
-#: ../IkiWiki/Plugin/meta.pm:395
-#, fuzzy
+#: ../IkiWiki/Plugin/meta.pm:400
msgid "sort=meta requires a parameter"
-msgstr "kræver 'from'- og 'to'-parametre"
+msgstr "sort=meta kræver en parameter"
#: ../IkiWiki/Plugin/mirrorlist.pm:44
msgid "Mirrors"
@@ -531,18 +530,17 @@ msgid "Mirror"
msgstr "Spejl"
#: ../IkiWiki/Plugin/moderatedcomments.pm:57
-#, fuzzy
msgid "comment needs moderation"
-msgstr "kommentarkoderering"
+msgstr "kommentar kræver moderering"
#: ../IkiWiki/Plugin/more.pm:8
msgid "more"
msgstr "mere"
#: ../IkiWiki/Plugin/openid.pm:70
-#, fuzzy, perl-format
+#, perl-format
msgid "failed to load openid module: "
-msgstr "kompilering af %s mislykkedes"
+msgstr "indlæsning af openid-modul mislykkedes: "
#: ../IkiWiki/Plugin/orphans.pm:56
msgid "All pages have other pages linking to them."
@@ -554,11 +552,11 @@ msgstr "dårlig eller manglende skabelon"
#: ../IkiWiki/Plugin/passwordauth.pm:231
msgid "Your user page: "
-msgstr ""
+msgstr "Din brugerside: "
#: ../IkiWiki/Plugin/passwordauth.pm:238
msgid "Create your user page"
-msgstr ""
+msgstr "Opret din brugerside"
#: ../IkiWiki/Plugin/passwordauth.pm:268
msgid "Account creation successful. Now you can Login."
@@ -593,39 +591,34 @@ msgstr "adgangskodenulstilling afvist"
msgid "Ping received."
msgstr "Ping modtaget."
-#: ../IkiWiki/Plugin/pinger.pm:53
+#: ../IkiWiki/Plugin/pinger.pm:54
msgid "requires 'from' and 'to' parameters"
msgstr "kræver 'from'- og 'to'-parametre"
-#: ../IkiWiki/Plugin/pinger.pm:58
+#: ../IkiWiki/Plugin/pinger.pm:59
#, perl-format
msgid "Will ping %s"
msgstr "vil pinge %s"
-#: ../IkiWiki/Plugin/pinger.pm:61
+#: ../IkiWiki/Plugin/pinger.pm:62
#, perl-format
msgid "Ignoring ping directive for wiki %s (this wiki is %s)"
msgstr "ignorerer ping-direktiv for wiki %s (denne wiki er %s)"
-#: ../IkiWiki/Plugin/pinger.pm:77
+#: ../IkiWiki/Plugin/pinger.pm:78
msgid "LWP not found, not pinging"
msgstr "LWP ikke fundet, pinger ikke"
#: ../IkiWiki/Plugin/po.pm:15
msgid "warning: Old po4a detected! Recommend upgrade to 0.35."
-msgstr ""
+msgstr "advarsel: Gammel po4a detekteret. Anbefaler opgradering til 0.35."
-#: ../IkiWiki/Plugin/po.pm:147
-#, perl-format
-msgid "%s has invalid syntax: must use CODE|NAME"
-msgstr ""
-
-#: ../IkiWiki/Plugin/po.pm:166
+#: ../IkiWiki/Plugin/po.pm:175
#, perl-format
msgid "%s is not a valid language code"
msgstr "%s er ikke en gyldig sprogkode"
-#: ../IkiWiki/Plugin/po.pm:178
+#: ../IkiWiki/Plugin/po.pm:187
#, perl-format
msgid ""
"%s is not a valid value for po_link_to, falling back to po_link_to=default"
@@ -633,7 +626,7 @@ msgstr ""
"%s er ikke en gyldig værdi for po_link_to, falder tilbage til "
"po_link_to=default"
-#: ../IkiWiki/Plugin/po.pm:183
+#: ../IkiWiki/Plugin/po.pm:192
msgid ""
"po_link_to=negotiated requires usedirs to be enabled, falling back to "
"po_link_to=default"
@@ -641,21 +634,11 @@ msgstr ""
"po_link_to=negotiated kræver at usedirs er aktiveret, falder tilbage til "
"po_link_to=default"
-#: ../IkiWiki/Plugin/po.pm:414
-#, perl-format
-msgid "rebuilding all pages to fix meta titles"
-msgstr "gendanner alle sider for at korrigere meta titler"
-
-#: ../IkiWiki/Plugin/po.pm:418 ../IkiWiki/Render.pm:784
-#, perl-format
-msgid "building %s"
-msgstr "danner %s"
-
-#: ../IkiWiki/Plugin/po.pm:456
+#: ../IkiWiki/Plugin/po.pm:455
msgid "updated PO files"
msgstr "opdaterer PO-filer"
-#: ../IkiWiki/Plugin/po.pm:479
+#: ../IkiWiki/Plugin/po.pm:478
msgid ""
"Can not remove a translation. If the master page is removed, however, its "
"translations will be removed as well."
@@ -663,7 +646,7 @@ msgstr ""
"Kan ikke fjerne en oversættelse. Fjern i stedet hovedsiden, så fjernes dens "
"oversættelser også."
-#: ../IkiWiki/Plugin/po.pm:499
+#: ../IkiWiki/Plugin/po.pm:498
msgid ""
"Can not rename a translation. If the master page is renamed, however, its "
"translations will be renamed as well."
@@ -671,54 +654,59 @@ msgstr ""
"Kan ikke omdøbe en oversættelse. Omdøb i stedet hovedsiden, så omdøbes dens "
"oversættelser også."
-#: ../IkiWiki/Plugin/po.pm:924
+#: ../IkiWiki/Plugin/po.pm:935
#, perl-format
msgid "POT file (%s) does not exist"
msgstr "POT-filen %s eksisterer ikke"
-#: ../IkiWiki/Plugin/po.pm:938
-#, fuzzy, perl-format
+#: ../IkiWiki/Plugin/po.pm:949
+#, perl-format
msgid "failed to copy underlay PO file to %s"
-msgstr "kopiering af POT-filen til %s mislykkedes"
+msgstr "kopiering af underlags-PO-fil til %s mislykkedes"
-#: ../IkiWiki/Plugin/po.pm:947
+#: ../IkiWiki/Plugin/po.pm:958
#, perl-format
msgid "failed to update %s"
msgstr "opdatering af %s mislykkedes"
-#: ../IkiWiki/Plugin/po.pm:953
+#: ../IkiWiki/Plugin/po.pm:964
#, perl-format
msgid "failed to copy the POT file to %s"
msgstr "kopiering af POT-filen til %s mislykkedes"
-#: ../IkiWiki/Plugin/po.pm:989
+#: ../IkiWiki/Plugin/po.pm:1000
msgid "N/A"
msgstr "N/A"
-#: ../IkiWiki/Plugin/po.pm:1000
+#: ../IkiWiki/Plugin/po.pm:1011
#, perl-format
msgid "failed to translate %s"
msgstr "oversættelse af %s mislykkedes"
-#: ../IkiWiki/Plugin/po.pm:1079
+#: ../IkiWiki/Plugin/po.pm:1090
msgid "removed obsolete PO files"
msgstr "forældede PO filer fjernet"
-#: ../IkiWiki/Plugin/po.pm:1136 ../IkiWiki/Plugin/po.pm:1148
-#: ../IkiWiki/Plugin/po.pm:1187
+#: ../IkiWiki/Plugin/po.pm:1147 ../IkiWiki/Plugin/po.pm:1159
+#: ../IkiWiki/Plugin/po.pm:1198
#, perl-format
msgid "failed to write %s"
msgstr "skrivning af %s mislykkedes"
-#: ../IkiWiki/Plugin/po.pm:1146
+#: ../IkiWiki/Plugin/po.pm:1157
msgid "failed to translate"
msgstr "oversættelse mislykkedes"
-#: ../IkiWiki/Plugin/po.pm:1199
+#: ../IkiWiki/Plugin/po.pm:1210
msgid "invalid gettext data, go back to previous page to continue edit"
msgstr ""
"forkert gettext-data, gå tilbage til forrige side og fortsæt redigering"
+#: ../IkiWiki/Plugin/po.pm:1252
+#, perl-format
+msgid "%s has invalid syntax: must use CODE|NAME"
+msgstr ""
+
#: ../IkiWiki/Plugin/poll.pm:70
msgid "vote"
msgstr "stem"
@@ -816,6 +804,16 @@ msgstr "ugyldig procentværdi %s"
msgid "need either `percent` or `totalpages` and `donepages` parameters"
msgstr "Kræver enten parametre `percent` eller `totalpages og `donepages`"
+#: ../IkiWiki/Plugin/recentchanges.pm:104
+#, perl-format
+msgid "This reverts commit %s"
+msgstr ""
+
+#: ../IkiWiki/Plugin/recentchanges.pm:123
+#, fuzzy, perl-format
+msgid "confirm reversion of %s"
+msgstr "bekræft at %s bliver fjernet"
+
#: ../IkiWiki/Plugin/recentchangesdiff.pm:37
msgid "(Diff truncated)"
msgstr "(Diff trunkeret)"
@@ -835,12 +833,12 @@ msgstr "%s er ikke i srcdir, så kan ikke blive slettet"
msgid "%s is not a file"
msgstr "%s er ikke en fil"
-#: ../IkiWiki/Plugin/remove.pm:137
+#: ../IkiWiki/Plugin/remove.pm:136
#, perl-format
msgid "confirm removal of %s"
msgstr "bekræft at %s bliver fjernet"
-#: ../IkiWiki/Plugin/remove.pm:174
+#: ../IkiWiki/Plugin/remove.pm:173
msgid "Please select the attachments to remove."
msgstr "Vælg vedhæftning der skal slettes."
@@ -872,42 +870,42 @@ msgstr "%s eksisterer allerede"
msgid "%s already exists on disk"
msgstr "%s eksisterer allerede på disken"
-#: ../IkiWiki/Plugin/rename.pm:122
+#: ../IkiWiki/Plugin/rename.pm:123
#, perl-format
msgid "rename %s"
msgstr "omdøb %s"
-#: ../IkiWiki/Plugin/rename.pm:163
+#: ../IkiWiki/Plugin/rename.pm:164
msgid "Also rename SubPages and attachments"
msgstr "Omdøb også UnderSider og vedhæftninger"
-#: ../IkiWiki/Plugin/rename.pm:250
+#: ../IkiWiki/Plugin/rename.pm:251
msgid "Only one attachment can be renamed at a time."
msgstr "Kun en vedhæftning kan blive omdøbt ad gangen."
-#: ../IkiWiki/Plugin/rename.pm:253
+#: ../IkiWiki/Plugin/rename.pm:254
msgid "Please select the attachment to rename."
msgstr "Vælg vedhæftningen som skal omdøbes."
-#: ../IkiWiki/Plugin/rename.pm:352
+#: ../IkiWiki/Plugin/rename.pm:353
#, perl-format
msgid "rename %s to %s"
msgstr "omdøb %s til %s"
-#: ../IkiWiki/Plugin/rename.pm:577
+#: ../IkiWiki/Plugin/rename.pm:578
#, perl-format
msgid "update for rename of %s to %s"
msgstr "opdatering til omdøbning af %s til %s"
#: ../IkiWiki/Plugin/rsync.pm:37
-#, fuzzy, perl-format
+#, perl-format
msgid "failed to execute rsync_command: %s"
-msgstr "læsning af %s mislykkedes"
+msgstr "afvikling af rsync_command mislykkedes: %s"
#: ../IkiWiki/Plugin/rsync.pm:40
#, perl-format
msgid "rsync_command exited %d"
-msgstr ""
+msgstr "rsync_command sluttede (exit code) %d"
#: ../IkiWiki/Plugin/search.pm:195
#, fuzzy, perl-format
@@ -935,7 +933,12 @@ msgstr "manglende navn eller url parameter"
msgid "shortcut %s points to <i>%s</i>"
msgstr "genvej %s viser til <i>%s</i>"
-#: ../IkiWiki/Plugin/smiley.pm:43
+#: ../IkiWiki/Plugin/smiley.pm:30
+#, fuzzy, perl-format
+msgid "smiley plugin will not work without %s"
+msgstr "genvejsudvidelsen vil ikke fungere uden %s"
+
+#: ../IkiWiki/Plugin/smiley.pm:50
msgid "failed to parse any smileys"
msgstr "afkodning af smileys mislykkedes"
@@ -993,58 +996,53 @@ msgid "parse fail at line %d: %s"
msgstr "afkodningsfejl på linje %d: %s"
#: ../IkiWiki/Plugin/tag.pm:83
-#, fuzzy, perl-format
+#, perl-format
msgid "creating tag page %s"
-msgstr "opretter ny side %s"
+msgstr "opretter mærkatside %s"
#: ../IkiWiki/Plugin/template.pm:33
msgid "missing id parameter"
msgstr "manglende id-parameter"
-#: ../IkiWiki/Plugin/template.pm:47
-#, fuzzy, perl-format
-msgid "%s not found"
-msgstr "fødning ikke fundet"
-
-#: ../IkiWiki/Plugin/teximg.pm:72
+#: ../IkiWiki/Plugin/teximg.pm:73
msgid "missing tex code"
msgstr "manglende tex-kode"
-#: ../IkiWiki/Plugin/teximg.pm:124
+#: ../IkiWiki/Plugin/teximg.pm:125
msgid "failed to generate image from code"
msgstr "billedopbygning fra kode mislykkedes"
#: ../IkiWiki/Plugin/websetup.pm:105
-#, fuzzy, perl-format
+#, perl-format
msgid "%s plugin:"
-msgstr "udvidelse"
+msgstr "%s udvidelse:"
#: ../IkiWiki/Plugin/websetup.pm:121
-#, fuzzy, perl-format
+#, perl-format
msgid "%s plugins"
-msgstr "udvidelser"
+msgstr "%s udvidelser"
#: ../IkiWiki/Plugin/websetup.pm:135
#, perl-format
msgid "enable %s?"
msgstr "aktivér %s?"
-#: ../IkiWiki/Plugin/websetup.pm:272
+#: ../IkiWiki/Plugin/websetup.pm:273
msgid "setup file for this wiki is not known"
msgstr "opsætningsfilen for denne wiki er ukendt"
-#: ../IkiWiki/Plugin/websetup.pm:288
+#: ../IkiWiki/Plugin/websetup.pm:289
msgid "main"
msgstr "primær"
-#: ../IkiWiki/Plugin/websetup.pm:431
+#: ../IkiWiki/Plugin/websetup.pm:433
msgid ""
"The configuration changes shown below require a wiki rebuild to take effect."
msgstr ""
"Opsætningsændringerne vist nedenfor kræver wiki-genopbygning for at træde i "
"kraft."
-#: ../IkiWiki/Plugin/websetup.pm:435
+#: ../IkiWiki/Plugin/websetup.pm:437
msgid ""
"For the configuration changes shown below to fully take effect, you may need "
"to rebuild the wiki."
@@ -1052,7 +1050,7 @@ msgstr ""
"For at opsætningsændringerne vist nedenfor træder fuldt ud i kraft, skal du "
"muligvis genopbygge wikien."
-#: ../IkiWiki/Plugin/websetup.pm:472
+#: ../IkiWiki/Plugin/websetup.pm:474
#, perl-format
msgid "Error: %s exited nonzero (%s). Discarding setup changes."
msgstr "Fejl: %s returnerede ikke-nul (%s). Dropper opsætningsændringer."
@@ -1062,11 +1060,6 @@ msgstr "Fejl: %s returnerede ikke-nul (%s). Dropper opsætningsændringer."
msgid "cannot determine id of untrusted committer %s"
msgstr "kan ikke afgøre id for ikke-tillidsfulde skribent %s"
-#: ../IkiWiki/Receive.pm:85
-#, perl-format
-msgid "bad file name %s"
-msgstr "dårligt filnavn %s"
-
#: ../IkiWiki/Render.pm:158
#, perl-format
msgid "scanning %s"
@@ -1094,12 +1087,12 @@ msgstr "%s har flere mulige kildesider"
#: ../IkiWiki/Render.pm:372
#, perl-format
msgid "querying %s for file creation and modification times.."
-msgstr ""
+msgstr "anmoder %s om oprettelses- og redigeringstider for fil.."
#: ../IkiWiki/Render.pm:446
-#, fuzzy, perl-format
+#, perl-format
msgid "removing obsolete %s"
-msgstr "fjerner gammel side %s"
+msgstr "fjerner forældet %s"
#: ../IkiWiki/Render.pm:520
#, perl-format
@@ -1121,7 +1114,12 @@ msgstr "danner %s, som afhænger af %s"
msgid "building %s, to update its backlinks"
msgstr "danner %s, for at opdatere dens krydshenvisninger (backlinks)"
-#: ../IkiWiki/Render.pm:836
+#: ../IkiWiki/Render.pm:787
+#, perl-format
+msgid "building %s"
+msgstr "danner %s"
+
+#: ../IkiWiki/Render.pm:839
#, perl-format
msgid "ikiwiki: cannot build %s"
msgstr "ikiwiki: kan ikke danne %s"
@@ -1134,14 +1132,14 @@ msgid "cannot read %s: %s"
msgstr "kan ikke læse %s: %s"
#: ../IkiWiki/Setup.pm:34
-#, fuzzy, perl-format
+#, perl-format
msgid "cannot load %s in safe mode"
-msgstr "kan ikke læse %s: %s"
+msgstr "kan ikke læse %s i sikker tilstand"
#: ../IkiWiki/Setup.pm:47
-#, fuzzy, perl-format
+#, perl-format
msgid "failed to parse %s"
-msgstr "opdatering af %s mislykkedes"
+msgstr "afkodning af %s mislykkedes"
#: ../IkiWiki/Setup/Automator.pm:34
msgid "you must enter a wikiname (that contains alphanumerics)"
@@ -1179,39 +1177,38 @@ msgid "wrapper filename not specified"
msgstr "wrapper-navn ikke angivet"
#. translators: The parameter is a C filename.
-#: ../IkiWiki/Wrapper.pm:218
+#: ../IkiWiki/Wrapper.pm:219
#, perl-format
msgid "failed to compile %s"
msgstr "kompilering af %s mislykkedes"
#. translators: The parameter is a filename.
-#: ../IkiWiki/Wrapper.pm:238
+#: ../IkiWiki/Wrapper.pm:239
#, perl-format
msgid "successfully generated %s"
msgstr "Korrekt bygget %s"
-#: ../ikiwiki.in:13
+#: ../ikiwiki.in:10
msgid "usage: ikiwiki [options] source dest"
msgstr "brug: ikiwiki [valg] kilde mål"
-#: ../ikiwiki.in:14
+#: ../ikiwiki.in:11
msgid " ikiwiki --setup configfile"
msgstr " ikiwiki --setup opsætningsfil"
-#: ../ikiwiki.in:105
+#: ../ikiwiki.in:102
msgid "usage: --set var=value"
msgstr "brug: --set var=værdi"
-#: ../ikiwiki.in:112
-#, fuzzy
+#: ../ikiwiki.in:109
msgid "usage: --set-yaml var=value"
-msgstr "brug: --set var=værdi"
+msgstr "brug: --set-yaml var=værdi"
-#: ../ikiwiki.in:218
+#: ../ikiwiki.in:215
msgid "rebuilding wiki.."
msgstr "genopbygger wiki..."
-#: ../ikiwiki.in:221
+#: ../ikiwiki.in:218
msgid "refreshing wiki.."
msgstr "genopfrisker wiki..."
@@ -1238,21 +1235,31 @@ msgstr ""
msgid "preprocessing loop detected on %s at depth %i"
msgstr "forudberegningssløkke fundet på %s ved dybde %i"
-#: ../IkiWiki.pm:2053
+#: ../IkiWiki.pm:1536
+#, perl-format
+msgid "bad file name %s"
+msgstr "dårligt filnavn %s"
+
+#: ../IkiWiki.pm:1836
+#, perl-format
+msgid "template %s not found"
+msgstr "skabelon %s ikke fundet"
+
+#: ../IkiWiki.pm:2118
msgid "yes"
msgstr "ja"
-#: ../IkiWiki.pm:2130
-#, fuzzy, perl-format
+#: ../IkiWiki.pm:2195
+#, perl-format
msgid "invalid sort type %s"
-msgstr "ukendt sorteringsform %s"
+msgstr "forkert sorteringstype %s"
-#: ../IkiWiki.pm:2151
+#: ../IkiWiki.pm:2216
#, perl-format
msgid "unknown sort type %s"
msgstr "ukendt sorteringsform %s"
-#: ../IkiWiki.pm:2287
+#: ../IkiWiki.pm:2352
#, perl-format
msgid "cannot match pages: %s"
msgstr "kan ikke få sider til at passe sammen: %s"
@@ -1277,35 +1284,8 @@ msgstr "Hvilken bruger (wiki konto eller openid) skal være administrator?"
msgid "What is the domain name of the web server?"
msgstr "Hvad er webserverens domænenavn?"
-#~ msgid "You need to log in first."
-#~ msgstr "Du skal først logge på."
-
-#~ msgid "Log in with"
-#~ msgstr "Log på med"
-
-#~ msgid "Get an OpenID"
-#~ msgstr "Skaf en OpenID"
-
-#~ msgid "failed to process"
-#~ msgstr "dannelsen mislykkedes"
-
-#~ msgid "nonexistant template %s"
-#~ msgstr "ikke-eksisterende skabelon: %s"
-
-#~ msgid "getctime not implemented"
-#~ msgstr "getctime ikke implementeret"
-
-#~ msgid "Sort::Naturally needed for title_natural sort"
-#~ msgstr "Sort::Naturally krævet for title_natural sortering"
-
-#~ msgid "failed to read %s"
-#~ msgstr "læsning af %s mislykkedes"
-
-#~ msgid "Failed to parse url, cannot determine domain name"
-#~ msgstr "Tolkning af URL mislykkedes, kan ikke afgøre domænenavn"
-
-#~ msgid "code includes disallowed latex commands"
-#~ msgstr "kode indeholder ikke-tilladte latec-kommandoer"
+#~ msgid "%s not found"
+#~ msgstr "%s ikke fundet"
-#~ msgid "discussion"
-#~ msgstr "diskussion"
+#~ msgid "rebuilding all pages to fix meta titles"
+#~ msgstr "gendanner alle sider for at korrigere meta titler"
diff --git a/po/de.po b/po/de.po
index dc3f447f5..4bc3fe379 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ikiwiki 3.14159\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-04 09:22-0400\n"
+"POT-Creation-Date: 2010-10-23 17:21-0400\n"
"PO-Revision-Date: 2010-03-14 16:09+0530\n"
"Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n"
"Language-Team: German <debian-l10n-german@lists.debian.org>\n"
@@ -65,76 +65,81 @@ msgstr "Das Web löst die Zusammenstellung aus"
msgid "Nothing to do right now, all feeds are up-to-date!"
msgstr "Es gibt nichts zu tun, alle Vorlagen (feeds) sind aktuell!"
-#: ../IkiWiki/Plugin/aggregate.pm:220
+#: ../IkiWiki/Plugin/aggregate.pm:222
#, perl-format
msgid "missing %s parameter"
msgstr "Parameter %s fehlt"
-#: ../IkiWiki/Plugin/aggregate.pm:255
+#: ../IkiWiki/Plugin/aggregate.pm:257
msgid "new feed"
msgstr "neue Vorlage (feed)"
-#: ../IkiWiki/Plugin/aggregate.pm:269
+#: ../IkiWiki/Plugin/aggregate.pm:271
msgid "posts"
msgstr "Beiträge"
-#: ../IkiWiki/Plugin/aggregate.pm:271
+#: ../IkiWiki/Plugin/aggregate.pm:273
msgid "new"
msgstr "neu"
-#: ../IkiWiki/Plugin/aggregate.pm:455
+#: ../IkiWiki/Plugin/aggregate.pm:457
#, perl-format
msgid "expiring %s (%s days old)"
msgstr "%s läuft aus (%s Tage alt)"
-#: ../IkiWiki/Plugin/aggregate.pm:462
+#: ../IkiWiki/Plugin/aggregate.pm:464
#, perl-format
msgid "expiring %s"
msgstr "%s läuft aus"
-#: ../IkiWiki/Plugin/aggregate.pm:489
+#: ../IkiWiki/Plugin/aggregate.pm:491
#, perl-format
msgid "last checked %s"
msgstr "zuletzt geprüft %s"
-#: ../IkiWiki/Plugin/aggregate.pm:493
+#: ../IkiWiki/Plugin/aggregate.pm:495
#, perl-format
msgid "checking feed %s ..."
msgstr "überprüfe Vorlage (feed) %s ..."
-#: ../IkiWiki/Plugin/aggregate.pm:498
+#: ../IkiWiki/Plugin/aggregate.pm:500
#, perl-format
msgid "could not find feed at %s"
msgstr "konnte Vorlage (feed) unter %s nicht finden"
-#: ../IkiWiki/Plugin/aggregate.pm:517
+#: ../IkiWiki/Plugin/aggregate.pm:519
msgid "feed not found"
msgstr "Vorlage (feed) nicht gefunden"
-#: ../IkiWiki/Plugin/aggregate.pm:528
+#: ../IkiWiki/Plugin/aggregate.pm:530
#, perl-format
msgid "(invalid UTF-8 stripped from feed)"
msgstr "(ungültiges UTF-8 wurde aus der Vorlage (feed) entfernt)"
-#: ../IkiWiki/Plugin/aggregate.pm:536
+#: ../IkiWiki/Plugin/aggregate.pm:538
#, perl-format
msgid "(feed entities escaped)"
msgstr "(Einträge in der Vorlage (feed) wurden maskiert)"
-#: ../IkiWiki/Plugin/aggregate.pm:544
+#: ../IkiWiki/Plugin/aggregate.pm:546
msgid "feed crashed XML::Feed!"
msgstr "Vorlage (feed) führte zum Absturz von XML::Feed!"
-#: ../IkiWiki/Plugin/aggregate.pm:630
+#: ../IkiWiki/Plugin/aggregate.pm:632
#, perl-format
msgid "creating new page %s"
msgstr "erstelle neue Seite %s"
+#: ../IkiWiki/Plugin/aggregate.pm:652 ../IkiWiki/Plugin/edittemplate.pm:133
+#, fuzzy
+msgid "failed to process template:"
+msgstr "Fehler beim Ablauf:"
+
#: ../IkiWiki/Plugin/amazon_s3.pm:31
msgid "deleting bucket.."
msgstr "lösche Behälter (bucket)..."
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:229
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:226
msgid "done"
msgstr "fertig"
@@ -177,7 +182,7 @@ msgstr "Anhang hochladen"
msgid "automatic index generation"
msgstr "automatische Index-Erstellung"
-#: ../IkiWiki/Plugin/blogspam.pm:110
+#: ../IkiWiki/Plugin/blogspam.pm:112
msgid ""
"Sorry, but that looks like spam to <a href=\"http://blogspam.net/"
"\">blogspam</a>: "
@@ -259,7 +264,7 @@ msgstr "Kommentar hinzugefügt"
msgid "Added a comment: %s"
msgstr "Kommentar hinzugefügt: %s"
-#: ../IkiWiki/Plugin/comments.pm:573 ../IkiWiki/Plugin/websetup.pm:268
+#: ../IkiWiki/Plugin/comments.pm:573 ../IkiWiki/Plugin/websetup.pm:269
msgid "you are not logged in as an admin"
msgstr "Sie sind nicht als Administrator angemeldet"
@@ -285,18 +290,18 @@ msgstr[1] "%i Kommentare"
msgid "Comment"
msgstr "Kommentieren"
-#: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:31
-#: ../IkiWiki/Plugin/cutpaste.pm:46 ../IkiWiki/Plugin/cutpaste.pm:62
+#: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:46
+#: ../IkiWiki/Plugin/cutpaste.pm:60 ../IkiWiki/Plugin/cutpaste.pm:75
#: ../IkiWiki/Plugin/testpagespec.pm:26
#, perl-format
msgid "%s parameter is required"
msgstr "der Parameter %s wird benötigt"
-#: ../IkiWiki/Plugin/cutpaste.pm:67
+#: ../IkiWiki/Plugin/cutpaste.pm:80
msgid "no text was copied in this page"
msgstr "es wurde kein Text in diese Seite kopiert"
-#: ../IkiWiki/Plugin/cutpaste.pm:70
+#: ../IkiWiki/Plugin/cutpaste.pm:83
#, perl-format
msgid "no text was copied in this page with id %s"
msgstr "es wurde kein Text in diese Seite mit der id %s kopiert"
@@ -323,25 +328,19 @@ msgstr "erstelle %s"
msgid "editing %s"
msgstr "bearbeite %s"
-#: ../IkiWiki/Plugin/edittemplate.pm:52
+#: ../IkiWiki/Plugin/edittemplate.pm:54
msgid "template not specified"
msgstr "Vorlage nicht angegeben"
-#: ../IkiWiki/Plugin/edittemplate.pm:55
+#: ../IkiWiki/Plugin/edittemplate.pm:57
msgid "match not specified"
msgstr "Übereinstimmung nicht angegeben"
-#: ../IkiWiki/Plugin/edittemplate.pm:70
+#: ../IkiWiki/Plugin/edittemplate.pm:72
#, perl-format
msgid "edittemplate %s registered for %s"
msgstr "edittemplate %s für %s registriert"
-#: ../IkiWiki/Plugin/edittemplate.pm:131 ../IkiWiki/Plugin/inline.pm:339
-#: ../IkiWiki/Plugin/template.pm:44
-#, fuzzy
-msgid "failed to process template:"
-msgstr "Fehler beim Ablauf:"
-
#: ../IkiWiki/Plugin/format.pm:30
msgid "must specify format and text"
msgstr "Format und Text müssen spezifiziert werden"
@@ -368,23 +367,32 @@ msgstr "Keine Seite"
msgid "%s is an attachment, not a page."
msgstr "Seite %s ist ein Anhang und keine Seite."
-#: ../IkiWiki/Plugin/git.pm:742 ../IkiWiki/Plugin/git.pm:760
-#: ../IkiWiki/Receive.pm:129
+#: ../IkiWiki/Plugin/git.pm:764 ../IkiWiki/Plugin/git.pm:827
+#: ../IkiWiki.pm:1580
#, perl-format
msgid "you are not allowed to change %s"
msgstr "Sie dürfen %s nicht verändern"
-#: ../IkiWiki/Plugin/git.pm:782
+#: ../IkiWiki/Plugin/git.pm:786
#, perl-format
msgid "you cannot act on a file with mode %s"
msgstr "Sie können eine Datei mit den Zugriffsrechten %s nicht nutzen"
-#: ../IkiWiki/Plugin/git.pm:786
+#: ../IkiWiki/Plugin/git.pm:790
msgid "you are not allowed to change file modes"
msgstr "Sie dürfen die Zugriffsrechte der Datei nicht ändern"
-#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:137
-#: ../IkiWiki/Plugin/search.pm:38
+#: ../IkiWiki/Plugin/git.pm:861
+#, fuzzy
+msgid "you are not allowed to revert a merge"
+msgstr "Sie dürfen %s nicht verändern"
+
+#: ../IkiWiki/Plugin/git.pm:877
+#, fuzzy, perl-format
+msgid "Failed to revert commit %s"
+msgstr "erzeugen von %s fehlgeschlagen"
+
+#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/search.pm:38
#, perl-format
msgid "Must specify %s when using the %s plugin"
msgstr "%s muss angegeben werden, wenn die %s Erweiterung verwandt wird"
@@ -397,24 +405,24 @@ msgstr "graphviz konnte nicht ausgeführt werden"
msgid "prog not a valid graphviz program"
msgstr "prog ist kein gültiges graphviz-Programm"
-#: ../IkiWiki/Plugin/highlight.pm:48
+#: ../IkiWiki/Plugin/highlight.pm:64
#, perl-format
msgid "tohighlight contains unknown file type '%s'"
msgstr "tohighlight enteilt unbekannten Dateityp '%s'"
-#: ../IkiWiki/Plugin/highlight.pm:59
+#: ../IkiWiki/Plugin/highlight.pm:75
#, perl-format
msgid "Source code: %s"
msgstr "Quellcode: %s"
-#: ../IkiWiki/Plugin/highlight.pm:124
+#: ../IkiWiki/Plugin/highlight.pm:140
msgid ""
"warning: highlight perl module not available; falling back to pass through"
msgstr ""
"Warnung: das highlight Perlmodul ist nicht verfügbar; greife zurück auf pass "
"through"
-#: ../IkiWiki/Plugin/htmltidy.pm:50
+#: ../IkiWiki/Plugin/htmltidy.pm:62
msgid "htmltidy failed to parse this html"
msgstr "htmltidy konnte dieses HTML nicht auswerten"
@@ -465,12 +473,12 @@ msgstr "die Parameter %s und %s können nicht zusammen benutzt werden"
msgid "Add a new post titled:"
msgstr "Füge einen neuen Beitrag hinzu. Titel:"
-#: ../IkiWiki/Plugin/inline.pm:342
-#, perl-format
-msgid "template %s not found"
-msgstr "Vorlage %s nicht gefunden"
+#: ../IkiWiki/Plugin/inline.pm:339 ../IkiWiki/Plugin/template.pm:44
+#, fuzzy, perl-format
+msgid "failed to process template %s"
+msgstr "Fehler beim Ablauf:"
-#: ../IkiWiki/Plugin/inline.pm:633
+#: ../IkiWiki/Plugin/inline.pm:630
msgid "RPC::XML::Client not found, not pinging"
msgstr "RPC::XML::Client nicht gefunden, führe Ping nicht aus"
@@ -501,19 +509,19 @@ msgstr ""
"laden des Perlmoduls Markdown.pm (%s) oder /usr/bin/markdown (%s) "
"fehlgeschlagen"
-#: ../IkiWiki/Plugin/meta.pm:174
+#: ../IkiWiki/Plugin/meta.pm:175
msgid "stylesheet not found"
msgstr "Stylesheet nicht gefunden"
-#: ../IkiWiki/Plugin/meta.pm:212
+#: ../IkiWiki/Plugin/meta.pm:217
msgid "redir page not found"
msgstr "Umleitungsseite nicht gefunden"
-#: ../IkiWiki/Plugin/meta.pm:226
+#: ../IkiWiki/Plugin/meta.pm:231
msgid "redir cycle is not allowed"
msgstr "Zyklische Umleitungen sind nicht erlaubt"
-#: ../IkiWiki/Plugin/meta.pm:395
+#: ../IkiWiki/Plugin/meta.pm:400
#, fuzzy
msgid "sort=meta requires a parameter"
msgstr "erfordert die Parameter 'from' und 'to'"
@@ -589,21 +597,21 @@ msgstr "zurücksetzen des Passworts abgelehnt"
msgid "Ping received."
msgstr "Ping empfangen."
-#: ../IkiWiki/Plugin/pinger.pm:53
+#: ../IkiWiki/Plugin/pinger.pm:54
msgid "requires 'from' and 'to' parameters"
msgstr "erfordert die Parameter 'from' und 'to'"
-#: ../IkiWiki/Plugin/pinger.pm:58
+#: ../IkiWiki/Plugin/pinger.pm:59
#, perl-format
msgid "Will ping %s"
msgstr "werde Ping an %s senden"
-#: ../IkiWiki/Plugin/pinger.pm:61
+#: ../IkiWiki/Plugin/pinger.pm:62
#, perl-format
msgid "Ignoring ping directive for wiki %s (this wiki is %s)"
msgstr "Ignoriere die ping Anweisung für das Wiki %s (dieses Wiki ist %s)"
-#: ../IkiWiki/Plugin/pinger.pm:77
+#: ../IkiWiki/Plugin/pinger.pm:78
msgid "LWP not found, not pinging"
msgstr "LWP nicht gefunden, führe Ping nicht aus"
@@ -611,17 +619,12 @@ msgstr "LWP nicht gefunden, führe Ping nicht aus"
msgid "warning: Old po4a detected! Recommend upgrade to 0.35."
msgstr "Warnung: Altes po4a erkannt! Empfehle Aktualisierung auf 0.35"
-#: ../IkiWiki/Plugin/po.pm:147
-#, perl-format
-msgid "%s has invalid syntax: must use CODE|NAME"
-msgstr ""
-
-#: ../IkiWiki/Plugin/po.pm:166
+#: ../IkiWiki/Plugin/po.pm:175
#, perl-format
msgid "%s is not a valid language code"
msgstr "%s ist keine gültige Sprachkodierung"
-#: ../IkiWiki/Plugin/po.pm:178
+#: ../IkiWiki/Plugin/po.pm:187
#, perl-format
msgid ""
"%s is not a valid value for po_link_to, falling back to po_link_to=default"
@@ -629,7 +632,7 @@ msgstr ""
"%s ist kein gültiger Wert für po_link_to, greife zurück auf "
"po_link_to=default"
-#: ../IkiWiki/Plugin/po.pm:183
+#: ../IkiWiki/Plugin/po.pm:192
msgid ""
"po_link_to=negotiated requires usedirs to be enabled, falling back to "
"po_link_to=default"
@@ -637,21 +640,11 @@ msgstr ""
"po_link_to=negotiated benötigt usedirs eingeschaltet, greife zurück auf "
"po_link_to=default"
-#: ../IkiWiki/Plugin/po.pm:414
-#, perl-format
-msgid "rebuilding all pages to fix meta titles"
-msgstr "um die meta-titeln zu reparieren werden alle Seiten neu erstellt"
-
-#: ../IkiWiki/Plugin/po.pm:418 ../IkiWiki/Render.pm:784
-#, perl-format
-msgid "building %s"
-msgstr "erzeuge %s"
-
-#: ../IkiWiki/Plugin/po.pm:456
+#: ../IkiWiki/Plugin/po.pm:455
msgid "updated PO files"
msgstr "PO-Dateien aktualisiert"
-#: ../IkiWiki/Plugin/po.pm:479
+#: ../IkiWiki/Plugin/po.pm:478
msgid ""
"Can not remove a translation. If the master page is removed, however, its "
"translations will be removed as well."
@@ -659,7 +652,7 @@ msgstr ""
"Übersetzung kann nicht entfernt werden. Wenn die Master Seite entfernt wird, "
"werden auch ihre Übersetzungen entfernt."
-#: ../IkiWiki/Plugin/po.pm:499
+#: ../IkiWiki/Plugin/po.pm:498
msgid ""
"Can not rename a translation. If the master page is renamed, however, its "
"translations will be renamed as well."
@@ -667,55 +660,60 @@ msgstr ""
"Eine Übersetzung kann nicht umbenannt werden. Wenn die Master Seite "
"unbenannt wird, werden auch ihre Übersetzungen unbenannt."
-#: ../IkiWiki/Plugin/po.pm:924
+#: ../IkiWiki/Plugin/po.pm:935
#, perl-format
msgid "POT file (%s) does not exist"
msgstr "POT-Datei (%s) existiert nicht"
-#: ../IkiWiki/Plugin/po.pm:938
+#: ../IkiWiki/Plugin/po.pm:949
#, perl-format
msgid "failed to copy underlay PO file to %s"
msgstr "konnte die PO-Datei nicht aus dem Underlay nach %s kopieren"
-#: ../IkiWiki/Plugin/po.pm:947
+#: ../IkiWiki/Plugin/po.pm:958
#, perl-format
msgid "failed to update %s"
msgstr "aktualisieren von %s fehlgeschlagen"
-#: ../IkiWiki/Plugin/po.pm:953
+#: ../IkiWiki/Plugin/po.pm:964
#, perl-format
msgid "failed to copy the POT file to %s"
msgstr "kopieren der POT-Datei nach %s fehlgeschlagen"
-#: ../IkiWiki/Plugin/po.pm:989
+#: ../IkiWiki/Plugin/po.pm:1000
msgid "N/A"
msgstr "N/A"
-#: ../IkiWiki/Plugin/po.pm:1000
+#: ../IkiWiki/Plugin/po.pm:1011
#, perl-format
msgid "failed to translate %s"
msgstr "übersetzen von %s fehlgeschlagen"
-#: ../IkiWiki/Plugin/po.pm:1079
+#: ../IkiWiki/Plugin/po.pm:1090
msgid "removed obsolete PO files"
msgstr "überflüssige PO-Dateien wurden entfernt"
-#: ../IkiWiki/Plugin/po.pm:1136 ../IkiWiki/Plugin/po.pm:1148
-#: ../IkiWiki/Plugin/po.pm:1187
+#: ../IkiWiki/Plugin/po.pm:1147 ../IkiWiki/Plugin/po.pm:1159
+#: ../IkiWiki/Plugin/po.pm:1198
#, perl-format
msgid "failed to write %s"
msgstr "schreiben von %s fehlgeschlagen"
-#: ../IkiWiki/Plugin/po.pm:1146
+#: ../IkiWiki/Plugin/po.pm:1157
msgid "failed to translate"
msgstr "übersetzen fehlgeschlagen"
-#: ../IkiWiki/Plugin/po.pm:1199
+#: ../IkiWiki/Plugin/po.pm:1210
msgid "invalid gettext data, go back to previous page to continue edit"
msgstr ""
"ungültige gettext Datei, gehe zurück zur vorherigen Seite um weiter zu "
"arbeiten"
+#: ../IkiWiki/Plugin/po.pm:1252
+#, perl-format
+msgid "%s has invalid syntax: must use CODE|NAME"
+msgstr ""
+
#: ../IkiWiki/Plugin/poll.pm:70
msgid "vote"
msgstr "abstimmen"
@@ -815,6 +813,16 @@ msgstr ""
"es werden entweder `percent` oder `totalpages` und `donepages` Parameter "
"benötigt"
+#: ../IkiWiki/Plugin/recentchanges.pm:104
+#, perl-format
+msgid "This reverts commit %s"
+msgstr ""
+
+#: ../IkiWiki/Plugin/recentchanges.pm:123
+#, fuzzy, perl-format
+msgid "confirm reversion of %s"
+msgstr "bestätigen Sie die Entfernung von %s"
+
#: ../IkiWiki/Plugin/recentchangesdiff.pm:37
msgid "(Diff truncated)"
msgstr "(Diff wurde gekürzt)"
@@ -834,12 +842,12 @@ msgstr "%s ist nicht im srcdir und kann deshalb nicht gelöscht werden"
msgid "%s is not a file"
msgstr "%s ist keine Datei"
-#: ../IkiWiki/Plugin/remove.pm:137
+#: ../IkiWiki/Plugin/remove.pm:136
#, perl-format
msgid "confirm removal of %s"
msgstr "bestätigen Sie die Entfernung von %s"
-#: ../IkiWiki/Plugin/remove.pm:174
+#: ../IkiWiki/Plugin/remove.pm:173
msgid "Please select the attachments to remove."
msgstr "Bitte wählen Sie die zu entfernenden Anhänge aus."
@@ -871,29 +879,29 @@ msgstr "%s existiert bereits"
msgid "%s already exists on disk"
msgstr "%s existiert bereits auf der Festplatte"
-#: ../IkiWiki/Plugin/rename.pm:122
+#: ../IkiWiki/Plugin/rename.pm:123
#, perl-format
msgid "rename %s"
msgstr "benenne %s um"
-#: ../IkiWiki/Plugin/rename.pm:163
+#: ../IkiWiki/Plugin/rename.pm:164
msgid "Also rename SubPages and attachments"
msgstr "Auch Unterseiten (SubPages) und Anhänge umbenennen"
-#: ../IkiWiki/Plugin/rename.pm:250
+#: ../IkiWiki/Plugin/rename.pm:251
msgid "Only one attachment can be renamed at a time."
msgstr "Es kann immer nur ein Anhang gleichzeitig umbenannt werden."
-#: ../IkiWiki/Plugin/rename.pm:253
+#: ../IkiWiki/Plugin/rename.pm:254
msgid "Please select the attachment to rename."
msgstr "Bitte wählen Sie den Anhang aus, der umbenannt werden soll."
-#: ../IkiWiki/Plugin/rename.pm:352
+#: ../IkiWiki/Plugin/rename.pm:353
#, perl-format
msgid "rename %s to %s"
msgstr "benenne %s in %s um"
-#: ../IkiWiki/Plugin/rename.pm:577
+#: ../IkiWiki/Plugin/rename.pm:578
#, perl-format
msgid "update for rename of %s to %s"
msgstr "aktualisiert zum Umbenennen von %s nach %s"
@@ -934,7 +942,12 @@ msgstr "fehlender Name oder URL-Parameter"
msgid "shortcut %s points to <i>%s</i>"
msgstr "Tastenkürzel %s verweist nach <i>%s</i>"
-#: ../IkiWiki/Plugin/smiley.pm:43
+#: ../IkiWiki/Plugin/smiley.pm:30
+#, fuzzy, perl-format
+msgid "smiley plugin will not work without %s"
+msgstr "die shortcut Erweiterung wird ohne %s nicht funktionieren"
+
+#: ../IkiWiki/Plugin/smiley.pm:50
msgid "failed to parse any smileys"
msgstr "Smileys konnten nicht ausgewertet werden"
@@ -1000,16 +1013,11 @@ msgstr "erstelle neue Seite %s"
msgid "missing id parameter"
msgstr "fehlender Parameter id"
-#: ../IkiWiki/Plugin/template.pm:47
-#, fuzzy, perl-format
-msgid "%s not found"
-msgstr "Vorlage (feed) nicht gefunden"
-
-#: ../IkiWiki/Plugin/teximg.pm:72
+#: ../IkiWiki/Plugin/teximg.pm:73
msgid "missing tex code"
msgstr "fehlender TeX-Code"
-#: ../IkiWiki/Plugin/teximg.pm:124
+#: ../IkiWiki/Plugin/teximg.pm:125
msgid "failed to generate image from code"
msgstr "konnte kein Bild aus dem Code erzeugen"
@@ -1028,22 +1036,22 @@ msgstr "%s-Erweiterungen"
msgid "enable %s?"
msgstr "%s aktivieren?"
-#: ../IkiWiki/Plugin/websetup.pm:272
+#: ../IkiWiki/Plugin/websetup.pm:273
msgid "setup file for this wiki is not known"
msgstr "Die Einrichtungsdatei für dieses Wiki ist unbekannt"
-#: ../IkiWiki/Plugin/websetup.pm:288
+#: ../IkiWiki/Plugin/websetup.pm:289
msgid "main"
msgstr "Hauptseite"
-#: ../IkiWiki/Plugin/websetup.pm:431
+#: ../IkiWiki/Plugin/websetup.pm:433
msgid ""
"The configuration changes shown below require a wiki rebuild to take effect."
msgstr ""
"Die unten aufgeführten Konfigurationsänderungen erfordern ein Neubau des "
"Wikis, um wirksam zu werden."
-#: ../IkiWiki/Plugin/websetup.pm:435
+#: ../IkiWiki/Plugin/websetup.pm:437
msgid ""
"For the configuration changes shown below to fully take effect, you may need "
"to rebuild the wiki."
@@ -1051,7 +1059,7 @@ msgstr ""
"Damit die unten aufgeführten Konfigurationsänderungen insgesamt wirksam "
"werden, kann es notwendig sein, das Wikis neu zu bauen."
-#: ../IkiWiki/Plugin/websetup.pm:472
+#: ../IkiWiki/Plugin/websetup.pm:474
#, perl-format
msgid "Error: %s exited nonzero (%s). Discarding setup changes."
msgstr ""
@@ -1064,11 +1072,6 @@ msgid "cannot determine id of untrusted committer %s"
msgstr ""
"id des nicht vertrauenswürdigen Absenders %s konnte nicht feststellt werden"
-#: ../IkiWiki/Receive.pm:85
-#, perl-format
-msgid "bad file name %s"
-msgstr "fehlerhafter Dateiname %s"
-
#: ../IkiWiki/Render.pm:158
#, perl-format
msgid "scanning %s"
@@ -1123,7 +1126,12 @@ msgstr "erzeuge %s, die von %s abhängt"
msgid "building %s, to update its backlinks"
msgstr "erzeuge %s, um dessen Rückverweise zu aktualisieren"
-#: ../IkiWiki/Render.pm:836
+#: ../IkiWiki/Render.pm:787
+#, perl-format
+msgid "building %s"
+msgstr "erzeuge %s"
+
+#: ../IkiWiki/Render.pm:839
#, perl-format
msgid "ikiwiki: cannot build %s"
msgstr "ikiwiki: kann %s nicht erzeugen"
@@ -1184,39 +1192,39 @@ msgid "wrapper filename not specified"
msgstr "Dateiname des Wrappers nicht angegeben"
#. translators: The parameter is a C filename.
-#: ../IkiWiki/Wrapper.pm:218
+#: ../IkiWiki/Wrapper.pm:219
#, perl-format
msgid "failed to compile %s"
msgstr "erzeugen von %s fehlgeschlagen"
#. translators: The parameter is a filename.
-#: ../IkiWiki/Wrapper.pm:238
+#: ../IkiWiki/Wrapper.pm:239
#, perl-format
msgid "successfully generated %s"
msgstr "%s wurde erfolgreich erstellt"
-#: ../ikiwiki.in:13
+#: ../ikiwiki.in:10
msgid "usage: ikiwiki [options] source dest"
msgstr "Aufruf: ikiwiki [Optionen] Quelle Ziel"
-#: ../ikiwiki.in:14
+#: ../ikiwiki.in:11
msgid " ikiwiki --setup configfile"
msgstr " ikiwiki --setup Konfigurationsdatei"
-#: ../ikiwiki.in:105
+#: ../ikiwiki.in:102
msgid "usage: --set var=value"
msgstr "Aufruf: --set Variable=Wert"
-#: ../ikiwiki.in:112
+#: ../ikiwiki.in:109
#, fuzzy
msgid "usage: --set-yaml var=value"
msgstr "Aufruf: --set Variable=Wert"
-#: ../ikiwiki.in:218
+#: ../ikiwiki.in:215
msgid "rebuilding wiki.."
msgstr "erzeuge Wiki neu.."
-#: ../ikiwiki.in:221
+#: ../ikiwiki.in:218
msgid "refreshing wiki.."
msgstr "aktualisiere Wiki.."
@@ -1245,21 +1253,31 @@ msgstr "Laden der für %s benötigten externen Erweiterung fehlgeschlagen: %s"
msgid "preprocessing loop detected on %s at depth %i"
msgstr "Präprozessorschleife auf %s in Tiefe %i erkannt"
-#: ../IkiWiki.pm:2053
+#: ../IkiWiki.pm:1536
+#, perl-format
+msgid "bad file name %s"
+msgstr "fehlerhafter Dateiname %s"
+
+#: ../IkiWiki.pm:1836
+#, perl-format
+msgid "template %s not found"
+msgstr "Vorlage %s nicht gefunden"
+
+#: ../IkiWiki.pm:2118
msgid "yes"
msgstr "ja"
-#: ../IkiWiki.pm:2130
+#: ../IkiWiki.pm:2195
#, fuzzy, perl-format
msgid "invalid sort type %s"
msgstr "Unbekannter Sortierungstyp %s"
-#: ../IkiWiki.pm:2151
+#: ../IkiWiki.pm:2216
#, perl-format
msgid "unknown sort type %s"
msgstr "Unbekannter Sortierungstyp %s"
-#: ../IkiWiki.pm:2287
+#: ../IkiWiki.pm:2352
#, perl-format
msgid "cannot match pages: %s"
msgstr "Kann die Seiten nicht zuordnen: %s"
@@ -1284,6 +1302,13 @@ msgstr "Wer (Wiki-Konto oder OpenID) soll Administrator sein?"
msgid "What is the domain name of the web server?"
msgstr "Wie lautet der Domainname des Webservers?"
+#, fuzzy
+#~ msgid "%s not found"
+#~ msgstr "Vorlage (feed) nicht gefunden"
+
+#~ msgid "rebuilding all pages to fix meta titles"
+#~ msgstr "um die meta-titeln zu reparieren werden alle Seiten neu erstellt"
+
#~ msgid "You need to log in first."
#~ msgstr "Sie müssen sich zuerst anmelden."
diff --git a/po/es.po b/po/es.po
index c7ec94678..e5159d0c6 100644
--- a/po/es.po
+++ b/po/es.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: es\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-04 09:22-0400\n"
+"POT-Creation-Date: 2010-10-23 17:21-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"
@@ -70,76 +70,81 @@ msgid "Nothing to do right now, all feeds are up-to-date!"
msgstr ""
"¡ No hay nada que hacer, todas las fuentes de noticias están actualizadas !"
-#: ../IkiWiki/Plugin/aggregate.pm:220
+#: ../IkiWiki/Plugin/aggregate.pm:222
#, perl-format
msgid "missing %s parameter"
msgstr "falta el parámetro %s"
-#: ../IkiWiki/Plugin/aggregate.pm:255
+#: ../IkiWiki/Plugin/aggregate.pm:257
msgid "new feed"
msgstr "nueva entrada"
-#: ../IkiWiki/Plugin/aggregate.pm:269
+#: ../IkiWiki/Plugin/aggregate.pm:271
msgid "posts"
msgstr "entradas"
-#: ../IkiWiki/Plugin/aggregate.pm:271
+#: ../IkiWiki/Plugin/aggregate.pm:273
msgid "new"
msgstr "nuevo"
-#: ../IkiWiki/Plugin/aggregate.pm:455
+#: ../IkiWiki/Plugin/aggregate.pm:457
#, perl-format
msgid "expiring %s (%s days old)"
msgstr "%s caducada (%s días de antigüedad)"
-#: ../IkiWiki/Plugin/aggregate.pm:462
+#: ../IkiWiki/Plugin/aggregate.pm:464
#, perl-format
msgid "expiring %s"
msgstr "%s caducada"
-#: ../IkiWiki/Plugin/aggregate.pm:489
+#: ../IkiWiki/Plugin/aggregate.pm:491
#, perl-format
msgid "last checked %s"
msgstr "última comprobación el %s"
-#: ../IkiWiki/Plugin/aggregate.pm:493
+#: ../IkiWiki/Plugin/aggregate.pm:495
#, perl-format
msgid "checking feed %s ..."
msgstr "comprobando fuente de datos %s ..."
-#: ../IkiWiki/Plugin/aggregate.pm:498
+#: ../IkiWiki/Plugin/aggregate.pm:500
#, perl-format
msgid "could not find feed at %s"
msgstr "no puedo encontrar la fuente de datos en %s"
-#: ../IkiWiki/Plugin/aggregate.pm:517
+#: ../IkiWiki/Plugin/aggregate.pm:519
msgid "feed not found"
msgstr "fuente de datos no encontrada"
-#: ../IkiWiki/Plugin/aggregate.pm:528
+#: ../IkiWiki/Plugin/aggregate.pm:530
#, perl-format
msgid "(invalid UTF-8 stripped from feed)"
msgstr "(una secuencia UTF-8 inválida ha sido eliminada de la fuente de datos)"
-#: ../IkiWiki/Plugin/aggregate.pm:536
+#: ../IkiWiki/Plugin/aggregate.pm:538
#, perl-format
msgid "(feed entities escaped)"
msgstr "(los caracteres especiales de la fuente de datos están exceptuados)"
-#: ../IkiWiki/Plugin/aggregate.pm:544
+#: ../IkiWiki/Plugin/aggregate.pm:546
msgid "feed crashed XML::Feed!"
msgstr "¡ la fuente de datos ha provocado un error fatal en XML::Feed !"
-#: ../IkiWiki/Plugin/aggregate.pm:630
+#: ../IkiWiki/Plugin/aggregate.pm:632
#, perl-format
msgid "creating new page %s"
msgstr "creando nueva página %s"
+#: ../IkiWiki/Plugin/aggregate.pm:652 ../IkiWiki/Plugin/edittemplate.pm:133
+#, fuzzy
+msgid "failed to process template:"
+msgstr "se ha producido un error fatal mientras procesaba la plantilla:"
+
#: ../IkiWiki/Plugin/amazon_s3.pm:31
msgid "deleting bucket.."
msgstr "borrando el directorio.."
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:229
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:226
msgid "done"
msgstr "completado"
@@ -184,7 +189,7 @@ msgstr "enviado el adjunto"
msgid "automatic index generation"
msgstr "creación de índice automática"
-#: ../IkiWiki/Plugin/blogspam.pm:110
+#: ../IkiWiki/Plugin/blogspam.pm:112
msgid ""
"Sorry, but that looks like spam to <a href=\"http://blogspam.net/"
"\">blogspam</a>: "
@@ -265,7 +270,7 @@ msgstr "Añadir un comentario"
msgid "Added a comment: %s"
msgstr "Comentario añadido: %s"
-#: ../IkiWiki/Plugin/comments.pm:573 ../IkiWiki/Plugin/websetup.pm:268
+#: ../IkiWiki/Plugin/comments.pm:573 ../IkiWiki/Plugin/websetup.pm:269
msgid "you are not logged in as an admin"
msgstr "No está registrado como un administrador"
@@ -292,18 +297,18 @@ msgstr[1] "Comentarios"
msgid "Comment"
msgstr "Comentarios"
-#: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:31
-#: ../IkiWiki/Plugin/cutpaste.pm:46 ../IkiWiki/Plugin/cutpaste.pm:62
+#: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:46
+#: ../IkiWiki/Plugin/cutpaste.pm:60 ../IkiWiki/Plugin/cutpaste.pm:75
#: ../IkiWiki/Plugin/testpagespec.pm:26
#, perl-format
msgid "%s parameter is required"
msgstr "el parámetro %s es obligatorio"
-#: ../IkiWiki/Plugin/cutpaste.pm:67
+#: ../IkiWiki/Plugin/cutpaste.pm:80
msgid "no text was copied in this page"
msgstr "no se ha copiado ningún texto en esta página"
-#: ../IkiWiki/Plugin/cutpaste.pm:70
+#: ../IkiWiki/Plugin/cutpaste.pm:83
#, perl-format
msgid "no text was copied in this page with id %s"
msgstr "no se ha copiado ningún texto con el identificador %s en esta pagina"
@@ -330,25 +335,19 @@ msgstr "creando página %s"
msgid "editing %s"
msgstr "modificando página %s"
-#: ../IkiWiki/Plugin/edittemplate.pm:52
+#: ../IkiWiki/Plugin/edittemplate.pm:54
msgid "template not specified"
msgstr "falta indicar la plantilla (template)"
-#: ../IkiWiki/Plugin/edittemplate.pm:55
+#: ../IkiWiki/Plugin/edittemplate.pm:57
msgid "match not specified"
msgstr "falta indicar la coincidencia de páginas (match)"
-#: ../IkiWiki/Plugin/edittemplate.pm:70
+#: ../IkiWiki/Plugin/edittemplate.pm:72
#, perl-format
msgid "edittemplate %s registered for %s"
msgstr "plantilla de edición %s registrada para %s"
-#: ../IkiWiki/Plugin/edittemplate.pm:131 ../IkiWiki/Plugin/inline.pm:339
-#: ../IkiWiki/Plugin/template.pm:44
-#, fuzzy
-msgid "failed to process template:"
-msgstr "se ha producido un error fatal mientras procesaba la plantilla:"
-
#: ../IkiWiki/Plugin/format.pm:30
msgid "must specify format and text"
msgstr "se deben especificar tanto el formato como el texto"
@@ -376,23 +375,32 @@ msgstr "no encuentro páginas coincidentes: %s"
msgid "%s is an attachment, not a page."
msgstr "la página %s no es modificable"
-#: ../IkiWiki/Plugin/git.pm:742 ../IkiWiki/Plugin/git.pm:760
-#: ../IkiWiki/Receive.pm:129
+#: ../IkiWiki/Plugin/git.pm:764 ../IkiWiki/Plugin/git.pm:827
+#: ../IkiWiki.pm:1580
#, perl-format
msgid "you are not allowed to change %s"
msgstr "No puede cambiar %s"
-#: ../IkiWiki/Plugin/git.pm:782
+#: ../IkiWiki/Plugin/git.pm:786
#, perl-format
msgid "you cannot act on a file with mode %s"
msgstr "no puede actuar sobre un archivo con permisos %s"
-#: ../IkiWiki/Plugin/git.pm:786
+#: ../IkiWiki/Plugin/git.pm:790
msgid "you are not allowed to change file modes"
msgstr "No puede cambiar los permisos de acceso de un archivo"
-#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:137
-#: ../IkiWiki/Plugin/search.pm:38
+#: ../IkiWiki/Plugin/git.pm:861
+#, fuzzy
+msgid "you are not allowed to revert a merge"
+msgstr "No puede cambiar %s"
+
+#: ../IkiWiki/Plugin/git.pm:877
+#, fuzzy, perl-format
+msgid "Failed to revert commit %s"
+msgstr "ha fallado la compilación del programa %s"
+
+#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/search.pm:38
#, fuzzy, perl-format
msgid "Must specify %s when using the %s plugin"
msgstr "Es obligatorio indicar %s cuando se utiliza el complemento de búsqueda"
@@ -405,24 +413,24 @@ msgstr "no he podido ejecutar el programa graphviz "
msgid "prog not a valid graphviz program"
msgstr "prog no es un programa graphviz válido "
-#: ../IkiWiki/Plugin/highlight.pm:48
+#: ../IkiWiki/Plugin/highlight.pm:64
#, perl-format
msgid "tohighlight contains unknown file type '%s'"
msgstr "la directiva tohighlight contiene el tipo de archivo desconocido '%s' "
-#: ../IkiWiki/Plugin/highlight.pm:59
+#: ../IkiWiki/Plugin/highlight.pm:75
#, perl-format
msgid "Source code: %s"
msgstr "Código fuente: %s"
-#: ../IkiWiki/Plugin/highlight.pm:124
+#: ../IkiWiki/Plugin/highlight.pm:140
msgid ""
"warning: highlight perl module not available; falling back to pass through"
msgstr ""
"aviso: el módulo Perl hightlight no está disponible; retrocedo la entrada "
"para continuar el proceso. "
-#: ../IkiWiki/Plugin/htmltidy.pm:50
+#: ../IkiWiki/Plugin/htmltidy.pm:62
#, fuzzy
msgid "htmltidy failed to parse this html"
msgstr "Algunos emoticonos tienen errores"
@@ -474,12 +482,12 @@ msgstr ""
msgid "Add a new post titled:"
msgstr "Añadir una entrada nueva titulada:"
-#: ../IkiWiki/Plugin/inline.pm:342
-#, perl-format
-msgid "template %s not found"
-msgstr "no he encontrado la plantilla %s"
+#: ../IkiWiki/Plugin/inline.pm:339 ../IkiWiki/Plugin/template.pm:44
+#, fuzzy, perl-format
+msgid "failed to process template %s"
+msgstr "se ha producido un error fatal mientras procesaba la plantilla:"
-#: ../IkiWiki/Plugin/inline.pm:633
+#: ../IkiWiki/Plugin/inline.pm:630
msgid "RPC::XML::Client not found, not pinging"
msgstr "No he encontrado el componente RPC::XML::Client, no envío señal alguna"
@@ -509,19 +517,19 @@ msgstr ""
"no he podido cargar el módulo Perl Markdown.pm (%s) ó no he podido ejecutar "
"el programa /usr/bin/markdown (%s)"
-#: ../IkiWiki/Plugin/meta.pm:174
+#: ../IkiWiki/Plugin/meta.pm:175
msgid "stylesheet not found"
msgstr "hoja de estilo no encontrada "
-#: ../IkiWiki/Plugin/meta.pm:212
+#: ../IkiWiki/Plugin/meta.pm:217
msgid "redir page not found"
msgstr "falta la página a donde redirigir"
-#: ../IkiWiki/Plugin/meta.pm:226
+#: ../IkiWiki/Plugin/meta.pm:231
msgid "redir cycle is not allowed"
msgstr "ciclo de redirección no permitido"
-#: ../IkiWiki/Plugin/meta.pm:395
+#: ../IkiWiki/Plugin/meta.pm:400
#, fuzzy
msgid "sort=meta requires a parameter"
msgstr "los parámetros 'from' y 'to' son obligatorios"
@@ -601,21 +609,21 @@ msgstr "reinicio de contraseña denegado"
msgid "Ping received."
msgstr "Recibida una señal ping."
-#: ../IkiWiki/Plugin/pinger.pm:53
+#: ../IkiWiki/Plugin/pinger.pm:54
msgid "requires 'from' and 'to' parameters"
msgstr "los parámetros 'from' y 'to' son obligatorios"
-#: ../IkiWiki/Plugin/pinger.pm:58
+#: ../IkiWiki/Plugin/pinger.pm:59
#, perl-format
msgid "Will ping %s"
msgstr "Informaremos a %s"
-#: ../IkiWiki/Plugin/pinger.pm:61
+#: ../IkiWiki/Plugin/pinger.pm:62
#, perl-format
msgid "Ignoring ping directive for wiki %s (this wiki is %s)"
msgstr "Ignorando directiva 'ping' para el wiki %s (este wiki es %s)"
-#: ../IkiWiki/Plugin/pinger.pm:77
+#: ../IkiWiki/Plugin/pinger.pm:78
msgid "LWP not found, not pinging"
msgstr "No he encontrado el componente LWP, no envío señal alguna"
@@ -623,102 +631,92 @@ msgstr "No he encontrado el componente LWP, no envío señal alguna"
msgid "warning: Old po4a detected! Recommend upgrade to 0.35."
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:147
-#, perl-format
-msgid "%s has invalid syntax: must use CODE|NAME"
-msgstr ""
-
-#: ../IkiWiki/Plugin/po.pm:166
+#: ../IkiWiki/Plugin/po.pm:175
#, fuzzy, perl-format
msgid "%s is not a valid language code"
msgstr "%s no es un archivo"
-#: ../IkiWiki/Plugin/po.pm:178
+#: ../IkiWiki/Plugin/po.pm:187
#, perl-format
msgid ""
"%s is not a valid value for po_link_to, falling back to po_link_to=default"
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:183
+#: ../IkiWiki/Plugin/po.pm:192
msgid ""
"po_link_to=negotiated requires usedirs to be enabled, falling back to "
"po_link_to=default"
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:414
-#, perl-format
-msgid "rebuilding all pages to fix meta titles"
-msgstr ""
-
-#: ../IkiWiki/Plugin/po.pm:418 ../IkiWiki/Render.pm:784
-#, fuzzy, perl-format
-msgid "building %s"
-msgstr "Informaremos a %s"
-
-#: ../IkiWiki/Plugin/po.pm:456
+#: ../IkiWiki/Plugin/po.pm:455
msgid "updated PO files"
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:479
+#: ../IkiWiki/Plugin/po.pm:478
msgid ""
"Can not remove a translation. If the master page is removed, however, its "
"translations will be removed as well."
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:499
+#: ../IkiWiki/Plugin/po.pm:498
msgid ""
"Can not rename a translation. If the master page is renamed, however, its "
"translations will be renamed as well."
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:924
+#: ../IkiWiki/Plugin/po.pm:935
#, fuzzy, perl-format
msgid "POT file (%s) does not exist"
msgstr "No existe la página %s."
-#: ../IkiWiki/Plugin/po.pm:938
+#: ../IkiWiki/Plugin/po.pm:949
#, fuzzy, perl-format
msgid "failed to copy underlay PO file to %s"
msgstr "ha fallado la compilación del programa %s"
-#: ../IkiWiki/Plugin/po.pm:947
+#: ../IkiWiki/Plugin/po.pm:958
#, fuzzy, perl-format
msgid "failed to update %s"
msgstr "ha fallado la compilación del programa %s"
-#: ../IkiWiki/Plugin/po.pm:953
+#: ../IkiWiki/Plugin/po.pm:964
#, fuzzy, perl-format
msgid "failed to copy the POT file to %s"
msgstr "ha fallado la compilación del programa %s"
-#: ../IkiWiki/Plugin/po.pm:989
+#: ../IkiWiki/Plugin/po.pm:1000
msgid "N/A"
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:1000
+#: ../IkiWiki/Plugin/po.pm:1011
#, fuzzy, perl-format
msgid "failed to translate %s"
msgstr "dimensionamiento fallido: %s"
-#: ../IkiWiki/Plugin/po.pm:1079
+#: ../IkiWiki/Plugin/po.pm:1090
msgid "removed obsolete PO files"
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:1136 ../IkiWiki/Plugin/po.pm:1148
-#: ../IkiWiki/Plugin/po.pm:1187
+#: ../IkiWiki/Plugin/po.pm:1147 ../IkiWiki/Plugin/po.pm:1159
+#: ../IkiWiki/Plugin/po.pm:1198
#, fuzzy, perl-format
msgid "failed to write %s"
msgstr "dimensionamiento fallido: %s"
-#: ../IkiWiki/Plugin/po.pm:1146
+#: ../IkiWiki/Plugin/po.pm:1157
#, fuzzy
msgid "failed to translate"
msgstr "no he podido ejecutar el programa dot"
-#: ../IkiWiki/Plugin/po.pm:1199
+#: ../IkiWiki/Plugin/po.pm:1210
msgid "invalid gettext data, go back to previous page to continue edit"
msgstr ""
+#: ../IkiWiki/Plugin/po.pm:1252
+#, perl-format
+msgid "%s has invalid syntax: must use CODE|NAME"
+msgstr ""
+
#: ../IkiWiki/Plugin/poll.pm:70
msgid "vote"
msgstr "Votar"
@@ -816,6 +814,16 @@ msgstr "%s es un valor erróneo para un porcentaje"
msgid "need either `percent` or `totalpages` and `donepages` parameters"
msgstr "son necesarios los parámetros 'donepages' y 'percent' ó 'totalpages'"
+#: ../IkiWiki/Plugin/recentchanges.pm:104
+#, perl-format
+msgid "This reverts commit %s"
+msgstr ""
+
+#: ../IkiWiki/Plugin/recentchanges.pm:123
+#, fuzzy, perl-format
+msgid "confirm reversion of %s"
+msgstr "confirme el borrado de %s"
+
#: ../IkiWiki/Plugin/recentchangesdiff.pm:37
msgid "(Diff truncated)"
msgstr "(Lista de diferencias truncada)"
@@ -835,12 +843,12 @@ msgstr "%s no está en el directorio fuente por lo que no puede ser borrada"
msgid "%s is not a file"
msgstr "%s no es un archivo"
-#: ../IkiWiki/Plugin/remove.pm:137
+#: ../IkiWiki/Plugin/remove.pm:136
#, perl-format
msgid "confirm removal of %s"
msgstr "confirme el borrado de %s"
-#: ../IkiWiki/Plugin/remove.pm:174
+#: ../IkiWiki/Plugin/remove.pm:173
msgid "Please select the attachments to remove."
msgstr "Por favor seleccione los adjuntos que serán borrados."
@@ -872,29 +880,29 @@ msgstr "%s ya existe"
msgid "%s already exists on disk"
msgstr "%s ya existe en el disco"
-#: ../IkiWiki/Plugin/rename.pm:122
+#: ../IkiWiki/Plugin/rename.pm:123
#, perl-format
msgid "rename %s"
msgstr "cambiando de nombre %s"
-#: ../IkiWiki/Plugin/rename.pm:163
+#: ../IkiWiki/Plugin/rename.pm:164
msgid "Also rename SubPages and attachments"
msgstr "También cambia de nombre las subpáginas y los adjuntos"
-#: ../IkiWiki/Plugin/rename.pm:250
+#: ../IkiWiki/Plugin/rename.pm:251
msgid "Only one attachment can be renamed at a time."
msgstr "Únicamente un adjunto puede ser renombrado a la vez."
-#: ../IkiWiki/Plugin/rename.pm:253
+#: ../IkiWiki/Plugin/rename.pm:254
msgid "Please select the attachment to rename."
msgstr "Por favor, seleccione el adjunto al que cambiar el nombre."
-#: ../IkiWiki/Plugin/rename.pm:352
+#: ../IkiWiki/Plugin/rename.pm:353
#, perl-format
msgid "rename %s to %s"
msgstr "%s cambia de nombre a %s"
-#: ../IkiWiki/Plugin/rename.pm:577
+#: ../IkiWiki/Plugin/rename.pm:578
#, perl-format
msgid "update for rename of %s to %s"
msgstr "actualizado el cambio de nombre de %s a %s"
@@ -935,7 +943,12 @@ msgstr "shortcut necesita el parámetro 'name' ó el parámetro 'url'"
msgid "shortcut %s points to <i>%s</i>"
msgstr "El atajo %s apunta a <i>%s</i>"
-#: ../IkiWiki/Plugin/smiley.pm:43
+#: ../IkiWiki/Plugin/smiley.pm:30
+#, fuzzy, perl-format
+msgid "smiley plugin will not work without %s"
+msgstr "el complemento shortcut no funcionará si no existe la página %s"
+
+#: ../IkiWiki/Plugin/smiley.pm:50
msgid "failed to parse any smileys"
msgstr "Algunos emoticonos tienen errores"
@@ -1005,16 +1018,11 @@ msgstr "creando nueva página %s"
msgid "missing id parameter"
msgstr "falta el parámetro \"id\""
-#: ../IkiWiki/Plugin/template.pm:47
-#, fuzzy, perl-format
-msgid "%s not found"
-msgstr "fuente de datos no encontrada"
-
-#: ../IkiWiki/Plugin/teximg.pm:72
+#: ../IkiWiki/Plugin/teximg.pm:73
msgid "missing tex code"
msgstr "falta el código tex"
-#: ../IkiWiki/Plugin/teximg.pm:124
+#: ../IkiWiki/Plugin/teximg.pm:125
msgid "failed to generate image from code"
msgstr "no he podido crear la imagen desde el código"
@@ -1033,22 +1041,22 @@ msgstr "complementos"
msgid "enable %s?"
msgstr "¿ activar %s ?"
-#: ../IkiWiki/Plugin/websetup.pm:272
+#: ../IkiWiki/Plugin/websetup.pm:273
msgid "setup file for this wiki is not known"
msgstr "El archivo de configuración para este wiki es desconocido"
-#: ../IkiWiki/Plugin/websetup.pm:288
+#: ../IkiWiki/Plugin/websetup.pm:289
msgid "main"
msgstr "principal"
-#: ../IkiWiki/Plugin/websetup.pm:431
+#: ../IkiWiki/Plugin/websetup.pm:433
msgid ""
"The configuration changes shown below require a wiki rebuild to take effect."
msgstr ""
"Los cambios en la configuración que se muestran más abajo precisan una "
"reconstrucción del wiki para tener efecto."
-#: ../IkiWiki/Plugin/websetup.pm:435
+#: ../IkiWiki/Plugin/websetup.pm:437
msgid ""
"For the configuration changes shown below to fully take effect, you may need "
"to rebuild the wiki."
@@ -1056,7 +1064,7 @@ msgstr ""
"Para que los cambios en la configuración mostrados más abajo tengan efecto, "
"es posible que necesite reconstruir el wiki."
-#: ../IkiWiki/Plugin/websetup.pm:472
+#: ../IkiWiki/Plugin/websetup.pm:474
#, perl-format
msgid "Error: %s exited nonzero (%s). Discarding setup changes."
msgstr ""
@@ -1068,11 +1076,6 @@ msgstr ""
msgid "cannot determine id of untrusted committer %s"
msgstr "no puedo determinar el identificador de un usuario no fiable como %s"
-#: ../IkiWiki/Receive.pm:85
-#, perl-format
-msgid "bad file name %s"
-msgstr "el nombre de archivo %s es erróneo"
-
#: ../IkiWiki/Render.pm:158
#, perl-format
msgid "scanning %s"
@@ -1129,7 +1132,12 @@ msgstr ""
"convirtiendo la página %s para actualizar la lista de páginas que hacen "
"referencia a ella."
-#: ../IkiWiki/Render.pm:836
+#: ../IkiWiki/Render.pm:787
+#, fuzzy, perl-format
+msgid "building %s"
+msgstr "Informaremos a %s"
+
+#: ../IkiWiki/Render.pm:839
#, fuzzy, perl-format
msgid "ikiwiki: cannot build %s"
msgstr "ikiwiki: no puedo convertir la página %s"
@@ -1189,39 +1197,39 @@ msgid "wrapper filename not specified"
msgstr "el programa envoltorio no ha sido especificado"
#. translators: The parameter is a C filename.
-#: ../IkiWiki/Wrapper.pm:218
+#: ../IkiWiki/Wrapper.pm:219
#, perl-format
msgid "failed to compile %s"
msgstr "ha fallado la compilación del programa %s"
#. translators: The parameter is a filename.
-#: ../IkiWiki/Wrapper.pm:238
+#: ../IkiWiki/Wrapper.pm:239
#, perl-format
msgid "successfully generated %s"
msgstr "creado con éxito el programa envoltorio %s"
-#: ../ikiwiki.in:13
+#: ../ikiwiki.in:10
msgid "usage: ikiwiki [options] source dest"
msgstr "uso: ikiwiki [opciones] origen destino"
-#: ../ikiwiki.in:14
+#: ../ikiwiki.in:11
msgid " ikiwiki --setup configfile"
msgstr " ikiwiki --setup archivo_de_configuración"
-#: ../ikiwiki.in:105
+#: ../ikiwiki.in:102
msgid "usage: --set var=value"
msgstr "uso: --set variable=valor"
-#: ../ikiwiki.in:112
+#: ../ikiwiki.in:109
#, fuzzy
msgid "usage: --set-yaml var=value"
msgstr "uso: --set variable=valor"
-#: ../ikiwiki.in:218
+#: ../ikiwiki.in:215
msgid "rebuilding wiki.."
msgstr "reconstruyendo el wiki.."
-#: ../ikiwiki.in:221
+#: ../ikiwiki.in:218
msgid "refreshing wiki.."
msgstr "actualizando el wiki.."
@@ -1251,21 +1259,31 @@ msgstr ""
"se ha detectado en la página %s un bucle de preprocesado en la iteración "
"número %i"
-#: ../IkiWiki.pm:2053
+#: ../IkiWiki.pm:1536
+#, perl-format
+msgid "bad file name %s"
+msgstr "el nombre de archivo %s es erróneo"
+
+#: ../IkiWiki.pm:1836
+#, perl-format
+msgid "template %s not found"
+msgstr "no he encontrado la plantilla %s"
+
+#: ../IkiWiki.pm:2118
msgid "yes"
msgstr "si"
-#: ../IkiWiki.pm:2130
+#: ../IkiWiki.pm:2195
#, fuzzy, perl-format
msgid "invalid sort type %s"
msgstr "no conozco este tipo de ordenación %s"
-#: ../IkiWiki.pm:2151
+#: ../IkiWiki.pm:2216
#, perl-format
msgid "unknown sort type %s"
msgstr "no conozco este tipo de ordenación %s"
-#: ../IkiWiki.pm:2287
+#: ../IkiWiki.pm:2352
#, perl-format
msgid "cannot match pages: %s"
msgstr "no encuentro páginas coincidentes: %s"
@@ -1293,6 +1311,10 @@ msgstr ""
msgid "What is the domain name of the web server?"
msgstr "¿ Cuál es el dominio para el servidor web ?"
+#, fuzzy
+#~ msgid "%s not found"
+#~ msgstr "fuente de datos no encontrada"
+
#~ msgid "You need to log in first."
#~ msgstr "Antes es necesario identificarse."
diff --git a/po/fr.po b/po/fr.po
index e961ba0fa..786889c88 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ikiwiki 3.141\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-04 09:22-0400\n"
-"PO-Revision-Date: 2010-07-17 18:13+0200\n"
+"POT-Creation-Date: 2010-10-23 17:21-0400\n"
+"PO-Revision-Date: 2010-10-03 10:42+0200\n"
"Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
"Language: fr\n"
@@ -66,76 +66,80 @@ msgstr "Agrégation déclenchée par le web"
msgid "Nothing to do right now, all feeds are up-to-date!"
msgstr "Rien à faire pour le moment, tous les flux sont à jour !"
-#: ../IkiWiki/Plugin/aggregate.pm:220
+#: ../IkiWiki/Plugin/aggregate.pm:222
#, perl-format
msgid "missing %s parameter"
msgstr "Paramètre %s manquant"
-#: ../IkiWiki/Plugin/aggregate.pm:255
+#: ../IkiWiki/Plugin/aggregate.pm:257
msgid "new feed"
msgstr "Nouveau flux"
-#: ../IkiWiki/Plugin/aggregate.pm:269
+#: ../IkiWiki/Plugin/aggregate.pm:271
msgid "posts"
msgstr "Articles"
-#: ../IkiWiki/Plugin/aggregate.pm:271
+#: ../IkiWiki/Plugin/aggregate.pm:273
msgid "new"
msgstr "Nouveau"
-#: ../IkiWiki/Plugin/aggregate.pm:455
+#: ../IkiWiki/Plugin/aggregate.pm:457
#, perl-format
msgid "expiring %s (%s days old)"
msgstr "Fin de validité de %s (date de %s jours)"
-#: ../IkiWiki/Plugin/aggregate.pm:462
+#: ../IkiWiki/Plugin/aggregate.pm:464
#, perl-format
msgid "expiring %s"
msgstr "Fin de validité de %s"
-#: ../IkiWiki/Plugin/aggregate.pm:489
+#: ../IkiWiki/Plugin/aggregate.pm:491
#, perl-format
msgid "last checked %s"
msgstr "dernière vérification : %s"
-#: ../IkiWiki/Plugin/aggregate.pm:493
+#: ../IkiWiki/Plugin/aggregate.pm:495
#, perl-format
msgid "checking feed %s ..."
msgstr "Vérification du flux %s..."
-#: ../IkiWiki/Plugin/aggregate.pm:498
+#: ../IkiWiki/Plugin/aggregate.pm:500
#, perl-format
msgid "could not find feed at %s"
msgstr "Impossible de trouver de flux à %s"
-#: ../IkiWiki/Plugin/aggregate.pm:517
+#: ../IkiWiki/Plugin/aggregate.pm:519
msgid "feed not found"
msgstr "Flux introuvable "
-#: ../IkiWiki/Plugin/aggregate.pm:528
+#: ../IkiWiki/Plugin/aggregate.pm:530
#, perl-format
msgid "(invalid UTF-8 stripped from feed)"
msgstr "(chaîne UTF-8 non valable supprimée du flux)"
-#: ../IkiWiki/Plugin/aggregate.pm:536
+#: ../IkiWiki/Plugin/aggregate.pm:538
#, perl-format
msgid "(feed entities escaped)"
msgstr "(échappement des entités de flux)"
-#: ../IkiWiki/Plugin/aggregate.pm:544
+#: ../IkiWiki/Plugin/aggregate.pm:546
msgid "feed crashed XML::Feed!"
msgstr "Plantage du flux XML::Feed !"
-#: ../IkiWiki/Plugin/aggregate.pm:630
+#: ../IkiWiki/Plugin/aggregate.pm:632
#, perl-format
msgid "creating new page %s"
msgstr "Création de la nouvelle page %s"
+#: ../IkiWiki/Plugin/aggregate.pm:652 ../IkiWiki/Plugin/edittemplate.pm:133
+msgid "failed to process template:"
+msgstr "Échec du traitementdu modèle :"
+
#: ../IkiWiki/Plugin/amazon_s3.pm:31
msgid "deleting bucket.."
msgstr "Suppression du compartiment S3 (« bucket »)..."
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:229
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:226
msgid "done"
msgstr "Terminé"
@@ -146,15 +150,15 @@ msgstr "Vous devez spécifier %s"
#: ../IkiWiki/Plugin/amazon_s3.pm:140
msgid "Failed to create S3 bucket: "
-msgstr "Impossible de créer un compartiment S3 :"
+msgstr "Impossible de créer un compartiment S3 : "
#: ../IkiWiki/Plugin/amazon_s3.pm:225
msgid "Failed to save file to S3: "
-msgstr "Impossible de sauvegarder le fichier dans le compartiment S3 :"
+msgstr "Impossible de sauvegarder le fichier dans le compartiment S3 : "
#: ../IkiWiki/Plugin/amazon_s3.pm:247
msgid "Failed to delete file from S3: "
-msgstr "Échec lors de la suppression du fichier sur S3 :"
+msgstr "Échec lors de la suppression du fichier sur S3 : "
#: ../IkiWiki/Plugin/attachment.pm:50
#, perl-format
@@ -177,7 +181,7 @@ msgstr "Envoi de la pièce jointe"
msgid "automatic index generation"
msgstr "Génération de l'index automatique"
-#: ../IkiWiki/Plugin/blogspam.pm:110
+#: ../IkiWiki/Plugin/blogspam.pm:112
msgid ""
"Sorry, but that looks like spam to <a href=\"http://blogspam.net/"
"\">blogspam</a>: "
@@ -195,14 +199,13 @@ msgid "There are no broken links!"
msgstr "Aucun lien cassé !"
#: ../IkiWiki/Plugin/comments.pm:113
-#, fuzzy, perl-format
+#, perl-format
msgid "this comment needs %s"
-msgstr "Faire un commentaire sur %s"
+msgstr "Ce commentaire demande %s"
#: ../IkiWiki/Plugin/comments.pm:116
-#, fuzzy
msgid "moderation"
-msgstr "Modération du commentaire"
+msgstr "Modération"
#: ../IkiWiki/Plugin/comments.pm:137 ../IkiWiki/Plugin/format.pm:48
#, perl-format
@@ -218,7 +221,6 @@ msgid "Anonymous"
msgstr "Anonyme"
#: ../IkiWiki/Plugin/comments.pm:256
-#, fuzzy
msgid "Comment Moderation"
msgstr "Modération du commentaire"
@@ -258,7 +260,7 @@ msgstr "Commentaire ajouté"
msgid "Added a comment: %s"
msgstr "Commentaire ajouté : %s"
-#: ../IkiWiki/Plugin/comments.pm:573 ../IkiWiki/Plugin/websetup.pm:268
+#: ../IkiWiki/Plugin/comments.pm:573 ../IkiWiki/Plugin/websetup.pm:269
msgid "you are not logged in as an admin"
msgstr "Vous n'êtes pas authentifié comme administrateur"
@@ -284,18 +286,18 @@ msgstr[1] "%i commentaires"
msgid "Comment"
msgstr "poster un commentaire"
-#: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:31
-#: ../IkiWiki/Plugin/cutpaste.pm:46 ../IkiWiki/Plugin/cutpaste.pm:62
+#: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:46
+#: ../IkiWiki/Plugin/cutpaste.pm:60 ../IkiWiki/Plugin/cutpaste.pm:75
#: ../IkiWiki/Plugin/testpagespec.pm:26
#, perl-format
msgid "%s parameter is required"
msgstr "Le paramètre %s est obligatoire"
-#: ../IkiWiki/Plugin/cutpaste.pm:67
+#: ../IkiWiki/Plugin/cutpaste.pm:80
msgid "no text was copied in this page"
msgstr "Aucun texte n'a été copié dans cette page"
-#: ../IkiWiki/Plugin/cutpaste.pm:70
+#: ../IkiWiki/Plugin/cutpaste.pm:83
#, perl-format
msgid "no text was copied in this page with id %s"
msgstr "Aucun texte n'a été copié dans cette page avec l'identifiant %s"
@@ -322,25 +324,19 @@ msgstr "Création de %s"
msgid "editing %s"
msgstr "Édition de %s"
-#: ../IkiWiki/Plugin/edittemplate.pm:52
+#: ../IkiWiki/Plugin/edittemplate.pm:54
msgid "template not specified"
msgstr "modèle (« template ») non indiqué"
-#: ../IkiWiki/Plugin/edittemplate.pm:55
+#: ../IkiWiki/Plugin/edittemplate.pm:57
msgid "match not specified"
msgstr "correspondance non indiquée"
-#: ../IkiWiki/Plugin/edittemplate.pm:70
+#: ../IkiWiki/Plugin/edittemplate.pm:72
#, perl-format
msgid "edittemplate %s registered for %s"
msgstr "edittemplate %s enregistré pour %s"
-#: ../IkiWiki/Plugin/edittemplate.pm:131 ../IkiWiki/Plugin/inline.pm:339
-#: ../IkiWiki/Plugin/template.pm:44
-#, fuzzy
-msgid "failed to process template:"
-msgstr "Échec du traitement :"
-
#: ../IkiWiki/Plugin/format.pm:30
msgid "must specify format and text"
msgstr "le format et le texte doivent être indiqués"
@@ -367,23 +363,32 @@ msgstr "Ce n'est pas une page."
msgid "%s is an attachment, not a page."
msgstr "%s est une pièce jointe, pas une page."
-#: ../IkiWiki/Plugin/git.pm:742 ../IkiWiki/Plugin/git.pm:760
-#: ../IkiWiki/Receive.pm:129
+#: ../IkiWiki/Plugin/git.pm:764 ../IkiWiki/Plugin/git.pm:827
+#: ../IkiWiki.pm:1580
#, perl-format
msgid "you are not allowed to change %s"
msgstr "Vous n'êtes pas autorisé à modifier %s"
-#: ../IkiWiki/Plugin/git.pm:782
+#: ../IkiWiki/Plugin/git.pm:786
#, perl-format
msgid "you cannot act on a file with mode %s"
msgstr "Vous ne pouvez pas modifier un fichier dont le mode est %s"
-#: ../IkiWiki/Plugin/git.pm:786
+#: ../IkiWiki/Plugin/git.pm:790
msgid "you are not allowed to change file modes"
msgstr "Vous n'êtes pas autorisé à modifier le mode des fichiers"
-#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:137
-#: ../IkiWiki/Plugin/search.pm:38
+#: ../IkiWiki/Plugin/git.pm:861
+#, fuzzy
+msgid "you are not allowed to revert a merge"
+msgstr "Vous n'êtes pas autorisé à modifier %s"
+
+#: ../IkiWiki/Plugin/git.pm:877
+#, fuzzy, perl-format
+msgid "Failed to revert commit %s"
+msgstr "Échec de la compilation de %s"
+
+#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/search.pm:38
#, perl-format
msgid "Must specify %s when using the %s plugin"
msgstr "Vous devez indiquer %s lors de l'utilisation du greffon %s."
@@ -396,24 +401,24 @@ msgstr "Échec du lancement de graphviz"
msgid "prog not a valid graphviz program"
msgstr "Ce programme n'est pas un programme graphviz valable"
-#: ../IkiWiki/Plugin/highlight.pm:48
+#: ../IkiWiki/Plugin/highlight.pm:64
#, perl-format
msgid "tohighlight contains unknown file type '%s'"
msgstr "tohighlight contient un type de fichier inconnu : '%s'"
-#: ../IkiWiki/Plugin/highlight.pm:59
+#: ../IkiWiki/Plugin/highlight.pm:75
#, perl-format
msgid "Source code: %s"
msgstr "Code source : %s"
-#: ../IkiWiki/Plugin/highlight.pm:124
+#: ../IkiWiki/Plugin/highlight.pm:140
msgid ""
"warning: highlight perl module not available; falling back to pass through"
msgstr ""
"Avertissement : le module perl « highlight » n'est pas disponible. "
"Continuation malgré tout."
-#: ../IkiWiki/Plugin/htmltidy.pm:50
+#: ../IkiWiki/Plugin/htmltidy.pm:62
msgid "htmltidy failed to parse this html"
msgstr "htmltidy n'a pas pu analyser cette page html"
@@ -464,12 +469,12 @@ msgstr "Les paramètres %s et %s ne peuvent être utilisés ensemble."
msgid "Add a new post titled:"
msgstr "Ajouter un nouvel article dont le titre est :"
-#: ../IkiWiki/Plugin/inline.pm:342
-#, perl-format
-msgid "template %s not found"
-msgstr "Modèle de page %s introuvable"
+#: ../IkiWiki/Plugin/inline.pm:339 ../IkiWiki/Plugin/template.pm:44
+#, fuzzy, perl-format
+msgid "failed to process template %s"
+msgstr "Échec du traitementdu modèle :"
-#: ../IkiWiki/Plugin/inline.pm:633
+#: ../IkiWiki/Plugin/inline.pm:630
msgid "RPC::XML::Client not found, not pinging"
msgstr "RPC::XML::Client introuvable, pas de réponse au ping"
@@ -498,22 +503,21 @@ msgstr ""
"Échec du chargement du module Perl Markdown.pm (%s) ou de /usr/bin/markdown "
"(%s)"
-#: ../IkiWiki/Plugin/meta.pm:174
+#: ../IkiWiki/Plugin/meta.pm:175
msgid "stylesheet not found"
msgstr "Feuille de style introuvable "
-#: ../IkiWiki/Plugin/meta.pm:212
+#: ../IkiWiki/Plugin/meta.pm:217
msgid "redir page not found"
msgstr "Page de redirection introuvable"
-#: ../IkiWiki/Plugin/meta.pm:226
+#: ../IkiWiki/Plugin/meta.pm:231
msgid "redir cycle is not allowed"
msgstr "Redirection cyclique non autorisée"
-#: ../IkiWiki/Plugin/meta.pm:395
-#, fuzzy
+#: ../IkiWiki/Plugin/meta.pm:400
msgid "sort=meta requires a parameter"
-msgstr "les paramètres « from » et « to » sont nécessaires."
+msgstr "sort=meta demande un paramètre."
#: ../IkiWiki/Plugin/mirrorlist.pm:44
msgid "Mirrors"
@@ -532,9 +536,9 @@ msgid "more"
msgstr "lire la suite"
#: ../IkiWiki/Plugin/openid.pm:70
-#, fuzzy, perl-format
+#, perl-format
msgid "failed to load openid module: "
-msgstr "Échec de la compilation de %s"
+msgstr "Impossible de charger le module openid"
#: ../IkiWiki/Plugin/orphans.pm:56
msgid "All pages have other pages linking to them."
@@ -588,21 +592,21 @@ msgstr "réinitialisation du mot de passe refusée"
msgid "Ping received."
msgstr "Ping reçu"
-#: ../IkiWiki/Plugin/pinger.pm:53
+#: ../IkiWiki/Plugin/pinger.pm:54
msgid "requires 'from' and 'to' parameters"
msgstr "les paramètres « from » et « to » sont nécessaires."
-#: ../IkiWiki/Plugin/pinger.pm:58
+#: ../IkiWiki/Plugin/pinger.pm:59
#, perl-format
msgid "Will ping %s"
msgstr "va envoyer un ping à %s"
-#: ../IkiWiki/Plugin/pinger.pm:61
+#: ../IkiWiki/Plugin/pinger.pm:62
#, perl-format
msgid "Ignoring ping directive for wiki %s (this wiki is %s)"
msgstr "Les instructions du wiki %s sont ignorées (ce wiki est %s)"
-#: ../IkiWiki/Plugin/pinger.pm:77
+#: ../IkiWiki/Plugin/pinger.pm:78
msgid "LWP not found, not pinging"
msgstr "LWP est introuvable. Pas de réponse au ping"
@@ -612,17 +616,12 @@ msgstr ""
"Note : ancienne version de po4a détectée. Il est recommandé d'installer la "
"version 0.35."
-#: ../IkiWiki/Plugin/po.pm:147
-#, perl-format
-msgid "%s has invalid syntax: must use CODE|NAME"
-msgstr ""
-
-#: ../IkiWiki/Plugin/po.pm:166
+#: ../IkiWiki/Plugin/po.pm:175
#, perl-format
msgid "%s is not a valid language code"
msgstr "%s n'est pas un code de langue valable"
-#: ../IkiWiki/Plugin/po.pm:178
+#: ../IkiWiki/Plugin/po.pm:187
#, perl-format
msgid ""
"%s is not a valid value for po_link_to, falling back to po_link_to=default"
@@ -630,7 +629,7 @@ msgstr ""
"%s n'est pas une valeur correcte pour po_link_to, retour à la valeur par "
"défaut."
-#: ../IkiWiki/Plugin/po.pm:183
+#: ../IkiWiki/Plugin/po.pm:192
msgid ""
"po_link_to=negotiated requires usedirs to be enabled, falling back to "
"po_link_to=default"
@@ -638,23 +637,11 @@ msgstr ""
"po_link_to=negotiated nécessite que usedirs soit activé, retour à "
"po_link_to=default."
-#: ../IkiWiki/Plugin/po.pm:414
-#, perl-format
-msgid "rebuilding all pages to fix meta titles"
-msgstr ""
-"Reconstruction de toutes les pages pour corriger les titres (greffon "
-"« meta »)."
-
-#: ../IkiWiki/Plugin/po.pm:418 ../IkiWiki/Render.pm:784
-#, perl-format
-msgid "building %s"
-msgstr "construction de %s"
-
-#: ../IkiWiki/Plugin/po.pm:456
+#: ../IkiWiki/Plugin/po.pm:455
msgid "updated PO files"
msgstr "Fichiers PO mis à jour."
-#: ../IkiWiki/Plugin/po.pm:479
+#: ../IkiWiki/Plugin/po.pm:478
msgid ""
"Can not remove a translation. If the master page is removed, however, its "
"translations will be removed as well."
@@ -662,7 +649,7 @@ msgstr ""
"Impossible de supprimer cette traduction. Si la page maître est supprimée, "
"alors ses traductions seront supprimées."
-#: ../IkiWiki/Plugin/po.pm:499
+#: ../IkiWiki/Plugin/po.pm:498
msgid ""
"Can not rename a translation. If the master page is renamed, however, its "
"translations will be renamed as well."
@@ -670,55 +657,60 @@ msgstr ""
"Impossible de renommer cette traduction. Si la page maître est renommée, "
"alors ses traductions pourront être renommées."
-#: ../IkiWiki/Plugin/po.pm:924
+#: ../IkiWiki/Plugin/po.pm:935
#, perl-format
msgid "POT file (%s) does not exist"
msgstr "Le fichier POT %s n'existe pas."
-#: ../IkiWiki/Plugin/po.pm:938
+#: ../IkiWiki/Plugin/po.pm:949
#, perl-format
msgid "failed to copy underlay PO file to %s"
msgstr "Impossible de copier le fichier PO underlay dans %s"
-#: ../IkiWiki/Plugin/po.pm:947
+#: ../IkiWiki/Plugin/po.pm:958
#, perl-format
msgid "failed to update %s"
msgstr "Impossible de mettre à jour %s"
-#: ../IkiWiki/Plugin/po.pm:953
+#: ../IkiWiki/Plugin/po.pm:964
#, perl-format
msgid "failed to copy the POT file to %s"
msgstr "Impossible de copier le fichier POT dans %s"
-#: ../IkiWiki/Plugin/po.pm:989
+#: ../IkiWiki/Plugin/po.pm:1000
msgid "N/A"
msgstr "N/A"
-#: ../IkiWiki/Plugin/po.pm:1000
+#: ../IkiWiki/Plugin/po.pm:1011
#, perl-format
msgid "failed to translate %s"
msgstr "Impossible de traduire %s"
-#: ../IkiWiki/Plugin/po.pm:1079
+#: ../IkiWiki/Plugin/po.pm:1090
msgid "removed obsolete PO files"
msgstr "Fichiers PO obsolètes supprimés."
-#: ../IkiWiki/Plugin/po.pm:1136 ../IkiWiki/Plugin/po.pm:1148
-#: ../IkiWiki/Plugin/po.pm:1187
+#: ../IkiWiki/Plugin/po.pm:1147 ../IkiWiki/Plugin/po.pm:1159
+#: ../IkiWiki/Plugin/po.pm:1198
#, perl-format
msgid "failed to write %s"
msgstr "Impossible de modifier %s"
-#: ../IkiWiki/Plugin/po.pm:1146
+#: ../IkiWiki/Plugin/po.pm:1157
msgid "failed to translate"
msgstr "Impossible de traduire"
-#: ../IkiWiki/Plugin/po.pm:1199
+#: ../IkiWiki/Plugin/po.pm:1210
msgid "invalid gettext data, go back to previous page to continue edit"
msgstr ""
"Données gettext incorrectes, retour à la page précédente pour la poursuite "
"des modifications."
+#: ../IkiWiki/Plugin/po.pm:1252
+#, perl-format
+msgid "%s has invalid syntax: must use CODE|NAME"
+msgstr "La syntaxe de %s n'est pas correcte : il faut utiliser CODE|NOM"
+
#: ../IkiWiki/Plugin/poll.pm:70
msgid "vote"
msgstr "Voter"
@@ -818,6 +810,16 @@ msgstr ""
"L'un des paramètres « percent », « totalpages » ou « donepages » est "
"nécessaire."
+#: ../IkiWiki/Plugin/recentchanges.pm:104
+#, perl-format
+msgid "This reverts commit %s"
+msgstr ""
+
+#: ../IkiWiki/Plugin/recentchanges.pm:123
+#, fuzzy, perl-format
+msgid "confirm reversion of %s"
+msgstr "Suppression de %s confirmée"
+
#: ../IkiWiki/Plugin/recentchangesdiff.pm:37
msgid "(Diff truncated)"
msgstr "(fichier de différences tronqué)"
@@ -837,12 +839,12 @@ msgstr "%s n'est pas dans srcdir et ne peut donc pas être supprimé"
msgid "%s is not a file"
msgstr "%s n'est pas un fichier"
-#: ../IkiWiki/Plugin/remove.pm:137
+#: ../IkiWiki/Plugin/remove.pm:136
#, perl-format
msgid "confirm removal of %s"
msgstr "Suppression de %s confirmée"
-#: ../IkiWiki/Plugin/remove.pm:174
+#: ../IkiWiki/Plugin/remove.pm:173
msgid "Please select the attachments to remove."
msgstr "Veuillez choisir la pièce jointe à supprimer"
@@ -874,29 +876,29 @@ msgstr "%s existe déjà"
msgid "%s already exists on disk"
msgstr "%s existe déjà sur le disque"
-#: ../IkiWiki/Plugin/rename.pm:122
+#: ../IkiWiki/Plugin/rename.pm:123
#, perl-format
msgid "rename %s"
msgstr "%s renommé"
-#: ../IkiWiki/Plugin/rename.pm:163
+#: ../IkiWiki/Plugin/rename.pm:164
msgid "Also rename SubPages and attachments"
msgstr "« SubPages » et attachements renommés."
-#: ../IkiWiki/Plugin/rename.pm:250
+#: ../IkiWiki/Plugin/rename.pm:251
msgid "Only one attachment can be renamed at a time."
msgstr "Modification de pièce jointe : une seule à la fois"
-#: ../IkiWiki/Plugin/rename.pm:253
+#: ../IkiWiki/Plugin/rename.pm:254
msgid "Please select the attachment to rename."
msgstr "Veuillez sélectionner la pièce jointe à renommer"
-#: ../IkiWiki/Plugin/rename.pm:352
+#: ../IkiWiki/Plugin/rename.pm:353
#, perl-format
msgid "rename %s to %s"
msgstr "Renomme %s en %s"
-#: ../IkiWiki/Plugin/rename.pm:577
+#: ../IkiWiki/Plugin/rename.pm:578
#, perl-format
msgid "update for rename of %s to %s"
msgstr "mise à jour, suite au changement de %s en %s"
@@ -912,7 +914,7 @@ msgid "rsync_command exited %d"
msgstr "la commande rsync s'est terminée avec le code : %d"
#: ../IkiWiki/Plugin/search.pm:195
-#, fuzzy, perl-format
+#, perl-format
msgid "need Digest::SHA to index %s"
msgstr "Digest::SHA1 est nécessaire pour indexer %s"
@@ -937,7 +939,12 @@ msgstr "Il manque le paramètre nom ou URL."
msgid "shortcut %s points to <i>%s</i>"
msgstr "Le raccourci %s pointe vers <i>%s</i>"
-#: ../IkiWiki/Plugin/smiley.pm:43
+#: ../IkiWiki/Plugin/smiley.pm:30
+#, perl-format
+msgid "smiley plugin will not work without %s"
+msgstr "Le module smiley ne fonctionne pas sans %s"
+
+#: ../IkiWiki/Plugin/smiley.pm:50
msgid "failed to parse any smileys"
msgstr "Aucun smiley n'a pu être analysé"
@@ -995,7 +1002,7 @@ msgid "parse fail at line %d: %s"
msgstr "Erreur d'analyse à la ligne %d : %s"
#: ../IkiWiki/Plugin/tag.pm:83
-#, fuzzy, perl-format
+#, perl-format
msgid "creating tag page %s"
msgstr "Création de la nouvelle page %s"
@@ -1003,16 +1010,11 @@ msgstr "Création de la nouvelle page %s"
msgid "missing id parameter"
msgstr "Paramètre d'identification manquant"
-#: ../IkiWiki/Plugin/template.pm:47
-#, fuzzy, perl-format
-msgid "%s not found"
-msgstr "Flux introuvable "
-
-#: ../IkiWiki/Plugin/teximg.pm:72
+#: ../IkiWiki/Plugin/teximg.pm:73
msgid "missing tex code"
msgstr "Il manque le code TeX"
-#: ../IkiWiki/Plugin/teximg.pm:124
+#: ../IkiWiki/Plugin/teximg.pm:125
msgid "failed to generate image from code"
msgstr "Échec de la création de l'image à partir du code"
@@ -1031,22 +1033,22 @@ msgstr "Greffons %s"
msgid "enable %s?"
msgstr "activer %s ?"
-#: ../IkiWiki/Plugin/websetup.pm:272
+#: ../IkiWiki/Plugin/websetup.pm:273
msgid "setup file for this wiki is not known"
msgstr "Le fichier de configuration de ce wiki n'est pas connu"
-#: ../IkiWiki/Plugin/websetup.pm:288
+#: ../IkiWiki/Plugin/websetup.pm:289
msgid "main"
msgstr "Partie principale"
-#: ../IkiWiki/Plugin/websetup.pm:431
+#: ../IkiWiki/Plugin/websetup.pm:433
msgid ""
"The configuration changes shown below require a wiki rebuild to take effect."
msgstr ""
"Les changements de configuration ci-dessous nécessitent une recompilation du "
"wiki pour prendre effet"
-#: ../IkiWiki/Plugin/websetup.pm:435
+#: ../IkiWiki/Plugin/websetup.pm:437
msgid ""
"For the configuration changes shown below to fully take effect, you may need "
"to rebuild the wiki."
@@ -1054,7 +1056,7 @@ msgstr ""
"Pour que les changements de configuration ci-dessous prennent effet vous "
"devez recompiler le wiki"
-#: ../IkiWiki/Plugin/websetup.pm:472
+#: ../IkiWiki/Plugin/websetup.pm:474
#, perl-format
msgid "Error: %s exited nonzero (%s). Discarding setup changes."
msgstr "Erreur : %s s'est terminé anormalement (%s). Modifications ignorées."
@@ -1065,11 +1067,6 @@ msgid "cannot determine id of untrusted committer %s"
msgstr ""
"Impossible de déterminer l'identifiant de %s, (enregistrement non fiable)"
-#: ../IkiWiki/Receive.pm:85
-#, perl-format
-msgid "bad file name %s"
-msgstr "Nom de fichier incorrect %s"
-
#: ../IkiWiki/Render.pm:158
#, perl-format
msgid "scanning %s"
@@ -1098,11 +1095,12 @@ msgstr "%s peut être associé à plusieurs pages source."
#, perl-format
msgid "querying %s for file creation and modification times.."
msgstr ""
+"recherche de %s pour les dates de modification et de création des fichiers..."
#: ../IkiWiki/Render.pm:446
-#, fuzzy, perl-format
+#, perl-format
msgid "removing obsolete %s"
-msgstr "Suppression de l'ancienne page %s"
+msgstr "Suppression de %s obsolète"
#: ../IkiWiki/Render.pm:520
#, perl-format
@@ -1124,7 +1122,12 @@ msgstr "Reconstruction de %s, qui dépend de %s"
msgid "building %s, to update its backlinks"
msgstr "Reconstruction de %s, afin de mettre à jour ses rétroliens"
-#: ../IkiWiki/Render.pm:836
+#: ../IkiWiki/Render.pm:787
+#, perl-format
+msgid "building %s"
+msgstr "construction de %s"
+
+#: ../IkiWiki/Render.pm:839
#, perl-format
msgid "ikiwiki: cannot build %s"
msgstr "ikiwiki : impossible de reconstruire %s"
@@ -1137,14 +1140,14 @@ msgid "cannot read %s: %s"
msgstr "Lecture impossible de %s : %s"
#: ../IkiWiki/Setup.pm:34
-#, fuzzy, perl-format
+#, perl-format
msgid "cannot load %s in safe mode"
-msgstr "Lecture impossible de %s : %s"
+msgstr "Impossible de charger %s de façon sécurisée"
#: ../IkiWiki/Setup.pm:47
-#, fuzzy, perl-format
+#, perl-format
msgid "failed to parse %s"
-msgstr "Impossible de mettre à jour %s"
+msgstr "Impossible d'analyser %s"
#: ../IkiWiki/Setup/Automator.pm:34
msgid "you must enter a wikiname (that contains alphanumerics)"
@@ -1187,39 +1190,38 @@ msgid "wrapper filename not specified"
msgstr "Le nom du fichier CGI n'a pas été indiqué"
#. translators: The parameter is a C filename.
-#: ../IkiWiki/Wrapper.pm:218
+#: ../IkiWiki/Wrapper.pm:219
#, perl-format
msgid "failed to compile %s"
msgstr "Échec de la compilation de %s"
#. translators: The parameter is a filename.
-#: ../IkiWiki/Wrapper.pm:238
+#: ../IkiWiki/Wrapper.pm:239
#, perl-format
msgid "successfully generated %s"
msgstr "%s a été créé avec succès"
-#: ../ikiwiki.in:13
+#: ../ikiwiki.in:10
msgid "usage: ikiwiki [options] source dest"
msgstr "Syntaxe : ikiwiki [options] source destination"
-#: ../ikiwiki.in:14
+#: ../ikiwiki.in:11
msgid " ikiwiki --setup configfile"
msgstr " ikiwiki --setup fichier de configuration"
-#: ../ikiwiki.in:105
+#: ../ikiwiki.in:102
msgid "usage: --set var=value"
msgstr "Syntaxe : -- set var=valeur"
-#: ../ikiwiki.in:112
-#, fuzzy
+#: ../ikiwiki.in:109
msgid "usage: --set-yaml var=value"
-msgstr "Syntaxe : -- set var=valeur"
+msgstr "Syntaxe : --set-yaml var=valeur"
-#: ../ikiwiki.in:218
+#: ../ikiwiki.in:215
msgid "rebuilding wiki.."
msgstr "Reconstruction du wiki..."
-#: ../ikiwiki.in:221
+#: ../ikiwiki.in:218
msgid "refreshing wiki.."
msgstr "Rafraîchissement du wiki..."
@@ -1246,24 +1248,34 @@ msgstr "Impossible de charger le greffon externe nécessaire au greffon %s : %s
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:2053
+#: ../IkiWiki.pm:1536
+#, perl-format
+msgid "bad file name %s"
+msgstr "Nom de fichier incorrect %s"
+
+#: ../IkiWiki.pm:1836
+#, perl-format
+msgid "template %s not found"
+msgstr "Modèle de page %s introuvable"
+
+#: ../IkiWiki.pm:2118
msgid "yes"
msgstr "oui"
-#: ../IkiWiki.pm:2130
-#, fuzzy, perl-format
+#: ../IkiWiki.pm:2195
+#, perl-format
msgid "invalid sort type %s"
msgstr "Type de tri %s inconnu"
-#: ../IkiWiki.pm:2151
+#: ../IkiWiki.pm:2216
#, perl-format
msgid "unknown sort type %s"
msgstr "Type de tri %s inconnu"
-#: ../IkiWiki.pm:2287
+#: ../IkiWiki.pm:2352
#, perl-format
msgid "cannot match pages: %s"
-msgstr "Impossible de trouver les pages %s"
+msgstr "Impossible de trouver les pages : %s"
#: ../auto.setup:16
msgid "What will the wiki be named?"
@@ -1285,6 +1297,14 @@ msgstr "Identifiant de l'administrateur (utilisateur du wiki ou openid) :"
msgid "What is the domain name of the web server?"
msgstr "Nom de domaine du serveur HTTP :"
+#~ msgid "%s not found"
+#~ msgstr "%s introuvable"
+
+#~ msgid "rebuilding all pages to fix meta titles"
+#~ msgstr ""
+#~ "Reconstruction de toutes les pages pour corriger les titres (greffon "
+#~ "« meta »)."
+
#~ msgid "You need to log in first."
#~ msgstr "Vous devez d'abord vous identifier."
diff --git a/po/gu.po b/po/gu.po
index fbeea1492..32b7c5701 100644
--- a/po/gu.po
+++ b/po/gu.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ikiwiki-gu\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-04 09:22-0400\n"
+"POT-Creation-Date: 2010-10-23 17:21-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"
@@ -63,76 +63,81 @@ msgstr ""
msgid "Nothing to do right now, all feeds are up-to-date!"
msgstr ""
-#: ../IkiWiki/Plugin/aggregate.pm:220
+#: ../IkiWiki/Plugin/aggregate.pm:222
#, perl-format
msgid "missing %s parameter"
msgstr "ખોવાયેલ %s વિકલ્પ"
-#: ../IkiWiki/Plugin/aggregate.pm:255
+#: ../IkiWiki/Plugin/aggregate.pm:257
msgid "new feed"
msgstr "નવું ફીડ"
-#: ../IkiWiki/Plugin/aggregate.pm:269
+#: ../IkiWiki/Plugin/aggregate.pm:271
msgid "posts"
msgstr "પોસ્ટ"
-#: ../IkiWiki/Plugin/aggregate.pm:271
+#: ../IkiWiki/Plugin/aggregate.pm:273
msgid "new"
msgstr "નવું"
-#: ../IkiWiki/Plugin/aggregate.pm:455
+#: ../IkiWiki/Plugin/aggregate.pm:457
#, perl-format
msgid "expiring %s (%s days old)"
msgstr "જુનું કરે છે %s (%s દિવસો જુનું)"
-#: ../IkiWiki/Plugin/aggregate.pm:462
+#: ../IkiWiki/Plugin/aggregate.pm:464
#, perl-format
msgid "expiring %s"
msgstr "જુનું કરે છે %s"
-#: ../IkiWiki/Plugin/aggregate.pm:489
+#: ../IkiWiki/Plugin/aggregate.pm:491
#, perl-format
msgid "last checked %s"
msgstr ""
-#: ../IkiWiki/Plugin/aggregate.pm:493
+#: ../IkiWiki/Plugin/aggregate.pm:495
#, perl-format
msgid "checking feed %s ..."
msgstr "ફીડ %s ચકાસે છે ..."
-#: ../IkiWiki/Plugin/aggregate.pm:498
+#: ../IkiWiki/Plugin/aggregate.pm:500
#, perl-format
msgid "could not find feed at %s"
msgstr "%s પર ફીડ મળી શક્યું નહી"
-#: ../IkiWiki/Plugin/aggregate.pm:517
+#: ../IkiWiki/Plugin/aggregate.pm:519
msgid "feed not found"
msgstr "ફીડ મળ્યું નહી"
-#: ../IkiWiki/Plugin/aggregate.pm:528
+#: ../IkiWiki/Plugin/aggregate.pm:530
#, fuzzy, perl-format
msgid "(invalid UTF-8 stripped from feed)"
msgstr "ફીડમાંથી અયોગ્ય રીતે UTF-8 નીકાળેલ છે"
-#: ../IkiWiki/Plugin/aggregate.pm:536
+#: ../IkiWiki/Plugin/aggregate.pm:538
#, perl-format
msgid "(feed entities escaped)"
msgstr ""
-#: ../IkiWiki/Plugin/aggregate.pm:544
+#: ../IkiWiki/Plugin/aggregate.pm:546
msgid "feed crashed XML::Feed!"
msgstr "ફીડ ભાંગી ગયું XML::Feed!"
-#: ../IkiWiki/Plugin/aggregate.pm:630
+#: ../IkiWiki/Plugin/aggregate.pm:632
#, perl-format
msgid "creating new page %s"
msgstr "નવું પાનું %s બનાવે છે"
+#: ../IkiWiki/Plugin/aggregate.pm:652 ../IkiWiki/Plugin/edittemplate.pm:133
+#, fuzzy
+msgid "failed to process template:"
+msgstr "ક્રિયા કરવામાં નિષ્ફળ:"
+
#: ../IkiWiki/Plugin/amazon_s3.pm:31
msgid "deleting bucket.."
msgstr ""
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:229
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:226
msgid "done"
msgstr "સંપૂર્ણ"
@@ -177,7 +182,7 @@ msgstr ""
msgid "automatic index generation"
msgstr ""
-#: ../IkiWiki/Plugin/blogspam.pm:110
+#: ../IkiWiki/Plugin/blogspam.pm:112
msgid ""
"Sorry, but that looks like spam to <a href=\"http://blogspam.net/"
"\">blogspam</a>: "
@@ -254,7 +259,7 @@ msgstr ""
msgid "Added a comment: %s"
msgstr ""
-#: ../IkiWiki/Plugin/comments.pm:573 ../IkiWiki/Plugin/websetup.pm:268
+#: ../IkiWiki/Plugin/comments.pm:573 ../IkiWiki/Plugin/websetup.pm:269
msgid "you are not logged in as an admin"
msgstr ""
@@ -280,18 +285,18 @@ msgstr[1] ""
msgid "Comment"
msgstr ""
-#: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:31
-#: ../IkiWiki/Plugin/cutpaste.pm:46 ../IkiWiki/Plugin/cutpaste.pm:62
+#: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:46
+#: ../IkiWiki/Plugin/cutpaste.pm:60 ../IkiWiki/Plugin/cutpaste.pm:75
#: ../IkiWiki/Plugin/testpagespec.pm:26
#, fuzzy, perl-format
msgid "%s parameter is required"
msgstr "\"test\" અને \"then\" વિકલ્પો જરૂરી છે"
-#: ../IkiWiki/Plugin/cutpaste.pm:67
+#: ../IkiWiki/Plugin/cutpaste.pm:80
msgid "no text was copied in this page"
msgstr ""
-#: ../IkiWiki/Plugin/cutpaste.pm:70
+#: ../IkiWiki/Plugin/cutpaste.pm:83
#, perl-format
msgid "no text was copied in this page with id %s"
msgstr ""
@@ -318,27 +323,21 @@ msgstr "%s બનાવે છે"
msgid "editing %s"
msgstr "%s સુધારે છે"
-#: ../IkiWiki/Plugin/edittemplate.pm:52
+#: ../IkiWiki/Plugin/edittemplate.pm:54
#, fuzzy
msgid "template not specified"
msgstr "ટેમ્પલેટ %s મળ્યું નહી"
-#: ../IkiWiki/Plugin/edittemplate.pm:55
+#: ../IkiWiki/Plugin/edittemplate.pm:57
#, fuzzy
msgid "match not specified"
msgstr "આવરણ ફાઇલનામ સ્પષ્ટ કરેલ નથી"
-#: ../IkiWiki/Plugin/edittemplate.pm:70
+#: ../IkiWiki/Plugin/edittemplate.pm:72
#, perl-format
msgid "edittemplate %s registered for %s"
msgstr ""
-#: ../IkiWiki/Plugin/edittemplate.pm:131 ../IkiWiki/Plugin/inline.pm:339
-#: ../IkiWiki/Plugin/template.pm:44
-#, fuzzy
-msgid "failed to process template:"
-msgstr "ક્રિયા કરવામાં નિષ્ફળ:"
-
#: ../IkiWiki/Plugin/format.pm:30
msgid "must specify format and text"
msgstr ""
@@ -367,23 +366,31 @@ msgstr "વાંચી શકાતી નથી %s: %s"
msgid "%s is an attachment, not a page."
msgstr "%s એ સુધારી શકાય તેવું પાનું નથી"
-#: ../IkiWiki/Plugin/git.pm:742 ../IkiWiki/Plugin/git.pm:760
-#: ../IkiWiki/Receive.pm:129
+#: ../IkiWiki/Plugin/git.pm:764 ../IkiWiki/Plugin/git.pm:827
+#: ../IkiWiki.pm:1580
#, perl-format
msgid "you are not allowed to change %s"
msgstr ""
-#: ../IkiWiki/Plugin/git.pm:782
+#: ../IkiWiki/Plugin/git.pm:786
#, perl-format
msgid "you cannot act on a file with mode %s"
msgstr ""
-#: ../IkiWiki/Plugin/git.pm:786
+#: ../IkiWiki/Plugin/git.pm:790
msgid "you are not allowed to change file modes"
msgstr ""
-#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:137
-#: ../IkiWiki/Plugin/search.pm:38
+#: ../IkiWiki/Plugin/git.pm:861
+msgid "you are not allowed to revert a merge"
+msgstr ""
+
+#: ../IkiWiki/Plugin/git.pm:877
+#, fuzzy, perl-format
+msgid "Failed to revert commit %s"
+msgstr "%s કમ્પાઇલ કરવામાં નિષ્ફળ"
+
+#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/search.pm:38
#, fuzzy, perl-format
msgid "Must specify %s when using the %s plugin"
msgstr "જ્યારે શોધ પ્લગઇન ઉપયોગ કરતા હોવ ત્યારે %s સ્પષ્ટ કરવું જ પડશે"
@@ -396,22 +403,22 @@ msgstr "ગ્રાફવિઝ ચલાવવામાં નિષ્ફળ"
msgid "prog not a valid graphviz program"
msgstr "કાર્યક્રમએ યોગ્ય ગ્રાફવિઝ કાર્યક્રમ નથી"
-#: ../IkiWiki/Plugin/highlight.pm:48
+#: ../IkiWiki/Plugin/highlight.pm:64
#, perl-format
msgid "tohighlight contains unknown file type '%s'"
msgstr ""
-#: ../IkiWiki/Plugin/highlight.pm:59
+#: ../IkiWiki/Plugin/highlight.pm:75
#, perl-format
msgid "Source code: %s"
msgstr ""
-#: ../IkiWiki/Plugin/highlight.pm:124
+#: ../IkiWiki/Plugin/highlight.pm:140
msgid ""
"warning: highlight perl module not available; falling back to pass through"
msgstr ""
-#: ../IkiWiki/Plugin/htmltidy.pm:50
+#: ../IkiWiki/Plugin/htmltidy.pm:62
#, fuzzy
msgid "htmltidy failed to parse this html"
msgstr "કોઇપણ સ્માઇલીઓ ઉકેલવામાં નિષ્ફળ"
@@ -464,12 +471,12 @@ msgstr ""
msgid "Add a new post titled:"
msgstr "આ શિર્ષકથી નવું પોસ્ટ ઉમેરો:"
-#: ../IkiWiki/Plugin/inline.pm:342
-#, perl-format
-msgid "template %s not found"
-msgstr "ટેમ્પલેટ %s મળ્યું નહી"
+#: ../IkiWiki/Plugin/inline.pm:339 ../IkiWiki/Plugin/template.pm:44
+#, fuzzy, perl-format
+msgid "failed to process template %s"
+msgstr "ક્રિયા કરવામાં નિષ્ફળ:"
-#: ../IkiWiki/Plugin/inline.pm:633
+#: ../IkiWiki/Plugin/inline.pm:630
msgid "RPC::XML::Client not found, not pinging"
msgstr "RPC::XML::Client મળ્યું નહી, પિંગ કરવામાં આવતું નથી"
@@ -496,21 +503,21 @@ msgstr ""
msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)"
msgstr "Markdown.pm પર્લ મોડ્યુલ (%s) અથવા /usr/bin/markdown (%s) લાવવામાં નિષ્ફળ"
-#: ../IkiWiki/Plugin/meta.pm:174
+#: ../IkiWiki/Plugin/meta.pm:175
msgid "stylesheet not found"
msgstr "સ્ટાઇલશીટ મળ્યું નહી"
-#: ../IkiWiki/Plugin/meta.pm:212
+#: ../IkiWiki/Plugin/meta.pm:217
#, fuzzy
msgid "redir page not found"
msgstr "ફીડ મળ્યું નહી"
-#: ../IkiWiki/Plugin/meta.pm:226
+#: ../IkiWiki/Plugin/meta.pm:231
#, fuzzy
msgid "redir cycle is not allowed"
msgstr "ફીડ મળ્યું નહી"
-#: ../IkiWiki/Plugin/meta.pm:395
+#: ../IkiWiki/Plugin/meta.pm:400
msgid "sort=meta requires a parameter"
msgstr ""
@@ -584,21 +591,21 @@ msgstr ""
msgid "Ping received."
msgstr ""
-#: ../IkiWiki/Plugin/pinger.pm:53
+#: ../IkiWiki/Plugin/pinger.pm:54
msgid "requires 'from' and 'to' parameters"
msgstr ""
-#: ../IkiWiki/Plugin/pinger.pm:58
+#: ../IkiWiki/Plugin/pinger.pm:59
#, fuzzy, perl-format
msgid "Will ping %s"
msgstr "%s સુધારે છે"
-#: ../IkiWiki/Plugin/pinger.pm:61
+#: ../IkiWiki/Plugin/pinger.pm:62
#, perl-format
msgid "Ignoring ping directive for wiki %s (this wiki is %s)"
msgstr ""
-#: ../IkiWiki/Plugin/pinger.pm:77
+#: ../IkiWiki/Plugin/pinger.pm:78
#, fuzzy
msgid "LWP not found, not pinging"
msgstr "RPC::XML::Client મળ્યું નહી, પિંગ કરવામાં આવતું નથી"
@@ -607,102 +614,92 @@ msgstr "RPC::XML::Client મળ્યું નહી, પિંગ કરવા
msgid "warning: Old po4a detected! Recommend upgrade to 0.35."
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:147
-#, perl-format
-msgid "%s has invalid syntax: must use CODE|NAME"
-msgstr ""
-
-#: ../IkiWiki/Plugin/po.pm:166
+#: ../IkiWiki/Plugin/po.pm:175
#, fuzzy, perl-format
msgid "%s is not a valid language code"
msgstr "%s એ સુધારી શકાય તેવું પાનું નથી"
-#: ../IkiWiki/Plugin/po.pm:178
+#: ../IkiWiki/Plugin/po.pm:187
#, perl-format
msgid ""
"%s is not a valid value for po_link_to, falling back to po_link_to=default"
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:183
+#: ../IkiWiki/Plugin/po.pm:192
msgid ""
"po_link_to=negotiated requires usedirs to be enabled, falling back to "
"po_link_to=default"
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:414
-#, perl-format
-msgid "rebuilding all pages to fix meta titles"
-msgstr ""
-
-#: ../IkiWiki/Plugin/po.pm:418 ../IkiWiki/Render.pm:784
-#, fuzzy, perl-format
-msgid "building %s"
-msgstr "%s સુધારે છે"
-
-#: ../IkiWiki/Plugin/po.pm:456
+#: ../IkiWiki/Plugin/po.pm:455
msgid "updated PO files"
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:479
+#: ../IkiWiki/Plugin/po.pm:478
msgid ""
"Can not remove a translation. If the master page is removed, however, its "
"translations will be removed as well."
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:499
+#: ../IkiWiki/Plugin/po.pm:498
msgid ""
"Can not rename a translation. If the master page is renamed, however, its "
"translations will be renamed as well."
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:924
+#: ../IkiWiki/Plugin/po.pm:935
#, perl-format
msgid "POT file (%s) does not exist"
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:938
+#: ../IkiWiki/Plugin/po.pm:949
#, fuzzy, perl-format
msgid "failed to copy underlay PO file to %s"
msgstr "%s કમ્પાઇલ કરવામાં નિષ્ફળ"
-#: ../IkiWiki/Plugin/po.pm:947
+#: ../IkiWiki/Plugin/po.pm:958
#, fuzzy, perl-format
msgid "failed to update %s"
msgstr "%s કમ્પાઇલ કરવામાં નિષ્ફળ"
-#: ../IkiWiki/Plugin/po.pm:953
+#: ../IkiWiki/Plugin/po.pm:964
#, fuzzy, perl-format
msgid "failed to copy the POT file to %s"
msgstr "%s કમ્પાઇલ કરવામાં નિષ્ફળ"
-#: ../IkiWiki/Plugin/po.pm:989
+#: ../IkiWiki/Plugin/po.pm:1000
msgid "N/A"
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:1000
+#: ../IkiWiki/Plugin/po.pm:1011
#, fuzzy, perl-format
msgid "failed to translate %s"
msgstr "માપ બદલવામાં નિષ્ફળ: %s"
-#: ../IkiWiki/Plugin/po.pm:1079
+#: ../IkiWiki/Plugin/po.pm:1090
msgid "removed obsolete PO files"
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:1136 ../IkiWiki/Plugin/po.pm:1148
-#: ../IkiWiki/Plugin/po.pm:1187
+#: ../IkiWiki/Plugin/po.pm:1147 ../IkiWiki/Plugin/po.pm:1159
+#: ../IkiWiki/Plugin/po.pm:1198
#, fuzzy, perl-format
msgid "failed to write %s"
msgstr "%s લખવામાં નિષ્ફળ: %s"
-#: ../IkiWiki/Plugin/po.pm:1146
+#: ../IkiWiki/Plugin/po.pm:1157
#, fuzzy
msgid "failed to translate"
msgstr "ડોટ ચલાવવામાં નિષ્ફળ"
-#: ../IkiWiki/Plugin/po.pm:1199
+#: ../IkiWiki/Plugin/po.pm:1210
msgid "invalid gettext data, go back to previous page to continue edit"
msgstr ""
+#: ../IkiWiki/Plugin/po.pm:1252
+#, perl-format
+msgid "%s has invalid syntax: must use CODE|NAME"
+msgstr ""
+
#: ../IkiWiki/Plugin/poll.pm:70
msgid "vote"
msgstr "મત"
@@ -802,6 +799,16 @@ msgstr ""
msgid "need either `percent` or `totalpages` and `donepages` parameters"
msgstr ""
+#: ../IkiWiki/Plugin/recentchanges.pm:104
+#, perl-format
+msgid "This reverts commit %s"
+msgstr ""
+
+#: ../IkiWiki/Plugin/recentchanges.pm:123
+#, perl-format
+msgid "confirm reversion of %s"
+msgstr ""
+
#: ../IkiWiki/Plugin/recentchangesdiff.pm:37
msgid "(Diff truncated)"
msgstr ""
@@ -821,12 +828,12 @@ msgstr "%s એ %s દ્વારા તાળું મરાયેલ છે
msgid "%s is not a file"
msgstr "%s એ સુધારી શકાય તેવું પાનું નથી"
-#: ../IkiWiki/Plugin/remove.pm:137
+#: ../IkiWiki/Plugin/remove.pm:136
#, perl-format
msgid "confirm removal of %s"
msgstr ""
-#: ../IkiWiki/Plugin/remove.pm:174
+#: ../IkiWiki/Plugin/remove.pm:173
msgid "Please select the attachments to remove."
msgstr ""
@@ -859,29 +866,29 @@ msgstr ""
msgid "%s already exists on disk"
msgstr ""
-#: ../IkiWiki/Plugin/rename.pm:122
+#: ../IkiWiki/Plugin/rename.pm:123
#, fuzzy, perl-format
msgid "rename %s"
msgstr "રેન્ડર કરે છે %s"
-#: ../IkiWiki/Plugin/rename.pm:163
+#: ../IkiWiki/Plugin/rename.pm:164
msgid "Also rename SubPages and attachments"
msgstr ""
-#: ../IkiWiki/Plugin/rename.pm:250
+#: ../IkiWiki/Plugin/rename.pm:251
msgid "Only one attachment can be renamed at a time."
msgstr ""
-#: ../IkiWiki/Plugin/rename.pm:253
+#: ../IkiWiki/Plugin/rename.pm:254
msgid "Please select the attachment to rename."
msgstr ""
-#: ../IkiWiki/Plugin/rename.pm:352
+#: ../IkiWiki/Plugin/rename.pm:353
#, perl-format
msgid "rename %s to %s"
msgstr ""
-#: ../IkiWiki/Plugin/rename.pm:577
+#: ../IkiWiki/Plugin/rename.pm:578
#, fuzzy, perl-format
msgid "update for rename of %s to %s"
msgstr "%s નો સુધારો %s નાં %s વડે"
@@ -922,7 +929,12 @@ msgstr "ખોવાયેલ નામ અથવા યુઆરએલ વિ
msgid "shortcut %s points to <i>%s</i>"
msgstr "ટુંકોરસ્તો %s એ <i>%s</i> નો નિર્દેશ કરે છે"
-#: ../IkiWiki/Plugin/smiley.pm:43
+#: ../IkiWiki/Plugin/smiley.pm:30
+#, perl-format
+msgid "smiley plugin will not work without %s"
+msgstr ""
+
+#: ../IkiWiki/Plugin/smiley.pm:50
msgid "failed to parse any smileys"
msgstr "કોઇપણ સ્માઇલીઓ ઉકેલવામાં નિષ્ફળ"
@@ -992,17 +1004,12 @@ msgstr "નવું પાનું %s બનાવે છે"
msgid "missing id parameter"
msgstr "ખોવાયેલ આઇડી વિકલ્પ"
-#: ../IkiWiki/Plugin/template.pm:47
-#, perl-format
-msgid "%s not found"
-msgstr "ટેમ્પલેટ %s મળ્યું નહી"
-
-#: ../IkiWiki/Plugin/teximg.pm:72
+#: ../IkiWiki/Plugin/teximg.pm:73
#, fuzzy
msgid "missing tex code"
msgstr "ખોવાયેલ કિંમતો"
-#: ../IkiWiki/Plugin/teximg.pm:124
+#: ../IkiWiki/Plugin/teximg.pm:125
#, fuzzy
msgid "failed to generate image from code"
msgstr "માપ બદલવામાં નિષ્ફળ: %s"
@@ -1022,26 +1029,26 @@ msgstr ""
msgid "enable %s?"
msgstr ""
-#: ../IkiWiki/Plugin/websetup.pm:272
+#: ../IkiWiki/Plugin/websetup.pm:273
msgid "setup file for this wiki is not known"
msgstr ""
-#: ../IkiWiki/Plugin/websetup.pm:288
+#: ../IkiWiki/Plugin/websetup.pm:289
msgid "main"
msgstr ""
-#: ../IkiWiki/Plugin/websetup.pm:431
+#: ../IkiWiki/Plugin/websetup.pm:433
msgid ""
"The configuration changes shown below require a wiki rebuild to take effect."
msgstr ""
-#: ../IkiWiki/Plugin/websetup.pm:435
+#: ../IkiWiki/Plugin/websetup.pm:437
msgid ""
"For the configuration changes shown below to fully take effect, you may need "
"to rebuild the wiki."
msgstr ""
-#: ../IkiWiki/Plugin/websetup.pm:472
+#: ../IkiWiki/Plugin/websetup.pm:474
#, perl-format
msgid "Error: %s exited nonzero (%s). Discarding setup changes."
msgstr ""
@@ -1051,11 +1058,6 @@ msgstr ""
msgid "cannot determine id of untrusted committer %s"
msgstr ""
-#: ../IkiWiki/Receive.pm:85
-#, fuzzy, perl-format
-msgid "bad file name %s"
-msgstr "ખરાબ ફાઇલ નામ છોડી દે છે %s"
-
#: ../IkiWiki/Render.pm:158
#, perl-format
msgid "scanning %s"
@@ -1108,7 +1110,12 @@ msgstr "રેન્ડર કરે છે %s, જે %s પર આધારિ
msgid "building %s, to update its backlinks"
msgstr "રેન્ડર કરે છે %s, તેનાં પાછળનાં જોડાણો સુધારવા માટે"
-#: ../IkiWiki/Render.pm:836
+#: ../IkiWiki/Render.pm:787
+#, fuzzy, perl-format
+msgid "building %s"
+msgstr "%s સુધારે છે"
+
+#: ../IkiWiki/Render.pm:839
#, fuzzy, perl-format
msgid "ikiwiki: cannot build %s"
msgstr "ikiwiki: %s રેન્ડર કરી શકાતું નથી"
@@ -1166,38 +1173,38 @@ msgid "wrapper filename not specified"
msgstr "આવરણ ફાઇલનામ સ્પષ્ટ કરેલ નથી"
#. translators: The parameter is a C filename.
-#: ../IkiWiki/Wrapper.pm:218
+#: ../IkiWiki/Wrapper.pm:219
#, perl-format
msgid "failed to compile %s"
msgstr "%s કમ્પાઇલ કરવામાં નિષ્ફળ"
#. translators: The parameter is a filename.
-#: ../IkiWiki/Wrapper.pm:238
+#: ../IkiWiki/Wrapper.pm:239
#, perl-format
msgid "successfully generated %s"
msgstr "સફળતાપૂર્વક પેદા કરેલ છે %s"
-#: ../ikiwiki.in:13
+#: ../ikiwiki.in:10
msgid "usage: ikiwiki [options] source dest"
msgstr "ઉપયોગ: ikiwiki [વિકલ્પો] source dest"
-#: ../ikiwiki.in:14
+#: ../ikiwiki.in:11
msgid " ikiwiki --setup configfile"
msgstr ""
-#: ../ikiwiki.in:105
+#: ../ikiwiki.in:102
msgid "usage: --set var=value"
msgstr ""
-#: ../ikiwiki.in:112
+#: ../ikiwiki.in:109
msgid "usage: --set-yaml var=value"
msgstr ""
-#: ../ikiwiki.in:218
+#: ../ikiwiki.in:215
msgid "rebuilding wiki.."
msgstr "વીકી ફરીથી બનાવે છે.."
-#: ../ikiwiki.in:221
+#: ../ikiwiki.in:218
msgid "refreshing wiki.."
msgstr "વીકીને તાજી કરે છે.."
@@ -1223,21 +1230,31 @@ msgstr ""
msgid "preprocessing loop detected on %s at depth %i"
msgstr "%s પર શોધાયેલ લુપ %s પર ચલાવે છે %i ઉંડાણ પર"
-#: ../IkiWiki.pm:2053
+#: ../IkiWiki.pm:1536
+#, fuzzy, perl-format
+msgid "bad file name %s"
+msgstr "ખરાબ ફાઇલ નામ છોડી દે છે %s"
+
+#: ../IkiWiki.pm:1836
+#, perl-format
+msgid "template %s not found"
+msgstr "ટેમ્પલેટ %s મળ્યું નહી"
+
+#: ../IkiWiki.pm:2118
msgid "yes"
msgstr ""
-#: ../IkiWiki.pm:2130
+#: ../IkiWiki.pm:2195
#, fuzzy, perl-format
msgid "invalid sort type %s"
msgstr "અજાણ્યો ગોઠવણી પ્રકાર %s"
-#: ../IkiWiki.pm:2151
+#: ../IkiWiki.pm:2216
#, perl-format
msgid "unknown sort type %s"
msgstr "અજાણ્યો ગોઠવણી પ્રકાર %s"
-#: ../IkiWiki.pm:2287
+#: ../IkiWiki.pm:2352
#, fuzzy, perl-format
msgid "cannot match pages: %s"
msgstr "વાંચી શકાતી નથી %s: %s"
@@ -1262,6 +1279,9 @@ msgstr ""
msgid "What is the domain name of the web server?"
msgstr ""
+#~ msgid "%s not found"
+#~ msgstr "ટેમ્પલેટ %s મળ્યું નહી"
+
#~ msgid "You need to log in first."
#~ msgstr "તમારે પ્રથમ લોગ ઇન થવું પડશે."
diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot
index a8226f402..6eb13103e 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: 2010-08-15 11:48-0400\n"
+"POT-Creation-Date: 2010-12-01 20:29-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"
@@ -64,76 +64,80 @@ msgstr ""
msgid "Nothing to do right now, all feeds are up-to-date!"
msgstr ""
-#: ../IkiWiki/Plugin/aggregate.pm:220
+#: ../IkiWiki/Plugin/aggregate.pm:222
#, perl-format
msgid "missing %s parameter"
msgstr ""
-#: ../IkiWiki/Plugin/aggregate.pm:255
+#: ../IkiWiki/Plugin/aggregate.pm:257
msgid "new feed"
msgstr ""
-#: ../IkiWiki/Plugin/aggregate.pm:269
+#: ../IkiWiki/Plugin/aggregate.pm:271
msgid "posts"
msgstr ""
-#: ../IkiWiki/Plugin/aggregate.pm:271
+#: ../IkiWiki/Plugin/aggregate.pm:273
msgid "new"
msgstr ""
-#: ../IkiWiki/Plugin/aggregate.pm:455
+#: ../IkiWiki/Plugin/aggregate.pm:457
#, perl-format
msgid "expiring %s (%s days old)"
msgstr ""
-#: ../IkiWiki/Plugin/aggregate.pm:462
+#: ../IkiWiki/Plugin/aggregate.pm:464
#, perl-format
msgid "expiring %s"
msgstr ""
-#: ../IkiWiki/Plugin/aggregate.pm:489
+#: ../IkiWiki/Plugin/aggregate.pm:491
#, perl-format
msgid "last checked %s"
msgstr ""
-#: ../IkiWiki/Plugin/aggregate.pm:493
+#: ../IkiWiki/Plugin/aggregate.pm:495
#, perl-format
msgid "checking feed %s ..."
msgstr ""
-#: ../IkiWiki/Plugin/aggregate.pm:498
+#: ../IkiWiki/Plugin/aggregate.pm:500
#, perl-format
msgid "could not find feed at %s"
msgstr ""
-#: ../IkiWiki/Plugin/aggregate.pm:517
+#: ../IkiWiki/Plugin/aggregate.pm:519
msgid "feed not found"
msgstr ""
-#: ../IkiWiki/Plugin/aggregate.pm:528
+#: ../IkiWiki/Plugin/aggregate.pm:530
#, perl-format
msgid "(invalid UTF-8 stripped from feed)"
msgstr ""
-#: ../IkiWiki/Plugin/aggregate.pm:536
+#: ../IkiWiki/Plugin/aggregate.pm:538
#, perl-format
msgid "(feed entities escaped)"
msgstr ""
-#: ../IkiWiki/Plugin/aggregate.pm:544
+#: ../IkiWiki/Plugin/aggregate.pm:546
msgid "feed crashed XML::Feed!"
msgstr ""
-#: ../IkiWiki/Plugin/aggregate.pm:630
+#: ../IkiWiki/Plugin/aggregate.pm:632
#, perl-format
msgid "creating new page %s"
msgstr ""
+#: ../IkiWiki/Plugin/aggregate.pm:652 ../IkiWiki/Plugin/edittemplate.pm:135
+msgid "failed to process template:"
+msgstr ""
+
#: ../IkiWiki/Plugin/amazon_s3.pm:31
msgid "deleting bucket.."
msgstr ""
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:229
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:226
msgid "done"
msgstr ""
@@ -175,7 +179,7 @@ msgstr ""
msgid "automatic index generation"
msgstr ""
-#: ../IkiWiki/Plugin/blogspam.pm:110
+#: ../IkiWiki/Plugin/blogspam.pm:112
msgid ""
"Sorry, but that looks like spam to <a href=\"http://blogspam.net/"
"\">blogspam</a>: "
@@ -199,7 +203,7 @@ msgstr ""
msgid "moderation"
msgstr ""
-#: ../IkiWiki/Plugin/comments.pm:137 ../IkiWiki/Plugin/format.pm:48
+#: ../IkiWiki/Plugin/comments.pm:137 ../IkiWiki/Plugin/format.pm:50
#, perl-format
msgid "unsupported page format %s"
msgstr ""
@@ -252,7 +256,7 @@ msgstr ""
msgid "Added a comment: %s"
msgstr ""
-#: ../IkiWiki/Plugin/comments.pm:573 ../IkiWiki/Plugin/websetup.pm:268
+#: ../IkiWiki/Plugin/comments.pm:573 ../IkiWiki/Plugin/websetup.pm:269
msgid "you are not logged in as an admin"
msgstr ""
@@ -264,7 +268,7 @@ msgstr ""
msgid "comment moderation"
msgstr ""
-#: ../IkiWiki/Plugin/comments.pm:822
+#: ../IkiWiki/Plugin/comments.pm:828
#, perl-format
msgid "%i comment"
msgid_plural "%i comments"
@@ -274,22 +278,22 @@ msgstr[1] ""
#. translators: Here "Comment" is a verb;
#. translators: the user clicks on it to
#. translators: post a comment.
-#: ../IkiWiki/Plugin/comments.pm:832
+#: ../IkiWiki/Plugin/comments.pm:838
msgid "Comment"
msgstr ""
-#: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:31
-#: ../IkiWiki/Plugin/cutpaste.pm:46 ../IkiWiki/Plugin/cutpaste.pm:62
+#: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:46
+#: ../IkiWiki/Plugin/cutpaste.pm:60 ../IkiWiki/Plugin/cutpaste.pm:75
#: ../IkiWiki/Plugin/testpagespec.pm:26
#, perl-format
msgid "%s parameter is required"
msgstr ""
-#: ../IkiWiki/Plugin/cutpaste.pm:67
+#: ../IkiWiki/Plugin/cutpaste.pm:80
msgid "no text was copied in this page"
msgstr ""
-#: ../IkiWiki/Plugin/cutpaste.pm:70
+#: ../IkiWiki/Plugin/cutpaste.pm:83
#, perl-format
msgid "no text was copied in this page with id %s"
msgstr ""
@@ -316,24 +320,19 @@ msgstr ""
msgid "editing %s"
msgstr ""
-#: ../IkiWiki/Plugin/edittemplate.pm:52
+#: ../IkiWiki/Plugin/edittemplate.pm:54
msgid "template not specified"
msgstr ""
-#: ../IkiWiki/Plugin/edittemplate.pm:55
+#: ../IkiWiki/Plugin/edittemplate.pm:57
msgid "match not specified"
msgstr ""
-#: ../IkiWiki/Plugin/edittemplate.pm:70
+#: ../IkiWiki/Plugin/edittemplate.pm:72
#, perl-format
msgid "edittemplate %s registered for %s"
msgstr ""
-#: ../IkiWiki/Plugin/edittemplate.pm:131 ../IkiWiki/Plugin/inline.pm:339
-#: ../IkiWiki/Plugin/template.pm:44
-msgid "failed to process template:"
-msgstr ""
-
#: ../IkiWiki/Plugin/format.pm:30
msgid "must specify format and text"
msgstr ""
@@ -360,23 +359,31 @@ msgstr ""
msgid "%s is an attachment, not a page."
msgstr ""
-#: ../IkiWiki/Plugin/git.pm:742 ../IkiWiki/Plugin/git.pm:760
-#: ../IkiWiki/Receive.pm:129
+#: ../IkiWiki/Plugin/git.pm:766 ../IkiWiki/Plugin/git.pm:829
+#: ../IkiWiki.pm:1580
#, perl-format
msgid "you are not allowed to change %s"
msgstr ""
-#: ../IkiWiki/Plugin/git.pm:782
+#: ../IkiWiki/Plugin/git.pm:788
#, perl-format
msgid "you cannot act on a file with mode %s"
msgstr ""
-#: ../IkiWiki/Plugin/git.pm:786
+#: ../IkiWiki/Plugin/git.pm:792
msgid "you are not allowed to change file modes"
msgstr ""
-#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:137
-#: ../IkiWiki/Plugin/search.pm:38
+#: ../IkiWiki/Plugin/git.pm:863
+msgid "you are not allowed to revert a merge"
+msgstr ""
+
+#: ../IkiWiki/Plugin/git.pm:879
+#, perl-format
+msgid "Failed to revert commit %s"
+msgstr ""
+
+#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/search.pm:38
#, perl-format
msgid "Must specify %s when using the %s plugin"
msgstr ""
@@ -389,22 +396,22 @@ msgstr ""
msgid "prog not a valid graphviz program"
msgstr ""
-#: ../IkiWiki/Plugin/highlight.pm:48
+#: ../IkiWiki/Plugin/highlight.pm:64
#, perl-format
msgid "tohighlight contains unknown file type '%s'"
msgstr ""
-#: ../IkiWiki/Plugin/highlight.pm:59
+#: ../IkiWiki/Plugin/highlight.pm:75
#, perl-format
msgid "Source code: %s"
msgstr ""
-#: ../IkiWiki/Plugin/highlight.pm:124
+#: ../IkiWiki/Plugin/highlight.pm:155
msgid ""
"warning: highlight perl module not available; falling back to pass through"
msgstr ""
-#: ../IkiWiki/Plugin/htmltidy.pm:50
+#: ../IkiWiki/Plugin/htmltidy.pm:63
msgid "htmltidy failed to parse this html"
msgstr ""
@@ -453,12 +460,12 @@ msgstr ""
msgid "Add a new post titled:"
msgstr ""
-#: ../IkiWiki/Plugin/inline.pm:342
+#: ../IkiWiki/Plugin/inline.pm:339 ../IkiWiki/Plugin/template.pm:44
#, perl-format
-msgid "template %s not found"
+msgid "failed to process template %s"
msgstr ""
-#: ../IkiWiki/Plugin/inline.pm:633
+#: ../IkiWiki/Plugin/inline.pm:663
msgid "RPC::XML::Client not found, not pinging"
msgstr ""
@@ -485,19 +492,19 @@ msgstr ""
msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)"
msgstr ""
-#: ../IkiWiki/Plugin/meta.pm:174
+#: ../IkiWiki/Plugin/meta.pm:175
msgid "stylesheet not found"
msgstr ""
-#: ../IkiWiki/Plugin/meta.pm:212
+#: ../IkiWiki/Plugin/meta.pm:217
msgid "redir page not found"
msgstr ""
-#: ../IkiWiki/Plugin/meta.pm:226
+#: ../IkiWiki/Plugin/meta.pm:231
msgid "redir cycle is not allowed"
msgstr ""
-#: ../IkiWiki/Plugin/meta.pm:395
+#: ../IkiWiki/Plugin/meta.pm:400
msgid "sort=meta requires a parameter"
msgstr ""
@@ -570,21 +577,21 @@ msgstr ""
msgid "Ping received."
msgstr ""
-#: ../IkiWiki/Plugin/pinger.pm:53
+#: ../IkiWiki/Plugin/pinger.pm:54
msgid "requires 'from' and 'to' parameters"
msgstr ""
-#: ../IkiWiki/Plugin/pinger.pm:58
+#: ../IkiWiki/Plugin/pinger.pm:59
#, perl-format
msgid "Will ping %s"
msgstr ""
-#: ../IkiWiki/Plugin/pinger.pm:61
+#: ../IkiWiki/Plugin/pinger.pm:62
#, perl-format
msgid "Ignoring ping directive for wiki %s (this wiki is %s)"
msgstr ""
-#: ../IkiWiki/Plugin/pinger.pm:77
+#: ../IkiWiki/Plugin/pinger.pm:78
msgid "LWP not found, not pinging"
msgstr ""
@@ -592,101 +599,91 @@ msgstr ""
msgid "warning: Old po4a detected! Recommend upgrade to 0.35."
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:147
-#, perl-format
-msgid "%s has invalid syntax: must use CODE|NAME"
-msgstr ""
-
-#: ../IkiWiki/Plugin/po.pm:166
+#: ../IkiWiki/Plugin/po.pm:175
#, perl-format
msgid "%s is not a valid language code"
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:178
+#: ../IkiWiki/Plugin/po.pm:187
#, perl-format
msgid ""
"%s is not a valid value for po_link_to, falling back to po_link_to=default"
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:183
+#: ../IkiWiki/Plugin/po.pm:192
msgid ""
"po_link_to=negotiated requires usedirs to be enabled, falling back to "
"po_link_to=default"
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:414
-#, perl-format
-msgid "rebuilding all pages to fix meta titles"
-msgstr ""
-
-#: ../IkiWiki/Plugin/po.pm:418 ../IkiWiki/Render.pm:784
-#, perl-format
-msgid "building %s"
-msgstr ""
-
-#: ../IkiWiki/Plugin/po.pm:456
+#: ../IkiWiki/Plugin/po.pm:455
msgid "updated PO files"
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:479
+#: ../IkiWiki/Plugin/po.pm:478
msgid ""
"Can not remove a translation. If the master page is removed, however, its "
"translations will be removed as well."
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:499
+#: ../IkiWiki/Plugin/po.pm:498
msgid ""
"Can not rename a translation. If the master page is renamed, however, its "
"translations will be renamed as well."
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:924
+#: ../IkiWiki/Plugin/po.pm:935
#, perl-format
msgid "POT file (%s) does not exist"
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:938
+#: ../IkiWiki/Plugin/po.pm:949
#, perl-format
msgid "failed to copy underlay PO file to %s"
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:947
+#: ../IkiWiki/Plugin/po.pm:958
#, perl-format
msgid "failed to update %s"
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:953
+#: ../IkiWiki/Plugin/po.pm:964
#, perl-format
msgid "failed to copy the POT file to %s"
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:989
+#: ../IkiWiki/Plugin/po.pm:1000
msgid "N/A"
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:1000
+#: ../IkiWiki/Plugin/po.pm:1011
#, perl-format
msgid "failed to translate %s"
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:1079
+#: ../IkiWiki/Plugin/po.pm:1090
msgid "removed obsolete PO files"
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:1136 ../IkiWiki/Plugin/po.pm:1148
-#: ../IkiWiki/Plugin/po.pm:1187
+#: ../IkiWiki/Plugin/po.pm:1147 ../IkiWiki/Plugin/po.pm:1159
+#: ../IkiWiki/Plugin/po.pm:1198
#, perl-format
msgid "failed to write %s"
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:1146
+#: ../IkiWiki/Plugin/po.pm:1157
msgid "failed to translate"
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:1199
+#: ../IkiWiki/Plugin/po.pm:1210
msgid "invalid gettext data, go back to previous page to continue edit"
msgstr ""
+#: ../IkiWiki/Plugin/po.pm:1252
+#, perl-format
+msgid "%s has invalid syntax: must use CODE|NAME"
+msgstr ""
+
#: ../IkiWiki/Plugin/poll.pm:70
msgid "vote"
msgstr ""
@@ -784,6 +781,16 @@ msgstr ""
msgid "need either `percent` or `totalpages` and `donepages` parameters"
msgstr ""
+#: ../IkiWiki/Plugin/recentchanges.pm:104
+#, perl-format
+msgid "This reverts commit %s"
+msgstr ""
+
+#: ../IkiWiki/Plugin/recentchanges.pm:123
+#, perl-format
+msgid "confirm reversion of %s"
+msgstr ""
+
#: ../IkiWiki/Plugin/recentchangesdiff.pm:37
msgid "(Diff truncated)"
msgstr ""
@@ -803,12 +810,12 @@ msgstr ""
msgid "%s is not a file"
msgstr ""
-#: ../IkiWiki/Plugin/remove.pm:137
+#: ../IkiWiki/Plugin/remove.pm:136
#, perl-format
msgid "confirm removal of %s"
msgstr ""
-#: ../IkiWiki/Plugin/remove.pm:174
+#: ../IkiWiki/Plugin/remove.pm:173
msgid "Please select the attachments to remove."
msgstr ""
@@ -840,29 +847,29 @@ msgstr ""
msgid "%s already exists on disk"
msgstr ""
-#: ../IkiWiki/Plugin/rename.pm:122
+#: ../IkiWiki/Plugin/rename.pm:123
#, perl-format
msgid "rename %s"
msgstr ""
-#: ../IkiWiki/Plugin/rename.pm:163
+#: ../IkiWiki/Plugin/rename.pm:164
msgid "Also rename SubPages and attachments"
msgstr ""
-#: ../IkiWiki/Plugin/rename.pm:250
+#: ../IkiWiki/Plugin/rename.pm:251
msgid "Only one attachment can be renamed at a time."
msgstr ""
-#: ../IkiWiki/Plugin/rename.pm:253
+#: ../IkiWiki/Plugin/rename.pm:254
msgid "Please select the attachment to rename."
msgstr ""
-#: ../IkiWiki/Plugin/rename.pm:352
+#: ../IkiWiki/Plugin/rename.pm:353
#, perl-format
msgid "rename %s to %s"
msgstr ""
-#: ../IkiWiki/Plugin/rename.pm:577
+#: ../IkiWiki/Plugin/rename.pm:578
#, perl-format
msgid "update for rename of %s to %s"
msgstr ""
@@ -903,7 +910,12 @@ msgstr ""
msgid "shortcut %s points to <i>%s</i>"
msgstr ""
-#: ../IkiWiki/Plugin/smiley.pm:43
+#: ../IkiWiki/Plugin/smiley.pm:30
+#, perl-format
+msgid "smiley plugin will not work without %s"
+msgstr ""
+
+#: ../IkiWiki/Plugin/smiley.pm:50
msgid "failed to parse any smileys"
msgstr ""
@@ -969,16 +981,11 @@ msgstr ""
msgid "missing id parameter"
msgstr ""
-#: ../IkiWiki/Plugin/template.pm:47
-#, perl-format
-msgid "%s not found"
-msgstr ""
-
-#: ../IkiWiki/Plugin/teximg.pm:72
+#: ../IkiWiki/Plugin/teximg.pm:73
msgid "missing tex code"
msgstr ""
-#: ../IkiWiki/Plugin/teximg.pm:124
+#: ../IkiWiki/Plugin/teximg.pm:125
msgid "failed to generate image from code"
msgstr ""
@@ -997,26 +1004,26 @@ msgstr ""
msgid "enable %s?"
msgstr ""
-#: ../IkiWiki/Plugin/websetup.pm:272
+#: ../IkiWiki/Plugin/websetup.pm:273
msgid "setup file for this wiki is not known"
msgstr ""
-#: ../IkiWiki/Plugin/websetup.pm:288
+#: ../IkiWiki/Plugin/websetup.pm:289
msgid "main"
msgstr ""
-#: ../IkiWiki/Plugin/websetup.pm:431
+#: ../IkiWiki/Plugin/websetup.pm:433
msgid ""
"The configuration changes shown below require a wiki rebuild to take effect."
msgstr ""
-#: ../IkiWiki/Plugin/websetup.pm:435
+#: ../IkiWiki/Plugin/websetup.pm:437
msgid ""
"For the configuration changes shown below to fully take effect, you may need "
"to rebuild the wiki."
msgstr ""
-#: ../IkiWiki/Plugin/websetup.pm:472
+#: ../IkiWiki/Plugin/websetup.pm:474
#, perl-format
msgid "Error: %s exited nonzero (%s). Discarding setup changes."
msgstr ""
@@ -1026,11 +1033,6 @@ msgstr ""
msgid "cannot determine id of untrusted committer %s"
msgstr ""
-#: ../IkiWiki/Receive.pm:85
-#, perl-format
-msgid "bad file name %s"
-msgstr ""
-
#: ../IkiWiki/Render.pm:158
#, perl-format
msgid "scanning %s"
@@ -1083,7 +1085,12 @@ msgstr ""
msgid "building %s, to update its backlinks"
msgstr ""
-#: ../IkiWiki/Render.pm:836
+#: ../IkiWiki/Render.pm:787
+#, perl-format
+msgid "building %s"
+msgstr ""
+
+#: ../IkiWiki/Render.pm:839
#, perl-format
msgid "ikiwiki: cannot build %s"
msgstr ""
@@ -1141,38 +1148,38 @@ msgid "wrapper filename not specified"
msgstr ""
#. translators: The parameter is a C filename.
-#: ../IkiWiki/Wrapper.pm:218
+#: ../IkiWiki/Wrapper.pm:219
#, perl-format
msgid "failed to compile %s"
msgstr ""
#. translators: The parameter is a filename.
-#: ../IkiWiki/Wrapper.pm:238
+#: ../IkiWiki/Wrapper.pm:239
#, perl-format
msgid "successfully generated %s"
msgstr ""
-#: ../ikiwiki.in:13
+#: ../ikiwiki.in:10
msgid "usage: ikiwiki [options] source dest"
msgstr ""
-#: ../ikiwiki.in:14
+#: ../ikiwiki.in:11
msgid " ikiwiki --setup configfile"
msgstr ""
-#: ../ikiwiki.in:105
+#: ../ikiwiki.in:102
msgid "usage: --set var=value"
msgstr ""
-#: ../ikiwiki.in:112
+#: ../ikiwiki.in:109
msgid "usage: --set-yaml var=value"
msgstr ""
-#: ../ikiwiki.in:218
+#: ../ikiwiki.in:215
msgid "rebuilding wiki.."
msgstr ""
-#: ../ikiwiki.in:221
+#: ../ikiwiki.in:218
msgid "refreshing wiki.."
msgstr ""
@@ -1198,21 +1205,31 @@ msgstr ""
msgid "preprocessing loop detected on %s at depth %i"
msgstr ""
-#: ../IkiWiki.pm:2053
+#: ../IkiWiki.pm:1536
+#, perl-format
+msgid "bad file name %s"
+msgstr ""
+
+#: ../IkiWiki.pm:1836
+#, perl-format
+msgid "template %s not found"
+msgstr ""
+
+#: ../IkiWiki.pm:2118
msgid "yes"
msgstr ""
-#: ../IkiWiki.pm:2130
+#: ../IkiWiki.pm:2195
#, perl-format
msgid "invalid sort type %s"
msgstr ""
-#: ../IkiWiki.pm:2151
+#: ../IkiWiki.pm:2216
#, perl-format
msgid "unknown sort type %s"
msgstr ""
-#: ../IkiWiki.pm:2287
+#: ../IkiWiki.pm:2352
#, perl-format
msgid "cannot match pages: %s"
msgstr ""
diff --git a/po/it.po b/po/it.po
index 3fda6d221..fc5fb5aea 100644
--- a/po/it.po
+++ b/po/it.po
@@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Ikiwiki\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-04 09:22-0400\n"
+"POT-Creation-Date: 2010-10-23 17:21-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"
@@ -63,76 +63,81 @@ msgid "Nothing to do right now, all feeds are up-to-date!"
msgstr ""
"Nessuna azione da intraprendere, tutti i notiziari sono già aggiornati."
-#: ../IkiWiki/Plugin/aggregate.pm:220
+#: ../IkiWiki/Plugin/aggregate.pm:222
#, perl-format
msgid "missing %s parameter"
msgstr "parametro %s mancante"
-#: ../IkiWiki/Plugin/aggregate.pm:255
+#: ../IkiWiki/Plugin/aggregate.pm:257
msgid "new feed"
msgstr "nuovo notiziario"
-#: ../IkiWiki/Plugin/aggregate.pm:269
+#: ../IkiWiki/Plugin/aggregate.pm:271
msgid "posts"
msgstr "articoli"
-#: ../IkiWiki/Plugin/aggregate.pm:271
+#: ../IkiWiki/Plugin/aggregate.pm:273
msgid "new"
msgstr "nuovo"
-#: ../IkiWiki/Plugin/aggregate.pm:455
+#: ../IkiWiki/Plugin/aggregate.pm:457
#, perl-format
msgid "expiring %s (%s days old)"
msgstr "in scadenza %s (vecchio di %s giorni)"
-#: ../IkiWiki/Plugin/aggregate.pm:462
+#: ../IkiWiki/Plugin/aggregate.pm:464
#, perl-format
msgid "expiring %s"
msgstr "in scadenza %s"
-#: ../IkiWiki/Plugin/aggregate.pm:489
+#: ../IkiWiki/Plugin/aggregate.pm:491
#, perl-format
msgid "last checked %s"
msgstr "ultimo controllo %s"
-#: ../IkiWiki/Plugin/aggregate.pm:493
+#: ../IkiWiki/Plugin/aggregate.pm:495
#, perl-format
msgid "checking feed %s ..."
msgstr "controllo notiziario %s..."
-#: ../IkiWiki/Plugin/aggregate.pm:498
+#: ../IkiWiki/Plugin/aggregate.pm:500
#, perl-format
msgid "could not find feed at %s"
msgstr "impossibile trovare il notiziario %s"
-#: ../IkiWiki/Plugin/aggregate.pm:517
+#: ../IkiWiki/Plugin/aggregate.pm:519
msgid "feed not found"
msgstr "notiziario non trovato"
-#: ../IkiWiki/Plugin/aggregate.pm:528
+#: ../IkiWiki/Plugin/aggregate.pm:530
#, perl-format
msgid "(invalid UTF-8 stripped from feed)"
msgstr "(codifica UTF-8 non valida eliminata dal notiziario)"
-#: ../IkiWiki/Plugin/aggregate.pm:536
+#: ../IkiWiki/Plugin/aggregate.pm:538
#, perl-format
msgid "(feed entities escaped)"
msgstr "(entità del notiziario espanse con escape)"
-#: ../IkiWiki/Plugin/aggregate.pm:544
+#: ../IkiWiki/Plugin/aggregate.pm:546
msgid "feed crashed XML::Feed!"
msgstr "il notiziario ha fatto andare in crash XML::Feed."
-#: ../IkiWiki/Plugin/aggregate.pm:630
+#: ../IkiWiki/Plugin/aggregate.pm:632
#, perl-format
msgid "creating new page %s"
msgstr "creazione nuova pagina %s"
+#: ../IkiWiki/Plugin/aggregate.pm:652 ../IkiWiki/Plugin/edittemplate.pm:133
+#, fuzzy
+msgid "failed to process template:"
+msgstr "errore nell'elaborazione:"
+
#: ../IkiWiki/Plugin/amazon_s3.pm:31
msgid "deleting bucket.."
msgstr "eliminazione contenitore..."
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:229
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:226
msgid "done"
msgstr "fatto"
@@ -174,7 +179,7 @@ msgstr "carica allegato"
msgid "automatic index generation"
msgstr "generazione automatica dell'indice"
-#: ../IkiWiki/Plugin/blogspam.pm:110
+#: ../IkiWiki/Plugin/blogspam.pm:112
msgid ""
"Sorry, but that looks like spam to <a href=\"http://blogspam.net/"
"\">blogspam</a>: "
@@ -255,7 +260,7 @@ msgstr "Aggiunto commento"
msgid "Added a comment: %s"
msgstr "Aggiunto commento: %s"
-#: ../IkiWiki/Plugin/comments.pm:573 ../IkiWiki/Plugin/websetup.pm:268
+#: ../IkiWiki/Plugin/comments.pm:573 ../IkiWiki/Plugin/websetup.pm:269
msgid "you are not logged in as an admin"
msgstr "non siete autenticati come amministratore"
@@ -282,18 +287,18 @@ msgstr[1] "Commenti"
msgid "Comment"
msgstr "Commenti"
-#: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:31
-#: ../IkiWiki/Plugin/cutpaste.pm:46 ../IkiWiki/Plugin/cutpaste.pm:62
+#: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:46
+#: ../IkiWiki/Plugin/cutpaste.pm:60 ../IkiWiki/Plugin/cutpaste.pm:75
#: ../IkiWiki/Plugin/testpagespec.pm:26
#, perl-format
msgid "%s parameter is required"
msgstr "parametro %s necessario"
-#: ../IkiWiki/Plugin/cutpaste.pm:67
+#: ../IkiWiki/Plugin/cutpaste.pm:80
msgid "no text was copied in this page"
msgstr "nessun testo è stato copiato in questa pagina"
-#: ../IkiWiki/Plugin/cutpaste.pm:70
+#: ../IkiWiki/Plugin/cutpaste.pm:83
#, perl-format
msgid "no text was copied in this page with id %s"
msgstr "nessun testo è stato copiato in questa pagina con l'id %s"
@@ -320,25 +325,19 @@ msgstr "creazione %s"
msgid "editing %s"
msgstr "modifica %s"
-#: ../IkiWiki/Plugin/edittemplate.pm:52
+#: ../IkiWiki/Plugin/edittemplate.pm:54
msgid "template not specified"
msgstr "modello non specificato"
-#: ../IkiWiki/Plugin/edittemplate.pm:55
+#: ../IkiWiki/Plugin/edittemplate.pm:57
msgid "match not specified"
msgstr "corrispondenza non specificata"
-#: ../IkiWiki/Plugin/edittemplate.pm:70
+#: ../IkiWiki/Plugin/edittemplate.pm:72
#, perl-format
msgid "edittemplate %s registered for %s"
msgstr "edittemplate %s registrato per %s"
-#: ../IkiWiki/Plugin/edittemplate.pm:131 ../IkiWiki/Plugin/inline.pm:339
-#: ../IkiWiki/Plugin/template.pm:44
-#, fuzzy
-msgid "failed to process template:"
-msgstr "errore nell'elaborazione:"
-
#: ../IkiWiki/Plugin/format.pm:30
msgid "must specify format and text"
msgstr "occorre specificare formato e testo"
@@ -365,23 +364,32 @@ msgstr "non è una pagina"
msgid "%s is an attachment, not a page."
msgstr "%s è un allegato, non una pagina."
-#: ../IkiWiki/Plugin/git.pm:742 ../IkiWiki/Plugin/git.pm:760
-#: ../IkiWiki/Receive.pm:129
+#: ../IkiWiki/Plugin/git.pm:764 ../IkiWiki/Plugin/git.pm:827
+#: ../IkiWiki.pm:1580
#, perl-format
msgid "you are not allowed to change %s"
msgstr "non è permesso modificare %s"
-#: ../IkiWiki/Plugin/git.pm:782
+#: ../IkiWiki/Plugin/git.pm:786
#, perl-format
msgid "you cannot act on a file with mode %s"
msgstr "non è permesso lavorare su un file in modalità %s"
-#: ../IkiWiki/Plugin/git.pm:786
+#: ../IkiWiki/Plugin/git.pm:790
msgid "you are not allowed to change file modes"
msgstr "non è permesso cambiare la modalità del file"
-#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:137
-#: ../IkiWiki/Plugin/search.pm:38
+#: ../IkiWiki/Plugin/git.pm:861
+#, fuzzy
+msgid "you are not allowed to revert a merge"
+msgstr "non è permesso modificare %s"
+
+#: ../IkiWiki/Plugin/git.pm:877
+#, fuzzy, perl-format
+msgid "Failed to revert commit %s"
+msgstr "errore nel compilare %s"
+
+#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/search.pm:38
#, perl-format
msgid "Must specify %s when using the %s plugin"
msgstr "Occorre specificare %s quando si usa il plugin %s"
@@ -394,23 +402,23 @@ msgstr "errore nell'eseguire graphviz"
msgid "prog not a valid graphviz program"
msgstr "prog non è un programma graphviz valido"
-#: ../IkiWiki/Plugin/highlight.pm:48
+#: ../IkiWiki/Plugin/highlight.pm:64
#, perl-format
msgid "tohighlight contains unknown file type '%s'"
msgstr "tohighlight contiene il tipo di file sconosciuto «%s»"
-#: ../IkiWiki/Plugin/highlight.pm:59
+#: ../IkiWiki/Plugin/highlight.pm:75
#, perl-format
msgid "Source code: %s"
msgstr "Sorgente: %s"
-#: ../IkiWiki/Plugin/highlight.pm:124
+#: ../IkiWiki/Plugin/highlight.pm:140
msgid ""
"warning: highlight perl module not available; falling back to pass through"
msgstr ""
"attenzione: modulo perl highlight non trovato, verrà passato inalterato"
-#: ../IkiWiki/Plugin/htmltidy.pm:50
+#: ../IkiWiki/Plugin/htmltidy.pm:62
#, fuzzy
msgid "htmltidy failed to parse this html"
msgstr "impossibile interpretare gli smile"
@@ -461,12 +469,12 @@ msgstr "i parametri %s e %s non possono essere usati insieme"
msgid "Add a new post titled:"
msgstr "Aggiungere un nuovo articolo dal titolo:"
-#: ../IkiWiki/Plugin/inline.pm:342
-#, perl-format
-msgid "template %s not found"
-msgstr "modello %s non trovato"
+#: ../IkiWiki/Plugin/inline.pm:339 ../IkiWiki/Plugin/template.pm:44
+#, fuzzy, perl-format
+msgid "failed to process template %s"
+msgstr "errore nell'elaborazione:"
-#: ../IkiWiki/Plugin/inline.pm:633
+#: ../IkiWiki/Plugin/inline.pm:630
msgid "RPC::XML::Client not found, not pinging"
msgstr "RPC::XML::Client non trovato, impossibile inviare ping"
@@ -495,19 +503,19 @@ msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)"
msgstr ""
"impossibile caricare il modulo perl Markdown.pm (%s) o /usr/bin/markdown (%s)"
-#: ../IkiWiki/Plugin/meta.pm:174
+#: ../IkiWiki/Plugin/meta.pm:175
msgid "stylesheet not found"
msgstr "foglio di stile non trovato"
-#: ../IkiWiki/Plugin/meta.pm:212
+#: ../IkiWiki/Plugin/meta.pm:217
msgid "redir page not found"
msgstr "pagina di reindirizzamento non trovata"
-#: ../IkiWiki/Plugin/meta.pm:226
+#: ../IkiWiki/Plugin/meta.pm:231
msgid "redir cycle is not allowed"
msgstr "ciclo di reindirizzamento non ammesso"
-#: ../IkiWiki/Plugin/meta.pm:395
+#: ../IkiWiki/Plugin/meta.pm:400
#, fuzzy
msgid "sort=meta requires a parameter"
msgstr "sono richiesti i parametri \"to\" e \"from\""
@@ -585,21 +593,21 @@ msgstr "reset della password non permesso"
msgid "Ping received."
msgstr "Ping ricevuto."
-#: ../IkiWiki/Plugin/pinger.pm:53
+#: ../IkiWiki/Plugin/pinger.pm:54
msgid "requires 'from' and 'to' parameters"
msgstr "sono richiesti i parametri \"to\" e \"from\""
-#: ../IkiWiki/Plugin/pinger.pm:58
+#: ../IkiWiki/Plugin/pinger.pm:59
#, perl-format
msgid "Will ping %s"
msgstr "Verrà inviato un ping a %s"
-#: ../IkiWiki/Plugin/pinger.pm:61
+#: ../IkiWiki/Plugin/pinger.pm:62
#, perl-format
msgid "Ignoring ping directive for wiki %s (this wiki is %s)"
msgstr "Ignorata la richiesta di ping per il wiki %s (questo wiki è %s)"
-#: ../IkiWiki/Plugin/pinger.pm:77
+#: ../IkiWiki/Plugin/pinger.pm:78
msgid "LWP not found, not pinging"
msgstr "LWP non trovato, ping non inviato"
@@ -609,24 +617,19 @@ msgstr ""
"attenzione: è presente un vecchio po4a. Si raccomanda di aggiornare almeno "
"alla versione 0.35."
-#: ../IkiWiki/Plugin/po.pm:147
-#, perl-format
-msgid "%s has invalid syntax: must use CODE|NAME"
-msgstr ""
-
-#: ../IkiWiki/Plugin/po.pm:166
+#: ../IkiWiki/Plugin/po.pm:175
#, perl-format
msgid "%s is not a valid language code"
msgstr "%s non è una codifica di lingua valida"
-#: ../IkiWiki/Plugin/po.pm:178
+#: ../IkiWiki/Plugin/po.pm:187
#, perl-format
msgid ""
"%s is not a valid value for po_link_to, falling back to po_link_to=default"
msgstr ""
"%s non è un valore per po_link_to valido, verrà utilizzato po_link_to=default"
-#: ../IkiWiki/Plugin/po.pm:183
+#: ../IkiWiki/Plugin/po.pm:192
msgid ""
"po_link_to=negotiated requires usedirs to be enabled, falling back to "
"po_link_to=default"
@@ -634,21 +637,11 @@ msgstr ""
"po_link_to=negotiated richiede che venga abilitato usedirs, verrà utilizzato "
"po_link_to=default"
-#: ../IkiWiki/Plugin/po.pm:414
-#, perl-format
-msgid "rebuilding all pages to fix meta titles"
-msgstr "rigenerazione di tutte le pagine per sistemare i meta-titoli"
-
-#: ../IkiWiki/Plugin/po.pm:418 ../IkiWiki/Render.pm:784
-#, perl-format
-msgid "building %s"
-msgstr "compilazione di %s"
-
-#: ../IkiWiki/Plugin/po.pm:456
+#: ../IkiWiki/Plugin/po.pm:455
msgid "updated PO files"
msgstr "file PO aggiornati"
-#: ../IkiWiki/Plugin/po.pm:479
+#: ../IkiWiki/Plugin/po.pm:478
msgid ""
"Can not remove a translation. If the master page is removed, however, its "
"translations will be removed as well."
@@ -656,7 +649,7 @@ msgstr ""
"Impossibile eliminare una traduzione. Tuttavia, se la pagina principale è "
"stata eliminata anche le traduzioni lo saranno."
-#: ../IkiWiki/Plugin/po.pm:499
+#: ../IkiWiki/Plugin/po.pm:498
msgid ""
"Can not rename a translation. If the master page is renamed, however, its "
"translations will be renamed as well."
@@ -664,55 +657,60 @@ msgstr ""
"Impossibile rinominare una traduzione. Tuttavia, se la pagina principale è "
"stata rinominata anche le traduzioni lo saranno."
-#: ../IkiWiki/Plugin/po.pm:924
+#: ../IkiWiki/Plugin/po.pm:935
#, perl-format
msgid "POT file (%s) does not exist"
msgstr "Il file POT (%s) non esiste"
-#: ../IkiWiki/Plugin/po.pm:938
+#: ../IkiWiki/Plugin/po.pm:949
#, perl-format
msgid "failed to copy underlay PO file to %s"
msgstr "impossibile copiare il file PO di underlay in %s"
-#: ../IkiWiki/Plugin/po.pm:947
+#: ../IkiWiki/Plugin/po.pm:958
#, perl-format
msgid "failed to update %s"
msgstr "impossibile aggiornare %s"
-#: ../IkiWiki/Plugin/po.pm:953
+#: ../IkiWiki/Plugin/po.pm:964
#, perl-format
msgid "failed to copy the POT file to %s"
msgstr "impossibile copiare il file POT in %s"
-#: ../IkiWiki/Plugin/po.pm:989
+#: ../IkiWiki/Plugin/po.pm:1000
msgid "N/A"
msgstr "N/D"
-#: ../IkiWiki/Plugin/po.pm:1000
+#: ../IkiWiki/Plugin/po.pm:1011
#, perl-format
msgid "failed to translate %s"
msgstr "impossibile tradurre %s"
-#: ../IkiWiki/Plugin/po.pm:1079
+#: ../IkiWiki/Plugin/po.pm:1090
msgid "removed obsolete PO files"
msgstr "file PO obsoleti rimossi"
-#: ../IkiWiki/Plugin/po.pm:1136 ../IkiWiki/Plugin/po.pm:1148
-#: ../IkiWiki/Plugin/po.pm:1187
+#: ../IkiWiki/Plugin/po.pm:1147 ../IkiWiki/Plugin/po.pm:1159
+#: ../IkiWiki/Plugin/po.pm:1198
#, perl-format
msgid "failed to write %s"
msgstr "impossibile scrivere %s"
-#: ../IkiWiki/Plugin/po.pm:1146
+#: ../IkiWiki/Plugin/po.pm:1157
msgid "failed to translate"
msgstr "impossibile tradurre"
-#: ../IkiWiki/Plugin/po.pm:1199
+#: ../IkiWiki/Plugin/po.pm:1210
msgid "invalid gettext data, go back to previous page to continue edit"
msgstr ""
"dati gettext non validi, tornare alle pagina precedente per continuare le "
"modifiche"
+#: ../IkiWiki/Plugin/po.pm:1252
+#, perl-format
+msgid "%s has invalid syntax: must use CODE|NAME"
+msgstr ""
+
#: ../IkiWiki/Plugin/poll.pm:70
msgid "vote"
msgstr "voto"
@@ -812,6 +810,16 @@ msgstr ""
"occorrono alternativamente i parametri \"percent\" o \"totalpages\" e "
"\"donepages\""
+#: ../IkiWiki/Plugin/recentchanges.pm:104
+#, perl-format
+msgid "This reverts commit %s"
+msgstr ""
+
+#: ../IkiWiki/Plugin/recentchanges.pm:123
+#, fuzzy, perl-format
+msgid "confirm reversion of %s"
+msgstr "conferma rimozione di %s"
+
#: ../IkiWiki/Plugin/recentchangesdiff.pm:37
msgid "(Diff truncated)"
msgstr "(Diff troncato)"
@@ -831,12 +839,12 @@ msgstr "%s non è in src, quindi non può essere eliminato"
msgid "%s is not a file"
msgstr "%s non è un file"
-#: ../IkiWiki/Plugin/remove.pm:137
+#: ../IkiWiki/Plugin/remove.pm:136
#, perl-format
msgid "confirm removal of %s"
msgstr "conferma rimozione di %s"
-#: ../IkiWiki/Plugin/remove.pm:174
+#: ../IkiWiki/Plugin/remove.pm:173
msgid "Please select the attachments to remove."
msgstr "Selezionare l'allegato da rimuovere."
@@ -868,29 +876,29 @@ msgstr "%s esiste già"
msgid "%s already exists on disk"
msgstr "%s già presente su disco"
-#: ../IkiWiki/Plugin/rename.pm:122
+#: ../IkiWiki/Plugin/rename.pm:123
#, perl-format
msgid "rename %s"
msgstr "rinomina di %s"
-#: ../IkiWiki/Plugin/rename.pm:163
+#: ../IkiWiki/Plugin/rename.pm:164
msgid "Also rename SubPages and attachments"
msgstr "Rinomina anche SottoPagine e allegati"
-#: ../IkiWiki/Plugin/rename.pm:250
+#: ../IkiWiki/Plugin/rename.pm:251
msgid "Only one attachment can be renamed at a time."
msgstr "Si può rinominare un solo allegato alla volta."
-#: ../IkiWiki/Plugin/rename.pm:253
+#: ../IkiWiki/Plugin/rename.pm:254
msgid "Please select the attachment to rename."
msgstr "Selezionare l'allegato da rinominare."
-#: ../IkiWiki/Plugin/rename.pm:352
+#: ../IkiWiki/Plugin/rename.pm:353
#, perl-format
msgid "rename %s to %s"
msgstr "rinomina %s in %s"
-#: ../IkiWiki/Plugin/rename.pm:577
+#: ../IkiWiki/Plugin/rename.pm:578
#, perl-format
msgid "update for rename of %s to %s"
msgstr "aggiornamento per rinomina di %s in %s"
@@ -931,7 +939,12 @@ msgstr "parametro nome o url mancante"
msgid "shortcut %s points to <i>%s</i>"
msgstr "la scorciatoia %s punta a <i>%s</i>"
-#: ../IkiWiki/Plugin/smiley.pm:43
+#: ../IkiWiki/Plugin/smiley.pm:30
+#, fuzzy, perl-format
+msgid "smiley plugin will not work without %s"
+msgstr "il plugin scorciatoia non può funzionare senza %s"
+
+#: ../IkiWiki/Plugin/smiley.pm:50
msgid "failed to parse any smileys"
msgstr "impossibile interpretare gli smile"
@@ -997,16 +1010,11 @@ msgstr "creazione nuova pagina %s"
msgid "missing id parameter"
msgstr "parametro id mancante"
-#: ../IkiWiki/Plugin/template.pm:47
-#, fuzzy, perl-format
-msgid "%s not found"
-msgstr "notiziario non trovato"
-
-#: ../IkiWiki/Plugin/teximg.pm:72
+#: ../IkiWiki/Plugin/teximg.pm:73
msgid "missing tex code"
msgstr "codice tex mancante"
-#: ../IkiWiki/Plugin/teximg.pm:124
+#: ../IkiWiki/Plugin/teximg.pm:125
msgid "failed to generate image from code"
msgstr "impossibile generare l'immagine dal codice"
@@ -1025,22 +1033,22 @@ msgstr "plugin"
msgid "enable %s?"
msgstr "abilitare %s?"
-#: ../IkiWiki/Plugin/websetup.pm:272
+#: ../IkiWiki/Plugin/websetup.pm:273
msgid "setup file for this wiki is not known"
msgstr "il file di setup di questo wiki non è noto"
-#: ../IkiWiki/Plugin/websetup.pm:288
+#: ../IkiWiki/Plugin/websetup.pm:289
msgid "main"
msgstr "principale"
-#: ../IkiWiki/Plugin/websetup.pm:431
+#: ../IkiWiki/Plugin/websetup.pm:433
msgid ""
"The configuration changes shown below require a wiki rebuild to take effect."
msgstr ""
"Le sottostanti modifiche alla configurazione richiedono la ricompilazione "
"del wiki."
-#: ../IkiWiki/Plugin/websetup.pm:435
+#: ../IkiWiki/Plugin/websetup.pm:437
msgid ""
"For the configuration changes shown below to fully take effect, you may need "
"to rebuild the wiki."
@@ -1048,7 +1056,7 @@ msgstr ""
"Affinché le sottostanti modifiche alla configurazione abbiano effetto, "
"occorre ricostruire il wiki."
-#: ../IkiWiki/Plugin/websetup.pm:472
+#: ../IkiWiki/Plugin/websetup.pm:474
#, perl-format
msgid "Error: %s exited nonzero (%s). Discarding setup changes."
msgstr "Errore: %s è terminato con errore (%s). Modifiche al setup scartate."
@@ -1058,11 +1066,6 @@ msgstr "Errore: %s è terminato con errore (%s). Modifiche al setup scartate."
msgid "cannot determine id of untrusted committer %s"
msgstr "impossibile determinare l'id del committer non fidato %s"
-#: ../IkiWiki/Receive.pm:85
-#, perl-format
-msgid "bad file name %s"
-msgstr "nome file %s scorretto"
-
#: ../IkiWiki/Render.pm:158
#, perl-format
msgid "scanning %s"
@@ -1117,7 +1120,12 @@ msgstr "compilazione di %s, che dipende da %s"
msgid "building %s, to update its backlinks"
msgstr "compilazione di %s, per aggiornare i collegamenti ai precedenti"
-#: ../IkiWiki/Render.pm:836
+#: ../IkiWiki/Render.pm:787
+#, perl-format
+msgid "building %s"
+msgstr "compilazione di %s"
+
+#: ../IkiWiki/Render.pm:839
#, perl-format
msgid "ikiwiki: cannot build %s"
msgstr "ikiwiki: impossibile compilare %s"
@@ -1176,39 +1184,39 @@ msgid "wrapper filename not specified"
msgstr "nome del file del contenitore non specificato"
#. translators: The parameter is a C filename.
-#: ../IkiWiki/Wrapper.pm:218
+#: ../IkiWiki/Wrapper.pm:219
#, perl-format
msgid "failed to compile %s"
msgstr "errore nel compilare %s"
#. translators: The parameter is a filename.
-#: ../IkiWiki/Wrapper.pm:238
+#: ../IkiWiki/Wrapper.pm:239
#, perl-format
msgid "successfully generated %s"
msgstr "%s generato con successo"
-#: ../ikiwiki.in:13
+#: ../ikiwiki.in:10
msgid "usage: ikiwiki [options] source dest"
msgstr "utilizzo: ikiwiki [opzioni] sorgente destinazione"
-#: ../ikiwiki.in:14
+#: ../ikiwiki.in:11
msgid " ikiwiki --setup configfile"
msgstr " ikiwiki --setup configfile"
-#: ../ikiwiki.in:105
+#: ../ikiwiki.in:102
msgid "usage: --set var=value"
msgstr "utilizzo: --set var=valore"
-#: ../ikiwiki.in:112
+#: ../ikiwiki.in:109
#, fuzzy
msgid "usage: --set-yaml var=value"
msgstr "utilizzo: --set var=valore"
-#: ../ikiwiki.in:218
+#: ../ikiwiki.in:215
msgid "rebuilding wiki.."
msgstr "ricostruzione wiki..."
-#: ../ikiwiki.in:221
+#: ../ikiwiki.in:218
msgid "refreshing wiki.."
msgstr "aggiornamento wiki..."
@@ -1234,21 +1242,31 @@ msgstr "impossibile caricare il plugin esterno per il plugin %s: %s"
msgid "preprocessing loop detected on %s at depth %i"
msgstr "ciclo del preprocessore individuato su %s alla profondità %i"
-#: ../IkiWiki.pm:2053
+#: ../IkiWiki.pm:1536
+#, perl-format
+msgid "bad file name %s"
+msgstr "nome file %s scorretto"
+
+#: ../IkiWiki.pm:1836
+#, perl-format
+msgid "template %s not found"
+msgstr "modello %s non trovato"
+
+#: ../IkiWiki.pm:2118
msgid "yes"
msgstr "sì"
-#: ../IkiWiki.pm:2130
+#: ../IkiWiki.pm:2195
#, fuzzy, perl-format
msgid "invalid sort type %s"
msgstr "ordinamento %s sconosciuto"
-#: ../IkiWiki.pm:2151
+#: ../IkiWiki.pm:2216
#, perl-format
msgid "unknown sort type %s"
msgstr "ordinamento %s sconosciuto"
-#: ../IkiWiki.pm:2287
+#: ../IkiWiki.pm:2352
#, perl-format
msgid "cannot match pages: %s"
msgstr "impossibile trovare pagine corrispondenti: %s"
@@ -1273,6 +1291,13 @@ msgstr "Quale utente (openid o del wiki) sarà l'amministratore?"
msgid "What is the domain name of the web server?"
msgstr "Qual è il nome del dominio del server web?"
+#, fuzzy
+#~ msgid "%s not found"
+#~ msgstr "notiziario non trovato"
+
+#~ msgid "rebuilding all pages to fix meta titles"
+#~ msgstr "rigenerazione di tutte le pagine per sistemare i meta-titoli"
+
#~ msgid "You need to log in first."
#~ msgstr "Occorre prima effettuare l'accesso."
diff --git a/po/pl.po b/po/pl.po
index e93753abd..dc78149f3 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ikiwiki 1.51\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-04 09:22-0400\n"
+"POT-Creation-Date: 2010-10-23 17:21-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"
@@ -66,77 +66,82 @@ msgstr ""
msgid "Nothing to do right now, all feeds are up-to-date!"
msgstr ""
-#: ../IkiWiki/Plugin/aggregate.pm:220
+#: ../IkiWiki/Plugin/aggregate.pm:222
#, fuzzy, perl-format
msgid "missing %s parameter"
msgstr "brakujący parametr %s"
-#: ../IkiWiki/Plugin/aggregate.pm:255
+#: ../IkiWiki/Plugin/aggregate.pm:257
msgid "new feed"
msgstr "nowy kanał RSS"
-#: ../IkiWiki/Plugin/aggregate.pm:269
+#: ../IkiWiki/Plugin/aggregate.pm:271
msgid "posts"
msgstr "wpisy"
-#: ../IkiWiki/Plugin/aggregate.pm:271
+#: ../IkiWiki/Plugin/aggregate.pm:273
msgid "new"
msgstr "nowy wpis"
-#: ../IkiWiki/Plugin/aggregate.pm:455
+#: ../IkiWiki/Plugin/aggregate.pm:457
#, perl-format
msgid "expiring %s (%s days old)"
msgstr "wygasający wpis %s (ma już %s dni)"
-#: ../IkiWiki/Plugin/aggregate.pm:462
+#: ../IkiWiki/Plugin/aggregate.pm:464
#, perl-format
msgid "expiring %s"
msgstr "wygasający wpis %s"
-#: ../IkiWiki/Plugin/aggregate.pm:489
+#: ../IkiWiki/Plugin/aggregate.pm:491
#, perl-format
msgid "last checked %s"
msgstr ""
-#: ../IkiWiki/Plugin/aggregate.pm:493
+#: ../IkiWiki/Plugin/aggregate.pm:495
#, perl-format
msgid "checking feed %s ..."
msgstr "sprawdzanie kanału RSS %s..."
-#: ../IkiWiki/Plugin/aggregate.pm:498
+#: ../IkiWiki/Plugin/aggregate.pm:500
#, perl-format
msgid "could not find feed at %s"
msgstr "nie znaleziono kanału RSS pod adresem %s"
-#: ../IkiWiki/Plugin/aggregate.pm:517
+#: ../IkiWiki/Plugin/aggregate.pm:519
#, fuzzy
msgid "feed not found"
msgstr "nieznaleziony kanał RSS"
-#: ../IkiWiki/Plugin/aggregate.pm:528
+#: ../IkiWiki/Plugin/aggregate.pm:530
#, fuzzy, perl-format
msgid "(invalid UTF-8 stripped from feed)"
msgstr "Nieprawidłowe kodowanie UTF-8 usunięte z kanału RSS"
-#: ../IkiWiki/Plugin/aggregate.pm:536
+#: ../IkiWiki/Plugin/aggregate.pm:538
#, perl-format
msgid "(feed entities escaped)"
msgstr ""
-#: ../IkiWiki/Plugin/aggregate.pm:544
+#: ../IkiWiki/Plugin/aggregate.pm:546
msgid "feed crashed XML::Feed!"
msgstr "awaria kanału RSS w module XML::Feed!"
-#: ../IkiWiki/Plugin/aggregate.pm:630
+#: ../IkiWiki/Plugin/aggregate.pm:632
#, perl-format
msgid "creating new page %s"
msgstr "tworzenie nowej strony %s"
+#: ../IkiWiki/Plugin/aggregate.pm:652 ../IkiWiki/Plugin/edittemplate.pm:133
+#, fuzzy
+msgid "failed to process template:"
+msgstr "awaria w trakcie przetwarzania:"
+
#: ../IkiWiki/Plugin/amazon_s3.pm:31
msgid "deleting bucket.."
msgstr ""
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:229
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:226
msgid "done"
msgstr "gotowe"
@@ -181,7 +186,7 @@ msgstr ""
msgid "automatic index generation"
msgstr ""
-#: ../IkiWiki/Plugin/blogspam.pm:110
+#: ../IkiWiki/Plugin/blogspam.pm:112
msgid ""
"Sorry, but that looks like spam to <a href=\"http://blogspam.net/"
"\">blogspam</a>: "
@@ -258,7 +263,7 @@ msgstr ""
msgid "Added a comment: %s"
msgstr ""
-#: ../IkiWiki/Plugin/comments.pm:573 ../IkiWiki/Plugin/websetup.pm:268
+#: ../IkiWiki/Plugin/comments.pm:573 ../IkiWiki/Plugin/websetup.pm:269
msgid "you are not logged in as an admin"
msgstr ""
@@ -284,18 +289,18 @@ msgstr[1] ""
msgid "Comment"
msgstr ""
-#: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:31
-#: ../IkiWiki/Plugin/cutpaste.pm:46 ../IkiWiki/Plugin/cutpaste.pm:62
+#: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:46
+#: ../IkiWiki/Plugin/cutpaste.pm:60 ../IkiWiki/Plugin/cutpaste.pm:75
#: ../IkiWiki/Plugin/testpagespec.pm:26
#, fuzzy, perl-format
msgid "%s parameter is required"
msgstr "Parametry \"test\" i \"then\" są wymagane"
-#: ../IkiWiki/Plugin/cutpaste.pm:67
+#: ../IkiWiki/Plugin/cutpaste.pm:80
msgid "no text was copied in this page"
msgstr ""
-#: ../IkiWiki/Plugin/cutpaste.pm:70
+#: ../IkiWiki/Plugin/cutpaste.pm:83
#, perl-format
msgid "no text was copied in this page with id %s"
msgstr ""
@@ -322,27 +327,21 @@ msgstr "tworzenie %s"
msgid "editing %s"
msgstr "edycja %s"
-#: ../IkiWiki/Plugin/edittemplate.pm:52
+#: ../IkiWiki/Plugin/edittemplate.pm:54
#, fuzzy
msgid "template not specified"
msgstr "nieznaleziony szablon %s"
-#: ../IkiWiki/Plugin/edittemplate.pm:55
+#: ../IkiWiki/Plugin/edittemplate.pm:57
#, fuzzy
msgid "match not specified"
msgstr "nieokreślona nazwa pliku osłony"
-#: ../IkiWiki/Plugin/edittemplate.pm:70
+#: ../IkiWiki/Plugin/edittemplate.pm:72
#, perl-format
msgid "edittemplate %s registered for %s"
msgstr ""
-#: ../IkiWiki/Plugin/edittemplate.pm:131 ../IkiWiki/Plugin/inline.pm:339
-#: ../IkiWiki/Plugin/template.pm:44
-#, fuzzy
-msgid "failed to process template:"
-msgstr "awaria w trakcie przetwarzania:"
-
#: ../IkiWiki/Plugin/format.pm:30
msgid "must specify format and text"
msgstr ""
@@ -371,23 +370,31 @@ msgstr "awaria w trakcie odczytu %s: %s"
msgid "%s is an attachment, not a page."
msgstr "Strona %s nie może być edytowana"
-#: ../IkiWiki/Plugin/git.pm:742 ../IkiWiki/Plugin/git.pm:760
-#: ../IkiWiki/Receive.pm:129
+#: ../IkiWiki/Plugin/git.pm:764 ../IkiWiki/Plugin/git.pm:827
+#: ../IkiWiki.pm:1580
#, perl-format
msgid "you are not allowed to change %s"
msgstr ""
-#: ../IkiWiki/Plugin/git.pm:782
+#: ../IkiWiki/Plugin/git.pm:786
#, perl-format
msgid "you cannot act on a file with mode %s"
msgstr ""
-#: ../IkiWiki/Plugin/git.pm:786
+#: ../IkiWiki/Plugin/git.pm:790
msgid "you are not allowed to change file modes"
msgstr ""
-#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:137
-#: ../IkiWiki/Plugin/search.pm:38
+#: ../IkiWiki/Plugin/git.pm:861
+msgid "you are not allowed to revert a merge"
+msgstr ""
+
+#: ../IkiWiki/Plugin/git.pm:877
+#, fuzzy, perl-format
+msgid "Failed to revert commit %s"
+msgstr "awaria w trakcie kompilowania %s"
+
+#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/search.pm:38
#, fuzzy, perl-format
msgid "Must specify %s when using the %s plugin"
msgstr "Wtyczka do wyszukiwarka wymaga podania %s"
@@ -401,22 +408,22 @@ msgstr "awaria w trakcie uruchamiania wtyczki graphviz"
msgid "prog not a valid graphviz program"
msgstr "prog nie jest poprawnym programem graphviz"
-#: ../IkiWiki/Plugin/highlight.pm:48
+#: ../IkiWiki/Plugin/highlight.pm:64
#, perl-format
msgid "tohighlight contains unknown file type '%s'"
msgstr ""
-#: ../IkiWiki/Plugin/highlight.pm:59
+#: ../IkiWiki/Plugin/highlight.pm:75
#, perl-format
msgid "Source code: %s"
msgstr ""
-#: ../IkiWiki/Plugin/highlight.pm:124
+#: ../IkiWiki/Plugin/highlight.pm:140
msgid ""
"warning: highlight perl module not available; falling back to pass through"
msgstr ""
-#: ../IkiWiki/Plugin/htmltidy.pm:50
+#: ../IkiWiki/Plugin/htmltidy.pm:62
#, fuzzy
msgid "htmltidy failed to parse this html"
msgstr "awaria w trakcie przetwarzania emitoikonki"
@@ -471,12 +478,12 @@ msgstr ""
msgid "Add a new post titled:"
msgstr "Tytuł nowego wpisu"
-#: ../IkiWiki/Plugin/inline.pm:342
-#, perl-format
-msgid "template %s not found"
-msgstr "nieznaleziony szablon %s"
+#: ../IkiWiki/Plugin/inline.pm:339 ../IkiWiki/Plugin/template.pm:44
+#, fuzzy, perl-format
+msgid "failed to process template %s"
+msgstr "awaria w trakcie przetwarzania:"
-#: ../IkiWiki/Plugin/inline.pm:633
+#: ../IkiWiki/Plugin/inline.pm:630
msgid "RPC::XML::Client not found, not pinging"
msgstr "Nieznaleziony moduł RPC::XML::Client, brak możliwości pingowania"
@@ -508,22 +515,22 @@ msgstr ""
"Awaria w trakcie ładowania perlowego modułu Markdown.pm (%s) lub "
"uruchamiania programu /usr/bin/markdown (%s)"
-#: ../IkiWiki/Plugin/meta.pm:174
+#: ../IkiWiki/Plugin/meta.pm:175
#, fuzzy
msgid "stylesheet not found"
msgstr "nieznaleziony szablon ze stylami CSS"
-#: ../IkiWiki/Plugin/meta.pm:212
+#: ../IkiWiki/Plugin/meta.pm:217
#, fuzzy
msgid "redir page not found"
msgstr "nieznaleziony kanał RSS"
-#: ../IkiWiki/Plugin/meta.pm:226
+#: ../IkiWiki/Plugin/meta.pm:231
#, fuzzy
msgid "redir cycle is not allowed"
msgstr "nieznaleziony kanał RSS"
-#: ../IkiWiki/Plugin/meta.pm:395
+#: ../IkiWiki/Plugin/meta.pm:400
msgid "sort=meta requires a parameter"
msgstr ""
@@ -597,21 +604,21 @@ msgstr ""
msgid "Ping received."
msgstr ""
-#: ../IkiWiki/Plugin/pinger.pm:53
+#: ../IkiWiki/Plugin/pinger.pm:54
msgid "requires 'from' and 'to' parameters"
msgstr ""
-#: ../IkiWiki/Plugin/pinger.pm:58
+#: ../IkiWiki/Plugin/pinger.pm:59
#, fuzzy, perl-format
msgid "Will ping %s"
msgstr "edycja %s"
-#: ../IkiWiki/Plugin/pinger.pm:61
+#: ../IkiWiki/Plugin/pinger.pm:62
#, perl-format
msgid "Ignoring ping directive for wiki %s (this wiki is %s)"
msgstr ""
-#: ../IkiWiki/Plugin/pinger.pm:77
+#: ../IkiWiki/Plugin/pinger.pm:78
#, fuzzy
msgid "LWP not found, not pinging"
msgstr "Nieznaleziony moduł RPC::XML::Client, brak możliwości pingowania"
@@ -620,102 +627,92 @@ msgstr "Nieznaleziony moduł RPC::XML::Client, brak możliwości pingowania"
msgid "warning: Old po4a detected! Recommend upgrade to 0.35."
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:147
-#, perl-format
-msgid "%s has invalid syntax: must use CODE|NAME"
-msgstr ""
-
-#: ../IkiWiki/Plugin/po.pm:166
+#: ../IkiWiki/Plugin/po.pm:175
#, fuzzy, perl-format
msgid "%s is not a valid language code"
msgstr "Strona %s nie może być edytowana"
-#: ../IkiWiki/Plugin/po.pm:178
+#: ../IkiWiki/Plugin/po.pm:187
#, perl-format
msgid ""
"%s is not a valid value for po_link_to, falling back to po_link_to=default"
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:183
+#: ../IkiWiki/Plugin/po.pm:192
msgid ""
"po_link_to=negotiated requires usedirs to be enabled, falling back to "
"po_link_to=default"
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:414
-#, perl-format
-msgid "rebuilding all pages to fix meta titles"
-msgstr ""
-
-#: ../IkiWiki/Plugin/po.pm:418 ../IkiWiki/Render.pm:784
-#, fuzzy, perl-format
-msgid "building %s"
-msgstr "edycja %s"
-
-#: ../IkiWiki/Plugin/po.pm:456
+#: ../IkiWiki/Plugin/po.pm:455
msgid "updated PO files"
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:479
+#: ../IkiWiki/Plugin/po.pm:478
msgid ""
"Can not remove a translation. If the master page is removed, however, its "
"translations will be removed as well."
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:499
+#: ../IkiWiki/Plugin/po.pm:498
msgid ""
"Can not rename a translation. If the master page is renamed, however, its "
"translations will be renamed as well."
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:924
+#: ../IkiWiki/Plugin/po.pm:935
#, perl-format
msgid "POT file (%s) does not exist"
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:938
+#: ../IkiWiki/Plugin/po.pm:949
#, fuzzy, perl-format
msgid "failed to copy underlay PO file to %s"
msgstr "awaria w trakcie kompilowania %s"
-#: ../IkiWiki/Plugin/po.pm:947
+#: ../IkiWiki/Plugin/po.pm:958
#, fuzzy, perl-format
msgid "failed to update %s"
msgstr "awaria w trakcie kompilowania %s"
-#: ../IkiWiki/Plugin/po.pm:953
+#: ../IkiWiki/Plugin/po.pm:964
#, fuzzy, perl-format
msgid "failed to copy the POT file to %s"
msgstr "awaria w trakcie kompilowania %s"
-#: ../IkiWiki/Plugin/po.pm:989
+#: ../IkiWiki/Plugin/po.pm:1000
msgid "N/A"
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:1000
+#: ../IkiWiki/Plugin/po.pm:1011
#, fuzzy, perl-format
msgid "failed to translate %s"
msgstr "awaria w trakcie zmiany rozmiaru: %s"
-#: ../IkiWiki/Plugin/po.pm:1079
+#: ../IkiWiki/Plugin/po.pm:1090
msgid "removed obsolete PO files"
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:1136 ../IkiWiki/Plugin/po.pm:1148
-#: ../IkiWiki/Plugin/po.pm:1187
+#: ../IkiWiki/Plugin/po.pm:1147 ../IkiWiki/Plugin/po.pm:1159
+#: ../IkiWiki/Plugin/po.pm:1198
#, fuzzy, perl-format
msgid "failed to write %s"
msgstr "awaria w trakcie zapisu %s: %s"
-#: ../IkiWiki/Plugin/po.pm:1146
+#: ../IkiWiki/Plugin/po.pm:1157
#, fuzzy
msgid "failed to translate"
msgstr "awaria w trakcie uruchamiania dot"
-#: ../IkiWiki/Plugin/po.pm:1199
+#: ../IkiWiki/Plugin/po.pm:1210
msgid "invalid gettext data, go back to previous page to continue edit"
msgstr ""
+#: ../IkiWiki/Plugin/po.pm:1252
+#, perl-format
+msgid "%s has invalid syntax: must use CODE|NAME"
+msgstr ""
+
#: ../IkiWiki/Plugin/poll.pm:70
msgid "vote"
msgstr "głosuj"
@@ -815,6 +812,16 @@ msgstr ""
msgid "need either `percent` or `totalpages` and `donepages` parameters"
msgstr ""
+#: ../IkiWiki/Plugin/recentchanges.pm:104
+#, perl-format
+msgid "This reverts commit %s"
+msgstr ""
+
+#: ../IkiWiki/Plugin/recentchanges.pm:123
+#, perl-format
+msgid "confirm reversion of %s"
+msgstr ""
+
#: ../IkiWiki/Plugin/recentchangesdiff.pm:37
msgid "(Diff truncated)"
msgstr ""
@@ -836,12 +843,12 @@ msgstr ""
msgid "%s is not a file"
msgstr "Strona %s nie może być edytowana"
-#: ../IkiWiki/Plugin/remove.pm:137
+#: ../IkiWiki/Plugin/remove.pm:136
#, perl-format
msgid "confirm removal of %s"
msgstr ""
-#: ../IkiWiki/Plugin/remove.pm:174
+#: ../IkiWiki/Plugin/remove.pm:173
msgid "Please select the attachments to remove."
msgstr ""
@@ -874,29 +881,29 @@ msgstr ""
msgid "%s already exists on disk"
msgstr ""
-#: ../IkiWiki/Plugin/rename.pm:122
+#: ../IkiWiki/Plugin/rename.pm:123
#, fuzzy, perl-format
msgid "rename %s"
msgstr "renderowanie %s"
-#: ../IkiWiki/Plugin/rename.pm:163
+#: ../IkiWiki/Plugin/rename.pm:164
msgid "Also rename SubPages and attachments"
msgstr ""
-#: ../IkiWiki/Plugin/rename.pm:250
+#: ../IkiWiki/Plugin/rename.pm:251
msgid "Only one attachment can be renamed at a time."
msgstr ""
-#: ../IkiWiki/Plugin/rename.pm:253
+#: ../IkiWiki/Plugin/rename.pm:254
msgid "Please select the attachment to rename."
msgstr ""
-#: ../IkiWiki/Plugin/rename.pm:352
+#: ../IkiWiki/Plugin/rename.pm:353
#, perl-format
msgid "rename %s to %s"
msgstr ""
-#: ../IkiWiki/Plugin/rename.pm:577
+#: ../IkiWiki/Plugin/rename.pm:578
#, fuzzy, perl-format
msgid "update for rename of %s to %s"
msgstr "aktualizacja stron wiki %s: %s przez użytkownika %s"
@@ -938,7 +945,12 @@ msgstr "brakujący parametr name lub url"
msgid "shortcut %s points to <i>%s</i>"
msgstr "skrót %s wskazuje na adres <i>%s</i>"
-#: ../IkiWiki/Plugin/smiley.pm:43
+#: ../IkiWiki/Plugin/smiley.pm:30
+#, perl-format
+msgid "smiley plugin will not work without %s"
+msgstr ""
+
+#: ../IkiWiki/Plugin/smiley.pm:50
#, fuzzy
msgid "failed to parse any smileys"
msgstr "awaria w trakcie przetwarzania emitoikonki"
@@ -1013,17 +1025,12 @@ msgstr "tworzenie nowej strony %s"
msgid "missing id parameter"
msgstr "brakujący parametr id"
-#: ../IkiWiki/Plugin/template.pm:47
-#, fuzzy, perl-format
-msgid "%s not found"
-msgstr "nie znaleziono %s"
-
-#: ../IkiWiki/Plugin/teximg.pm:72
+#: ../IkiWiki/Plugin/teximg.pm:73
#, fuzzy
msgid "missing tex code"
msgstr "brakujące wartości"
-#: ../IkiWiki/Plugin/teximg.pm:124
+#: ../IkiWiki/Plugin/teximg.pm:125
#, fuzzy
msgid "failed to generate image from code"
msgstr "awaria w trakcie zmiany rozmiaru: %s"
@@ -1043,26 +1050,26 @@ msgstr ""
msgid "enable %s?"
msgstr ""
-#: ../IkiWiki/Plugin/websetup.pm:272
+#: ../IkiWiki/Plugin/websetup.pm:273
msgid "setup file for this wiki is not known"
msgstr ""
-#: ../IkiWiki/Plugin/websetup.pm:288
+#: ../IkiWiki/Plugin/websetup.pm:289
msgid "main"
msgstr ""
-#: ../IkiWiki/Plugin/websetup.pm:431
+#: ../IkiWiki/Plugin/websetup.pm:433
msgid ""
"The configuration changes shown below require a wiki rebuild to take effect."
msgstr ""
-#: ../IkiWiki/Plugin/websetup.pm:435
+#: ../IkiWiki/Plugin/websetup.pm:437
msgid ""
"For the configuration changes shown below to fully take effect, you may need "
"to rebuild the wiki."
msgstr ""
-#: ../IkiWiki/Plugin/websetup.pm:472
+#: ../IkiWiki/Plugin/websetup.pm:474
#, perl-format
msgid "Error: %s exited nonzero (%s). Discarding setup changes."
msgstr ""
@@ -1072,11 +1079,6 @@ msgstr ""
msgid "cannot determine id of untrusted committer %s"
msgstr ""
-#: ../IkiWiki/Receive.pm:85
-#, fuzzy, perl-format
-msgid "bad file name %s"
-msgstr "pomijanie nieprawidłowej nazwy pliku %s"
-
#: ../IkiWiki/Render.pm:158
#, perl-format
msgid "scanning %s"
@@ -1129,7 +1131,12 @@ msgstr "renderowanie %s zależącego od %s"
msgid "building %s, to update its backlinks"
msgstr "renderowanie %s w celu aktualizacji powrotnych odnośników"
-#: ../IkiWiki/Render.pm:836
+#: ../IkiWiki/Render.pm:787
+#, fuzzy, perl-format
+msgid "building %s"
+msgstr "edycja %s"
+
+#: ../IkiWiki/Render.pm:839
#, fuzzy, perl-format
msgid "ikiwiki: cannot build %s"
msgstr "ikiwiki: awaria w trakcie tworzenia %s"
@@ -1187,38 +1194,38 @@ msgid "wrapper filename not specified"
msgstr "nieokreślona nazwa pliku osłony"
#. translators: The parameter is a C filename.
-#: ../IkiWiki/Wrapper.pm:218
+#: ../IkiWiki/Wrapper.pm:219
#, perl-format
msgid "failed to compile %s"
msgstr "awaria w trakcie kompilowania %s"
#. translators: The parameter is a filename.
-#: ../IkiWiki/Wrapper.pm:238
+#: ../IkiWiki/Wrapper.pm:239
#, perl-format
msgid "successfully generated %s"
msgstr "pomyślnie utworzono %s"
-#: ../ikiwiki.in:13
+#: ../ikiwiki.in:10
msgid "usage: ikiwiki [options] source dest"
msgstr "użycie: ikiwiki [parametry] źródło cel"
-#: ../ikiwiki.in:14
+#: ../ikiwiki.in:11
msgid " ikiwiki --setup configfile"
msgstr ""
-#: ../ikiwiki.in:105
+#: ../ikiwiki.in:102
msgid "usage: --set var=value"
msgstr ""
-#: ../ikiwiki.in:112
+#: ../ikiwiki.in:109
msgid "usage: --set-yaml var=value"
msgstr ""
-#: ../ikiwiki.in:218
+#: ../ikiwiki.in:215
msgid "rebuilding wiki.."
msgstr "przebudowywanie wiki..."
-#: ../ikiwiki.in:221
+#: ../ikiwiki.in:218
msgid "refreshing wiki.."
msgstr "odświeżanie wiki..."
@@ -1246,21 +1253,31 @@ msgstr ""
msgid "preprocessing loop detected on %s at depth %i"
msgstr "polecenie preprocesora %s wykryte w %s na głębokości %i"
-#: ../IkiWiki.pm:2053
+#: ../IkiWiki.pm:1536
+#, fuzzy, perl-format
+msgid "bad file name %s"
+msgstr "pomijanie nieprawidłowej nazwy pliku %s"
+
+#: ../IkiWiki.pm:1836
+#, perl-format
+msgid "template %s not found"
+msgstr "nieznaleziony szablon %s"
+
+#: ../IkiWiki.pm:2118
msgid "yes"
msgstr ""
-#: ../IkiWiki.pm:2130
+#: ../IkiWiki.pm:2195
#, fuzzy, perl-format
msgid "invalid sort type %s"
msgstr "nieznany sposób sortowania %s"
-#: ../IkiWiki.pm:2151
+#: ../IkiWiki.pm:2216
#, perl-format
msgid "unknown sort type %s"
msgstr "nieznany sposób sortowania %s"
-#: ../IkiWiki.pm:2287
+#: ../IkiWiki.pm:2352
#, fuzzy, perl-format
msgid "cannot match pages: %s"
msgstr "awaria w trakcie odczytu %s: %s"
@@ -1285,6 +1302,10 @@ msgstr ""
msgid "What is the domain name of the web server?"
msgstr ""
+#, fuzzy
+#~ msgid "%s not found"
+#~ msgstr "nie znaleziono %s"
+
#~ msgid "You need to log in first."
#~ msgstr "Proszę najpierw zalogować się."
diff --git a/po/po2wiki b/po/po2wiki
index 6b84f7d54..126aa8e17 100755
--- a/po/po2wiki
+++ b/po/po2wiki
@@ -22,7 +22,8 @@ foreach my $file (@$files) {
$pagesources{$page}=$file; # used by po plugin functions
}
-foreach my $ll (keys %{$config{po_slave_languages}}) {
+foreach my $lang (@{$config{po_slave_languages}}) {
+ my ($ll, $name)=IkiWiki::Plugin::po::splitlangpair($lang);
$config{destdir}="../underlays/locale/$ll";
foreach my $file (@$files) {
diff --git a/po/sv.po b/po/sv.po
index fee2693e2..5a2d7b666 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ikiwiki\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-04 09:22-0400\n"
+"POT-Creation-Date: 2010-10-23 17:21-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"
@@ -63,77 +63,82 @@ msgstr ""
msgid "Nothing to do right now, all feeds are up-to-date!"
msgstr ""
-#: ../IkiWiki/Plugin/aggregate.pm:220
+#: ../IkiWiki/Plugin/aggregate.pm:222
#, fuzzy, perl-format
msgid "missing %s parameter"
msgstr "mall saknar id-parameter"
-#: ../IkiWiki/Plugin/aggregate.pm:255
+#: ../IkiWiki/Plugin/aggregate.pm:257
msgid "new feed"
msgstr "ny kanal"
-#: ../IkiWiki/Plugin/aggregate.pm:269
+#: ../IkiWiki/Plugin/aggregate.pm:271
msgid "posts"
msgstr "inlägg"
-#: ../IkiWiki/Plugin/aggregate.pm:271
+#: ../IkiWiki/Plugin/aggregate.pm:273
msgid "new"
msgstr "ny"
-#: ../IkiWiki/Plugin/aggregate.pm:455
+#: ../IkiWiki/Plugin/aggregate.pm:457
#, perl-format
msgid "expiring %s (%s days old)"
msgstr "låter %s gå ut (%s dagar gammal)"
-#: ../IkiWiki/Plugin/aggregate.pm:462
+#: ../IkiWiki/Plugin/aggregate.pm:464
#, perl-format
msgid "expiring %s"
msgstr "låter %s gå ut"
-#: ../IkiWiki/Plugin/aggregate.pm:489
+#: ../IkiWiki/Plugin/aggregate.pm:491
#, perl-format
msgid "last checked %s"
msgstr ""
-#: ../IkiWiki/Plugin/aggregate.pm:493
+#: ../IkiWiki/Plugin/aggregate.pm:495
#, perl-format
msgid "checking feed %s ..."
msgstr "kontrollerar kanalen %s ..."
-#: ../IkiWiki/Plugin/aggregate.pm:498
+#: ../IkiWiki/Plugin/aggregate.pm:500
#, perl-format
msgid "could not find feed at %s"
msgstr "kunde inte hitta kanalen på %s"
-#: ../IkiWiki/Plugin/aggregate.pm:517
+#: ../IkiWiki/Plugin/aggregate.pm:519
#, fuzzy
msgid "feed not found"
msgstr "mallen %s hittades inte"
-#: ../IkiWiki/Plugin/aggregate.pm:528
+#: ../IkiWiki/Plugin/aggregate.pm:530
#, perl-format
msgid "(invalid UTF-8 stripped from feed)"
msgstr ""
-#: ../IkiWiki/Plugin/aggregate.pm:536
+#: ../IkiWiki/Plugin/aggregate.pm:538
#, perl-format
msgid "(feed entities escaped)"
msgstr ""
-#: ../IkiWiki/Plugin/aggregate.pm:544
+#: ../IkiWiki/Plugin/aggregate.pm:546
msgid "feed crashed XML::Feed!"
msgstr "kanalen kraschade XML::Feed!"
-#: ../IkiWiki/Plugin/aggregate.pm:630
+#: ../IkiWiki/Plugin/aggregate.pm:632
#, perl-format
msgid "creating new page %s"
msgstr "skapar nya sidan %s"
+#: ../IkiWiki/Plugin/aggregate.pm:652 ../IkiWiki/Plugin/edittemplate.pm:133
+#, fuzzy
+msgid "failed to process template:"
+msgstr "misslyckades med att behandla mall:"
+
#: ../IkiWiki/Plugin/amazon_s3.pm:31
msgid "deleting bucket.."
msgstr ""
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:229
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:226
msgid "done"
msgstr "klar"
@@ -178,7 +183,7 @@ msgstr ""
msgid "automatic index generation"
msgstr ""
-#: ../IkiWiki/Plugin/blogspam.pm:110
+#: ../IkiWiki/Plugin/blogspam.pm:112
msgid ""
"Sorry, but that looks like spam to <a href=\"http://blogspam.net/"
"\">blogspam</a>: "
@@ -255,7 +260,7 @@ msgstr ""
msgid "Added a comment: %s"
msgstr ""
-#: ../IkiWiki/Plugin/comments.pm:573 ../IkiWiki/Plugin/websetup.pm:268
+#: ../IkiWiki/Plugin/comments.pm:573 ../IkiWiki/Plugin/websetup.pm:269
msgid "you are not logged in as an admin"
msgstr ""
@@ -281,18 +286,18 @@ msgstr[1] ""
msgid "Comment"
msgstr ""
-#: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:31
-#: ../IkiWiki/Plugin/cutpaste.pm:46 ../IkiWiki/Plugin/cutpaste.pm:62
+#: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:46
+#: ../IkiWiki/Plugin/cutpaste.pm:60 ../IkiWiki/Plugin/cutpaste.pm:75
#: ../IkiWiki/Plugin/testpagespec.pm:26
#, perl-format
msgid "%s parameter is required"
msgstr ""
-#: ../IkiWiki/Plugin/cutpaste.pm:67
+#: ../IkiWiki/Plugin/cutpaste.pm:80
msgid "no text was copied in this page"
msgstr ""
-#: ../IkiWiki/Plugin/cutpaste.pm:70
+#: ../IkiWiki/Plugin/cutpaste.pm:83
#, perl-format
msgid "no text was copied in this page with id %s"
msgstr ""
@@ -319,27 +324,21 @@ msgstr "skapar %s"
msgid "editing %s"
msgstr "redigerar %s"
-#: ../IkiWiki/Plugin/edittemplate.pm:52
+#: ../IkiWiki/Plugin/edittemplate.pm:54
#, fuzzy
msgid "template not specified"
msgstr "mallen %s hittades inte"
-#: ../IkiWiki/Plugin/edittemplate.pm:55
+#: ../IkiWiki/Plugin/edittemplate.pm:57
#, fuzzy
msgid "match not specified"
msgstr "filnamn för wrapper har inte angivits"
-#: ../IkiWiki/Plugin/edittemplate.pm:70
+#: ../IkiWiki/Plugin/edittemplate.pm:72
#, perl-format
msgid "edittemplate %s registered for %s"
msgstr ""
-#: ../IkiWiki/Plugin/edittemplate.pm:131 ../IkiWiki/Plugin/inline.pm:339
-#: ../IkiWiki/Plugin/template.pm:44
-#, fuzzy
-msgid "failed to process template:"
-msgstr "misslyckades med att behandla mall:"
-
#: ../IkiWiki/Plugin/format.pm:30
msgid "must specify format and text"
msgstr ""
@@ -368,23 +367,31 @@ msgstr "kan inte läsa %s: %s"
msgid "%s is an attachment, not a page."
msgstr ""
-#: ../IkiWiki/Plugin/git.pm:742 ../IkiWiki/Plugin/git.pm:760
-#: ../IkiWiki/Receive.pm:129
+#: ../IkiWiki/Plugin/git.pm:764 ../IkiWiki/Plugin/git.pm:827
+#: ../IkiWiki.pm:1580
#, perl-format
msgid "you are not allowed to change %s"
msgstr ""
-#: ../IkiWiki/Plugin/git.pm:782
+#: ../IkiWiki/Plugin/git.pm:786
#, perl-format
msgid "you cannot act on a file with mode %s"
msgstr ""
-#: ../IkiWiki/Plugin/git.pm:786
+#: ../IkiWiki/Plugin/git.pm:790
msgid "you are not allowed to change file modes"
msgstr ""
-#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:137
-#: ../IkiWiki/Plugin/search.pm:38
+#: ../IkiWiki/Plugin/git.pm:861
+msgid "you are not allowed to revert a merge"
+msgstr ""
+
+#: ../IkiWiki/Plugin/git.pm:877
+#, fuzzy, perl-format
+msgid "Failed to revert commit %s"
+msgstr "misslyckades med att kompilera %s"
+
+#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/search.pm:38
#, fuzzy, perl-format
msgid "Must specify %s when using the %s plugin"
msgstr "Måste ange %s när sökinsticket används"
@@ -398,22 +405,22 @@ msgstr "linkmap misslyckades att köra dot"
msgid "prog not a valid graphviz program"
msgstr ""
-#: ../IkiWiki/Plugin/highlight.pm:48
+#: ../IkiWiki/Plugin/highlight.pm:64
#, perl-format
msgid "tohighlight contains unknown file type '%s'"
msgstr ""
-#: ../IkiWiki/Plugin/highlight.pm:59
+#: ../IkiWiki/Plugin/highlight.pm:75
#, perl-format
msgid "Source code: %s"
msgstr ""
-#: ../IkiWiki/Plugin/highlight.pm:124
+#: ../IkiWiki/Plugin/highlight.pm:140
msgid ""
"warning: highlight perl module not available; falling back to pass through"
msgstr ""
-#: ../IkiWiki/Plugin/htmltidy.pm:50
+#: ../IkiWiki/Plugin/htmltidy.pm:62
#, fuzzy
msgid "htmltidy failed to parse this html"
msgstr "misslyckades med att tolka smilisar, inaktiverar instick"
@@ -466,12 +473,12 @@ msgstr ""
msgid "Add a new post titled:"
msgstr ""
-#: ../IkiWiki/Plugin/inline.pm:342
-#, perl-format
-msgid "template %s not found"
-msgstr "mallen %s hittades inte"
+#: ../IkiWiki/Plugin/inline.pm:339 ../IkiWiki/Plugin/template.pm:44
+#, fuzzy, perl-format
+msgid "failed to process template %s"
+msgstr "misslyckades med att behandla mall:"
-#: ../IkiWiki/Plugin/inline.pm:633
+#: ../IkiWiki/Plugin/inline.pm:630
msgid "RPC::XML::Client not found, not pinging"
msgstr "RPC::XML::Client hittades inte, pingar inte"
@@ -501,22 +508,22 @@ msgstr ""
"misslyckades med att läsa in Perl-modulen Markdown.pm (%s) eller /usr/bin/"
"markdown (%s)"
-#: ../IkiWiki/Plugin/meta.pm:174
+#: ../IkiWiki/Plugin/meta.pm:175
#, fuzzy
msgid "stylesheet not found"
msgstr "mallen %s hittades inte"
-#: ../IkiWiki/Plugin/meta.pm:212
+#: ../IkiWiki/Plugin/meta.pm:217
#, fuzzy
msgid "redir page not found"
msgstr "mallen %s hittades inte"
-#: ../IkiWiki/Plugin/meta.pm:226
+#: ../IkiWiki/Plugin/meta.pm:231
#, fuzzy
msgid "redir cycle is not allowed"
msgstr "mallen %s hittades inte"
-#: ../IkiWiki/Plugin/meta.pm:395
+#: ../IkiWiki/Plugin/meta.pm:400
msgid "sort=meta requires a parameter"
msgstr ""
@@ -590,21 +597,21 @@ msgstr ""
msgid "Ping received."
msgstr ""
-#: ../IkiWiki/Plugin/pinger.pm:53
+#: ../IkiWiki/Plugin/pinger.pm:54
msgid "requires 'from' and 'to' parameters"
msgstr ""
-#: ../IkiWiki/Plugin/pinger.pm:58
+#: ../IkiWiki/Plugin/pinger.pm:59
#, fuzzy, perl-format
msgid "Will ping %s"
msgstr "redigerar %s"
-#: ../IkiWiki/Plugin/pinger.pm:61
+#: ../IkiWiki/Plugin/pinger.pm:62
#, perl-format
msgid "Ignoring ping directive for wiki %s (this wiki is %s)"
msgstr ""
-#: ../IkiWiki/Plugin/pinger.pm:77
+#: ../IkiWiki/Plugin/pinger.pm:78
#, fuzzy
msgid "LWP not found, not pinging"
msgstr "RPC::XML::Client hittades inte, pingar inte"
@@ -613,102 +620,92 @@ msgstr "RPC::XML::Client hittades inte, pingar inte"
msgid "warning: Old po4a detected! Recommend upgrade to 0.35."
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:147
-#, perl-format
-msgid "%s has invalid syntax: must use CODE|NAME"
-msgstr ""
-
-#: ../IkiWiki/Plugin/po.pm:166
+#: ../IkiWiki/Plugin/po.pm:175
#, perl-format
msgid "%s is not a valid language code"
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:178
+#: ../IkiWiki/Plugin/po.pm:187
#, perl-format
msgid ""
"%s is not a valid value for po_link_to, falling back to po_link_to=default"
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:183
+#: ../IkiWiki/Plugin/po.pm:192
msgid ""
"po_link_to=negotiated requires usedirs to be enabled, falling back to "
"po_link_to=default"
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:414
-#, perl-format
-msgid "rebuilding all pages to fix meta titles"
-msgstr ""
-
-#: ../IkiWiki/Plugin/po.pm:418 ../IkiWiki/Render.pm:784
-#, fuzzy, perl-format
-msgid "building %s"
-msgstr "redigerar %s"
-
-#: ../IkiWiki/Plugin/po.pm:456
+#: ../IkiWiki/Plugin/po.pm:455
msgid "updated PO files"
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:479
+#: ../IkiWiki/Plugin/po.pm:478
msgid ""
"Can not remove a translation. If the master page is removed, however, its "
"translations will be removed as well."
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:499
+#: ../IkiWiki/Plugin/po.pm:498
msgid ""
"Can not rename a translation. If the master page is renamed, however, its "
"translations will be renamed as well."
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:924
+#: ../IkiWiki/Plugin/po.pm:935
#, perl-format
msgid "POT file (%s) does not exist"
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:938
+#: ../IkiWiki/Plugin/po.pm:949
#, fuzzy, perl-format
msgid "failed to copy underlay PO file to %s"
msgstr "misslyckades med att kompilera %s"
-#: ../IkiWiki/Plugin/po.pm:947
+#: ../IkiWiki/Plugin/po.pm:958
#, fuzzy, perl-format
msgid "failed to update %s"
msgstr "misslyckades med att kompilera %s"
-#: ../IkiWiki/Plugin/po.pm:953
+#: ../IkiWiki/Plugin/po.pm:964
#, fuzzy, perl-format
msgid "failed to copy the POT file to %s"
msgstr "misslyckades med att kompilera %s"
-#: ../IkiWiki/Plugin/po.pm:989
+#: ../IkiWiki/Plugin/po.pm:1000
msgid "N/A"
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:1000
+#: ../IkiWiki/Plugin/po.pm:1011
#, fuzzy, perl-format
msgid "failed to translate %s"
msgstr "misslyckades med att skriva %s: %s"
-#: ../IkiWiki/Plugin/po.pm:1079
+#: ../IkiWiki/Plugin/po.pm:1090
msgid "removed obsolete PO files"
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:1136 ../IkiWiki/Plugin/po.pm:1148
-#: ../IkiWiki/Plugin/po.pm:1187
+#: ../IkiWiki/Plugin/po.pm:1147 ../IkiWiki/Plugin/po.pm:1159
+#: ../IkiWiki/Plugin/po.pm:1198
#, fuzzy, perl-format
msgid "failed to write %s"
msgstr "misslyckades med att skriva %s: %s"
-#: ../IkiWiki/Plugin/po.pm:1146
+#: ../IkiWiki/Plugin/po.pm:1157
#, fuzzy
msgid "failed to translate"
msgstr "linkmap misslyckades att köra dot"
-#: ../IkiWiki/Plugin/po.pm:1199
+#: ../IkiWiki/Plugin/po.pm:1210
msgid "invalid gettext data, go back to previous page to continue edit"
msgstr ""
+#: ../IkiWiki/Plugin/po.pm:1252
+#, perl-format
+msgid "%s has invalid syntax: must use CODE|NAME"
+msgstr ""
+
#: ../IkiWiki/Plugin/poll.pm:70
msgid "vote"
msgstr "röst"
@@ -807,6 +804,16 @@ msgstr ""
msgid "need either `percent` or `totalpages` and `donepages` parameters"
msgstr ""
+#: ../IkiWiki/Plugin/recentchanges.pm:104
+#, perl-format
+msgid "This reverts commit %s"
+msgstr ""
+
+#: ../IkiWiki/Plugin/recentchanges.pm:123
+#, perl-format
+msgid "confirm reversion of %s"
+msgstr ""
+
#: ../IkiWiki/Plugin/recentchangesdiff.pm:37
msgid "(Diff truncated)"
msgstr ""
@@ -826,12 +833,12 @@ msgstr "%s är låst av %s och kan inte redigeras"
msgid "%s is not a file"
msgstr ""
-#: ../IkiWiki/Plugin/remove.pm:137
+#: ../IkiWiki/Plugin/remove.pm:136
#, perl-format
msgid "confirm removal of %s"
msgstr ""
-#: ../IkiWiki/Plugin/remove.pm:174
+#: ../IkiWiki/Plugin/remove.pm:173
msgid "Please select the attachments to remove."
msgstr ""
@@ -864,29 +871,29 @@ msgstr ""
msgid "%s already exists on disk"
msgstr ""
-#: ../IkiWiki/Plugin/rename.pm:122
+#: ../IkiWiki/Plugin/rename.pm:123
#, fuzzy, perl-format
msgid "rename %s"
msgstr "ritar upp %s"
-#: ../IkiWiki/Plugin/rename.pm:163
+#: ../IkiWiki/Plugin/rename.pm:164
msgid "Also rename SubPages and attachments"
msgstr ""
-#: ../IkiWiki/Plugin/rename.pm:250
+#: ../IkiWiki/Plugin/rename.pm:251
msgid "Only one attachment can be renamed at a time."
msgstr ""
-#: ../IkiWiki/Plugin/rename.pm:253
+#: ../IkiWiki/Plugin/rename.pm:254
msgid "Please select the attachment to rename."
msgstr ""
-#: ../IkiWiki/Plugin/rename.pm:352
+#: ../IkiWiki/Plugin/rename.pm:353
#, perl-format
msgid "rename %s to %s"
msgstr ""
-#: ../IkiWiki/Plugin/rename.pm:577
+#: ../IkiWiki/Plugin/rename.pm:578
#, fuzzy, perl-format
msgid "update for rename of %s to %s"
msgstr "uppdatering av %s, %s av %s"
@@ -928,7 +935,12 @@ msgstr "genväg saknar parameter för namn eller url"
msgid "shortcut %s points to <i>%s</i>"
msgstr "genvägen %s pekar på %s"
-#: ../IkiWiki/Plugin/smiley.pm:43
+#: ../IkiWiki/Plugin/smiley.pm:30
+#, perl-format
+msgid "smiley plugin will not work without %s"
+msgstr ""
+
+#: ../IkiWiki/Plugin/smiley.pm:50
#, fuzzy
msgid "failed to parse any smileys"
msgstr "misslyckades med att tolka smilisar, inaktiverar instick"
@@ -1001,16 +1013,11 @@ msgstr "skapar nya sidan %s"
msgid "missing id parameter"
msgstr "mall saknar id-parameter"
-#: ../IkiWiki/Plugin/template.pm:47
-#, fuzzy, perl-format
-msgid "%s not found"
-msgstr "mallen %s hittades inte"
-
-#: ../IkiWiki/Plugin/teximg.pm:72
+#: ../IkiWiki/Plugin/teximg.pm:73
msgid "missing tex code"
msgstr ""
-#: ../IkiWiki/Plugin/teximg.pm:124
+#: ../IkiWiki/Plugin/teximg.pm:125
#, fuzzy
msgid "failed to generate image from code"
msgstr "misslyckades med att skriva %s: %s"
@@ -1030,26 +1037,26 @@ msgstr ""
msgid "enable %s?"
msgstr ""
-#: ../IkiWiki/Plugin/websetup.pm:272
+#: ../IkiWiki/Plugin/websetup.pm:273
msgid "setup file for this wiki is not known"
msgstr ""
-#: ../IkiWiki/Plugin/websetup.pm:288
+#: ../IkiWiki/Plugin/websetup.pm:289
msgid "main"
msgstr ""
-#: ../IkiWiki/Plugin/websetup.pm:431
+#: ../IkiWiki/Plugin/websetup.pm:433
msgid ""
"The configuration changes shown below require a wiki rebuild to take effect."
msgstr ""
-#: ../IkiWiki/Plugin/websetup.pm:435
+#: ../IkiWiki/Plugin/websetup.pm:437
msgid ""
"For the configuration changes shown below to fully take effect, you may need "
"to rebuild the wiki."
msgstr ""
-#: ../IkiWiki/Plugin/websetup.pm:472
+#: ../IkiWiki/Plugin/websetup.pm:474
#, perl-format
msgid "Error: %s exited nonzero (%s). Discarding setup changes."
msgstr ""
@@ -1059,11 +1066,6 @@ msgstr ""
msgid "cannot determine id of untrusted committer %s"
msgstr ""
-#: ../IkiWiki/Receive.pm:85
-#, fuzzy, perl-format
-msgid "bad file name %s"
-msgstr "hoppar över felaktigt filnamn %s"
-
#: ../IkiWiki/Render.pm:158
#, perl-format
msgid "scanning %s"
@@ -1116,7 +1118,12 @@ msgstr "ritar upp %s, vilken är beroende av %s"
msgid "building %s, to update its backlinks"
msgstr "ritar upp %s, för att uppdatera dess bakåtlänkar"
-#: ../IkiWiki/Render.pm:836
+#: ../IkiWiki/Render.pm:787
+#, fuzzy, perl-format
+msgid "building %s"
+msgstr "redigerar %s"
+
+#: ../IkiWiki/Render.pm:839
#, fuzzy, perl-format
msgid "ikiwiki: cannot build %s"
msgstr "ikiwiki: kan inte rita upp %s"
@@ -1174,38 +1181,38 @@ msgid "wrapper filename not specified"
msgstr "filnamn för wrapper har inte angivits"
#. translators: The parameter is a C filename.
-#: ../IkiWiki/Wrapper.pm:218
+#: ../IkiWiki/Wrapper.pm:219
#, perl-format
msgid "failed to compile %s"
msgstr "misslyckades med att kompilera %s"
#. translators: The parameter is a filename.
-#: ../IkiWiki/Wrapper.pm:238
+#: ../IkiWiki/Wrapper.pm:239
#, perl-format
msgid "successfully generated %s"
msgstr "generering av %s lyckades"
-#: ../ikiwiki.in:13
+#: ../ikiwiki.in:10
msgid "usage: ikiwiki [options] source dest"
msgstr "användning: ikiwiki [flaggor] källa mål"
-#: ../ikiwiki.in:14
+#: ../ikiwiki.in:11
msgid " ikiwiki --setup configfile"
msgstr ""
-#: ../ikiwiki.in:105
+#: ../ikiwiki.in:102
msgid "usage: --set var=value"
msgstr ""
-#: ../ikiwiki.in:112
+#: ../ikiwiki.in:109
msgid "usage: --set-yaml var=value"
msgstr ""
-#: ../ikiwiki.in:218
+#: ../ikiwiki.in:215
msgid "rebuilding wiki.."
msgstr "bygger om wiki.."
-#: ../ikiwiki.in:221
+#: ../ikiwiki.in:218
msgid "refreshing wiki.."
msgstr "uppdaterar wiki.."
@@ -1231,21 +1238,31 @@ msgstr ""
msgid "preprocessing loop detected on %s at depth %i"
msgstr "%s förbehandlingsslinga detekterades på %s, djup %i"
-#: ../IkiWiki.pm:2053
+#: ../IkiWiki.pm:1536
+#, fuzzy, perl-format
+msgid "bad file name %s"
+msgstr "hoppar över felaktigt filnamn %s"
+
+#: ../IkiWiki.pm:1836
+#, perl-format
+msgid "template %s not found"
+msgstr "mallen %s hittades inte"
+
+#: ../IkiWiki.pm:2118
msgid "yes"
msgstr ""
-#: ../IkiWiki.pm:2130
+#: ../IkiWiki.pm:2195
#, fuzzy, perl-format
msgid "invalid sort type %s"
msgstr "okänd sorteringstyp %s"
-#: ../IkiWiki.pm:2151
+#: ../IkiWiki.pm:2216
#, perl-format
msgid "unknown sort type %s"
msgstr "okänd sorteringstyp %s"
-#: ../IkiWiki.pm:2287
+#: ../IkiWiki.pm:2352
#, fuzzy, perl-format
msgid "cannot match pages: %s"
msgstr "kan inte läsa %s: %s"
@@ -1270,6 +1287,10 @@ msgstr ""
msgid "What is the domain name of the web server?"
msgstr ""
+#, fuzzy
+#~ msgid "%s not found"
+#~ msgstr "mallen %s hittades inte"
+
#~ msgid "You need to log in first."
#~ msgstr "Du måste logga in först."
diff --git a/po/tr.po b/po/tr.po
index e1c5f03b5..6b904a945 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ikiwiki 3.20091031\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-04 09:22-0400\n"
+"POT-Creation-Date: 2010-10-23 17:21-0400\n"
"PO-Revision-Date: 2009-11-08 03:04+0200\n"
"Last-Translator: Recai Oktaş <roktas@debian.org>\n"
"Language-Team: Turkish <debian-l10n-turkish@lists.debian.org>\n"
@@ -60,76 +60,80 @@ msgstr ""
msgid "Nothing to do right now, all feeds are up-to-date!"
msgstr ""
-#: ../IkiWiki/Plugin/aggregate.pm:220
+#: ../IkiWiki/Plugin/aggregate.pm:222
#, perl-format
msgid "missing %s parameter"
msgstr "%s parametresi eksik"
-#: ../IkiWiki/Plugin/aggregate.pm:255
+#: ../IkiWiki/Plugin/aggregate.pm:257
msgid "new feed"
msgstr "yeni özet akışı"
-#: ../IkiWiki/Plugin/aggregate.pm:269
+#: ../IkiWiki/Plugin/aggregate.pm:271
msgid "posts"
msgstr "gönderi"
-#: ../IkiWiki/Plugin/aggregate.pm:271
+#: ../IkiWiki/Plugin/aggregate.pm:273
msgid "new"
msgstr "yeni"
-#: ../IkiWiki/Plugin/aggregate.pm:455
+#: ../IkiWiki/Plugin/aggregate.pm:457
#, perl-format
msgid "expiring %s (%s days old)"
msgstr "%s için zaman aşımı (%s gün eski)"
-#: ../IkiWiki/Plugin/aggregate.pm:462
+#: ../IkiWiki/Plugin/aggregate.pm:464
#, perl-format
msgid "expiring %s"
msgstr "%s için zaman aşımı"
-#: ../IkiWiki/Plugin/aggregate.pm:489
+#: ../IkiWiki/Plugin/aggregate.pm:491
#, perl-format
msgid "last checked %s"
msgstr "son güncelleme: %s"
-#: ../IkiWiki/Plugin/aggregate.pm:493
+#: ../IkiWiki/Plugin/aggregate.pm:495
#, perl-format
msgid "checking feed %s ..."
msgstr "%s özet akışı denetleniyor ..."
-#: ../IkiWiki/Plugin/aggregate.pm:498
+#: ../IkiWiki/Plugin/aggregate.pm:500
#, perl-format
msgid "could not find feed at %s"
msgstr "%s özet akışı bulunamadı"
-#: ../IkiWiki/Plugin/aggregate.pm:517
+#: ../IkiWiki/Plugin/aggregate.pm:519
msgid "feed not found"
msgstr "özet akışı bulunamadı"
-#: ../IkiWiki/Plugin/aggregate.pm:528
+#: ../IkiWiki/Plugin/aggregate.pm:530
#, perl-format
msgid "(invalid UTF-8 stripped from feed)"
msgstr "(geçersiz UTF-8 dizgisi özet akışından çıkarıldı)"
-#: ../IkiWiki/Plugin/aggregate.pm:536
+#: ../IkiWiki/Plugin/aggregate.pm:538
#, perl-format
msgid "(feed entities escaped)"
msgstr "(özet akışı girdileri işlendi)"
-#: ../IkiWiki/Plugin/aggregate.pm:544
+#: ../IkiWiki/Plugin/aggregate.pm:546
msgid "feed crashed XML::Feed!"
msgstr "özet akışı XML::Feed'in çakılmasına yol açtı!"
-#: ../IkiWiki/Plugin/aggregate.pm:630
+#: ../IkiWiki/Plugin/aggregate.pm:632
#, perl-format
msgid "creating new page %s"
msgstr "%s için yeni sayfa oluşturuluyor"
+#: ../IkiWiki/Plugin/aggregate.pm:652 ../IkiWiki/Plugin/edittemplate.pm:133
+msgid "failed to process template:"
+msgstr ""
+
#: ../IkiWiki/Plugin/amazon_s3.pm:31
msgid "deleting bucket.."
msgstr ""
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:229
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:226
msgid "done"
msgstr ""
@@ -171,7 +175,7 @@ msgstr ""
msgid "automatic index generation"
msgstr ""
-#: ../IkiWiki/Plugin/blogspam.pm:110
+#: ../IkiWiki/Plugin/blogspam.pm:112
msgid ""
"Sorry, but that looks like spam to <a href=\"http://blogspam.net/"
"\">blogspam</a>: "
@@ -248,7 +252,7 @@ msgstr ""
msgid "Added a comment: %s"
msgstr ""
-#: ../IkiWiki/Plugin/comments.pm:573 ../IkiWiki/Plugin/websetup.pm:268
+#: ../IkiWiki/Plugin/comments.pm:573 ../IkiWiki/Plugin/websetup.pm:269
msgid "you are not logged in as an admin"
msgstr ""
@@ -274,18 +278,18 @@ msgstr[1] ""
msgid "Comment"
msgstr ""
-#: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:31
-#: ../IkiWiki/Plugin/cutpaste.pm:46 ../IkiWiki/Plugin/cutpaste.pm:62
+#: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:46
+#: ../IkiWiki/Plugin/cutpaste.pm:60 ../IkiWiki/Plugin/cutpaste.pm:75
#: ../IkiWiki/Plugin/testpagespec.pm:26
#, perl-format
msgid "%s parameter is required"
msgstr ""
-#: ../IkiWiki/Plugin/cutpaste.pm:67
+#: ../IkiWiki/Plugin/cutpaste.pm:80
msgid "no text was copied in this page"
msgstr ""
-#: ../IkiWiki/Plugin/cutpaste.pm:70
+#: ../IkiWiki/Plugin/cutpaste.pm:83
#, perl-format
msgid "no text was copied in this page with id %s"
msgstr ""
@@ -312,24 +316,19 @@ msgstr ""
msgid "editing %s"
msgstr ""
-#: ../IkiWiki/Plugin/edittemplate.pm:52
+#: ../IkiWiki/Plugin/edittemplate.pm:54
msgid "template not specified"
msgstr ""
-#: ../IkiWiki/Plugin/edittemplate.pm:55
+#: ../IkiWiki/Plugin/edittemplate.pm:57
msgid "match not specified"
msgstr ""
-#: ../IkiWiki/Plugin/edittemplate.pm:70
+#: ../IkiWiki/Plugin/edittemplate.pm:72
#, perl-format
msgid "edittemplate %s registered for %s"
msgstr ""
-#: ../IkiWiki/Plugin/edittemplate.pm:131 ../IkiWiki/Plugin/inline.pm:339
-#: ../IkiWiki/Plugin/template.pm:44
-msgid "failed to process template:"
-msgstr ""
-
#: ../IkiWiki/Plugin/format.pm:30
msgid "must specify format and text"
msgstr ""
@@ -356,23 +355,31 @@ msgstr ""
msgid "%s is an attachment, not a page."
msgstr ""
-#: ../IkiWiki/Plugin/git.pm:742 ../IkiWiki/Plugin/git.pm:760
-#: ../IkiWiki/Receive.pm:129
+#: ../IkiWiki/Plugin/git.pm:764 ../IkiWiki/Plugin/git.pm:827
+#: ../IkiWiki.pm:1580
#, perl-format
msgid "you are not allowed to change %s"
msgstr ""
-#: ../IkiWiki/Plugin/git.pm:782
+#: ../IkiWiki/Plugin/git.pm:786
#, perl-format
msgid "you cannot act on a file with mode %s"
msgstr ""
-#: ../IkiWiki/Plugin/git.pm:786
+#: ../IkiWiki/Plugin/git.pm:790
msgid "you are not allowed to change file modes"
msgstr ""
-#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:137
-#: ../IkiWiki/Plugin/search.pm:38
+#: ../IkiWiki/Plugin/git.pm:861
+msgid "you are not allowed to revert a merge"
+msgstr ""
+
+#: ../IkiWiki/Plugin/git.pm:877
+#, perl-format
+msgid "Failed to revert commit %s"
+msgstr ""
+
+#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/search.pm:38
#, perl-format
msgid "Must specify %s when using the %s plugin"
msgstr ""
@@ -385,22 +392,22 @@ msgstr ""
msgid "prog not a valid graphviz program"
msgstr ""
-#: ../IkiWiki/Plugin/highlight.pm:48
+#: ../IkiWiki/Plugin/highlight.pm:64
#, perl-format
msgid "tohighlight contains unknown file type '%s'"
msgstr ""
-#: ../IkiWiki/Plugin/highlight.pm:59
+#: ../IkiWiki/Plugin/highlight.pm:75
#, perl-format
msgid "Source code: %s"
msgstr ""
-#: ../IkiWiki/Plugin/highlight.pm:124
+#: ../IkiWiki/Plugin/highlight.pm:140
msgid ""
"warning: highlight perl module not available; falling back to pass through"
msgstr ""
-#: ../IkiWiki/Plugin/htmltidy.pm:50
+#: ../IkiWiki/Plugin/htmltidy.pm:62
msgid "htmltidy failed to parse this html"
msgstr ""
@@ -449,12 +456,12 @@ msgstr ""
msgid "Add a new post titled:"
msgstr ""
-#: ../IkiWiki/Plugin/inline.pm:342
+#: ../IkiWiki/Plugin/inline.pm:339 ../IkiWiki/Plugin/template.pm:44
#, perl-format
-msgid "template %s not found"
+msgid "failed to process template %s"
msgstr ""
-#: ../IkiWiki/Plugin/inline.pm:633
+#: ../IkiWiki/Plugin/inline.pm:630
msgid "RPC::XML::Client not found, not pinging"
msgstr ""
@@ -481,19 +488,19 @@ msgstr ""
msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)"
msgstr ""
-#: ../IkiWiki/Plugin/meta.pm:174
+#: ../IkiWiki/Plugin/meta.pm:175
msgid "stylesheet not found"
msgstr ""
-#: ../IkiWiki/Plugin/meta.pm:212
+#: ../IkiWiki/Plugin/meta.pm:217
msgid "redir page not found"
msgstr ""
-#: ../IkiWiki/Plugin/meta.pm:226
+#: ../IkiWiki/Plugin/meta.pm:231
msgid "redir cycle is not allowed"
msgstr ""
-#: ../IkiWiki/Plugin/meta.pm:395
+#: ../IkiWiki/Plugin/meta.pm:400
msgid "sort=meta requires a parameter"
msgstr ""
@@ -566,21 +573,21 @@ msgstr ""
msgid "Ping received."
msgstr ""
-#: ../IkiWiki/Plugin/pinger.pm:53
+#: ../IkiWiki/Plugin/pinger.pm:54
msgid "requires 'from' and 'to' parameters"
msgstr ""
-#: ../IkiWiki/Plugin/pinger.pm:58
+#: ../IkiWiki/Plugin/pinger.pm:59
#, perl-format
msgid "Will ping %s"
msgstr ""
-#: ../IkiWiki/Plugin/pinger.pm:61
+#: ../IkiWiki/Plugin/pinger.pm:62
#, perl-format
msgid "Ignoring ping directive for wiki %s (this wiki is %s)"
msgstr ""
-#: ../IkiWiki/Plugin/pinger.pm:77
+#: ../IkiWiki/Plugin/pinger.pm:78
msgid "LWP not found, not pinging"
msgstr ""
@@ -588,101 +595,91 @@ msgstr ""
msgid "warning: Old po4a detected! Recommend upgrade to 0.35."
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:147
-#, perl-format
-msgid "%s has invalid syntax: must use CODE|NAME"
-msgstr ""
-
-#: ../IkiWiki/Plugin/po.pm:166
+#: ../IkiWiki/Plugin/po.pm:175
#, perl-format
msgid "%s is not a valid language code"
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:178
+#: ../IkiWiki/Plugin/po.pm:187
#, perl-format
msgid ""
"%s is not a valid value for po_link_to, falling back to po_link_to=default"
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:183
+#: ../IkiWiki/Plugin/po.pm:192
msgid ""
"po_link_to=negotiated requires usedirs to be enabled, falling back to "
"po_link_to=default"
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:414
-#, perl-format
-msgid "rebuilding all pages to fix meta titles"
-msgstr ""
-
-#: ../IkiWiki/Plugin/po.pm:418 ../IkiWiki/Render.pm:784
-#, perl-format
-msgid "building %s"
-msgstr ""
-
-#: ../IkiWiki/Plugin/po.pm:456
+#: ../IkiWiki/Plugin/po.pm:455
msgid "updated PO files"
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:479
+#: ../IkiWiki/Plugin/po.pm:478
msgid ""
"Can not remove a translation. If the master page is removed, however, its "
"translations will be removed as well."
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:499
+#: ../IkiWiki/Plugin/po.pm:498
msgid ""
"Can not rename a translation. If the master page is renamed, however, its "
"translations will be renamed as well."
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:924
+#: ../IkiWiki/Plugin/po.pm:935
#, perl-format
msgid "POT file (%s) does not exist"
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:938
+#: ../IkiWiki/Plugin/po.pm:949
#, perl-format
msgid "failed to copy underlay PO file to %s"
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:947
+#: ../IkiWiki/Plugin/po.pm:958
#, perl-format
msgid "failed to update %s"
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:953
+#: ../IkiWiki/Plugin/po.pm:964
#, perl-format
msgid "failed to copy the POT file to %s"
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:989
+#: ../IkiWiki/Plugin/po.pm:1000
msgid "N/A"
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:1000
+#: ../IkiWiki/Plugin/po.pm:1011
#, perl-format
msgid "failed to translate %s"
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:1079
+#: ../IkiWiki/Plugin/po.pm:1090
msgid "removed obsolete PO files"
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:1136 ../IkiWiki/Plugin/po.pm:1148
-#: ../IkiWiki/Plugin/po.pm:1187
+#: ../IkiWiki/Plugin/po.pm:1147 ../IkiWiki/Plugin/po.pm:1159
+#: ../IkiWiki/Plugin/po.pm:1198
#, perl-format
msgid "failed to write %s"
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:1146
+#: ../IkiWiki/Plugin/po.pm:1157
msgid "failed to translate"
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:1199
+#: ../IkiWiki/Plugin/po.pm:1210
msgid "invalid gettext data, go back to previous page to continue edit"
msgstr ""
+#: ../IkiWiki/Plugin/po.pm:1252
+#, perl-format
+msgid "%s has invalid syntax: must use CODE|NAME"
+msgstr ""
+
#: ../IkiWiki/Plugin/poll.pm:70
msgid "vote"
msgstr ""
@@ -780,6 +777,16 @@ msgstr ""
msgid "need either `percent` or `totalpages` and `donepages` parameters"
msgstr ""
+#: ../IkiWiki/Plugin/recentchanges.pm:104
+#, perl-format
+msgid "This reverts commit %s"
+msgstr ""
+
+#: ../IkiWiki/Plugin/recentchanges.pm:123
+#, perl-format
+msgid "confirm reversion of %s"
+msgstr ""
+
#: ../IkiWiki/Plugin/recentchangesdiff.pm:37
msgid "(Diff truncated)"
msgstr ""
@@ -799,12 +806,12 @@ msgstr ""
msgid "%s is not a file"
msgstr ""
-#: ../IkiWiki/Plugin/remove.pm:137
+#: ../IkiWiki/Plugin/remove.pm:136
#, perl-format
msgid "confirm removal of %s"
msgstr ""
-#: ../IkiWiki/Plugin/remove.pm:174
+#: ../IkiWiki/Plugin/remove.pm:173
msgid "Please select the attachments to remove."
msgstr ""
@@ -836,29 +843,29 @@ msgstr ""
msgid "%s already exists on disk"
msgstr ""
-#: ../IkiWiki/Plugin/rename.pm:122
+#: ../IkiWiki/Plugin/rename.pm:123
#, perl-format
msgid "rename %s"
msgstr ""
-#: ../IkiWiki/Plugin/rename.pm:163
+#: ../IkiWiki/Plugin/rename.pm:164
msgid "Also rename SubPages and attachments"
msgstr ""
-#: ../IkiWiki/Plugin/rename.pm:250
+#: ../IkiWiki/Plugin/rename.pm:251
msgid "Only one attachment can be renamed at a time."
msgstr ""
-#: ../IkiWiki/Plugin/rename.pm:253
+#: ../IkiWiki/Plugin/rename.pm:254
msgid "Please select the attachment to rename."
msgstr ""
-#: ../IkiWiki/Plugin/rename.pm:352
+#: ../IkiWiki/Plugin/rename.pm:353
#, perl-format
msgid "rename %s to %s"
msgstr ""
-#: ../IkiWiki/Plugin/rename.pm:577
+#: ../IkiWiki/Plugin/rename.pm:578
#, perl-format
msgid "update for rename of %s to %s"
msgstr ""
@@ -899,7 +906,12 @@ msgstr ""
msgid "shortcut %s points to <i>%s</i>"
msgstr ""
-#: ../IkiWiki/Plugin/smiley.pm:43
+#: ../IkiWiki/Plugin/smiley.pm:30
+#, perl-format
+msgid "smiley plugin will not work without %s"
+msgstr ""
+
+#: ../IkiWiki/Plugin/smiley.pm:50
msgid "failed to parse any smileys"
msgstr ""
@@ -965,16 +977,11 @@ msgstr "%s için yeni sayfa oluşturuluyor"
msgid "missing id parameter"
msgstr ""
-#: ../IkiWiki/Plugin/template.pm:47
-#, fuzzy, perl-format
-msgid "%s not found"
-msgstr "özet akışı bulunamadı"
-
-#: ../IkiWiki/Plugin/teximg.pm:72
+#: ../IkiWiki/Plugin/teximg.pm:73
msgid "missing tex code"
msgstr ""
-#: ../IkiWiki/Plugin/teximg.pm:124
+#: ../IkiWiki/Plugin/teximg.pm:125
msgid "failed to generate image from code"
msgstr ""
@@ -993,26 +1000,26 @@ msgstr ""
msgid "enable %s?"
msgstr ""
-#: ../IkiWiki/Plugin/websetup.pm:272
+#: ../IkiWiki/Plugin/websetup.pm:273
msgid "setup file for this wiki is not known"
msgstr ""
-#: ../IkiWiki/Plugin/websetup.pm:288
+#: ../IkiWiki/Plugin/websetup.pm:289
msgid "main"
msgstr ""
-#: ../IkiWiki/Plugin/websetup.pm:431
+#: ../IkiWiki/Plugin/websetup.pm:433
msgid ""
"The configuration changes shown below require a wiki rebuild to take effect."
msgstr ""
-#: ../IkiWiki/Plugin/websetup.pm:435
+#: ../IkiWiki/Plugin/websetup.pm:437
msgid ""
"For the configuration changes shown below to fully take effect, you may need "
"to rebuild the wiki."
msgstr ""
-#: ../IkiWiki/Plugin/websetup.pm:472
+#: ../IkiWiki/Plugin/websetup.pm:474
#, perl-format
msgid "Error: %s exited nonzero (%s). Discarding setup changes."
msgstr ""
@@ -1022,11 +1029,6 @@ msgstr ""
msgid "cannot determine id of untrusted committer %s"
msgstr ""
-#: ../IkiWiki/Receive.pm:85
-#, perl-format
-msgid "bad file name %s"
-msgstr ""
-
#: ../IkiWiki/Render.pm:158
#, perl-format
msgid "scanning %s"
@@ -1079,7 +1081,12 @@ msgstr ""
msgid "building %s, to update its backlinks"
msgstr ""
-#: ../IkiWiki/Render.pm:836
+#: ../IkiWiki/Render.pm:787
+#, perl-format
+msgid "building %s"
+msgstr ""
+
+#: ../IkiWiki/Render.pm:839
#, perl-format
msgid "ikiwiki: cannot build %s"
msgstr ""
@@ -1137,38 +1144,38 @@ msgid "wrapper filename not specified"
msgstr ""
#. translators: The parameter is a C filename.
-#: ../IkiWiki/Wrapper.pm:218
+#: ../IkiWiki/Wrapper.pm:219
#, perl-format
msgid "failed to compile %s"
msgstr ""
#. translators: The parameter is a filename.
-#: ../IkiWiki/Wrapper.pm:238
+#: ../IkiWiki/Wrapper.pm:239
#, perl-format
msgid "successfully generated %s"
msgstr ""
-#: ../ikiwiki.in:13
+#: ../ikiwiki.in:10
msgid "usage: ikiwiki [options] source dest"
msgstr ""
-#: ../ikiwiki.in:14
+#: ../ikiwiki.in:11
msgid " ikiwiki --setup configfile"
msgstr ""
-#: ../ikiwiki.in:105
+#: ../ikiwiki.in:102
msgid "usage: --set var=value"
msgstr ""
-#: ../ikiwiki.in:112
+#: ../ikiwiki.in:109
msgid "usage: --set-yaml var=value"
msgstr ""
-#: ../ikiwiki.in:218
+#: ../ikiwiki.in:215
msgid "rebuilding wiki.."
msgstr ""
-#: ../ikiwiki.in:221
+#: ../ikiwiki.in:218
msgid "refreshing wiki.."
msgstr ""
@@ -1194,21 +1201,31 @@ msgstr ""
msgid "preprocessing loop detected on %s at depth %i"
msgstr ""
-#: ../IkiWiki.pm:2053
+#: ../IkiWiki.pm:1536
+#, perl-format
+msgid "bad file name %s"
+msgstr ""
+
+#: ../IkiWiki.pm:1836
+#, perl-format
+msgid "template %s not found"
+msgstr ""
+
+#: ../IkiWiki.pm:2118
msgid "yes"
msgstr ""
-#: ../IkiWiki.pm:2130
+#: ../IkiWiki.pm:2195
#, perl-format
msgid "invalid sort type %s"
msgstr ""
-#: ../IkiWiki.pm:2151
+#: ../IkiWiki.pm:2216
#, perl-format
msgid "unknown sort type %s"
msgstr ""
-#: ../IkiWiki.pm:2287
+#: ../IkiWiki.pm:2352
#, perl-format
msgid "cannot match pages: %s"
msgstr ""
@@ -1233,5 +1250,9 @@ msgstr ""
msgid "What is the domain name of the web server?"
msgstr ""
+#, fuzzy
+#~ msgid "%s not found"
+#~ msgstr "özet akışı bulunamadı"
+
#~ msgid "You need to log in first."
#~ msgstr "Önce sisteme giriş yapmanız gerekiyor."
diff --git a/po/underlay.setup b/po/underlay.setup
index 8d3516cff..ebe7251cf 100644
--- a/po/underlay.setup
+++ b/po/underlay.setup
@@ -6,14 +6,14 @@ use IkiWiki::Setup::Standard {
# List here all languages that have translations.
# Listing languages without active translations
# will excessively bloat things.
- po_slave_languages => {
- 'es' => 'Español',
- 'de' => 'Deutsch',
- 'fr' => 'Français',
- 'da' => 'Dansk',
- 'cs' => 'česky',
- },
- po_master_language => { 'code' => 'en', 'name' => 'English' },
+ po_slave_languages => [
+ 'es|Español',
+ 'de|Deutsch',
+ 'fr|Français',
+ 'da|Dansk',
+ 'cs|česky',
+ ],
+ po_master_language => 'en|English',
po_translatable_pages => "*",
add_plugins => [qw{po}],
diff --git a/po/vi.po b/po/vi.po
index b22f16418..619509c4c 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ikiwiki\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-04 09:22-0400\n"
+"POT-Creation-Date: 2010-10-23 17:21-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"
@@ -64,77 +64,82 @@ msgstr ""
msgid "Nothing to do right now, all feeds are up-to-date!"
msgstr ""
-#: ../IkiWiki/Plugin/aggregate.pm:220
+#: ../IkiWiki/Plugin/aggregate.pm:222
#, fuzzy, perl-format
msgid "missing %s parameter"
msgstr "mẫu thiếu tham số id"
-#: ../IkiWiki/Plugin/aggregate.pm:255
+#: ../IkiWiki/Plugin/aggregate.pm:257
msgid "new feed"
msgstr "nguồn tin mới"
-#: ../IkiWiki/Plugin/aggregate.pm:269
+#: ../IkiWiki/Plugin/aggregate.pm:271
msgid "posts"
msgstr "bài"
-#: ../IkiWiki/Plugin/aggregate.pm:271
+#: ../IkiWiki/Plugin/aggregate.pm:273
msgid "new"
msgstr "mới"
-#: ../IkiWiki/Plugin/aggregate.pm:455
+#: ../IkiWiki/Plugin/aggregate.pm:457
#, perl-format
msgid "expiring %s (%s days old)"
msgstr "đang mãn hạn %s (cũ %s ngày)"
-#: ../IkiWiki/Plugin/aggregate.pm:462
+#: ../IkiWiki/Plugin/aggregate.pm:464
#, perl-format
msgid "expiring %s"
msgstr "đang mãn hạn %s"
-#: ../IkiWiki/Plugin/aggregate.pm:489
+#: ../IkiWiki/Plugin/aggregate.pm:491
#, perl-format
msgid "last checked %s"
msgstr ""
-#: ../IkiWiki/Plugin/aggregate.pm:493
+#: ../IkiWiki/Plugin/aggregate.pm:495
#, perl-format
msgid "checking feed %s ..."
msgstr "đang kiểm tra nguồn tin %s ..."
-#: ../IkiWiki/Plugin/aggregate.pm:498
+#: ../IkiWiki/Plugin/aggregate.pm:500
#, perl-format
msgid "could not find feed at %s"
msgstr "không tìm thấy nguồn tin ở %s"
-#: ../IkiWiki/Plugin/aggregate.pm:517
+#: ../IkiWiki/Plugin/aggregate.pm:519
#, fuzzy
msgid "feed not found"
msgstr "không tìm thấy mẫu %s"
-#: ../IkiWiki/Plugin/aggregate.pm:528
+#: ../IkiWiki/Plugin/aggregate.pm:530
#, perl-format
msgid "(invalid UTF-8 stripped from feed)"
msgstr ""
-#: ../IkiWiki/Plugin/aggregate.pm:536
+#: ../IkiWiki/Plugin/aggregate.pm:538
#, perl-format
msgid "(feed entities escaped)"
msgstr ""
-#: ../IkiWiki/Plugin/aggregate.pm:544
+#: ../IkiWiki/Plugin/aggregate.pm:546
msgid "feed crashed XML::Feed!"
msgstr "nguồn tin đã gây ra XML::Feed sụp đổ."
-#: ../IkiWiki/Plugin/aggregate.pm:630
+#: ../IkiWiki/Plugin/aggregate.pm:632
#, perl-format
msgid "creating new page %s"
msgstr "đang tạo trang mới %s"
+#: ../IkiWiki/Plugin/aggregate.pm:652 ../IkiWiki/Plugin/edittemplate.pm:133
+#, fuzzy
+msgid "failed to process template:"
+msgstr "mẫu không xử lý được:"
+
#: ../IkiWiki/Plugin/amazon_s3.pm:31
msgid "deleting bucket.."
msgstr ""
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:229
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:226
msgid "done"
msgstr "xong"
@@ -179,7 +184,7 @@ msgstr ""
msgid "automatic index generation"
msgstr ""
-#: ../IkiWiki/Plugin/blogspam.pm:110
+#: ../IkiWiki/Plugin/blogspam.pm:112
msgid ""
"Sorry, but that looks like spam to <a href=\"http://blogspam.net/"
"\">blogspam</a>: "
@@ -256,7 +261,7 @@ msgstr ""
msgid "Added a comment: %s"
msgstr ""
-#: ../IkiWiki/Plugin/comments.pm:573 ../IkiWiki/Plugin/websetup.pm:268
+#: ../IkiWiki/Plugin/comments.pm:573 ../IkiWiki/Plugin/websetup.pm:269
msgid "you are not logged in as an admin"
msgstr ""
@@ -281,18 +286,18 @@ msgstr[0] ""
msgid "Comment"
msgstr ""
-#: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:31
-#: ../IkiWiki/Plugin/cutpaste.pm:46 ../IkiWiki/Plugin/cutpaste.pm:62
+#: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:46
+#: ../IkiWiki/Plugin/cutpaste.pm:60 ../IkiWiki/Plugin/cutpaste.pm:75
#: ../IkiWiki/Plugin/testpagespec.pm:26
#, perl-format
msgid "%s parameter is required"
msgstr ""
-#: ../IkiWiki/Plugin/cutpaste.pm:67
+#: ../IkiWiki/Plugin/cutpaste.pm:80
msgid "no text was copied in this page"
msgstr ""
-#: ../IkiWiki/Plugin/cutpaste.pm:70
+#: ../IkiWiki/Plugin/cutpaste.pm:83
#, perl-format
msgid "no text was copied in this page with id %s"
msgstr ""
@@ -319,27 +324,21 @@ msgstr "đang tạo %s"
msgid "editing %s"
msgstr "đang sửa %s"
-#: ../IkiWiki/Plugin/edittemplate.pm:52
+#: ../IkiWiki/Plugin/edittemplate.pm:54
#, fuzzy
msgid "template not specified"
msgstr "không tìm thấy mẫu %s"
-#: ../IkiWiki/Plugin/edittemplate.pm:55
+#: ../IkiWiki/Plugin/edittemplate.pm:57
#, fuzzy
msgid "match not specified"
msgstr "chưa xác định tên tập tin bộ bao bọc"
-#: ../IkiWiki/Plugin/edittemplate.pm:70
+#: ../IkiWiki/Plugin/edittemplate.pm:72
#, perl-format
msgid "edittemplate %s registered for %s"
msgstr ""
-#: ../IkiWiki/Plugin/edittemplate.pm:131 ../IkiWiki/Plugin/inline.pm:339
-#: ../IkiWiki/Plugin/template.pm:44
-#, fuzzy
-msgid "failed to process template:"
-msgstr "mẫu không xử lý được:"
-
#: ../IkiWiki/Plugin/format.pm:30
msgid "must specify format and text"
msgstr ""
@@ -368,23 +367,31 @@ msgstr "không thể đọc %s: %s"
msgid "%s is an attachment, not a page."
msgstr ""
-#: ../IkiWiki/Plugin/git.pm:742 ../IkiWiki/Plugin/git.pm:760
-#: ../IkiWiki/Receive.pm:129
+#: ../IkiWiki/Plugin/git.pm:764 ../IkiWiki/Plugin/git.pm:827
+#: ../IkiWiki.pm:1580
#, perl-format
msgid "you are not allowed to change %s"
msgstr ""
-#: ../IkiWiki/Plugin/git.pm:782
+#: ../IkiWiki/Plugin/git.pm:786
#, perl-format
msgid "you cannot act on a file with mode %s"
msgstr ""
-#: ../IkiWiki/Plugin/git.pm:786
+#: ../IkiWiki/Plugin/git.pm:790
msgid "you are not allowed to change file modes"
msgstr ""
-#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:137
-#: ../IkiWiki/Plugin/search.pm:38
+#: ../IkiWiki/Plugin/git.pm:861
+msgid "you are not allowed to revert a merge"
+msgstr ""
+
+#: ../IkiWiki/Plugin/git.pm:877
+#, fuzzy, perl-format
+msgid "Failed to revert commit %s"
+msgstr "lỗi biên dịch %s"
+
+#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/search.pm:38
#, fuzzy, perl-format
msgid "Must specify %s when using the %s plugin"
msgstr "Cần phải xác định %s khi dùng bổ sung tìm kiếm"
@@ -398,22 +405,22 @@ msgstr "linkmap không chạy dot được"
msgid "prog not a valid graphviz program"
msgstr ""
-#: ../IkiWiki/Plugin/highlight.pm:48
+#: ../IkiWiki/Plugin/highlight.pm:64
#, perl-format
msgid "tohighlight contains unknown file type '%s'"
msgstr ""
-#: ../IkiWiki/Plugin/highlight.pm:59
+#: ../IkiWiki/Plugin/highlight.pm:75
#, perl-format
msgid "Source code: %s"
msgstr ""
-#: ../IkiWiki/Plugin/highlight.pm:124
+#: ../IkiWiki/Plugin/highlight.pm:140
msgid ""
"warning: highlight perl module not available; falling back to pass through"
msgstr ""
-#: ../IkiWiki/Plugin/htmltidy.pm:50
+#: ../IkiWiki/Plugin/htmltidy.pm:62
#, fuzzy
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"
@@ -468,12 +475,12 @@ msgstr ""
msgid "Add a new post titled:"
msgstr ""
-#: ../IkiWiki/Plugin/inline.pm:342
-#, perl-format
-msgid "template %s not found"
-msgstr "không tìm thấy mẫu %s"
+#: ../IkiWiki/Plugin/inline.pm:339 ../IkiWiki/Plugin/template.pm:44
+#, fuzzy, perl-format
+msgid "failed to process template %s"
+msgstr "mẫu không xử lý được:"
-#: ../IkiWiki/Plugin/inline.pm:633
+#: ../IkiWiki/Plugin/inline.pm:630
msgid "RPC::XML::Client not found, not pinging"
msgstr "Không tìm thấy RPC::XML::Client nên không gửi gói tin ping"
@@ -501,22 +508,22 @@ msgstr ""
msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)"
msgstr "lỗi nạp mô-đun perl Markdown.pm (%s) hay « /usr/bin/markdown » (%s)"
-#: ../IkiWiki/Plugin/meta.pm:174
+#: ../IkiWiki/Plugin/meta.pm:175
#, fuzzy
msgid "stylesheet not found"
msgstr "không tìm thấy mẫu %s"
-#: ../IkiWiki/Plugin/meta.pm:212
+#: ../IkiWiki/Plugin/meta.pm:217
#, fuzzy
msgid "redir page not found"
msgstr "không tìm thấy mẫu %s"
-#: ../IkiWiki/Plugin/meta.pm:226
+#: ../IkiWiki/Plugin/meta.pm:231
#, fuzzy
msgid "redir cycle is not allowed"
msgstr "không tìm thấy mẫu %s"
-#: ../IkiWiki/Plugin/meta.pm:395
+#: ../IkiWiki/Plugin/meta.pm:400
msgid "sort=meta requires a parameter"
msgstr ""
@@ -590,21 +597,21 @@ msgstr ""
msgid "Ping received."
msgstr ""
-#: ../IkiWiki/Plugin/pinger.pm:53
+#: ../IkiWiki/Plugin/pinger.pm:54
msgid "requires 'from' and 'to' parameters"
msgstr ""
-#: ../IkiWiki/Plugin/pinger.pm:58
+#: ../IkiWiki/Plugin/pinger.pm:59
#, fuzzy, perl-format
msgid "Will ping %s"
msgstr "đang sửa %s"
-#: ../IkiWiki/Plugin/pinger.pm:61
+#: ../IkiWiki/Plugin/pinger.pm:62
#, perl-format
msgid "Ignoring ping directive for wiki %s (this wiki is %s)"
msgstr ""
-#: ../IkiWiki/Plugin/pinger.pm:77
+#: ../IkiWiki/Plugin/pinger.pm:78
#, fuzzy
msgid "LWP not found, not pinging"
msgstr "Không tìm thấy RPC::XML::Client nên không gửi gói tin ping"
@@ -613,102 +620,92 @@ msgstr "Không tìm thấy RPC::XML::Client nên không gửi gói tin ping"
msgid "warning: Old po4a detected! Recommend upgrade to 0.35."
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:147
-#, perl-format
-msgid "%s has invalid syntax: must use CODE|NAME"
-msgstr ""
-
-#: ../IkiWiki/Plugin/po.pm:166
+#: ../IkiWiki/Plugin/po.pm:175
#, perl-format
msgid "%s is not a valid language code"
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:178
+#: ../IkiWiki/Plugin/po.pm:187
#, perl-format
msgid ""
"%s is not a valid value for po_link_to, falling back to po_link_to=default"
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:183
+#: ../IkiWiki/Plugin/po.pm:192
msgid ""
"po_link_to=negotiated requires usedirs to be enabled, falling back to "
"po_link_to=default"
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:414
-#, perl-format
-msgid "rebuilding all pages to fix meta titles"
-msgstr ""
-
-#: ../IkiWiki/Plugin/po.pm:418 ../IkiWiki/Render.pm:784
-#, fuzzy, perl-format
-msgid "building %s"
-msgstr "đang sửa %s"
-
-#: ../IkiWiki/Plugin/po.pm:456
+#: ../IkiWiki/Plugin/po.pm:455
msgid "updated PO files"
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:479
+#: ../IkiWiki/Plugin/po.pm:478
msgid ""
"Can not remove a translation. If the master page is removed, however, its "
"translations will be removed as well."
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:499
+#: ../IkiWiki/Plugin/po.pm:498
msgid ""
"Can not rename a translation. If the master page is renamed, however, its "
"translations will be renamed as well."
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:924
+#: ../IkiWiki/Plugin/po.pm:935
#, perl-format
msgid "POT file (%s) does not exist"
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:938
+#: ../IkiWiki/Plugin/po.pm:949
#, fuzzy, perl-format
msgid "failed to copy underlay PO file to %s"
msgstr "lỗi biên dịch %s"
-#: ../IkiWiki/Plugin/po.pm:947
+#: ../IkiWiki/Plugin/po.pm:958
#, fuzzy, perl-format
msgid "failed to update %s"
msgstr "lỗi biên dịch %s"
-#: ../IkiWiki/Plugin/po.pm:953
+#: ../IkiWiki/Plugin/po.pm:964
#, fuzzy, perl-format
msgid "failed to copy the POT file to %s"
msgstr "lỗi biên dịch %s"
-#: ../IkiWiki/Plugin/po.pm:989
+#: ../IkiWiki/Plugin/po.pm:1000
msgid "N/A"
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:1000
+#: ../IkiWiki/Plugin/po.pm:1011
#, fuzzy, perl-format
msgid "failed to translate %s"
msgstr "lỗi ghi %s: %s"
-#: ../IkiWiki/Plugin/po.pm:1079
+#: ../IkiWiki/Plugin/po.pm:1090
msgid "removed obsolete PO files"
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:1136 ../IkiWiki/Plugin/po.pm:1148
-#: ../IkiWiki/Plugin/po.pm:1187
+#: ../IkiWiki/Plugin/po.pm:1147 ../IkiWiki/Plugin/po.pm:1159
+#: ../IkiWiki/Plugin/po.pm:1198
#, fuzzy, perl-format
msgid "failed to write %s"
msgstr "lỗi ghi %s: %s"
-#: ../IkiWiki/Plugin/po.pm:1146
+#: ../IkiWiki/Plugin/po.pm:1157
#, fuzzy
msgid "failed to translate"
msgstr "linkmap không chạy dot được"
-#: ../IkiWiki/Plugin/po.pm:1199
+#: ../IkiWiki/Plugin/po.pm:1210
msgid "invalid gettext data, go back to previous page to continue edit"
msgstr ""
+#: ../IkiWiki/Plugin/po.pm:1252
+#, perl-format
+msgid "%s has invalid syntax: must use CODE|NAME"
+msgstr ""
+
#: ../IkiWiki/Plugin/poll.pm:70
msgid "vote"
msgstr "bỏ phiếu"
@@ -807,6 +804,16 @@ msgstr ""
msgid "need either `percent` or `totalpages` and `donepages` parameters"
msgstr ""
+#: ../IkiWiki/Plugin/recentchanges.pm:104
+#, perl-format
+msgid "This reverts commit %s"
+msgstr ""
+
+#: ../IkiWiki/Plugin/recentchanges.pm:123
+#, perl-format
+msgid "confirm reversion of %s"
+msgstr ""
+
#: ../IkiWiki/Plugin/recentchangesdiff.pm:37
msgid "(Diff truncated)"
msgstr ""
@@ -826,12 +833,12 @@ msgstr "%s bị %s khoá nên không thể sửa được"
msgid "%s is not a file"
msgstr ""
-#: ../IkiWiki/Plugin/remove.pm:137
+#: ../IkiWiki/Plugin/remove.pm:136
#, perl-format
msgid "confirm removal of %s"
msgstr ""
-#: ../IkiWiki/Plugin/remove.pm:174
+#: ../IkiWiki/Plugin/remove.pm:173
msgid "Please select the attachments to remove."
msgstr ""
@@ -864,29 +871,29 @@ msgstr ""
msgid "%s already exists on disk"
msgstr ""
-#: ../IkiWiki/Plugin/rename.pm:122
+#: ../IkiWiki/Plugin/rename.pm:123
#, fuzzy, perl-format
msgid "rename %s"
msgstr "đang vẽ %s"
-#: ../IkiWiki/Plugin/rename.pm:163
+#: ../IkiWiki/Plugin/rename.pm:164
msgid "Also rename SubPages and attachments"
msgstr ""
-#: ../IkiWiki/Plugin/rename.pm:250
+#: ../IkiWiki/Plugin/rename.pm:251
msgid "Only one attachment can be renamed at a time."
msgstr ""
-#: ../IkiWiki/Plugin/rename.pm:253
+#: ../IkiWiki/Plugin/rename.pm:254
msgid "Please select the attachment to rename."
msgstr ""
-#: ../IkiWiki/Plugin/rename.pm:352
+#: ../IkiWiki/Plugin/rename.pm:353
#, perl-format
msgid "rename %s to %s"
msgstr ""
-#: ../IkiWiki/Plugin/rename.pm:577
+#: ../IkiWiki/Plugin/rename.pm:578
#, fuzzy, perl-format
msgid "update for rename of %s to %s"
msgstr "cập nhật %2$s của %1$s bởi %3$s"
@@ -928,7 +935,12 @@ msgstr "lối tắt thiếu tên hay tham số url"
msgid "shortcut %s points to <i>%s</i>"
msgstr "lối tắt %s chỉ tới %s"
-#: ../IkiWiki/Plugin/smiley.pm:43
+#: ../IkiWiki/Plugin/smiley.pm:30
+#, perl-format
+msgid "smiley plugin will not work without %s"
+msgstr ""
+
+#: ../IkiWiki/Plugin/smiley.pm:50
#, fuzzy
msgid "failed to parse any smileys"
msgstr "lỗi phân tách hình cười nào nên tắt bổ sung"
@@ -1001,16 +1013,11 @@ msgstr "đang tạo trang mới %s"
msgid "missing id parameter"
msgstr "mẫu thiếu tham số id"
-#: ../IkiWiki/Plugin/template.pm:47
-#, fuzzy, perl-format
-msgid "%s not found"
-msgstr "không tìm thấy mẫu %s"
-
-#: ../IkiWiki/Plugin/teximg.pm:72
+#: ../IkiWiki/Plugin/teximg.pm:73
msgid "missing tex code"
msgstr ""
-#: ../IkiWiki/Plugin/teximg.pm:124
+#: ../IkiWiki/Plugin/teximg.pm:125
#, fuzzy
msgid "failed to generate image from code"
msgstr "lỗi ghi %s: %s"
@@ -1030,26 +1037,26 @@ msgstr ""
msgid "enable %s?"
msgstr ""
-#: ../IkiWiki/Plugin/websetup.pm:272
+#: ../IkiWiki/Plugin/websetup.pm:273
msgid "setup file for this wiki is not known"
msgstr ""
-#: ../IkiWiki/Plugin/websetup.pm:288
+#: ../IkiWiki/Plugin/websetup.pm:289
msgid "main"
msgstr ""
-#: ../IkiWiki/Plugin/websetup.pm:431
+#: ../IkiWiki/Plugin/websetup.pm:433
msgid ""
"The configuration changes shown below require a wiki rebuild to take effect."
msgstr ""
-#: ../IkiWiki/Plugin/websetup.pm:435
+#: ../IkiWiki/Plugin/websetup.pm:437
msgid ""
"For the configuration changes shown below to fully take effect, you may need "
"to rebuild the wiki."
msgstr ""
-#: ../IkiWiki/Plugin/websetup.pm:472
+#: ../IkiWiki/Plugin/websetup.pm:474
#, perl-format
msgid "Error: %s exited nonzero (%s). Discarding setup changes."
msgstr ""
@@ -1059,11 +1066,6 @@ msgstr ""
msgid "cannot determine id of untrusted committer %s"
msgstr ""
-#: ../IkiWiki/Receive.pm:85
-#, fuzzy, perl-format
-msgid "bad file name %s"
-msgstr "đang bỏ qua tên tập tin sai %s"
-
#: ../IkiWiki/Render.pm:158
#, perl-format
msgid "scanning %s"
@@ -1116,7 +1118,12 @@ msgstr "đang vẽ %s mà phụ thuộc vào %s"
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:836
+#: ../IkiWiki/Render.pm:787
+#, fuzzy, perl-format
+msgid "building %s"
+msgstr "đang sửa %s"
+
+#: ../IkiWiki/Render.pm:839
#, fuzzy, perl-format
msgid "ikiwiki: cannot build %s"
msgstr "ikiwiki: không thể vẽ %s"
@@ -1174,38 +1181,38 @@ msgid "wrapper filename not specified"
msgstr "chưa xác định tên tập tin bộ bao bọc"
#. translators: The parameter is a C filename.
-#: ../IkiWiki/Wrapper.pm:218
+#: ../IkiWiki/Wrapper.pm:219
#, perl-format
msgid "failed to compile %s"
msgstr "lỗi biên dịch %s"
#. translators: The parameter is a filename.
-#: ../IkiWiki/Wrapper.pm:238
+#: ../IkiWiki/Wrapper.pm:239
#, perl-format
msgid "successfully generated %s"
msgstr "%s đã được tạo ra"
-#: ../ikiwiki.in:13
+#: ../ikiwiki.in:10
msgid "usage: ikiwiki [options] source dest"
msgstr "cách sử dụng: ikiwiki [tùy chọn] nguồn đích"
-#: ../ikiwiki.in:14
+#: ../ikiwiki.in:11
msgid " ikiwiki --setup configfile"
msgstr ""
-#: ../ikiwiki.in:105
+#: ../ikiwiki.in:102
msgid "usage: --set var=value"
msgstr ""
-#: ../ikiwiki.in:112
+#: ../ikiwiki.in:109
msgid "usage: --set-yaml var=value"
msgstr ""
-#: ../ikiwiki.in:218
+#: ../ikiwiki.in:215
msgid "rebuilding wiki.."
msgstr "đang xây dựng lại wiki.."
-#: ../ikiwiki.in:221
+#: ../ikiwiki.in:218
msgid "refreshing wiki.."
msgstr "đang làm tươi wiki.."
@@ -1232,21 +1239,31 @@ msgstr ""
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:2053
+#: ../IkiWiki.pm:1536
+#, fuzzy, perl-format
+msgid "bad file name %s"
+msgstr "đang bỏ qua tên tập tin sai %s"
+
+#: ../IkiWiki.pm:1836
+#, perl-format
+msgid "template %s not found"
+msgstr "không tìm thấy mẫu %s"
+
+#: ../IkiWiki.pm:2118
msgid "yes"
msgstr ""
-#: ../IkiWiki.pm:2130
+#: ../IkiWiki.pm:2195
#, fuzzy, perl-format
msgid "invalid sort type %s"
msgstr "kiểu sắp xếp không rõ %s"
-#: ../IkiWiki.pm:2151
+#: ../IkiWiki.pm:2216
#, perl-format
msgid "unknown sort type %s"
msgstr "kiểu sắp xếp không rõ %s"
-#: ../IkiWiki.pm:2287
+#: ../IkiWiki.pm:2352
#, fuzzy, perl-format
msgid "cannot match pages: %s"
msgstr "không thể đọc %s: %s"
@@ -1271,6 +1288,10 @@ msgstr ""
msgid "What is the domain name of the web server?"
msgstr ""
+#, fuzzy
+#~ msgid "%s not found"
+#~ msgstr "không tìm thấy mẫu %s"
+
#~ msgid "You need to log in first."
#~ msgstr "Trước tiên bạn cần phải đăng nhập."