\n"
@@ -24,10 +24,13 @@ msgid ""
msgstr ""
#: ../IkiWiki/CGI.pm:220
-msgid "login failed, perhaps you need to turn on cookies?"
+msgid ""
+"Login succeeded, but I don't remember why you were logging in, so you'll "
+"have to navigate back to whatever you were doing. (This should not normally "
+"happen. Perhaps you need to enable cookies?)"
msgstr ""
-#: ../IkiWiki/CGI.pm:239 ../IkiWiki/CGI.pm:394
+#: ../IkiWiki/CGI.pm:239 ../IkiWiki/CGI.pm:395
msgid "Your login session has expired."
msgstr ""
@@ -44,15 +47,15 @@ msgstr "Tùy thích đã được lưu."
msgid "Admin"
msgstr ""
-#: ../IkiWiki/CGI.pm:302
+#: ../IkiWiki/CGI.pm:303
msgid "Preferences saved."
msgstr "Tùy thích đã được lưu."
-#: ../IkiWiki/CGI.pm:357
+#: ../IkiWiki/CGI.pm:358
msgid "You are banned."
msgstr "Bạn bị cấm ra."
-#: ../IkiWiki/CGI.pm:490 ../IkiWiki/CGI.pm:491 ../IkiWiki.pm:1653
+#: ../IkiWiki/CGI.pm:491 ../IkiWiki/CGI.pm:492 ../IkiWiki.pm:1672
msgid "Error"
msgstr "Lỗi"
@@ -172,19 +175,19 @@ msgstr ""
msgid "prohibited by allowed_attachments"
msgstr ""
-#: ../IkiWiki/Plugin/attachment.pm:234
+#: ../IkiWiki/Plugin/attachment.pm:235
msgid "bad attachment filename"
msgstr ""
-#: ../IkiWiki/Plugin/attachment.pm:307
+#: ../IkiWiki/Plugin/attachment.pm:308
msgid "attachment upload"
msgstr ""
-#: ../IkiWiki/Plugin/attachment.pm:358
+#: ../IkiWiki/Plugin/attachment.pm:359
msgid "this attachment is not yet saved"
msgstr ""
-#: ../IkiWiki/Plugin/attachment.pm:376
+#: ../IkiWiki/Plugin/attachment.pm:377
msgid "just uploaded"
msgstr ""
@@ -382,7 +385,7 @@ msgstr ""
msgid "Invalid email address."
msgstr ""
-#: ../IkiWiki/Plugin/emailauth.pm:98 ../IkiWiki/Plugin/passwordauth.pm:377
+#: ../IkiWiki/Plugin/emailauth.pm:98 ../IkiWiki/Plugin/passwordauth.pm:380
msgid "Failed to send mail"
msgstr "Lỗi gửi thư"
@@ -426,25 +429,25 @@ msgstr "không thể đọc %s: %s"
msgid "%s is an attachment, not a page."
msgstr ""
-#: ../IkiWiki/Plugin/git.pm:929 ../IkiWiki/Plugin/git.pm:992 ../IkiWiki.pm:1873
+#: ../IkiWiki/Plugin/git.pm:933 ../IkiWiki/Plugin/git.pm:997 ../IkiWiki.pm:1892
#, perl-format
msgid "you are not allowed to change %s"
msgstr ""
-#: ../IkiWiki/Plugin/git.pm:951
+#: ../IkiWiki/Plugin/git.pm:955
#, perl-format
msgid "you cannot act on a file with mode %s"
msgstr ""
-#: ../IkiWiki/Plugin/git.pm:955
+#: ../IkiWiki/Plugin/git.pm:959
msgid "you are not allowed to change file modes"
msgstr ""
-#: ../IkiWiki/Plugin/git.pm:1029
+#: ../IkiWiki/Plugin/git.pm:1033
msgid "you are not allowed to revert a merge"
msgstr ""
-#: ../IkiWiki/Plugin/git.pm:1087 ../IkiWiki/Plugin/git.pm:1107
+#: ../IkiWiki/Plugin/git.pm:1085 ../IkiWiki/Plugin/git.pm:1104
#, fuzzy, perl-format
msgid "Failed to revert commit %s"
msgstr "lỗi biên dịch %s"
@@ -489,7 +492,7 @@ msgid "Unable to detect image type from extension"
msgstr "lỗi ghi %s: %s"
#: ../IkiWiki/Plugin/img.pm:104 ../IkiWiki/Plugin/img.pm:136
-#: ../IkiWiki/Plugin/img.pm:175 ../IkiWiki/Plugin/img.pm:217
+#: ../IkiWiki/Plugin/img.pm:175 ../IkiWiki/Plugin/img.pm:223
#, fuzzy, perl-format
msgid "failed to read %s: %s"
msgstr "lỗi ghi %s: %s"
@@ -509,22 +512,22 @@ msgstr "có vẻ là %s không phải có khả năng thực hiện"
msgid "Image::Magick is not installed"
msgstr "chưa cài đặt polygen"
-#: ../IkiWiki/Plugin/img.pm:178
+#: ../IkiWiki/Plugin/img.pm:184
#, fuzzy, perl-format
msgid "failed to get dimensions of %s"
msgstr "lỗi ghi %s: %s"
-#: ../IkiWiki/Plugin/img.pm:185
+#: ../IkiWiki/Plugin/img.pm:191
#, perl-format
msgid "wrong size format \"%s\" (should be WxH)"
msgstr ""
-#: ../IkiWiki/Plugin/img.pm:221
+#: ../IkiWiki/Plugin/img.pm:227
#, fuzzy, perl-format
msgid "failed to resize: %s"
msgstr "lỗi ghi %s: %s"
-#: ../IkiWiki/Plugin/img.pm:246
+#: ../IkiWiki/Plugin/img.pm:252
#, fuzzy, perl-format
msgid "failed to determine size of image %s"
msgstr "lỗi ghi %s: %s"
@@ -600,11 +603,11 @@ msgstr ""
msgid "Password"
msgstr ""
-#: ../IkiWiki/Plugin/mdwn.pm:53
+#: ../IkiWiki/Plugin/mdwn.pm:74
msgid "multimarkdown is enabled, but Text::MultiMarkdown is not installed"
msgstr ""
-#: ../IkiWiki/Plugin/mdwn.pm:98
+#: ../IkiWiki/Plugin/mdwn.pm:150
#, 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)"
@@ -675,7 +678,7 @@ msgstr "Mọi trang được liên kết với trang khác."
msgid "bad or missing template"
msgstr ""
-#: ../IkiWiki/Plugin/passwordauth.pm:145 ../IkiWiki/Plugin/passwordauth.pm:343
+#: ../IkiWiki/Plugin/passwordauth.pm:145 ../IkiWiki/Plugin/passwordauth.pm:347
msgid "Error creating account."
msgstr "Gặp lỗi khi tạo tài khoản."
@@ -687,31 +690,31 @@ msgstr ""
msgid "Create your user page"
msgstr ""
-#: ../IkiWiki/Plugin/passwordauth.pm:340
+#: ../IkiWiki/Plugin/passwordauth.pm:344
msgid "Account creation successful. Now you can Login."
msgstr "Tài khoản đã được tạo. Lúc bây giờ bạn có thể đăng nhập."
-#: ../IkiWiki/Plugin/passwordauth.pm:350
+#: ../IkiWiki/Plugin/passwordauth.pm:353
msgid "No email address, so cannot email password reset instructions."
msgstr ""
-#: ../IkiWiki/Plugin/passwordauth.pm:379
+#: ../IkiWiki/Plugin/passwordauth.pm:382
msgid "You have been mailed password reset instructions."
msgstr ""
-#: ../IkiWiki/Plugin/passwordauth.pm:414
+#: ../IkiWiki/Plugin/passwordauth.pm:418
msgid "incorrect password reset url"
msgstr ""
-#: ../IkiWiki/Plugin/passwordauth.pm:417
+#: ../IkiWiki/Plugin/passwordauth.pm:421
msgid "password reset denied"
msgstr ""
-#: ../IkiWiki/Plugin/passwordauth.pm:430
+#: ../IkiWiki/Plugin/passwordauth.pm:434
msgid "incorrect url"
msgstr ""
-#: ../IkiWiki/Plugin/passwordauth.pm:433
+#: ../IkiWiki/Plugin/passwordauth.pm:437
msgid "access denied"
msgstr ""
@@ -964,11 +967,11 @@ msgstr ""
msgid "confirm removal of %s"
msgstr ""
-#: ../IkiWiki/Plugin/remove.pm:204
+#: ../IkiWiki/Plugin/remove.pm:206
msgid "Please select the attachments to remove."
msgstr ""
-#: ../IkiWiki/Plugin/remove.pm:264
+#: ../IkiWiki/Plugin/remove.pm:267
msgid "removed"
msgstr ""
@@ -1213,7 +1216,7 @@ msgstr ""
msgid "Error: %s exited nonzero (%s). Discarding setup changes."
msgstr ""
-#: ../IkiWiki/Receive.pm:34
+#: ../IkiWiki/Receive.pm:36
#, perl-format
msgid "cannot determine id of untrusted committer %s"
msgstr ""
@@ -1332,18 +1335,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"
-#: ../IkiWiki/Wrapper.pm:120
+#: ../IkiWiki/Wrapper.pm:122
msgid "Please wait"
msgstr ""
#. translators: The parameter is a C filename.
-#: ../IkiWiki/Wrapper.pm:301
+#: ../IkiWiki/Wrapper.pm:303
#, perl-format
msgid "failed to compile %s"
msgstr "lỗi biên dịch %s"
#. translators: The parameter is a filename.
-#: ../IkiWiki/Wrapper.pm:321
+#: ../IkiWiki/Wrapper.pm:323
#, perl-format
msgid "successfully generated %s"
msgstr "%s đã được tạo ra"
@@ -1395,36 +1398,36 @@ msgstr ""
msgid "failed to load external plugin needed for %s plugin: %s"
msgstr ""
-#: ../IkiWiki.pm:1633
+#: ../IkiWiki.pm:1652
#, 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:1829
+#: ../IkiWiki.pm:1848
#, fuzzy, perl-format
msgid "bad file name %s"
msgstr "đang bỏ qua tên tập tin sai %s"
-#: ../IkiWiki.pm:2142
+#: ../IkiWiki.pm:2161
#, perl-format
msgid "template %s not found"
msgstr "không tìm thấy mẫu %s"
-#: ../IkiWiki.pm:2400
+#: ../IkiWiki.pm:2419
msgid "yes"
msgstr ""
-#: ../IkiWiki.pm:2485
+#: ../IkiWiki.pm:2504
#, fuzzy, perl-format
msgid "invalid sort type %s"
msgstr "kiểu sắp xếp không rõ %s"
-#: ../IkiWiki.pm:2506
+#: ../IkiWiki.pm:2525
#, perl-format
msgid "unknown sort type %s"
msgstr "kiểu sắp xếp không rõ %s"
-#: ../IkiWiki.pm:2655
+#: ../IkiWiki.pm:2674
#, fuzzy, perl-format
msgid "cannot match pages: %s"
msgstr "không thể đọc %s: %s"
diff --git a/t/meta.t b/t/meta.t
index 3b26ee7d2..63c01937f 100755
--- a/t/meta.t
+++ b/t/meta.t
@@ -65,12 +65,6 @@ write_build_read_compare(
qr{},
);
-write_build_read_compare(
- 'enclosure',
- q{[[!meta enclosure="ikiwiki/login-selector/wordpress.png"]]},
- qr{},
-);
-
write_build_read_compare(
'author',
q{[[!meta author="Noodly J. Appendage"]]},
diff --git a/underlays/login-selector/ikiwiki/login-selector/aol.png b/underlays/login-selector/ikiwiki/login-selector/aol.png
deleted file mode 100644
index d47f5fa54..000000000
Binary files a/underlays/login-selector/ikiwiki/login-selector/aol.png and /dev/null differ
diff --git a/underlays/login-selector/ikiwiki/login-selector/goa-account-flickr.png b/underlays/login-selector/ikiwiki/login-selector/goa-account-flickr.png
deleted file mode 100644
index 5321642f6..000000000
Binary files a/underlays/login-selector/ikiwiki/login-selector/goa-account-flickr.png and /dev/null differ
diff --git a/underlays/login-selector/ikiwiki/login-selector/goa-account-yahoo.png b/underlays/login-selector/ikiwiki/login-selector/goa-account-yahoo.png
deleted file mode 100644
index 51e1c119b..000000000
Binary files a/underlays/login-selector/ikiwiki/login-selector/goa-account-yahoo.png and /dev/null differ
diff --git a/underlays/login-selector/ikiwiki/login-selector/login-selector.js b/underlays/login-selector/ikiwiki/login-selector/login-selector.js
index 71ae0466e..f54a94469 100644
--- a/underlays/login-selector/ikiwiki/login-selector/login-selector.js
+++ b/underlays/login-selector/ikiwiki/login-selector/login-selector.js
@@ -21,38 +21,7 @@ var selections_openid_large = {
url: null
}
};
-var selections_openid_small = {
- verisign: {
- name: 'Verisign',
- icon: 'ikiwiki/login-selector/verisign.png',
- label: 'Enter your Verisign username:',
- url: 'http://{username}.pip.verisignlabs.com/'
- },
- yahoo: {
- name: 'Yahoo',
- icon: 'ikiwiki/login-selector/goa-account-yahoo.png',
- url: 'http://me.yahoo.com/'
- },
- flickr: {
- name: 'Flickr',
- icon: 'ikiwiki/login-selector/goa-account-flickr.png',
- label: 'Enter your Flickr username:',
- url: 'http://flickr.com/photos/{username}/'
- },
- wordpress: {
- name: 'Wordpress',
- icon: 'ikiwiki/login-selector/wordpress.png',
- label: 'Enter your Wordpress.com username:',
- url: 'http://{username}.wordpress.com/'
- },
- aol: {
- name: 'AOL',
- icon: 'ikiwiki/login-selector/aol.png',
- label: 'Enter your AOL username:',
- url: 'http://openid.aol.com/{username}'
- }
-};
-var selections = $.extend({}, selections_email_large, selections_openid_large, selections_openid_small);
+var selections = $.extend({}, selections_email_large, selections_openid_large);
var selector = {
@@ -108,14 +77,6 @@ var selector = {
$('#'+this.othersignin_id).hide();
}
- if (login_methods['openid'] && selections_openid_small) {
- selector_btns.append('
');
-
- for (id in selections_openid_small) {
- selector_btns.append(this.getBoxHTML(selections_openid_small[id], 'small'));
- }
- }
-
$('#login_selector_form').submit(this.submit);
var box_id = this.readCookie();
diff --git a/underlays/login-selector/ikiwiki/login-selector/verisign.png b/underlays/login-selector/ikiwiki/login-selector/verisign.png
deleted file mode 100644
index 5120812ed..000000000
Binary files a/underlays/login-selector/ikiwiki/login-selector/verisign.png and /dev/null differ
diff --git a/underlays/login-selector/ikiwiki/login-selector/wordpress.png b/underlays/login-selector/ikiwiki/login-selector/wordpress.png
deleted file mode 100644
index 96e08bd99..000000000
Binary files a/underlays/login-selector/ikiwiki/login-selector/wordpress.png and /dev/null differ