IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into pt_BR

Browse Source
This commit is contained in:
J. Bruni
2013-07-22 16:00:09 -03:00
parent 1c78b485d3 112b9f9c2a
commit e257cfc56c
81 changed files with 1524 additions and 485 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/views/static/faq.en.html.erb
View File

@@ -112,7 +112,7 @@
</p>
<div class="more">
<p>
Rather than posting “+1” or “Agreed,” use the Like button. Rather than taking an existing topic in a radically different direction, use Reply as a New Topic.
Rather than posting “+1” or “Agreed”, use the Like button. Rather than taking an existing topic in a radically different direction, use Reply as a New Topic.
</p>
</div>
@@ -132,4 +132,4 @@
<div class="more">
</div>
<% end %>
<% end %>

2
app/views/static/tos.en.html.erb
View File

@@ -62,7 +62,7 @@
<div id="7"></div>
<h2><a href="#7">7. Content Posted on Other Websites</a></h2>
<p>We have not reviewed, and cannot review, all of the material, including computer software, made available through the websites and webpages to which <%= SiteSetting.company_domain %> links, and that link to <%= SiteSetting.company_domain %>. <%= SiteSetting.company_short_name %> does not have any control over those non-<%= SiteSetting.company_domain %> websites and webpages, and is not responsible for their contents or their use. By linking to a non-<%= SiteSetting.company_domain %> website or webpage, <%= SiteSetting.company_short_name %> does not represent or imply that it endorses such website or webpage. You are responsible for taking precautions as necessary to protect yourself and your computer systems from viruses, worms, Trojan horses, and other harmful or destructive content. <%= SiteSetting.company_short_name %> disclaims any responsibility for any harm resulting from your use of non-WordPress websites and webpages.
<p>We have not reviewed, and cannot review, all of the material, including computer software, made available through the websites and webpages to which <%= SiteSetting.company_domain %> links, and that link to <%= SiteSetting.company_domain %>. <%= SiteSetting.company_short_name %> does not have any control over those non-<%= SiteSetting.company_domain %> websites and webpages, and is not responsible for their contents or their use. By linking to a non-<%= SiteSetting.company_domain %> website or webpage, <%= SiteSetting.company_short_name %> does not represent or imply that it endorses such website or webpage. You are responsible for taking precautions as necessary to protect yourself and your computer systems from viruses, worms, Trojan horses, and other harmful or destructive content. <%= SiteSetting.company_short_name %> disclaims any responsibility for any harm resulting from your use of non-<%= SiteSetting.company_domain %> websites and webpages.
</p>
<div id="8"></div>