From adc2eb3d8c900a011000431b01ff4b89d5f4f689 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Wed, 6 Aug 2008 01:58:04 -0400
Subject: Options set in the setup file are now immediatly loaded by ikiwiki
 -setup. This allows later switches to override them. Previously, setup file
 options overrode most command line options.

---
 po/ikiwiki.pot | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'po')

diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot
index 53f6e0e57..a6328c48d 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-08-05 20:43-0400\n"
+"POT-Creation-Date: 2008-08-06 01:51-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"
@@ -71,7 +71,7 @@ msgstr ""
 msgid "You are banned."
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:783 ../IkiWiki/CGI.pm:784 ../IkiWiki.pm:1110
+#: ../IkiWiki/CGI.pm:783 ../IkiWiki/CGI.pm:784 ../IkiWiki.pm:1117
 msgid "Error"
 msgstr ""
 
@@ -152,7 +152,7 @@ msgstr ""
 msgid "deleting bucket.."
 msgstr ""
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:194
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:192
 msgid "done"
 msgstr ""
 
@@ -190,7 +190,7 @@ msgstr ""
 msgid "attachment upload"
 msgstr ""
 
-#: ../IkiWiki/Plugin/autoindex.pm:74
+#: ../IkiWiki/Plugin/autoindex.pm:77
 msgid "automatic index generation"
 msgstr ""
 
@@ -836,35 +836,35 @@ msgstr ""
 msgid "usage: ikiwiki [options] source dest"
 msgstr ""
 
-#: ../ikiwiki.in:79
+#: ../ikiwiki.in:83
 msgid "usage: --set var=value"
 msgstr ""
 
-#: ../ikiwiki.in:127
+#: ../ikiwiki.in:129
 msgid "generating wrappers.."
 msgstr ""
 
-#: ../ikiwiki.in:183
+#: ../ikiwiki.in:181
 msgid "rebuilding wiki.."
 msgstr ""
 
-#: ../ikiwiki.in:186
+#: ../ikiwiki.in:184
 msgid "refreshing wiki.."
 msgstr ""
 
-#: ../IkiWiki.pm:427
+#: ../IkiWiki.pm:434
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr ""
 
-#: ../IkiWiki.pm:471
+#: ../IkiWiki.pm:478
 msgid "cannot use multiple rcs plugins"
 msgstr ""
 
-#: ../IkiWiki.pm:1093
+#: ../IkiWiki.pm:1100
 #, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr ""
 
-#: ../IkiWiki.pm:1581
+#: ../IkiWiki.pm:1588
 msgid "yes"
 msgstr ""
-- 
cgit v1.2.3