You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by bu...@apache.org on 2017/04/12 19:29:51 UTC
svn commit: r1010370 - in /websites/staging/ooo-site/trunk: cgi-bin/
content/ content/ru/index.html content/ru/topnav.html
content/ru/why/why_new_computers.html
Author: buildbot
Date: Wed Apr 12 19:29:51 2017
New Revision: 1010370
Log:
Staging update by buildbot for ooo-site
Modified:
websites/staging/ooo-site/trunk/cgi-bin/ (props changed)
websites/staging/ooo-site/trunk/content/ (props changed)
websites/staging/ooo-site/trunk/content/ru/index.html
websites/staging/ooo-site/trunk/content/ru/topnav.html
websites/staging/ooo-site/trunk/content/ru/why/why_new_computers.html
Propchange: websites/staging/ooo-site/trunk/cgi-bin/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Wed Apr 12 19:29:51 2017
@@ -1 +1 @@
-1791175
+1791178
Propchange: websites/staging/ooo-site/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Wed Apr 12 19:29:51 2017
@@ -1 +1 @@
-1791175
+1791178
Modified: websites/staging/ooo-site/trunk/content/ru/index.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/ru/index.html (original)
+++ websites/staging/ooo-site/trunk/content/ru/index.html Wed Apr 12 19:29:51 2017
@@ -242,38 +242,38 @@ screen reader.
</div>
</div>
-<div id="news" style="margin: 2% 3% 0 0; height: 520px;">
+<div id="news">
- <div class="campaign" style="height: 200px; float: right; overflow: auto;">
- <h2 style="display: inline;">Новости блога</h2>
+ <div class="first campaign" style="height: 210px; float: right; overflow: auto;">
+ <h2>Новости блога</h2>
<p style="text-align:right">
<a href="http://blogs.apache.org/OOo/">Весь блог</a>
</p>
<p>
- <em>21 августа:</em><br /><a href="https://blogs.apache.org/OOo/entry/announcing_apache_openoffice_4_1">
+ <em>21 августа 2014:</em><br /><a href="https://blogs.apache.org/OOo/entry/announcing_apache_openoffice_4_1">
Выпущен Apache OpenOffice 4.1.1</a>
<br />
- <em>29 апреля:</em><br /><a href="https://blogs.apache.org/OOo/entry/the_apache_openoffice_project_announce">
+ <em>29 апреля 2014:</em><br /><a href="https://blogs.apache.org/OOo/entry/the_apache_openoffice_project_announce">
Выпущен Apache OpenOffice 4.1.0</a>
<br/>
- <em>28 апреля:</em><br /><a href="https://blogs.apache.org/OOo/entry/apache_openoffice_weekly_news_2">
+ <em>28 апреля 2014:</em><br /><a href="https://blogs.apache.org/OOo/entry/apache_openoffice_weekly_news_2">
Еженедельные новости Apache OpenOffice #2</a>
<br/>
- <em>25 апреля:</em><br /><a href="https://blogs.apache.org/OOo/entry/apache_openoffice_weekly_news_1">
+ <em>25 апреля 2014:</em><br /><a href="https://blogs.apache.org/OOo/entry/apache_openoffice_weekly_news_1">
Еженедельные новости Apache OpenOffice #1</a>
<br/>
- <em>17 апреля:</em><br /><a href="https://blogs.apache.org/foundation/entry/the_apache_software_foundation_announces56">
+ <em>17 апреля 2014:</em><br /><a href="https://blogs.apache.org/foundation/entry/the_apache_software_foundation_announces56">
100 миллионов загрузок</a>
<br/>
- <em>31 декабря:</em><br /><a href="https://blogs.apache.org/OOo/entry/apache_openoffice_in_2013_a">
+ <em>31 декабря 2014:</em><br /><a href="https://blogs.apache.org/OOo/entry/apache_openoffice_in_2013_a">
Apache OpenOffice в 2013: годовой обзор</a>
<br/>
</p>
</div>
- <div id="all_news" style="height: 320px; float: left; overflow: auto;">
+ <div id="all_news" style="height: 375px; float: left; overflow: auto;">
<div class="campaign">
<h2>Последние новости</h2>
Modified: websites/staging/ooo-site/trunk/content/ru/topnav.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/ru/topnav.html (original)
+++ websites/staging/ooo-site/trunk/content/ru/topnav.html Wed Apr 12 19:29:51 2017
@@ -10,10 +10,12 @@
}
h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover > .headerlink, h4:hover > .headerlink, h5:hover > .headerlink, dt:hover > .elementid-permalink { visibility: visible }</style>
<ul>
-<li><a href="/product/" title="Apache OpenOffice product description">Product</a></li>
-<li><a href="/ru/download/" title="Download Apache OpenOffice">Download</a></li>
-<li><a href="/support/" title="Find Support for OpenOffice">Support</a></li>
+<li><a href="/product/index.html" title="Apache OpenOffice product description">Product</a></li>
+<li><a href="/ru/download/index.html" title="Download OpenOffice">Download</a></li>
+<li><a href="/support/index.html" title="Find Support for OpenOffice">Support</a></li>
<li><a href="https://blogs.apache.org/ooo/" title="Apache OpenOffice Blog">Blog</a></li>
-<li><a href="/extensions/" title="Extensions and Templates for OpenOffice">Extend</a></li>
-<li><a href="/participate.html" title="Get involved in Apache OpenOffice">Get Involved</a></li>
+<li><a href="/extensions/index.html" title="Extensions and Templates for OpenOffice">Extend</a></li>
+<li><a href="https://openoffice.apache.org/get-involved.html" title="Get involved in Apache OpenOffice">Develop</a></li>
+<li><a href="/projects/accepted.html" title="Apache OpenOffice development focus areas">Focus Areas</a></li>
+<li><a href="/projects/native-lang.html" title="Apache OpenOffice in your Native Language">Native Language</a></li>
</ul></div>
Modified: websites/staging/ooo-site/trunk/content/ru/why/why_new_computers.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/ru/why/why_new_computers.html (original)
+++ websites/staging/ooo-site/trunk/content/ru/why/why_new_computers.html Wed Apr 12 19:29:51 2017
@@ -35,8 +35,8 @@
h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover > .headerlink, h4:hover > .headerlink, h5:hover > .headerlink, dt:hover > .elementid-permalink { visibility: visible }</style>
<h2 id="save-money-on-your-new-computer">Save money on your new computer<a class="headerlink" href="#save-money-on-your-new-computer" title="Permanent link">¶</a></h2>
<p>Are you buying yourself a new computer?, or buying one for someone else? If so, here is a money saving tip that your computer vendor may not be telling you.</p>
-<p>You are not required to spend $100, $200 or more for a copy of Microsoft Office. You can buy a computer without Office installed, and save that money. Then when you go home, try the free, <a href="http://www.openoffice.org/download">Apache OpenOffice (AOO)</a>. It has a word processor, a spreadsheet and a presentation editor. It can read Microsoft files. It can export to PDF. It works on Windows XP-Windows 8, Mac OS and Linux. And it is absolutely free!</p>
-<p>How can we give this to you for free? We're a nonprofit organization with the charitable mission to publish free software for the public. That's what we do. We want you to have free software.</p>
+<p>You are not required to spend $100, $200 or more for a copy of Microsoft Office. You can buy a computer without Office installed, and save that money. Then when you go home, try the free, <a href="https://www.openoffice.org/download">Apache OpenOffice (AOO)</a>. It has a word processor, a spreadsheet and a presentation editor. It can read Microsoft files. It can export to PDF. It works on Windows XP - Windows 10, macOS (OS X) and Linux. And it is absolutely free!</p>
+<p>How can we give this to you for free? We are a nonprofit organization with the charitable mission to publish free software for the public. That's what we do. We want you to have free software.</p>
<p>So when the salesman tries to load up your computer invoice with all those "extras", just say "Thank you, but No. I will install AOO".</p>
</div>
<!--#include virtual="/footer.html" -->