summaryrefslogtreecommitdiff
path: root/po
diff options
context:
space:
mode:
authorJoey Hess <joey@kodama.kitenet.net>2008-09-29 18:11:32 -0400
committerJoey Hess <joey@kodama.kitenet.net>2008-09-29 18:11:32 -0400
commit799bcbcd477653ff49aaee2e49818b62e40b6724 (patch)
treee9f7ede05d2c63e04969b0e081a159ec3a5b16c5 /po
parenta9d7c5453ae0f214f86043381310b81ad358b933 (diff)
parent0d3878896fa250cd1a6d4b1e7991714ca8478f36 (diff)
Merge branch 'master' into tova
Diffstat (limited to 'po')
-rw-r--r--po/ikiwiki.pot14
1 files changed, 7 insertions, 7 deletions
diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot
index b0206e45a..6614bfd87 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: 2008-09-29 17:12-0400\n"
+"POT-Creation-Date: 2008-09-29 18:05-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"
@@ -48,7 +48,7 @@ msgstr ""
msgid "You are banned."
msgstr ""
-#: ../IkiWiki/CGI.pm:385 ../IkiWiki/CGI.pm:386 ../IkiWiki.pm:1153
+#: ../IkiWiki/CGI.pm:385 ../IkiWiki/CGI.pm:386 ../IkiWiki.pm:1143
msgid "Error"
msgstr ""
@@ -904,25 +904,25 @@ msgstr ""
msgid "refreshing wiki.."
msgstr ""
-#: ../IkiWiki.pm:458
+#: ../IkiWiki.pm:451
msgid "Must specify url to wiki with --url when using --cgi"
msgstr ""
-#: ../IkiWiki.pm:504
+#: ../IkiWiki.pm:497
msgid "cannot use multiple rcs plugins"
msgstr ""
-#: ../IkiWiki.pm:533
+#: ../IkiWiki.pm:526
#, perl-format
msgid "failed to load external plugin needed for %s plugin: %s"
msgstr ""
-#: ../IkiWiki.pm:1136
+#: ../IkiWiki.pm:1126
#, perl-format
msgid "preprocessing loop detected on %s at depth %i"
msgstr ""
-#: ../IkiWiki.pm:1645
+#: ../IkiWiki.pm:1635
msgid "yes"
msgstr ""