www-commits
[Top][All Lists]
Advanced

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

www distros/free-distros.ca.html distros/po/fre...


From: GNUN
Subject: www distros/free-distros.ca.html distros/po/fre...
Date: Mon, 02 Mar 2015 10:27:05 +0000

CVSROOT:        /web/www
Module name:    www
Changes by:     GNUN <gnun>     15/03/02 10:27:05

Modified files:
        distros        : free-distros.ca.html 
        distros/po     : free-distros.ca-en.html free-distros.ca.po 
        gnu            : gnu-linux-faq.ca.html 
        gnu/po         : gnu-linux-faq.ca-en.html gnu-linux-faq.ca.po 
        licenses       : licenses.ca.html translations.ca.html 
        licenses/po    : licenses.ca-en.html licenses.ca.po 
                         translations.ca-en.html translations.ca.po 

Log message:
        Automatic update by GNUnited Nations.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/free-distros.ca.html?cvsroot=www&r1=1.46&r2=1.47
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/free-distros.ca-en.html?cvsroot=www&r1=1.18&r2=1.19
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/free-distros.ca.po?cvsroot=www&r1=1.109&r2=1.110
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/gnu-linux-faq.ca.html?cvsroot=www&r1=1.41&r2=1.42
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-linux-faq.ca-en.html?cvsroot=www&r1=1.15&r2=1.16
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-linux-faq.ca.po?cvsroot=www&r1=1.64&r2=1.65
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/licenses.ca.html?cvsroot=www&r1=1.45&r2=1.46
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/translations.ca.html?cvsroot=www&r1=1.42&r2=1.43
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/licenses.ca-en.html?cvsroot=www&r1=1.15&r2=1.16
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/licenses.ca.po?cvsroot=www&r1=1.55&r2=1.56
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/translations.ca-en.html?cvsroot=www&r1=1.18&r2=1.19
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/translations.ca.po?cvsroot=www&r1=1.104&r2=1.105

Patches:
Index: distros/free-distros.ca.html
===================================================================
RCS file: /web/www/www/distros/free-distros.ca.html,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -b -r1.46 -r1.47
--- distros/free-distros.ca.html        1 Dec 2014 10:28:32 -0000       1.46
+++ distros/free-distros.ca.html        2 Mar 2015 10:27:02 -0000       1.47
@@ -27,8 +27,9 @@
 disc dur d'un ordinador; la majoria també poden executar-se sense
 instal·lació prèvia.</p>
 
-<p>No intentem jutjar o comparar aquestes distribucions basant-nos en algun
-criteri que no sigui la llibertat, i per això les posem en ordre
+<p>La Free Software Foundation recomana i avala aquestes distribucions de
+GNU/Linux, tot i que no intentem jutjar-les o comparar-les  basant-nos en
+algun criteri que no sigui la llibertat, i per això les posem en ordre
 alfabètic. Us animem a llegir aquestes breus descripcions i a explorar les
 seves respectives pàgines web i altra informació per escollir la que sigui
 millor per vosaltres.</p>
@@ -84,31 +85,39 @@
 vídeo i àudio.</td></tr>
 
  <tr class="even">
+   <td><a href="http://www.gnu.org/software/guix/";>
+       <img src="/software/guix/graphics/guix-logo.small.png" alt="guix" 
/></a></td>
+   <td>Guix System Distribution és una distribució avançada de GNU/Linux 
construïda
+sobre GNU Guix (es pronuncia com &ldquo;geeks&rdquo;), un gestor de paquets
+funcional per al sistema GNU. </td></tr>
+
+ <tr class="odd">
    <td><a href="http://www.gnewsense.org/";>
        <img src="/graphics/distros-gnewsense.png" alt="gNewSense" /></a></td>
    <td>gNewSense, una distribució GNU/Linux basada en Debian amb el patrocini 
de la
 FSF.</td></tr>
 
- <tr class="odd">
+    
+ <tr class="even">
    <td><a href="https://musixdistro.wordpress.com/";>
        <img src="/graphics/distros-musix.png" alt="Musix GNU+Linux" /></a></td>
    <td>Musix GNU+Linux, una distribució GNU/Linux basada en Knoppix que posa
 especial èmfasi en la producció d'àudio.</td></tr>
 
- <tr class="even">
+ <tr class="odd">
    <td><a href="http://www.parabola.nu/https/";>
        <img src="/graphics/distros-parabola.png"
             alt="Parabola GNU/Linux" /></a></td>
    <td>Parabola GNU/Linux, una distribució basada en Arch que prioritza la
 simplicitat en la gestió del sistema i dels paquets.</td></tr>
 
- <tr class="odd">
+ <tr class="even">
    <td><a href="http://trisquel.info/";>
        <img src="/graphics/distros-trisquel.png" alt="Trisquel" /></a></td>
    <td>Trisquel, una distribució GNU/Linux basada en Ubuntu i orientada a 
petites
 empreses, usuaris domèstics i centres educatius.</td></tr>
 
-<tr class="even">
+<tr class="odd">
    <td><a href="http://www.ututo.org/";>
        <img src="/graphics/distros-ututo.png" alt="Ututo" /></a></td>
    <td>Ututo XS, una distribució GNU/Linux basada en Gentoo. Va ser el primer
@@ -238,7 +247,7 @@
      
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright &copy; 2014 Free Software Foundation, Inc.</p>
+<p>Copyright &copy; 2014, 2015 Free Software Foundation, Inc.</p>
 
 <p>Aquesta pàgina es troba sota la <a rel="license"
 href="http://creativecommons.org/licenses/by-nd/3.0/us/deed.ca";>Llicència
@@ -249,13 +258,13 @@
 <div class="translators-credits">
 
 <!--TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.-->
-Darrera actualització: <a href="http://www.puigpe.org/";>puigpe</a>, 1 de
-novembre de 2014.</div>
+Darrera actualització: <a href="http://www.puigpe.org/";>puigpe</a>, 2 de
+març de 2015.</div>
 
 <p class="unprintable"><!-- timestamp start -->
 Updated:
 
-$Date: 2014/12/01 10:28:32 $
+$Date: 2015/03/02 10:27:02 $
 
 <!-- timestamp end -->
 </p>

Index: distros/po/free-distros.ca-en.html
===================================================================
RCS file: /web/www/www/distros/po/free-distros.ca-en.html,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- distros/po/free-distros.ca-en.html  1 Dec 2014 10:28:32 -0000       1.18
+++ distros/po/free-distros.ca-en.html  2 Mar 2015 10:27:02 -0000       1.19
@@ -22,7 +22,8 @@
 All of the distributions that follow are installable to a
 computer's hard drive; most can be run live.</p>
 
-<p>We do not try to judge or compare these distros based on any
+<p>The Free Software Foundation recommends and endorses these GNU/Linux
+distros, although we do not try to judge or compare them based on any
 criterion other than freedom; therefore, we list them in alphabetical
 order.  We encourage you to read these brief descriptions and to
 consult their respective web sites and other information to choose the
@@ -79,31 +80,39 @@
        and video editing.</td></tr>
 
  <tr class="even">
+   <td><a href="http://www.gnu.org/software/guix/";>
+       <img src="/software/guix/graphics/guix-logo.small.png" alt="guix" 
/></a></td>
+   <td>Guix System Distribution is an advanced GNU/Linux distro built
+       on top of GNU Guix (pronounced &ldquo;geeks&rdquo;), a purely
+       functional package manager for the GNU system. </td></tr>
+
+ <tr class="odd">
    <td><a href="http://www.gnewsense.org/";>
        <img src="/graphics/distros-gnewsense.png" alt="gNewSense" /></a></td>
    <td>gNewSense, a GNU/Linux distribution based on Debian, with
        sponsorship from the FSF.</td></tr>
 
- <tr class="odd">
+    
+ <tr class="even">
    <td><a href="https://musixdistro.wordpress.com/";>
        <img src="/graphics/distros-musix.png" alt="Musix GNU+Linux" /></a></td>
    <td>Musix, a GNU+Linux distribution based on Knoppix, with special
        emphasis on audio production.</td></tr>
 
- <tr class="even">
+ <tr class="odd">
    <td><a href="http://www.parabola.nu/https/";>
        <img src="/graphics/distros-parabola.png"
             alt="Parabola GNU/Linux" /></a></td>
    <td>Parabola GNU/Linux, a distribution based on Arch that
        prioritizes simple package and system management.</td></tr>
 
- <tr class="odd">
+ <tr class="even">
    <td><a href="http://trisquel.info/";>
        <img src="/graphics/distros-trisquel.png" alt="Trisquel" /></a></td>
    <td>Trisquel, a GNU/Linux distribution based on Ubuntu that's oriented 
  toward small enterprises, domestic users and educational centers.</td></tr>
 
-<tr class="even">
+<tr class="odd">
    <td><a href="http://www.ututo.org/";>
        <img src="/graphics/distros-ututo.png" alt="Ututo" /></a></td>
    <td>Ututo XS, a GNU/Linux distribution based on Gentoo.  It was the first
@@ -226,7 +235,7 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
 
-<p>Copyright &copy; 2014 Free Software Foundation, Inc.</p>
+<p>Copyright &copy; 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
@@ -236,7 +245,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2014/12/01 10:28:32 $
+$Date: 2015/03/02 10:27:02 $
 <!-- timestamp end -->
 </p>
 </div>

Index: distros/po/free-distros.ca.po
===================================================================
RCS file: /web/www/www/distros/po/free-distros.ca.po,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -b -r1.109 -r1.110
--- distros/po/free-distros.ca.po       2 Mar 2015 09:59:18 -0000       1.109
+++ distros/po/free-distros.ca.po       2 Mar 2015 10:27:02 -0000       1.110
@@ -11,9 +11,10 @@
 "PO-Revision-Date: 2015-03-02 10:58+0100\n"
 "Last-Translator: Miquel Puigpelat <address@hidden>\n"
 "Language-Team: Catalan <address@hidden>\n"
+"Language: ca\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit"
+"Content-Transfer-Encoding: 8bit\n"
 
 # type: Content of: <title>
 #. type: Content of: <title>
@@ -53,11 +54,6 @@
 "prèvia."
 
 #. type: Content of: <p>
-#| msgid ""
-#| "We do not try to judge or compare these distros based on any criterion "
-#| "other than freedom; therefore, we list them in alphabetical order.  We "
-#| "encourage you to read these brief descriptions and to consult their "
-#| "respective web sites and other information to choose the one best for you."
 msgid ""
 "The Free Software Foundation recommends and endorses these GNU/Linux "
 "distros, although we do not try to judge or compare them based on any "
@@ -66,7 +62,8 @@
 "their respective web sites and other information to choose the one best for "
 "you."
 msgstr ""
-"La Free Software Foundation recomana i avala aquestes distribucions de 
GNU/Linux, tot i que no intentem jutjar-les o comparar-les  basant-nos en algun 
"
+"La Free Software Foundation recomana i avala aquestes distribucions de GNU/"
+"Linux, tot i que no intentem jutjar-les o comparar-les  basant-nos en algun "
 "criteri que no sigui la llibertat, i per això les posem en ordre alfabètic. 
"
 "Us animem a llegir aquestes breus descripcions i a explorar les seves "
 "respectives pàgines web i altra informació per escollir la que sigui millor 
"
@@ -196,7 +193,6 @@
 
 # type: Content of: <table><tr><td><a>
 #. type: Content of: <table><tr><td><a>
-#| msgid "<a href=\"http://www.ututo.org/\";>"
 msgid "<a href=\"http://www.gnu.org/software/guix/\";>"
 msgstr "<a href=\"http://www.gnu.org/software/guix/\";>"
 
@@ -210,7 +206,9 @@
 "Guix (pronounced &ldquo;geeks&rdquo;), a purely functional package manager "
 "for the GNU system."
 msgstr ""
-"Guix System Distribution és una distribució avançada de GNU/Linux 
construïda sobre GNU Guix (es pronuncia com &ldquo;geeks&rdquo;), un gestor de 
paquets funcional per al sistema GNU."
+"Guix System Distribution és una distribució avançada de GNU/Linux 
construïda "
+"sobre GNU Guix (es pronuncia com &ldquo;geeks&rdquo;), un gestor de paquets "
+"funcional per al sistema GNU."
 
 # type: Content of: <table><tr><td><a>
 #. type: Content of: <table><tr><td><a>
@@ -490,7 +488,6 @@
 
 # type: Content of: <div><p>
 #. type: Content of: <div><p>
-#| msgid "Copyright &copy; 2011, 2012 Free Software Foundation, Inc."
 msgid "Copyright &copy; 2014, 2015 Free Software Foundation, Inc."
 msgstr "Copyright &copy; 2014, 2015 Free Software Foundation, Inc."
 

Index: gnu/gnu-linux-faq.ca.html
===================================================================
RCS file: /web/www/www/gnu/gnu-linux-faq.ca.html,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- gnu/gnu-linux-faq.ca.html   6 Jan 2015 12:28:18 -0000       1.41
+++ gnu/gnu-linux-faq.ca.html   2 Mar 2015 10:27:03 -0000       1.42
@@ -553,7 +553,7 @@
 
 <dt id="notinstallable">Com pot ser GNU un sistema operatiu, si no puc obtenir 
quelcom anomenat
 &ldquo;GNU&rdquo; i instal·lar-ho? <span class="anchor-reference-id">(<a
-href="#TOCnotinstallable">#notinstallable</a>)</span></dt>
+href="#notinstallable">#notinstallable</a>)</span></dt>
 
 <dd>
 Hi ha disponibles molts <a href="/distros/distros.html">paquets i versions
@@ -1481,7 +1481,7 @@
      
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright &copy; 2001, 2006, 2007, 2008, 2010, 2011, 2013, 2014 Free
+<p>Copyright &copy; 2001, 2006, 2007, 2008, 2010, 2011, 2013, 2014, 2015 Free
 Software Foundation, Inc.</p>
 
 <p>Aquesta pàgina es troba sota la <a rel="license"
@@ -1500,7 +1500,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Updated:
 
-$Date: 2015/01/06 12:28:18 $
+$Date: 2015/03/02 10:27:03 $
 
 <!-- timestamp end -->
 </p>

Index: gnu/po/gnu-linux-faq.ca-en.html
===================================================================
RCS file: /web/www/www/gnu/po/gnu-linux-faq.ca-en.html,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- gnu/po/gnu-linux-faq.ca-en.html     6 Jan 2015 12:28:19 -0000       1.15
+++ gnu/po/gnu-linux-faq.ca-en.html     2 Mar 2015 10:27:03 -0000       1.16
@@ -553,7 +553,7 @@
 
 <dt id="notinstallable">How can GNU be an
     operating system, if I can't get something called &ldquo;GNU&rdquo;
-    and install it? <span class="anchor-reference-id">(<a 
href="#TOCnotinstallable">#notinstallable</a>)</span></dt>
+    and install it? <span class="anchor-reference-id">(<a 
href="#notinstallable">#notinstallable</a>)</span></dt>
 
 <dd>
 Many <a href="/distros/distros.html"> packaged and installable
@@ -1471,7 +1471,7 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
 
-<p>Copyright &copy; 2001, 2006, 2007, 2008, 2010, 2011, 2013, 2014
+<p>Copyright &copy; 2001, 2006, 2007, 2008, 2010, 2011, 2013, 2014, 2015
 Free Software Foundation, Inc.</p>
 
 <p>This page is licensed under a <a rel="license"
@@ -1482,7 +1482,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2015/01/06 12:28:19 $
+$Date: 2015/03/02 10:27:03 $
 <!-- timestamp end -->
 </p>
 </div>

Index: gnu/po/gnu-linux-faq.ca.po
===================================================================
RCS file: /web/www/www/gnu/po/gnu-linux-faq.ca.po,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -b -r1.64 -r1.65
--- gnu/po/gnu-linux-faq.ca.po  2 Mar 2015 10:02:45 -0000       1.64
+++ gnu/po/gnu-linux-faq.ca.po  2 Mar 2015 10:27:03 -0000       1.65
@@ -11,9 +11,10 @@
 "PO-Revision-Date: 2015-03-02 11:01+0100\n"
 "Last-Translator: Miquel Puigpelat <address@hidden>\n"
 "Language-Team: Catalan <address@hidden>\n"
+"Language: ca\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit"
+"Content-Transfer-Encoding: 8bit\n"
 
 # type: Content of: <title>
 #. type: Content of: <title>
@@ -1378,10 +1379,6 @@
 
 # type: Content of: <dl><dt>
 #. type: Content of: <dl><dt>
-#| msgid ""
-#| "How can GNU be an operating system, if I can't get something called "
-#| "&ldquo;GNU&rdquo; and install it? <span class=\"anchor-reference-id\">(<a "
-#| "href=\"#TOCnotinstallable\">#notinstallable</a>)</span>"
 msgid ""
 "How can GNU be an operating system, if I can't get something called &ldquo;"
 "GNU&rdquo; and install it? <span class=\"anchor-reference-id\">(<a href="
@@ -3399,9 +3396,6 @@
 
 # type: Content of: <div><p>
 #. type: Content of: <div><p>
-#| msgid ""
-#| "Copyright &copy; 2001, 2006, 2007, 2008, 2010, 2011, 2013, 2014 Free "
-#| "Software Foundation, Inc."
 msgid ""
 "Copyright &copy; 2001, 2006, 2007, 2008, 2010, 2011, 2013, 2014, 2015 Free "
 "Software Foundation, Inc."

Index: licenses/licenses.ca.html
===================================================================
RCS file: /web/www/www/licenses/licenses.ca.html,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -b -r1.45 -r1.46
--- licenses/licenses.ca.html   5 Jun 2014 15:31:19 -0000       1.45
+++ licenses/licenses.ca.html   2 Mar 2015 10:27:03 -0000       1.46
@@ -45,13 +45,6 @@
 <p>Tenim també una pàgina que exposa <a href="/philosophy/bsd.ca.html">el
 problema de la llicència BSD</a>.</p>
 
-<p>
-Actualment estem revisant totes les nostres llicències; els vostres
-comentaris sobre els textos proposats són benvinguts. Visiteu si us plau <a
-href="http://gplv3.fsf.org";>el nostre web sobre l'actualització de les
-llicències</a> per llegir els esborranys i participar en el procés.
-</p>
-
 <h3>Recursos comuns per a totes les nostres llicències</h3>
 
 <p>Tenim una sèrie de recursos per ajudar a la gent a entendre i utilitzar les
@@ -342,7 +335,7 @@
 
 <p>
 El copyleft ajuda també els programadors que volen aportar <a
-href="/software/software.ca.html#HelpWriteSoftware">millores</a> als <a
+href="/software/software.ca.html#develop">millores</a> als <a
 href="/philosophy/free-sw.ca.html">programes lliures</a> a obtenir el permís
 de fer-ho. Aquests programadors treballen sovint per empreses o universitats
 que farien gairebé qualsevol cosa per guanyar més diners. Un programador pot
@@ -486,7 +479,7 @@
      
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright &copy; 2014 Free Software Foundation, Inc.</p>
+<p>Copyright &copy; 2014, 2015 Free Software Foundation, Inc.</p>
 
 <p>Aquesta pàgina es troba sota la <a rel="license"
 href="http://creativecommons.org/licenses/by-nd/3.0/us/deed.ca";>Llicència
@@ -503,7 +496,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Updated:
 
-$Date: 2014/06/05 15:31:19 $
+$Date: 2015/03/02 10:27:03 $
 
 <!-- timestamp end -->
 </p>

Index: licenses/translations.ca.html
===================================================================
RCS file: /web/www/www/licenses/translations.ca.html,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -b -r1.42 -r1.43
--- licenses/translations.ca.html       1 Dec 2014 10:57:00 -0000       1.42
+++ licenses/translations.ca.html       2 Mar 2015 10:27:04 -0000       1.43
@@ -183,22 +183,17 @@
 href="http://alas.matf.bg.ac.rs/~mr99164/gnu/ojl-3.0.pdf";>PDF</a>
   </li>
 
-<!-- ads; many other links
+  <!-- ads; many other links
   <li>
 <code>[uk]</code> <a 
href="http://www.linux.kiev.ua/ua/devel/licenses/gnu-gpl/";>
   Ukrainian</a> translation of the GPL</li>
 -->
-<!-- many links; some may be problematic - to suggest republishing
-  <li>
-
-<code>[zh-cn]</code> <a 
href="http://www.zeuux.org/group/free-software/bbs/content/50512/";>
-  Chinese (Simplified)</a> translation of the GPL
--->
-<!-- PDF download requires registration
- (<a href="http://www.zeuux.org/group/free-software/file/content/283/";>
-PDF</a>)</li>
--->
-<li><!-- RT #715288 -->
+<li>
+      <!-- RT #977716 -->
+<code>[zh-cn]</code> Traducció al xinés (simplificat) de la GPL - <a
+href="http://mprc.pku.edu.cn/~ruankunliang/gpl3.html";>HTML</a>, <a
+href="http://mprc.pku.edu.cn/~ruankunliang/gpl3.pdf";>PDF</a></li>
+  <li><!-- RT #715288 -->
 <code>[zh-tw]</code> <a href="http://www.chinasona.org/gnu/gnuv3-tc.html";>
 Traducció al xinés (tradicional)</a> de la GPL</li>
 </ul>
@@ -451,7 +446,7 @@
 </div>
 
 <p>Copyright &copy; 1996, 1997, 1998, 1999, 2004, 2005, 2006, 2008, 2009, 2010,
-2011, 2014 Free Software Foundation, Inc.</p>
+2011, 2014, 2015 Free Software Foundation, Inc.</p>
 
 <p>Aquesta pàgina es troba sota la <a rel="license"
 href="http://creativecommons.org/licenses/by-nd/3.0/us/deed.ca";>Llicència
@@ -468,7 +463,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Updated:
 
-$Date: 2014/12/01 10:57:00 $
+$Date: 2015/03/02 10:27:04 $
 
 <!-- timestamp end -->
 </p>

Index: licenses/po/licenses.ca-en.html
===================================================================
RCS file: /web/www/www/licenses/po/licenses.ca-en.html,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- licenses/po/licenses.ca-en.html     5 Jun 2014 15:31:44 -0000       1.15
+++ licenses/po/licenses.ca-en.html     2 Mar 2015 10:27:04 -0000       1.16
@@ -38,13 +38,6 @@
 
 <p>We also have a page that discusses <a href="/philosophy/bsd.html">the BSD 
License Problem</a>.</p>
 
-<p>
-Our documentation licenses are currently being revised, and we welcome
-your comments on the proposed texts. Please
-visit <a href="http://gplv3.fsf.org";>our license update site</a> to
-read the current drafts and participate in the process.
-</p>
-
 <h3>Common Resources for our Software Licenses</h3>
 
 <p>We have a number of resources to help people understand and use our
@@ -325,7 +318,7 @@
 
 <p>
 Copyleft also helps programmers who want to contribute
-<a href="/software/software.html#HelpWriteSoftware">improvements</a> to
+<a href="/help/software.html#develop">improvements</a> to
 <a href="/philosophy/free-sw.html">free software</a> get permission to
 do that.  These programmers often work for companies or universities
 that would do almost anything to get more money.  A programmer may
@@ -454,7 +447,7 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
 
-<p>Copyright &copy; 2014 Free Software Foundation, Inc.</p>
+<p>Copyright &copy; 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
@@ -464,7 +457,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2014/06/05 15:31:44 $
+$Date: 2015/03/02 10:27:04 $
 <!-- timestamp end -->
 </p>
 </div>

Index: licenses/po/licenses.ca.po
===================================================================
RCS file: /web/www/www/licenses/po/licenses.ca.po,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -b -r1.55 -r1.56
--- licenses/po/licenses.ca.po  2 Mar 2015 10:09:04 -0000       1.55
+++ licenses/po/licenses.ca.po  2 Mar 2015 10:27:04 -0000       1.56
@@ -11,9 +11,10 @@
 "PO-Revision-Date: 2015-03-02 11:06+0100\n"
 "Last-Translator: Miquel Puigpelat <address@hidden>\n"
 "Language-Team: Catalan <address@hidden>\n"
+"Language: ca\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit"
+"Content-Transfer-Encoding: 8bit\n"
 
 # type: Content of: <title>
 #. type: Content of: <title>
@@ -716,14 +717,6 @@
 
 # type: Content of: <p>
 #. type: Content of: <p>
-#| msgid ""
-#| "Copyleft also helps programmers who want to contribute <a href=\"/"
-#| "software/software.html#HelpWriteSoftware\">improvements</a> to <a href=\"/"
-#| "philosophy/free-sw.html\">free software</a> get permission to do that.  "
-#| "These programmers often work for companies or universities that would do "
-#| "almost anything to get more money.  A programmer may want to contribute "
-#| "her changes to the community, but her employer may want to turn the "
-#| "changes into a proprietary software product."
 msgid ""
 "Copyleft also helps programmers who want to contribute <a href=\"/help/"
 "software.html#develop\">improvements</a> to <a href=\"/philosophy/free-sw."
@@ -734,12 +727,12 @@
 "product."
 msgstr ""
 "El copyleft ajuda també els programadors que volen aportar <a href=\"/"
-"software/software.ca.html#develop\">millores</a> als <a href=\"/"
-"philosophy/free-sw.ca.html\">programes lliures</a> a obtenir el permís de "
-"fer-ho. Aquests programadors treballen sovint per empreses o universitats "
-"que farien gairebé qualsevol cosa per guanyar més diners. Un programador 
pot "
-"voler contribuir amb les seves aportacions a la comunitat, però pot passar "
-"que l'empresari vulgui convertir aquestes aportacions en un producte de "
+"software/software.ca.html#develop\">millores</a> als <a href=\"/philosophy/"
+"free-sw.ca.html\">programes lliures</a> a obtenir el permís de fer-ho. "
+"Aquests programadors treballen sovint per empreses o universitats que farien "
+"gairebé qualsevol cosa per guanyar més diners. Un programador pot voler "
+"contribuir amb les seves aportacions a la comunitat, però pot passar que "
+"l'empresari vulgui convertir aquestes aportacions en un producte de "
 "programari privatiu."
 
 # type: Content of: <p>
@@ -933,7 +926,6 @@
 
 # type: Content of: <div><p>
 #. type: Content of: <div><p>
-#| msgid "Copyright &copy; 2011, 2012 Free Software Foundation, Inc."
 msgid "Copyright &copy; 2014, 2015 Free Software Foundation, Inc."
 msgstr "Copyright &copy; 2014, 2015 Free Software Foundation, Inc."
 

Index: licenses/po/translations.ca-en.html
===================================================================
RCS file: /web/www/www/licenses/po/translations.ca-en.html,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- licenses/po/translations.ca-en.html 1 Dec 2014 10:57:02 -0000       1.18
+++ licenses/po/translations.ca-en.html 2 Mar 2015 10:27:04 -0000       1.19
@@ -163,14 +163,11 @@
   <li><code>[uk]</code> <a 
href="http://www.linux.kiev.ua/ua/devel/licenses/gnu-gpl/";>
   Ukrainian</a> translation of the GPL</li>
 -->
-<!-- many links; some may be problematic - to suggest republishing
-  <li>
-<code>[zh-cn]</code> <a 
href="http://www.zeuux.org/group/free-software/bbs/content/50512/";>
-  Chinese (Simplified)</a> translation of the GPL
--->
-<!-- PDF download requires registration
- (<a 
href="http://www.zeuux.org/group/free-software/file/content/283/";>PDF</a>)</li>
--->
+  <li><!-- RT #977716 -->
+      <code>[zh-cn]</code>
+         Chinese (Simplified) translation of the GPL -
+         <a href="http://mprc.pku.edu.cn/~ruankunliang/gpl3.html";>HTML</a>,
+         <a href="http://mprc.pku.edu.cn/~ruankunliang/gpl3.pdf";>PDF</a></li>
   <li><code>[zh-tw]</code> <!-- RT #715288 -->
   <a href="http://www.chinasona.org/gnu/gnuv3-tc.html";>
   Chinese (Traditional)</a> translation of the GPL</li>
@@ -390,7 +387,7 @@
 </div>
 
 <p>Copyright &copy; 1996, 1997, 1998, 1999, 2004, 2005, 2006, 2008, 2009,
-2010, 2011, 2014 Free Software Foundation, Inc.</p>
+2010, 2011, 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
@@ -400,7 +397,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2014/12/01 10:57:02 $
+$Date: 2015/03/02 10:27:04 $
 <!-- timestamp end -->
 </p>
 </div>

Index: licenses/po/translations.ca.po
===================================================================
RCS file: /web/www/www/licenses/po/translations.ca.po,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -b -r1.104 -r1.105
--- licenses/po/translations.ca.po      2 Mar 2015 10:09:04 -0000       1.104
+++ licenses/po/translations.ca.po      2 Mar 2015 10:27:04 -0000       1.105
@@ -11,9 +11,10 @@
 "PO-Revision-Date: 2015-03-02 11:08+0100\n"
 "Last-Translator: Miquel Puigpelat <address@hidden>\n"
 "Language-Team: Catalan <address@hidden>\n"
+"Language: ca\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit"
+"Content-Transfer-Encoding: 8bit\n"
 
 # type: Content of: <title>
 #. type: Content of: <title>
@@ -333,10 +334,6 @@
 # type: Content of: <ul><li>
 #.  RT #977716 
 #. type: Content of: <ul><li>
-#| msgid ""
-#| "<code>[sr]</code> Serbian translation of the GPL: <a href=\"http://alas.";
-#| "matf.bg.ac.rs/~mr99164/ojl-3.0.html\">HTML</a>, <a href=\"http://alas.";
-#| "matf.bg.ac.rs/~mr99164/gnu/ojl-3.0.pdf\">PDF</a>"
 msgid ""
 "<code>[zh-cn]</code> Chinese (Simplified) translation of the GPL - <a href="
 "\"http://mprc.pku.edu.cn/~ruankunliang/gpl3.html\";>HTML</a>, <a href="
@@ -612,9 +609,6 @@
 
 # type: Content of: <div><p>
 #. type: Content of: <div><p>
-#| msgid ""
-#| "Copyright &copy; 1996, 1997, 1998, 1999, 2004, 2005, 2006, 2008, 2009, "
-#| "2010, 2011, 2014 Free Software Foundation, Inc."
 msgid ""
 "Copyright &copy; 1996, 1997, 1998, 1999, 2004, 2005, 2006, 2008, 2009, 2010, "
 "2011, 2014, 2015 Free Software Foundation, Inc."



reply via email to

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