Index: /branches/release-40/default_templates/notify-entry.mtml =================================================================== --- /branches/release-40/default_templates/notify-entry.mtml (revision 1118) +++ /branches/release-40/default_templates/notify-entry.mtml (revision 2603) @@ -1,25 +1,25 @@ -<__trans phrase="A new [lc,_3] entitled '[_1]' has been published to [_2]." params="<$MTEntryTitle$>%%<$MTBlogName$>%%<$MTEntryClassLabel$>"> +<__trans phrase="A new [lc,_3] entitled '[_1]' has been published to [_2]." params="<$mt:EntryTitle$>%%<$mt:BlogName$>%%<$mt:EntryClassLabel$>"> -<__trans phrase="View entry:"><__trans phrase="View page:"> <<$MTEntryStatus$><$MTEntryPermalink$>> +<__trans phrase="View entry:"><__trans phrase="View page:"> <<$mt:EntryStatus$><$mt:EntryPermalink$><$mt:Var name="entry_editurl"$>> ------------------------------------------------------------------------ -<__trans phrase="[_1] Title: [_2]" params="<$MTEntryClassLabel lower_case="1"$>%%<$MTEntryTitle$>"> -<__trans phrase="Publish Date: [_1]" params="<$MTEntryDate mail="1"$>"> - +<__trans phrase="[_1] Title: [_2]" params="<$mt:EntryClassLabel lower_case="1"$>%%<$mt:EntryTitle$>"> +<__trans phrase="Publish Date: [_1]" params="<$mt:EntryDate mail="1"$>"> + -<$MTEntryExcerpt wrap_text="72"$> - +<$mt:EntryExcerpt wrap_text="72"$> + ------------------------------------------------------------------------ -<__trans phrase="Message from Sender:"> - - +<__trans phrase="Message from Sender:"> +<$mt:Var name="message"$> + ------------------------------------------------------------------------ -<$MTEntryBody remove_html="1" wrap_text="72"$> +<$mt:EntryBody remove_html="1" wrap_text="72"$> ------------------------------------------------------------------------- +------------------------------------------------------------------------ -<__trans phrase="You are receiving this email either because you have elected to receive notifications about new content on [_1], or the author of the post thought you would be interested. If you no longer wish to receive these emails, please contact the following person:" params="<$MTBlogName$>"> +<__trans phrase="You are receiving this email either because you have elected to receive notifications about new content on [_1], or the author of the post thought you would be interested. If you no longer wish to receive these emails, please contact the following person:" params="<$mt:BlogName$>"> -<$MTAuthorDisplayName$> <<$MTAuthorEmail$>> +<$mt:AuthorDisplayName$> <<$mt:AuthorEmail$>> Index: /branches/release-40/default_templates/main_index.mtml =================================================================== --- /branches/release-40/default_templates/main_index.mtml (revision 2312) +++ /branches/release-40/default_templates/main_index.mtml (revision 2603) @@ -3,14 +3,14 @@ - <$mt:include module="<__trans phrase="HTML Head">"$> - " /> - <$MTBlogName encode_html="1"$> + <$mt:Include module="<__trans phrase="HTML Head">"$> + " /> + <$mt:BlogName encode_html="1"$> -"> +">

- <$mt:include module="<__trans phrase="Banner Header">"$> + <$mt:Include module="<__trans phrase="Banner Header">"$> @@ -21,12 +21,12 @@

- - - <$mt:include module="<__trans phrase="Entry Summary">"$> - + + + <$mt:Include module="<__trans phrase="Entry Summary">"$> +

- "><__trans phrase="Archives"> + "><__trans phrase="Archives">

@@ -36,5 +36,5 @@ - <$MTInclude module="<__trans phrase="Sidebar">"$> + <$mt:Include module="<__trans phrase="Sidebar">"$> @@ -43,5 +43,5 @@ - <$mt:include module="<__trans phrase="Banner Footer">"$> + <$mt:Include module="<__trans phrase="Banner Footer">"$> Index: /branches/release-40/default_templates/page.mtml =================================================================== --- /branches/release-40/default_templates/page.mtml (revision 2312) +++ /branches/release-40/default_templates/page.mtml (revision 2603) @@ -3,5 +3,5 @@ - <$mt:include module="<__trans phrase="HTML Head">"$> + <$mt:Include module="<__trans phrase="HTML Head">"$> <$mt:EntryTrackbackData$> <$mt:PageTitle encode_html="1"$> - <$mt:BlogName encode_html="1"$> @@ -12,5 +12,5 @@ - <$mt:include module="<__trans phrase="Banner Header">"$> + <$mt:Include module="<__trans phrase="Banner Header">"$> @@ -58,5 +58,5 @@ - <$mt:include module="<__trans phrase="Banner Footer">"$> + <$mt:Include module="<__trans phrase="Banner Footer">"$> Index: /branches/release-40/default_templates/main_index_widgets_group.mtml =================================================================== --- /branches/release-40/default_templates/main_index_widgets_group.mtml (revision 2052) +++ /branches/release-40/default_templates/main_index_widgets_group.mtml (revision 2603) @@ -3,7 +3,7 @@ - <$mt:include widget="<__trans phrase="Recent Comments">"$> - <$mt:include widget="<__trans phrase="Recent Entries">"$> - <$mt:include widget="<__trans phrase="Recent Assets">"$> - <$mt:include widget="<__trans phrase="Tag Cloud">"$> + <$mt:Include widget="<__trans phrase="Recent Comments">"$> + <$mt:Include widget="<__trans phrase="Recent Entries">"$> + <$mt:Include widget="<__trans phrase="Recent Assets">"$> + <$mt:Include widget="<__trans phrase="Tag Cloud">"$> Index: /branches/release-40/default_templates/banner_header.mtml =================================================================== --- /branches/release-40/default_templates/banner_header.mtml (revision 1851) +++ /branches/release-40/default_templates/banner_header.mtml (revision 2603) @@ -2,12 +2,12 @@

- - -

<$MTBlogName encode_html="1"$>

<$MTBlogDescription$>

- -

<$MTBlogDescription$>

- + + +

<$mt:BlogName encode_html="1"$>

<$mt:BlogDescription$>

+ +

<$mt:BlogName encode_html="1"$>

<$mt:BlogDescription$>

Index: /branches/release-40/default_templates/entry_summary.mtml =================================================================== --- /branches/release-40/default_templates/entry_summary.mtml (revision 2471) +++ /branches/release-40/default_templates/entry_summary.mtml (revision 2603) @@ -1,41 +1,41 @@ -<$MTEntryTrackbackData$> -

+<$mt:EntryTrackbackData$> +

<$MTEntryTitle$>

<$mt:EntryTitle$>

- - <__trans phrase="By [_1] on [_2]" params="<$MTEntryAuthorLink show_hcard="1"$>%%"><$MTEntryDate format="%x %X"$>"> - - "><$MTEntryDate format="%x %X"$> - + + <__trans phrase="By [_1] on [_2]" params="<$mt:EntryAuthorLink show_hcard="1"$>%%"><$mt:EntryDate format="%x %X"$>"> + + "><$mt:EntryDate format="%x %X"$> + - - | <$MTEntryCommentCount singular="<__trans phrase="1 Comment">" plural="<__trans phrase="# Comments">" none="<__trans phrase="No Comments">"$> - | <$MTEntryTrackbackCount singular="<__trans phrase="1 TrackBack">" plural="<__trans phrase="# TrackBacks">" none="<__trans phrase="No TrackBacks">"$> - + + | <$mt:EntryCommentCount singular="<__trans phrase="1 Comment">" plural="<__trans phrase="# Comments">" none="<__trans phrase="No Comments">"$> + | <$mt:EntryTrackbackCount singular="<__trans phrase="1 TrackBack">" plural="<__trans phrase="# TrackBacks">" none="<__trans phrase="No TrackBacks">"$> +

- +

- <$MTEntryBody$> + <$mt:EntryBody$>

- - - + + +

<__trans phrase="Tags">:

- - - + + +

- <__trans phrase="Continue reading [_2]." params="<$MTEntryPermalink$>#more%%<$MTEntryTitle$>"> + <__trans phrase="Continue reading [_2]." params="<$mt:EntryPermalink$>#more%%<$mt:EntryTitle$>">

- +

Index: /branches/release-40/default_templates/comment_response.mtml =================================================================== --- /branches/release-40/default_templates/comment_response.mtml (revision 2393) +++ /branches/release-40/default_templates/comment_response.mtml (revision 2603) @@ -5,28 +5,28 @@ - - - "> -

"> - - - "> -

<__trans phrase="Your comment submission failed for the following reasons: [_1]" params="<$MTErrorMessage$>">

- + + + <$mt:SetVar name="page_title" value="<__trans phrase="Confirmation...">"$> + <$mt:SetVar name="message" value="

<__trans phrase="Your comment has been submitted!">

"$> + + + <$mt:SetVar name="page_title" value="<__trans phrase="Thank you for commenting.">"$> + <$mt:SetVar name="message" value="

<__trans phrase="Your comment has been received and held for approval by the blog owner.">

"$> + + + <$mt:SetVar name="page_title" value="<__trans phrase="Comment Submission Error">"$> +

<__trans phrase="Your comment submission failed for the following reasons: [_1]" params="<$mt:ErrorMessage$>">

+ - <$mt:include module="<__trans phrase="HTML Head">"$> - <$MTBlogName encode_html="1"$>: <$MTVar name="page_title"$> + <$mt:Include module="<__trans phrase="HTML Head">"$> + <$mt:BlogName encode_html="1"$>: <$mt:Var name="page_title"$> - <$MTVar name="page_layout"$>"> + <$mt:Var name="page_layout"$>">

- <$mt:include module="<__trans phrase="Banner Header">"$> + <$mt:Include module="<__trans phrase="Banner Header">"$> @@ -37,12 +37,12 @@

<$MTVar name="page_title"$>

- <$MTVar name="message"$> -

<__trans phrase="Return to the original entry." params="<$MTEntryLink$>">

<$mt:Var name="page_title"$>

+ <$mt:Var name="message"$> +

<__trans phrase="Return to the original entry." params="<$mt:EntryLink$>">

- <$MTInclude module="<__trans phrase="Sidebar">"$> + <$mt:Include module="<__trans phrase="Sidebar">"$> @@ -51,5 +51,5 @@ - <$mt:include module="<__trans phrase="Banner Footer">"$> + <$mt:Include module="<__trans phrase="Banner Footer">"$> Index: /branches/release-40/default_templates/commenter_notify.mtml =================================================================== --- /branches/release-40/default_templates/commenter_notify.mtml (revision 1102) +++ /branches/release-40/default_templates/commenter_notify.mtml (revision 2603) @@ -1,11 +1,11 @@ -<__trans phrase="This email is to notify you that a new user has successfully registered on the blog '[_1]'. Listed below you will find some useful information about this new user." params="<$MTBlogName$>"> +<__trans phrase="This email is to notify you that a new user has successfully registered on the blog '[_1]'. Listed below you will find some useful information about this new user." params="<$mt:BlogName$>"> <__trans phrase="New User Information:"> -<__trans phrase="Username: [_1]" params="<$MTCommenterUsername$>"> -<__trans phrase="Full Name: [_1]" params="<$MTCommenterName$>"> -<__trans phrase="Email: [_1]" params="<$MTCommenterEmail$>"> +<__trans phrase="Username: [_1]" params="<$mt:CommenterUsername$>"> +<__trans phrase="Full Name: [_1]" params="<$mt:CommenterName$>"> +<__trans phrase="Email: [_1]" params="<$mt:CommenterEmail$>"> <__trans phrase="To view or edit this user, please click on or cut and paste the following URL into a web browser:"> - +<$mt:Var name="profile_url"$> -"> +<$mt:Include module="<__trans phrase="Mail Footer">"$> Index: /branches/release-40/default_templates/footer-email.mtml =================================================================== --- /branches/release-40/default_templates/footer-email.mtml (revision 1102) +++ /branches/release-40/default_templates/footer-email.mtml (revision 2603) @@ -1,4 +1,4 @@ -- -<__trans phrase="Powered by Movable Type [_1]" params="<$MTVersion$>"> -<$mt:var name="portal_url"$> +<__trans phrase="Powered by Movable Type [_1]" params="<$mt:Version$>"> +<$mt:Var name="portal_url"$> Index: /branches/release-40/default_templates/archive_widgets_group.mtml =================================================================== --- /branches/release-40/default_templates/archive_widgets_group.mtml (revision 2052) +++ /branches/release-40/default_templates/archive_widgets_group.mtml (revision 2603) @@ -2,13 +2,13 @@ <__trans phrase="This is a custom set of widgets that are conditioned to serve different content based upon what type of archive it is included. More info: [_1]" params="http://www.movabletype.org/documentation/designer/widget-sets.html"> - + - <$mt:include widget="<__trans phrase="Current Category Monthly Archives">"$> + <$mt:Include widget="<__trans phrase="Current Category Monthly Archives">"$> - + - <$mt:include widget="<__trans phrase="Category Archives">"$> + <$mt:Include widget="<__trans phrase="Category Archives">"$> - <$mt:include widget="<__trans phrase="Monthly Archives">"$> + <$mt:Include widget="<__trans phrase="Monthly Archives">"$> Index: /branches/release-40/default_templates/verify-subscribe.mtml =================================================================== --- /branches/release-40/default_templates/verify-subscribe.mtml (revision 1102) +++ /branches/release-40/default_templates/verify-subscribe.mtml (revision 2603) @@ -1,7 +1,7 @@ -<__trans phrase="Thanks for subscribing to notifications about updates to [_1]. Follow the link below to confirm your subscription:" params="<$MTBlogName$>"> +<__trans phrase="Thanks for subscribing to notifications about updates to [_1]. Follow the link below to confirm your subscription:" params="<$mt:BlogName$>"> -?__mode=confirm;email=;magic=;blog_id=<$MTBlogID$>;redirect=;entry_id=<$MTEntryID$> +<$mt:Var name="script_path"$>?__mode=confirm;email=<$mt:Var name="email" escape="url"$>;magic=<$mt:Var name="magic" escape="url"$>;blog_id=<$mt:BlogID$>;redirect=<$mt:Var name="redirect_url" escape="url"$>;entry_id=<$mt:EntryID$> <__trans phrase="If the link is not clickable, just copy and paste it into your browser."> -"> +<$mt:Include module="<__trans phrase="Mail Footer">"$> Index: /branches/release-40/default_templates/new-ping.mtml =================================================================== --- /branches/release-40/default_templates/new-ping.mtml (revision 1103) +++ /branches/release-40/default_templates/new-ping.mtml (revision 2603) @@ -1,23 +1,23 @@ -<__trans phrase="An unapproved TrackBack has been posted on your blog [_1], for entry #[_2] ([_3]). You need to approve this TrackBack before it will appear on your site." params="<$MTBlogName$>%%<$MTEntryID$>%%<$MTEntryTitle$>">"><__trans phrase="An unapproved TrackBack has been posted on your blog [_1], for category #[_2], ([_3]). You need to approve this TrackBack before it will appear on your site." params="<$MTBlogName$>%%<$MTCategoryID$>%%<$MTCategoryLabel$>"><__trans phrase="A new TrackBack has been posted on your blog [_1], on entry #[_2] ([_3])." params="<$MTBlogName$>%%<$MTEntryID$>%%<$MTEntryTitle$>"><__trans phrase="A new TrackBack has been posted on your blog [_1], on category #[_2] ([_3])." params="<$MTBlogName$>%%<$MTCategoryID$>%%<$MTCategoryLabel$>"> +<__trans phrase="An unapproved TrackBack has been posted on your blog [_1], for entry #[_2] ([_3]). You need to approve this TrackBack before it will appear on your site." params="<$mt:BlogName$>%%<$mt:EntryID$>%%<$mt:EntryTitle$>">"><__trans phrase="An unapproved TrackBack has been posted on your blog [_1], for category #[_2], ([_3]). You need to approve this TrackBack before it will appear on your site." params="<$mt:BlogName$>%%<$mt:CategoryID$>%%<$mt:CategoryLabel$>"><__trans phrase="A new TrackBack has been posted on your blog [_1], on entry #[_2] ([_3])." params="<$mt:BlogName$>%%<$mt:EntryID$>%%<$mt:EntryTitle$>"><__trans phrase="A new TrackBack has been posted on your blog [_1], on category #[_2] ([_3])." params="<$mt:BlogName$>%%<$mt:CategoryID$>%%<$mt:CategoryLabel$>"> <__trans phrase="Excerpt">: -<$MTPingExcerpt wrap_text="72"$> +<$mt:PingExcerpt wrap_text="72"$> -<__trans phrase="URL">: <$MTPingURL$> -<__trans phrase="Title">: <$MTPingTitle$> -<__trans phrase="Blog">: <$MTPingBlogName$> -<__trans phrase="IP address">: <$MTPingIP$> +<__trans phrase="URL">: <$mt:PingURL$> +<__trans phrase="Title">: <$mt:PingTitle$> +<__trans phrase="Blog">: <$mt:PingBlogName$> +<__trans phrase="IP address">: <$mt:PingIP$> -<__trans phrase="Approve TrackBack">: - <> - -<__trans phrase="View TrackBack">: - <<$MTEntryPermalink$>> - -<__trans phrase="Report TrackBack as spam">: - <> - +<__trans phrase="Approve TrackBack">: + <<$mt:Var name="approve_url"$>> + +<__trans phrase="View TrackBack">: + <<$mt:EntryPermalink$>> + +<__trans phrase="Report TrackBack as spam">: + <<$mt:Var name="spam_url"$>> + <__trans phrase="Edit TrackBack">: - <> + <<$mt:Var name="edit_url"$>> -"> +<$mt:Include module="<__trans phrase="Mail Footer">"$> Index: /branches/release-40/default_templates/syndication.mtml =================================================================== --- /branches/release-40/default_templates/syndication.mtml (revision 2052) +++ /branches/release-40/default_templates/syndication.mtml (revision 2603) @@ -4,7 +4,7 @@

" width="9" height="9" /> "><__trans phrase="Subscribe to this blog's feed">

- -

" width="9" height="9" /> &Template=feed&IncludeBlogs=<$mt:SearchIncludeBlogs$>&limit=" title="<__trans phrase="Subscribe to feed">"><__trans phrase="Search results matching “<$mt:SearchString$>”">

- + +

" width="9" height="9" /> &Template=feed&IncludeBlogs=<$mt:SearchIncludeBlogs$>&limit=<$mt:SearchMaxResults$>" title="<__trans phrase="Subscribe to feed">"><__trans phrase="Search results matching “<$mt:SearchString$>”">

+ Index: /branches/release-40/default_templates/comment_throttle.mtml =================================================================== --- /branches/release-40/default_templates/comment_throttle.mtml (revision 1103) +++ /branches/release-40/default_templates/comment_throttle.mtml (revision 2603) @@ -1,8 +1,8 @@ -<__trans phrase="If this was a mistake, you can unblock the IP address and allow the visitor to add it again by logging in to your Movable Type installation, going to Blog Config - IP Banning, and deleting the IP address [_1] from the list of banned addresses." params=""> -<__trans phrase="A visitor to your blog [_1] has automatically been banned by adding more than the allowed number of comments in the last [_2] seconds." params="<$MTBlogName$>%%"> +<__trans phrase="If this was a mistake, you can unblock the IP address and allow the visitor to add it again by logging in to your Movable Type installation, going to Blog Config - IP Banning, and deleting the IP address [_1] from the list of banned addresses." params="<$mt:Var name="throttled_ip"$>"> +<__trans phrase="A visitor to your blog [_1] has automatically been banned by adding more than the allowed number of comments in the last [_2] seconds." params="<$mt:BlogName$>%%<$mt:Var name="throttle_seconds"$>"> <__trans phrase="This has been done to prevent a malicious script from overwhelming your weblog with comments. The banned IP address is"> - +<$mt:Var name="throttled_ip"$> - +<$mt:Var name="message"$> Index: /branches/release-40/default_templates/category_entry_listing.mtml =================================================================== --- /branches/release-40/default_templates/category_entry_listing.mtml (revision 2101) +++ /branches/release-40/default_templates/category_entry_listing.mtml (revision 2603) @@ -3,20 +3,20 @@ - <$mt:include module="<__trans phrase="HTML Head">"$> - <$MTBlogName encode_html="1"$>: <__trans phrase="[_1] Archives" params="<$MTArchiveTitle$>"> - + <$mt:Include module="<__trans phrase="HTML Head">"$> + <$mt:BlogName encode_html="1"$>: <__trans phrase="[_1] Archives" params="<$mt:ArchiveTitle$>"> + - - - " /> - " /> - + + + " /> + " /> + - <$MTVar name="page_layout"$>"> + <$mt:Var name="page_layout"$>">

- <$mt:include module="<__trans phrase="Banner Header">"$> + <$mt:Include module="<__trans phrase="Banner Header">"$> @@ -27,26 +27,26 @@

- - -

<__trans phrase="[_1] Archives" params="<$MTArchiveTitle$>">

- - -

<__trans phrase="Recently in [_1] Category" params="<$MTArchiveTitle$>">

- + + +

<__trans phrase="[_1] Archives" params="<$mt:ArchiveTitle$>">

+ + +

<__trans phrase="Recently in [_1] Category" params="<$mt:ArchiveTitle$>">

+ - -<$mt:setvar name="limit" value="auto"$> - - - <$mt:include module="<__trans phrase="Entry Summary">"$> - + +<$mt:SetVar name="limit" value="auto"$> + + + <$mt:Include module="<__trans phrase="Entry Summary">"$> +

@@ -56,5 +56,5 @@ - <$MTInclude module="<__trans phrase="Sidebar">"$> + <$mt:Include module="<__trans phrase="Sidebar">"$> @@ -63,5 +63,5 @@ - <$mt:include module="<__trans phrase="Banner Footer">"$> + <$mt:Include module="<__trans phrase="Banner Footer">"$> Index: /branches/release-40/default_templates/new-comment.mtml =================================================================== --- /branches/release-40/default_templates/new-comment.mtml (revision 1103) +++ /branches/release-40/default_templates/new-comment.mtml (revision 2603) @@ -1,19 +1,19 @@ -<__trans phrase="An unapproved comment has been posted on your blog [_1], for entry #[_2] ([_3]). You need to approve this comment before it will appear on your site." params="<$MTBlogName$>%%<$MTEntryID$>%%<$MTEntryTitle$>"><__trans phrase="A new comment has been posted on your blog [_1], on entry #[_2] ([_3])." params="<$MTBlogName$>%%<$MTEntryID$>%%<$MTEntryTitle$>"> +<__trans phrase="An unapproved comment has been posted on your blog [_1], for entry #[_2] ([_3]). You need to approve this comment before it will appear on your site." params="<$mt:BlogName$>%%<$mt:EntryID$>%%<$mt:EntryTitle$>"><__trans phrase="A new comment has been posted on your blog [_1], on entry #[_2] ([_3])." params="<$mt:BlogName$>%%<$mt:EntryID$>%%<$mt:EntryTitle$>"> -<$MTCommentBody remove_html="1" wrap_text="72"$> +<$mt:CommentBody remove_html="1" wrap_text="72"$> -<__trans phrase="Commenter name: [_1]" params="<$MTCommentAuthor$>"> -<__trans phrase="Commenter email address: [_1]" params="<$MTCommentEmail$>"> -<__trans phrase="Commenter URL: [_1]" params="<$MTCommentURL$>"> -<__trans phrase="Commenter IP address: [_1]" params="<$MTCommentIP$>"> +<__trans phrase="Commenter name: [_1]" params="<$mt:CommentAuthor$>"> +<__trans phrase="Commenter email address: [_1]" params="<$mt:CommentEmail$>"> +<__trans phrase="Commenter URL: [_1]" params="<$mt:CommentURL$>"> +<__trans phrase="Commenter IP address: [_1]" params="<$mt:CommentIP$>"> -<__trans phrase="Approve comment:"> - <> -<__trans phrase="View comment:"> - <> +<__trans phrase="Approve comment:"> + <<$mt:Var name="approve_url"$>> +<__trans phrase="View comment:"> + <<$mt:Var name="view_url"$>> <__trans phrase="Edit comment:"> - <> -<__trans phrase="Report comment as spam:"> - <> + <<$mt:Var name="edit_url"$>> +<__trans phrase="Report comment as spam:"> + <<$mt:Var name="spam_url"$>> -"> +<$mt:Include module="<__trans phrase="Mail Footer">"$> Index: /branches/release-40/default_templates/entry.mtml =================================================================== --- /branches/release-40/default_templates/entry.mtml (revision 2593) +++ /branches/release-40/default_templates/entry.mtml (revision 2603) @@ -3,16 +3,16 @@ - <$mt:include module="<__trans phrase="HTML Head">"$> - " /> - " /> - <$MTEntryTrackbackData$> - <$MTEntryTitle encode_html="1"$> - <$MTBlogName encode_html="1"$> + <$mt:Include module="<__trans phrase="HTML Head">"$> + " /> + " /> + <$mt:EntryTrackbackData$> + <$mt:EntryTitle encode_html="1"$> - <$mt:BlogName encode_html="1"$> -" onload="mtEntryOnLoad()" onunload="mtEntryOnUnload()"> +" onload="mtEntryOnLoad()" onunload="mtEntryOnUnload()">

- <$mt:include module="<__trans phrase="Banner Header">"$> + <$mt:Include module="<__trans phrase="Banner Header">"$> @@ -25,34 +25,34 @@ -

<$MTEntryTitle$>

<$mt:EntryTitle$>

- - <__trans phrase="By [_1] on [_2]" params="<$MTEntryAuthorLink show_hcard="1"$>%%"><$MTEntryDate format="%x %X"$>"> - - "><$MTEntryDate format="%x %X"$> - + + <__trans phrase="By [_1] on [_2]" params="<$mt:EntryAuthorLink show_hcard="1"$>%%"><$mt:EntryDate format="%x %X"$>"> + + "><$mt:EntryDate format="%x %X"$> + - - | <$MTEntryCommentCount singular="<__trans phrase="1 Comment">" plural="<__trans phrase="# Comments">" none="<__trans phrase="No Comments">"$> - - - | <$MTEntryTrackbackCount singular="<__trans phrase="1 TrackBack">" plural="<__trans phrase="# TrackBacks">" none="<__trans phrase="No TrackBacks">"$> - + + | <$mt:EntryCommentCount singular="<__trans phrase="1 Comment">" plural="<__trans phrase="# Comments">" none="<__trans phrase="No Comments">"$> + + + | <$mt:EntryTrackbackCount singular="<__trans phrase="1 TrackBack">" plural="<__trans phrase="# TrackBacks">" none="<__trans phrase="No TrackBacks">"$> +

- +

- <$MTEntryBody$> + <$mt:EntryBody$>

- - + +

- <$MTEntryMore$> + <$mt:EntryMore$>

- +

<__trans phrase="Tags">:

- +

- <$MTInclude module="<__trans phrase="Trackbacks">"$> - <$MTInclude module="<__trans phrase="Comments">"$> + <$mt:Include module="<__trans phrase="Trackbacks">"$> + <$mt:Include module="<__trans phrase="Comments">"$> @@ -87,5 +87,5 @@ - <$MTInclude module="<__trans phrase="Sidebar">"$> + <$mt:Include module="<__trans phrase="Sidebar">"$> @@ -94,5 +94,5 @@ - <$mt:include module="<__trans phrase="Banner Footer">"$> + <$mt:Include module="<__trans phrase="Banner Footer">"$> Index: /branches/release-40/default_templates/feed_recent.mtml =================================================================== --- /branches/release-40/default_templates/feed_recent.mtml (revision 1463) +++ /branches/release-40/default_templates/feed_recent.mtml (revision 2603) @@ -1,35 +1,35 @@ -<$MTHTTPContentType type="application/atom+xml"$>"?> +<$mt:HTTPContentType type="application/atom+xml"$>"?> - <$MTBlogName remove_html="1" encode_xml="1"$> - " /> - " /> - tag:<$MTBlogHost exclude_port="1" encode_xml="1"$>,<$MTTemplateCreatedOn format="%Y-%m-%d"$>:<$MTBlogRelativeURL encode_xml="1"$>/<$MTBlogID$> - <$MTEntryModifiedDate utc="1" format="%Y-%m-%dT%H:%M:%SZ"$> - <$MTBlogDescription remove_html="1" encode_xml="1"$> - <$MTProductName version="1"$> - + <$mt:BlogName remove_html="1" encode_xml="1"$> + " /> + " /> + tag:<$mt:BlogHost exclude_port="1" encode_xml="1"$>,<$mt:TemplateCreatedOn format="%Y-%m-%d"$>:<$mt:BlogRelativeURL encode_xml="1"$>/<$mt:BlogID$> + <$mt:EntryModifiedDate utc="1" format="%Y-%m-%dT%H:%M:%SZ"$> + <$mt:BlogDescription remove_html="1" encode_xml="1"$> + <$mt:ProductName version="1"$> + - <$MTEntryTitle remove_html="1" encode_xml="1"$> - " /> - <$MTEntryAtomID$> + <$mt:EntryTitle remove_html="1" encode_xml="1"$> + " /> + <$mt:EntryAtomID$> - <$MTEntryDate utc="1" format="%Y-%m-%dT%H:%M:%SZ"$> - <$MTEntryModifiedDate utc="1" format="%Y-%m-%dT%H:%M:%SZ"$> + <$mt:EntryDate utc="1" format="%Y-%m-%dT%H:%M:%SZ"$> + <$mt:EntryModifiedDate utc="1" format="%Y-%m-%dT%H:%M:%SZ"$> -

<$MTEntryExcerpt remove_html="1" encode_xml="1"$>

<$mt:EntryExcerpt remove_html="1" encode_xml="1"$>

- <$MTEntryAuthorDisplayName encode_xml="1"$> - <$MTEntryAuthorURL encode_xml="1"$> + <$mt:EntryAuthorDisplayName encode_xml="1"$> + <$mt:EntryAuthorURL encode_xml="1"$> - - " scheme="http://www.sixapart.com/ns/types#category" /> - - " label="<$MTTagName encode_xml="1"$>" scheme="http://www.sixapart.com/ns/types#tag" /> - - " xml:base="<$MTBlogURL encode_xml="1"$>"> - <$MTEntryBody encode_xml="1"$> - <$MTEntryMore encode_xml="1"$> + + " scheme="http://www.sixapart.com/ns/types#category" /> + + " label="<$mt:TagName encode_xml="1"$>" scheme="http://www.sixapart.com/ns/types#tag" /> + + " xml:base="<$mt:BlogURL encode_xml="1"$>"> + <$mt:EntryBody encode_xml="1"$> + <$mt:EntryMore encode_xml="1"$> - + Index: /branches/release-40/default_templates/recover-password.mtml =================================================================== --- /branches/release-40/default_templates/recover-password.mtml (revision 1104) +++ /branches/release-40/default_templates/recover-password.mtml (revision 2603) @@ -1,10 +1,10 @@ <__trans phrase="_USAGE_FORGOT_PASSWORD_1"> - + <$mt:Var name="user_password"$> <__trans phrase="_USAGE_FORGOT_PASSWORD_2"> - + <$mt:Var name="link_to_login"$> -"> +<$mt:Include module="<__trans phrase="Mail Footer">"$> Index: /branches/release-40/default_templates/popup_image.mtml =================================================================== --- /branches/release-40/default_templates/popup_image.mtml (revision 1423) +++ /branches/release-40/default_templates/popup_image.mtml (revision 2603) @@ -1,7 +1,7 @@ -<$MTImageURL$> +<$mt:ImageURL$> -

Index: /branches/release-40/default_templates/javascript.mtml =================================================================== --- /branches/release-40/default_templates/javascript.mtml (revision 2553) +++ /branches/release-40/default_templates/javascript.mtml (revision 2603) @@ -477,5 +477,5 @@ url += '&entry_id=' + entry_id; } else { - url += '&return_url=<$MTBlogURL encode_url="1"$>'; + url += '&return_url=<$mt:BlogURL encode_url="1"$>'; } } else { @@ -528,5 +528,5 @@ url += '&entry_id=' + entry_id; } else { - url += '&return_url=<$MTBlogURL encode_url="1"$>'; + url += '&return_url=<$mt:BlogURL encode_url="1"$>'; } } else { Index: /branches/release-40/default_templates/archive_index.mtml =================================================================== --- /branches/release-40/default_templates/archive_index.mtml (revision 2101) +++ /branches/release-40/default_templates/archive_index.mtml (revision 2603) @@ -3,13 +3,13 @@ - <$mt:include module="<__trans phrase="HTML Head">"$> - <$MTBlogName encode_html="1"$>: <__trans phrase="Archives"> + <$mt:Include module="<__trans phrase="HTML Head">"$> + <$mt:BlogName encode_html="1"$>: <__trans phrase="Archives"> -"> +">

- <$mt:include module="<__trans phrase="Banner Header">"$> + <$mt:Include module="<__trans phrase="Banner Header">"$> @@ -23,133 +23,133 @@

<__trans phrase="Archives">

- + - - + +

- - + +

<__trans phrase="Monthly Archives">

<$MTArchiveTitle$>

+ +

<$mt:ArchiveTitle$>

- - + +

- + - + - - + +

<__trans phrase="Categories">

- - + +

<$MTCategoryLabel$> - -

<$MTCategoryLabel$> - - + + +

<$mt:CategoryLabel$> + +

<$mt:CategoryLabel$> + + <$mt:SubCatsRecurse$>

- +

- - + +

- + - + - +

- - + +

<__trans phrase="Author Archives">

<$MTArchiveTitle$>

+ +

<$mt:ArchiveTitle$>

- - + +

- - + + - + - +

- - + +

<__trans phrase="Category Monthly Archives">

<$MTArchiveTitle$>

+ +

<$mt:ArchiveTitle$>

- - + +

- - + + - + - +

- - + +

<__trans phrase="Author Monthly Archives">

<$MTArchiveTitle$>

+ +

<$mt:ArchiveTitle$>

- - + +

- - + + - + - +

- - + +

<$MTArchiveDate format="%Y.%m.%d"$>: <$MTArchiveTitle$>

+ +

<$mt:ArchiveDate format="%Y.%m.%d"$>: <$mt:ArchiveTitle$>

- - + +

- - + + @@ -158,5 +158,5 @@ - <$MTInclude module="<__trans phrase="Sidebar">"$> + <$mt:Include module="<__trans phrase="Sidebar">"$> @@ -165,5 +165,5 @@ - <$mt:include module="<__trans phrase="Banner Footer">"$> + <$mt:Include module="<__trans phrase="Banner Footer">"$> Index: /branches/release-40/default_templates/trackbacks.mtml =================================================================== --- /branches/release-40/default_templates/trackbacks.mtml (revision 2383) +++ /branches/release-40/default_templates/trackbacks.mtml (revision 2603) @@ -1,38 +1,38 @@ - - + +

<$MTEntryTrackbackCount singular="<trans phrase="1 TrackBack">" plural="<trans phrase="# TrackBacks">" none="<__trans phrase="No TrackBacks">"$>

<$mt:EntryTrackbackCount singular="<trans phrase="1 TrackBack">" plural="<trans phrase="# TrackBacks">" none="<__trans phrase="No TrackBacks">"$>

- - + +

<__trans phrase="TrackBack URL: [_1]" params="<$MTEntryTrackbackLink$>">

<__trans phrase="TrackBack URL: [_1]" params="<$mt:EntryTrackbackLink$>">

- + - - - + + +

- -

+ +

- <__trans phrase="[_2] from [_3] on [_5]" params="<$MTPingURL$>%%<$MTPingTitle$>%%<$MTPingBlogName$>%%#ping-<$MTPingID$>%%<$MTPingDate$>"> + <__trans phrase="[_2] from [_3] on [_5]" params="<$mt:PingURL$>%%<$mt:PingTitle$>%%<$mt:PingBlogName$>%%#ping-<$mt:PingID$>%%<$mt:PingDate$>">

- <__trans phrase="[_1] Read More" params="<$MTPingExcerpt$>%%<$MTPingURL$>"> + <__trans phrase="[_1] Read More" params="<$mt:PingExcerpt$>%%<$mt:PingURL$>">

- +

- - + +

- + Index: /branches/release-40/default_templates/sidebar.mtml =================================================================== --- /branches/release-40/default_templates/sidebar.mtml (revision 1709) +++ /branches/release-40/default_templates/sidebar.mtml (revision 2603) @@ -1,3 +1,3 @@ - +--> @@ -11,11 +11,11 @@

- - + + <$mt:WidgetSet name="<__trans phrase="2-column layout - Sidebar">"$> - - + + <$mt:WidgetSet name="<__trans phrase="3-column layout - Primary Sidebar">"$> - +

@@ -23,6 +23,6 @@ - - + +

@@ -30,3 +30,3 @@

- + Index: /branches/release-40/default_templates/banner_footer.mtml =================================================================== --- /branches/release-40/default_templates/banner_footer.mtml (revision 1851) +++ /branches/release-40/default_templates/banner_footer.mtml (revision 2603) @@ -7,11 +7,11 @@

- + - +

Index: /branches/release-40/default_templates/styles.mtml =================================================================== --- /branches/release-40/default_templates/styles.mtml (revision 1423) +++ /branches/release-40/default_templates/styles.mtml (revision 2603) @@ -1,2 +1,2 @@ -@import url(<$MTStaticWebPath$>themes-base/blog.css); -@import url(<$MTStaticWebPath$>themes/minimalist-red/screen.css); +@import url(<$mt:StaticWebPath$>themes-base/blog.css); +@import url(<$mt:StaticWebPath$>themes/minimalist-red/screen.css); Index: /branches/release-40/default_templates/html_head.mtml =================================================================== --- /branches/release-40/default_templates/html_head.mtml (revision 2239) +++ /branches/release-40/default_templates/html_head.mtml (revision 2603) @@ -1,7 +1,7 @@ - -" /> -" type="text/css" /> - -" /> - -<$MTCCLicenseRDF$> + +" /> +" type="text/css" /> + +" /> + +<$mt:CCLicenseRDF$> Index: /branches/release-40/default_templates/comments.mtml =================================================================== --- /branches/release-40/default_templates/comments.mtml (revision 2394) +++ /branches/release-40/default_templates/comments.mtml (revision 2603) @@ -1,64 +1,64 @@ - + - - + +

- + - - - -

<$MTEntryCommentCount singular="<trans phrase="1 Comment">" plural="<trans phrase="# Comments">" none="<__trans phrase="No Comments">"$>

+ + + +

<$mt:EntryCommentCount singular="<trans phrase="1 Comment">" plural="<trans phrase="# Comments">" none="<__trans phrase="No Comments">"$>

- -

+ +

- <$MTCommentAuthorIdentity$> + <$mt:CommentAuthorIdentity$> - <__trans phrase="[_1] replied to comment from [_3]" params="<$MTCommentAuthorLink$>%%<$mt:CommentLink$>%%<$MTCommentAuthor$>"> - - <$MTCommentAuthorLink$> + <__trans phrase="[_1] replied to comment from [_3]" params="<$mt:CommentAuthorLink$>%%<$mt:CommentLink$>%%<$mt:CommentAuthor$>"> + + <$mt:CommentAuthorLink$> - | "><$MTCommentDate$> - - | <$MTCommentReplyLink$> - + | "><$mt:CommentDate$> + + | <$mt:CommentReplyLink$> +

- <$MTCommentBody$> + <$mt:CommentBody$>

- +

- - + + - + - - + +

<__trans phrase="Leave a comment">

- + - +

- +

- + Index: /branches/release-40/default_templates/search_results.mtml =================================================================== --- /branches/release-40/default_templates/search_results.mtml (revision 2463) +++ /branches/release-40/default_templates/search_results.mtml (revision 2603) @@ -5,13 +5,13 @@ - <$mt:include module="<__trans phrase="HTML Head">"$> - <$MTBlogName encode_html="1"$>: <__trans phrase="Search Results"> - Below Javascript adds ajax search capability + <$mt:Include module="<__trans phrase="HTML Head">"$> + <$mt:BlogName encode_html="1"$>: <__trans phrase="Search Results"> + Below Javascript adds ajax search capability -"> +">

- <$mt:include module="<__trans phrase="Banner Header">"$> + <$mt:Include module="<__trans phrase="Banner Header">"$> @@ -81,56 +81,56 @@

- - - - +--> + + +

- +

- - <__trans phrase="Results matching “[_1]”" params="<$MTSearchString$>"> - - - <__trans phrase="Results tagged “[_1]”" params="<$MTSearchString$>"> - + + <__trans phrase="Results matching “[_1]”" params="<$mt:SearchString$>"> + + + <__trans phrase="Results tagged “[_1]”" params="<$mt:SearchString$>"> +

- - <$MTInclude module="<__trans phrase="Entry Summary">" hide_counts="1"$> - + + <$mt:Include module="<__trans phrase="Entry Summary">" hide_counts="1"$> +

- +

- < <__trans phrase="Previous"> <__trans phrase="Next"> > + < <__trans phrase="Previous"> <$mt:Var name="__value__"$><$mt:Var name="__value__"$> <__trans phrase="Next"> >

- - - - - + + + + +<$mt:Var name="search_results"$> - - + +

- - <__trans phrase="Results matching “[_1]”" params="<$MTSearchString$>"> - - - <__trans phrase="Results tagged “[_1]”" params="<$MTSearchString$>"> - + + <__trans phrase="Results matching “[_1]”" params="<$mt:SearchString$>"> + + + <__trans phrase="Results tagged “[_1]”" params="<$mt:SearchString$>"> +

<__trans phrase="No results found for “[_1]”." params="<$MTSearchString$>">

- +

<__trans phrase="No results found for “[_1]”." params="<$mt:SearchString$>">

+ - - + +

<__trans phrase="Instructions">

<__trans phrase="By default, this search engine looks for all words in any order. To search for an exact phrase, enclose the phrase in quotes:">

@@ -143,21 +143,21 @@

<__trans phrase="publishing NOT personal">

- + - - + + - + @@ -165,5 +165,5 @@

- <$MTInclude module="<__trans phrase="Sidebar">"$> + <$mt:Include module="<__trans phrase="Sidebar">"$> @@ -172,5 +172,5 @@ - <$mt:include module="<__trans phrase="Banner Footer">"$> + <$mt:Include module="<__trans phrase="Banner Footer">"$> Index: /branches/release-40/default_templates/rsd.mtml =================================================================== --- /branches/release-40/default_templates/rsd.mtml (revision 1098) +++ /branches/release-40/default_templates/rsd.mtml (revision 2603) @@ -1,13 +1,13 @@ -<$MTHTTPContentType type="application/rsd+xml"$> +<$mt:HTTPContentType type="application/rsd+xml"$> -<$MTProductName version="1"$> +<$mt:ProductName version="1"$> http://www.sixapart.com/movabletype/ -<$MTBlogURL$> +<$mt:BlogURL$> - - - - + + + + Index: /branches/release-40/default_templates/dynamic_error.mtml =================================================================== --- /branches/release-40/default_templates/dynamic_error.mtml (revision 2101) +++ /branches/release-40/default_templates/dynamic_error.mtml (revision 2603) @@ -3,13 +3,13 @@ - <$mt:include module="<__trans phrase="HTML Head">"$> - <$MTBlogName encode_html="1"$>: <__trans phrase="Page Not Found"> + <$mt:Include module="<__trans phrase="HTML Head">"$> + <$mt:BlogName encode_html="1"$>: <__trans phrase="Page Not Found"> -"> +">

- <$mt:include module="<__trans phrase="Banner Header">"$> + <$mt:Include module="<__trans phrase="Banner Header">"$> @@ -22,5 +22,5 @@

<__trans phrase="Page Not Found">

- <$MTErrorMessage$> + <$mt:ErrorMessage$>

@@ -28,5 +28,5 @@ - <$MTInclude module="<__trans phrase="Sidebar">"$> + <$mt:Include module="<__trans phrase="Sidebar">"$> @@ -35,5 +35,5 @@ - <$mt:include module="<__trans phrase="Banner Footer">"$> + <$mt:Include module="<__trans phrase="Banner Footer">"$> Index: /branches/release-40/default_templates/tag_cloud.mtml =================================================================== --- /branches/release-40/default_templates/tag_cloud.mtml (revision 2439) +++ /branches/release-40/default_templates/tag_cloud.mtml (revision 2603) @@ -4,5 +4,5 @@ Index: /branches/release-40/default_templates/comment_preview.mtml =================================================================== --- /branches/release-40/default_templates/comment_preview.mtml (revision 2394) +++ /branches/release-40/default_templates/comment_preview.mtml (revision 2603) @@ -5,17 +5,17 @@ - <$mt:include module="<__trans phrase="HTML Head">"$> - <$MTBlogName encode_html="1"$>: <__trans phrase="Previewing your Comment"> + <$mt:Include module="<__trans phrase="HTML Head">"$> + <$mt:BlogName encode_html="1"$>: <__trans phrase="Previewing your Comment"> -" onload="mtEntryOnLoad()"> +" onload="mtEntryOnLoad()">

- <$mt:include module="<__trans phrase="Banner Header">"$> + <$mt:Include module="<__trans phrase="Banner Header">"$> @@ -28,25 +28,25 @@ -

<$MTVar name="page_title"$>

<$mt:Var name="page_title"$>

- -

+ +

- <$MTCommentBody$> + <$mt:CommentBody$>

@@ -54,41 +54,41 @@ - +

<__trans phrase="Leave a comment">

- + - - + + - +

<__trans phrase="Name"> - " onfocus="mtShowCaptcha()" /> + " onfocus="mtShowCaptcha()" />

<__trans phrase="Email Address"> - " onfocus="mtShowCaptcha()" /> + " onfocus="mtShowCaptcha()" />

<__trans phrase="URL"> - " onfocus="mtShowCaptcha()" /> + " onfocus="mtShowCaptcha()" />

- - <__trans phrase="Replying to comment from [_1]" params="<$MTCommentAuthor$>"> + + <__trans phrase="Replying to comment from [_1]" params="<$mt:CommentAuthor$>">

- <__trans phrase="Comments"> <__trans phrase="(You may use HTML tags for style)"> - + <__trans phrase="Comments"> <__trans phrase="(You may use HTML tags for style)"> +

@@ -96,5 +96,5 @@ " onclick="this.form.preview.value='1';" /> " /> - " onclick="window.location='<$MTEntryPermalink$>'" /> + " onclick="window.location='<$mt:EntryPermalink$>'" />

@@ -105,5 +105,5 @@ - <$MTInclude module="<__trans phrase="Sidebar">"$> + <$mt:Include module="<__trans phrase="Sidebar">"$> @@ -112,5 +112,5 @@ - <$mt:include module="<__trans phrase="Banner Footer">"$> + <$mt:Include module="<__trans phrase="Banner Footer">"$> Index: /branches/release-40/default_templates/monthly_entry_listing.mtml =================================================================== --- /branches/release-40/default_templates/monthly_entry_listing.mtml (revision 2101) +++ /branches/release-40/default_templates/monthly_entry_listing.mtml (revision 2603) @@ -3,20 +3,20 @@ - <$mt:include module="<__trans phrase="HTML Head">"$> - <$MTBlogName encode_html="1"$>: <__trans phrase="[_1] Archives" params="<$MTArchiveTitle$>"> - + <$mt:Include module="<__trans phrase="HTML Head">"$> + <$mt:BlogName encode_html="1"$>: <__trans phrase="[_1] Archives" params="<$mt:ArchiveTitle$>"> + - - - " /> - " /> - + + + " /> + " /> + - <$MTVar name="page_layout"$>"> + <$mt:Var name="page_layout"$>">

- <$mt:include module="<__trans phrase="Banner Header">"$> + <$mt:Include module="<__trans phrase="Banner Header">"$> @@ -29,20 +29,20 @@ -

<__trans phrase="[_1] Archives" params="<$MTArchiveTitle$>">

<__trans phrase="[_1] Archives" params="<$mt:ArchiveTitle$>">

- -<$mt:setvar name="limit" value="auto"$> - - - <$mt:include module="<__trans phrase="Entry Summary">"$> - + +<$mt:SetVar name="limit" value="auto"$> + + + <$mt:Include module="<__trans phrase="Entry Summary">"$> +

@@ -52,5 +52,5 @@ - <$MTInclude module="<__trans phrase="Sidebar">"$> + <$mt:Include module="<__trans phrase="Sidebar">"$> @@ -59,5 +59,5 @@ - <$mt:include module="<__trans phrase="Banner Footer">"$> + <$mt:Include module="<__trans phrase="Banner Footer">"$> Index: /branches/release-40/default_templates/search.mtml =================================================================== --- /branches/release-40/default_templates/search.mtml (revision 2455) +++ /branches/release-40/default_templates/search.mtml (revision 2603) @@ -6,5 +6,5 @@ - +

<__trans phrase="Regex search">

- - + + - - + + " /> @@ -28,5 +28,5 @@ Index: /branches/release-40/default_templates/commenter_confirm.mtml =================================================================== --- /branches/release-40/default_templates/commenter_confirm.mtml (revision 1102) +++ /branches/release-40/default_templates/commenter_confirm.mtml (revision 2603) @@ -1,16 +1,16 @@ -<__trans phrase="Thank you registering for an account to comment on [_1]." params="<$MTBlogName$>"> +<__trans phrase="Thank you registering for an account to comment on [_1]." params="<$mt:BlogName$>"> -<__trans phrase="For your own security and to prevent fraud, we ask that you please confirm your account and email address before continuing. Once confirmed you will immediately be allowed to comment on [_1]." params="<$MTBlogName$>"> +<__trans phrase="For your own security and to prevent fraud, we ask that you please confirm your account and email address before continuing. Once confirmed you will immediately be allowed to comment on [_1]." params="<$mt:BlogName$>"> <__trans phrase="To confirm your account, please click on or cut and paste the following URL into a web browser:"> - +<$mt:Var name="confirm_url"$> -<__trans phrase="If you did not make this request, or you don't want to register for an account to comment on [_1], then no further action is required." params="<$MTBlogName$>"> +<__trans phrase="If you did not make this request, or you don't want to register for an account to comment on [_1], then no further action is required." params="<$mt:BlogName$>"> <__trans phrase="Thank you very much for your understanding."> <__trans phrase="Sincerely,"> -<$MTAuthorDisplayName$>Movable Type +<$mt:AuthorDisplayName$>Movable Type -"> +<$mt:Include module="<__trans phrase="Mail Footer">"$>

<$MTBlogName encode_html="1"$>

<$MTBlogDescription$>

<$mt:BlogName encode_html="1"$>

<$mt:BlogDescription$>

<$MTEntryTitle$>

<$mt:EntryTitle$>

<__trans phrase="Tags">:

<$MTVar name="page_title"$>

<$mt:Var name="page_title"$>

<__trans phrase="[_1] Archives" params="<$MTArchiveTitle$>">

<__trans phrase="Recently in [_1] Category" params="<$MTArchiveTitle$>">

<__trans phrase="[_1] Archives" params="<$mt:ArchiveTitle$>">

<__trans phrase="Recently in [_1] Category" params="<$mt:ArchiveTitle$>">

<$MTEntryTitle$>

<$mt:EntryTitle$>

<__trans phrase="Categories">:

<__trans phrase="Tags">:

<__trans phrase="Archives">

<__trans phrase="Monthly Archives">

<__trans phrase="Categories">

<__trans phrase="Author Archives">

<__trans phrase="Category Monthly Archives">

<__trans phrase="Author Monthly Archives">

<$MTEntryTrackbackCount singular="<__trans phrase="1 TrackBack">" plural="<__trans phrase="# TrackBacks">" none="<__trans phrase="No TrackBacks">"$>

<$mt:EntryTrackbackCount singular="<__trans phrase="1 TrackBack">" plural="<__trans phrase="# TrackBacks">" none="<__trans phrase="No TrackBacks">"$>

<$MTEntryCommentCount singular="<__trans phrase="1 Comment">" plural="<__trans phrase="# Comments">" none="<__trans phrase="No Comments">"$>

<$mt:EntryCommentCount singular="<__trans phrase="1 Comment">" plural="<__trans phrase="# Comments">" none="<__trans phrase="No Comments">"$>

<__trans phrase="Leave a comment">

<__trans phrase="Instructions">

<__trans phrase="Page Not Found">

<$MTVar name="page_title"$>

<$mt:Var name="page_title"$>

<__trans phrase="Leave a comment">

<__trans phrase="[_1] Archives" params="<$MTArchiveTitle$>">

<__trans phrase="[_1] Archives" params="<$mt:ArchiveTitle$>">

<$MTEntryTrackbackCount singular="<trans phrase="1 TrackBack">" plural="<trans phrase="# TrackBacks">" none="<__trans phrase="No TrackBacks">"$>

<$mt:EntryTrackbackCount singular="<trans phrase="1 TrackBack">" plural="<trans phrase="# TrackBacks">" none="<__trans phrase="No TrackBacks">"$>

<$MTEntryCommentCount singular="<trans phrase="1 Comment">" plural="<trans phrase="# Comments">" none="<__trans phrase="No Comments">"$>

<$mt:EntryCommentCount singular="<trans phrase="1 Comment">" plural="<trans phrase="# Comments">" none="<__trans phrase="No Comments">"$>