www/distros screenshot.ru.html po/screenshot.ru...

[GNUN]

CVSROOT:        /web/www
Module name:    www
Changes by:     GNUN <gnun>     15/10/29 17:01:25

Modified files:
        distros        : screenshot.ru.html 
        distros/po     : screenshot.ru-en.html screenshot.ru.po 

Log message:
        Automatic update by GNUnited Nations.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/screenshot.ru.html?cvsroot=www&r1=1.10&r2=1.11
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/screenshot.ru-en.html?cvsroot=www&r1=1.7&r2=1.8
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/screenshot.ru.po?cvsroot=www&r1=1.18&r2=1.19

Patches:
Index: screenshot.ru.html
===================================================================
RCS file: /web/www/www/distros/screenshot.ru.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- screenshot.ru.html  17 Feb 2015 15:29:00 -0000      1.10
+++ screenshot.ru.html  29 Oct 2015 17:01:25 -0000      1.11
@@ -11,10 +11,13 @@
 <!--#include virtual="/server/banner.ru.html" -->
 <h2>Вид экрана свободного дистрибутива</h2>
 
-<p><img src="/graphics/t-desktop-4.jpg" alt="[ Рабочий стол с 
окнами текстового и табличного 
процессоров ]" width="100%" /></p>
-
-<p class="c">Вид экрана дистрибутива Trisquel GNU/Linux 
с работающим LibreOffice,
-свободным пакетом канцелярских программ, 
сопоставимым с Microsoft Office.</p>
+<p><img src="screenshots/trisquel.png" alt="[ Рабочий стол с 
окнами текстового и табличного 
процессоров, графического
+редактора и браузера ]"
+  width="100%" /></p>
+
+<p class="c">Вид экрана дистрибутива Trisquel GNU/Linux 
с LibreOffice, свободным пакетом
+канцелярских программ, GIMP, свободным 
графическим редактором, GNU IceCat,
+свободным браузером на базе FireFox.</p>
 
 <h3 class="c"><a href="/distros/free-distros.html">Попробуй 
GNU/Linux</a></h3>
 
@@ -61,7 +64,7 @@
 
 <!-- Regarding copyright, in general, standalone pages (as opposed to
      files generated as part of manuals) on the GNU web server should
-     be under CC BY-ND 3.0 US.  Please do NOT change or remove this
+     be under CC BY-ND 4.0.  Please do NOT change or remove this
      without talking with the webmasters or licensing team first.
      Please make sure the copyright date is consistent with the
      document.  For web pages, it is ok to list just the latest year the
@@ -75,12 +78,13 @@
      
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright &copy; 2014, 2015 Free Software Foundation, Inc.</p>
+<p>Copyright &copy; 2015 Jade Levesque<br />Copyright &copy; 2015 Free Software
+Foundation (translation)</p>
 
 <p>Это произведение доступно по <a rel="license"
-href="http://creativecommons.org/licenses/by-nd/3.0/us/deed.ru";>лицензии
-Creative Commons Attribution-NoDerivs (<em>Атрибуция&nbsp;&mdash; 
Без
-производных произведений</em>) 3.0 США</a>.
+href="http://creativecommons.org/licenses/by-nd/4.0/deed.ru";>лицензии
+Creative Commons Attribution-ShareAlike (<em>Атрибуция&nbsp;&mdash; 
На тех
+же  условиях</em>) 4.0 Всемирная</a>.
 </p>
 
 <!--#include virtual="/server/bottom-notes.ru.html" -->
@@ -96,7 +100,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Обновлено:
 
-$Date: 2015/02/17 15:29:00 $
+$Date: 2015/10/29 17:01:25 $
 
 <!-- timestamp end -->
 </p>

Index: po/screenshot.ru-en.html
===================================================================
RCS file: /web/www/www/distros/po/screenshot.ru-en.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- po/screenshot.ru-en.html    17 Feb 2015 15:29:00 -0000      1.7
+++ po/screenshot.ru-en.html    29 Oct 2015 17:01:25 -0000      1.8
@@ -6,12 +6,13 @@
 <!--#include virtual="/server/banner.html" -->
 <h2>Screenshot of a Free Distro</h2>
 
-<p><img src="/graphics/t-desktop-4.jpg" alt="[ Desktop with text
- processor and spreadsheet windows ]" width="100%" /></p>
+<p><img src="screenshots/trisquel.png" alt="[ Desktop with text
+  processor, image manipulation program and web browser windows ]"
+  width="100%" /></p>
 
 <p class="c"><small>Screenshot of the Trisquel GNU/Linux distribution
-running LibreOffice, a free software office suite comparable to
-Microsoft Office or Apple iWork</small></p>
+running LibreOffice, a free office suite; GIMP, a free image manipulation
+program; GNU IceCat, a free web browser based on Mozilla Firefox.</small></p>
 
 <h3 class="c"><a href="/distros/free-distros.html">Try GNU/Linux</a></h3>
 
@@ -47,7 +48,7 @@
 
 <!-- Regarding copyright, in general, standalone pages (as opposed to
      files generated as part of manuals) on the GNU web server should
-     be under CC BY-ND 3.0 US.  Please do NOT change or remove this
+     be under CC BY-ND 4.0.  Please do NOT change or remove this
      without talking with the webmasters or licensing team first.
      Please make sure the copyright date is consistent with the
      document.  For web pages, it is ok to list just the latest year the
@@ -62,18 +63,19 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
 
-<p>Copyright &copy; 2014, 2015 Free Software Foundation, Inc.</p>
+<p>Copyright &copy; 2015 Jade Levesque</p>
 
-<p>This page is licensed under a <a rel="license"
-href="http://creativecommons.org/licenses/by-nd/3.0/us/";>Creative
-Commons Attribution-NoDerivs 3.0 United States License</a>.
+<p>The screenshot is licensed under a
+<a rel="license"
+href="https://creativecommons.org/licenses/by-sa/4.0/";>Creative
+Commons Attribution-ShareAlike 4.0 International License</a>.
 </p>
 
 <!--#include virtual="/server/bottom-notes.html" -->
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2015/02/17 15:29:00 $
+$Date: 2015/10/29 17:01:25 $
 <!-- timestamp end -->
 </p>
 </div>

Index: po/screenshot.ru.po
===================================================================
RCS file: /web/www/www/distros/po/screenshot.ru.po,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- po/screenshot.ru.po 29 Oct 2015 16:26:39 -0000      1.18
+++ po/screenshot.ru.po 29 Oct 2015 17:01:25 -0000      1.19
@@ -15,7 +15,6 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Outdated-Since: 2015-10-29 09:55+0000\n"
 
 #. type: Content of: <title>
 msgid "Screenshot of a Free Distro - GNU Project - Free Software Foundation"
@@ -28,33 +27,22 @@
 msgstr "Вид экрана свободного дистрибутива"
 
 #. type: Attribute 'alt' of: <p><img>
-# | [ Desktop with text [-processor-] {+processor, image manipulation
-# | program+} and [-spreadsheet-] {+web browser+} windows ]
-#| msgid "[ Desktop with text processor and spreadsheet windows ]"
 msgid ""
 "[ Desktop with text processor, image manipulation program and web browser "
 "windows ]"
 msgstr ""
-"[ Рабочий стол с окнами текстового и 
табличного процессоров, "
-"графического редактора и браузера ]"
+"[ Рабочий стол с окнами текстового и 
табличного процессоров, графического "
+"редактора и браузера ]"
 
 #. type: Content of: <p>
-# | <small>Screenshot of the Trisquel GNU/Linux distribution running
-# | LibreOffice, a free [-software-] office [-suite comparable to Microsoft
-# | Office or Apple iWork</small>-] {+suite; GIMP, a free image manipulation
-# | program; GNU IceCat, a free web browser based on Mozilla Firefox.</small>+}
-#| msgid ""
-#| "<small>Screenshot of the Trisquel GNU/Linux distribution running "
-#| "LibreOffice, a free software office suite comparable to Microsoft Office "
-#| "or Apple iWork</small>"
 msgid ""
 "<small>Screenshot of the Trisquel GNU/Linux distribution running "
 "LibreOffice, a free office suite; GIMP, a free image manipulation program; "
 "GNU IceCat, a free web browser based on Mozilla Firefox.</small>"
 msgstr ""
-"Вид экрана дистрибутива Trisquel GNU/Linux с 
LibreOffice, "
-"свободным пакетом канцелярских программ, 
GIMP, свободным графическим редактором, "
-"GNU IceCat, свободным браузером на базе FireFox."
+"Вид экрана дистрибутива Trisquel GNU/Linux с 
LibreOffice, свободным пакетом "
+"канцелярских программ, GIMP, свободным 
графическим редактором, GNU IceCat, "
+"свободным браузером на базе FireFox."
 
 #. type: Content of: <h3>
 msgid "<a href=\"/distros/free-distros.html\">Try GNU/Linux</a>"
@@ -107,19 +95,10 @@
 #. type: Content of: <div><p>
 msgid "Copyright &copy; 2015 Jade Levesque"
 msgstr ""
-"Copyright &copy; 2015 Jade Levesque<br />"
-"Copyright &copy; 2015 Free Software Foundation (translation)"
+"Copyright &copy; 2015 Jade Levesque<br />Copyright &copy; 2015 Free Software "
+"Foundation (translation)"
 
 #. type: Content of: <div><p>
-# | [-This page-]{+The screenshot+} is licensed under a <a rel=\"license\"
-# | [-href=\"http://creativecommons.org/licenses/by-nd/4.0/\";>Creative-]
-# | {+href=\"https://creativecommons.org/licenses/by-sa/4.0/\";>Creative+}
-# | Commons [-Attribution-NoDerivatives-] {+Attribution-ShareAlike+} 4.0
-# | International License</a>.
-#| msgid ""
-#| "This page is licensed under a <a rel=\"license\" href=\"http://";
-#| "creativecommons.org/licenses/by-nd/4.0/\">Creative Commons Attribution-"
-#| "NoDerivatives 4.0 International License</a>."
 msgid ""
 "The screenshot is licensed under a <a rel=\"license\" href=\"https://";
 "creativecommons.org/licenses/by-sa/4.0/\">Creative Commons Attribution-"
@@ -127,8 +106,8 @@
 msgstr ""
 "Это произведение доступно по <a rel=\"license\" 
href=\"http://";
 "creativecommons.org/licenses/by-nd/4.0/deed.ru\">лицензии Creative 
Commons "
-"Attribution-ShareAlike (<em>Атрибуция&nbsp;&mdash; На тех же  
"
-"условиях</em>) 4.0 Всемирная</a>."
+"Attribution-ShareAlike (<em>Атрибуция&nbsp;&mdash; На тех же  
условиях</em>) "
+"4.0 Всемирная</a>."
 
 # type: Content of: <div><div>
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.