www-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

www/philosophy free-doc.fa.html free-doc.hr.htm...


From: GNUN
Subject: www/philosophy free-doc.fa.html free-doc.hr.htm...
Date: Sun, 7 Aug 2016 17:28:12 +0000 (UTC)

CVSROOT:        /web/www
Module name:    www
Changes by:     GNUN <gnun>     16/08/07 17:28:12

Modified files:
        philosophy     : free-doc.fa.html free-doc.hr.html 
                         free-doc.zh-cn.html 
        philosophy/po  : free-doc.fa-en.html free-doc.hr-en.html 
                         free-doc.hr.po free-doc.zh-cn-en.html 
                         free-doc.zh-cn.po 

Log message:
        Automatic update by GNUnited Nations.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/free-doc.fa.html?cvsroot=www&r1=1.7&r2=1.8
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/free-doc.hr.html?cvsroot=www&r1=1.17&r2=1.18
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/free-doc.zh-cn.html?cvsroot=www&r1=1.18&r2=1.19
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-doc.fa-en.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-doc.hr-en.html?cvsroot=www&r1=1.6&r2=1.7
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-doc.hr.po?cvsroot=www&r1=1.13&r2=1.14
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-doc.zh-cn-en.html?cvsroot=www&r1=1.11&r2=1.12
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-doc.zh-cn.po?cvsroot=www&r1=1.14&r2=1.15

Patches:
Index: free-doc.fa.html
===================================================================
RCS file: /web/www/www/philosophy/free-doc.fa.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- free-doc.fa.html    7 Aug 2016 14:58:25 -0000       1.7
+++ free-doc.fa.html    7 Aug 2016 17:28:11 -0000       1.8
@@ -1,9 +1,4 @@
-<!--#set var="PO_FILE"
- value='<a href="/philosophy/po/free-doc.fa.po">
- https://www.gnu.org/philosophy/po/free-doc.fa.po</a>'
- --><!--#set var="ORIGINAL_FILE" value="/philosophy/free-doc.html"
- --><!--#set var="DIFF_FILE" value="/philosophy/po/free-doc.fa-diff.html"
- --><!--#set var="OUTDATED_SINCE" value="2015-12-31" -->
+<!--#set var="ENGLISH_PAGE" value="/philosophy/free-doc.en.html" -->
 
 <!--#include virtual="/server/header.fa.html" -->
 <!-- Parent-Version: 1.77 -->
@@ -14,13 +9,12 @@
 
 <!--#include virtual="/philosophy/po/free-doc.translist" -->
 <!--#include virtual="/server/banner.fa.html" -->
-<!--#include virtual="/server/outdated.fa.html" -->
 <h2>چرا نرم افزار آزاد نیاز به مستندات آزاد 
دارد</h2>
 
-<blockquote class="note">
+<div class="announcement">
 <p><a href="http://defectivebydesign.org/ebooks.html";>به لیست پستی م
ا دربارهٔ
 خطرات کتاب های الکترونیک بپیوندید</a>.</p>
-</blockquote>
+</div>
 
 <ul>
 <li><a href="/copyleft/fdl.html">مجوز مستندات آزاد 
گنو</a></li>
@@ -65,7 +59,7 @@
 رابطه با این راهنماها، تعیین قیمت فروش 
برای نسخه‌های چاپ شده توسط O'Reilly
 نبود، (کما اینکه بنیاد نرم افزارهای آزاد هم 
<a
 href="/doc/doc.html">راهنماهای آزاد گنو</a> را <a
-href="/doc/doc.html#DescriptionsOfGNUDocumentation">به شکل چاپ شده 
به فروش
+href="http://shop.fsf.org/category/books/";>به شکل چاپ شده به 
فروش
 می‌رساند</a> )  اما راهنماهای گنو در قالب کد م
نبع نیز در دسترس هستند در حالی
 که راهنماهای انحصاری فقط بر روی کاغذ عرضه م
ی‌شوند. راهنماهای گنو با مجوزهای
 کپی و اعمال تغییرات ارائه می‌گردند؛ اما 
راهنماهای Perl این‌طور نیستند. مساله
@@ -196,7 +190,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
@@ -211,11 +205,12 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
 <p><span dir="ltr">Copyright &copy; 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-2003, 2004, 2005, 2006, 2007, 2009 Free Software Foundation, Inc.</span></p>
+2003, 2004, 2005, 2006, 2007, 2009, 2015, 2016 Free Software Foundation,
+Inc.</span></p>
 
 <p>این صفحه تحت مجوز <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-NoDerivs 4.0 International License</a> قرار دارد.</p>
 
 <!--#include virtual="/server/bottom-notes.fa.html" -->
 <div class="translators-credits">
@@ -226,7 +221,7 @@
 <p class="unprintable"><!-- timestamp start -->
 آخرین به روز رسانی:
 
-$Date: 2016/08/07 14:58:25 $
+$Date: 2016/08/07 17:28:11 $
 
 <!-- timestamp end -->
 </p>

Index: free-doc.hr.html
===================================================================
RCS file: /web/www/www/philosophy/free-doc.hr.html,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- free-doc.hr.html    7 Aug 2016 14:58:25 -0000       1.17
+++ free-doc.hr.html    7 Aug 2016 17:28:11 -0000       1.18
@@ -1,9 +1,4 @@
-<!--#set var="PO_FILE"
- value='<a href="/philosophy/po/free-doc.hr.po">
- https://www.gnu.org/philosophy/po/free-doc.hr.po</a>'
- --><!--#set var="ORIGINAL_FILE" value="/philosophy/free-doc.html"
- --><!--#set var="DIFF_FILE" value="/philosophy/po/free-doc.hr-diff.html"
- --><!--#set var="OUTDATED_SINCE" value="2015-12-31" -->
+<!--#set var="ENGLISH_PAGE" value="/philosophy/free-doc.en.html" -->
 
 <!--#include virtual="/server/header.hr.html" -->
 <!-- Parent-Version: 1.77 -->
@@ -14,13 +9,12 @@
 
 <!--#include virtual="/philosophy/po/free-doc.translist" -->
 <!--#include virtual="/server/banner.hr.html" -->
-<!--#include virtual="/server/outdated.hr.html" -->
 <h2>Zašto slobodan softver treba slobodnu dokumentaciju</h2>
 
-<blockquote class="note">
+<div class="announcement">
 <p><a href="http://defectivebydesign.org/ebooks.html";>Pridružite se našoj 
listi
 o opasnosti e-knjiga (<i>eBooks</i>)</a></p>
-</blockquote>
+</div>
 
 <ul>
 <li><a href="/copyleft/fdl.html">GNU licenca slobodne dokumentacije (<i>The GNU
@@ -66,12 +60,11 @@
 cijene. Poteškoća s tim priručnicima nije bila u tomu što su O'Reilly
 Associates stavili cijenu na tiskane primjerke&mdash;samo po sebi, to je u
 redu. (Zaklada za slobodan softver isto tako <a
-href="/doc/doc.html#DescriptionsOfGNUDocumentation">prodaje tiskane
-primjerke</a> slobodnih <a href="/doc/doc.html">GNU priručnika</a>.) Ali,
-GNU priručnici su dostupni u obliku izvornoga koda, dok su ovi priručnici
-dostupni jedino u papirnatom obliku. GNU priručnici dolaze s dopuštenjem
-kopiranja i preinačavanja; priručnici za Perl, ne. Ta ograničenja su
-problem. </p>
+href="http://shop.fsf.org/category/books/";>prodaje tiskane primjerke</a>
+slobodnih <a href="/doc/doc.html">GNU priručnika</a>.) Ali, GNU priručnici
+su dostupni u obliku izvornoga koda, dok su ovi priručnici dostupni jedino u
+papirnatom obliku. GNU priručnici dolaze s dopuštenjem kopiranja i
+preinačavanja; priručnici za Perl, ne. Ta ograničenja su problem. </p>
 
 <p>
 Mjerila za slobodni priručnik su po prilici ista kao i za slobodni softver:
@@ -199,7 +192,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
@@ -214,11 +207,11 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
 <p>Copyright &copy; 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-2006, 2007, 2009 Free Software Foundation, Inc.</p>
+2006, 2007, 2009, 2015, 2016 Free Software Foundation, Inc.</p>
 
 <p>Ovo djelo je dano na korištenje pod licencom <a rel="license"
-href="http://creativecommons.org/licenses/by-nd/3.0/us/deed.hr";> Creative
-Commons Imenovanje-Bez prerada 3.0 SAD</a>.</p>
+href="http://creativecommons.org/licenses/by-nd/4.0/deed.hr";> Creative
+Commons Imenovanje-Bez prerada 4.0 međunarodna</a>.</p>
 
 <!--#include virtual="/server/bottom-notes.hr.html" -->
 <div class="translators-credits">
@@ -229,7 +222,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Zadnji put promijenjeno:
 
-$Date: 2016/08/07 14:58:25 $
+$Date: 2016/08/07 17:28:11 $
 
 <!-- timestamp end -->
 </p>

Index: free-doc.zh-cn.html
===================================================================
RCS file: /web/www/www/philosophy/free-doc.zh-cn.html,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- free-doc.zh-cn.html 7 Aug 2016 14:58:25 -0000       1.18
+++ free-doc.zh-cn.html 7 Aug 2016 17:28:11 -0000       1.19
@@ -1,9 +1,4 @@
-<!--#set var="PO_FILE"
- value='<a href="/philosophy/po/free-doc.zh-cn.po">
- https://www.gnu.org/philosophy/po/free-doc.zh-cn.po</a>'
- --><!--#set var="ORIGINAL_FILE" value="/philosophy/free-doc.html"
- --><!--#set var="DIFF_FILE" value="/philosophy/po/free-doc.zh-cn-diff.html"
- --><!--#set var="OUTDATED_SINCE" value="2015-12-31" -->
+<!--#set var="ENGLISH_PAGE" value="/philosophy/free-doc.en.html" -->
 
 <!--#include virtual="/server/header.zh-cn.html" -->
 <!-- Parent-Version: 1.77 -->
@@ -13,12 +8,11 @@
 
 <!--#include virtual="/philosophy/po/free-doc.translist" -->
 <!--#include virtual="/server/banner.zh-cn.html" -->
-<!--#include virtual="/server/outdated.zh-cn.html" -->
 <h2>为什么自由软件需要自由手册</h2>
 
-<blockquote class="note">
+<div class="announcement">
 <p><a href="http://defectivebydesign.org/ebooks.html";>关注我们有å…
³ç”µå­ä¹¦å±é™©æ€§çš„邮件列表</a> 。</p>
-</blockquote>
+</div>
 
 <ul>
 <li><a href="/copyleft/fdl.html">GNU 自由文档许可证</a></li>
@@ -46,7 +40,7 @@
 <p>
 自由文档,就像自由软件一样,核心在于自由,而不是价æ 
¼ã€‚O'Reilly
 Associates出版社出售这些文档,赚取利润,这本身无
可厚非(自由软件基金会也<a
-href="/doc/doc.html#DescriptionsOfGNUDocumentation">出售印刷版</a> 的<a
+href="http://shop.fsf.org/category/books/";>出售印刷版</a> 的<a
 href="/doc/doc.html">GNU手册</a>) 。 但是,GNU 手册的源代ç 
æ˜¯å¼€æ”¾çš„,出售的只是纸质的印刷版本。 GNU
 手册允许被复制和修改;而非自由的Perl手册则不å…
è®¸çš„这些。这样的限制才是问题所在。</p>
 
@@ -129,7 +123,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
@@ -144,11 +138,11 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
 <p>版权所有 &copy; 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 
2005,
-2006, 2007, 2008, 2009 <a 
href="http://www.fsf.org";>自由软件基金会</a></p>
+2006, 2007, 2008, 2009, 2015, 2016 <a 
href="http://www.fsf.org";>自由软件基金会</a></p>
 
 <p>本页面采用 <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.zh-cn.html" -->
 <div class="translators-credits">
@@ -160,7 +154,7 @@
 <p class="unprintable"><!-- timestamp start -->
 最后更新:
 
-$Date: 2016/08/07 14:58:25 $
+$Date: 2016/08/07 17:28:11 $
 
 <!-- timestamp end -->
 </p>

Index: po/free-doc.fa-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/free-doc.fa-en.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- po/free-doc.fa-en.html      30 Aug 2014 14:57:00 -0000      1.1
+++ po/free-doc.fa-en.html      7 Aug 2016 17:28:12 -0000       1.2
@@ -8,9 +8,9 @@
    
 <h2>Why Free Software needs Free Documentation</h2>
 
-<blockquote class="note">
+<div class="announcement">
 <p><a href="http://defectivebydesign.org/ebooks.html";>Join our mailing list 
about the dangers of eBooks</a>.</p>
-</blockquote>
+</div>
 
 <ul>
 <li><a href="/copyleft/fdl.html">The GNU Free Documentation License</a></li>
@@ -56,7 +56,7 @@
 price.  The problem with these manuals was not that O'Reilly
 Associates charged a price for printed copies&mdash;that in itself is
 fine.  (The Free Software Foundation
-<a href="/doc/doc.html#DescriptionsOfGNUDocumentation">sells printed
+<a href="http://shop.fsf.org/category/books/";>sells printed
 copies</a> of free <a href="/doc/doc.html">GNU manuals</a>, too.)  But
 GNU manuals are available in source code form, while these manuals are
 available only on paper.  GNU manuals come with permission to copy and
@@ -178,7 +178,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
@@ -194,17 +194,17 @@
      Information document, www.gnu.org/prep/maintain. -->
 
 <p>Copyright &copy; 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-2005, 2006, 2007, 2009 Free Software Foundation, Inc.</p>
+2005, 2006, 2007, 2009, 2015, 2016 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/30 14:57:00 $
+$Date: 2016/08/07 17:28:12 $
 <!-- timestamp end -->
 </p>
 </div>

Index: po/free-doc.hr-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/free-doc.hr-en.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- po/free-doc.hr-en.html      12 Apr 2014 13:58:40 -0000      1.6
+++ po/free-doc.hr-en.html      7 Aug 2016 17:28:12 -0000       1.7
@@ -8,9 +8,9 @@
    
 <h2>Why Free Software needs Free Documentation</h2>
 
-<blockquote class="note">
+<div class="announcement">
 <p><a href="http://defectivebydesign.org/ebooks.html";>Join our mailing list 
about the dangers of eBooks</a>.</p>
-</blockquote>
+</div>
 
 <ul>
 <li><a href="/copyleft/fdl.html">The GNU Free Documentation License</a></li>
@@ -56,7 +56,7 @@
 price.  The problem with these manuals was not that O'Reilly
 Associates charged a price for printed copies&mdash;that in itself is
 fine.  (The Free Software Foundation
-<a href="/doc/doc.html#DescriptionsOfGNUDocumentation">sells printed
+<a href="http://shop.fsf.org/category/books/";>sells printed
 copies</a> of free <a href="/doc/doc.html">GNU manuals</a>, too.)  But
 GNU manuals are available in source code form, while these manuals are
 available only on paper.  GNU manuals come with permission to copy and
@@ -178,7 +178,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
@@ -194,17 +194,17 @@
      Information document, www.gnu.org/prep/maintain. -->
 
 <p>Copyright &copy; 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-2005, 2006, 2007, 2009 Free Software Foundation, Inc.</p>
+2005, 2006, 2007, 2009, 2015, 2016 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/04/12 13:58:40 $
+$Date: 2016/08/07 17:28:12 $
 <!-- timestamp end -->
 </p>
 </div>

Index: po/free-doc.hr.po
===================================================================
RCS file: /web/www/www/philosophy/po/free-doc.hr.po,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- po/free-doc.hr.po   7 Aug 2016 17:13:33 -0000       1.13
+++ po/free-doc.hr.po   7 Aug 2016 17:28:12 -0000       1.14
@@ -16,7 +16,6 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Outdated-Since: 2015-12-31 20:56+0000\n"
 "X-Generator: Poedit 1.5.4\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 
@@ -127,11 +126,12 @@
 "Slobodna dokumentacija je, kao i slobodni softver, stvar slobode, a ne "
 "cijene. Poteškoća s tim priručnicima nije bila u tomu što su O'Reilly "
 "Associates stavili cijenu na tiskane primjerke&mdash;samo po sebi, to je u "
-"redu. (Zaklada za slobodan softver isto tako <a 
href=\"http://shop.fsf.org/category/books/\";>prodaje tiskane primjerke</a> "
-"slobodnih <a href=\"/doc/doc.html\">GNU priručnika</a>.) Ali, GNU 
priručnici "
-"su dostupni u obliku izvornoga koda, dok su ovi priručnici dostupni jedino u 
"
-"papirnatom obliku. GNU priručnici dolaze s dopuštenjem kopiranja i "
-"preinačavanja; priručnici za Perl, ne. Ta ograničenja su problem. "
+"redu. (Zaklada za slobodan softver isto tako <a href=\"http://shop.fsf.org/";
+"category/books/\">prodaje tiskane primjerke</a> slobodnih <a href=\"/doc/doc."
+"html\">GNU priručnika</a>.) Ali, GNU priručnici su dostupni u obliku "
+"izvornoga koda, dok su ovi priručnici dostupni jedino u papirnatom obliku. "
+"GNU priručnici dolaze s dopuštenjem kopiranja i preinačavanja; priručnici 
za "
+"Perl, ne. Ta ograničenja su problem. "
 
 #. type: Content of: <p>
 msgid ""
@@ -359,8 +359,8 @@
 "NoDerivatives 4.0 International License</a>."
 msgstr ""
 "Ovo djelo je dano na korištenje pod licencom <a rel=\"license\" href="
-"\"http://creativecommons.org/licenses/by-nd/4.0/deed.hr\";> Creative "
-"Commons Imenovanje-Bez prerada 4.0 međunarodna</a>."
+"\"http://creativecommons.org/licenses/by-nd/4.0/deed.hr\";> Creative Commons "
+"Imenovanje-Bez prerada 4.0 međunarodna</a>."
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.
 #. type: Content of: <div><div>

Index: po/free-doc.zh-cn-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/free-doc.zh-cn-en.html,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- po/free-doc.zh-cn-en.html   5 Jul 2014 04:58:47 -0000       1.11
+++ po/free-doc.zh-cn-en.html   7 Aug 2016 17:28:12 -0000       1.12
@@ -8,9 +8,9 @@
    
 <h2>Why Free Software needs Free Documentation</h2>
 
-<blockquote class="note">
+<div class="announcement">
 <p><a href="http://defectivebydesign.org/ebooks.html";>Join our mailing list 
about the dangers of eBooks</a>.</p>
-</blockquote>
+</div>
 
 <ul>
 <li><a href="/copyleft/fdl.html">The GNU Free Documentation License</a></li>
@@ -56,7 +56,7 @@
 price.  The problem with these manuals was not that O'Reilly
 Associates charged a price for printed copies&mdash;that in itself is
 fine.  (The Free Software Foundation
-<a href="/doc/doc.html#DescriptionsOfGNUDocumentation">sells printed
+<a href="http://shop.fsf.org/category/books/";>sells printed
 copies</a> of free <a href="/doc/doc.html">GNU manuals</a>, too.)  But
 GNU manuals are available in source code form, while these manuals are
 available only on paper.  GNU manuals come with permission to copy and
@@ -178,7 +178,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
@@ -194,17 +194,17 @@
      Information document, www.gnu.org/prep/maintain. -->
 
 <p>Copyright &copy; 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-2005, 2006, 2007, 2009 Free Software Foundation, Inc.</p>
+2005, 2006, 2007, 2009, 2015, 2016 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/07/05 04:58:47 $
+$Date: 2016/08/07 17:28:12 $
 <!-- timestamp end -->
 </p>
 </div>

Index: po/free-doc.zh-cn.po
===================================================================
RCS file: /web/www/www/philosophy/po/free-doc.zh-cn.po,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- po/free-doc.zh-cn.po        7 Aug 2016 17:13:33 -0000       1.14
+++ po/free-doc.zh-cn.po        7 Aug 2016 17:28:12 -0000       1.15
@@ -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-12-31 20:56+0000\n"
 "Plural-Forms: \n"
 
 # type: Content of: <title>
@@ -109,6 +108,7 @@
 "种手册。 "
 
 # type: Content of: <p>
+#. type: Content of: <p>
 msgid ""
 "Free documentation, like free software, is a matter of freedom, not price.  "
 "The problem with these manuals was not that O'Reilly Associates charged a "
@@ -120,10 +120,11 @@
 "Perl manuals do not.  These restrictions are the problems."
 msgstr ""
 "自由文档,就像自由软件一样,核心在于自由,而不是价æ 
¼ã€‚O'Reilly Associates出版"
-"社出售这些文档,赚取利润,这本身无
可厚非(自由软件基金会也<a 
href=\"http://shop.fsf.org/category/books/\";>出售印刷版</a> 的<a 
href=\"/doc/doc."
-"html\">GNU手册</a>) 。 但是,GNU 手册的源代ç 
æ˜¯å¼€æ”¾çš„,出售的只是纸质的印刷"
-"版本。 GNU 手册å…
è®¸è¢«å¤åˆ¶å’Œä¿®æ”¹ï¼›è€Œéžè‡ªç”±çš„Perl手册则不允许的这些。这æ 
·çš„限制"
-"才是问题所在。"
+"社出售这些文档,赚取利润,这本身无
可厚非(自由软件基金会也<a href=\"http://";
+"shop.fsf.org/category/books/\">出售印刷版</a> 的<a 
href=\"/doc/doc.html\">GNU"
+"手册</a>) 。 但是,GNU 手册的源代ç 
æ˜¯å¼€æ”¾çš„,出售的只是纸质的印刷版本。 GNU "
+"手册允许被复制和修改;而非自由的Perl手册则不å…
è®¸çš„这些。这样的限制才是问题所"
+"在。"
 
 # type: Content of: <p>
 #. type: Content of: <p>
@@ -328,7 +329,8 @@
 "2006, 2007, 2009, 2015, 2016 Free Software Foundation, Inc."
 msgstr ""
 "版权所有 &copy; 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 
2005, "
-"2006, 2007, 2008, 2009, 2015, 2016 <a 
href=\"http://www.fsf.org\";>自由软件基金会</a>"
+"2006, 2007, 2008, 2009, 2015, 2016 <a 
href=\"http://www.fsf.org\";>自由软件基"
+"金会</a>"
 
 #. type: Content of: <div><p>
 msgid ""
@@ -337,8 +339,8 @@
 "NoDerivatives 4.0 International License</a>."
 msgstr ""
 "本页面采用 <a rel=\"license\" 
href=\"http://creativecommons.org/licenses/by-";
-"nd/4.0/\">Creative Commons Attribution-"
-"NoDerivatives 4.0 International License</a> 许可证授权。"
+"nd/4.0/\">Creative Commons Attribution-NoDerivatives 4.0 International "
+"License</a> 许可证授权。"
 
 # type: Content of: <div><div>
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.



reply via email to

[Prev in Thread] Current Thread [Next in Thread]