Merge pull request #2770 from techAPJ/patch-1

Correct starred education copy, unclosed ul tag
This commit is contained in:
Jeff Atwood 2014-09-08 01:16:46 -07:00
commit 7b688aba92
1 changed files with 1 additions and 2 deletions

View File

@ -782,8 +782,7 @@ en:
educate: educate:
new: '<p>Your new topics appear here.</p><p>By default, topics are considered new and will show a <span class="badge new-topic badge-notification" style="vertical-align:middle;line-height:inherit;">new</span> indicator if they were created in the last 2 days.</p><p>You can change this in your <a href="%{userPrefsUrl}">preferences</a>.</p>' new: '<p>Your new topics appear here.</p><p>By default, topics are considered new and will show a <span class="badge new-topic badge-notification" style="vertical-align:middle;line-height:inherit;">new</span> indicator if they were created in the last 2 days.</p><p>You can change this in your <a href="%{userPrefsUrl}">preferences</a>.</p>'
unread: '<p>Your unread topics appear here.</p><p>By default, topics are considered unread and will show unread counts <span class="badge new-posts badge-notification">1</span> if you:</p><ul><li>Created the topic</li><li>Replied to the topic</li><li>Read the topic for more than 4 minutes</li></ul><p>Or if you have explicitly set the topic to Tracked or Watched via the notification control at the bottom of each topic.</p><p>You can change this in your <a href="%{userPrefsUrl}">preferences</a>.</p>' unread: '<p>Your unread topics appear here.</p><p>By default, topics are considered unread and will show unread counts <span class="badge new-posts badge-notification">1</span> if you:</p><ul><li>Created the topic</li><li>Replied to the topic</li><li>Read the topic for more than 4 minutes</li></ul><p>Or if you have explicitly set the topic to Tracked or Watched via the notification control at the bottom of each topic.</p><p>You can change this in your <a href="%{userPrefsUrl}">preferences</a>.</p>'
starred: '<p>Your starred topics appear here.</p> starred: '<p>Your starred topics appear here.</p><p>To star or unstar a topic:</p><ul><li>The <i class="fa fa-star"></i> next to any topic title</li><li>The Star button at the bottom of each topic</li></ul>'
<p>To star or unstar a topic:</p><ul><li>The <i class="fa fa-star"></i> next to any topic title</li><li>The Star button at the bottom of each topic</li>'
bottom: bottom:
latest: "There are no more latest topics." latest: "There are no more latest topics."
hot: "There are no more hot topics." hot: "There are no more hot topics."