Merge branch 'master' into debian-jessie-backports

[git.ikiwiki.info.git] / po / vi.po

diff --git a/po/vi.po b/po/vi.po
index d524bfadc62d752b4d30a2dab3a47dc0bbc2f1c3..f65be671461e4e4e714d1fb740f226f274b72e36 100644 (file)
--- a/po/vi.po
+++ b/po/vi.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
 "Report-Msgid-Bugs-To: \n"
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2013-09-04 10:16-0400\n"
+"POT-Creation-Date: 2015-05-14 10:41-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"
 "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"


@@ -17,42 +17,42 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: LocFactoryEditor 1.6fc1\n"
 
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: LocFactoryEditor 1.6fc1\n"
 

-#: ../IkiWiki/CGI.pm:200
+#: ../IkiWiki/CGI.pm:222

 msgid ""
 "probable misconfiguration: sslcookie is set, but you are attempting to login "
 "via http, not https"
 msgstr ""
 
 msgid ""
 "probable misconfiguration: sslcookie is set, but you are attempting to login "
 "via http, not https"
 msgstr ""
 

-#: ../IkiWiki/CGI.pm:203
+#: ../IkiWiki/CGI.pm:225

 msgid "login failed, perhaps you need to turn on cookies?"
 msgstr ""
 
 msgid "login failed, perhaps you need to turn on cookies?"
 msgstr ""
 

-#: ../IkiWiki/CGI.pm:222 ../IkiWiki/CGI.pm:373
+#: ../IkiWiki/CGI.pm:244 ../IkiWiki/CGI.pm:396

 msgid "Your login session has expired."
 msgstr ""
 
 msgid "Your login session has expired."
 msgstr ""
 

-#: ../IkiWiki/CGI.pm:243
+#: ../IkiWiki/CGI.pm:265

 msgid "Login"
 msgstr ""
 
 msgid "Login"
 msgstr ""
 

-#: ../IkiWiki/CGI.pm:244
+#: ../IkiWiki/CGI.pm:266

 #, fuzzy
 msgid "Preferences"
 msgstr "Tùy thích đã được lưu."
 
 #, fuzzy
 msgid "Preferences"
 msgstr "Tùy thích đã được lưu."
 

-#: ../IkiWiki/CGI.pm:245
+#: ../IkiWiki/CGI.pm:267

 msgid "Admin"
 msgstr ""
 
 msgid "Admin"
 msgstr ""
 

-#: ../IkiWiki/CGI.pm:285
+#: ../IkiWiki/CGI.pm:307

 msgid "Preferences saved."
 msgstr "Tùy thích đã được lưu."
 
 msgid "Preferences saved."
 msgstr "Tùy thích đã được lưu."
 

-#: ../IkiWiki/CGI.pm:337
+#: ../IkiWiki/CGI.pm:359

 msgid "You are banned."
 msgstr "Bạn bị cấm ra."
 
 msgid "You are banned."
 msgstr "Bạn bị cấm ra."
 

-#: ../IkiWiki/CGI.pm:464 ../IkiWiki/CGI.pm:465 ../IkiWiki.pm:1508
+#: ../IkiWiki/CGI.pm:487 ../IkiWiki/CGI.pm:488 ../IkiWiki.pm:1624

 msgid "Error"
 msgstr "Lỗi"
 
 msgid "Error"
 msgstr "Lỗi"
 


@@ -121,16 +121,16 @@ msgstr ""
 msgid "(feed entities escaped)"
 msgstr ""
 
 msgid "(feed entities escaped)"
 msgstr ""
 

-#: ../IkiWiki/Plugin/aggregate.pm:556
+#: ../IkiWiki/Plugin/aggregate.pm:558

 msgid "feed crashed XML::Feed!"
 msgstr "nguồn tin đã gây ra XML::Feed sụp đổ."
 
 msgid "feed crashed XML::Feed!"
 msgstr "nguồn tin đã gây ra XML::Feed sụp đổ."
 

-#: ../IkiWiki/Plugin/aggregate.pm:649
+#: ../IkiWiki/Plugin/aggregate.pm:652

 #, perl-format
 msgid "creating new page %s"
 msgstr "đang tạo trang mới %s"
 
 #, perl-format
 msgid "creating new page %s"
 msgstr "đang tạo trang mới %s"
 

-#: ../IkiWiki/Plugin/aggregate.pm:677 ../IkiWiki/Plugin/edittemplate.pm:135
+#: ../IkiWiki/Plugin/aggregate.pm:682 ../IkiWiki/Plugin/edittemplate.pm:137

 #, fuzzy
 msgid "failed to process template:"
 msgstr "mẫu không xử lý được:"
 #, fuzzy
 msgid "failed to process template:"
 msgstr "mẫu không xử lý được:"


@@ -176,15 +176,15 @@ msgstr ""
 msgid "bad attachment filename"
 msgstr ""
 
 msgid "bad attachment filename"
 msgstr ""
 

-#: ../IkiWiki/Plugin/attachment.pm:296
+#: ../IkiWiki/Plugin/attachment.pm:298

 msgid "attachment upload"
 msgstr ""
 
 msgid "attachment upload"
 msgstr ""
 

-#: ../IkiWiki/Plugin/attachment.pm:347
+#: ../IkiWiki/Plugin/attachment.pm:349

 msgid "this attachment is not yet saved"
 msgstr ""
 
 msgid "this attachment is not yet saved"
 msgstr ""
 

-#: ../IkiWiki/Plugin/attachment.pm:365
+#: ../IkiWiki/Plugin/attachment.pm:367

 msgid "just uploaded"
 msgstr ""
 
 msgid "just uploaded"
 msgstr ""
 


@@ -193,7 +193,7 @@ msgstr ""
 msgid "creating index page %s"
 msgstr "đang tạo trang mới %s"
 
 msgid "creating index page %s"
 msgstr "đang tạo trang mới %s"
 

-#: ../IkiWiki/Plugin/blogspam.pm:119
+#: ../IkiWiki/Plugin/blogspam.pm:139

 msgid ""
 "Sorry, but that looks like spam to <a href=\"http://blogspam.net/"
 "\">blogspam</a>: "
 msgid ""
 "Sorry, but that looks like spam to <a href=\"http://blogspam.net/"
 "\">blogspam</a>: "


@@ -208,87 +208,107 @@ msgstr ""
 msgid "There are no broken links!"
 msgstr "Không có liên kết bị ngắt nào."
 
 msgid "There are no broken links!"
 msgstr "Không có liên kết bị ngắt nào."
 

-#: ../IkiWiki/Plugin/comments.pm:124
+#: ../IkiWiki/Plugin/calendar.pm:115 ../IkiWiki/Plugin/calendar.pm:117
+#, perl-format
+msgid "building calendar for %s, its previous or next year has changed"
+msgstr ""
+
+#: ../IkiWiki/Plugin/calendar.pm:120 ../IkiWiki/Plugin/calendar.pm:122
+#, perl-format
+msgid "building calendar for %s/%s, its previous or next month has changed"
+msgstr ""
+
+#: ../IkiWiki/Plugin/calendar.pm:131
+#, fuzzy, perl-format
+msgid "creating calendar page %s"
+msgstr "đang tạo trang mới %s"
+
+#: ../IkiWiki/Plugin/comments.pm:128

 #, fuzzy, perl-format
 msgid "this comment needs %s"
 msgstr "đang tạo %s"
 
 #, fuzzy, perl-format
 msgid "this comment needs %s"
 msgstr "đang tạo %s"
 

-#: ../IkiWiki/Plugin/comments.pm:127
+#: ../IkiWiki/Plugin/comments.pm:131

 msgid "moderation"
 msgstr ""
 
 msgid "moderation"
 msgstr ""
 

-#: ../IkiWiki/Plugin/comments.pm:154 ../IkiWiki/Plugin/format.pm:50
+#: ../IkiWiki/Plugin/comments.pm:158 ../IkiWiki/Plugin/format.pm:50

 #, perl-format
 msgid "unsupported page format %s"
 msgstr ""
 
 #, perl-format
 msgid "unsupported page format %s"
 msgstr ""
 

-#: ../IkiWiki/Plugin/comments.pm:159
+#: ../IkiWiki/Plugin/comments.pm:163

 msgid "comment must have content"
 msgstr ""
 
 msgid "comment must have content"
 msgstr ""
 

-#: ../IkiWiki/Plugin/comments.pm:217
+#: ../IkiWiki/Plugin/comments.pm:227

 msgid "Anonymous"
 msgstr ""
 
 msgid "Anonymous"
 msgstr ""
 

-#: ../IkiWiki/Plugin/comments.pm:279
+#: ../IkiWiki/Plugin/comments.pm:285

 msgid "Comment Moderation"
 msgstr ""
 
 msgid "Comment Moderation"
 msgstr ""
 

-#: ../IkiWiki/Plugin/comments.pm:375 ../IkiWiki/Plugin/comments.pm:379
+#: ../IkiWiki/Plugin/comments.pm:381 ../IkiWiki/Plugin/comments.pm:385

 msgid "email replies to me"
 msgstr ""
 
 msgid "email replies to me"
 msgstr ""
 

-#: ../IkiWiki/Plugin/comments.pm:413 ../IkiWiki/Plugin/editpage.pm:96
+#: ../IkiWiki/Plugin/comments.pm:419 ../IkiWiki/Plugin/editpage.pm:96

 #: ../IkiWiki/Plugin/editpage.pm:102
 msgid "bad page name"
 msgstr ""
 
 #: ../IkiWiki/Plugin/editpage.pm:102
 msgid "bad page name"
 msgstr ""
 

-#: ../IkiWiki/Plugin/comments.pm:416
+#: ../IkiWiki/Plugin/comments.pm:422

 #, fuzzy, perl-format
 msgid "commenting on %s"
 msgstr "đang tạo %s"
 
 #, fuzzy, perl-format
 msgid "commenting on %s"
 msgstr "đang tạo %s"
 

-#: ../IkiWiki/Plugin/comments.pm:433
+#: ../IkiWiki/Plugin/comments.pm:439

 #, perl-format
 msgid "page '%s' doesn't exist, so you can't comment"
 msgstr ""
 
 #, perl-format
 msgid "page '%s' doesn't exist, so you can't comment"
 msgstr ""
 

-#: ../IkiWiki/Plugin/comments.pm:440
+#: ../IkiWiki/Plugin/comments.pm:449
+#, perl-format
+msgid "comments on page '%s' are not allowed"
+msgstr ""
+
+#: ../IkiWiki/Plugin/comments.pm:456

 #, perl-format
 msgid "comments on page '%s' are closed"
 msgstr ""
 
 #, perl-format
 msgid "comments on page '%s' are closed"
 msgstr ""
 

-#: ../IkiWiki/Plugin/comments.pm:565
+#: ../IkiWiki/Plugin/comments.pm:583

 msgid "comment stored for moderation"
 msgstr ""
 
 msgid "comment stored for moderation"
 msgstr ""
 

-#: ../IkiWiki/Plugin/comments.pm:567
+#: ../IkiWiki/Plugin/comments.pm:585

 msgid "Your comment will be posted after moderator review"
 msgstr ""
 
 msgid "Your comment will be posted after moderator review"
 msgstr ""
 

-#: ../IkiWiki/Plugin/comments.pm:580
+#: ../IkiWiki/Plugin/comments.pm:598

 msgid "Added a comment"
 msgstr ""
 
 msgid "Added a comment"
 msgstr ""
 

-#: ../IkiWiki/Plugin/comments.pm:584
+#: ../IkiWiki/Plugin/comments.pm:602

 #, perl-format
 msgid "Added a comment: %s"
 msgstr ""
 
 #, perl-format
 msgid "Added a comment: %s"
 msgstr ""
 

-#: ../IkiWiki/Plugin/comments.pm:654 ../IkiWiki/Plugin/userlist.pm:55
+#: ../IkiWiki/Plugin/comments.pm:676 ../IkiWiki/Plugin/userlist.pm:55

 #: ../IkiWiki/Plugin/websetup.pm:272
 msgid "you are not logged in as an admin"
 msgstr ""
 
 #: ../IkiWiki/Plugin/websetup.pm:272
 msgid "you are not logged in as an admin"
 msgstr ""
 

-#: ../IkiWiki/Plugin/comments.pm:708
+#: ../IkiWiki/Plugin/comments.pm:735

 msgid "Comment moderation"
 msgstr ""
 
 msgid "Comment moderation"
 msgstr ""
 

-#: ../IkiWiki/Plugin/comments.pm:749
+#: ../IkiWiki/Plugin/comments.pm:776

 msgid "comment moderation"
 msgstr ""
 
 msgid "comment moderation"
 msgstr ""
 

-#: ../IkiWiki/Plugin/comments.pm:910
+#: ../IkiWiki/Plugin/comments.pm:939

 #, perl-format
 msgid "%i comment"
 msgid_plural "%i comments"
 #, perl-format
 msgid "%i comment"
 msgid_plural "%i comments"


@@ -297,7 +317,7 @@ msgstr[0] ""
 #. translators: Here "Comment" is a verb;
 #. translators: the user clicks on it to
 #. translators: post a comment.
 #. translators: Here "Comment" is a verb;
 #. translators: the user clicks on it to
 #. translators: post a comment.

-#: ../IkiWiki/Plugin/comments.pm:920
+#: ../IkiWiki/Plugin/comments.pm:949

 msgid "Comment"
 msgstr ""
 
 msgid "Comment"
 msgstr ""
 


@@ -337,8 +357,8 @@ msgid "creating %s"
 msgstr "đang tạo %s"
 
 #: ../IkiWiki/Plugin/editpage.pm:337 ../IkiWiki/Plugin/editpage.pm:356
 msgstr "đang tạo %s"
 
 #: ../IkiWiki/Plugin/editpage.pm:337 ../IkiWiki/Plugin/editpage.pm:356

-#: ../IkiWiki/Plugin/editpage.pm:367 ../IkiWiki/Plugin/editpage.pm:412
-#: ../IkiWiki/Plugin/editpage.pm:454
+#: ../IkiWiki/Plugin/editpage.pm:367 ../IkiWiki/Plugin/editpage.pm:414
+#: ../IkiWiki/Plugin/editpage.pm:456

 #, perl-format
 msgid "editing %s"
 msgstr "đang sửa %s"
 #, perl-format
 msgid "editing %s"
 msgstr "đang sửa %s"


@@ -358,6 +378,26 @@ msgstr "chưa xác định tên tập tin bộ bao bọc"
 msgid "edittemplate %s registered for %s"
 msgstr ""
 
 msgid "edittemplate %s registered for %s"
 msgstr ""
 

+#: ../IkiWiki/Plugin/emailauth.pm:55
+msgid "Invalid email address."
+msgstr ""
+
+#: ../IkiWiki/Plugin/emailauth.pm:88 ../IkiWiki/Plugin/passwordauth.pm:371
+msgid "Failed to send mail"
+msgstr "Lỗi gửi thư"
+
+#: ../IkiWiki/Plugin/emailauth.pm:90
+msgid ""
+"You have been sent an email, with a link you can open to complete the login "
+"process."
+msgstr ""
+
+#: ../IkiWiki/Plugin/emailauth.pm:107
+msgid ""
+"Wrong login token length. Please check that you pasted in the complete login "
+"link from the email!"
+msgstr ""
+

 #: ../IkiWiki/Plugin/format.pm:30
 msgid "must specify format and text"
 msgstr ""
 #: ../IkiWiki/Plugin/format.pm:30
 msgid "must specify format and text"
 msgstr ""


@@ -386,31 +426,31 @@ msgstr "không thể đọc %s: %s"
 msgid "%s is an attachment, not a page."
 msgstr ""
 
 msgid "%s is an attachment, not a page."
 msgstr ""
 

-#: ../IkiWiki/Plugin/git.pm:789 ../IkiWiki/Plugin/git.pm:852
-#: ../IkiWiki.pm:1728
+#: ../IkiWiki/Plugin/git.pm:839 ../IkiWiki/Plugin/git.pm:902
+#: ../IkiWiki.pm:1844

 #, perl-format
 msgid "you are not allowed to change %s"
 msgstr ""
 
 #, perl-format
 msgid "you are not allowed to change %s"
 msgstr ""
 

-#: ../IkiWiki/Plugin/git.pm:811
+#: ../IkiWiki/Plugin/git.pm:861

 #, perl-format
 msgid "you cannot act on a file with mode %s"
 msgstr ""
 
 #, perl-format
 msgid "you cannot act on a file with mode %s"
 msgstr ""
 

-#: ../IkiWiki/Plugin/git.pm:815
+#: ../IkiWiki/Plugin/git.pm:865

 msgid "you are not allowed to change file modes"
 msgstr ""
 
 msgid "you are not allowed to change file modes"
 msgstr ""
 

-#: ../IkiWiki/Plugin/git.pm:885
+#: ../IkiWiki/Plugin/git.pm:935

 msgid "you are not allowed to revert a merge"
 msgstr ""
 
 msgid "you are not allowed to revert a merge"
 msgstr ""
 

-#: ../IkiWiki/Plugin/git.pm:902
+#: ../IkiWiki/Plugin/git.pm:952

 #, fuzzy, perl-format
 msgid "Failed to revert commit %s"
 msgstr "lỗi biên dịch %s"
 
 #, 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:41
+#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/search.pm:48

 #, 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"
 #, 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"


@@ -424,17 +464,17 @@ msgstr "linkmap không chạy dot được"
 msgid "prog not a valid graphviz program"
 msgstr ""
 
 msgid "prog not a valid graphviz program"
 msgstr ""
 

-#: ../IkiWiki/Plugin/highlight.pm:83
+#: ../IkiWiki/Plugin/highlight.pm:91

 #, perl-format
 msgid "tohighlight contains unknown file type '%s'"
 msgstr ""
 
 #, perl-format
 msgid "tohighlight contains unknown file type '%s'"
 msgstr ""
 

-#: ../IkiWiki/Plugin/highlight.pm:94
+#: ../IkiWiki/Plugin/highlight.pm:102

 #, perl-format
 msgid "Source code: %s"
 msgstr ""
 
 #, perl-format
 msgid "Source code: %s"
 msgstr ""
 

-#: ../IkiWiki/Plugin/highlight.pm:180
+#: ../IkiWiki/Plugin/highlight.pm:198

 msgid ""
 "warning: highlight perl module not available; falling back to pass through"
 msgstr ""
 msgid ""
 "warning: highlight perl module not available; falling back to pass through"
 msgstr ""


@@ -444,27 +484,32 @@ msgstr ""
 msgid "htmltidy failed to parse this html"
 msgstr "lỗi phân tách hình cười nào nên tắt bổ sung"
 
 msgid "htmltidy failed to parse this html"
 msgstr "lỗi phân tách hình cười nào nên tắt bổ sung"
 

-#: ../IkiWiki/Plugin/img.pm:70
+#: ../IkiWiki/Plugin/img.pm:75

 #, fuzzy
 msgid "Image::Magick is not installed"
 msgstr "chưa cài đặt polygen"
 
 #, fuzzy
 msgid "Image::Magick is not installed"
 msgstr "chưa cài đặt polygen"
 

-#: ../IkiWiki/Plugin/img.pm:74 ../IkiWiki/Plugin/img.pm:118
+#: ../IkiWiki/Plugin/img.pm:80 ../IkiWiki/Plugin/img.pm:125

 #, fuzzy, perl-format
 msgid "failed to read %s: %s"
 msgstr "lỗi ghi %s: %s"
 
 #, fuzzy, perl-format
 msgid "failed to read %s: %s"
 msgstr "lỗi ghi %s: %s"
 

-#: ../IkiWiki/Plugin/img.pm:80
+#: ../IkiWiki/Plugin/img.pm:83
+#, fuzzy, perl-format
+msgid "failed to get dimensions of %s"
+msgstr "lỗi ghi %s: %s"
+
+#: ../IkiWiki/Plugin/img.pm:93

 #, perl-format
 msgid "wrong size format \"%s\" (should be WxH)"
 msgstr ""
 
 #, perl-format
 msgid "wrong size format \"%s\" (should be WxH)"
 msgstr ""
 

-#: ../IkiWiki/Plugin/img.pm:122
+#: ../IkiWiki/Plugin/img.pm:129

 #, fuzzy, perl-format
 msgid "failed to resize: %s"
 msgstr "lỗi ghi %s: %s"
 
 #, fuzzy, perl-format
 msgid "failed to resize: %s"
 msgstr "lỗi ghi %s: %s"
 

-#: ../IkiWiki/Plugin/img.pm:147
+#: ../IkiWiki/Plugin/img.pm:154

 #, fuzzy, perl-format
 msgid "failed to determine size of image %s"
 msgstr "lỗi ghi %s: %s"
 #, fuzzy, perl-format
 msgid "failed to determine size of image %s"
 msgstr "lỗi ghi %s: %s"


@@ -485,41 +530,41 @@ msgstr "không tìm thấy mẫu %s"
 msgid "missing pages parameter"
 msgstr "mẫu thiếu tham số id"
 
 msgid "missing pages parameter"
 msgstr "mẫu thiếu tham số id"
 

-#: ../IkiWiki/Plugin/inline.pm:209
+#: ../IkiWiki/Plugin/inline.pm:216

 #, perl-format
 msgid "the %s and %s parameters cannot be used together"
 msgstr ""
 
 #, perl-format
 msgid "the %s and %s parameters cannot be used together"
 msgstr ""
 

-#: ../IkiWiki/Plugin/inline.pm:315
+#: ../IkiWiki/Plugin/inline.pm:322

 #, perl-format
 msgid "%s (RSS feed)"
 msgstr ""
 
 #, perl-format
 msgid "%s (RSS feed)"
 msgstr ""
 

-#: ../IkiWiki/Plugin/inline.pm:319
+#: ../IkiWiki/Plugin/inline.pm:326

 #, perl-format
 msgid "%s (Atom feed)"
 msgstr ""
 
 #, perl-format
 msgid "%s (Atom feed)"
 msgstr ""
 

-#: ../IkiWiki/Plugin/inline.pm:348
+#: ../IkiWiki/Plugin/inline.pm:359

 msgid "Add a new post titled:"
 msgstr ""
 
 msgid "Add a new post titled:"
 msgstr ""
 

-#: ../IkiWiki/Plugin/inline.pm:387 ../IkiWiki/Plugin/template.pm:44
+#: ../IkiWiki/Plugin/inline.pm:400 ../IkiWiki/Plugin/template.pm:46

 #, fuzzy, perl-format
 msgid "failed to process template %s"
 msgstr "mẫu không xử lý được:"
 
 #, fuzzy, perl-format
 msgid "failed to process template %s"
 msgstr "mẫu không xử lý được:"
 

-#: ../IkiWiki/Plugin/inline.pm:725
+#: ../IkiWiki/Plugin/inline.pm:739

 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"
 
 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"
 

-#: ../IkiWiki/Plugin/linkmap.pm:81 ../IkiWiki/Plugin/linkmap.pm:88
-#: ../IkiWiki/Plugin/linkmap.pm:92 ../IkiWiki/Plugin/linkmap.pm:95
+#: ../IkiWiki/Plugin/linkmap.pm:94 ../IkiWiki/Plugin/linkmap.pm:101
+#: ../IkiWiki/Plugin/linkmap.pm:105 ../IkiWiki/Plugin/linkmap.pm:108

 #, fuzzy
 msgid "failed to run dot"
 msgstr "linkmap không chạy dot được"
 
 #, fuzzy
 msgid "failed to run dot"
 msgstr "linkmap không chạy dot được"
 

-#: ../IkiWiki/Plugin/linkmap.pm:85
+#: ../IkiWiki/Plugin/linkmap.pm:98

 msgid "linkmap"
 msgstr ""
 
 msgid "linkmap"
 msgstr ""
 


@@ -528,11 +573,19 @@ msgstr ""
 msgid "%s is locked and cannot be edited"
 msgstr "%s bị %s khoá nên không thể sửa được"
 
 msgid "%s is locked and cannot be edited"
 msgstr "%s bị %s khoá nên không thể sửa được"
 

+#: ../IkiWiki/Plugin/loginselector.pm:95
+msgid "Other"
+msgstr ""
+
+#: ../IkiWiki/Plugin/loginselector.pm:107
+msgid "Password"
+msgstr ""
+

 #: ../IkiWiki/Plugin/mdwn.pm:52
 msgid "multimarkdown is enabled, but Text::MultiMarkdown is not installed"
 msgstr ""
 
 #: ../IkiWiki/Plugin/mdwn.pm:52
 msgid "multimarkdown is enabled, but Text::MultiMarkdown is not installed"
 msgstr ""
 

-#: ../IkiWiki/Plugin/mdwn.pm:96
+#: ../IkiWiki/Plugin/mdwn.pm:97

 #, perl-format
 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)"
 #, perl-format
 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)"


@@ -594,11 +647,6 @@ msgstr ""
 msgid "comment notification:"
 msgstr ""
 
 msgid "comment notification:"
 msgstr ""
 

-#: ../IkiWiki/Plugin/openid.pm:71
-#, fuzzy, perl-format
-msgid "failed to load openid module: "
-msgstr "lỗi biên dịch %s"
-

 #: ../IkiWiki/Plugin/orphans.pm:56
 #, fuzzy
 msgid "All pages have other pages linking to them."
 #: ../IkiWiki/Plugin/orphans.pm:56
 #, fuzzy
 msgid "All pages have other pages linking to them."


@@ -628,10 +676,6 @@ msgstr "Tài khoản đã được tạo. Lúc bây giờ bạn có thể đăng
 msgid "No email address, so cannot email password reset instructions."
 msgstr ""
 
 msgid "No email address, so cannot email password reset instructions."
 msgstr ""
 

-#: ../IkiWiki/Plugin/passwordauth.pm:371
-msgid "Failed to send mail"
-msgstr "Lỗi gửi thư"
-

 #: ../IkiWiki/Plugin/passwordauth.pm:373
 msgid "You have been mailed password reset instructions."
 msgstr ""
 #: ../IkiWiki/Plugin/passwordauth.pm:373
 msgid "You have been mailed password reset instructions."
 msgstr ""


@@ -696,71 +740,71 @@ msgid ""
 "po_link_to=default"
 msgstr ""
 
 "po_link_to=default"
 msgstr ""
 

-#: ../IkiWiki/Plugin/po.pm:467
+#: ../IkiWiki/Plugin/po.pm:473

 msgid "updated PO files"
 msgstr ""
 
 msgid "updated PO files"
 msgstr ""
 

-#: ../IkiWiki/Plugin/po.pm:490
+#: ../IkiWiki/Plugin/po.pm:496

 msgid ""
 "Can not remove a translation. If the master page is removed, however, its "
 "translations will be removed as well."
 msgstr ""
 
 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:510
+#: ../IkiWiki/Plugin/po.pm:516

 msgid ""
 "Can not rename a translation. If the master page is renamed, however, its "
 "translations will be renamed as well."
 msgstr ""
 
 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:956
+#: ../IkiWiki/Plugin/po.pm:975

 #, perl-format
 msgid "POT file (%s) does not exist"
 msgstr ""
 
 #, perl-format
 msgid "POT file (%s) does not exist"
 msgstr ""
 

-#: ../IkiWiki/Plugin/po.pm:970
+#: ../IkiWiki/Plugin/po.pm:989

 #, fuzzy, perl-format
 msgid "failed to copy underlay PO file to %s"
 msgstr "lỗi biên dịch %s"
 
 #, fuzzy, perl-format
 msgid "failed to copy underlay PO file to %s"
 msgstr "lỗi biên dịch %s"
 

-#: ../IkiWiki/Plugin/po.pm:979
+#: ../IkiWiki/Plugin/po.pm:997

 #, fuzzy, perl-format
 msgid "failed to update %s"
 msgstr "lỗi biên dịch %s"
 
 #, fuzzy, perl-format
 msgid "failed to update %s"
 msgstr "lỗi biên dịch %s"
 

-#: ../IkiWiki/Plugin/po.pm:985
+#: ../IkiWiki/Plugin/po.pm:1003

 #, fuzzy, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr "lỗi biên dịch %s"
 
 #, fuzzy, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr "lỗi biên dịch %s"
 

-#: ../IkiWiki/Plugin/po.pm:1021
+#: ../IkiWiki/Plugin/po.pm:1039

 msgid "N/A"
 msgstr ""
 
 msgid "N/A"
 msgstr ""
 

-#: ../IkiWiki/Plugin/po.pm:1032
+#: ../IkiWiki/Plugin/po.pm:1050

 #, fuzzy, perl-format
 msgid "failed to translate %s"
 msgstr "lỗi ghi %s: %s"
 
 #, fuzzy, perl-format
 msgid "failed to translate %s"
 msgstr "lỗi ghi %s: %s"
 

-#: ../IkiWiki/Plugin/po.pm:1111
+#: ../IkiWiki/Plugin/po.pm:1133

 msgid "removed obsolete PO files"
 msgstr ""
 
 msgid "removed obsolete PO files"
 msgstr ""
 

-#: ../IkiWiki/Plugin/po.pm:1168 ../IkiWiki/Plugin/po.pm:1180
-#: ../IkiWiki/Plugin/po.pm:1219
+#: ../IkiWiki/Plugin/po.pm:1190 ../IkiWiki/Plugin/po.pm:1202
+#: ../IkiWiki/Plugin/po.pm:1241

 #, fuzzy, perl-format
 msgid "failed to write %s"
 msgstr "lỗi ghi %s: %s"
 
 #, fuzzy, perl-format
 msgid "failed to write %s"
 msgstr "lỗi ghi %s: %s"
 

-#: ../IkiWiki/Plugin/po.pm:1178
+#: ../IkiWiki/Plugin/po.pm:1200

 #, fuzzy
 msgid "failed to translate"
 msgstr "linkmap không chạy dot được"
 
 #, fuzzy
 msgid "failed to translate"
 msgstr "linkmap không chạy dot được"
 

-#: ../IkiWiki/Plugin/po.pm:1231
+#: ../IkiWiki/Plugin/po.pm:1253

 msgid "invalid gettext data, go back to previous page to continue edit"
 msgstr ""
 
 msgid "invalid gettext data, go back to previous page to continue edit"
 msgstr ""
 

-#: ../IkiWiki/Plugin/po.pm:1274
+#: ../IkiWiki/Plugin/po.pm:1296

 #, perl-format
 msgid "%s has invalid syntax: must use CODE|NAME"
 msgstr ""
 #, perl-format
 msgid "%s has invalid syntax: must use CODE|NAME"
 msgstr ""


@@ -971,12 +1015,12 @@ msgstr "lỗi ghi %s: %s"
 msgid "rsync_command exited %d"
 msgstr ""
 
 msgid "rsync_command exited %d"
 msgstr ""
 

-#: ../IkiWiki/Plugin/search.pm:199
+#: ../IkiWiki/Plugin/search.pm:216

 #, perl-format
 msgid "need Digest::SHA to index %s"
 msgstr ""
 
 #, perl-format
 msgid "need Digest::SHA to index %s"
 msgstr ""
 

-#: ../IkiWiki/Plugin/search.pm:253
+#: ../IkiWiki/Plugin/search.pm:270

 msgid "search"
 msgstr ""
 
 msgid "search"
 msgstr ""
 


@@ -1076,6 +1120,10 @@ msgstr "đang tạo trang mới %s"
 msgid "missing id parameter"
 msgstr "mẫu thiếu tham số id"
 
 msgid "missing id parameter"
 msgstr "mẫu thiếu tham số id"
 

+#: ../IkiWiki/Plugin/templatebody.pm:42
+msgid "first parameter must be the content"
+msgstr ""
+

 #: ../IkiWiki/Plugin/teximg.pm:73
 msgid "missing tex code"
 msgstr ""
 #: ../IkiWiki/Plugin/teximg.pm:73
 msgid "missing tex code"
 msgstr ""


@@ -1085,7 +1133,7 @@ msgstr ""
 msgid "failed to generate image from code"
 msgstr "lỗi ghi %s: %s"
 
 msgid "failed to generate image from code"
 msgstr "lỗi ghi %s: %s"
 

-#: ../IkiWiki/Plugin/trail.pm:393
+#: ../IkiWiki/Plugin/trail.pm:392

 #, perl-format
 msgid "building %s, its previous or next page has changed"
 msgstr ""
 #, perl-format
 msgid "building %s, its previous or next page has changed"
 msgstr ""


@@ -1151,64 +1199,64 @@ msgstr ""
 msgid "cannot determine id of untrusted committer %s"
 msgstr ""
 
 msgid "cannot determine id of untrusted committer %s"
 msgstr ""
 

-#: ../IkiWiki/Render.pm:158
+#: ../IkiWiki/Render.pm:161

 #, perl-format
 msgid "scanning %s"
 msgstr "đang quét %s"
 
 #, perl-format
 msgid "scanning %s"
 msgstr "đang quét %s"
 

-#: ../IkiWiki/Render.pm:281
+#: ../IkiWiki/Render.pm:284

 #, perl-format
 msgid ""
 "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to "
 "allow this"
 msgstr ""
 
 #, perl-format
 msgid ""
 "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to "
 "allow this"
 msgstr ""
 

-#: ../IkiWiki/Render.pm:317
+#: ../IkiWiki/Render.pm:335 ../IkiWiki/Render.pm:396

 #, perl-format
 msgid "skipping bad filename %s"
 msgstr "đang bỏ qua tên tập tin sai %s"
 
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr "đang bỏ qua tên tập tin sai %s"
 

-#: ../IkiWiki/Render.pm:333
+#: ../IkiWiki/Render.pm:352 ../IkiWiki/Render.pm:401

 #, perl-format
 msgid "%s has multiple possible source pages"
 msgstr ""
 
 #, perl-format
 msgid "%s has multiple possible source pages"
 msgstr ""
 

-#: ../IkiWiki/Render.pm:373
+#: ../IkiWiki/Render.pm:438

 #, perl-format
 msgid "querying %s for file creation and modification times.."
 msgstr ""
 
 #, perl-format
 msgid "querying %s for file creation and modification times.."
 msgstr ""
 

-#: ../IkiWiki/Render.pm:447
+#: ../IkiWiki/Render.pm:513

 #, fuzzy, perl-format
 msgid "removing obsolete %s"
 msgstr "đang gỡ bỏ trang cũ %s"
 
 #, fuzzy, perl-format
 msgid "removing obsolete %s"
 msgstr "đang gỡ bỏ trang cũ %s"
 

-#: ../IkiWiki/Render.pm:531
+#: ../IkiWiki/Render.pm:598

 #, fuzzy, perl-format
 msgid "building %s, which links to %s"
 msgstr "đang vẽ %s mà liên kết tới %s"
 
 #, fuzzy, perl-format
 msgid "building %s, which links to %s"
 msgstr "đang vẽ %s mà liên kết tới %s"
 

-#: ../IkiWiki/Render.pm:540
+#: ../IkiWiki/Render.pm:607

 #, fuzzy, perl-format
 msgid "removing %s, no longer built by %s"
 msgstr "đang gỡ bỏ %s, không còn được vẽ lại bởi %s"
 
 #, fuzzy, perl-format
 msgid "removing %s, no longer built by %s"
 msgstr "đang gỡ bỏ %s, không còn được vẽ lại bởi %s"
 

-#: ../IkiWiki/Render.pm:623 ../IkiWiki/Render.pm:705
+#: ../IkiWiki/Render.pm:690 ../IkiWiki/Render.pm:772

 #, fuzzy, perl-format
 msgid "building %s, which depends on %s"
 msgstr "đang vẽ %s mà phụ thuộc vào %s"
 
 #, fuzzy, perl-format
 msgid "building %s, which depends on %s"
 msgstr "đang vẽ %s mà phụ thuộc vào %s"
 

-#: ../IkiWiki/Render.pm:718
+#: ../IkiWiki/Render.pm:785

 #, fuzzy, perl-format
 msgid "building %s, to update its backlinks"
 msgstr "đang vẽ %s để cập nhật các liên kết ngược của nó"
 
 #, fuzzy, perl-format
 msgid "building %s, to update its backlinks"
 msgstr "đang vẽ %s để cập nhật các liên kết ngược của nó"
 

-#: ../IkiWiki/Render.pm:806
+#: ../IkiWiki/Render.pm:896

 #, fuzzy, perl-format
 msgid "building %s"
 msgstr "đang sửa %s"
 
 #, fuzzy, perl-format
 msgid "building %s"
 msgstr "đang sửa %s"
 

-#: ../IkiWiki/Render.pm:871
+#: ../IkiWiki/Render.pm:965

 #, fuzzy, perl-format
 msgid "ikiwiki: cannot build %s"
 msgstr "ikiwiki: không thể vẽ %s"
 #, fuzzy, perl-format
 msgid "ikiwiki: cannot build %s"
 msgstr "ikiwiki: không thể vẽ %s"


@@ -1265,18 +1313,18 @@ msgstr "không thể tạo bộ bao bọc sử dụng tập tin thiết lập"
 msgid "wrapper filename not specified"
 msgstr "chưa xác định tên tập tin bộ bao bọc"
 
 msgid "wrapper filename not specified"
 msgstr "chưa xác định tên tập tin bộ bao bọc"
 

-#: ../IkiWiki/Wrapper.pm:109
+#: ../IkiWiki/Wrapper.pm:122

 msgid "Please wait"
 msgstr ""
 
 #. translators: The parameter is a C filename.
 msgid "Please wait"
 msgstr ""
 
 #. translators: The parameter is a C filename.

-#: ../IkiWiki/Wrapper.pm:268
+#: ../IkiWiki/Wrapper.pm:288

 #, perl-format
 msgid "failed to compile %s"
 msgstr "lỗi biên dịch %s"
 
 #. translators: The parameter is a filename.
 #, perl-format
 msgid "failed to compile %s"
 msgstr "lỗi biên dịch %s"
 
 #. translators: The parameter is a filename.

-#: ../IkiWiki/Wrapper.pm:288
+#: ../IkiWiki/Wrapper.pm:308

 #, perl-format
 msgid "successfully generated %s"
 msgstr "%s đã được tạo ra"
 #, perl-format
 msgid "successfully generated %s"
 msgstr "%s đã được tạo ra"


@@ -1286,7 +1334,7 @@ msgid "usage: ikiwiki [options] source dest"
 msgstr "cách sử dụng: ikiwiki [tùy chọn] nguồn đích"
 
 #: ../ikiwiki.in:11
 msgstr "cách sử dụng: ikiwiki [tùy chọn] nguồn đích"
 
 #: ../ikiwiki.in:11

-msgid "       ikiwiki --setup configfile"
+msgid "       ikiwiki --setup my.setup [options]"

 msgstr ""
 
 #: ../ikiwiki.in:102
 msgstr ""
 
 #: ../ikiwiki.in:102


@@ -1305,59 +1353,59 @@ msgstr "đang xây dựng lại wiki.."
 msgid "refreshing wiki.."
 msgstr "đang làm tươi wiki.."
 
 msgid "refreshing wiki.."
 msgstr "đang làm tươi wiki.."
 

-#: ../IkiWiki.pm:248
+#: ../IkiWiki.pm:270

 msgid "Discussion"
 msgstr "Thảo luận"
 
 msgid "Discussion"
 msgstr "Thảo luận"
 

-#: ../IkiWiki.pm:580
+#: ../IkiWiki.pm:648

 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr ""
 "Cần phải xác định địa chỉ URL tới wiki với « --url » khi dùng « --cgi »"
 
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr ""
 "Cần phải xác định địa chỉ URL tới wiki với « --url » khi dùng « --cgi »"
 

-#: ../IkiWiki.pm:628
+#: ../IkiWiki.pm:723

 #, perl-format
 msgid "unsupported umask setting %s"
 msgstr ""
 
 #, perl-format
 msgid "unsupported umask setting %s"
 msgstr ""
 

-#: ../IkiWiki.pm:668
+#: ../IkiWiki.pm:763

 msgid "cannot use multiple rcs plugins"
 msgstr ""
 
 msgid "cannot use multiple rcs plugins"
 msgstr ""
 

-#: ../IkiWiki.pm:698
+#: ../IkiWiki.pm:793

 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 

-#: ../IkiWiki.pm:1490
+#: ../IkiWiki.pm:1606

 #, fuzzy, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "vòng lặp tiền xử lý %s được phát hiện trên %s ở độ sâu %i"
 
 #, fuzzy, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "vòng lặp tiền xử lý %s được phát hiện trên %s ở độ sâu %i"
 

-#: ../IkiWiki.pm:1684
+#: ../IkiWiki.pm:1800

 #, fuzzy, perl-format
 msgid "bad file name %s"
 msgstr "đang bỏ qua tên tập tin sai %s"
 
 #, fuzzy, perl-format
 msgid "bad file name %s"
 msgstr "đang bỏ qua tên tập tin sai %s"
 

-#: ../IkiWiki.pm:1984
+#: ../IkiWiki.pm:2113

 #, perl-format
 msgid "template %s not found"
 msgstr "không tìm thấy mẫu %s"
 
 #, perl-format
 msgid "template %s not found"
 msgstr "không tìm thấy mẫu %s"
 

-#: ../IkiWiki.pm:2234
+#: ../IkiWiki.pm:2371

 msgid "yes"
 msgstr ""
 
 msgid "yes"
 msgstr ""
 

-#: ../IkiWiki.pm:2318
+#: ../IkiWiki.pm:2456

 #, fuzzy, perl-format
 msgid "invalid sort type %s"
 msgstr "kiểu sắp xếp không rõ %s"
 
 #, fuzzy, perl-format
 msgid "invalid sort type %s"
 msgstr "kiểu sắp xếp không rõ %s"
 

-#: ../IkiWiki.pm:2339
+#: ../IkiWiki.pm:2477

 #, perl-format
 msgid "unknown sort type %s"
 msgstr "kiểu sắp xếp không rõ %s"
 
 #, perl-format
 msgid "unknown sort type %s"
 msgstr "kiểu sắp xếp không rõ %s"
 

-#: ../IkiWiki.pm:2475
+#: ../IkiWiki.pm:2626

 #, fuzzy, perl-format
 msgid "cannot match pages: %s"
 msgstr "không thể đọc %s: %s"
 #, fuzzy, perl-format
 msgid "cannot match pages: %s"
 msgstr "không thể đọc %s: %s"


@@ -1375,13 +1423,17 @@ msgid "What revision control system to use?"
 msgstr ""
 
 #: ../auto.setup:21
 msgstr ""
 
 #: ../auto.setup:21

-msgid "Which user (wiki account or openid) will be admin?"
+msgid "Which user (wiki account, openid, or email) will be admin?"

 msgstr ""
 
 #: ../auto.setup:24
 msgid "What is the domain name of the web server?"
 msgstr ""
 
 msgstr ""
 
 #: ../auto.setup:24
 msgid "What is the domain name of the web server?"
 msgstr ""
 

+#, fuzzy
+#~ msgid "failed to load openid module: "
+#~ msgstr "lỗi biên dịch %s"
+

 #~ msgid "You need to log in first."
 #~ msgstr "Trước tiên bạn cần phải đăng nhập."
 
 #~ msgid "You need to log in first."
 #~ msgstr "Trước tiên bạn cần phải đăng nhập."