www keepingup.ru.html po/keepingup.ru-en.html p...

[GNUN]

CVSROOT:        /web/www
Module name:    www
Changes by:     GNUN <gnun>     15/11/24 06:34:01

Modified files:
        .              : keepingup.ru.html 
        po             : keepingup.ru-en.html keepingup.ru.po 
        prep           : ftp.de.html 
        prep/po        : ftp.de.po ftp.pot 

Log message:
        Automatic update by GNUnited Nations.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/keepingup.ru.html?cvsroot=www&r1=1.48&r2=1.49
http://web.cvs.savannah.gnu.org/viewcvs/www/po/keepingup.ru-en.html?cvsroot=www&r1=1.25&r2=1.26
http://web.cvs.savannah.gnu.org/viewcvs/www/po/keepingup.ru.po?cvsroot=www&r1=1.27&r2=1.28
http://web.cvs.savannah.gnu.org/viewcvs/www/prep/ftp.de.html?cvsroot=www&r1=1.114&r2=1.115
http://web.cvs.savannah.gnu.org/viewcvs/www/prep/po/ftp.de.po?cvsroot=www&r1=1.140&r2=1.141
http://web.cvs.savannah.gnu.org/viewcvs/www/prep/po/ftp.pot?cvsroot=www&r1=1.99&r2=1.100

Patches:
Index: keepingup.ru.html
===================================================================
RCS file: /web/www/www/keepingup.ru.html,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -b -r1.48 -r1.49
--- keepingup.ru.html   19 Aug 2014 04:28:52 -0000      1.48
+++ keepingup.ru.html   24 Nov 2015 06:33:57 -0000      1.49
@@ -53,9 +53,8 @@
     <li><a href="http://mail.gnu.org/mailman/listinfo/info-gnu";>info-gnu</a>:
 Объявления и запросы помощи из проекта GNU и 
Фонда свободного программного
 обеспечения.</li>
-    <li><a
-href="http://mail.gnu.org/mailman/listinfo/info-gnu-events";>info-gnu-events</a>:
-Объявления о событиях GNU и ФСПО.</li>
+    <li><a href="//www.fsf.org/events">События ФСПО</a>: 
Будьте в курсе мероприятий,
+выступлений и конференций с участием Р
ичарда Столмена и сотрудников ФСПО.</li>
     <li><a 
href="http://mail.gnu.org/mailman/listinfo/info-press";>info-press</a>:
 Объявления в прессе о GNU.</li>
 </ul>    
@@ -115,7 +114,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
@@ -129,13 +128,13 @@
      
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright &copy; 2003, 2004, 2005, 2006, 2007, 2014 Free Software
+<p>Copyright &copy; 2003, 2004, 2005, 2006, 2007, 2014, 2015 Free Software
 Foundation, Inc.</p>
 
 <p>Это произведение доступно по <a rel="license"
-href="http://creativecommons.org/licenses/by-nd/3.0/us/deed.ru";>лицензии
+href="http://creativecommons.org/licenses/by-nd/4.0/deed.ru";>лицензии
 Creative Commons Attribution-NoDerivs (<em>Атрибуция&nbsp;&mdash; 
Без
-производных произведений</em>) 3.0 США</a>.</p>
+производных произведений</em>) 4.0 
Всемирная</a>.</p>
 
 <!--#include virtual="/server/bottom-notes.ru.html" -->
 <div class="translators-credits">
@@ -146,7 +145,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Обновлено:
 
-$Date: 2014/08/19 04:28:52 $
+$Date: 2015/11/24 06:33:57 $
 
 <!-- timestamp end -->
 </p>

Index: po/keepingup.ru-en.html
===================================================================
RCS file: /web/www/www/po/keepingup.ru-en.html,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- po/keepingup.ru-en.html     19 Aug 2014 04:28:54 -0000      1.25
+++ po/keepingup.ru-en.html     24 Nov 2015 06:33:59 -0000      1.26
@@ -55,8 +55,9 @@
     <li><a href="http://mail.gnu.org/mailman/listinfo/info-gnu";>
         info-gnu</a>: Announcements and requests for help from the GNU
         project and the Free Software Foundation.</li>
-    <li><a href="http://mail.gnu.org/mailman/listinfo/info-gnu-events";>
-        info-gnu-events</a>: Announcements of GNU and FSF events.</li>
+    <li><a href="//www.fsf.org/events">FSF Events</a>: Keep
+        up-to-date with events, speeches and conferences featuring
+        Richard Stallman and the FSF staff.</li>
     <li><a href="http://mail.gnu.org/mailman/listinfo/info-press";>
         info-press</a>: GNU press announcements.</li>
 </ul>    
@@ -104,7 +105,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
@@ -119,18 +120,18 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
 
-<p>Copyright &copy; 2003, 2004, 2005, 2006, 2007, 2014 Free Software
+<p>Copyright &copy; 2003, 2004, 2005, 2006, 2007, 2014, 2015 Free Software
 Foundation, Inc.</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>
+href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative
+Commons Attribution-NoDerivatives 4.0 International License</a>.</p>
 
 <!--#include virtual="/server/bottom-notes.html" -->
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2014/08/19 04:28:54 $
+$Date: 2015/11/24 06:33:59 $
 <!-- timestamp end -->
 </p>
 </div>

Index: po/keepingup.ru.po
===================================================================
RCS file: /web/www/www/po/keepingup.ru.po,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- po/keepingup.ru.po  24 Nov 2015 05:33:23 -0000      1.27
+++ po/keepingup.ru.po  24 Nov 2015 06:34:00 -0000      1.28
@@ -15,7 +15,6 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
-"X-Outdated-Since: 2015-11-24 05:26+0000\n"
 
 # type: Content of: <title>
 #. type: Content of: <title>
@@ -160,8 +159,9 @@
 "events, speeches and conferences featuring Richard Stallman and the FSF "
 "staff."
 msgstr ""
-"<a href=\"//www.fsf.org/events\">События ФСПО</a>: Будьте в 
курсе мероприятий, "
-"выступлений и конференций с участием Р
ичарда Столмена и сотрудников ФСПО."
+"<a href=\"//www.fsf.org/events\">События ФСПО</a>: Будьте в 
курсе "
+"мероприятий, выступлений и конференций с 
участием Ричарда Столмена и "
+"сотрудников ФСПО."
 
 # type: Content of: <ul><li>
 #. type: Content of: <ul><li>
@@ -252,11 +252,6 @@
 "translations.html\">&ldquo;Руководстве по 
переводам&rdquo;</a>."
 
 #. type: Content of: <div><p>
-# | Copyright &copy; 2003, 2004, 2005, 2006, 2007, [-2014-] {+2014, 2015+}
-# | Free Software Foundation, Inc.
-#| msgid ""
-#| "Copyright &copy; 2003, 2004, 2005, 2006, 2007, 2014 Free Software "
-#| "Foundation, Inc."
 msgid ""
 "Copyright &copy; 2003, 2004, 2005, 2006, 2007, 2014, 2015 Free Software "
 "Foundation, Inc."
@@ -265,11 +260,6 @@
 "Foundation, Inc."
 
 #. type: Content of: <div><p>
-# || No change detected.  The change might only be in amounts of spaces.
-#| 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 ""
 "This page is licensed under a <a rel=\"license\" href=\"http://";
 "creativecommons.org/licenses/by-nd/4.0/\">Creative Commons Attribution-"

Index: prep/ftp.de.html
===================================================================
RCS file: /web/www/www/prep/ftp.de.html,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -b -r1.114 -r1.115
--- prep/ftp.de.html    22 Oct 2015 14:38:35 -0000      1.114
+++ prep/ftp.de.html    24 Nov 2015 06:34:00 -0000      1.115
@@ -347,11 +347,6 @@
 href="http://gnumirror.nkn.in/";>http://gnumirror.nkn.in/</a></li>
  </ul></li>
  <!-- end of India -->
-<li>Iran
- <ul>
-  <li><a rel="nofollow" 
href="http://gnu.aasaam.ir/";>http://gnu.aasaam.ir/</a></li>
- </ul></li>
- <!-- end of Iran -->
 <li>Japan
  <ul>
   <li><a rel="nofollow"
@@ -830,7 +825,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Aktualisierung:
 
-$Date: 2015/10/22 14:38:35 $
+$Date: 2015/11/24 06:34:00 $
 
 <!-- timestamp end -->
 </p>

Index: prep/po/ftp.de.po
===================================================================
RCS file: /web/www/www/prep/po/ftp.de.po,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -b -r1.140 -r1.141
--- prep/po/ftp.de.po   22 Oct 2015 14:38:36 -0000      1.140
+++ prep/po/ftp.de.po   24 Nov 2015 06:34:01 -0000      1.141
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: ftp.html\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2015-10-22 14:34+0000\n"
+"POT-Creation-Date: 2015-11-24 06:27+0000\n"
 "PO-Revision-Date: 2015-07-06 22:00+0200\n"
 "Last-Translator: Jоегg Kоhпе <joeko (AT) online [PUNKT] de>\n"
 "Language-Team: German <address@hidden>\n"
@@ -684,15 +684,6 @@
 msgstr ""
 
 #. type: Content of: <ul><li>
-msgid "Iran"
-msgstr "Iran"
-
-#. type: Content of: <ul><li><ul><li>
-msgid ""
-"<a rel=\"nofollow\" href=\"http://gnu.aasaam.ir/\";>http://gnu.aasaam.ir/</a>"
-msgstr ""
-
-#. type: Content of: <ul><li>
 msgid "Japan"
 msgstr "Japan"
 
@@ -1692,6 +1683,9 @@
 msgid "Updated:"
 msgstr "Aktualisierung:"
 
+#~ msgid "Iran"
+#~ msgstr "Iran"
+
 #~ msgid "Bangladesh"
 #~ msgstr "Bangladesch"
 

Index: prep/po/ftp.pot
===================================================================
RCS file: /web/www/www/prep/po/ftp.pot,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -b -r1.99 -r1.100
--- prep/po/ftp.pot     22 Oct 2015 14:38:36 -0000      1.99
+++ prep/po/ftp.pot     24 Nov 2015 06:34:01 -0000      1.100
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ftp.html\n"
-"POT-Creation-Date: 2015-10-22 14:34+0000\n"
+"POT-Creation-Date: 2015-11-24 06:27+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <address@hidden>\n"
 "Language-Team: LANGUAGE <address@hidden>\n"
@@ -637,14 +637,6 @@
 msgstr ""
 
 #. type: Content of: <ul><li>
-msgid "Iran"
-msgstr ""
-
-#. type: Content of: <ul><li><ul><li>
-msgid "<a rel=\"nofollow\" 
href=\"http://gnu.aasaam.ir/\";>http://gnu.aasaam.ir/</a>"
-msgstr ""
-
-#. type: Content of: <ul><li>
 msgid "Japan"
 msgstr ""