![[site community profile]](https://www.dreamwidth.org/img/comm_staff.png){kind=small}
[dw-free] Dump existing dw.org text strings and check into cvs
[commit: http://hg.dwscoalition.org/dw-free/rev/b5fcf79b7915]
http://bugs.dwscoalition.org/show_bug.cgi?id=1553
Step 1: use cleaned up files generated by dumptextcvs (processed slightly to
remove staleness). This patch: makes sure everything is alphabetized,
appends standard header, standardizes spacing. Also needed to move obsolete
strings to deadphrases.dat so they'll be cleaned out from our database.
Patch by![[personal profile]](https://www.dreamwidth.org/img/silk/identity/user.png)
fu.
Files modified:
http://bugs.dwscoalition.org/show_bug.cgi?id=1553
Step 1: use cleaned up files generated by dumptextcvs (processed slightly to
remove staleness). This patch: makes sure everything is alphabetized,
appends standard header, standardizes spacing. Also needed to move obsolete
strings to deadphrases.dat so they'll be cleaned out from our database.
Patch by
fu.Files modified:
- bin/upgrading/deadphrases.dat
- bin/upgrading/en.dat
- htdocs/accountstatus.bml.text
- htdocs/admin/console/index.bml.text
- htdocs/admin/console/reference.bml.text
- htdocs/admin/faq/faqcat.bml.text
- htdocs/admin/impersonate.bml.text
- htdocs/admin/invites/distribute.bml.text
- htdocs/admin/invites/index.bml.text
- htdocs/admin/invites/promo.bml.text
- htdocs/admin/vgifts/inactive.bml.text
- htdocs/admin/vgifts/index.bml.text
- htdocs/admin/vgifts/tags.bml.text
- htdocs/allpics.bml.text
- htdocs/betafeatures.bml.text
- htdocs/changeemail.bml.text
- htdocs/changepassword.bml.text
- htdocs/community/join.bml.text
- htdocs/community/leave.bml.text
- htdocs/community/manage.bml.text
- htdocs/community/members.bml.text
- htdocs/community/moderate.bml.text
- htdocs/community/pending.bml.text
- htdocs/community/sentinvites.bml.text
- htdocs/community/settings.bml.text
- htdocs/customize/advanced/layeredit.bml.text
- htdocs/customize/index.bml.text
- htdocs/customize/options.bml.text
- htdocs/customize/preview_redirect.bml.text
- htdocs/customize/viewuser.bml.text
- htdocs/directory.bml.text
- htdocs/directorysearch.bml.text
- htdocs/doc/s2/index.bml.text
- htdocs/editicons.bml.text
- htdocs/editjournal.bml.text
- htdocs/editprivacy.bml.text
- htdocs/edittags.bml.text
- htdocs/go.bml.text
- htdocs/imgupload.bml.text
- htdocs/inbox/compose.bml.text
- htdocs/inbox/index.bml.text
- htdocs/login.bml.text
- htdocs/lostinfo.bml.text
- htdocs/lostinfo_do.bml.text
- htdocs/manage/banusers.bml.text
- htdocs/manage/circle/add.bml.text
- htdocs/manage/circle/edit.bml.text
- htdocs/manage/circle/editfilters.bml.text
- htdocs/manage/circle/filter.bml.text
- htdocs/manage/circle/invite.bml.text
- htdocs/manage/emailpost.bml.text
- htdocs/manage/externalaccount.bml.text
- htdocs/manage/index.bml.text
- htdocs/manage/invitecodes.bml.text
- htdocs/manage/profile/index.bml
- htdocs/manage/profile/index.bml.text
- htdocs/manage/settings/index.bml.text
- htdocs/manage/siteopts.bml.text
- htdocs/manage/subscriptions/filters.bml.text
- htdocs/manage/tags.bml.text
- htdocs/misc/adult_content.bml.text
- htdocs/misc/blockedlink.bml.text
- htdocs/misc/mogupic.bml.text
- htdocs/mobile/index.bml.text
- htdocs/mobile/login.bml.text
- htdocs/mobile/post.bml.text
- htdocs/mobile/read.bml.text
- htdocs/multisearch.bml.text
- htdocs/openid/approve.bml.text
- htdocs/openid/index.bml.text
- htdocs/openid/login.bml.text
- htdocs/openid/options.bml.text
- htdocs/poll/create.bml.text
- htdocs/preview/entry.bml.text
- htdocs/profile.bml.text
- htdocs/register.bml.text
- htdocs/reject.bml.text
- htdocs/settings/index.bml.text
- htdocs/shop/account.bml.text
- htdocs/shop/cancel.bml.text
- htdocs/shop/cart.bml.text
- htdocs/shop/checkout.bml.text
- htdocs/shop/confirm.bml.text
- htdocs/shop/creditcard.bml.text
- htdocs/shop/creditcard_wait.bml.text
- htdocs/shop/entercc.bml.text
- htdocs/shop/gifts.bml.text
- htdocs/shop/history.bml.text
- htdocs/shop/randomgift.bml.text
- htdocs/shop/receipt.bml.text
- htdocs/shop/renames.bml.text
- htdocs/site/index.bml.text
- htdocs/site/opensource.bml.text
- htdocs/stats.bml.text
- htdocs/support/actmulti.bml.text
- htdocs/support/append_request.bml.text
- htdocs/support/faq.bml.text
- htdocs/support/faqpop.bml.text
- htdocs/support/help.bml.text
- htdocs/support/highscores.bml.text
- htdocs/support/known_issues.bml.text
- htdocs/support/see_request.bml.text
- htdocs/support/stock_answers.bml.text
- htdocs/talkpost.bml.text
- htdocs/talkpost_do.bml.text
- htdocs/talkread.bml.text
- htdocs/tools/endpoints/extacct_auth.bml.text
- htdocs/tools/importer.bml.text
- htdocs/tools/memadd.bml.text
- htdocs/tools/popsubscriptions.bml.text
- htdocs/tools/recent_comments.bml.text
- htdocs/tools/search.bml.text
- htdocs/tools/tellafriend.bml.text
- htdocs/tools/textmessage.bml.text
- htdocs/update.bml.text
- views/admin/eventoutput-select.tt.text
- views/admin/index.tt.text
- views/admin/memcache_clear.tt.text
- views/admin/rename.tt.text
- views/admin/rename_edit.tt.text
- views/admin/stats.tt.text
- views/admin/themes/category.tt.text
- views/admin/themes/index.tt.text
- views/admin/themes/theme.tt.text
- views/dev/classes.tt.text
- views/interests/add.tt.text
- views/interests/enmasse.tt.text
- views/interests/enmasse_do.tt.text
- views/interests/findsim.tt.text
- views/interests/index.tt.text
- views/interests/int.tt.text
- views/interests/popular.tt.text
- views/latest/mood.tt.text
- views/legal/index.tt.text
- views/login.tt.text
- views/misc/whereami.tt.text
- views/nav.tt.text
- views/protected.tt.text
- views/rename.tt.text
- views/rename/swap.tt.text
- views/shop/cartdisplay.tt.text
- views/shop/index.tt.text
- views/shop/points.tt.text
- views/shop/transferpoints.tt.text
- views/stats/site.tt.text
--------------------------------------------------------------------------------
diff -r 7d1ada126323 -r b5fcf79b7915 bin/upgrading/deadphrases.dat
--- a/bin/upgrading/deadphrases.dat Wed Apr 20 22:06:47 2011 +0800
+++ b/bin/upgrading/deadphrases.dat Thu Apr 21 03:02:10 2011 +0800
@@ -673,4 +673,664 @@ general setting.contentpromotion.label
general setting.contentpromotion.label
general setting.contentpromotion.option
-general error.message.yourself
\ No newline at end of file
+general error.message.yourself
+
+general /allpics.bml.comment
+general /allpics.bml.current
+general /allpics.bml.default
+general /allpics.bml.description
+general /allpics.bml.edit4
+general /allpics.bml.error.noparam
+general /allpics.bml.keywords
+general /allpics.bml.nopics.text.other2
+general /allpics.bml.nopics.text3
+general /allpics.bml.nopics.title
+general /allpics.bml.pics.owner
+general /allpics.bml.pics2
+general /allpics.bml.sort.default
+general /allpics.bml.sort.keyword
+general /allpics.bml.title
+general /approve.bml.comm.text
+general /approve.bml.shared.success
+general /approve.bml.shared.text
+general /changeemail.bml.newemail.body2
+general /changeemail.bml.error.lj_domain
+general /changepassword.bml.changepassword.header
+general /community/join.bml.error.ischild
+general /community/leave.bml.label.lastmaintainer
+general /community/members.bml.error.ischild
+general /community/members.bml.error.invaliduser
+general /community/moderate.bml.choice.bkreject
+general /community/moderate.bml.choice.bkapprove
+general /community/pending.bml.approve.title
+general /community/pending.bml.succedd.ban_skipped
+general /community/settings.bml.button.changecommunity
+general /community/settings.bml.label.adultcontentnote
+general /community/settings.bml.label.adultcontenttext
+general /community/settings.bml.label.anybodycan
+general /community/settings.bml.label.changeheader
+general /community/settings.bml.label.changetext
+general /community/settings.bml.label.createheader
+general /community/settings.bml.label.createtext2
+general /community/settings.bml.label.createtext2_example
+general /community/settings.bml.label.modheader
+general /community/settings.bml.label.modis
+general /community/settings.bml.label.modisnt
+general /community/settings.bml.label.modtext
+general /community/settings.bml.label.nmcan
+general /community/settings.bml.label.nmcan2
+general /community/settings.bml.label.nmcant
+general /community/settings.bml.label.nmcant2
+general /community/settings.bml.label.nmheader
+general /community/settings.bml.label.postaccess
+general /community/settings.bml.label.selcan
+general /community/settings.bml.label.whocanpost
+general /community/settings.bml.manage2
+general /community/settings.bml.members2
+general /customize/advanced/layers.bml.createlayer.layoutspecific.select.user
+general /customize/advanced/styles.bml.error.maxstyles
+general /customize/advanced/styles.bml.stylelayers.label.user
+general /customize/viewuser.bml.layer.isnt.type
+general /customize/viewuser.bml.no.user.layer
+general /customize/viewuser.bml.user.layer
+general /directory.bml.us_map
+general /directorysearch.bml.by_friends
+general /directorysearch.bml.lists_user_as_a_friend
+general /directorysearch.bml.use_this_dir
+general /directorysearch.bml.user_lists_as_a_friend
+general /editprivacy.bml.calendar
+general /login.bml.createaccount.tour
+general /lostinfo.bml.captcha.invalid
+general /lostinfo.bml.recaptcha.title
+general /manage/circle/add.bml.confirm.syn.title1
+general /manage/circle/add.bml.confirm.syn.title1.add
+general /manage/circle/add.bml.confirm.text1.news
+general /manage/circle/add.bml.confirm.title.community
+general /manage/circle/add.bml.confirm.title.community.add
+general /manage/circle/add.bml.confirm.title.news
+general /manage/circle/add.bml.confirm.title.person
+general /manage/circle/add.bml.confirm.title.person.add
+general /manage/circle/edit.bml.addfriends.head
+general /manage/circle/edit.bml.addfriends.text
+general /manage/circle/edit.bml.circle.img.n
+general /manage/circle/edit.bml.circle.img.y
+general /manage/circle/edit.bml.circle.member.n
+general /manage/circle/edit.bml.circle.member.y
+general /manage/circle/edit.bml.circle.intro.people
+general /manage/circle/filter.bml.editgroups
+general /manage/circle/filter.bml.error.nogroups.header
+general /manage/circle/filter.bml.error.nogroups2
+general /manage/circle/filter.bml.reset
+general /manage/circle/filter.bml.select
+general /manage/circle/filter.bml.select.header
+general /manage/circle/filter.bml.submit
+general /manage/circle/filter.bml.title2
+general /manage/circle/invite.bml.error.noinvitecodes
+general /manage/circle/invite.bml.intro.code
+general /manage/circle/invite.bml.intro.code2
+general /manage/emailpost.bml.addresses.table.errors
+general /manage/emailpost.bml.error.invalidimagesize
+general /manage/emailpost.bml.help.headers.header
+general /manage/emailpost.bml.help.images.gallery.example
+general /manage/emailpost.bml.help.images.gallery.header
+general /manage/emailpost.bml.help.images.gallery.text
+general /manage/emailpost.bml.help.images.header
+general /manage/emailpost.bml.help.images.layout.header
+general /manage/emailpost.bml.help.images.layout.text1
+general /manage/emailpost.bml.help.images.layout.text2
+general /manage/emailpost.bml.help.images.layout.text3
+general /manage/emailpost.bml.help.images.ljcut.header
+general /manage/emailpost.bml.help.images.ljcut.text
+general /manage/emailpost.bml.help.images.security.header
+general /manage/emailpost.bml.help.images.security.text1
+general /manage/emailpost.bml.help.images.security.text2
+general /manage/emailpost.bml.help.images.size.header
+general /manage/emailpost.bml.help.images.size.text1
+general /manage/emailpost.bml.help.images.size.text2
+general /manage/emailpost.bml.help.images.text
+general /manage/index.bml.schools
+general /manage/profile/index.bml.birthday.underage
+general /manage/profile/index.bml.birthday.year.opt
+general /manage/profile/index.bml.country.choose
+general /manage/profile/index.bml.email.change
+general /manage/profile/index.bml.email.change.display
+general /manage/profile/index.bml.email.opt.actual
+general /manage/profile/index.bml.email.opt.both
+general /manage/profile/index.bml.email.opt.display
+general /manage/profile/index.bml.email.opt.dont
+general /manage/profile/index.bml.email.opt.lj
+general /manage/profile/index.bml.email.opt.none
+general /manage/profile/index.bml.email.opt.no_show
+general /manage/profile/index.bml.email.opt.prime
+general /manage/profile/index.bml.email.opt.show
+general /manage/profile/index.bml.error.bday.child
+general /manage/profile/index.bml.error.contact.child
+general /manage/profile/index.bml.error.email.lj_domain
+general /manage/profile/index.bml.error.locale.zip_ne_state
+general /manage/profile/index.bml.error.locale.zip_requires_us
+general /manage/profile/index.bml.fn.contactinfo
+general /manage/profile/index.bml.fn.email
+general /manage/profile/index.bml.fn.emaildisplay
+general /manage/profile/index.bml.fn.friendof
+general /manage/profile/index.bml.fn.imservices2
+general /manage/profile/index.bml.fn.imservices3
+general /manage/profile/index.bml.fn.last_fm
+general /manage/profile/index.bml.fn.last_fm.desc
+general /manage/profile/index.bml.fn.link
+general /manage/profile/index.bml.fn.mutualfriends
+general /manage/profile/index.bml.fn.name
+general /manage/profile/index.bml.fn.schools
+general /manage/profile/index.bml.fn.sitename
+general /manage/profile/index.bml.fn.userpic
+general /manage/profile/index.bml.fn.zip
+general /manage/profile/index.bml.friendof
+general /manage/profile/index.bml.location
+general /manage/profile/index.bml.mutualfriends
+general /manage/profile/index.bml.optional
+general /manage/profile/index.bml.schools
+general /manage/profile/index.bml.schools.manage
+general /manage/profile/index.bml.section.bio
+general /manage/profile/index.bml.section.description
+general /manage/profile/index.bml.section.friends
+general /manage/profile/index.bml.section.location
+general /manage/profile/index.bml.section.members
+general /manage/profile/index.bml.section.theme
+general /manage/profile/index.bml.section.usermessaging
+general /manage/profile/index.bml.section.web
+general /manage/profile/index.bml.security.visibility.everybody
+general /manage/profile/index.bml.security.visibility.friends
+general /manage/profile/index.bml.share.birthday
+general /manage/profile/index.bml.show.birthday
+general /manage/profile/index.bml.show.birthday.day
+general /manage/profile/index.bml.show.birthday.full
+general /manage/profile/index.bml.show.birthday.nothing
+general /manage/profile/index.bml.show.birthday.year
+general /manage/profile/index.bml.showljtalk
+general /manage/profile/index.bml.success.editpics
+general /manage/profile/index.bml.theme
+general /manage/profile/index.bml.zip.usonly
+general /manage/settings/index.bml.fn.gettingstarted
+general /manage/settings/index.bml.fn.navstrip
+general /manage/settings/index.bml.fn.stylealwaysmine
+general /manage/settings/index.bml.fn.verticalincl
+general /manage/settings/index.bml.fn.weblogs
+general /manage/settings/index.bml.gettingstarted
+general /manage/settings/index.bml.gettingstarted.text
+general /manage/settings/index.bml.gettingstarted.text.completed
+general /manage/settings/index.bml.navstrip
+general /manage/settings/index.bml.navstrip.choose
+general /manage/settings/index.bml.navstrip.choose.dark
+general /manage/settings/index.bml.navstrip.choose.light
+general /manage/settings/index.bml.navstrip.customcolors
+general /manage/settings/index.bml.navstrip.list1
+general /manage/settings/index.bml.navstrip.list2
+general /manage/settings/index.bml.navstrip.list3
+general /manage/settings/index.bml.navstrip.options
+general /manage/settings/index.bml.navstrip.options.see
+general /manage/settings/index.bml.navstrip.options.show
+general /manage/settings/index.bml.public.helper
+general /manage/settings/index.bml.stylealwaysmine
+general /manage/settings/index.bml.stylealwaysmine.text
+general /manage/settings/index.bml.verticalincl
+general /manage/settings/index.bml.verticalincl.text
+general /manage/settings/index.bml.weblogscom
+general /manage/settings/index.bml.weblogscom.text
+general /manage/tags.bml.setting.friends
+general /misc/adult_content.bml.explore
+general /misc/adult_content.bml.explore.notconfirmed
+general /misc/adult_content.bml.message.concepts.blocked.byadmin
+general /misc/adult_content.bml.message.concepts.blocked.byjournal
+general /misc/adult_content.bml.message.concepts.blocked.byposter
+general /misc/adult_content.bml.message.concepts.byadmin
+general /misc/adult_content.bml.message.explicit.blocked.byadmin
+general /misc/adult_content.bml.message.explicit.byadmin
+general /openid/approve.bml.form.header1
+general /openid/approve.bml.form.header2
+general /openid/approve.bml.form.request
+general /openid/approve.bml.form.title
+general /openid/index.bml.beta.content
+general /openid/index.bml.beta.heading
+general /poll/index.bml.gotocreate2
+general /register.bml.ask.header
+general /register.bml.email.body
+general /register.bml.new.101.friends.answer
+general /register.bml.new.101.friends.question
+general /register.bml.new.bodyuser
+general /register.bml.validate.human.submit
+general /register.bml.validate.human.title
+general /reject.bml.shared.success
+general /shop/account.bml.footnote.prices
+general /shop/gifts.bml.buy
+general /shop/gifts.bml.paid.about
+general /shop/gifts.bml.paid.header
+general /shop/randomgift.bml.form.getanother
+general /shop/randomgift.bml.intro
+general /shop/randomgift.bml.nousers
+general /shop/randomgift.bml.title
+general /support/faq.bml.cannotfind
+general /support/faq.bml.cannotfind.note
+general /support/faqbrowse.bml.title_num
+general /support/help.bml.interim
+general /support/see_request.bml.email.validared
+general /support/see_rquest.bml.important.notes.text
+general /talkpost.bml.opt.ljuser
+general /talkpost.bml.opt.ljuser2
+general /talkpost.bml.warnscreened
+general /tools/recent_comments.bml.latest.comments
+general /update.bml.updating
+general /interests/findsim.tt.findsim_do.similar.head
+general /interests/findsim.tt.findsim_do.similar.text
+general /interests/int.tt.communities.header
+general /interests/int.tt.nocomms.header
+general /interests/int.tt.nocomms.text
+general /interests/int.tt.nousers.header
+general /interests/int.tt.nousers.text2
+general /interests/int.tt.users.header
+general /shop/transferpoints.tt.confirm
+general /shop/transferpoints.tt.confirm.anon
+general contentflag.viewingconcepts.byadmin
+general contentflag.viewingexplicit.byadmin
+general cprod.todomaxitems.text2.v1
+general cprod.todononpublic.text.v1
+general crumb.filterfriends
+general crumb.managecomments
+general crumb.managecommentsettings
+general crumb.managecommunities
+general crumb.managefriendgrps
+general crumb.managefriends
+general crumb.managetags
+general crumb.manageuserpics
+general crumb.meme
+general crumb.news
+general crumb.postentry
+general crumb.schools
+general crumb.schoolsfind
+general crumb.schoolsmy
+general customize.cats.animals
+general customize.cats.clean
+general customize.cats.cool
+general customize.cats.cute
+general customize.cats.dark
+general customize.cats.food
+general customize.cats.hobbies
+general customize.cats.illustrated
+general customize.cats.media
+general customize.cats.modern
+general customize.cats.nature
+general customize.cats.occasions
+general customize.cats.pattern
+general customize.cats.special
+general customize.cats.sponsors
+general customize.cats.sup
+general customize.cats.tech
+general customize.cats.travel
+general customize.cats.warm
+general customize.cats.writing
+general customize.layouts.3m
+general customize.propgroup_subheaders.calendar
+general customize.propgroup_subheaders.caption_bar
+general customize.propgroup_subheaders.component
+general customize.propgroup_subheaders.custom
+general customize.propgroup_subheaders.free_text_sidebox
+general customize.propgroup_subheaders.header_bar
+general customize.propgroup_subheaders.hotspot_area
+general customize.propgroup_subheaders.icon
+general customize.propgroup_subheaders.links_sidebox
+general customize.propgroup_subheaders.multisearch_sidebox
+general customize.propgroup_subheaders.navigation_box
+general customize.propgroup_subheaders.ordering
+general customize.propgroup_subheaders.setup
+general customize.propgroup_subheaders.sidebar
+general customize.propgroup_subheaders.sidebox
+general customize.propgroup_subheaders.tabs_and_headers
+general customize.propgroup_subheaders.tags_sidebox
+general customize.propgroup_subheaders.text
+general customize.propgroup_subheaders.title
+general customize.propgroup_subheaders.title_box
+general customize.propgroup_subheaders.top_bar
+general email.invitecoderequest.accept.body
+general email.newacct.body
+general email.newacct2.body
+general email.newacct4.body
+general entryform.music.detect
+general entryform.public
+general error.badpassword
+general error.interest.bytes.chars.words
+general error.interest.chars.words
+general error.interest.excessive
+general error.interest.words
+general esn.add_friend
+general esn.befriended.email_text
+general esn.befriended.openid_email_text
+general esn.befriended.subject
+general esn.defriended.email_text
+general esn.defriended.subject
+general esn.email.pm_without_body
+general esn.journal_new_comment.anonymous.reply_to.anonymous_comment.to_post
+general esn.journal_new_comment.anonymous.reply_to.anonymous_comment.to_your_post
+general esn.journal_new_comment.anonymous.reply_to.post
+general esn.journal_new_comment.anonymous.reply_to.user_comment.to_post
+general esn.journal_new_comment.anonymous.reply_to.user_comment.to_your_post
+general esn.journal_new_comment.anonymous.reply_to.your_comment.to_post
+general esn.journal_new_comment.anonymous.reply_to.your_comment.to_your_post
+general esn.journal_new_comment.anonymous.reply_to.your_post
+general esn.journal_new_comment.user.edit_reply_to.anonymous_comment.to_post
+general esn.journal_new_comment.user.edit_reply_to.anonymous_comment.to_your_post
+general esn.journal_new_comment.user.edit_reply_to.post
+general esn.journal_new_comment.user.edit_reply_to.user_comment.to_post
+general esn.journal_new_comment.user.edit_reply_to.user_comment.to_your_post
+general esn.journal_new_comment.user.edit_reply_to.your_comment.to_post
+general esn.journal_new_comment.user.edit_reply_to.your_comment.to_your_post
+general esn.journal_new_comment.user.edit_reply_to.your_post
+general esn.journal_new_comment.user.reply_to.anonymous_comment.to_post
+general esn.journal_new_comment.user.reply_to.anonymous_comment.to_your_post
+general esn.journal_new_comment.user.reply_to.post
+general esn.journal_new_comment.user.reply_to.user_comment.to_post
+general esn.journal_new_comment.user.reply_to.user_comment.to_your_post
+general esn.journal_new_comment.user.reply_to.your_comment.to_post
+general esn.journal_new_comment.user.reply_to.your_comment.to_your_post
+general esn.journal_new_comment.user.reply_to.your_post
+general esn.journal_new_comment.you.edit_reply_to.anonymous_comment.to_post
+general esn.journal_new_comment.you.edit_reply_to.anonymous_comment.to_your_post
+general esn.journal_new_comment.you.edit_reply_to.post
+general esn.journal_new_comment.you.edit_reply_to.user_comment.to_post
+general esn.journal_new_comment.you.edit_reply_to.user_comment.to_your_post
+general esn.journal_new_comment.you.edit_reply_to.your_comment.to_post
+general esn.journal_new_comment.you.edit_reply_to.your_comment.to_your_post
+general esn.journal_new_comment.you.edit_reply_to.your_post
+general esn.journal_new_comment.you.reply_to.anonymous_comment.to_post
+general esn.journal_new_comment.you.reply_to.anonymous_comment.to_your_post
+general esn.journal_new_comment.you.reply_to.post
+general esn.journal_new_comment.you.reply_to.user_comment.to_post
+general esn.journal_new_comment.you.reply_to.user_comment.to_your_post
+general esn.journal_new_comment.you.reply_to.your_comment.to_post
+general esn.journal_new_comment.you.reply_to.your_comment.to_your_post
+general esn.journal_new_comment.you.reply_to.your_post
+general esn.moderated_submission.subject
+general esn.officialpost.html
+general esn.officialpost.sms
+general esn.officialpost.string
+general esn.remove_friend
+general esn.someone_must_unscreen
+general esn.supofficialpost.sms
+general event.befriended.me
+general event.befriended.user
+general event.defriended.me
+general event.defriended.user
+general fcklang.ljvideo
+general img.flag_btn
+general inbox.menu.friend_updates
+general inbox.menu.new_friends
+general label.security.friends
+general menunav.explore.journalsearch
+general menunav.read.inbox.unread
+general notification_method.sms.title
+general password.max30
+general pingback.ljping.comment.text
+general pingback.option.disabled
+general pingback.option.journal_default
+general pingback.option.lj_only
+general pingback.option.open
+general pingback.public.comment.text
+general pingback.sourceuri.default_title
+general poll.error.notvalidated
+general poll.error.scaletoobig
+general portal.bdays.count.des
+general portal.bdays.count.name
+general portal.bdays.portalname
+general portal.bdays.portaltitle
+general portal.login.portalname
+general portal.memories.entriesnoun
+general portal.memories.entrynoun
+general portal.memories.portalname
+general portal.memories.portaltitle
+general portal.ministats.active
+general portal.ministats.title
+general portal.ministats.total
+general portal.popfaq.portalname
+general portal.popfaq.portaltitle
+general portal.popwithfriends.accttype
+general portal.randuser.count.des
+general portal.randuser.count.name
+general portal.randuser.error.tableempty
+general portal.randuser.hidename.des
+general portal.randuser.hidename.name
+general portal.randuser.hidepic.des
+general portal.randuser.hidepic.name
+general portal.randuser.portalname
+general portal.randuser.portaltitle
+general portal.randuser.portaltitleplural
+general portal.recent.error.noentries
+general portal.recent.error.notsetup
+general portal.recent.error.userstatus
+general portal.recent.items.description
+general portal.recent.items.name
+general portal.recent.journal.description
+general portal.recent.journal.name
+general portal.recent.nosubject
+general portal.recent.permlink
+general portal.recent.portalname
+general portal.recent.portaltitle
+general portal.recent.showtext.description
+general portal.recent.showtext.name
+general portal.stats.journalentyest
+general portal.stats.portalname
+general portal.stats.portaltitle
+general portal.stats.totalusers
+general portal.update.entry
+general portal.update.mode.des
+general portal.update.mode.full
+general portal.update.mode.name
+general portal.update.mode.simple
+general portal.update.moreopts
+general portal.update.portalname
+general portal.update.portaltitle
+general portal.update.subject
+general protocol.old_win32_client
+general search.user.nopic
+general setting.display.secretquestion.actionlink.change
+general setting.display.secretquestion.actionlink.set
+general setting.display.secretquestion.label
+general setting.display.smshistory.label
+general setting.display.smshistory.option
+general setting.gettingstarted.label
+general setting.gettingstarted.option
+general setting.minsecurity.option.select.admin
+general setting.minsecurity.option.select.friends
+general setting.minsecurity.option.select.members
+general setting.minsecurity.option.select.private
+general setting.minsecurity.option.select.public
+general setting.notifyweblogs.label
+general setting.notifyweblogs.option.comm
+general setting.notifyweblogs.option.self
+general setting.sms.error.carrier.invalid
+general setting.sms.error.carrier.none
+general setting.sms.error.phone.failed
+general setting.sms.error.phone.inuse
+general setting.sms.error.phone.invalid
+general setting.sms.error.phone.ratelimit
+general setting.sms.option
+general setting.sms.option.advanced
+general setting.sms.option.carrier
+general setting.sms.option.carrier.selectone
+general setting.sms.option.phone
+general setting.stylealwaysmine.label
+general setting.stylealwaysmine.option
+general setting.xpost.option.footer.vars.comment_image.alttext
+general settings.error.locale.zip_ne_state
+general settings.error.locale.zip_requires_us
+general settings.zipcode
+general shop.email.comm.anon.body
+general shop.email.comm.anon.subject
+general shop.email.comm.explicit.body
+general shop.email.comm.explicit.subject
+general shop.email.comm.other.body
+general shop.email.comm.other.subject
+general shop.email.comm.self.body
+general shop.email.comm.self.subject
+general shop.email.email.anon.body
+general shop.email.email.anon.subject
+general shop.email.email.other.body
+general shop.email.email.other.subject
+general shop.email.user.anon.body
+general shop.email.user.anon.subject
+general shop.email.user.explicit.body
+general shop.email.user.explicit.subject
+general shop.email.user.other.body
+general shop.email.user.other.subject
+general shop.email.user.random.body
+general shop.email.user.random.subject
+general shop.email.user.random_anon.body
+general shop.email.user.random_anon.subject
+general shop.email.user.self.body
+general shop.email.user.self.subject
+general shop.item.account.canbeadded.invaliduser
+general taglib.error.nomerge
+general taglib.error.toomany
+general talk.unscreentoreply
+general tos.error
+general tos.haveread
+general tos.mustread
+general web.controlstrip.links.addfriend
+general web.controlstrip.links.flag
+general web.controlstrip.links.managefriends
+general web.controlstrip.links.viewfriendspage
+general web.controlstrip.links.viewfriendspage2
+general web.controlstrip.reloadpage
+general web.controlstrip.reloadpage.lightstyle
+general web.controlstrip.reloadpage.mystyle
+general web.controlstrip.reloadpage.origstyle
+general web.controlstrip.status.friend
+general web.controlstrip.status.friendof
+general web.controlstrip.status.mutualfriend
+general web.controlstrip.status.news
+general web.controlstrip.status.personalfriendsfriendspage
+general web.controlstrip.status.personalfriendspage
+general web.controlstrip.status.personalneworkpage
+general web.controlstrip.status.yourfriendsfriendspage
+general web.controlstrip.status.yourfriendspage
+general web.lj-replace.first_post
+general web.lj-replace.first_post.subject
+general widget.accountstatistics.comments
+general widget.accountstatistics.entries
+general widget.accountstatistics.memories
+general widget.accountstatistics.tags
+general widget.addqotd.extratext
+general widget.addqotd.extratext.note
+general widget.addqotd.is_special
+general widget.browse.directorysearch
+general widget.browse.directorysearch.communities
+general widget.browse.directorysearch.users
+general widget.browse.extras.random
+general widget.browse.extras.random.desc
+general widget.browse.findusers
+general widget.browse.findusers.location
+general widget.browse.findusers.school
+general widget.browse.title
+general widget.commsofuser.title
+general widget.commsofuser.viewfriendspage
+general widget.commsofuser.viewprofile
+general widget.contentflagreport.btn.returnentry
+general widget.contentflagreport.btn.returnjournal
+general widget.contentflagreport.btn.submit
+general widget.contentflagreport.confirm
+general widget.contentflagreport.description
+general widget.contentflagreport.done
+general widget.contentflagreport.error.invalidentry
+general widget.contentflagreport.error.invalidurl
+general widget.contentflagreport.error.invalidusername
+general widget.contentflagreport.explore
+general widget.contentflagreport.note
+general widget.createaccount.alt_layout.error.tos
+general widget.createaccount.alt_layout.field.captcha
+general widget.createaccount.alt_layout.field.tos
+general widget.createaccount.error.username.reserved
+general widget.createaccount.field.captcha
+general widget.createaccountnextsteps.steps.explore
+general widget.friendbirthdays.paidtime_link
+general widget.gettingstarted.entry.link
+general widget.gettingstarted.entry.note
+general widget.gettingstarted.expires
+general widget.gettingstarted.friends.link
+general widget.gettingstarted.friends.note]
+general widget.gettingstarted.manage
+general widget.gettingstarted.profile.link
+general widget.gettingstarted.profile.note2
+general widget.gettingstarted.title
+general widget.gettingstarted.userpics.link
+general widget.gettingstarted.userpics.note
+general widget.latestnews.more
+general widget.latestnews.subscribe
+general widget.location.error.locale.zip_ne_state
+general widget.location.error.locale.zip_requires_us
+general widget.location.fn.zip
+general widget.location.fn.zip.inline
+general widget.location.zip.usonly
+general widget.manageqotd.extratext
+general widget.manageqotd.is_special
+general widget.navstripchooser.option.onjournal
+general widget.navstripchooser.option.onothers
+general widget.navstripchooser.page.comment.custom
+general widget.navstripchooser.page.community.belongto
+general widget.navstripchooser.page.community.notbelongto
+general widget.navstripchooser.page.journal.loggedout
+general widget.navstripchooser.page.journal.notwatching
+general widget.navstripchooser.page.journal.own
+general widget.navstripchooser.page.journal.watching
+general widget.navstripchooser.page.readlist.loggedout
+general widget.navstripchooser.page.readlist.own
+general widget.pagenotice.dismiss
+general widget.qotd.answer
+general widget.qotd.archivelink
+general widget.qotd.entry.subject
+general widget.qotd.entry.submittedby
+general widget.qotd.suggestions
+general widget.qotd.view.more
+general widget.qotd.view.other.answers
+general widget.qotd.viewanswers
+general widget.qotdarchive.skip.next
+general widget.qotdarchive.skip.previous
+general widget.qotdresponses.answer.the.question
+general widget.qotdresponses.explore
+general widget.qotdresponses.no.entries.to.display
+general widget.qotdresponses.previous
+general widget.qotdresponses.read.more
+general widget.qotdresponses.read.your.friends.page
+general widget.qotdresponses.there.are.no.answers
+general widget.search.note
+general widget.shopcart.deliverydate.today
+general widget.shopcartstatusbar.header
+general widget.shopcartstatusbar.itemcount
+general widget.shopcartstatusbar.newcart
+general widget.shopcartstatusbar.viewcart
+general widget.shopitemgroupdisplay.paidaccounts.header
+general widget.shopitemgroupdisplay.paidaccounts.item.circleaccount
+general widget.shopitemgroupdisplay.paidaccounts.item.differentaccount
+general widget.shopitemgroupdisplay.paidaccounts.item.exisitingaccount
+general widget.shopitemgroupdisplay.paidaccounts.item.existingaccount
+general widget.shopitemgroupdisplay.paidaccounts.item.newaccount
+general widget.shopitemgroupdisplay.paidaccounts.item.randomaccount.noshow
+general widget.shopitemgroupdisplay.paidaccounts.item.randomaccount.show
+general widget.shopitemgroupdisplay.paidaccounts.item.self
+general widget.support.submit.error.captcha
+general widget.themechooser.theme.desc
+general widget.themechooser.theme.specialdesc
+general
+general
+general
+general
+general
+general
+general
+general
+general
+general
+general
+general
+general
+general
+general
+general
+general
+
+
diff -r 7d1ada126323 -r b5fcf79b7915 bin/upgrading/en.dat
--- a/bin/upgrading/en.dat Wed Apr 20 22:06:47 2011 +0800
+++ b/bin/upgrading/en.dat Thu Apr 21 03:02:10 2011 +0800
@@ -1,10 +1,9 @@
;; -*- coding: utf-8 -*-
-
-actionlink=[[[link]]]
+Actionlink=[[[link]]]
admin.noprivserror=Sorry, your account does not have the necessary [[?numprivs|privilege|privileges]] ([[?numprivs||one of ]][[needprivs]]) to use this tool.
-backlink=[<a href="[[link]]"><<</a> [[text]]]
+Backlink=[<a href="[[link]]"><<</a> [[text]]]
bml.badcontent.body=One or more errors occurred processing your request. Please go back, correct the necessary information, and submit your data again.
@@ -12,17 +11,15 @@ bml.badinput.body=Your browser sent some
bml.badinput.head=Bad Unicode Input
-bml.needlogin.body4=In order to view this page, you must <a [[aopts]]>log in</a>. If you do not have an account, you may <a [[aopts]]>create one now</a>.
-
bml.needlogin.body5=In order to view this page, you must <a [[aopts1]]>log in</a>. If you do not have an account, you may <a [[aopts2]]>create one now</a>.
bml.needlogin.head=Login Required
-bml.parse_multipart.parse=Error parsing upload
-
-bml.parse_multipart.toolarge=Upload too large
-
-bml.parse_multipart.unknowntype=Unknown content type
+BML.parse_multipart.parse=Error parsing upload
+
+BML.parse_multipart.toolarge=Upload too large
+
+BML.parse_multipart.unknowntype=Unknown content type
bml.requirepost=As a security precaution, the page you're viewing requires a POST request, not a GET. If you're trying to submit this form legitimately, please contact us.
@@ -42,10 +39,10 @@ cleanhtml.suspend_msg=This is a suspende
cleanhtml.suspend_msg_with_supportid=This is a suspended entry. <a [[aopts]]>An unsuspension request</a> has been opened, and your entry will be reviewed soon.
+collapsible.collapsed=Expand
+
collapsible.expanded=Collapse
-collapsible.collapsed=Expand
-
contentflag.viewingconcepts.bycommunity=You are about to view content that a community administrator has advised should be viewed with discretion.
contentflag.viewingconcepts.byjournal=You are about to view content that the journal owner has advised should be viewed with discretion.
@@ -60,382 +57,48 @@ contentflag.viewingexplicit.byposter=You
cprod.birthday.link.v1=birthdays
-cprod.birthday.link.v2=
-
-cprod.birthday.link.v3=
-
-cprod.birthday.link.v4=
-
-cprod.birthday.link.v5=
-
cprod.birthday.text.v1=Hey, [[user]], see which of your friends' [[link]] are coming up! LiveJournal keeps a list of their birthdays for you.
-cprod.birthday.text.v2=
-
-cprod.birthday.text.v3=
-
-cprod.birthday.text.v4=
-
-cprod.birthday.text.v5=
-
cprod.controlstrip.link.v1=Navigation Strip
-cprod.controlstrip.link.v2=
-
-cprod.controlstrip.link.v3=
-
-cprod.controlstrip.link.v4=
-
-cprod.controlstrip.link.v5=
-
cprod.controlstrip.text.v1=9 out of 10 LJ users prefer the [[link]]. (OK we made that up, but you should check it out anyway.)
-cprod.controlstrip.text.v2=
-
-cprod.controlstrip.text.v3=
-
-cprod.controlstrip.text.v4=
-
-cprod.controlstrip.text.v5=
-
-cprod.createstyles.link.v1=
-
-cprod.createstyles.link.v2=
-
-cprod.createstyles.link.v3=
-
-cprod.createstyles.link.v4=
-
-cprod.createstyles.link.v5=
-
cprod.createstyles.text.v1=Your account type does not support creating styles.
-cprod.createstyles.text.v2=
-
-cprod.createstyles.text.v3=
-
-cprod.createstyles.text.v4=
-
-cprod.createstyles.text.v5=
-
-cprod.directory.link3.v1=
-
-cprod.directory.link3.v2=
-
-cprod.directory.link3.v3=
-
-cprod.directory.link3.v4=
-
-cprod.directory.link3.v5=
-
cprod.directory.text3.v1=Your account level doesn't give you access to the directory.
-cprod.directory.text3.v2=
-
-cprod.directory.text3.v3=
-
-cprod.directory.text3.v4=
-
-cprod.directory.text3.v5=
-
-cprod.editpics.link.v1=
-
-cprod.editpics.link.v2=
-
-cprod.editpics.link.v3=
-
-cprod.editpics.link.v4=
-
-cprod.editpics.link.v5=
-
-cprod.editpics.link2-2.v1=
-
-cprod.editpics.link2-2.v2=
-
-cprod.editpics.link2-2.v3=
-
-cprod.editpics.link2-2.v4=
-
-cprod.editpics.link2-2.v5=
-
-cprod.editpics.link3-2.v1=
-
-cprod.editpics.link3-2.v4=
-
-cprod.editpics.link3-2.v5=
-
-cprod.editpics.link3-3.v3=
-
-cprod.editpics.text5.v4=
-
-cprod.editpics.text5.v5=
-
cprod.editpics.text6.v1=You've reached your limit of [[num]] userpics.
-cprod.editpics.text6.v2=
-
-cprod.editpics.text6.v3=
-
cprod.editpics.text7.v1=You've reached your limit of [[num]] userpics.
-cprod.editpicsmax.link.v1=
-
-cprod.editpicsmax.link.v2=
-
-cprod.editpicsmax.link.v3=
-
-cprod.editpicsmax.link.v4=
-
-cprod.editpicsmax.link.v5=
-
-cprod.editpicsmax.link2-3.v1=
-
-cprod.editpicsmax.link2.v2=
-
-cprod.editpicsmax.link2.v3=
-
-cprod.editpicsmax.link2.v4=
-
-cprod.editpicsmax.link2.v5=
-
-cprod.editpicsmax.link3.v1=
-
-cprod.editpicsmax.link3.v3=
-
-cprod.editpicsmax.link3.v4=
-
-cprod.editpicsmax.link3.v5=
-
cprod.editpicsmax.text5.v1=You've reached your limit of [[num]] userpics.
-cprod.editpicsmax.text5.v2=
-
-cprod.editpicsmax.text5.v3=
-
-cprod.editpicsmax.text5.v4=
-
-cprod.editpicsmax.text5.v5=
-
-cprod.editstyles.link.v1=
-
-cprod.editstyles.link.v2=
-
-cprod.editstyles.link.v3=
-
-cprod.editstyles.link.v4=
-
-cprod.editstyles.link.v5=
-
cprod.editstyles.text.v1=Your account type does not permit you to edit styles.
-cprod.editstyles.text.v2=
-
-cprod.editstyles.text.v3=
-
-cprod.editstyles.text.v4=
-
-cprod.editstyles.text.v5=
-
cprod.feeds.link.v1=syndicated feeds
-cprod.feeds.link.v2=
-
-cprod.feeds.link.v3=
-
-cprod.feeds.link.v4=
-
-cprod.feeds.link.v5=
-
cprod.feeds.text.v1=Find good content outside of LJ? Add [[link]] to your Friends page so you never have to leave.
-cprod.feeds.text.v2=
-
-cprod.feeds.text.v3=
-
-cprod.feeds.text.v4=
-
-cprod.feeds.text.v5=
-
cprod.friendsfriends.link2.v1=Friends of Friends
-cprod.friendsfriends.link2.v2=
-
-cprod.friendsfriends.link2.v3=
-
-cprod.friendsfriends.link2.v4=
-
-cprod.friendsfriends.link2.v5=
-
cprod.friendsfriends.text2.v1=[[link]] page shows all your friends' Friends pages in one Friends page. Say that three times fast!
-cprod.friendsfriends.text2.v2=
-
-cprod.friendsfriends.text2.v3=
-
-cprod.friendsfriends.text2.v4=
-
-cprod.friendsfriends.text2.v5=
-
-cprod.friendsfriendsinline.link2.v1=Paid accounts
-
-cprod.friendsfriendsinline.link2.v2=
-
-cprod.friendsfriendsinline.link2.v3=
-
-cprod.friendsfriendsinline.link2.v4=
-
-cprod.friendsfriendsinline.link2.v5=
-
-cprod.friendsfriendsinline.link3.v1=
-
-cprod.friendsfriendsinline.link3.v2=
-
-cprod.friendsfriendsinline.link3.v3=
-
-cprod.friendsfriendsinline.link3.v4=
-
-cprod.friendsfriendsinline.link3.v5=
-
-cprod.friendsfriendsinline.text2.v1=Sorry, only [[link]] permit showing friends of friends.
-
-cprod.friendsfriendsinline.text2.v2=
-
-cprod.friendsfriendsinline.text2.v3=
-
-cprod.friendsfriendsinline.text2.v4=
-
-cprod.friendsfriendsinline.text2.v5=
-
cprod.friendsfriendsinline.text3.v1=Sorry, this account type does not permit showing your network.
-cprod.friendsfriendsinline.text3.v2=
-
-cprod.friendsfriendsinline.text3.v3=
-
-cprod.friendsfriendsinline.text3.v4=
-
-cprod.friendsfriendsinline.text3.v5=
-
-cprod.links.link.v1=
-
-cprod.links.link.v2=
-
-cprod.links.link.v3=
-
-cprod.links.link.v4=
-
-cprod.links.link.v5=
-
-cprod.links.link2-2.v1=
-
-cprod.links.link2.v2=
-
-cprod.links.link2.v3=
-
-cprod.links.link2.v4=
-
-cprod.links.link2.v5=
-
cprod.links.text3.v1=Your account type does not permit you to use any more links.
-cprod.links.text3.v2=
-
-cprod.links.text3.v3=
-
-cprod.links.text3.v4=
-
-cprod.links.text3.v5=
-
cprod.polls.link.v1=poll creation wizard
-cprod.polls.link.v2=
-
-cprod.polls.link.v3=
-
-cprod.polls.link.v4=
-
-cprod.polls.link.v5=
-
cprod.polls.text.v1=[[user]], you can post a poll in your journal using our [[link]]? [[poll]]
-cprod.polls.text.v2=
-
-cprod.polls.text.v3=
-
-cprod.polls.text.v4=
-
-cprod.polls.text.v5=
-
-cprod.syn.link.v1=
-
-cprod.syn.link.v2=
-
-cprod.syn.link.v3=
-
-cprod.syn.link.v4=
-
-cprod.syn.link.v5=
-
cprod.syn.text.v1=Note: This feature is not available to your account type.
-cprod.syn.text.v2=
-
-cprod.syn.text.v3=
-
-cprod.syn.text.v4=
-
-cprod.syn.text.v5=
-
-cprod.textmessaging.link.v1=
-
-cprod.textmessaging.link.v2=
-
-cprod.textmessaging.link.v3=
-
-cprod.textmessaging.link.v4=
-
-cprod.textmessaging.link.v5=
-
-cprod.textmessaging.link2-2.v1=
-
-cprod.textmessaging.link2.v2=
-
-cprod.textmessaging.link2.v3=
-
-cprod.textmessaging.link2.v4=
-
-cprod.textmessaging.link2.v5=
-
-cprod.textmessaging.text.v2=
-
-cprod.textmessaging.text.v3=
-
-cprod.textmessaging.text.v4=
-
-cprod.textmessaging.text.v5=
-
cprod.textmessaging.text3.v1=Your account type does not permit usage of this feature.
cprod.userpic.link.v1=default userpic
-cprod.userpic.link.v2=
-
-cprod.userpic.link.v3=
-
-cprod.userpic.link.v4=
-
-cprod.userpic.link.v5=
-
cprod.userpic.text.v1=[[user]], did you know you could pick a [[link]] to go along with your posts and comments?
-cprod.userpic.text.v2=
-
-cprod.userpic.text.v3=
-
-cprod.userpic.text.v4=
-
-cprod.userpic.text.v5=
-
crumb.acctstatus=Account Status
crumb.addfriend=Add Friend
@@ -466,8 +129,6 @@ crumb.community=Community Center
crumb.createcommunity=Create Community
-crumb.createjournal=Create Journal
-
crumb.createjournal_1=Create Your Account
crumb.createstyle=Create Style
@@ -484,8 +145,6 @@ crumb.editcomments=Comment Settings
crumb.editentries=Edit Entries
-crumb.editentries_do=Edit Entry
-
crumb.editfriendgrps=Edit Friends Groups
crumb.editfriends=Edit Friends
@@ -550,8 +209,6 @@ crumb.mobilepost=Mobile Post Settings
crumb.moderate=Community Moderation
-crumb.modify=Journal Settings
-
crumb.moodeditor=Custom Mood Theme Editor
crumb.moodlist=Mood Viewer
@@ -560,7 +217,7 @@ crumb.phonepostsettings=Phone Post
crumb.popfaq=Popular FAQs
-crumb.register=Validate Email
+]crumb.register=Validate Email
crumb.searchinterests=Search By Interest
@@ -570,8 +227,6 @@ crumb.seeoverrides=View User Overrides
crumb.setpgpkey=Public Key
-crumb.siteopts=Browse Preferences
-
crumb.sitestats=Site Statistics
crumb.stats=Statistics
@@ -618,8 +273,6 @@ customize.cats.custom=Your Custom Layers
customize.cats.featured=Featured
-customize.cats.special=Special
-
customize.layoutname.default=(Unnamed - [[layoutid]])
customize.layouts.1=1 Column (no sidebar)
@@ -632,12 +285,12 @@ customize.layouts.2r=2 Column (sidebar o
customize.layouts.2rnh=2 Column (sidebar on right; no header)
+customize.layouts.3=3 Column (sidebars on either side)
+
customize.layouts.3l=3 Column (sidebars on the left)
customize.layouts.3r=3 Column (sidebars on the right)
-customize.layouts.3=3 Column (sidebars on either side)
-
customize.layouts_for_dropdown.choose=(Choose a Layout)
customize.propgroup_subheaders.archive=Archive
@@ -742,10 +395,10 @@ edges.join.error.targetnotopen=The commu
edges.join.error.targetnotvisible=The community must be visible.
+edges.join.error.usernotindividual=Your account must be a personal or identity account.
+
edges.join.error.usernotpersonal=Your account must be a personal account.
-edges.join.error.usernotindividual=Your account must be a personal or identity account.
-
edges.join.error.usernotvisible=Your account must be visible.
edges.join.error.userunderage=You must be 18 or older to join this community.
@@ -770,7 +423,7 @@ edges.watch.error.usernotindividual=Your
edges.watch.error.usernotvisible=Your account must be visible.
-email=Email
+Email=Email
email.emailreset.body<<
The email address for your [[sitename]] account '[[user]]' has
@@ -1169,12 +822,13 @@ entryform.userpic.upload=Upload a userpi
entryform.userpics=User Picture Icon:
-error=Error
-
entryform.xpost=Crosspost this entry
entryform.xpost.manage=Manage accounts
+Error|notes=typically used inside an H1 tag to announce an error.
+Error=Error
+
error.badpassword2=You typed the wrong password. If you make too many wrong login attempts in a row, your account access will be temporarily blocked, so you may want to <a [[aopts]]>reset your password</a> if you aren't sure what it is.
error.blocked=Sorry, you are currently blocked from reaching the page you are attempting to visit. The block type is: [[blocktype]]. Please email us at [[email]] and reference this message for further assistance.
@@ -1263,12 +917,12 @@ error.noschwartz=TheSchwartz not install
error.notloggedin=You have to <a [[aopts]]>log in</a> in order to use this page.
+error.pay.cmo.engbadstate=Payment engine is in a bad state. Please try your order again.
+
error.pay.dberr=Database error: [[errstr]]. Please try again later.
error.pay.nodb=Failed to connect to database. Please try again later.
-error.pay.cmo.engbadstate=Payment engine is in a bad state. Please try your order again.
-
error.pay.paypal.connection=Temporary failure connecting to PayPal. Please try again later.
error.pay.paypal.engbadstate=Payment engine is in a bad state. Please contact site administrators.
@@ -1329,12 +983,12 @@ error.tempdisabled=This is disabled temp
error.unknownmode=Unknown mode.
+error.usernameinvalid=Username contains invalid characters.
+
+error.usernamelong=Username is too long; cannot exceed 15 characters.
+
error.username_notfound=Username not found.
-error.usernameinvalid=Username contains invalid characters.
-
-error.usernamelong=Username is too long; cannot exceed 15 characters.
-
error.vhost.noalias=This user's account type doesn't permit domain aliasing.
error.vhost.nocomm=This account isn't a community journal.
@@ -1343,32 +997,32 @@ error.vhost.nodomain=URLs like <nobr><b>
error.vhost.nostyle=This user's account type is not permitted to create and embed styles.
+esn.addedtocircle.trusted.email_text<<
+Hi [[user]],
+
+[[poster]] has granted you access to their journal. You will now be able to read their locked entries.
+
+You can:
+.
+
+esn.addedtocircle.trusted.subject=[[who]] granted you access to their journal!
+
+esn.addedtocircle.watched.email_text<<
+Hi [[user]],
+
+[[poster]] has subscribed to your journal. They will now be able to read your[[entries]] entries on their reading list.
+
+You can:
+.
+
+esn.addedtocircle.watched.subject=[[who]] subscribed to your journal!
+
esn.add_friend_community=[[openlink]]Add community "[[community]]" to your reading page[[closelink]]
esn.add_trust=[[openlink]]Grant access to [[journal]][[closelink]]
esn.add_watch=[[openlink]]Subscribe to [[journal]][[closelink]]
-esn.addedtocircle.trusted.email_text<<
-Hi [[user]],
-
-[[poster]] has granted you access to their journal. You will now be able to read their locked entries.
-
-You can:
-.
-
-esn.addedtocircle.trusted.subject=[[who]] granted you access to their journal!
-
-esn.addedtocircle.watched.email_text<<
-Hi [[user]],
-
-[[poster]] has subscribed to your journal. They will now be able to read your[[entries]] entries on their reading list.
-
-You can:
-.
-
-esn.addedtocircle.watched.subject=[[who]] subscribed to your journal!
-
esn.bday.email<<
Hi [[user]],
@@ -1378,6 +1032,18 @@ You can:
.
esn.bday.subject=[[bdayuser]]'s birthday is coming up!
+
+esn.befriended.subject=[[who]] added you as a friend!
+
+esn.community_join_requst.email_text<<
+Hi [[maintainer]],
+
+[[username]] has requested to join your community, [[communityname]].
+
+You can:
+.
+
+esn.community_join_requst.subject=[[comm]] membership request by [[who]]
esn.comm_invite.email<<
Hi [[user]],
@@ -1419,16 +1085,6 @@ Regards,
[[sitename]] Team
.
-
-esn.community_join_requst.email_text<<
-Hi [[maintainer]],
-
-[[username]] has requested to join your community, [[communityname]].
-
-You can:
-.
-
-esn.community_join_requst.subject=[[comm]] membership request by [[who]]
esn.delete_comment=[[openlink]]Delete the comment[[closelink]]
@@ -1470,17 +1126,17 @@ esn.hi=Hi [[username]],
esn.if_suport_form=If your mail client supports it, you can also reply here:
+esn.invited_friend_joins.email<<
+Hi [[user]],
+
+Your friend [[newuser]] has created a journal on [[sitenameshort]]!
+
+You can:
+.
+
+esn.invited_friend_joins.subject=[[who]] created a journal!
+
esn.invite_another_friend=[[openlink]]Invite another friend[[closelink]]
-
-esn.invited_friend_joins.email<<
-Hi [[user]],
-
-Your friend [[newuser]] has created a journal on [[sitenameshort]]!
-
-You can:
-.
-
-esn.invited_friend_joins.subject=[[who]] created a journal!
esn.join_community=[[openlink]]Join [[journal]] to read Members-only entries[[closelink]]
@@ -1603,17 +1259,17 @@ esn.mail_comments.subject.comment_you_ed
esn.mail_comments.subject.comment_you_posted=Comment you posted...
+esn.mail_comments.subject.edit_reply_to_an_entry=Edited reply to an entry...
+
esn.mail_comments.subject.edit_reply_to_a_comment=Edited reply to a comment...
-esn.mail_comments.subject.edit_reply_to_an_entry=Edited reply to an entry...
-
esn.mail_comments.subject.edit_reply_to_your_comment=Edited reply to your comment...
esn.mail_comments.subject.edit_reply_to_your_entry=Edited reply to your entry...
+esn.mail_comments.subject.reply_to_an_entry=Reply to an entry...
+
esn.mail_comments.subject.reply_to_a_comment=Reply to a comment...
-
-esn.mail_comments.subject.reply_to_an_entry=Reply to an entry...
esn.mail_comments.subject.reply_to_your_comment=Reply to your comment...
@@ -1741,29 +1397,29 @@ Regards,
The [[sitename]] Team
.
+esn.removedfromcircle.trusted.email_text<<
+Hi [[user]],
+
+[[poster]] has removed your access to their journal. You will no longer be able to read their locked entries.
+
+You can:
+.
+
+esn.removedfromcircle.trusted.subject=[[who]] removed your access to their journal
+
+esn.removedfromcircle.watched.email_text<<
+Hi [[user]],
+
+[[poster]] has unsubscribed from your journal. They will no longer be able to read your entries on their reading list.
+
+You can:
+.
+
+esn.removedfromcircle.watched.subject=[[who]] has unsubscribed from your journal
+
esn.remove_trust=[[openlink]]Remove access from [[postername]][[closelink]]
esn.remove_watch=[[openlink]]Unsubscribe from [[postername]][[closelink]]
-
-esn.removedfromcircle.trusted.email_text<<
-Hi [[user]],
-
-[[poster]] has removed your access to their journal. You will no longer be able to read their locked entries.
-
-You can:
-.
-
-esn.removedfromcircle.trusted.subject=[[who]] removed your access to their journal
-
-esn.removedfromcircle.watched.email_text<<
-Hi [[user]],
-
-[[poster]] has unsubscribed from your journal. They will no longer be able to read your entries on their reading list.
-
-You can:
-.
-
-esn.removedfromcircle.watched.subject=[[who]] has unsubscribed from your journal
esn.reply_at_webpage=[[openlink]]Reply[[closelink]] at the webpage
@@ -1841,12 +1497,12 @@ esn.view_thread=[[openlink]]View the thr
esn.view_threadroot=[[openlink]]Go to the top of the thread[[closelink]] this comment is part of
+esn.your_inbox=your Inbox
+
esn.you_can=You can:
esn.you_must_unscreen=You must respond to it or unscreen it before others can see it.
-esn.your_inbox=your Inbox
-
event.addedtocircle.me=Someone adds me to their circle
event.addedtocircle.user=Someone adds [[user]] to their circle
@@ -1855,10 +1511,10 @@ event.birthday.me=One of the people on m
event.birthday.user=[[user]]'s birthday is coming up
+event.community_join_requst=Someone requests membership in a community I maintain
+
event.comm_invite=I receive an invitation to join a community
-event.community_join_requst=Someone requests membership in a community I maintain
-
event.invited_friend_joins=Someone I invited creates a new journal
event.journal_new_comment.friend=Someone comments in any journal on my friends page
@@ -1965,6 +1621,10 @@ event.removedfromcircle.me=Someone remov
event.removedfromcircle.user=Someone removes [[user]] from their circle
+event.userpic_upload.me=One of the accounts I subscribe to uploads a new userpic
+
+event.userpic_upload.user=[[user]] uploads a new userpic
+
event.user_expunged=[[user]] has been purged
event.user_message_recvd.me=Someone sends me a message
@@ -1975,9 +1635,19 @@ event.user_new_entry.any=Any of my frien
event.user_new_entry.user=[[user]] posts a new entry anywhere.
-event.userpic_upload.me=One of the accounts I subscribe to uploads a new userpic
-
-event.userpic_upload.user=[[user]] uploads a new userpic
+event.vgift.approved.actions=<a [[aopts]]>View Gift</a>
+
+event.vgift.approved.content.n=[[admin]] has rejected your virtual gift submission "[[vgift]]".
+
+event.vgift.approved.content.y=[[admin]] has approved your virtual gift submission "[[vgift]]".
+
+event.vgift.approved.msg.n=Sorry, your proposed virtual gift named "[[vgift]]" was not approved.
+
+event.vgift.approved.msg.y=Congratulations, your proposed virtual gift named "[[vgift]]" was approved.
+
+event.vgift.approved.reason=The reviewer, [[admin]], included the following comments:
+
+event.vgift.notfound=The specified virtual gift could not be found.
event.xpost.failure.content=Crosspost to [[accountname]] failed.<br /><br />[[errmsg]]
@@ -1991,20 +1661,6 @@ event.xpost.success.content=Crosspost to
event.xpost.success.title=Crosspost of <a href="[[entryurl]]">[[entrydesc]]</a> to [[accountname]] action successful.
-event.vgift.approved.actions=<a [[aopts]]>View Gift</a>
-
-event.vgift.approved.content.N=[[admin]] has rejected your virtual gift submission "[[vgift]]".
-
-event.vgift.approved.content.Y=[[admin]] has approved your virtual gift submission "[[vgift]]".
-
-event.vgift.approved.msg.N=Sorry, your proposed virtual gift named "[[vgift]]" was not approved.
-
-event.vgift.approved.msg.Y=Congratulations, your proposed virtual gift named "[[vgift]]" was approved.
-
-event.vgift.approved.reason=The reviewer, [[admin]], included the following comments:
-
-event.vgift.notfound=The specified virtual gift could not be found.
-
fckland.ljimage=Insert/Edit Image
fcklang.cutcontents=Type your cut contents here.
@@ -2029,7 +1685,7 @@ fcklang.userprompt.user=Username
fcklang.videoprompt=Please enter the YouTube, PhotoBucket, or Google Video URL:
-help=Help
+Help=Help
img.arrow-down=Open
@@ -2127,13 +1783,13 @@ inbox.menu.birthdays=Birthdays
inbox.menu.bookmarks=Bookmarks
+inbox.menu.circle_updates=Circle Updates
+
+inbox.menu.encircled=New People
+
inbox.menu.entries_and_comments=Entries & Comments
-inbox.menu.circle_updates=Circle Updates
-
inbox.menu.messages=Messages
-
-inbox.menu.encircled=New People
inbox.menu.new_message.btn=New Message
@@ -2300,22 +1956,22 @@ menunav.create.uploaduserpics=Upload Ico
menunav.explore=Explore
+menunav.explore.directorysearch=Directory Search
+
+menunav.explore.faq=FAQ
+
menunav.explore.interests=Interests
-menunav.explore.directorysearch=Directory Search
-
menunav.explore.latestthings=Latest Things
menunav.explore.popsubscriptions=Popular Subscriptions
+menunav.explore.randomcommunity=Random Community
+
menunav.explore.randomjournal=Random Journal
-menunav.explore.randomcommunity=Random Community
-
menunav.explore.sitesearch=Site and Journal Search
-menunav.explore.faq=FAQ
-
menunav.organize=Organize
menunav.organize.customizestyle=Customize Style
@@ -2358,12 +2014,12 @@ menunav.shop=Shop
menunav.shop.gifts=Circle Gifts
+menunav.shop.history=Payment History
+
+menunav.shop.merchandise=[[siteabbrev]] Merchandise
+
menunav.shop.paidtime=Buy a Paid Account
-menunav.shop.history=Payment History
-
-menunav.shop.merchandise=[[siteabbrev]] Merchandise
-
menunav.shop.sponsor=Sponsor a User
menunav.shop.transferpoints=Transfer Shop Points
@@ -2382,7 +2038,7 @@ number.thousand=[[number]] thousand
optional=(optional)
-password=Password
+Password=Password
poll.changevote=Change Your Vote
@@ -2494,14 +2150,110 @@ poll.submit=Submit Poll
poll.viewanswers=View Answers
-polls.link=poll creation wizard
-
-polls.text=[[user]], did you know you can post a poll in your journal using our [[link]]? Find out what your friends <em>really</em> think about that shirt you bought last week. [[poll]]
+portal.bdays.count.des=By default, the 5 friends with the soonest birthdays are shown.
+
+portal.bdays.count.name=Birthdays to Display
+
+portal.bdays.portalname=Birthdays
+
+portal.bdays.portaltitle=Birthdays
+
+portal.login.portalname=Login Box
+
+portal.memories.entriesnoun=entries
+
+portal.memories.entrynoun=entry
+
+portal.memories.portalname=Memorable Posts
+
+portal.memories.portaltitle=Memorable Posts
+
+portal.ministats.active=Active:
+
+portal.ministats.title=User Stats
+
+portal.ministats.total=Total:
+
+portal.popfaq.portalname=10 Most Viewed FAQs
+
+portal.popfaq.portaltitle=10 Most Viewed FAQs
+
+portal.popwithfriends.accttype=Your account type does not permit use of this feature.
+
+portal.randuser.count.des=By default, 1 random user is shown, but you can have up to 10 vertically in the narrow columns, or 5 horizontally in a wide column
+
+portal.randuser.count.name=Number of random users to show
+
+portal.randuser.error.tableempty=There are no random users. Contact admin.
+
+portal.randuser.hidename.des=By default, the random user name is shown. Check this to remove it.
+
+portal.randuser.hidename.name=Hide Name
+
+portal.randuser.hidepic.des=By default, the random user picture is shown, if available. Check this to remove it.
+
+portal.randuser.hidepic.name=Hide User Picture
+
+portal.randuser.portalname=Random User
+
+portal.randuser.portaltitle=Random User
+
+portal.randuser.portaltitleplural=Random Users
+
+portal.recent.error.noentries=Sorry. No entries.
+
+portal.recent.error.notsetup=You have to configure this box. Click the plus symbol to setup the journal you'd like to watch here.
+
+portal.recent.error.userstatus=User has deleted or suspended their account.
+
+portal.recent.items.description=By default, only the most recent entry is shown.
+
+portal.recent.items.name=Items to display
+
+portal.recent.journal.description=What journal do you want to see the recent items from?
+
+portal.recent.journal.name=Journal
+
+portal.recent.nosubject=(No Subject)
+
+portal.recent.permlink=Link
+
+portal.recent.portalname=Recent Entry View
+
+portal.recent.portaltitle=Recent Entry Box
+
+portal.recent.showtext.description=By default only subjects will be shown.
+
+portal.recent.showtext.name=Include Text
+
+portal.stats.journalentyest=Journal entries yesterday
+
+portal.stats.portalname=Site Statistics
+
+portal.stats.portaltitle=Statistics
+
+portal.stats.totalusers=Total users
+
+portal.update.entry=Entry:
+
+portal.update.mode.des=Full mode gives you a ton of extra posting options ... including posting in communities and setting your current mood, music, and picture. Simple mode is nicer if you hardly use those features and would prefer not to see it all.
+
+portal.update.mode.full=Full
+
+portal.update.mode.name=Mode
+
+portal.update.mode.simple=Simple
+
+portal.update.moreopts=More Options
+
+portal.update.portalname=Journal Update
+
+portal.update.portaltitle=Update Your Journal
+
+portal.update.subject=Subject:
protocol.bad_password=Your password is too easy to guess. It's recommended that you change it, otherwise you risk having your journal hijacked. Visit [[siteroot]]/changepassword.bml to change your password.
-protocol.hello_test=
-
protocol.mail_bouncing=You are currently using a bad email address. All mail we try to send you is bouncing. We require a valid email address for continued use. Visit the support area for more information.
protocol.modpost=Your entry has been put into the moderation queue. It will be accepted or rejected by one of the community moderators.
@@ -2516,10 +2268,10 @@ protocol.readonly=Your account is tempor
rename.error.invalidaccounttype=Only personal journals can own rename tokens.
+rename.error.invalidfrom=Tried to rename an invalid journal.
+
rename.error.invalidjournaltypeto=This username is in use and is not a personal journal; only personal journals may be renamed to.
-rename.error.invalidfrom=Tried to rename an invalid journal.
-
rename.error.invalidstatusfrom=Cannot rename [[from]]: must be an active journal, not deleted or suspended.
rename.error.invalidstatusto=You cannot rename to [[to]]; it must be either an active journal under your control, or else deleted and purged.
@@ -2532,17 +2284,17 @@ rename.error.noto=No username provided t
rename.error.reserved="[[to]]" is a reserved username.
+rename.error.tokenapplied=This token has already been used.
+
+rename.error.tokeninvalid=The provided token is not a valid token.
+
+rename.error.tokentoofew=Too few tokens; you need two to perform a swap.
+
rename.error.unauthorized=[[to]] is not under your control.
rename.error.unauthorized.forcomm=The community [[comm]] must have no members, and must be under your control.
rename.error.unknown=Cannot rename to "[[to]]".
-
-rename.error.tokenapplied=This token has already been used.
-
-rename.error.tokeninvalid=The provided token is not a valid token.
-
-rename.error.tokentoofew=Too few tokens; you need two to perform a swap.
rename.ex.toomanytries=We had some trouble trying to move aside the account you are trying to rename to ([[tousername]]). Please try again.
@@ -2688,16 +2440,16 @@ setting.ctxpopup.label=Hover Menu
setting.ctxpopup.option=Show menu when I hover over userhead images or userpics
+setting.ctxpopup.option.both=Both
+
+setting.ctxpopup.option.icons=Icons
+
+setting.ctxpopup.option.none=Never
+
+setting.ctxpopup.option.userhead=Userhead graphic
+
setting.ctxpopup.option2=Show the contextual menu when you hover over:
-setting.ctxpopup.option.both=Both
-
-setting.ctxpopup.option.icons=Icons
-
-setting.ctxpopup.option.none=Never
-
-setting.ctxpopup.option.userhead=Userhead graphic
-
setting.cutdisable.label=Cut Tag Behavior
setting.cutdisable.option=Display full content of cut entries?
@@ -2734,14 +2486,14 @@ setting.display.accountstatus.option.rea
setting.display.accountstatus.option.suspended=Suspended
+setting.display.accounttype.addmore=Extend Account
+
setting.display.accounttype.label=Account Type
-setting.display.accounttype.addmore=Extend Account
+setting.display.accounttype.status=[[status]], expiring [[exptime]]
setting.display.accounttype.upgrade=Upgrade
-setting.display.accounttype.status=[[status]], expiring [[exptime]]
-
setting.display.banusers.label=Ban and Unban Users
setting.display.banusers.option.comm=Ban and unban users from commenting in my community
@@ -2802,13 +2554,13 @@ setting.display.viewjournalstyle.option=
setting.display.viewstyle.invalid=Invalid style view setting option
+setting.display.viewstyle.light=Light format
+
+setting.display.viewstyle.mine=My own style
+
setting.display.viewstyle.original=Original style
setting.display.viewstyle.site=Site skin
-
-setting.display.viewstyle.mine=My own style
-
-setting.display.viewstyle.light=Light format
setting.emailalias.label=Email Alias
@@ -2919,15 +2671,15 @@ setting.globalsearch.sel.no=No, do not a
setting.globalsearch.sel.yes=Yes, display my public content in search results (default)
+setting.googleanalytics.error.invalid=Invalid Google Analytics ID entered, must be of the format: UA-NNNNNNN-NN (where N represents numbers).
+
+setting.googleanalytics.label=Google Analytics ID
+
setting.graphicpreviews.label=Graphic Previews
setting.graphicpreviews.option.comm=Allow viewers to preview external links within my community
setting.graphicpreviews.option.self=Display a preview of external links when hovering over them
-
-setting.googleanalytics.error.invalid=Invalid Google Analytics ID entered, must be of the format: UA-NNNNNNN-NN (where N represents numbers).
-
-setting.googleanalytics.label=Google Analytics ID
setting.imageplaceholders.error.invalid=Invalid image size.
@@ -2983,30 +2735,30 @@ setting.navstrip.label=Navigation Strip
setting.navstrip.option=Display for
+setting.navstrip.option.journal.norelationship=journals not in your circle
+
setting.navstrip.option.journal.this=yourself and logged-out users on your journal
setting.navstrip.option.journal.withrelationship=journals in your circle
-setting.navstrip.option.journal.norelationship=journals not in your circle
+setting.nctalklinks.header=New Comment Link Indicator
setting.nctalklinks.option=Adds the comment count to entry links. Your browser should display links in a different color if there are new comments since your last visit.
-setting.nctalklinks.header=New Comment Link Indicator
-
setting.prod.display.title=New Setting!
+setting.profileemail.error.email.invalid=Invalid email address entered.
+
setting.profileemail.label=Email to display on your profile
setting.randompaidgifts.label=Random Paid Gifts
setting.randompaidgifts.option=Include yourself in the pool of free users who can be randomly selected by our sponsor-a-free-user program.
+setting.randompaidgifts.option.note=You may receive a paid account from someone you do not know.
+
setting.randompaidgifts.option.paid=If your paid account expires, include yourself in the pool of free users who can be randomly selected by our sponsor-a-free-user program.
-setting.randompaidgifts.option.note=You may receive a paid account from someone you do not know.
-
-setting.profileemail.error.email.invalid=Invalid email address entered.
-
setting.safesearch.error.invalid=Invalid safe search setting.
setting.safesearch.label=Safe Search Filter
@@ -3057,13 +2809,19 @@ setting.synlevel.option.select.summary=B
setting.synlevel.option.select.title=Title Only
+setting.timeformat.error.invalid=Invalid time format
+
setting.timeformat.label=Time display format
setting.timeformat.option.12hour=12 Hour (am/pm)
setting.timeformat.option.24hour=24 Hour
-setting.timeformat.error.invalid=Invalid time format
+setting.timezone.error.invalid=Invalid time zone.
+
+setting.timezone.label=Time Zone
+
+setting.timezone.option.select=(Select Your Time Zone)
setting.txtmsgsetup.details=(<a [[aopts]]>details</a>)
@@ -3083,12 +2841,6 @@ setting.txtmsgsetup.select.provider=-- S
setting.txtmsgsetup.vis=Who can send you text messages?
-setting.timezone.error.invalid=Invalid time zone.
-
-setting.timezone.label=Time Zone
-
-setting.timezone.option.select=(Select Your Time Zone)
-
setting.viewingadultcontent.error.invalid=Invalid viewing adult content setting.
setting.viewingadultcontent.label=Viewing Adult Content
@@ -3115,11 +2867,13 @@ setting.xpost.footer.default.label=Syste
setting.xpost.label=Crossposting
+setting.xpost.message.create=Successfully created account [[username]]@[[servername]].
+
+setting.xpost.message.update=Successfully updated account [[username]]@[[servername]].
+
setting.xpost.message.usage=Current accounts configured: <b>[[current]] of [[max]]</b>
-setting.xpost.message.create=Successfully created account [[username]]@[[servername]].
-
-setting.xpost.message.update=Successfully updated account [[username]]@[[servername]].
+setting.xpost.noaccounts=No accounts configured
setting.xpost.option=Configure accounts for crossposting.
@@ -3134,11 +2888,16 @@ setting.xpost.option.footer.nocomments=T
setting.xpost.option.footer.nocomments=Text of the footer when local comments are disabled. Uses the main custom footer if blank, or the system default if both are blank.
setting.xpost.option.footer.vars=The following variables may be used:
+
+setting.xpost.option.footer.vars.comment_image=image tag that dynamically displays the comment count on the original post
+
+setting.xpost.option.footer.vars.comment_image.alt=comment count unavailable
+
+setting.xpost.option.footer.vars.comment_url=link to view the comments on the original post
+
+setting.xpost.option.footer.vars.reply_url=link to the reply form on the original post
+
setting.xpost.option.footer.vars.url=link to the original post
-setting.xpost.option.footer.vars.reply_url=link to the reply form on the original post
-setting.xpost.option.footer.vars.comment_url=link to view the comments on the original post
-setting.xpost.option.footer.vars.comment_image=image tag that dynamically displays the comment count on the original post
-setting.xpost.option.footer.vars.comment_image.alt=comment count unavailable
setting.xpost.option.footer.when=Add the footer to the post on the other site:
@@ -3158,8 +2917,6 @@ setting.xpost.option.username=Username
setting.xpost.option.xpostbydefault=Crosspost by Default
-setting.xpost.noaccounts=No accounts configured
-
setting.xpost.preview=Preview
setting.xpost.settings=Crosspost Settings
@@ -3238,13 +2995,13 @@ settings.usermessaging.label=[[siteabbre
settings.usermessaging.opt.a=Everyone
-settings.usermessaging.opt.f=Access Only
-
-settings.usermessaging.opt.m=Only Mutual Access
-
-settings.usermessaging.opt.n=Nobody
-
-settings.usermessaging.opt.y=Registered Users
+settings.usermessaging.opt.F=Access Only
+
+settings.usermessaging.opt.M=Only Mutual Access
+
+settings.usermessaging.opt.N=Nobody
+
+settings.usermessaging.opt.Y=Registered Users
settings.usermessaging.question=Receive messages from:
@@ -3361,9 +3118,30 @@ shop.email.confirm.paypal.subject=[[site
shop.email.email.anon=Someone has chosen to purchase a [[sitename]] account for you.
+shop.email.email.body<<
+Dear [[email]],
+
+[[fromuser]] has chosen to purchase a [[sitename]] account for you. The account
+that was purchased is:
+
+ [[accounttype]]
+
+You can use the following link to create your account:
+
+ [[createurl]]
+
+We look forward to having you on the site!
+
+
+Regards,
+The [[sitename]] Team
+.
+
shop.email.email.close=We look forward to having you on the site!
shop.email.email.other=[[fromuser]] has chosen to purchase a [[sitename]] account for you.
+
+shop.email.email.subject=[[sitename]] Account Purchase
shop.email.gift.other.body<<
Dear [[touser]],
@@ -3413,42 +3191,54 @@ The [[sitename]] Team
shop.email.processed.subject=[[sitename]] Order Processed
+shop.email.renametoken.anon.body<<
+Dear [[touser]],
+
+Someone has gifted you with a rename token. You can use this token by visiting the following link:
+
+[[tokenurl]]
+
+Regards,
+The [[sitename]] Team
+.
+
+shop.email.renametoken.explicit.body<<
+Dear [[touser]],
+
+[[fromuser]] has gifted you with a rename token. You can use this token by visiting the following link:
+
+[[tokenurl]]
+
+Regards,
+The [[sitename]] Team
+.
+
+shop.email.renametoken.self.body<<
+Dear [[touser]],
+
+The rename token you bought is now available. You can use this token by visiting the following link:
+
+[[tokenurl]]
+
+Regards,
+The [[sitename]] Team
+.
+
shop.email.renametoken.subject=[[sitename]] Rename Token
-shop.email.renametoken.anon.body<<
-Dear [[touser]],
-
-Someone has gifted you with a rename token. You can use this token by visiting the following link:
-
-[[tokenurl]]
-
-Regards,
-The [[sitename]] Team
-.
-
-shop.email.renametoken.explicit.body<<
-Dear [[touser]],
-
-[[fromuser]] has gifted you with a rename token. You can use this token by visiting the following link:
-
-[[tokenurl]]
-
-Regards,
-The [[sitename]] Team
-.
-
-shop.email.renametoken.self.body<<
-Dear [[touser]],
-
-The rename token you bought is now available. You can use this token by visiting the following link:
-
-[[tokenurl]]
-
-Regards,
-The [[sitename]] Team
-.
-
shop.email.user.anon=Someone has chosen to upgrade your [[sitename]] account.
+
+shop.email.user.body<<
+Dear [[touser]],
+
+[[fromuser]] has chosen to upgrade your [[sitename]] account.
+
+Congratulations on your paid time!
+
+
+Regards,
+The [[sitename]] Team
+.
shop.email.user.close=Congratulations on your paid time!
@@ -3468,6 +3258,61 @@ sponsor-a-free-user program.
shop.email.user.self=Your [[sitename]] account has been upgraded.
+shop.email.user.subject=[[sitename]] Account Purchase
+
+shop.expiration.0.body<<
+Dear [[account]],
+
+Your paid account has expired.
+
+If you wish, you can purchase more paid time here:
+
+ [[shopurl]]
+
+
+Regards,
+The [[sitename]] Team
+.
+
+shop.expiration.0.subject=[[sitename]] Account Expired
+
+shop.expiration.14.body<<
+Dear [[account]],
+
+This is a friendly notice letting you know that your paid account is set to
+expire in approximately two weeks.
+
+If you wish, you can add more paid time to your account here:
+
+ [[shopurl]]
+
+
+Regards,
+The [[sitename]] Team
+.
+
+shop.expiration.14.subject=[[sitename]] Account Expiration
+
+shop.expiration.3.body<<
+Dear [[account]],
+
+This is a friendly notice letting you know that your account is set to expire in
+approximately three days.
+
+This is the last notice you will get. Your account will automatically revert to
+free status three days from now.
+
+If you wish, you can add more paid time to your account here:
+
+ [[shopurl]]
+
+
+Regards,
+The [[sitename]] Team
+.
+
+shop.expiration.3.subject=[[sitename]] Account Expiration
+
shop.expiration.comm.0.body<<
Dear [[touser]],
@@ -3610,14 +3455,14 @@ shop.item.points.name=[[num]] [[sitename
shop.item.rename.canbeadded.invalidjournaltype=You can only send a rename token to a personal journal. To rename a community, have a community administrator use the token.
+shop.item.rename.name.hastoken=Rename Token <a [[aopts]]>[[token]]</a>
+
+shop.item.rename.name.hastoken.text=Rename Token [[token]]
+
+shop.item.rename.name.notoken=[[points]] points for a Rename Token
+
shop.item.rename.note=Tokens can be used at the <a [[aopts]]>rename page</a>.
-shop.item.rename.name.notoken=[[points]] points for a Rename Token
-
-shop.item.rename.name.hastoken=Rename Token <a [[aopts]]>[[token]]</a>
-
-shop.item.rename.name.hastoken.text=Rename Token [[token]]
-
shop.unavailable=The shop is currently disabled.
sitescheme.accountlinks.account=Account
@@ -3664,7 +3509,8 @@ sitescheme.footer.sitemap=Site Map
sitescheme.footer.suggestion=Make a Suggestion
-sorry=Sorry
+Sorry|notes=typically used to announce that the requested action can't be done.
+Sorry=Sorry
states.head.defined=(states/regions/territories)
@@ -3716,8 +3562,6 @@ subscribe_interface.subs.total=You are u
subscribe_interface.unavailable_subs.note=These notification options are only available to certain account types.
-success=Success
-
taglib.error.access=You are not allowed to tag entries in this journal.
taglib.error.add=You are not allowed to create new tags for this journal; the entry was not tagged with [[tags]].
@@ -3748,25 +3592,25 @@ talk.commentpermlink=link
talk.commentpost=Post a new comment
+talk.comments.counted=[[replycount]] [[?replycount|comment|comments]]
+
+talk.comments.disabled_maintainer=Comments disabled by a maintainer of this community
+
talk.commentsread=Read comments
talk.commentsread.counted=Read [[replycount]] [[?replycount|comment|comments]]
-talk.comments.counted=[[replycount]] [[?replycount|comment|comments]]
-
-talk.comments.disabled_maintainer=Comments disabled by a maintainer of this community
-
talk.commentsread.nocomments=No comments
-talk.curname_groups=<b>Custom friends groups:</b>
-
-talk.curname_location=<b>Current location:</b>
-
-talk.curname_mood=<b>Current mood:</b>
-
-talk.curname_music=<b>Current music:</b>
-
-talk.curname_tags=<b>Entry tags:</b>
+talk.curname_Groups=<b>Custom friends groups:</b>
+
+talk.curname_Location=<b>Current location:</b>
+
+talk.curname_Mood=<b>Current mood:</b>
+
+talk.curname_Music=<b>Current music:</b>
+
+talk.curname_Tags=<b>Entry tags:</b>
talk.curname_xpost=<b>Crossposts:</b>
@@ -3810,10 +3654,10 @@ talk.error.nosuchjournal=No such journal
talk.error.notauthorised=You are not authorized to view this protected entry.
+talk.error.notauthorised.comm.closed=This protected entry is viewable by community members only. Membership to this community is closed.
+
talk.error.notauthorised.comm.open=This protected entry is viewable by community members only. Would you like to <a [[aopts]]>join the community</a>?
-talk.error.notauthorised.comm.closed=This protected entry is viewable by community members only. Membership to this community is closed.
-
talk.error.purged=This journal has been deleted and purged.
talk.error.quickquote=If you'd like to quote a portion of the original message, highlight it then press 'Quote'.
@@ -3878,10 +3722,10 @@ userlinkbar.addsub.title.self=Subscribe
userlinkbar.addtrust=Grant Access
+userlinkbar.addtrust.title.loggedout=You must be logged in to grant access to this user
+
userlinkbar.addtrust.title.other=Grant access to this user
-userlinkbar.addtrust.title.loggedout=You must be logged in to grant access to this user
-
userlinkbar.buyaccount.comm=Gift Paid Account
userlinkbar.buyaccount.other=Gift Paid Account
@@ -3924,38 +3768,38 @@ userlinkbar.modifytrust=Modify Access
userlinkbar.modifytrust.title.other=Modify/remove access from this user
+userlinkbar.post=Post
+
+userlinkbar.post.title=Post to this community
+
+userlinkbar.post.title.cantpost=You cannot post to this community
+
+userlinkbar.post.title.loggedout=You must be logged in to post to this community
+
+userlinkbar.postentry=Post an Entry
+
+userlinkbar.postentry.title=Post to your journal
+
+userlinkbar.search=Search for Entries
+
+userlinkbar.search.title=Search for entries in this account
+
+userlinkbar.sendmessage=Send Message
+
+userlinkbar.sendmessage.title=Send a private message to this user
+
+userlinkbar.sendmessage.title.cantsendmessage=You cannot send a private message to this user
+
+userlinkbar.sendmessage.title.loggedout=You must be logged in to send a private message to this user
+
+userlinkbar.sendmessage.title.self=Send a private message to yourself
+
userlinkbar.tellafriend=Tell a Friend
userlinkbar.tellafriend.title.other=Tell a friend about this journal
userlinkbar.tellafriend.title.self=Tell a friend about your journal
-userlinkbar.post=Post
-
-userlinkbar.post.title=Post to this community
-
-userlinkbar.post.title.cantpost=You cannot post to this community
-
-userlinkbar.post.title.loggedout=You must be logged in to post to this community
-
-userlinkbar.postentry=Post an Entry
-
-userlinkbar.postentry.title=Post to your journal
-
-userlinkbar.search=Search for Entries
-
-userlinkbar.search.title=Search for entries in this account
-
-userlinkbar.sendmessage=Send Message
-
-userlinkbar.sendmessage.title=Send a private message to this user
-
-userlinkbar.sendmessage.title.self=Send a private message to yourself
-
-userlinkbar.sendmessage.title.cantsendmessage=You cannot send a private message to this user
-
-userlinkbar.sendmessage.title.loggedout=You must be logged in to send a private message to this user
-
userlinkbar.track=Track
userlinkbar.track.title=Receive notifications of updates to this community
@@ -3972,7 +3816,7 @@ userlinkbar.trackuser.title.cantuseesn=Y
userlinkbar.trackuser.title.loggedout=You must be logged in to manage notifications
-username=Username
+Username=Username
userpic.inactive=Inactive
@@ -4020,14 +3864,12 @@ vgift.error.tags.invalid=Attempt to use
vgift.error.tags.novalidtags=No valid tags!
+vgift.error.validate.property=Invalid property '[[key]]'
+
+vgift.error.validate.text=Invalid text encoding for [[prop]]
+
vgift.error.validate.value=Invalid value for [[prop]]
-vgift.error.validate.property=Invalid property '[[key]]'
-
-vgift.error.validate.text=Invalid text encoding for [[prop]]
-
-vgift.error.validate.value=Invalid value for [[prop]]
-
web.ads.advertisement=<a [[aopts]]>Advertisement</a>
web.ads.advertisement_nolink=Advertisement
@@ -4046,20 +3888,18 @@ web.authas.label.comm=Work as community:
web.controlstrip.btn.go=Go
+web.controlstrip.btn.inbox=Inbox
+
web.controlstrip.btn.login=Log in
web.controlstrip.btn.logout=Log out
web.controlstrip.btn.view=View
-web.controlstrip.btn.inbox=Inbox
-
web.controlstrip.links.addfeed=Add it to your reading page
web.controlstrip.links.addtocircle=Add to your circle
-web.controlstrip.links.changecommsettings=Change Settings
-
web.controlstrip.links.confirm=Confirm email address
web.controlstrip.links.create=Create a [[sitename]] Account
@@ -4138,18 +3978,18 @@ web.controlstrip.nouserpic.alt=Upload Us
web.controlstrip.nouserpic.title=Edit Userpics
+web.controlstrip.reloadpage.lightstyle2=light
+
+web.controlstrip.reloadpage.mystyle2=mine
+
+web.controlstrip.reloadpage.originalstyle=original
+
+web.controlstrip.reloadpage.origstyle2=original
+
+web.controlstrip.reloadpage.sitestyle=site
+
web.controlstrip.reloadpage2=Reload page in style:
-web.controlstrip.reloadpage.originalstyle=original
-
-web.controlstrip.reloadpage.lightstyle2=light
-
-web.controlstrip.reloadpage.mystyle2=mine
-
-web.controlstrip.reloadpage.sitestyle=site
-
-web.controlstrip.reloadpage.origstyle2=original
-
web.controlstrip.select.friends.all=All Subscriptions
web.controlstrip.select.friends.communities=Communities Only
@@ -4188,28 +4028,28 @@ web.controlstrip.status.personalreadingp
web.controlstrip.status.syn=You are viewing the feed [[user]]
+web.controlstrip.status.trusted=You have granted [[user]] access to your journal
+
+web.controlstrip.status.trustedby=You have been granted access to [[user]]'s journal
+
+web.controlstrip.status.trustedby_mutualwatch=[[user]] has granted access to you and you and they have mutual subscriptions
+
+web.controlstrip.status.trustedby_watch=[[user]] has granted access to you and you subscribe to them
+
+web.controlstrip.status.trustedby_watchedby=[[user]] has granted access and subscribes to you
+
web.controlstrip.status.trust_mutualwatch=You have granted access to [[user]] and you and they have mutual subscriptions
web.controlstrip.status.trust_watch=You have granted access and subscribe to [[user]]
web.controlstrip.status.trust_watchedby=You have granted access to [[user]] and they have subscribed to you
-web.controlstrip.status.trusted=You have granted [[user]] access to your journal
-
-web.controlstrip.status.trustedby=You have been granted access to [[user]]'s journal
-
-web.controlstrip.status.trustedby_mutualwatch=[[user]] has granted access to you and you and they have mutual subscriptions
-
-web.controlstrip.status.trustedby_watch=[[user]] has granted access to you and you subscribe to them
-
-web.controlstrip.status.trustedby_watchedby=[[user]] has granted access and subscribes to you
+web.controlstrip.status.watched=You have subscribed to [[user]]'s journal
+
+web.controlstrip.status.watchedby=[[user]] has subscribed to your journal
web.controlstrip.status.watcher=You are watching [[user]]
-web.controlstrip.status.watched=You have subscribed to [[user]]'s journal
-
-web.controlstrip.status.watchedby=[[user]] has subscribed to your journal
-
web.controlstrip.status.yourjournal=You are viewing your journal
web.controlstrip.status.yournetworkpage=You are viewing your network page
@@ -4224,12 +4064,12 @@ web.postto.btn=Switch
web.postto.label=Post to:
+widget.accountstatistics.comments2=[[num_received_comma]] [[?num_received_raw|comment|comments]] received; [[num_posted_comma]] [[?num_posted_raw|comment|comments]] posted
+
+widget.accountstatistics.entries2=[[num_comma]] [[?num_raw|entry|entries]]
+
widget.accountstatistics.expires_on=[[type]], expiring [[date]]
-widget.accountstatistics.comments2=[[num_received_comma]] [[?num_received_raw|comment|comments]] received; [[num_posted_comma]] [[?num_posted_raw|comment|comments]] posted
-
-widget.accountstatistics.entries2=[[num_comma]] [[?num_raw|entry|entries]]
-
widget.accountstatistics.last_updated=Last updated [[date]]
widget.accountstatistics.member_since=Member since [[date]]
@@ -4244,7 +4084,15 @@ widget.betafeature.btn.off=Turn OFF beta
widget.betafeature.btn.on=Turn ON beta testing
-widget.betafeature.journaljquery.title=New JS on Journals
+widget.betafeature.journaljquery.off<<
+Switch to the new JS behavior on journals.
+<h3>Implemented</h3>
+[[implemented]]
+
+<h3>Todo</h3>
+[[notimplemented]]
+.
+
widget.betafeature.journaljquery.on<<
Currently beta-testing the new JS behavior on journals.
<h3>Implemented</h3>
@@ -4254,14 +4102,7 @@ Currently beta-testing the new JS behavi
[[notimplemented]]
.
-widget.betafeature.journaljquery.off<<
-Switch to the new JS behavior on journals.
-<h3>Implemented</h3>
-[[implemented]]
-
-<h3>Todo</h3>
-[[notimplemented]]
-.
+widget.betafeature.journaljquery.title=New JS on Journals
widget.communitymanagement.nopending=No communities require action.
@@ -4325,14 +4166,14 @@ widget.createaccount.error.username.purg
widget.createaccount.field.birthdate=Birthdate:
+widget.createaccount.field.captcha.hear=Type the numbers you hear:
+
+widget.createaccount.field.captcha.play=Play the sound
+
+widget.createaccount.field.captcha.visual=Type the letters and numbers seen above:
+
widget.createaccount.field.captcha2=Anti-spam measure:
-widget.createaccount.field.captcha.hear=Type the numbers you hear:
-
-widget.createaccount.field.captcha.play=Play the sound
-
-widget.createaccount.field.captcha.visual=Type the letters and numbers seen above:
-
widget.createaccount.field.confirmpassword=Confirm Password:
widget.createaccount.field.email=Email Address:
@@ -4367,14 +4208,14 @@ widget.createaccountentercode.btn.procee
widget.createaccountentercode.code=Code:
+widget.createaccountentercode.comm=If you'd like to <a [[aopts]]>create a community</a> instead, you don't need an account creation code.
+
+widget.createaccountentercode.comm.loggedout=You should create or log into a personal account to be the maintainer. If you don't have a personal account yet, you will need a code to create that account, but you don't need one for the community itself.
+
widget.createaccountentercode.error.invalidcode=Invalid code.
widget.createaccountentercode.error.toofast=You are entering codes too quickly; please try again later.
-widget.createaccountentercode.comm=If you'd like to <a [[aopts]]>create a community</a> instead, you don't need an account creation code.
-
-widget.createaccountentercode.comm.loggedout=You should create or log into a personal account to be the maintainer. If you don't have a personal account yet, you will need a code to create that account, but you don't need one for the community itself.
-
widget.createaccountentercode.getcode= If you do not have an account creation code, you can obtain one this way.
widget.createaccountentercode.info=To create a new account, enter an account creation code:
@@ -4461,14 +4302,14 @@ widget.currenttheme.desc=[[layout]] by [
widget.currenttheme.options=More options:
+widget.currenttheme.options.advancedcust=Advanced Customization
+
widget.currenttheme.options.change=Customize your theme
widget.currenttheme.options.editlayoutlayer=Edit your layout layer
widget.currenttheme.options.editthemelayer=Edit your theme layer
-widget.currenttheme.options.advancedcust=Advanced Customization
-
widget.currenttheme.options.layout=Change page setup
widget.currenttheme.options.newtheme=Select a different theme
@@ -4493,17 +4334,17 @@ widget.customizetheme.nav.style=Style
widget.customizetheme.title=Customize Your Theme
-widget.cuttag.expandAll=Expand All Cut Tags
+widget.cuttag.collapseall=Collapse All Cut Tags
+
+widget.cuttag.collapsed=Expand
+
+widget.cuttag.expandall=Expand All Cut Tags
widget.cuttag.expanded=Collapse
-widget.cuttag.collapseAll=Collapse All Cut Tags
-
-widget.cuttag.collapsed=Expand
-
widget.feeds.btn.add=Add
-widget.feeds.enterrss=enter RSS url
+widget.feeds.enterRSS=enter RSS url
widget.feeds.find=Find or create feed:
@@ -4663,12 +4504,12 @@ widget.inbox.menu.next_page.btn=Next Pag
widget.inbox.menu.previous_page.btn=Previous Page
+widget.inbox.notification.add_bookmark=Bookmark This
+
+widget.inbox.notification.collapsed=Expand
+
widget.inbox.notification.expanded=Collapse
-widget.inbox.notification.collapsed=Expand
-
-widget.inbox.notification.add_bookmark=Bookmark This
-
widget.inbox.notification.rem_bookmark=Remove Bookmark
widget.inboxfolder.confirm.delete=Are you sure you want to delete one or more bookmarked items?
@@ -4982,8 +4823,6 @@ widget.shopitemoptions.price=[[num]] [[?
widget.shopitemoptions.price=[[num]] [[?num|month|months]] for [[points]] points ([[price]])
widget.shopitemoptions.price.seed=Forever for [[points]] points ([[price]])
-
-widget.sitemessages.title=[[sitename]] Plugs In
widget.sitesearch.desc=Search for entries containing:
@@ -5093,14 +4932,14 @@ xpost.error.connection=Failed to connect
xpost.error.invalidprotocol=Missing or invalid posting protocol.
+xpost.nopw.cancel=Cancel
+
+xpost.nopw.checking=Getting authentication...
+
+xpost.nopw.required=Password required.
+
xpost.notrespected=This will not respect your default <a [[aopts]]>crosspost settings</a>. Your crossposted entries will not be updated.
-xpost.nopw.cancel=Cancel
-
-xpost.nopw.checking=Getting authentication...
-
-xpost.nopw.required=Password required.
-
xpost.password=Password:
xpost.poll.view=View poll: [[name]]
@@ -5109,12 +4948,11 @@ xpost.redirect=<span style="font-size: s
xpost.redirect.comment=<span style="font-size: smaller;">This entry was originally posted at <a href = "[[postlink]]">[[postlink]]</a>. Please comment there using OpenID.</span>
+xpost.request.failed=Failed to crosspost to [[account]]. You may go <a href = "[[editurl]]">here</a> to attempt to crosspost this entry again.
+
xpost.request.success=Crosspost requested to [[account]]. You will be notified when this attempt has completed.
-xpost.request.failed=Failed to crosspost to [[account]]. You may go <a href = "[[editurl]]">here</a> to attempt to crosspost this entry again.
-
xpost.respected=This will respect your default <a [[aopts]]>crosspost settings</a>, so make sure you have them set properly before you do this.
xpost.success=Crosspost to [[username]]@[[server]] successful. You can view this entry <a href = "[[xpostlink]]">here</a>.
-
diff -r 7d1ada126323 -r b5fcf79b7915 htdocs/accountstatus.bml.text
--- a/htdocs/accountstatus.bml.text Wed Apr 20 22:06:47 2011 +0800
+++ b/htdocs/accountstatus.bml.text Thu Apr 21 03:02:10 2011 +0800
@@ -31,13 +31,13 @@
.message.nochange=Your journal status has been left as <b>[[statusvis]]</b>.
+.message.noothermaintainer=You are about to leave the following without an active maintainer: [[commlist]] If you want to appoint an additional maintainer now, visit the <a [[aopts]]>[[pagetitle]]</a> page.
+
.message.success=Your journal status has been successfully changed to <b>[[statusvis]]</b>.
-.message.noothermaintainer=You are about to leave the following without an active maintainer: [[commlist]] If you want to appoint an additional maintainer now, visit the <a [[aopts]]>[[pagetitle]]</a> page.
+.reason.about=The reason you're deleting your journal, to display on your deleted journal (optional)
.reason.head=Reason:
-.reason.about=The reason you're deleting your journal, to display on your deleted journal (optional)
-
.title=Account Status
diff -r 7d1ada126323 -r b5fcf79b7915 htdocs/admin/console/index.bml.text
--- a/htdocs/admin/console/index.bml.text Wed Apr 20 22:06:47 2011 +0800
+++ b/htdocs/admin/console/index.bml.text Thu Apr 21 03:02:10 2011 +0800
@@ -1,5 +1,4 @@
;; -*- coding: utf-8 -*-
-
.description=The Admin Console is where you can submit batch commands to be run. Most commands require special privileges, but some can be used by anybody.
.description.reference=See the <a [[aopts]]>command reference</a> for a list of commands.
@@ -11,3 +10,4 @@
.execute=Execute
.title=Admin Console
+
diff -r 7d1ada126323 -r b5fcf79b7915 htdocs/admin/console/reference.bml.text
--- a/htdocs/admin/console/reference.bml.text Wed Apr 20 22:06:47 2011 +0800
+++ b/htdocs/admin/console/reference.bml.text Thu Apr 21 03:02:10 2011 +0800
@@ -5,4 +5,5 @@
.paragraph3=Arguments in <angle brackets> are required. Arguments in [brackets] are optional. If there is more than one optional argument, you can't skip one and provide one after it. Once you skip one, you have to skip the rest.
-.title=Admin Console Reference
\ No newline at end of file
+.title=Admin Console Reference
+
diff -r 7d1ada126323 -r b5fcf79b7915 htdocs/admin/faq/faqcat.bml.text
--- a/htdocs/admin/faq/faqcat.bml.text Wed Apr 20 22:06:47 2011 +0800
+++ b/htdocs/admin/faq/faqcat.bml.text Thu Apr 21 03:02:10 2011 +0800
@@ -1,5 +1,4 @@
;; -*- coding: utf-8 -*-
-
.addcat.intro=Complete the below form to add a new category to the FAQ.
.addcat.success=Category successfully added.
@@ -14,9 +13,9 @@
.btn.editcat=Edit Category
+.btn.sortdown=Sort Down
+
.btn.sortup=Sort Up
-
-.btn.sortdown=Sort Down
.catsort.success=Category successfully sorted [[direction]].
@@ -43,3 +42,4 @@
.label.catorder=Category Order
.link.faqmain=Back to FAQ Administration Area
+
diff -r 7d1ada126323 -r b5fcf79b7915 htdocs/admin/impersonate.bml.text
--- a/htdocs/admin/impersonate.bml.text Wed Apr 20 22:06:47 2011 +0800
+++ b/htdocs/admin/impersonate.bml.text Thu Apr 21 03:02:10 2011 +0800
@@ -1,3 +1,4 @@
+;; -*- coding: utf-8 -*-
.error.emptyreason=A reason is required.
.error.failedlogin=Attempt to impersonate failed.
@@ -13,3 +14,4 @@
.form.username=Usename:
.title=Impersonate
+
diff -r 7d1ada126323 -r b5fcf79b7915 htdocs/admin/invites/distribute.bml.text
--- a/htdocs/admin/invites/distribute.bml.text Wed Apr 20 22:06:47 2011 +0800
+++ b/htdocs/admin/invites/distribute.bml.text Thu Apr 21 03:02:10 2011 +0800
@@ -1,10 +1,11 @@
+;; -*- coding: utf-8 -*-
.btn.distribute=Distribute
.error.cantinsertjob=Unable to start TheSchwartz job for invite codes distribution.
+.error.noinvites=Cannot distribute 0 invites!
+
.error.nosuchclass=The selection class "[[class]]" does not exist.
-
-.error.noinvites=Cannot distribute 0 invites!
.field.distribute.label=Distribute to:
@@ -15,3 +16,4 @@
.success.jobstarted=Invite code distribution successfully initiated. You will receive a report by email to your registered address when it is complete.
.title=Distribute Invite Codes
+
diff -r 7d1ada126323 -r b5fcf79b7915 htdocs/admin/invites/index.bml.text
--- a/htdocs/admin/invites/index.bml.text Wed Apr 20 22:06:47 2011 +0800
+++ b/htdocs/admin/invites/index.bml.text Thu Apr 21 03:02:10 2011 +0800
@@ -1,5 +1,4 @@
;; -*- coding: utf-8 -*-
-
.codetrace.desc=Look up invite codes, by code or by user
.codetrace.head=Codetrace
@@ -21,3 +20,4 @@
.review.head=Review Invite History
.title=Invite Codes Administration
+
diff -r 7d1ada126323 -r b5fcf79b7915 htdocs/admin/invites/promo.bml.text
--- a/htdocs/admin/invites/promo.bml.text Wed Apr 20 22:06:47 2011 +0800
+++ b/htdocs/admin/invites/promo.bml.text Thu Apr 21 03:02:10 2011 +0800
@@ -1,3 +1,4 @@
+;; -*- coding: utf-8 -*-
.active.active=active
.active.inactive=inactive
@@ -8,8 +9,6 @@
.count.outof= out of
-.error.label=Error:
-
.error.code.exists=Promo code already exists
.error.code.invalid=Code invalid
@@ -19,6 +18,8 @@
.error.code.missing=Code must be specified
.error.count.negative=Count must be positive
+
+.error.label=Error:
.error.suggest_journal.invalid=Cannot find that user
@@ -58,9 +59,9 @@
.return=Return to list
-.suggest.none=<em>(none)</em>
+.state.active=Active
-.state.active=Active
+.state.inactive=Inactive
.state.new=Create new
@@ -70,10 +71,11 @@
.state.unused=Unused
-.state.inactive=Inactive
+.suggest.none=<em>(none)</em>
.title=Manage Promo Codes
.title.create=Create Promo Code
.title.edit=Edit Promo Code: [[code]]
+
diff -r 7d1ada126323 -r b5fcf79b7915 htdocs/admin/vgifts/inactive.bml.text
--- a/htdocs/admin/vgifts/inactive.bml.text Wed Apr 20 22:06:47 2011 +0800
+++ b/htdocs/admin/vgifts/inactive.bml.text Thu Apr 21 03:02:10 2011 +0800
@@ -1,3 +1,4 @@
+;; -*- coding: utf-8 -*-
.error=Error
.error.badid=The specified tag was not found.
@@ -35,3 +36,4 @@
.tab.tags=Filter By Tag
.title=Virtual Gifts: Activation Management
+
diff -r 7d1ada126323 -r b5fcf79b7915 htdocs/admin/vgifts/index.bml.text
--- a/htdocs/admin/vgifts/index.bml.text Wed Apr 20 22:06:47 2011 +0800
+++ b/htdocs/admin/vgifts/index.bml.text Thu Apr 21 03:02:10 2011 +0800
@@ -1,3 +1,4 @@
+;; -*- coding: utf-8 -*-
.error=Error
.error.badid=An error occurred while trying to load this vgift.
@@ -114,9 +115,9 @@
.submit.create=Create
+.submit.delete=Yes, I want to delete this gift.
+
.submit.edit=Submit Changes
-
-.submit.delete=Yes, I want to delete this gift.
.submit.review=Submit Review
@@ -131,3 +132,4 @@
.title.edited=Edit Successful!
.title.review=Review Queue
+
diff -r 7d1ada126323 -r b5fcf79b7915 htdocs/admin/vgifts/tags.bml.text
--- a/htdocs/admin/vgifts/tags.bml.text Wed Apr 20 22:06:47 2011 +0800
+++ b/htdocs/admin/vgifts/tags.bml.text Thu Apr 21 03:02:10 2011 +0800
@@ -1,3 +1,4 @@
+;; -*- coding: utf-8 -*-
.error=Error
.error.badarg=The argument [[arg]] is not valid for the privilege [[priv]].
@@ -50,12 +51,13 @@
.review.empty=There are no relevant gifts available to display.
+.submit.delete=Yes, I want to delete this tag.
+
.submit.edit=Submit Changes
-
-.submit.delete=Yes, I want to delete this tag.
.title=Virtual Gifts: Tag Management
.title.delete=Delete A Tag
.title.edited=Edit Successful!
+
diff -r 7d1ada126323 -r b5fcf79b7915 htdocs/allpics.bml.text
--- a/htdocs/allpics.bml.text Wed Apr 20 22:06:47 2011 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
-;; -*- coding: utf-8 -*-
-.current=Current Pictures
-
-.default=<u>Default</u>
-
-.edit3=You may be interested in <a [[aopts1]]>editing your picture keywords</a> or <a [[aopts2]]>uploading a new picture</a>.
-
-.edit4=You may be interested in <a [[aopts]]>editing your userpic keywords or uploading a new userpic</a>.
-
-.error.noparam=You need to specify a user parameter.
-
-.keywords=Keywords:
-
-.comment=Comment:
-
-.description=Description:
-
-.nopics.text.other=This user has not uploaded any user pictures.
-
-.nopics.text.other2=[[username]] has not uploaded any userpics. <a [[aopts]]>Get notified</a> when they upload one.
-
-.nopics.text3=You have no pictures uploaded. To upload one, go <a [[aopts]]>here</a>.
-
-.nopics.title=No Pictures
-
-.pics=Here are the user pictures for [[user]].
-
-.pics2=Here are the userpics for [[user]]. <a [[aopts]]>Get notified</a> when they upload a new one.
-
-.pics.owner=Here are the userpics for [[user]].
-
-.sort.default=Upload Order
-
-.sort.keyword=Keyword Order
-
-.title=User Pictures
-
diff -r 7d1ada126323 -r b5fcf79b7915 htdocs/betafeatures.bml.text
--- a/htdocs/betafeatures.bml.text Wed Apr 20 22:06:47 2011 +0800
+++ b/htdocs/betafeatures.bml.text Thu Apr 21 03:02:10 2011 +0800
@@ -1,7 +1,7 @@
;; -*- coding: utf-8 -*-
-
.nofeatures=There are no features currently available for beta testing.
.staytuned=Stay tuned to [[news]] for upcoming testing opportunities. Thank you.
.title=[[sitename]] Beta
+
diff -r 7d1ada126323 -r b5fcf79b7915 htdocs/changeemail.bml.text
--- a/htdocs/changeemail.bml.text Wed Apr 20 22:06:47 2011 +0800
+++ b/htdocs/changeemail.bml.text Thu Apr 21 03:02:10 2011 +0800
@@ -1,5 +1,4 @@
;; -*- coding: utf-8 -*-
-
.btn.change=Change email address
.error.invalidemail=Invalid email address.
@@ -26,6 +25,16 @@
.label.username=Username:
+.newemail.body.openid<<
+You have just entered an email address for your OpenID account "[[username]]" at [[sitename]]. To validate this address, please go to:
+
+[[conflink]]
+
+Regards,
+[[sitename]] Team
+[[sitelink]]
+.
+
.newemail.body3<<
You have changed the address for your [[sitename]] account "[[username]]" to this address: [[email]].
@@ -40,16 +49,9 @@ Sincerely,
[[siteroot]]
.
-.newemail.body.openid<<
-You have just entered an email address for your OpenID account "[[username]]" at [[sitename]]. To validate this address, please go to:
+.newemail.subject=Email Address Changed
-[[conflink]]
-
-Regards,
-[[sitename]] Team
-[[sitelink]]
-.
-
+.newemail.subject.openid=Email Address Added
.newemail_old.body2<<
Someone just changed the e-mail address for your [[sitename]] account "[[username]]".
@@ -67,10 +69,6 @@ Regards,
.newemail_old.subject=E-mail Address Changed
-.newemail.subject.openid=Email Address Added
-
-.newemail.subject=Email Address Changed
-
.noemail=(None)
.success.header=Success
diff -r 7d1ada126323 -r b5fcf79b7915 htdocs/changepassword.bml.text
--- a/htdocs/changepassword.bml.text Wed Apr 20 22:06:47 2011 +0800
+++ b/htdocs/changepassword.bml.text Thu Apr 21 03:02:10 2011 +0800
@@ -48,9 +48,9 @@ Regards,
.error.notvalidated=You cannot change your password if your current email address has not been validated.
+.forcechange=Your current password is too easy for an automated program to guess, so your account has been frozen. Before you do anything else, you need to change your password.
+
.forcechange.header=Pick a New Password
-
-.forcechange=Your current password is too easy for an automated program to guess, so your account has been frozen. Before you do anything else, you need to change your password.
.header.username=Username
diff -r 7d1ada126323 -r b5fcf79b7915 htdocs/community/join.bml.text
--- a/htdocs/community/join.bml.text Wed Apr 20 22:06:47 2011 +0800
+++ b/htdocs/community/join.bml.text Thu Apr 21 03:02:10 2011 +0800
@@ -1,7 +1,5 @@
;; -*- coding: utf-8 -*-
.btn.cancel=Cancel
-
-.button.join=Join Community
.button.join2=Join Community
@@ -17,23 +15,13 @@
.error.statusvis.title=Unable to Join Communities
-.label.addtofriends=Add "[[maintainer]]" to friends list.<br>
-
-.label.addtofriends.note=Subscribing to this community will allow you to read entries posted in it on your Friends page.
-
.label.addtofriends.note2=Adding a community allows you to read entries posted in it on your Friends page.
-
-.label.addtofriends2=Subscribe to [[comm]] in addition to joining it.
.label.addtofriends2.modify=Modify subscription to [[comm]] in addition to joining it.
.label.addtofriends3=Yes, I want to watch [[comm]] in addition to joining it. Take me to <strong>Step 2: Add to Friends</strong>.
-.label.allowposting=This community allows posting by all members, so you now have access to post in it. If you already have a LiveJournal client open on your computer, you'll have to log out and log back in for this journal to show up in your list of journals you can post to.
-
.label.allowposting2=Additionally, this community allows posting by all members. If you already have a [[sitename]] client open, log out and log back in for this community to show in your posting permissions.
-
-.label.auth=Although you are now listed as a member, this community only allows posting by authorized users. Contact one of the maintainers if you desire posting access. Below is the list of maintainers for this community: [[admins]]
.label.auth2=Please note that this community only allows posting by authorized users, so joining it will not allow you to post in it. Contact one of the maintainers if you desire posting access. Below is the list of maintainers for this community: [[admins]]
@@ -45,15 +33,9 @@
.label.errorcomminfo=The specified community information is not valid.
-.label.expls=Press the button below to join the "[[maintainer]]" community. Uncheck the box below if you want to join the community without seeing community entries on your friends page.
-
.label.expls2=Joining this community will allow you to read any members-only entries posted in it. It will not allow community members or maintainers to read protected entries in your own journal.
.label.locked=This community is not accepting new members, and so you cannot join it.
-
-.label.membernow2=You are now a member of the <a [[aopts]]>[[commname]] Community</a>.
-
-.label.membernow3=You are now a member of <a [[aopts]]>[[commname]] Community</a>.
.label.membernow6=You are now a member of [[commname]] Community.
@@ -64,8 +46,6 @@
.label.read_recent_entries=Read the recent entries in [[user]]
.label.search_other=Search for other communities
-
-.label.sure=You sure?
.label.sure2=Join [[comm]]?
diff -r 7d1ada126323 -r b5fcf79b7915 htdocs/community/leave.bml.text
--- a/htdocs/community/leave.bml.text Wed Apr 20 22:06:47 2011 +0800
+++ b/htdocs/community/leave.bml.text Thu Apr 21 03:02:10 2011 +0800
@@ -13,11 +13,7 @@
.label.logoutfirst2=To leave a community you must first <a [[aopts]]>log in</a>.
-.label.removed.stopwatch=You are no longer watching the <a [[aopts]]>[[commname]] Community</a>.
-
.label.removed.stopwatch4=You are no longer watching the [[commname]] Community.
-
-.label.removed2=You are now removed from the <a [[aopts]]>[[commname]] Community</a>.
.label.removed5=You are now removed from the [[commname]] Community.
diff -r 7d1ada126323 -r b5fcf79b7915 htdocs/community/manage.bml.text
--- a/htdocs/community/manage.bml.text Wed Apr 20 22:06:47 2011 +0800
+++ b/htdocs/community/manage.bml.text Thu Apr 21 03:02:10 2011 +0800
@@ -8,8 +8,6 @@
.commlist.actions=<b>Actions</b>
.commlist.actmembers2=Members
-
-.commlist.tags=Tags
.commlist.actpending|notes=This is appended to /community/manage.bml.commlist.actmembers2 when there are pending people.
.commlist.actpending=, <a [[aopts]]>[[num]] pending</a>
@@ -31,6 +29,8 @@
.commlist.post=Post
.commlist.queue=Queue
+
+.commlist.tags=Tags
.commlist.text=Here are the communities that you manage or co-manage:
diff -r 7d1ada126323 -r b5fcf79b7915 htdocs/community/members.bml.text
--- a/htdocs/community/members.bml.text Wed Apr 20 22:06:47 2011 +0800
+++ b/htdocs/community/members.bml.text Thu Apr 21 03:02:10 2011 +0800
@@ -45,11 +45,11 @@
.error.unknown=Error inviting [[user]]. Please make sure they're not already a member and try again.
-.jump=Jump to user
-
.intro=You can define the roles of each of your members here.
.intro.invite=To invite a user to your community, enter their username in one of the empty boxes below and select the checkboxes that correspond to the roles you which the user to have.
+
+.jump=Jump to user
.key.admin=<b>Maintainer</b>
diff -r 7d1ada126323 -r b5fcf79b7915 htdocs/community/moderate.bml.text
--- a/htdocs/community/moderate.bml.text Wed Apr 20 22:06:47 2011 +0800
+++ b/htdocs/community/moderate.bml.text Thu Apr 21 03:02:10 2011 +0800
@@ -27,9 +27,9 @@
.choice.approve=Approve
+.choice.mark_as_spam=Reject and mark as spam
+
.choice.reject=Reject
-
-.choice.mark_as_spam=Reject and mark as spam
.error.noaccess=You do not moderate the community [[comm]].
diff -r 7d1ada126323 -r b5fcf79b7915 htdocs/community/pending.bml.text
--- a/htdocs/community/pending.bml.text Wed Apr 20 22:06:47 2011 +0800
+++ b/htdocs/community/pending.bml.text Thu Apr 21 03:02:10 2011 +0800
@@ -1,5 +1,4 @@
;; -*- coding: utf-8 -*-
-
.ban=No and ban
.button.approve=Approve membership
diff -r 7d1ada126323 -r b5fcf79b7915 htdocs/community/sentinvites.bml.text
--- a/htdocs/community/sentinvites.bml.text Wed Apr 20 22:06:47 2011 +0800
+++ b/htdocs/community/sentinvites.bml.text Thu Apr 21 03:02:10 2011 +0800
@@ -1,5 +1,4 @@
;; -*- coding: utf-8 -*-
-
.cancel=Cancel Invitations
.date=Date Sent
@@ -22,30 +21,33 @@
.key.date=Date
+.key.maintainer=Maintainer
+
.key.maintainer.abbrev=A
-.key.maintainer=Maintainer
+.key.moderator=Moderator
.key.moderator.abbrev=M
-.key.moderator=Moderator
+.key.posting=Posting
.key.posting.abbrev=P
-
-.key.posting=Posting
.key.sentby=Sent By
.key.status=Status
+.key.unmoderated=Unmoderated
+
.key.unmoderated.abbrev=U
-.key.unmoderated=Unmoderated
+.none.accepted.body=No invites have been accepted in the past 30 days. If you wish to invite people to this community, please visit the <a [[aopts]]>Members page</a>.
.none.body=No invites have been sent in the past 30 days. If you wish to invite people to this community, please visit the <a [[aopts]]>Members page</a>.
-.none.accepted.body=No invites have been accepted in the past 30 days. If you wish to invite people to this community, please visit the <a [[aopts]]>Members page</a>.
+
+.none.outstanding.body=No outstanding invites have been found from the past 30 days. If you wish to invite people to this community, please visit the <a [[aopts]]>Members page</a>.
+
.none.rejected.body=No invites have been rejected in the past 30 days. If you wish to invite people to this community, please visit the <a [[aopts]]>Members page</a>.
-.none.outstanding.body=No outstanding invites have been found from the past 30 days. If you wish to invite people to this community, please visit the <a [[aopts]]>Members page</a>.
.none.title=No Invites Found
diff -r 7d1ada126323 -r b5fcf79b7915 htdocs/community/settings.bml.text
--- a/htdocs/community/settings.bml.text Wed Apr 20 22:06:47 2011 +0800
+++ b/htdocs/community/settings.bml.text Thu Apr 21 03:02:10 2011 +0800
@@ -1,5 +1,4 @@
;; -*- coding: utf-8 -*-
-
.button.changecommunity2=Save Changes
.button.createcommunity=Create Community
diff -r 7d1ada126323 -r b5fcf79b7915 htdocs/customize/advanced/layeredit.bml.text
--- a/htdocs/customize/advanced/layeredit.bml.text Wed Apr 20 22:06:47 2011 +0800
+++ b/htdocs/customize/advanced/layeredit.bml.text Thu Apr 21 03:02:10 2011 +0800
@@ -1,1 +1,3 @@
+;; -*- coding: utf-8 -*-
.advancedlayerlink=Back to layers list
+
diff -r 7d1ada126323 -r b5fcf79b7915 htdocs/customize/index.bml.text
--- a/htdocs/customize/index.bml.text Wed Apr 20 22:06:47 2011 +0800
+++ b/htdocs/customize/index.bml.text Thu Apr 21 03:02:10 2011 +0800
@@ -1,5 +1,4 @@
;; -*- coding: utf-8 -*-
-
.btn.nextpage=Customize Selected Theme ->
.customize_area_feedback=Customize Area Feedback
@@ -13,3 +12,4 @@
.title=Choose Journal Style
.title2=Select Journal Style
+
diff -r 7d1ada126323 -r b5fcf79b7915 htdocs/customize/options.bml.text
--- a/htdocs/customize/options.bml.text Wed Apr 20 22:06:47 2011 +0800
+++ b/htdocs/customize/options.bml.text Thu Apr 21 03:02:10 2011 +0800
@@ -1,4 +1,5 @@
;; -*- coding: utf-8 -*-
+.advanced=Advanced Customization
.customize.feedback=Customize Area Feedback
@@ -8,5 +9,3 @@
.title=Customize Journal Style
-.advanced=Advanced Customization
-
diff -r 7d1ada126323 -r b5fcf79b7915 htdocs/customize/preview_redirect.bml.text
--- a/htdocs/customize/preview_redirect.bml.text Wed Apr 20 22:06:47 2011 +0800
+++ b/htdocs/customize/preview_redirect.bml.text Thu Apr 21 03:02:10 2011 +0800
@@ -1,6 +1,7 @@
;; -*- coding: utf-8 -*-
-.error.user=Invalid user.
-
.error.id=No theme id or custom layout id specified.
.error.preview=Error loading preview.
+
+.error.user=Invalid user.
+
diff -r 7d1ada126323 -r b5fcf79b7915 htdocs/customize/viewuser.bml.text
--- a/htdocs/customize/viewuser.bml.text Wed Apr 20 22:06:47 2011 +0800
+++ b/htdocs/customize/viewuser.bml.text Thu Apr 21 03:02:10 2011 +0800
@@ -3,9 +3,9 @@
.core.layer=Core layer for layout not found.
+.core.layer.for.layout=Core layer for layout not found.
+
.customize=customize
-
-.core.layer.for.layout=Core layer for layout not found.
.layer.belongs=Layer belongs to another user.
@@ -13,9 +13,9 @@
.layout.layer=Layout layer for this [[layertype]] layer not found.
+.login.first=You must first <a [[url]]>login</a>.
+
.login.required=Login Required
-
-.login.first=You must first <a [[url]]>login</a>.
.no.user.layer2=No wizard layer
diff -r 7d1ada126323 -r b5fcf79b7915 htdocs/directory.bml.text
--- a/htdocs/directory.bml.text Wed Apr 20 22:06:47 2011 +0800
+++ b/htdocs/directory.bml.text Thu Apr 21 03:02:10 2011 +0800
@@ -21,15 +21,15 @@ directory usage, be sure that you are lo
.navcrap.xofy=Page [[curpage]] of [[totpages]] shown (records [[reca]]-[[recb]])
-.new_search=New search
-
-.new_search_show=Show:
-
.new_all_search=All
.new_community_search=Communities Only
.new_identity_search=OpenIDs Only
+
+.new_search=New search
+
+.new_search_show=Show:
.new_user_search=Users Only
@@ -45,9 +45,9 @@ directory usage, be sure that you are lo
.search.overflow=<b>Search results limited to [[count]] results. Please refine your query.</b>
+.search.title=Searching
+
.search_results=Search Results
-
-.search.title=Searching
.title=Directory Search
@@ -56,4 +56,3 @@ directory usage, be sure that you are lo
.update=Update:
.user=User
-
diff -r 7d1ada126323 -r b5fcf79b7915 htdocs/directorysearch.bml.text
--- a/htdocs/directorysearch.bml.text Wed Apr 20 22:06:47 2011 +0800
+++ b/htdocs/directorysearch.bml.text Thu Apr 21 03:02:10 2011 +0800
@@ -1,5 +1,4 @@
;; -*- coding: utf-8 -*-
-
.and=and
.between=Between
@@ -56,8 +55,6 @@
.updated_in_last=Updated in last
-.use_this_dir2=Use this directory to search for [[sitename]] users. If you fill in more than one blank, the directory will display results that match all your criteria. (e.g. user lives in "San Francisco" AND lists "music" as an interest.) Check out our <a [[aopts]]>community search</a> page to find new and interesting communities.
-
.user_likes=User likes:
.user_trusted_by=User is granted access by: [[input]]
@@ -68,6 +65,9 @@
.user_watches=User is subscribed to: [[input]]
+.use_this_dir2=Use this directory to search for [[sitename]] users. If you fill in more than one blank, the directory will display results that match all your criteria. (e.g. user lives in "San Francisco" AND lists "music" as an interest.) Check out our <a [[aopts]]>community search</a> page to find new and interesting communities.
+
.week=week
.years_old=years old.
+
diff -r 7d1ada126323 -r b5fcf79b7915 htdocs/doc/s2/index.bml.text
--- a/htdocs/doc/s2/index.bml.text Wed Apr 20 22:06:47 2011 +0800
+++ b/htdocs/doc/s2/index.bml.text Thu Apr 21 03:02:10 2011 +0800
@@ -1,6 +1,4 @@
;; -*- coding: utf-8 -*-
-.title=Style Documentation
-
.css.header=CSS Documentation
.css.overview=Overview
@@ -27,4 +25,7 @@
.s2.props=Properties
-.s2.troubleshoot=Troubleshooting
\ No newline at end of file
+.s2.troubleshoot=Troubleshooting
+
+.title=Style Documentation
+
diff -r 7d1ada126323 -r b5fcf79b7915 htdocs/editicons.bml.text
--- a/htdocs/editicons.bml.text Wed Apr 20 22:06:47 2011 +0800
+++ b/htdocs/editicons.bml.text Thu Apr 21 03:02:10 2011 +0800
@@ -1,5 +1,4 @@
;; -*- coding: utf-8 -*-
-
.about.icons=About Icons
.btn.addfile=Add File
@@ -22,9 +21,9 @@
.error.generatinguserpic=There was an error in generating the userpic:
+.error.giffiledimensions=Sorry, you cannot upload a userpic larger than 100x100 pixels if it is in GIF format.
+
.error.giffiletoolarge=The GIF image you uploaded is too large. GIF file size cannot exceed [[maxsize]].
-
-.error.giffiledimensions=Sorry, you cannot upload a userpic larger than 100x100 pixels if it is in GIF format.
.error.imagetoolarge=The dimensions of your image ([[imagesize]]) exceed maximum size. Your picture can only be 100x100 pixels large. Use a image/photo editing program to reduce the image to thumbnail-size.
@@ -36,9 +35,9 @@
.error.nofile=You must choose a file to upload
+.error.nomediauploads.delete=Unable to delete userpics at this time. Media modification is currently disabled for the site.
+
.error.nourl=You must enter the URL of an image
-
-.error.nomediauploads.delete=Unable to delete userpics at this time. Media modification is currently disabled for the site.
.error.rename.blankkw=Error renaming '[[origkw]]' to '[[newkw]]': renaming of blank (pic#) keywords not allowed.
diff -r 7d1ada126323 -r b5fcf79b7915 htdocs/editjournal.bml.text
--- a/htdocs/editjournal.bml.text Wed Apr 20 22:06:47 2011 +0800
+++ b/htdocs/editjournal.bml.text Thu Apr 21 03:02:10 2011 +0800
@@ -14,6 +14,8 @@
.error.nofind=Could not find selected journal entry.
.in=In community:
+
+.invalid_encoding=This entry may contain unknown characters, which have been replaced with a "?". Please ensure the entry is exactly as intended before posting.
.massprivacy=You also may want to use the <a [[aopts]]>mass privacy tool</a> to change the security of a group of entries at once.
@@ -53,4 +55,3 @@
.viewwhat=View What Entries:
-.invalid_encoding=This entry may contain unknown characters, which have been replaced with a "?". Please ensure the entry is exactly as intended before posting.
diff -r 7d1ada126323 -r b5fcf79b7915 htdocs/editprivacy.bml.text
--- a/htdocs/editprivacy.bml.text Wed Apr 20 22:06:47 2011 +0800
+++ b/htdocs/editprivacy.bml.text Thu Apr 21 03:02:10 2011 +0800
@@ -1,9 +1,9 @@
;; -*- coding: utf-8 -*-
+.archive=Your <a [[aopts]]>journal archive</a> provides an easy way to browse through your posts by month.
+
.button.update=Update Entries
.button.ya.rly=Yes, Update these Posts
-
-.archive=Your <a [[aopts]]>journal archive</a> provides an easy way to browse through your posts by month.
.intro=Change the privacy level of all posts in a certain timeframe by choosing the start and end dates. You can also specify that only posts of a certain privacy level should be changed.
diff -r 7d1ada126323 -r b5fcf79b7915 htdocs/edittags.bml.text
--- a/htdocs/edittags.bml.text Wed Apr 20 22:06:47 2011 +0800
+++ b/htdocs/edittags.bml.text Thu Apr 21 03:02:10 2011 +0800
@@ -38,3 +38,4 @@
.view=<a [[aopts]]>View</a> this entry.
.xpost.notrespected.editentry=If this is important to you, <a [[aopts]]>edit this entry directly</a> to add the tags.
+
diff -r 7d1ada126323 -r b5fcf79b7915 htdocs/go.bml.text
--- a/htdocs/go.bml.text Wed Apr 20 22:06:47 2011 +0800
+++ b/htdocs/go.bml.text Thu Apr 21 03:02:10 2011 +0800
@@ -14,3 +14,4 @@
.error.usernotfound=User not found.
.link.to.journal=Go back to [[journal]].
+
diff -r 7d1ada126323 -r b5fcf79b7915 htdocs/imgupload.bml.text
--- a/htdocs/imgupload.bml.text Wed Apr 20 22:06:47 2011 +0800
+++ b/htdocs/imgupload.bml.text Thu Apr 21 03:02:10 2011 +0800
@@ -1,6 +1,7 @@
;; -*- coding: utf-8 -*-
.gallery.label=Image from gallery
+.login.message2=Login is required to upload an image from file or insert image from Scrapbook.
+
.size=When uploading from file or from a gallery, the image will display as 320 x 240 (medium) and will link to the image in the gallery.
-.login.message2=Login is required to upload an image from file or insert image from Scrapbook.
diff -r 7d1ada126323 -r b5fcf79b7915 htdocs/inbox/compose.bml.text
--- a/htdocs/inbox/compose.bml.text Wed Apr 20 22:06:47 2011 +0800
+++ b/htdocs/inbox/compose.bml.text Thu Apr 21 03:02:10 2011 +0800
@@ -1,5 +1,4 @@
;; -*- coding: utf-8 -*-
-
.error.cannot.reply=You cannot reply to this message
.error.invalid.username="[[to]]" is not a valid username
@@ -33,3 +32,4 @@
.suspended.cannot.send=Suspended accounts are not allowed to send private messages
.warning.empty.message=Warning: You are trying to send a message with no text. Please resubmit if this is correct.
+
diff -r 7d1ada126323 -r b5fcf79b7915 htdocs/inbox/index.bml.text
--- a/htdocs/inbox/index.bml.text Wed Apr 20 22:06:47 2011 +0800
+++ b/htdocs/inbox/index.bml.text Thu Apr 21 03:02:10 2011 +0800
@@ -1,10 +1,11 @@
;; -*- coding: utf-8 -*-
-
.error.couldnt_retrieve_inbox=Could not retrieve inbox for user [[user]]
.error.max_bookmarks=Max number of bookmarks reached
.error.not_ready=Not ready
+
+.manage_settings=Manage Settings
.menu.all=All
@@ -12,9 +13,13 @@
.menu.bookmarks=Bookmarks
+.menu.delete_all.btn=Delete All
+
.menu.entries_and_comments=Entries & Comments
.menu.friend_updates=Friend Updates
+
+.menu.mark_all_read.btn=Mark All Read
.menu.messages=Messages
@@ -22,14 +27,9 @@
.menu.new_message.btn=New Message
-.menu.mark_all_read.btn=Mark All Read
-
-.menu.delete_all.btn=Delete All
-
.menu.sent=Sent
-
-.manage_settings=Manage Settings
.refresh=Refresh
.title=Inbox
+
diff -r 7d1ada126323 -r b5fcf79b7915 htdocs/login.bml.text
--- a/htdocs/login.bml.text Wed Apr 20 22:06:47 2011 +0800
+++ b/htdocs/login.bml.text Thu Apr 21 03:02:10 2011 +0800
@@ -1,7 +1,7 @@
;; -*- coding: utf-8 -*-
+.createaccount.button=Create an Account
+
.createaccount.header=Not a <?sitename?> member?
-
-.createaccount.button=Create an Account
.createaccount.whylogin.benefit1=Read friends-only posts that are addressed to you.
diff -r 7d1ada126323 -r b5fcf79b7915 htdocs/lostinfo.bml.text
--- a/htdocs/lostinfo.bml.text Wed Apr 20 22:06:47 2011 +0800
+++ b/htdocs/lostinfo.bml.text Thu Apr 21 03:02:10 2011 +0800
@@ -30,3 +30,4 @@
.lostusername.title=Lost your username?
.title=Lost Information
+
diff -r 7d1ada126323 -r b5fcf79b7915 htdocs/lostinfo_do.bml.text
--- a/htdocs/lostinfo_do.bml.text Wed Apr 20 22:06:47 2011 +0800
+++ b/htdocs/lostinfo_do.bml.text Thu Apr 21 03:02:10 2011 +0800
@@ -26,9 +26,6 @@ believes that he or she controls this us
believes that he or she controls this username. It's also possible that
someone made a typo in a username or email address.
.
-
-.lostpasswordmail.part4|notes=Site-local text. For 'en', it's blank.
-.lostpasswordmail.part4=
.lostpasswordmail.part5<<
Useful links:
diff -r 7d1ada126323 -r b5fcf79b7915 htdocs/manage/banusers.bml.text
--- a/htdocs/manage/banusers.bml.text Wed Apr 20 22:06:47 2011 +0800
+++ b/htdocs/manage/banusers.bml.text Thu Apr 21 03:02:10 2011 +0800
@@ -1,5 +1,4 @@
;; -*- coding: utf-8 -*-
-
.btn.banunban=Ban and Unban Users
.error.toomanybans=Banning the user(s) that you specified will bring you over the maximum number of allowed bans. Please adjust your lists and try again. Any users that you chose to unban have been unbanned successfully.
@@ -23,3 +22,4 @@
.success=You have successfully banned and unbanned the specified users.
.title=Ban and Unban Users
+
diff -r 7d1ada126323 -r b5fcf79b7915 htdocs/manage/circle/add.bml.text
--- a/htdocs/manage/circle/add.bml.text Wed Apr 20 22:06:47 2011 +0800
+++ b/htdocs/manage/circle/add.bml.text Thu Apr 21 03:02:10 2011 +0800
@@ -1,5 +1,4 @@
;; -*- coding: utf-8 -*-
-
.add.header=Success
.add.next.friends=View your reading page
@@ -88,9 +87,9 @@
.groups.nogroup=No friend groups set up.
+.groups.reading=<i>Optional:</i> Include in one or more subscription filters. <strong>You must subscribe to the user by selecting the second box above in order to add them to any subscription filters.</strong>
+
.groups.text1=<i>Optional:</i> Include in one or more access filters. <strong>You must grant access to the user by selecting the first box above in order to add them to any access filters.</strong>
-
-.groups.reading=<i>Optional:</i> Include in one or more subscription filters. <strong>You must subscribe to the user by selecting the second box above in order to add them to any subscription filters.</strong>
.optional=Optional
diff -r 7d1ada126323 -r b5fcf79b7915 htdocs/manage/circle/edit.bml.text
--- a/htdocs/manage/circle/edit.bml.text Wed Apr 20 22:06:47 2011 +0800
+++ b/htdocs/manage/circle/edit.bml.text Thu Apr 21 03:02:10 2011 +0800
@@ -1,5 +1,4 @@
;; -*- coding: utf-8 -*-
-
.addrelationships.head=Add Relationships
.addrelationships.text=To add people to your circle, or to modify the colors associated with a user that you subscribe to, enter their [[sitename]] usernames or their OpenID URLs in the boxes below. You can also <a [[aopts]]>invite a friend</a> to join [[sitename]].
@@ -16,11 +15,13 @@
.btn.toggle=Preview
+.circle.access=Give access
+
.circle.access.n=Does not give you access
.circle.access.y=Gives you access
-.circle.access=Give access
+.circle.header=Current Relationships
.circle.header.comms=Communities ([[num]])
@@ -28,23 +29,11 @@
.circle.header.people=People ([[num]])
-.circle.header=Current Relationships
-
.circle.intro=Here are the <a [[aopts1]]>people</a>, <a [[aopts2]]>communities</a>, and <a [[aopts3]]>feeds</a> that are in your circle. You can change who appears on your Reading Page and who you give access to by using the check boxes. You can also <a [[aopts4]]>edit your notification tracking options</a>.
-
-.circle.intro.people=Here are the people in your circle:
.circle.intro.nonpeople=Here are the communities and feeds in your circle:
-.circle.member.n=You are not a member
-
-.circle.member.y=You are a member
-
.circle.member=Member
-
-.circle.member.n=You are not a member
-
-.circle.member.y=You are a member
.circle.na=N/A
@@ -58,11 +47,11 @@
.circle.status=Circle status
+.circle.subscribe=Subscribe
+
.circle.subscribe.n=Does not subscribe to you
.circle.subscribe.y=Subscribes to you
-
-.circle.subscribe=Subscribe
.circle.trust=Give access?
@@ -141,3 +130,4 @@
.user=User
.viewer=Color Viewer
+
diff -r 7d1ada126323 -r b5fcf79b7915 htdocs/manage/circle/editfilters.bml.text
--- a/htdocs/manage/circle/editfilters.bml.text Wed Apr 20 22:06:47 2011 +0800
+++ b/htdocs/manage/circle/editfilters.bml.text Thu Apr 21 03:02:10 2011 +0800
@@ -56,3 +56,4 @@
.title2=Manage Access Filters
.yourgroups=Your access filters:
+
diff -r 7d1ada126323 -r b5fcf79b7915 htdocs/manage/circle/filter.bml.text
--- a/htdocs/manage/circle/filter.bml.text Wed Apr 20 22:06:47 2011 +0800
+++ b/htdocs/manage/circle/filter.bml.text Thu Apr 21 03:02:10 2011 +0800
@@ -5,9 +5,9 @@
.error.nogroups3=You cannot filter your reading list because you must first <a [[aopts]]>set up your subscription filters</a>.
+.select.header2=Select Filters
+
.select2=Click the subscription filter you want to view on your reading list, or <a [[aopts]]>edit your subscription filters</a>.
-
-.select.header2=Select Filters
.title3=Filter Reading Page
diff -r 7d1ada126323 -r b5fcf79b7915 htdocs/manage/circle/invite.bml.text
--- a/htdocs/manage/circle/invite.bml.text Wed Apr 20 22:06:47 2011 +0800
+++ b/htdocs/manage/circle/invite.bml.text Thu Apr 21 03:02:10 2011 +0800
@@ -1,5 +1,4 @@
;; -*- coding: utf-8 -*-
-
.awesomely<<
Awesomely Yours,
The [[sitenameshort]] Team
@@ -69,7 +68,9 @@ Create an account (yes, it's free):
.msg.header=Message:
-.msg_body_top=Hi! [[displayname]] ([[username]]) has invited you to come check out [[sitename]].
+.msg.noinvitecodes=You don't have any invite codes available.
+
+.msg.noinvitecodes.requestmore=You can request more on your <a [[aopts]]>Manage Invite Codes</a> page.
.msg_body_bottom<<
Creating an account is free, and you can get started here:
@@ -78,6 +79,8 @@ Creating an account is free, and you can
[[username]] will automatically be added to your Friends list, and we'll let them know when you create your account so that they can add you as well.
.
+
+.msg_body_top=Hi! [[displayname]] ([[username]]) has invited you to come check out [[sitename]].
.msg_custom=It's a place where people post and share thoughts on personal journals and communities. You can start your own journal or just kick back and enjoy the atmosphere.
@@ -96,10 +99,6 @@ The [[sitename]] Team
[[siteroot]]
.
-.msg.noinvitecodes=You don't have any invite codes available.
-
-.msg.noinvitecodes.requestmore=You can request more on your <a [[aopts]]>Manage Invite Codes</a> page.
-
.msg_subject=[[username]] has invited you to join [[sitenameshort]]!
.msg_subject.header=Subject:
@@ -111,3 +110,4 @@ The [[sitename]] Team
.success.invitemore=Would you like to invite someone else?
.title=Invite a Friend!
+
diff -r 7d1ada126323 -r b5fcf79b7915 htdocs/manage/emailpost.bml.text
--- a/htdocs/manage/emailpost.bml.text Wed Apr 20 22:06:47 2011 +0800
+++ b/htdocs/manage/emailpost.bml.text Thu Apr 21 03:02:10 2011 +0800
@@ -51,11 +51,11 @@
.help.header=How does this feature work?
-.help.headers.header2=Post headers and security
-
.help.headers.compat.header=Compatibility with other sites
.help.headers.compat.text=[[sitename]] also accepts old-style headers of the form "lj-headername" for backwards compatibility. That means you can post to multiple LJ-based sites in the same email, using the same headers in the message, and have them interpreted correctly.
+
+.help.headers.header2=Post headers and security
.help.headers.options.comments.example=("[[off]]" or "[[noemail]]")
diff -r 7d1ada126323 -r b5fcf79b7915 htdocs/manage/externalaccount.bml.text
--- a/htdocs/manage/externalaccount.bml.text Wed Apr 20 22:06:47 2011 +0800
+++ b/htdocs/manage/externalaccount.bml.text Thu Apr 21 03:02:10 2011 +0800
@@ -1,5 +1,4 @@
;; -*- coding: utf-8 -*-
-
.btn.create=Create
.btn.update=Update
@@ -17,6 +16,32 @@
.protocol.ljxmlrpc.minsecurity.public=Public
.protocol.options=[[protocol]] options
+
+.setting.xpost.option.password=Password
+
+.setting.xpost.option.password.info=(Please make sure you have caps-lock disabled and enter the correct password.)
+
+.setting.xpost.option.recordlink=Display Cross Post Links
+
+.setting.xpost.option.savepassword=Save Password
+
+.setting.xpost.option.service.ljxmlrpc.url=LJ XML-RPC URL
+
+.setting.xpost.option.servicename=Custom Service Name
+
+.setting.xpost.option.servicetype=Custom Service Type
+
+.setting.xpost.option.serviceurl=Custom Service URL
+
+.setting.xpost.option.site=Site
+
+.setting.xpost.option.site.custom=Other Site
+
+.setting.xpost.option.username=Username
+
+.setting.xpost.option.username.info=(Please enter a valid username on the selected service. Crossposting to community accounts is not possible.)
+
+.setting.xpost.option.xpostbydefault=Cross Post by Default
.settings.xpost.error.ipban=Too many log-in attempts. Please try creating the account again later.
@@ -38,32 +63,7 @@
.settings.xpost.error.username.required=Username is required.
-.setting.xpost.option.password=Password
-
-.setting.xpost.option.password.info=(Please make sure you have caps-lock disabled and enter the correct password.)
-
-.setting.xpost.option.recordlink=Display Cross Post Links
-
-.setting.xpost.option.savepassword=Save Password
-
-.setting.xpost.option.servicename=Custom Service Name
-
-.setting.xpost.option.servicetype=Custom Service Type
-
-.setting.xpost.option.serviceurl=Custom Service URL
-
-.setting.xpost.option.service.ljxmlrpc.url=LJ XML-RPC URL
-
-.setting.xpost.option.site=Site
-
-.setting.xpost.option.site.custom=Other Site
-
-.setting.xpost.option.username=Username
-
-.setting.xpost.option.username.info=(Please enter a valid username on the selected service. Crossposting to community accounts is not possible.)
-
-.setting.xpost.option.xpostbydefault=Cross Post by Default
-
.title.edit=Edit External Account
.title.new=New External Account
+
diff -r 7d1ada126323 -r b5fcf79b7915 htdocs/manage/index.bml.text
--- a/htdocs/manage/index.bml.text Wed Apr 20 22:06:47 2011 +0800
+++ b/htdocs/manage/index.bml.text Thu Apr 21 03:02:10 2011 +0800
@@ -79,8 +79,6 @@
.information.comments.about=Change your comment settings
-.information.editinfo.about=Edit your account information and various options
-
.information.header=Account Information
.information.mobilepost=Mobile Post Settings
@@ -95,15 +93,13 @@
.information.settings.about=Change your viewing options and other account settings
-.information.siteopts.about=Select your preferred site layout & language
-
.information.status=Account Status
.information.status.about=Set your account's activation status
+.invites.manage=Manage Your Invite Codes
+
.invites.manage.about=Manage your invite codes
-
-.invites.manage=Manage Your Invite Codes
.login2=The following links will navigate you to pages where your login information is required. To save yourself some time, you can <a [[aopts]]>log in</a> beforehand.
diff -r 7d1ada126323 -r b5fcf79b7915 htdocs/manage/invitecodes.bml.text
--- a/htdocs/manage/invitecodes.bml.text Wed Apr 20 22:06:47 2011 +0800
+++ b/htdocs/manage/invitecodes.bml.text Thu Apr 21 03:02:10 2011 +0800
@@ -9,18 +9,6 @@
.form.request.submit=Request invites
-.label.viewing.full=Here is a full list of your invite codes. See only those which are <a [[aopts]]>unused, or used but recently sent</a>.
-
-.label.viewing.partial=Here are your unused and recently sent invite codes. See the <a [[aopts]]>full list of your invite codes</a>.
-
-.msg.request.success=Your request for new invite codes has been forwarded to site administrators for review.
-
-.msg.request.error=Your request could not go through.
-
-.noinvitecodes=You have no invite codes.
-
-.noinvitecodes.partial=You have no unused or recently sent invite codes.
-
.header.code=Code:
.header.email=Sent to email:
@@ -31,3 +19,15 @@
.header.used=Used on:
+.label.viewing.full=Here is a full list of your invite codes. See only those which are <a [[aopts]]>unused, or used but recently sent</a>.
+
+.label.viewing.partial=Here are your unused and recently sent invite codes. See the <a [[aopts]]>full list of your invite codes</a>.
+
+.msg.request.error=Your request could not go through.
+
+.msg.request.success=Your request for new invite codes has been forwarded to site administrators for review.
+
+.noinvitecodes=You have no invite codes.
+
+.noinvitecodes.partial=You have no unused or recently sent invite codes.
+
diff -r 7d1ada126323 -r b5fcf79b7915 htdocs/manage/profile/index.bml
--- a/htdocs/manage/profile/index.bml Wed Apr 20 22:06:47 2011 +0800
+++ b/htdocs/manage/profile/index.bml Thu Apr 21 03:02:10 2011 +0800
@@ -98,7 +98,7 @@ body<=
$ret .= "</form>\n\n";
$ret .= "<div style='margin: 1em 0;'> ";
- $ret .= BML::ml( ".intro", { aopts1 => "href='$LJ::SITEROOT/manage/settings/$getextra${getsep}cat=privacy'",
+ $ret .= BML::ml( ".intro1", { aopts1 => "href='$LJ::SITEROOT/manage/settings/$getextra${getsep}cat=privacy'",
aopts2 => "href='$LJ::SITEROOT/manage/settings/$getextra${getsep}cat=display'" } );
$ret .= "</div>";
diff -r 7d1ada126323 -r b5fcf79b7915 htdocs/manage/profile/index.bml.text
--- a/htdocs/manage/profile/index.bml.text Wed Apr 20 22:06:47 2011 +0800
+++ b/htdocs/manage/profile/index.bml.text Thu Apr 21 03:02:10 2011 +0800
@@ -18,8 +18,6 @@
.comms=Display communities of which you are a member.
.display.title=Display Settings for [[name]]
-
-.email=Email
.email.change.system=Change email used by system
@@ -105,8 +103,6 @@
.fn.gender=Gender
-.fn.interests=List all your interests, separated by commas, to allow other users to find you using the Interest Search.
-
.fn.link2=Link URL
.fn.ljtalk.address=[[siteabbrev]] Chat Address
@@ -151,7 +147,7 @@
.gender.unspecified=(Unspecified)
-.intro=This is where you fill in the information to be displayed on your Profile. You don't have to display all of this information to everyone; you can set options below. You may also want to edit your <a [[aopts1]]>privacy settings</a> or your <a [[aopts2]]>viewing options</a>.
+.intro1=Here's where you fill out your Profile page. You don't have to display all of your info to everyone - check out the options below. You may also want to edit your <a [[aopts1]]>comment settings</a> or your <a [[aopts2]]>viewing options</a>.
.jumpto=Jump to:
diff -r 7d1ada126323 -r b5fcf79b7915 htdocs/manage/settings/index.bml.text
--- a/htdocs/manage/settings/index.bml.text Wed Apr 20 22:06:47 2011 +0800
+++ b/htdocs/manage/settings/index.bml.text Thu Apr 21 03:02:10 2011 +0800
@@ -1,5 +1,4 @@
;; -*- coding: utf-8 -*-
-
.adultcontentflag=Limit age:
.adultcontentflag.select.concepts=Age 14 and over
@@ -14,11 +13,9 @@
.bdayreminder=Receive email reminders for your friends' birthdays
-.bdayreminder.note=Note: This feature is currently disabled, but may be re-enabled in the future.
+.btn.deleteinactive=Delete all inactive subscriptions
.btn.save=Save
-
-.btn.deleteinactive=Delete all inactive subscriptions
.cat.account=Account
@@ -62,8 +59,6 @@
.finished.save_button=Save Changes
-.form.confirm=Save your changes?
-
.fn.adultcontentflag=Adult Content
.fn.adultcontentreason=Age Limit Reason
@@ -82,15 +77,17 @@
.fn.minsecurity=Entry Security
+.fn.public=Publicity
+
.fn.safesearch=Safe Search Filtering
.fn.scheme=Scheme
.fn.searchincl=Search inclusion
-.fn.public=Publicity
+.fn.viewingadult=Viewing Age Limited Content
-.fn.viewingadult=Viewing Age Limited Content
+.form.confirm=Save your changes?
.imagelinks.size.custom=Custom: use placeholders for images larger than [[width]]x[[height]]
@@ -122,8 +119,6 @@
.minsecurity=Default privacy of new entries:
-.minsecurity.text=This setting will override the security for all future entries, unless you choose a more restrictive privacy. In that case, the more restrictive privacy setting will be used.
-
.minsecurity.friends=Friends Only
.minsecurity.members=Members Only
@@ -132,6 +127,8 @@
.minsecurity.public=Everyone (Public)
+.minsecurity.text=This setting will override the security for all future entries, unless you choose a more restrictive privacy. In that case, the more restrictive privacy setting will be used.
+
.public<<
I hereby give my authorization to reproduce and/or
distribute any part or all of my Content by third parties, with the
@@ -139,7 +136,8 @@ This authorization is remuneration free.
This authorization is remuneration free. Except as stated herein, none
of the Content may be transferred, copied, republished and distributed
in any form or by any means for commercial use.
-.
+
+.safesearch.select.none=Do not filter my results
.safesearch2=You can choose to filter mature or offensive content out of search results.
@@ -147,13 +145,11 @@ in any form or by any means for commerci
.safesearch2.select.explicit=Use moderate filtering (Excludes content the poster has marked 18+)
-.safesearch.select.none=Do not filter my results
-
.searchincl=Minimize your journal's inclusion in search engine results
+.searchincl.text=We can instruct search engines not to include your journal entries in their search results. Not all search engines recognize this request; if you do not want a journal entry to show up in search results, then make sure it is posted private or Friends-only.
+
.searchincl2=Minimize your journal's inclusion in search engine results. Selecting this option also means that your entries will not be publicized at external sites that have content partnership with [[sitename]].
-
-.searchincl.text=We can instruct search engines not to include your journal entries in their search results. Not all search engines recognize this request; if you do not want a journal entry to show up in search results, then make sure it is posted private or Friends-only.
.section.adult_content=Adult content options
@@ -175,8 +171,6 @@ in any form or by any means for commerci
.success.header=Success!
-.success.text=Your viewing options have been updated.
-
.success.next=What would you like to do next?
.success.next.customize=Customize your journal
@@ -186,6 +180,8 @@ in any form or by any means for commerci
.success.next.home=Return to the home page
.success.next.viewing=Change your viewing options
+
+.success.text=Your viewing options have been updated.
.title=Viewing Options
@@ -201,6 +197,7 @@ in any form or by any means for commerci
.viewingadult.select.none=Do not collapse
+.you.can.change=You can change other viewing options by <a [[login]]>logging in</a>. If you don't have an account, you can <a [[create.bml]]>create one now</a>.
+
.you.could.not.auth=You could not be authenticated as the specified user.
-.you.can.change=You can change other viewing options by <a [[login]]>logging in</a>. If you don't have an account, you can <a [[create.bml]]>create one now</a>.
diff -r 7d1ada126323 -r b5fcf79b7915 htdocs/manage/siteopts.bml.text
--- a/htdocs/manage/siteopts.bml.text Wed Apr 20 22:06:47 2011 +0800
+++ b/htdocs/manage/siteopts.bml.text Thu Apr 21 03:02:10 2011 +0800
@@ -1,13 +1,3 @@
;; -*- coding: utf-8 -*-
-.btn.lang=Switch Language
-
-.btn.scheme=Switch Scheme
-
-.head.lang=Select Your Language
-
.head.scheme=Select Your Preferred Scheme
-.scheme.preview=[Preview of [[title]] scheme]
-
-.title=Browse Preferences
-
diff -r 7d1ada126323 -r b5fcf79b7915 htdocs/manage/subscriptions/filters.bml.text
--- a/htdocs/manage/subscriptions/filters.bml.text Wed Apr 20 22:06:47 2011 +0800
+++ b/htdocs/manage/subscriptions/filters.bml.text Thu Apr 21 03:02:10 2011 +0800
@@ -1,1 +1,3 @@
+;; -*- coding: utf-8 -*-
.accessfilters=You are currently managing your subscription filters. <a [[aopts]]>Manage your access filters?</a>
+
diff -r 7d1ada126323 -r b5fcf79b7915 htdocs/manage/tags.bml.text
--- a/htdocs/manage/tags.bml.text Wed Apr 20 22:06:47 2011 +0800
+++ b/htdocs/manage/tags.bml.text Thu Apr 21 03:02:10 2011 +0800
@@ -61,15 +61,15 @@
.setting.desc.control=Who can create new tags and add/remove tags from entries?
-.setting.public=Any user
-
-.setting.trusted=Access only
-
.setting.maintainers=Only maintainers
.setting.members=Members only
.setting.private=Only you
+
+.setting.public=Any user
+
+.setting.trusted=Access only
.sort.a=<strong>sort</strong>: <a [[aopts]]>alphabetically</a> or by usage
diff -r 7d1ada126323 -r b5fcf79b7915 htdocs/misc/adult_content.bml.text
--- a/htdocs/misc/adult_content.bml.text Wed Apr 20 22:06:47 2011 +0800
+++ b/htdocs/misc/adult_content.bml.text Thu Apr 21 03:02:10 2011 +0800
@@ -1,16 +1,15 @@
;; -*- coding: utf-8 -*-
-
.btn.ageconfirm=Yes, I am at least [[age]] years old.
.btn.viewconfirm=Yes, I wish to view this content.
+.message.concepts.byjournal=You are about to view content that [[journal]] has advised <strong>should be viewed with discretion</strong>. To continue, you must confirm that you want to view this content.
+
+.message.concepts.byjournal.reason=The following reason has been provided by [[journal]] for this entry: <strong>[[reason]]</strong>.
+
.message.concepts.byposter=You are about to view content that [[poster]] has advised <strong>should be viewed with discretion</strong>. To continue, you must confirm that you want to view this content.
.message.concepts.byposter.reason=The following reason has been provided by [[poster]] for this entry: <strong>[[reason]]</strong>.
-
-.message.concepts.byjournal=You are about to view content that [[journal]] has advised <strong>should be viewed with discretion</strong>. To continue, you must confirm that you want to view this content.
-
-.message.concepts.byjournal.reason=The following reason has been provided by [[journal]] for this entry: <strong>[[reason]]</strong>.
.message.concepts.communityreason=The following reason has been provided by [[journal]] for this community: <strong>[[reason]]</strong>.
@@ -44,8 +43,9 @@
.title=Adult Content Notice
-.title.NSFW=Discretion Advised
-
.title.18=Discretion Advised: 18+ Content
-.title.18.blocked=Adult Content: Restricted to 18+
\ No newline at end of file
+.title.18.blocked=Adult Content: Restricted to 18+
+
+.title.nsfw=Discretion Advised
+
diff -r 7d1ada126323 -r b5fcf79b7915 htdocs/misc/blockedlink.bml.text
--- a/htdocs/misc/blockedlink.bml.text Wed Apr 20 22:06:47 2011 +0800
+++ b/htdocs/misc/blockedlink.bml.text Thu Apr 21 03:02:10 2011 +0800
@@ -1,3 +1,5 @@
+;; -*- coding: utf-8 -*-
.link_was_blocked=The original link, shown below, was blocked for security reasons. We do not recommend following this link.
.title=Blocked link
+
diff -r 7d1ada126323 -r b5fcf79b7915 htdocs/misc/mogupic.bml.text
--- a/htdocs/misc/mogupic.bml.text Wed Apr 20 22:06:47 2011 +0800
+++ b/htdocs/misc/mogupic.bml.text Thu Apr 21 03:02:10 2011 +0800
@@ -1,5 +1,5 @@
;; -*- coding: utf-8 -*-
+.error.image=Error retrieving image.
.error.referer=Invalid Referer
-.error.image=Error retrieving image.
diff -r 7d1ada126323 -r b5fcf79b7915 htdocs/mobile/index.bml.text
--- a/htdocs/mobile/index.bml.text Wed Apr 20 22:06:47 2011 +0800
+++ b/htdocs/mobile/index.bml.text Thu Apr 21 03:02:10 2011 +0800
@@ -1,5 +1,4 @@
-.title=[[sitename]] Mobile
-
+;; -*- coding: utf-8 -*-
.intro.header=[[sitename]] Mobile
.intro.hello=Hello, [[user]]!
@@ -8,10 +7,13 @@
.options.header=Options
+.options.logged_in=<a [[aopts]]>Log in</a> -- you're currently logged in as
+
.options.login_prompt=<a [[aopts]]>Log in</a> -- required
-
-.options.logged_in=<a [[aopts]]>Log in</a> -- you're currently logged in as
.options.post=<a [[aopts]]>Post to [[sitename]]</a>
.options.readingpage=<a [[aopts]]>Your reading page</a>
+
+.title=[[sitename]] Mobile
+
diff -r 7d1ada126323 -r b5fcf79b7915 htdocs/mobile/login.bml.text
--- a/htdocs/mobile/login.bml.text Wed Apr 20 22:06:47 2011 +0800
+++ b/htdocs/mobile/login.bml.text Thu Apr 21 03:02:10 2011 +0800
@@ -1,3 +1,4 @@
+;; -*- coding: utf-8 -*-
.basic.header=Insecure basic login
.basic.text=This sends your password unprotected, probably over the air. Not a good idea on Wifi. Probably okay over a mobile carrier's data network.
@@ -23,3 +24,4 @@
.ssl.header=SSL secure login
.ssl.text=Secure using SSL, but may not work on all mobile devices:
+
diff -r 7d1ada126323 -r b5fcf79b7915 htdocs/mobile/post.bml.text
--- a/htdocs/mobile/post.bml.text Wed Apr 20 22:06:47 2011 +0800
+++ b/htdocs/mobile/post.bml.text Thu Apr 21 03:02:10 2011 +0800
@@ -1,3 +1,4 @@
+;; -*- coding: utf-8 -*-
.form.button=Post
.form.header=Post
diff -r 7d1ada126323 -r b5fcf79b7915 htdocs/mobile/read.bml.text
--- a/htdocs/mobile/read.bml.text Wed Apr 20 22:06:47 2011 +0800
+++ b/htdocs/mobile/read.bml.text Thu Apr 21 03:02:10 2011 +0800
@@ -1,7 +1,6 @@
;; -*- coding: utf-8 -*-
+.items.next= | <a [[aopts]]>Next [[items]] >></a>
-.items.next= | <a [[aopts]]>Next [[items]] >></a>
-
.items.previous=<a [[aopts]]><< Previous [[items]]</a>
.page.title=Reading Page
@@ -13,3 +12,4 @@
.read.login=You must <a [[aopts]]>log in</a> to access your reading page.
.read.noentries=<i>No further entries to display in group: [[groupname]]</i>
+
diff -r 7d1ada126323 -r b5fcf79b7915 htdocs/multisearch.bml.text
--- a/htdocs/multisearch.bml.text Wed Apr 20 22:06:47 2011 +0800
+++ b/htdocs/multisearch.bml.text Thu Apr 21 03:02:10 2011 +0800
@@ -36,4 +36,5 @@ If you want to do a different type of se
.region.head=Search by Region
-.title.results=Search Results
\ No newline at end of file
+.title.results=Search Results
+
diff -r 7d1ada126323 -r b5fcf79b7915 htdocs/openid/approve.bml.text
--- a/htdocs/openid/approve.bml.text Wed Apr 20 22:06:47 2011 +0800
+++ b/htdocs/openid/approve.bml.text Thu Apr 21 03:02:10 2011 +0800
@@ -1,5 +1,4 @@
;; -*- coding: utf-8 -*-
-
.error.cannot_provide_identity=The site you just came from seems to want to verify <a href='[[url]]'>an identity</a> that you, as [[user]], cannot provide.
.error.failed_sign_url=Failed to make signed return URL.
@@ -28,4 +27,5 @@
.form.request2=The site you just came from has asked [[sitename]] to prove that you own this [[sitename]] account. If you allow this, we will <b>not</b> give them access to your [[sitename]] account or password, or any information that isn't already public in your account. All we'll do is tell [[refurl]] that you control the account [[url]].
-.form.title2=Pass identity along?
\ No newline at end of file
+.form.title2=Pass identity along?
+
diff -r 7d1ada126323 -r b5fcf79b7915 htdocs/openid/index.bml.text
--- a/htdocs/openid/index.bml.text Wed Apr 20 22:06:47 2011 +0800
+++ b/htdocs/openid/index.bml.text Thu Apr 21 03:02:10 2011 +0800
@@ -1,8 +1,13 @@
-.title=OpenID
+;; -*- coding: utf-8 -*-
+.login.example=For example: <tt>melody.someblog.com</tt> (if your host supports OpenID)
-.main.what_is_openid=What is OpenID?
+.login.openid_url=Your OpenID URL:
-.main.what_is_openid.content=[[sitename]] supports the <a href="http://openid.net/">OpenID</a> distributed identity system, letting you bring your [[sitename]] identity to other sites, and letting non-[[sitename]] users bring their identity here. After all, not everybody uses the same websites, but you should still be able to play together.
+.login.submit=Login
+
+.main.openid_other_sites=Using your OpenID on another site.
+
+.main.openid_other_sites.content=If another site says it supports OpenID and you want to use your [[sitename]] identity there, just enter your journal URL. (you don't need the http:// part either). For example, just enter <b>melody.[[domain]]</b>, or whatever your address is. After you do so, you'll be sent to [[sitename]] briefly to ask if you want to trust that site to know who you are. You can either trust them once, or forever. You can change your <a href="/openid/options.bml">OpenID settings and trust</a> at any time.
.main.using_your_openid_here=Using your OpenID here.
@@ -12,12 +17,9 @@
.main.using_your_openid_here.email2=You can also <a [[aopts1]]>set</a> and <a [[aopts2]]>validate</a> an email address to be notified of replies to your comments via email.
-.login.openid_url=Your OpenID URL:
+.main.what_is_openid=What is OpenID?
-.login.submit=Login
+.main.what_is_openid.content=[[sitename]] supports the <a href="http://openid.net/">OpenID</a> distributed identity system, letting you bring your [[sitename]] identity to other sites, and letting non-[[sitename]] users bring their identity here. After all, not everybody uses the same websites, but you should still be able to play together.
-.login.example=For example: <tt>melody.someblog.com</tt> (if your host supports OpenID)
+.title=OpenID
-.main.openid_other_sites=Using your OpenID on another site.
-
-.main.openid_other_sites.content=If another site says it supports OpenID and you want to use your [[sitename]] identity there, just enter your journal URL. (you don't need the http:// part either). For example, just enter <b>melody.[[domain]]</b>, or whatever your address is. After you do so, you'll be sent to [[sitename]] briefly to ask if you want to trust that site to know who you are. You can either trust them once, or forever. You can change your <a href="/openid/options.bml">OpenID settings and trust</a> at any time.
diff -r 7d1ada126323 -r b5fcf79b7915 htdocs/openid/login.bml.text
--- a/htdocs/openid/login.bml.text Wed Apr 20 22:06:47 2011 +0800
+++ b/htdocs/openid/login.bml.text Thu Apr 21 03:02:10 2011 +0800
@@ -1,17 +1,19 @@
-.title=OpenID Login
+;; -*- coding: utf-8 -*-
+.error.cantuseownsite=You can't use a [[sitename]] OpenID account on [[sitename]] — just <a href='/login.bml'>go login</a> with your actual [[sitename]] account.
+
+.error.invalidchars=Invalid characters in identity URL.
+
+.error.invalidparam=Invalid [[param]]
+
+.error.logout.content=Hello, [[user]]. Before logging in with <a href='http://openid.net/'>OpenID</a>, you must first <a href='/logout.bml'>log out</a>.
+
+.error.logout.heading=Already logged in
+
+.error.notvivified=Couldn't vivify your account (but we verified that you're [[url]])
+
+.error.no_support=OpenID consumer support is disabled
.error.title=Error
-.error.no_support=OpenID consumer support is disabled
+.title=OpenID Login
-.error.logout.heading=Already logged in
-
-.error.logout.content=Hello, [[user]]. Before logging in with <a href='http://openid.net/'>OpenID</a>, you must first <a href='/logout.bml'>log out</a>.
-
-.error.invalidparam=Invalid [[param]]
-
-.error.invalidchars=Invalid characters in identity URL.
-
-.error.notvivified=Couldn't vivify your account (but we verified that you're [[url]])
-
-.error.cantuseownsite=You can't use a [[sitename]] OpenID account on [[sitename]] — just <a href='/login.bml'>go login</a> with your actual [[sitename]] account.
diff -r 7d1ada126323 -r b5fcf79b7915 htdocs/openid/options.bml.text
--- a/htdocs/openid/options.bml.text Wed Apr 20 22:06:47 2011 +0800
+++ b/htdocs/openid/options.bml.text Thu Apr 21 03:02:10 2011 +0800
@@ -1,17 +1,19 @@
-.error.title=Error
+;; -*- coding: utf-8 -*-
+.error.form_tampering=Possible form tampering detected.
+
+.error.login=You need to be <a href='/login.bml?ret=1'>logged in</a> to manage your OpenID options.
.error.no_support=OpenID server support is disabled
-.error.login=You need to be <a href='/login.bml?ret=1'>logged in</a> to manage your OpenID options.
-
-.error.form_tampering=Possible form tampering detected.
-
-.title=OpenID Options
-
-.main.trust.heading=Sites you trust
-
-.main.trust.content=You've marked these sites as able to verify your identity. You may remove them here.
+.error.title=Error
.main.delete=Delete
.main.none=(None)
+
+.main.trust.content=You've marked these sites as able to verify your identity. You may remove them here.
+
+.main.trust.heading=Sites you trust
+
+.title=OpenID Options
+
diff -r 7d1ada126323 -r b5fcf79b7915 htdocs/poll/create.bml.text
--- a/htdocs/poll/create.bml.text Wed Apr 20 22:06:47 2011 +0800
+++ b/htdocs/poll/create.bml.text Thu Apr 21 03:02:10 2011 +0800
@@ -11,21 +11,19 @@
.button.startover=Start Over
+.checkmax=Maximum options accepted:
+
.checkmin=Minimum options required:
-.checkmax=Maximum options accepted:
-
.elements.limitreached=Element limit reached
-
-.error.accttype=Your account type does not permit you to use the poll creation feature.
.error.accttype2=Your account type does not permit you to use the poll creation feature.
.error.allitemsblank=All items cannot be blank.
+.error.checkmaxtoolow=Maximum value for checkbox options is too low
+
.error.checkmintoohigh=Minimum value for checkbox options is too high
-
-.error.checkmaxtoolow=Maximum value for checkbox options is too low
.error.notext=You need text explaining your question
@@ -38,6 +36,8 @@
.error.scalemaxlessmin=Scale 'from' value must be less than 'to' value.
.error.scalemininvalid=Scale increment must be at least [[min]].
+
+.error.scaletoobig=Limit of [[max]] selections (to-from)/by > 20
.error.scaletoobig1=Your scale exceeds the limit of [[maxselections]] selections by [[selections]].
diff -r 7d1ada126323 -r b5fcf79b7915 htdocs/preview/entry.bml.text
--- a/htdocs/preview/entry.bml.text Wed Apr 20 22:06:47 2011 +0800
+++ b/htdocs/preview/entry.bml.text Thu Apr 21 03:02:10 2011 +0800
@@ -1,3 +1,5 @@
+;; -*- coding: utf-8 -*-
+.entry.preview_warn_text=This is a preview only. To save this entry, close this popup and return to your main browser window.
+
.title=[[sitenameshort]]: Entry Preview (Unsaved)
-.entry.preview_warn_text=This is a preview only. To save this entry, close this popup and return to your main browser window.
diff -r 7d1ada126323 -r b5fcf79b7915 htdocs/profile.bml.text
--- a/htdocs/profile.bml.text Wed Apr 20 22:06:47 2011 +0800
+++ b/htdocs/profile.bml.text Thu Apr 21 03:02:10 2011 +0800
@@ -1,5 +1,4 @@
;; -*- coding: utf-8 -*-
-
.about.comm=About:
.about.header=About
@@ -96,13 +95,13 @@
.details.lastupdated=Last updated [[timestamp]]
+.details.lastupdated.never=Never updated
+
+.details.lastupdated.never2=never updated
+
.details.lastupdated2=last updated [[timestamp]]
.details.lastupdated3=last updated [[timestamp]] ([[agotext]])
-
-.details.lastupdated.never=Never updated
-
-.details.lastupdated.never2=never updated
.details.membersince=Member Since: [[createdate]]
@@ -222,9 +221,9 @@
.label.hidden=(hidden)
+.label.icquin=ICQ UIN:
+
.label.icq_send_message=Send Message
-
-.label.icquin=ICQ UIN:
.label.interests=Interests ([[num]]):
@@ -282,12 +281,6 @@
.label.supportpoints=Support points
-.label.syndicatedfrom=Syndicated from:
-
-.label.syndicatedstatus=Syndication Status:
-
-.label.syndreadcount=Number of Readers:
-
.label.syn.hubbub.goodfor=Expiration time:
.label.syn.hubbub.huburl=Hub URL:
@@ -299,6 +292,12 @@
.label.syn.hubbub.pings=Pings received:
.label.syn.hubbub.topicurl=Topic URL:
+
+.label.syndicatedfrom=Syndicated from:
+
+.label.syndicatedstatus=Syndication Status:
+
+.label.syndreadcount=Number of Readers:
.label.textmessage=<nobr>Text<br>Message</nobr>:
@@ -318,9 +317,9 @@
.linking.about=To link to this user, copy this code:
+.linking.anywhere=Elsewhere:
+
.linking.local=On [[sitename]]:
-
-.linking.anywhere=Elsewhere:
.members.header=Members
@@ -485,3 +484,4 @@
.userpic.viewall=View All Userpics
.userpic.viewall.edit=<a [[aopts1]]>View All</a> / <a [[aopts2]]>Edit</a>
+
diff -r 7d1ada126323 -r b5fcf79b7915 htdocs/register.bml.text
--- a/htdocs/register.bml.text Wed Apr 20 22:06:47 2011 +0800
+++ b/htdocs/register.bml.text Thu Apr 21 03:02:10 2011 +0800
@@ -49,10 +49,6 @@ Sincerely,
.new.101.community.question=What is a community?
-.new.101.reading.answer=It lets you read the latest from journals and web feeds you've subscribed to, all in one place.
-
-.new.101.reading.question=What is a Reading Page?
-
.new.101.journal.answer=Your journal is for writing and sharing stories, photos, videos, and more with others.
.new.101.journal.question=What is a journal?
@@ -60,6 +56,10 @@ Sincerely,
.new.101.profile.answer=A collection of goodies about yourself. Express yourself with userpics, interests, a bio, and more!
.new.101.profile.question=What is a profile?
+
+.new.101.reading.answer=It lets you read the latest from journals and web feeds you've subscribed to, all in one place.
+
+.new.101.reading.question=What is a Reading Page?
.new.101.title=[[sitename]] 101
@@ -76,3 +76,4 @@ Sincerely,
.trans.body=Your new email address has been validated.
.trans.header=Success
+
diff -r 7d1ada126323 -r b5fcf79b7915 htdocs/reject.bml.text
--- a/htdocs/reject.bml.text Wed Apr 20 22:06:47 2011 +0800
+++ b/htdocs/reject.bml.text Thu Apr 21 03:02:10 2011 +0800
@@ -5,11 +5,11 @@
.error.actionperformed=This action has already been performed
-.error.rejecting=There was an error rejecting this request to join.
-
.error.internerr.invalidaction=Internal error: invalid action
.error.invalidargument=Invalid argument given
+
+.error.rejecting=There was an error rejecting this request to join.
.error.unknownactiontype=Unknown action type
diff -r 7d1ada126323 -r b5fcf79b7915 htdocs/settings/index.bml.text
--- a/htdocs/settings/index.bml.text Wed Apr 20 22:06:47 2011 +0800
+++ b/htdocs/settings/index.bml.text Thu Apr 21 03:02:10 2011 +0800
@@ -1,17 +1,17 @@
+;; -*- coding: utf-8 -*-
.change.settings=Change Settings
.failed.to.load=Failed to load
+
+.no.options.match=No options match
+
+.options.tagged=Options tagged
.save=Save
.sorry=Sorry
-.no.options.match=No options match
-
-.options.tagged=Options tagged
-
.the.setting=The '[[selminiclass]]' setting:
.which.setting=Which <a [[link]]>setting</a> do you want to change today? Enter tag:
-
diff -r 7d1ada126323 -r b5fcf79b7915 htdocs/shop/account.bml.text
--- a/htdocs/shop/account.bml.text Wed Apr 20 22:06:47 2011 +0800
+++ b/htdocs/shop/account.bml.text Thu Apr 21 03:02:10 2011 +0800
@@ -1,5 +1,4 @@
;; -*- coding: utf-8 -*-
-
.backlink=Back to [[sitename]] Shop
.btn.addtocart=Add to Order
@@ -31,3 +30,4 @@
.intro.self=Please choose the type of paid account that you'd like to purchase for your account [[user]].
.title=Buy a Paid Account
+
diff -r 7d1ada126323 -r b5fcf79b7915 htdocs/shop/cancel.bml.text
--- a/htdocs/shop/cancel.bml.text Wed Apr 20 22:06:47 2011 +0800
+++ b/htdocs/shop/cancel.bml.text Thu Apr 21 03:02:10 2011 +0800
@@ -1,5 +1,4 @@
;; -*- coding: utf-8 -*-
-
.error.cantcancel=Sorry, we could not cancel your order at this time.
.error.invalidcart=Your cart is invalid.
@@ -9,3 +8,4 @@
.error.invalidtoken=Your token is invalid.
.error.needtoken=You did not provide an order number or token.
+
diff -r 7d1ada126323 -r b5fcf79b7915 htdocs/shop/cart.bml.text
--- a/htdocs/shop/cart.bml.text Wed Apr 20 22:06:47 2011 +0800
+++ b/htdocs/shop/cart.bml.text Thu Apr 21 03:02:10 2011 +0800
@@ -1,5 +1,4 @@
;; -*- coding: utf-8 -*-
-
.backlink=Continue Shopping
.gift=Give a Gift
@@ -9,3 +8,4 @@
.payment.failed.title=Payment Failed
.title=Your Shopping Cart
+
diff -r 7d1ada126323 -r b5fcf79b7915 htdocs/shop/checkout.bml.text
--- a/htdocs/shop/checkout.bml.text Wed Apr 20 22:06:47 2011 +0800
+++ b/htdocs/shop/checkout.bml.text Thu Apr 21 03:02:10 2011 +0800
@@ -1,5 +1,4 @@
;; -*- coding: utf-8 -*-
-
.error.emptycart=Your cart is empty.
.error.invalidpaymentmethod=The payment method you chose is not currently supported.
@@ -9,3 +8,4 @@
.error.zerocart=Sorry, we don't support $0 carts yet.
.title=Check Out
+
diff -r 7d1ada126323 -r b5fcf79b7915 htdocs/shop/confirm.bml.text
--- a/htdocs/shop/confirm.bml.text Wed Apr 20 22:06:47 2011 +0800
+++ b/htdocs/shop/confirm.bml.text Thu Apr 21 03:02:10 2011 +0800
@@ -1,5 +1,4 @@
;; -*- coding: utf-8 -*-
-
.btn.back=Back to Shop
.btn.cancel=Cancel Payment
@@ -37,3 +36,4 @@
.success.paypal.processing=Your order has been successfully placed, but PayPal says it will take some time for your payment to finish processing. As soon as it does, PayPal will email you and we will process your order. Thank you for your purchase!
.title=Confirm Your Payment
+
diff -r 7d1ada126323 -r b5fcf79b7915 htdocs/shop/creditcard.bml.text
--- a/htdocs/shop/creditcard.bml.text Wed Apr 20 22:06:47 2011 +0800
+++ b/htdocs/shop/creditcard.bml.text Thu Apr 21 03:02:10 2011 +0800
@@ -1,5 +1,4 @@
;; -*- coding: utf-8 -*-
-
.error.badcartstate=Your shopping cart has already been checked out. If your payment failed, you will need to build a new shopping cart to try again. We're sorry for the inconvenience.
.error.emptycart=Your cart is empty.
@@ -13,3 +12,4 @@
.info=If you'd like to use a credit card to purchase your account, use the button below. This will take you to PayPal, our merchant processor. You won't need a PayPal account to use this payment option.
.title=Purchase by Credit Card
+
diff -r 7d1ada126323 -r b5fcf79b7915 htdocs/shop/creditcard_wait.bml.text
--- a/htdocs/shop/creditcard_wait.bml.text Wed Apr 20 22:06:47 2011 +0800
+++ b/htdocs/shop/creditcard_wait.bml.text Thu Apr 21 03:02:10 2011 +0800
@@ -1,5 +1,4 @@
;; -*- coding: utf-8 -*-
-
.state.failed=We're sorry, but your payment has been declined by our credit card processor. You may wish to try an alternative payment method, or ensure that you accurately entered your billing information.
.state.internal_failure=We're sorry, but something failed internally on our end attempting to process your payment. Your credit card has probably not been charged.
@@ -15,3 +14,4 @@
.title.paid=Payment Received
.title.queued=Please Wait
+
diff -r 7d1ada126323 -r b5fcf79b7915 htdocs/shop/entercc.bml.text
--- a/htdocs/shop/entercc.bml.text Wed Apr 20 22:06:47 2011 +0800
+++ b/htdocs/shop/entercc.bml.text Thu Apr 21 03:02:10 2011 +0800
@@ -1,5 +1,4 @@
;; -*- coding: utf-8 -*-
-
.about=This page allows you to complete your payment using an accepted major credit card.
.about.security=[[sitename]] does not store your credit card information. Your payment details are passed to our payment processor using industry standard encryption and will never be stored on our servers.
@@ -61,3 +60,4 @@
.form.zip=Zip/Postal Code:
.title=Purchase by Credit Card
+
diff -r 7d1ada126323 -r b5fcf79b7915 htdocs/shop/gifts.bml.text
--- a/htdocs/shop/gifts.bml.text Wed Apr 20 22:06:47 2011 +0800
+++ b/htdocs/shop/gifts.bml.text Thu Apr 21 03:02:10 2011 +0800
@@ -1,5 +1,4 @@
;; -*- coding: utf-8 -*-
-
.about=Are you looking for a gift for a birthday or a holiday? Is one of the people in your Circle such a compelling writer that you want to find a way to say a quick "thank you for being so awesome"? Give the gift of a paid [[sitename]] account!
.buy.gift=Buy gift
@@ -10,9 +9,9 @@
.free.header=Free Accounts
+.free.header.communities=Communities
+
.free.header.personal=Journals
-
-.free.header.communities=Communities
.none.free.text=All of the people in your Circle have paid accounts that aren't set to expire soon. You can still buy a gift for them, or buy a gift for others in the <a [[aopts]]>[[sitename]] Shop</a>.
@@ -31,3 +30,4 @@
.paid.soon.about=These are the people in your Circle who have paid accounts that are expiring within the next month:
.title=Give the Gift of [[sitename]]
+
diff -r 7d1ada126323 -r b5fcf79b7915 htdocs/shop/history.bml.text
--- a/htdocs/shop/history.bml.text Wed Apr 20 22:06:47 2011 +0800
+++ b/htdocs/shop/history.bml.text Thu Apr 21 03:02:10 2011 +0800
@@ -1,5 +1,4 @@
;; -*- coding: utf-8 -*-
-
.cart.details=View
.cart.header.date=Date
@@ -19,3 +18,4 @@
.nocarts.extra=You have not placed any orders. <a [[aopts]]>Want to purchase something?</a>
.title=Order History
+
diff -r 7d1ada126323 -r b5fcf79b7915 htdocs/shop/randomgift.bml.text
--- a/htdocs/shop/randomgift.bml.text Wed Apr 20 22:06:47 2011 +0800
+++ b/htdocs/shop/randomgift.bml.text Thu Apr 21 03:02:10 2011 +0800
@@ -1,20 +1,19 @@
;; -*- coding: utf-8 -*-
-
.backlink=Back to [[sitename]] Shop
-.form.getanother.P=Find a different random active free user
+.form.getanother.c=Find a different random active free community
-.form.getanother.C=Find a different random active free community
-
-.form.switchtype.C=Find a random active free user
-
-.form.switchtype.P=Find a random active free community
+.form.getanother.p=Find a different random active free user
.form.submit=Purchase a Paid Account for [[username]]
-.intro.P=Here is a random active free user who may appreciate a paid account. If you'd like to find a different random user, just <a [[aopts]]>refresh</a>. You can also <a [[aopts2]]>purchase a paid account for an unknown random user</a>.
+.form.switchtype.c=Find a random active free user
-.intro.C=Here is a random active free community who may appreciate a paid account. If you'd like to find a different random community, just <a [[aopts]]>refresh</a>.
+.form.switchtype.p=Find a random active free community
+
+.intro.c=Here is a random active free community who may appreciate a paid account. If you'd like to find a different random community, just <a [[aopts]]>refresh</a>.
+
+.intro.p=Here is a random active free user who may appreciate a paid account. If you'd like to find a different random user, just <a [[aopts]]>refresh</a>. You can also <a [[aopts2]]>purchase a paid account for an unknown random user</a>.
.label.createdate=Created on:
@@ -30,10 +29,11 @@
.label.username=Username:
-.nousers.P=There are currently no active free users.
+.nousers.c=There are currently no active free communities.
-.nousers.C=There are currently no active free communities.
+.nousers.p=There are currently no active free users.
-.title.P=Find a Random Active Free User
+.title.c=Find a Random Active Free Community
-.title.C=Find a Random Active Free Community
+.title.p=Find a Random Active Free User
+
diff -r 7d1ada126323 -r b5fcf79b7915 htdocs/shop/receipt.bml.text
--- a/htdocs/shop/receipt.bml.text Wed Apr 20 22:06:47 2011 +0800
+++ b/htdocs/shop/receipt.bml.text Thu Apr 21 03:02:10 2011 +0800
@@ -1,6 +1,19 @@
;; -*- coding: utf-8 -*-
+.cart.date=<strong>Order Date:</strong> [[date]]
-.cart.date=<strong>Order Date:</strong> [[date]]
+.cart.paymentmethod=<strong>Payment Method:</strong> [[paymentmethod]]
+
+.cart.paymentmethod.checkmoneyorder=Check/Money Order
+
+.cart.paymentmethod.checkmoneyorder.extra=Please make your check or money order out to: [[sitecompany]]</p><p>Mail it to: [[address]]
+
+.cart.paymentmethod.creditcard=Credit Card
+
+.cart.paymentmethod.creditcardpp=Credit Card
+
+.cart.paymentmethod.gco=Google Checkout Account
+
+.cart.paymentmethod.paypal=PayPal Account
.cart.status=<strong>Current Order Status:</strong> [[status]]
@@ -25,20 +38,7 @@
.cart.status.9=Charge declined
-.cart.paymentmethod=<strong>Payment Method:</strong> [[paymentmethod]]
-
-.cart.paymentmethod.checkmoneyorder=Check/Money Order
-
-.cart.paymentmethod.checkmoneyorder.extra=Please make your check or money order out to: [[sitecompany]]</p><p>Mail it to: [[address]]
-
-.cart.paymentmethod.creditcard=Credit Card
-
-.cart.paymentmethod.creditcardpp=Credit Card
-
-.cart.paymentmethod.gco=Google Checkout Account
-
-.cart.paymentmethod.paypal=PayPal Account
-
.error.invalidordernum=Your order number is invalid.
.title=Order #[[num]]
+
diff -r 7d1ada126323 -r b5fcf79b7915 htdocs/shop/renames.bml.text
--- a/htdocs/shop/renames.bml.text Wed Apr 20 22:06:47 2011 +0800
+++ b/htdocs/shop/renames.bml.text Thu Apr 21 03:02:10 2011 +0800
@@ -1,4 +1,5 @@
;; -*- coding: utf-8 -*-
+.action=Once your payment has gone through, the token will be listed on <a [[aopts]]>the rename page</a>.
.backlink=Back to [[sitename]] Shop
@@ -16,6 +17,5 @@
.intro.self=Buy a rename token for your journal to change your username, or the username of a community you manage.
-.action=Once your payment has gone through, the token will be listed on <a [[aopts]]>the rename page</a>.
+.title=Buy a Rename Token
-.title=Buy a Rename Token
diff -r 7d1ada126323 -r b5fcf79b7915 htdocs/site/index.bml.text
--- a/htdocs/site/index.bml.text Wed Apr 20 22:06:47 2011 +0800
+++ b/htdocs/site/index.bml.text Thu Apr 21 03:02:10 2011 +0800
@@ -35,9 +35,9 @@
.maplinks.create-poll=Create poll
+.maplinks.customize-title=...customize the look of your journal:
+
.maplinks.customizestyle=Customize style
-
-.maplinks.customize-title=...customize the look of your journal:
.maplinks.directory=Search directory
@@ -105,9 +105,9 @@
.maplinks.massprivacy=Edit journal privacy
+.maplinks.official-journals-title=...read the [[sitename]] official journals:
+
.maplinks.official-journals.list=Complete list
-
-.maplinks.official-journals-title=...read the [[sitename]] official journals:
.maplinks.payment-history=View your payment history
@@ -150,3 +150,4 @@
.maplinks.upgrade=Upgrade your account
.title=Site Map
+
diff -r 7d1ada126323 -r b5fcf79b7915 htdocs/site/opensource.bml.text
--- a/htdocs/site/opensource.bml.text Wed Apr 20 22:06:47 2011 +0800
+++ b/htdocs/site/opensource.bml.text Thu Apr 21 03:02:10 2011 +0800
@@ -1,15 +1,13 @@
;; -*- coding: utf-8 -*-
-.title=Open Source
+.attrib.circular=• For some themes, [[sitenameshort]] uses the <a href="http://prothemedesign.com/circular-icons/">Circular</a> icon set, designed by Ben Gillbanks, which are licensed under a <a href="http://creativecommons.org/licenses/by/2.5/">Creative Commons Attribution 2.5 License</a>. Some icons have been color-shifted to match the layouts they are used in.
.attrib.header=Attribution for Content
-.attrib.circular=• For some themes, [[sitenameshort]] uses the <a href="http://prothemedesign.com/circular-icons/">Circular</a> icon set, designed by Ben Gillbanks, which are licensed under a <a href="http://creativecommons.org/licenses/by/2.5/">Creative Commons Attribution 2.5 License</a>. Some icons have been color-shifted to match the layouts they are used in.
-
.attrib.silk=• In certain places, [[sitenameshort]] uses the <a href="http://www.famfamfam.com/lab/icons/silk/">Silk</a> icon set made by Mark James, which are licensed under a <a href="http://creativecommons.org/licenses/by/2.5/">Creative Commons Attribution 2.5 License</a>. We are grateful to Mark for creating and sharing these.
+.development.directions=If you'd like to report a bug that you've found in the Dreamwidth code, please do so by opening a <a href="http://www.dreamwidth.org/support/submit.bml">support request</a> on Dreamwidth.org, or email support@dreamwidth.org. That will allow us to verify the bug and the steps to reproduce it before entering it into our Bugzilla. If the bug is security-related and you think it shouldn't be posted in public, you can email webmaster@dreamwidth.org instead.
+
.development.header=Development
-
-.development.directions=If you'd like to report a bug that you've found in the Dreamwidth code, please do so by opening a <a href="http://www.dreamwidth.org/support/submit.bml">support request</a> on Dreamwidth.org, or email support@dreamwidth.org. That will allow us to verify the bug and the steps to reproduce it before entering it into our Bugzilla. If the bug is security-related and you think it shouldn't be posted in public, you can email webmaster@dreamwidth.org instead.
.development.main=Information about installing and maintaining a Dreamwidth-powered site can be found at <a href="http://wiki.dwscoalition.org">the Dreamwidth Wiki</a>. If you'd like to submit a patch to us, or see a list of the bugs available for someone to work on, check out our <a href="http://bugs.dwscoalition.org">Bugzilla installation</a>.
@@ -24,3 +22,6 @@
.os.intro=We believe strongly in Open Source and the creative commons. By freely releasing all of our code and documentation, we hope to create a vibrant and thriving community that will constantly improve the product we offer.
.os.lj=The Dreamwidth Studios codebase is built on the Open Source codebase provided by <a href="http://www.livejournal.com">LiveJournal.com</a>. We've extended and expanded upon the codebase, but we remain incredibly thankful to Danga Interactive, Six Apart Ltd, and LiveJournal Inc for their effort over the years.
+
+.title=Open Source
+
diff -r 7d1ada126323 -r b5fcf79b7915 htdocs/stats.bml.text
--- a/htdocs/stats.bml.text Wed Apr 20 22:06:47 2011 +0800
+++ b/htdocs/stats.bml.text Thu Apr 21 03:02:10 2011 +0800
@@ -1,26 +1,25 @@
;; -*- coding: utf-8 -*-
+.age.desc=The age distribution of our users:
.age.header=Age Distribution
-.age.desc=The age distribution of our users:
+.client.desc=How people have updated their journals over the last 30 days:
.client.header=Client Use
-
-.client.desc=How people have updated their journals over the last 30 days:
-
-.demographics.header=Demographics
.demographics.desc.countries=The 15 top countries our users have listed as their homes:
.demographics.desc.states=The 15 top states our users have listed as their homes:
+.demographics.header=Demographics
+
.description=The following statistics may be interesting. For speed, most of this page is only updated every 24 hours. You can also see the <a [[aopts]]>raw data</a>.
-
-.gender.header=Gender
.gender.desc=The gender balance of our users:
.gender.female=Female
+
+.gender.header=Gender
.gender.male=Male
@@ -28,19 +27,21 @@
.gender.unspecified=Unspecified
+.new.desc=The following are the 10 most recently created journals. (It's very likely these users haven't written much in them yet...)
+
.new.header=New Journals
-
-.new.desc=The following are the 10 most recently created journals. (It's very likely these users haven't written much in them yet...)
.notavailable=stat not available
+.recent.desc=The 10 most recently updated journals:
+
.recent.header=Recently Updated
-.recent.desc=The 10 most recently updated journals:
+.title=[[sitenameshort]] Statistics
+
+.users.desc=How many users, and how many of those are active?
.users.header=Users
-
-.users.desc=How many users, and how many of those are active?
.users.total=Total accounts:
@@ -48,12 +49,9 @@
.users.total.everupdate=... that have ever updated:
+.users.total.last24=... updating in the last 24 hours:
+
.users.total.last30=... updating in last 30 days:
.users.total.last7=... updating in the last 7 days:
-.users.total.last24=... updating in the last 24 hours:
-
-.title=[[sitenameshort]] Statistics
-
-
diff -r 7d1ada126323 -r b5fcf79b7915 htdocs/support/actmulti.bml.text
--- a/htdocs/support/actmulti.bml.text Wed Apr 20 22:06:47 2011 +0800
+++ b/htdocs/support/actmulti.bml.text Thu Apr 21 03:02:10 2011 +0800
@@ -7,9 +7,9 @@
.no.request=No request ids were provided to act on.
+.not.have.access=You don't have access to close requests in that category.
+
.not.have.access.move.request=You don't have access to move requests out of this category.
-
-.not.have.access=You don't have access to close requests in that category.
.request.moved=The requests have been moved.
diff -r 7d1ada126323 -r b5fcf79b7915 htdocs/support/append_request.bml.text
--- a/htdocs/support/append_request.bml.text Wed Apr 20 22:06:47 2011 +0800
+++ b/htdocs/support/append_request.bml.text Thu Apr 21 03:02:10 2011 +0800
@@ -31,15 +31,15 @@
.invalid.noanswer=Invalid screened response to approve.
+.invalid.noid=This action requires a support request ID.
+
+.invalid.nosummary=You must enter a request summary.
+
.invalid.notcat=That category doesn't seem to exist.
.invalid.notier=You must select a tier with your answer.
.invalid.notlang=That language doesn't seem to exist.
-
-.invalid.noid=This action requires a support request ID.
-
-.invalid.nosummary=You must enter a request summary.
.invalid.type=Invalid Reply Type.
diff -r 7d1ada126323 -r b5fcf79b7915 htdocs/support/faq.bml.text
--- a/htdocs/support/faq.bml.text Wed Apr 20 22:06:47 2011 +0800
+++ b/htdocs/support/faq.bml.text Thu Apr 21 03:02:10 2011 +0800
@@ -5,9 +5,9 @@
.faq.search.text=If you aren't sure where to start looking, use this box to search our documentation.
+.faq.title=Frequently Asked Questions
+
.faq.title.text=Below are some frequently asked questions, and answers, too! Oh boy. Try to read this before you ask a new question. If you know something we should add to this, let us know.
-
-.faq.title=Frequently Asked Questions
.toc.title=Available Categories
diff -r 7d1ada126323 -r b5fcf79b7915 htdocs/support/faqpop.bml.text
--- a/htdocs/support/faqpop.bml.text Wed Apr 20 22:06:47 2011 +0800
+++ b/htdocs/support/faqpop.bml.text Thu Apr 21 03:02:10 2011 +0800
@@ -1,9 +1,9 @@
;; -*- coding: utf-8 -*-
+.faqpop.back.link=Back to <a [[backlink]]>the support area</a>.
-.faqpop.back.link=Back to <a [[backlink]]>the support area</a>.
+.faqpop.title=Popular FAQs
.faqpop.title.text=The following is a list of what questions people have been interested in during the past week, followed by the number of people that have read the answers:
-.faqpop.title=Popular FAQs
+.head.title=Popular Frequently Asked Questions
-.head.title=Popular Frequently Asked Questions
diff -r 7d1ada126323 -r b5fcf79b7915 htdocs/support/help.bml.text
--- a/htdocs/support/help.bml.text Wed Apr 20 22:06:47 2011 +0800
+++ b/htdocs/support/help.bml.text Thu Apr 21 03:02:10 2011 +0800
@@ -11,11 +11,11 @@
.showonlyhelp=Show only
+.state.closed=Closed
+
.state.closed.text=Below are all support requests that have been recently closed. To return to the open requests, <a [[clickurl]]>click here</a>
.state.closed.title=Recently Closed Support Requests
-
-.state.closed=Closed
.state.else.text=<?p Below are all support requests that are open (they just came in and haven't been touched yet) or answered (either awaiting to be closed by the person needing help, or the person requested they still need help). The <a [[statelink]]>closed reports</a> are also available. If you help somebody out and they confirm you helped them, you get the number of points indicated in the status column. These points will show up on your userinfo page p?>
diff -r 7d1ada126323 -r b5fcf79b7915 htdocs/support/highscores.bml.text
--- a/htdocs/support/highscores.bml.text Wed Apr 20 22:06:47 2011 +0800
+++ b/htdocs/support/highscores.bml.text Thu Apr 21 03:02:10 2011 +0800
@@ -16,3 +16,4 @@
.title.text=The following people have helped other users in the support area:
.warn.support=Support high score data is not available.
+
diff -r 7d1ada126323 -r b5fcf79b7915 htdocs/support/known_issues.bml.text
--- a/htdocs/support/known_issues.bml.text Wed Apr 20 22:06:47 2011 +0800
+++ b/htdocs/support/known_issues.bml.text Thu Apr 21 03:02:10 2011 +0800
@@ -1,3 +1,3 @@
;; -*- coding: utf-8 -*-
+.title=LiveJournal Support Known Issues
-.title=LiveJournal Support Known Issues
diff -r 7d1ada126323 -r b5fcf79b7915 htdocs/support/see_request.bml.text
--- a/htdocs/support/see_request.bml.text Wed Apr 20 22:06:47 2011 +0800
+++ b/htdocs/support/see_request.bml.text Thu Apr 21 03:02:10 2011 +0800
@@ -3,9 +3,9 @@
.answer=Answer
+.answered=<b><span style='color: #ff0000;'>answered</span></b> (awaiting close)
+
.answered.need.help=<b><span style='color: #ff0000;'>answered</span></b> (<b>still needs help</b>)
-
-.answered=<b><span style='color: #ff0000;'>answered</span></b> (awaiting close)
.approve.screened=Approve Screened Response
@@ -37,15 +37,15 @@
.diagnostics=Diagnostics
+.email.user=Email/User:
+
.email.validated=email validated?
-.email.user=Email/User:
+.error=Error
.error.text1=You do not appear to have permission to read any support categories.
.error.text2=<?p No [[what]] open request [[cat]] found. p?>
-
-.error=Error
.faq=FAQ
@@ -83,16 +83,15 @@
.next=next
+.no=no
+
.no.html.allowed=No HTML allowed, so don't worry about about escaping < and ><br />URLs are automatically link-ified, so just reference those.
-.no=no
+.none=none
.not.have.access=Sorry, you do not have access to answer people's support requests in this category.
.nothaveprivilege=You don't have the necessary privilege to view this request.
-
-.none=none
-
.open=open
@@ -136,15 +135,17 @@
.status=Status
+.status.deleted.and.purged=Status: <b>deleted and purged</b>
+
.statushistory=statushistory
-
-.status.deleted.and.purged=Status: <b>deleted and purged</b>
.style=style
.summary=Summary
.supportcategory=Support category
+
+.take.out.of.queue=Take out of Queue:
.tier=Tier:
@@ -166,13 +167,13 @@
.transitioning=<b>transitioning</b> (used to be validated, but changed email addresses and hasn't reconfirmed)
-.take.out.of.queue=Take out of Queue:
-
.unable.connect=(unable to connect to cluster, some data temporarily unavailable)
-.uniquecookie=unique cookie
+.underage=underage
.uniq=Uniq:
+
+.uniquecookie=unique cookie
.unknown=Unknown
diff -r 7d1ada126323 -r b5fcf79b7915 htdocs/support/stock_answers.bml.text
--- a/htdocs/support/stock_answers.bml.text Wed Apr 20 22:06:47 2011 +0800
+++ b/htdocs/support/stock_answers.bml.text Thu Apr 21 03:02:10 2011 +0800
@@ -11,6 +11,8 @@
.changes.saved=Changes saved!
+.confirm.answer=Are you sure you want to delete this stock answer?
+
.delete.answer=Delete Answer
.error=Error
@@ -23,17 +25,17 @@
.last.modified.by=Last modified by
+.no.answer=No answer was found to delete?
+
.no.answer.id=No answer id provided.
-
-.no.answer=No answer was found to delete?
.no.database.available=No database available.
.not.have.access.to.actions=You do not have access to perform actions here.
+.not.have.access.to.view.answers=You do not have access to view any stock answers.
+
.not.have.access.to.view.answers.in.cat=You do not have access to view stock answers in that category.
-
-.not.have.access.to.view.answers=You do not have access to view any stock answers.
.save_changes=Save Changes
@@ -49,5 +51,3 @@
.view.all=View All
-.confirm.answer=Are you sure you want to delete this stock answer?
-
diff -r 7d1ada126323 -r b5fcf79b7915 htdocs/talkpost.bml.text
--- a/htdocs/talkpost.bml.text Wed Apr 20 22:06:47 2011 +0800
+++ b/htdocs/talkpost.bml.text Thu Apr 21 03:02:10 2011 +0800
@@ -25,6 +25,8 @@
.label.picturetouse2=<a [[aopts]]>Picture</a> to use:
+.linkstripped=Links will be displayed as unclickable URLs to help prevent spam.
+
.loganonip=<b>Notice!</b> This user has turned on the option that logs IP addresses of anonymous posters.
.loginq=Login?
@@ -36,8 +38,6 @@
.noedithtml=No HTML allowed in reason for edit
.nosubjecthtml=No HTML allowed in subject
-
-.linkstripped=Links will be displayed as unclickable URLs to help prevent spam.
.opt.anonymous=Anonymous
@@ -55,8 +55,6 @@
.opt.loggedin=<b>Logged in user:</b> [[username]]
-.opt.openidsignin=- OpenID commenting on this post is limited. Please sign in <a [[aopts]]>here</a>.
-
.opt.membersonly=- this community only allows commenting by members. You may comment here if you are a member of [[username]].
.opt.message=Message:
@@ -70,6 +68,8 @@
.opt.noimage=No Image
.opt.noopenidpost=- you must <a [[aopts1]]>set</a> and <a [[aopts2]]>validate</a> your email address in order to comment.
+
+.opt.openidsignin=- OpenID commenting on this post is limited. Please sign in <a [[aopts]]>here</a>.
.opt.preview=Preview
diff -r 7d1ada126323 -r b5fcf79b7915 htdocs/talkpost_do.bml.text
--- a/htdocs/talkpost_do.bml.text Wed Apr 20 22:06:47 2011 +0800
+++ b/htdocs/talkpost_do.bml.text Thu Apr 21 03:02:10 2011 +0800
@@ -1,5 +1,4 @@
;; -*- coding: utf-8 -*-
-
.error.badpassword2=Incorrect password given for the username specified. You can recover your password <a [[aopts]]>here</a> if you've forgotten it.
.error.badusername2=The [[sitename]] username you specified does not exist. You can recover your username <a [[aopts]]>here</a> if you've forgotten it, or you may post as "Anonymous" instead.
@@ -16,8 +15,6 @@
.error.invalidform=Invalid form submission. You may have left the reply form open too long, or logged out since you opened the page. Please try posting again.
-.error.membersonly=Only members of [[user]] can post in this community.
-
.error.lostcookie=Your login cookie seems to have disappeared?
.error.manybytes=Sorry, but your comment of [[current]] exceeds the maximum byte length of [[limit]]. Please go back, shorten it, and try posting it again.
@@ -26,15 +23,17 @@
.error.maxcomments=Sorry, this entry already has the maximum number of comments allowed.
+.error.membersonly=Only members of [[user]] can post in this community.
+
.error.mustlogin=You must be logged in or using a username/password to reply to this protected entry.
.error.noanon=You can't post anonymously in this person's journal.
.error.noauth=You are not authorized to reply to this protected entry.
+.error.nocomments=User has disabled commenting on this journal entry.
+
.error.noopenid=OpenID users are not authorized to reply to this entry.
-
-.error.nocomments=User has disabled commenting on this journal entry.
.error.noparent=Cannot reply to a non-existent comment.
@@ -84,15 +83,15 @@
.success.screened.comm.anon2=Your anonymous comment has been added. According to this community's settings, it was marked as screened, and will be visible only to the community maintainers until they choose to unscreen it. You can go back to the comment thread <a [[aopts]]>here</a>.
+.success.screened.comm.owncomm=Your comment has been added. According to this community's settings, it was marked as screened, and will be visible only to you and any other community admins until one of you chooses to unscreen it. You can view your comment <a [[aopts]]>here</a>.
+
.success.screened.comm2=Your comment has been added. According to this community's settings, it was marked as screened, and will be visible only to you and the community maintainers until they choose to unscreen it. You can view your comment <a [[aopts]]>here</a>.
-
-.success.screened.comm.owncomm=Your comment has been added. According to this community's settings, it was marked as screened, and will be visible only to you and any other community admins until one of you chooses to unscreen it. You can view your comment <a [[aopts]]>here</a>.
.success.screened.user.anon2=Your anonymous comment has been added. According to this journal's settings, it was marked as screened, and will be visible only to the journal's owner until the owner chooses to unscreen it. You can go back to the comment thread <a [[aopts]]>here</a>.
+.success.screened.user.ownjournal=Your comment has been added. According to this journal's settings, it was marked as screened, and will be visible only to you until you choose to unscreen it. You can view your comment <a [[aopts]]>here</a>.
+
.success.screened.user2=Your comment has been added. According to this journal's settings, it was marked as screened, and will be visible only to you and the journal's owner until the owner chooses to unscreen it. You can view your comment <a [[aopts]]>here</a>.
-
-.success.screened.user.ownjournal=Your comment has been added. According to this journal's settings, it was marked as screened, and will be visible only to you until you choose to unscreen it. You can view your comment <a [[aopts]]>here</a>.
.success.title=Success
diff -r 7d1ada126323 -r b5fcf79b7915 htdocs/talkread.bml.text
--- a/htdocs/talkread.bml.text Wed Apr 20 22:06:47 2011 +0800
+++ b/htdocs/talkread.bml.text Thu Apr 21 03:02:10 2011 +0800
@@ -5,9 +5,9 @@
.button.post=Post Comment
+.comment.screened.subject=(screened)
+
.confirm.action=Are you sure you wish to delete the selected comments?
-
-.comment.screened.subject=(screened)
.deletedpost=<b>(Deleted post)</b>
@@ -15,9 +15,9 @@
.edittime=Edited [[editreason]] [[edittime]]
+.fromip=(from [[ip]])
+
.from_external=(from [[site]])
-
-.fromip=(from [[ip]])
.noreplies=No replies
diff -r 7d1ada126323 -r b5fcf79b7915 htdocs/tools/endpoints/extacct_auth.bml.text
--- a/htdocs/tools/endpoints/extacct_auth.bml.text Wed Apr 20 22:06:47 2011 +0800
+++ b/htdocs/tools/endpoints/extacct_auth.bml.text Thu Apr 21 03:02:10 2011 +0800
@@ -1,5 +1,4 @@
;; -*- coding: utf-8 -*-
-
.error.authfailed=Failed to connect to [[account]]
.error.nochallenge=[[account]] does not support challenge/response authentication.
diff -r 7d1ada126323 -r b5fcf79b7915 htdocs/tools/importer.bml.text
--- a/htdocs/tools/importer.bml.text Wed Apr 20 22:06:47 2011 +0800
+++ b/htdocs/tools/importer.bml.text Thu Apr 21 03:02:10 2011 +0800
@@ -1,7 +1,7 @@
;; -*- coding: utf-8 -*-
-
.error.notperson=You must be logged in to a personal account (not OpenID) in order to import content into it.
.intro=This wizard will allow you to import content from LiveJournal or another LiveJournal-based site into your [[sitename]] account [[user]]. This process is not immediate; you will be entered into a queue once you schedule your import. Imports will be processed in the order that they are scheduled.
.title=Import Content Into Your Journal
+
diff -r 7d1ada126323 -r b5fcf79b7915 htdocs/tools/memadd.bml.text
--- a/htdocs/tools/memadd.bml.text Wed Apr 20 22:06:47 2011 +0800
+++ b/htdocs/tools/memadd.bml.text Thu Apr 21 03:02:10 2011 +0800
@@ -6,8 +6,6 @@
.body.added.header=Success
-.body.added.text=Your list of memorable entries has been updated.
-
.body.added.next.entry=Go back to the entry
.body.added.next.friends=Read your Friends page
@@ -15,6 +13,8 @@
.body.added.next.journal=Continue reading [[user]]
.body.added.next.view=View all your memories
+
+.body.added.text=Your list of memorable entries has been updated.
.description=Description:
diff -r 7d1ada126323 -r b5fcf79b7915 htdocs/tools/popsubscriptions.bml.text
--- a/htdocs/tools/popsubscriptions.bml.text Wed Apr 20 22:06:47 2011 +0800
+++ b/htdocs/tools/popsubscriptions.bml.text Thu Apr 21 03:02:10 2011 +0800
@@ -1,3 +1,4 @@
+;; -*- coding: utf-8 -*-
.communities.intro=These are the most popular community accounts in your circle:
.disabled=This feature is not available on this service.
@@ -37,3 +38,4 @@
.results.personal=These are the most popular personal accounts in your circle:
.title=Popular With Circle
+
diff -r 7d1ada126323 -r b5fcf79b7915 htdocs/tools/recent_comments.bml.text
--- a/htdocs/tools/recent_comments.bml.text Wed Apr 20 22:06:47 2011 +0800
+++ b/htdocs/tools/recent_comments.bml.text Thu Apr 21 03:02:10 2011 +0800
@@ -1,12 +1,11 @@
;; -*- coding: utf-8 -*-
+.anonymous=Anonymous
-.anonymous=Anonymous
+.comment=Comment
.comment.deleted=Comment Deleted
.comment.link=Comment Link
-
-.comment=Comment
.comments=Comments
@@ -18,9 +17,9 @@
.edit.link=edit
+.entry=Entry
+
.entry.link=Entry Link
-
-.entry=Entry
.last.num.posted.by=Last [[num]] comments [[user]] has posted
@@ -48,4 +47,3 @@
.view.latest=View Latest
-
diff -r 7d1ada126323 -r b5fcf79b7915 htdocs/tools/search.bml.text
--- a/htdocs/tools/search.bml.text Wed Apr 20 22:06:47 2011 +0800
+++ b/htdocs/tools/search.bml.text Thu Apr 21 03:02:10 2011 +0800
@@ -1,16 +1,17 @@
;; -*- coding: utf-8 -*-
+.commsearch=<a [[aopts]]>Community Search</a>
+
.commsearch.desc=Search for communities.
-.commsearch=<a [[aopts]]>Community Search</a>
+.directory=<a [[aopts]]>Directory Search</a>
.directory.desc=Search for users.
-.directory=<a [[aopts]]>Directory Search</a>
+.intro=Search [[sitename]] using the box below, or use one of our advanced search options.
-.intro=Search [[sitename]] using the box below, or use one of our advanced search options.
+.journal=<a [[aopts]]>Journal Search</a>
.journal.desc=Search your journal. (This feature requires a <a [[aopts]]>paid account</a>.)
-.journal=<a [[aopts]]>Journal Search</a>
+.title=Search [[sitename]]
-.title=Search [[sitename]]
diff -r 7d1ada126323 -r b5fcf79b7915 htdocs/tools/tellafriend.bml.text
--- a/htdocs/tools/tellafriend.bml.text Wed Apr 20 22:06:47 2011 +0800
+++ b/htdocs/tools/tellafriend.bml.text Thu Apr 21 03:02:10 2011 +0800
@@ -1,3 +1,4 @@
+;; -*- coding: utf-8 -*-
.email.body<<
Hi,
@@ -70,11 +71,11 @@ Check out my journal that I'm keeping on
.error.noemail=No email addresses found.
+.error.unknownjournal=Unknown journal
+
.errorpage.body=[[errormessage]]
.errorpage.title=Error
-
-.error.unknownjournal=Unknown journal
.invalidemailpage.body=Your current email address [[emailaddress]] isn't validated, so we can't let you use the "Tell a Friend" feature. To validate your email address, <a href="[[siteroot]]/register.bml">have the confirmation email resent</a>, and then follow the instructions in it when you get it.
@@ -90,4 +91,5 @@ Check out my journal that I'm keeping on
.title=Tell a Friend!
-.via= via
\ No newline at end of file
+.via= via
+
diff -r 7d1ada126323 -r b5fcf79b7915 htdocs/tools/textmessage.bml.text
--- a/htdocs/tools/textmessage.bml.text Wed Apr 20 22:06:47 2011 +0800
+++ b/htdocs/tools/textmessage.bml.text Thu Apr 21 03:02:10 2011 +0800
@@ -5,19 +5,17 @@
.enter.user.submit=Proceed...
-.enter.user.text=The following text messaging service providers are supported.
+.enter.user.text2=Enter the LiveJournal username of the person you'd like to send a text message to:
-.enter.user.text2=Enter the LiveJournal username of the person you'd like to send a text message to:
+.error.banned.head=Banned
+
+.error.banned.text=[[user]] has banned you from sending them text messages.
.error.notloggedin.head=Not logged in
.error.notloggedin.notfriend=and be listed as their friend
.error.notloggedin.text=To send a text message to this user, you must be <a [[aopts]]>logged in</a>[[andbefriend]].
-
-.error.banned.head=Banned
-
-.error.banned.text=[[user]] has banned you from sending them text messages.
.error.unauthorized.head=Unauthorized
diff -r 7d1ada126323 -r b5fcf79b7915 htdocs/update.bml.text
--- a/htdocs/update.bml.text Wed Apr 20 22:06:47 2011 +0800
+++ b/htdocs/update.bml.text Thu Apr 21 03:02:10 2011 +0800
@@ -121,9 +121,9 @@
.timeformat=24 hour time
+.title.readonly=Read-only mode
+
.title2=Post an Entry
-
-.title.readonly=Read-only mode
.update.head=Update your Journal...
diff -r 7d1ada126323 -r b5fcf79b7915 views/admin/eventoutput-select.tt.text
--- a/views/admin/eventoutput-select.tt.text Wed Apr 20 22:06:47 2011 +0800
+++ b/views/admin/eventoutput-select.tt.text Thu Apr 21 03:02:10 2011 +0800
@@ -1,4 +1,6 @@
+;; -*- coding: utf-8 -*-
.admin.link=Event / Notification Output
+
.admin.text=Quick overview of an event in various output formats.
.form.label.arg1=First Argument
@@ -14,3 +16,4 @@
.form.optional=(optional)
.title=Select Event to Preview
+
diff -r 7d1ada126323 -r b5fcf79b7915 views/admin/index.tt.text
--- a/views/admin/index.tt.text Wed Apr 20 22:06:47 2011 +0800
+++ b/views/admin/index.tt.text Thu Apr 21 03:02:10 2011 +0800
@@ -1,100 +1,123 @@
;; -*- coding: utf-8 -*-
+.admin.capability.link=Capability Edit
+
+.admin.capability.text=For editing user capabilities.
+
+.admin.cluster.link=Cluster Status
+
+.admin.cluster.text=Get information on cluster availability.
+
+.admin.console.link=Console
+
+.admin.console.text=For general input; usable by all users to an extent.
+
+.admin.dbschema.link=Database Schema
+
+.admin.dbschema.text=Shows the database schema.
+
+.admin.dupkiller.link=Duplicate Entry Killer
+
+.admin.dupkiller.text=Checks for (and kills) duplicate entries.
+
+.admin.entryprops.link=Entry Properties
+
+.admin.entryprops.text=View the properties set on a particular entry.
+
+.admin.faq.link=FAQ Tools
+
+.admin.faq.text=Allows you to manipulate the FAQ.
+
+.admin.file_edit.link=File Edit
+
+.admin.file_edit.text=Allows you to edit various include files.
+
+.admin.invites.link=Invite Code Management
+
+.admin.invites.text=View and manage invite codes.
+
+.admin.logout_user.link=Logout User
+
+.admin.logout_user.text=Logs a user out of the site.
+
+.admin.memcache.link=Memcache Overview
+
+.admin.memcache.text=Shows current memcache conditions.
+
+.admin.memcache_view.link=Memcache View
+
+.admin.memcache_view.text=Shows current memcache details.
+
+.admin.mysql.link=MySQL Status
+
+.admin.mysql.text=Shows current MySQL status.
+
+.admin.navtag.link=Navtag Edit
+
+.admin.navtag.text=Allows you to tag pages for navigation.
+
+.admin.pay.link=Payment Managements
+
+.admin.pay.text=Review payment details.
+
+.admin.priv.link=Privilege Management
+
+.admin.priv.text=View privs by priv or by user. Some priv lists are private.
+
+.admin.propedit.link=User Property Edit
+
+.admin.propedit.text=Allows you to view and edit userprops.
+
+.admin.recent_comments.link=Recent Comments
+
+.admin.recent_comments.text=Allows you to view a user's recent comments.
+
+.admin.sitemessages_add.link=Site Messages - Add
+
+.admin.sitemessages_add.text=Add new site-wide messages.
+
+.admin.sitemessages_manage.link=Site Messages - Manage
+
+.admin.sitemessages_manage.text=View and manipulate site-wide messages.
+
+.admin.spamreports.link=Spam Reports
+
+.admin.spamreports.text=View and handle reports of spam.
+
+.admin.statushistory.link=Statushistory
+
+.admin.statushistory.text=Shows you a user's statushistory.
+
+.admin.styleinfo.link=Style Info
+
+.admin.styleinfo.text=Shows you a user's style information.
+
+.admin.sysban.link=Sysban Management
+
+.admin.sysban.text=Set and manage sysbans.
+
+.admin.theschwartz.link=TheSchwartz Queue/Error Viewer
+
+.admin.theschwartz.text=View the status of jobs in the TheSchwartz queue.
.admin.title=Admin Tools
-.admin.capability.link=Capability Edit
-.admin.capability.text=For editing user capabilities.
+.admin.translate.link=Translation & Site Copy
-.admin.cluster.link=Cluster Status
-.admin.cluster.text=Get information on cluster availability.
-
-.admin.console.link=Console
-.admin.console.text=For general input; usable by all users to an extent.
-
-.admin.dbschema.link=Database Schema
-.admin.dbschema.text=Shows the database schema.
-
-.admin.dupkiller.link=Duplicate Entry Killer
-.admin.dupkiller.text=Checks for (and kills) duplicate entries.
-
-.admin.entryprops.link=Entry Properties
-.admin.entryprops.text=View the properties set on a particular entry.
-
-.admin.faq.link=FAQ Tools
-.admin.faq.text=Allows you to manipulate the FAQ.
-
-.admin.file_edit.link=File Edit
-.admin.file_edit.text=Allows you to edit various include files.
-
-.admin.invites.link=Invite Code Management
-.admin.invites.text=View and manage invite codes.
-
-.admin.logout_user.link=Logout User
-.admin.logout_user.text=Logs a user out of the site.
-
-.admin.memcache.link=Memcache Overview
-.admin.memcache.text=Shows current memcache conditions.
-
-.admin.memcache_view.link=Memcache View
-.admin.memcache_view.text=Shows current memcache details.
-
-.admin.mysql.link=MySQL Status
-.admin.mysql.text=Shows current MySQL status.
-
-.admin.navtag.link=Navtag Edit
-.admin.navtag.text=Allows you to tag pages for navigation.
-
-.admin.pay.link=Payment Managements
-.admin.pay.text=Review payment details.
-
-.admin.priv.link=Privilege Management
-.admin.priv.text=View privs by priv or by user. Some priv lists are private.
-
-.admin.propedit.link=User Property Edit
-.admin.propedit.text=Allows you to view and edit userprops.
-
-.admin.recent_comments.link=Recent Comments
-.admin.recent_comments.text=Allows you to view a user's recent comments.
-
-.admin.sitemessages_add.link=Site Messages - Add
-.admin.sitemessages_add.text=Add new site-wide messages.
-
-.admin.sitemessages_manage.link=Site Messages - Manage
-.admin.sitemessages_manage.text=View and manipulate site-wide messages.
-
-.admin.spamreports.link=Spam Reports
-.admin.spamreports.text=View and handle reports of spam.
-
-.admin.statushistory.link=Statushistory
-.admin.statushistory.text=Shows you a user's statushistory.
-
-.admin.styleinfo.link=Style Info
-.admin.styleinfo.text=Shows you a user's style information.
-
-.admin.sysban.link=Sysban Management
-.admin.sysban.text=Set and manage sysbans.
-
-.admin.theschwartz.link=TheSchwartz Queue/Error Viewer
-.admin.theschwartz.text=View the status of jobs in the TheSchwartz queue.
-
-.admin.translate.link=Translation & Site Copy
.admin.translate.text=View and edit the site copy and translations.
.admin.userlog.link=Userlog Viewer
+
.admin.userlog.text=Shows you a user's logged actions.
.admin.vgifts.link=Virtual Gifts
+
.admin.vgifts.text=Maintain the virtual gift shop and submit new gift ideas.
.anysupportpriv=any support priv
+
.devserver=dev server
.needspriv=needs
+
.needs_one_of=needs one of
-
-
-
-
-
-
diff -r 7d1ada126323 -r b5fcf79b7915 views/admin/memcache_clear.tt.text
--- a/views/admin/memcache_clear.tt.text Wed Apr 20 22:06:47 2011 +0800
+++ b/views/admin/memcache_clear.tt.text Thu Apr 21 03:02:10 2011 +0800
@@ -1,14 +1,17 @@
;; -*- coding: utf-8 -*-
+.admin.link=Memcache Clear
-.admin.link=Memcache Clear
.admin.text=Clear memcache data for a user.
.cleared=Memcache data cleared.
+.purge.all=All (Major Memcache)
+
+.purge.btn=Clear for User
+
+.purge.userpic=Userpic
+
.username.label=Username:
+
.what.label=Purge:
-.purge.all=All (Major Memcache)
-.purge.userpic=Userpic
-
-.purge.btn=Clear for User
diff -r 7d1ada126323 -r b5fcf79b7915 views/admin/rename.tt.text
--- a/views/admin/rename.tt.text Wed Apr 20 22:06:47 2011 +0800
+++ b/views/admin/rename.tt.text Thu Apr 21 03:02:10 2011 +0800
@@ -1,6 +1,6 @@
;; -*- coding: utf-8 -*-
+.admin.link=Renames
-.admin.link=Renames
.admin.text=Manage renames
.new.link=Create Rename
@@ -10,3 +10,4 @@
.renames.list.item.details=More / edit
.title=Renames Admin Page
+
diff -r 7d1ada126323 -r b5fcf79b7915 views/admin/rename_edit.tt.text
--- a/views/admin/rename_edit.tt.text Wed Apr 20 22:06:47 2011 +0800
+++ b/views/admin/rename_edit.tt.text Thu Apr 21 03:02:10 2011 +0800
@@ -1,5 +1,5 @@
;; -*- coding: utf-8 -*-
-
.form.rename.header=Options chosen
.title=Renames Admin Page
+
diff -r 7d1ada126323 -r b5fcf79b7915 views/admin/stats.tt.text
--- a/views/admin/stats.tt.text Wed Apr 20 22:06:47 2011 +0800
+++ b/views/admin/stats.tt.text Thu Apr 21 03:02:10 2011 +0800
@@ -1,6 +1,6 @@
;; -*- coding: utf-8 -*-
+.admin.link=Business Statistics
-.admin.link=Business Statistics
.admin.text=Detailed breakdown of business statistics
.title=Business Statistics
diff -r 7d1ada126323 -r b5fcf79b7915 views/admin/themes/category.tt.text
--- a/views/admin/themes/category.tt.text Wed Apr 20 22:06:47 2011 +0800
+++ b/views/admin/themes/category.tt.text Thu Apr 21 03:02:10 2011 +0800
@@ -1,12 +1,11 @@
;; -*- coding: utf-8 -*-
-
.back.link=<< Back
.commit_all=Commit All
+.delete=Delete
+
.delete.note=( Clear all and commit to be able to delete )
-
-.delete=Delete
.filter.act.all=All
@@ -23,3 +22,4 @@
.visible.check=Check Visible
.visible.clear=Clear Visible
+
diff -r 7d1ada126323 -r b5fcf79b7915 views/admin/themes/index.tt.text
--- a/views/admin/themes/index.tt.text Wed Apr 20 22:06:47 2011 +0800
+++ b/views/admin/themes/index.tt.text Thu Apr 21 03:02:10 2011 +0800
@@ -1,13 +1,17 @@
;; -*- coding: utf-8 -*-
+.add_category.btn=Add / Edit
-.add_category.btn=Add / Edit
.add_category.label=Add Category:
.admin.link=Theme Metadata
+
.admin.text=Manage theme metadata ( categories )
.edit_category.btn=Edit
+
.edit_category.label=Edit Category:
.edit_theme.btn=Edit
+
.edit_theme.label=Edit Theme:
+
diff -r 7d1ada126323 -r b5fcf79b7915 views/admin/themes/theme.tt.text
--- a/views/admin/themes/theme.tt.text Wed Apr 20 22:06:47 2011 +0800
+++ b/views/admin/themes/theme.tt.text Thu Apr 21 03:02:10 2011 +0800
@@ -1,5 +1,4 @@
;; -*- coding: utf-8 -*-
-
.add.hint=( comma seperated )
.add.label=Add Categories:
@@ -23,7 +22,10 @@
.remove.na=N/A
.source=Source
+
.source.layer=Layer
+
.source.theme=Theme
.title=Edit Metadata: [[layout]]/[[theme]]
+
diff -r 7d1ada126323 -r b5fcf79b7915 views/dev/classes.tt.text
--- a/views/dev/classes.tt.text Wed Apr 20 22:06:47 2011 +0800
+++ b/views/dev/classes.tt.text Thu Apr 21 03:02:10 2011 +0800
@@ -1,2 +1,3 @@
+;; -*- coding: utf-8 -*-
.title=Elements and CSS Classes used in Site Pages
diff -r 7d1ada126323 -r b5fcf79b7915 views/interests/add.tt.text
--- a/views/interests/add.tt.text Wed Apr 20 22:06:47 2011 +0800
+++ b/views/interests/add.tt.text Thu Apr 21 03:02:10 2011 +0800
@@ -1,9 +1,9 @@
;; -*- coding: utf-8 -*-
-.add.added.head=Added.
-
.add.added.editinterests=Edit your interests
.add.added.editprofile=Edit your profile
+
+.add.added.head=Added.
.add.added.interestspage=Return to the Interests page
@@ -18,3 +18,4 @@
.add.confirm.text=To add <strong>[[interest]]</strong> as an interest, click the button below.
.title=Interests
+
diff -r 7d1ada126323 -r b5fcf79b7915 views/interests/enmasse.tt.text
--- a/views/interests/enmasse.tt.text Wed Apr 20 22:06:47 2011 +0800
+++ b/views/interests/enmasse.tt.text Thu Apr 21 03:02:10 2011 +0800
@@ -25,3 +25,4 @@ When you're done, save your changes.
.finished.save_button=Save Changes
.title=Interests
+
diff -r 7d1ada126323 -r b5fcf79b7915 views/interests/enmasse_do.tt.text
--- a/views/interests/enmasse_do.tt.text Wed Apr 20 22:06:47 2011 +0800
+++ b/views/interests/enmasse_do.tt.text Thu Apr 21 03:02:10 2011 +0800
@@ -6,3 +6,4 @@
.results.message2=Return to your revised <a [[aopts]]>profile page</a>.
.title=Interests
+
diff -r 7d1ada126323 -r b5fcf79b7915 views/interests/findsim.tt.text
--- a/views/interests/findsim.tt.text Wed Apr 20 22:06:47 2011 +0800
+++ b/views/interests/findsim.tt.text Thu Apr 21 03:02:10 2011 +0800
@@ -20,3 +20,4 @@
.text=The following accounts have interests closely related to those of [[user]]:
.title=Interests
+
diff -r 7d1ada126323 -r b5fcf79b7915 views/interests/index.tt.text
--- a/views/interests/index.tt.text Wed Apr 20 22:06:47 2011 +0800
+++ b/views/interests/index.tt.text Thu Apr 21 03:02:10 2011 +0800
@@ -8,3 +8,4 @@
.nointerests.text2=If you don't have any interests listed, you can add some by going to the <a [[aopts]]>Edit Personal Information</a> page.
.title=Interests
+
diff -r 7d1ada126323 -r b5fcf79b7915 views/interests/int.tt.text
--- a/views/interests/int.tt.text Wed Apr 20 22:06:47 2011 +0800
+++ b/views/interests/int.tt.text Thu Apr 21 03:02:10 2011 +0800
@@ -3,15 +3,15 @@
.filtered=[[num]] [[?num|match|matches]], showing [[count]] [[?count|result|results]]:
-.filterlink.C=Communities Only
+.filterlink.c=Communities Only
-.filterlink.I=OpenIDs Only
+.filterlink.i=OpenIDs Only
.filterlink.label=Show:
.filterlink.none=All Account Types
-.filterlink.P=Users Only
+.filterlink.p=Users Only
.header=Search results for "[[interest]]"
diff -r 7d1ada126323 -r b5fcf79b7915 views/interests/popular.tt.text
--- a/views/interests/popular.tt.text Wed Apr 20 22:06:47 2011 +0800
+++ b/views/interests/popular.tt.text Thu Apr 21 03:02:10 2011 +0800
@@ -12,3 +12,4 @@
.popular.textmode=<a [[aopts]]>View as a table</a>.
.title=Interests
+
diff -r 7d1ada126323 -r b5fcf79b7915 views/latest/mood.tt.text
--- a/views/latest/mood.tt.text Wed Apr 20 22:06:47 2011 +0800
+++ b/views/latest/mood.tt.text Thu Apr 21 03:02:10 2011 +0800
@@ -1,5 +1,4 @@
;; -*- coding: utf-8 -*-
-
.alt.happy=happy
.alt.indicator=[[score]] out of [[top]]
@@ -17,3 +16,4 @@
.no_data=There is currently no current mood to display. Please check later.
.title=Mood of Service
+
diff -r 7d1ada126323 -r b5fcf79b7915 views/legal/index.tt.text
--- a/views/legal/index.tt.text Wed Apr 20 22:06:47 2011 +0800
+++ b/views/legal/index.tt.text Thu Apr 21 03:02:10 2011 +0800
@@ -1,19 +1,18 @@
;; -*- coding: utf-8 -*-
-
-.privacy-header=Privacy Policy
-
.privacy<<
The Privacy Policy explains what information we collect from our users
and how we use that information. It also includes our COPPA (Children's
Online Privacy Protection Act) statement.
.
+.privacy-header=Privacy Policy
+
.title=[[sitename]] Legal Documents
-
-.tos-header=Terms of Service
.tos<<
The Terms of Service explain our usage policies, including instructions
on how to report abuse of the site.
.
+.tos-header=Terms of Service
+
diff -r 7d1ada126323 -r b5fcf79b7915 views/login.tt.text
--- a/views/login.tt.text Wed Apr 20 22:06:47 2011 +0800
+++ b/views/login.tt.text Thu Apr 21 03:02:10 2011 +0800
@@ -1,7 +1,7 @@
;; -*- coding: utf-8 -*-
+.createaccount.button=Create an Account
+
.createaccount.header=Not a [[sitename]] member?
-
-.createaccount.button=Create an Account
.createaccount.whylogin.benefit1=Read Access List and filtered entries that you have access to.
diff -r 7d1ada126323 -r b5fcf79b7915 views/misc/whereami.tt.text
--- a/views/misc/whereami.tt.text Wed Apr 20 22:06:47 2011 +0800
+++ b/views/misc/whereami.tt.text Thu Apr 21 03:02:10 2011 +0800
@@ -1,5 +1,4 @@
;; -*- coding: utf-8 -*-
-
.cluster=[[user]] is located on the <strong>[[cluster]]</strong>.
.cluster.unknown=Unnamed Cluster
@@ -7,3 +6,4 @@
.intro=This site is made up of clusters of servers that store user data. Each of these clusters can contain many tens or hundreds of thousands of different users and communities.
.title=Cluster Locator
+
diff -r 7d1ada126323 -r b5fcf79b7915 views/nav.tt.text
--- a/views/nav.tt.text Wed Apr 20 22:06:47 2011 +0800
+++ b/views/nav.tt.text Thu Apr 21 03:02:10 2011 +0800
@@ -1,7 +1,7 @@
;; -*- coding: utf-8 -*-
-
.error.invalidcat=The navigation category that you specified is invalid.
.error.nocat=You did not specify a navigation category.
.title=Navigation
+
diff -r 7d1ada126323 -r b5fcf79b7915 views/protected.tt.text
--- a/views/protected.tt.text Wed Apr 20 22:06:47 2011 +0800
+++ b/views/protected.tt.text Thu Apr 21 03:02:10 2011 +0800
@@ -1,5 +1,4 @@
;; -*- coding: utf-8 -*-
-
.message.comment.posted=Comment was posted successfully.
.protected.error.notauthorised.comm.closed=This protected entry is viewable by community members only. Membership to this community is closed.
diff -r 7d1ada126323 -r b5fcf79b7915 views/rename.tt.text
--- a/views/rename.tt.text Wed Apr 20 22:06:47 2011 +0800
+++ b/views/rename.tt.text Thu Apr 21 03:02:10 2011 +0800
@@ -1,5 +1,4 @@
;; -*- coding: utf-8 -*-
-
.checkusername.intro=Input your desired username, to check whether it is available for renaming to.
.checkusername.label=Desired username
@@ -10,6 +9,10 @@
.checkusername.submit=Check Username Availability
+.error.emailnoalias=The email alias feature is not available to your current account level.
+
+.error.emailnotforward=You cannot forward emails sent to your [[emaildomain]] address to your new username, because you have not chosen to redirect your old username to your new one.
+
.error.header=Unable to perform rename. Please correct the following and try again:
.error.invalidform=There was a problem with processing the form: the page may have been left open too long. Please try submitting the form again.
@@ -18,13 +21,15 @@
.error.noredirectopt=You need to choose whether to forward your old username to your new username, or else to drop the connection.
-.error.emailnoalias=The email alias feature is not available to your current account level.
+.form.others.email=Redirect emails sent to your old [[sitename]] email address
-.error.emailnotforward=You cannot forward emails sent to your [[emaildomain]] address to your new username, because you have not chosen to redirect your old username to your new one.
+.form.others.email.note=your old username must also redirect to your desired username
+
+.form.others.header=Others
+
+.form.relationships.communities=Keep community memberships and administration roles
.form.relationships.header=Relationships
-
-.form.relationships.communities=Keep community memberships and administration roles
.form.relationships.trusted=Keep outgoing access (people you have granted access to)
@@ -34,37 +39,29 @@
.form.relationships.watched_by=Keep incoming subscriptions (people who are subscribed to you)
+.form.rename.disconnect.label.c=Disconnect the old username from the new username, leaving the old username free to use
-.form.others.header=Others
+.form.rename.disconnect.label.p=Disconnect your old username from your new username, leaving the old username free to use
-.form.others.email=Redirect emails sent to your old [[sitename]] email address
+.form.rename.disconnect.note.c=[[journalurl]] will not point to the new username.
-.form.others.email.note=your old username must also redirect to your desired username
+.form.rename.disconnect.note.p=[[journalurl]] will not point to your new username; comments and community entries that you posted will still show your new username.
+.form.rename.forward.label.c=Forward your community's old username to the new username
+
+.form.rename.forward.label.p=Forward your old username to your new username
+
+.form.rename.forward.note.c=[[journalurl]] will automatically redirect to your community's new username.
+
+.form.rename.forward.note.p=[[journalurl]] will automatically redirect to your new username.
+
+.form.rename.fromuser.label=Rename from
.form.rename.header=Rename
-.form.rename.disconnect.label.C=Disconnect the old username from the new username, leaving the old username free to use
+.form.rename.oldusername.header.c=What do you want to do with your community's old username?
-.form.rename.disconnect.label.P=Disconnect your old username from your new username, leaving the old username free to use
-
-.form.rename.disconnect.note.C=[[journalurl]] will not point to the new username.
-
-.form.rename.disconnect.note.P=[[journalurl]] will not point to your new username; comments and community entries that you posted will still show your new username.
-
-.form.rename.forward.label.C=Forward your community's old username to the new username
-
-.form.rename.forward.label.P=Forward your old username to your new username
-
-.form.rename.forward.note.C=[[journalurl]] will automatically redirect to your community's new username.
-
-.form.rename.forward.note.P=[[journalurl]] will automatically redirect to your new username.
-
-.form.rename.fromuser.label=Rename from
-
-.form.rename.oldusername.header.C=What do you want to do with your community's old username?
-
-.form.rename.oldusername.header.P=What do you want to do with your old username?
+.form.rename.oldusername.header.p=What do you want to do with your old username?
.form.rename.token.label=Rename token
@@ -73,7 +70,6 @@
.form.switchtype.comm=rename a community you own
.form.switchtype.journal=rename your journal
-
.success=Successfully renamed journal from [[from]] to [[to]].
@@ -85,12 +81,13 @@
.token.list.item=Use token to rename journal
-.token.list.item.withname=Use token to rename journal to [[username]]
-
.token.list.item.comm= Use token to rename a community
.token.list.item.comm.withname=Use token to rename a community to [[username]]
+.token.list.item.withname=Use token to rename journal to [[username]]
+
.token.notoken=<a [[aopts]]>Purchase a rename token</a> to perform a rename.
.token.used=Token has been used: [[token]]
+
diff -r 7d1ada126323 -r b5fcf79b7915 views/rename/swap.tt.text
--- a/views/rename/swap.tt.text Wed Apr 20 22:06:47 2011 +0800
+++ b/views/rename/swap.tt.text Thu Apr 21 03:02:10 2011 +0800
@@ -1,3 +1,4 @@
+;; -*- coding: utf-8 -*-
.error.header=Unable to perform username swap. Please correct the following and try again:
.error.invalidswapjournal=Invalid username was provided to swap with.
@@ -15,3 +16,4 @@
.success=Successfully swapped [[journal]] and [[swapjournal]].
.title=Swap Journal Usernames
+
diff -r 7d1ada126323 -r b5fcf79b7915 views/shop/cartdisplay.tt.text
--- a/views/shop/cartdisplay.tt.text Wed Apr 20 22:06:47 2011 +0800
+++ b/views/shop/cartdisplay.tt.text Thu Apr 21 03:02:10 2011 +0800
@@ -1,3 +1,4 @@
+;; -*- coding: utf-8 -*-
.header=Shopping Cart
.itemcount=[[num]] [[?num|item|items]] for a total of [[price]]
@@ -5,3 +6,4 @@
.newcart=Discard Cart
.viewcart=View Cart
+
diff -r 7d1ada126323 -r b5fcf79b7915 views/shop/index.tt.text
--- a/views/shop/index.tt.text Wed Apr 20 22:06:47 2011 +0800
+++ b/views/shop/index.tt.text Thu Apr 21 03:02:10 2011 +0800
@@ -1,3 +1,4 @@
+;; -*- coding: utf-8 -*-
.about=This is the shop where we sell things to help pay for our expenses to keep the site running, develop new features, and fix bugs.
.for.circle=someone in your circle
@@ -23,3 +24,4 @@
.title.points=Buy [[site]] Points for...
.title.renames=Buy a Rename Token for...
+
diff -r 7d1ada126323 -r b5fcf79b7915 views/shop/points.tt.text
--- a/views/shop/points.tt.text Wed Apr 20 22:06:47 2011 +0800
+++ b/views/shop/points.tt.text Thu Apr 21 03:02:10 2011 +0800
@@ -1,3 +1,4 @@
+;; -*- coding: utf-8 -*-
.about=This page allows you to buy [[sitename]] Points, the on-site currency accepted in our store and elsewhere on the site.
.about2=Points cost 10 cents ($0.10 USD) each and can be used in place of cash in the site store. For example, you can purchase paid time for yourself or someone else using points without needing to mail in a check or use a credit card.
@@ -11,3 +12,4 @@
.buying.points.range=(30 to 5,000)
.title=[[sitename]] Points Shop
+
diff -r 7d1ada126323 -r b5fcf79b7915 views/shop/transferpoints.tt.text
--- a/views/shop/transferpoints.tt.text Wed Apr 20 22:06:47 2011 +0800
+++ b/views/shop/transferpoints.tt.text Thu Apr 21 03:02:10 2011 +0800
@@ -1,3 +1,4 @@
+;; -*- coding: utf-8 -*-
.about=This page allows you to transfer [[sitename]] Points to another user.
.about.nopoints=<strong>You have no points to transfer.</strong> You can buy some for yourself or someone else in the <a [[aopts]]>[[sitename]] Store</a>.
@@ -29,3 +30,4 @@
.transferred.anon=An anonymous notification has been sent to advise of this transfer.
.transferred.notify=A notification has been sent to advise of this transfer.
+
diff -r 7d1ada126323 -r b5fcf79b7915 views/stats/site.tt.text
--- a/views/stats/site.tt.text Wed Apr 20 22:06:47 2011 +0800
+++ b/views/stats/site.tt.text Thu Apr 21 03:02:10 2011 +0800
@@ -1,11 +1,4 @@
;; -*- coding: utf-8 -*-
-
-.active.bytime.active_1d=Last 24 hours:
-
-.active.bytime.active_7d=Last 7 days:
-
-.active.bytime.active_30d=Last 30 days:
-
.accounts.bytype.community=Community:
.accounts.bytype.identity=External identity (OpenID, etc.):
@@ -26,31 +19,37 @@
.accounts.title=Number of accounts
+.active.bytime.active_1d=Last 24 hours:
+
+.active.bytime.active_30d=Last 30 days:
+
+.active.bytime.active_7d=Last 7 days:
+
.active.desc=These are accounts who logged in, posted an entry, commented, or edited a comment during the period indicated. For entries posted to communities, both the poster and the community are counted.
.active.free1=free accounts active in the past 1 day:
-.active.paid1=paid accounts active in the past 1 day:
+.active.free30=free accounts active in the past 30 days:
.active.free7=free accounts active in the past 7 days:
-.active.paid7=paid accounts active in the past 7 days:
-
-.active.free30=free accounts active in the past 30 days:
+.active.paid1=paid accounts active in the past 1 day:
.active.paid30=paid accounts active in the past 30 days:
+
+.active.paid7=paid accounts active in the past 7 days:
.active.title=Active accounts
.error.notavailable=(Sorry, those statistics aren't available right now.)
+
+.graphtitle.accounts=Pie chart: Dreamwidth accounts,<br /> divided by account type:
.graphtitle.active.community=Bar graph: Community accounts which have<br /> been active in the past 1 day, 7 days, and 30 days
.graphtitle.active.identity=Bar graph: Identity accounts which have<br /> been active in the past 1 day, 7 days, and 30 days
.graphtitle.active.personal=Bar graph: Personal accounts which have been active<br /> in the past 1 day, 7 days, and 30 days
-
-.graphtitle.accounts=Pie chart: Dreamwidth accounts,<br /> divided by account type:
.graphtitle.paid=Pie chart: Active accounts: paid,<br />paid-premium, paid-seed, and free:
@@ -64,9 +63,9 @@
.label.bar.1d=1 day
+.label.bar.30d=30 days
+
.label.bar.7d=7 days
-
-.label.bar.30d=30 days
.label.bar.free=free
@@ -92,9 +91,9 @@
.paid.colhdr.number=Number
+.paid.colhdr.pct_active=% of active accounts
+
.paid.colhdr.pct_total=% of total accounts
-
-.paid.colhdr.pct_active=% of active accounts
.paid.explanation=There are two levels of paid accounts, 'paid' and 'premium paid', which offer extra services compared to free accounts. 'Seed' accounts offer the level of services as 'premium paid', but are permanent. <a href="http://www.dreamwidth.org/support/faqbrowse?faqid=4">Information on paid accounts</a>.
@@ -111,3 +110,4 @@
.paid.title=Paid accounts
.title=[[sitenameshort]] Site Statistics
+
--------------------------------------------------------------------------------