[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
www/gnu gnu-linux-faq.ca.html linux-and-gnu.ca....
|
From: |
GNUN |
|
Subject: |
www/gnu gnu-linux-faq.ca.html linux-and-gnu.ca.... |
|
Date: |
Fri, 17 May 2013 17:28:31 +0000 |
CVSROOT: /web/www
Module name: www
Changes by: GNUN <gnun> 13/05/17 17:28:31
Modified files:
gnu : gnu-linux-faq.ca.html linux-and-gnu.ca.html
thegnuproject.ca.html
gnu/po : gnu-linux-faq.ca-en.html gnu-linux-faq.ca.po
linux-and-gnu.ca-en.html linux-and-gnu.ca.po
thegnuproject.ca-en.html thegnuproject.ca.po
Log message:
Automatic update by GNUnited Nations.
CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/gnu-linux-faq.ca.html?cvsroot=www&r1=1.30&r2=1.31
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/linux-and-gnu.ca.html?cvsroot=www&r1=1.30&r2=1.31
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/thegnuproject.ca.html?cvsroot=www&r1=1.26&r2=1.27
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-linux-faq.ca-en.html?cvsroot=www&r1=1.8&r2=1.9
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-linux-faq.ca.po?cvsroot=www&r1=1.39&r2=1.40
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/linux-and-gnu.ca-en.html?cvsroot=www&r1=1.7&r2=1.8
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/linux-and-gnu.ca.po?cvsroot=www&r1=1.40&r2=1.41
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/thegnuproject.ca-en.html?cvsroot=www&r1=1.5&r2=1.6
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/thegnuproject.ca.po?cvsroot=www&r1=1.29&r2=1.30
Patches:
Index: gnu-linux-faq.ca.html
===================================================================
RCS file: /web/www/www/gnu/gnu-linux-faq.ca.html,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- gnu-linux-faq.ca.html 25 Mar 2013 07:04:26 -0000 1.30
+++ gnu-linux-faq.ca.html 17 May 2013 17:28:30 -0000 1.31
@@ -81,6 +81,9 @@
<li><a href="#long" id="TOClong">El problema de âGNU/Linuxâ és que és
massa
llarg. Quin nom més curt recomaneu?</a></li>
+<li><a href="#long2" id="TOClong2">El problema de “GNU/Linux” és
que
+és massa llarg. Per què m'he de complicar dient “GNU/”?</a></li>
+
<li><a href="#justgnu" id="TOCjustgnu">Atès que Linux és una contribució
secundà ria, seria faltar a la veritat anomenar al sistema simplement
âGNUâ?</a></li>
@@ -560,7 +563,17 @@
âGNU/Linuxâ.
<p>
El nom legÃtim més curt per al sistema és âGNUâ, però l'anomenem
âGNU/Linuxâ
-per les raons que donem baix.</p>
+<a href="#justgnu">per les raons que donem més avall</a>.</p>
+</dd>
+
+<dt id="long2">El problema de “GNU/Linux” és que és massa llarg.
Per què m'he
+de complicar dient “GNU/”? <span class="anchor-reference-id">(<a
+href="#long2">#long2</a>)</span></dt>
+
+<dd>
+<p>Només pren un segon dir o teclejar “GNU/”. Si aprecieu el
+sistema que và rem desenvolupar, no podeu gastar un segon en reconèixer la
+nostra feina?</p>
</dd>
<dt id="justgnu">Atès que Linux és una contribució secundà ria, seria
faltar a la veritat
@@ -1256,6 +1269,11 @@
Seria hipòcrita exigir usar el nom GNU/Linux en una clà usula de la
llicència, i no ho fem. Sols us <em>demanem</em> que ens doneu el
reconeixement que mereixem.
+
+<p>
+Noteu que hi ha com a mÃnim <a href="/philosophy/bsd.ca.html"> dues
+llicències BSD diferents</a>. Per a major claredat, no utilitzeu si us plau
+l'expressió “llicència BSD ” sense especificar quina.</p>
</dd>
<dt id="deserve">Ja que no vau afegir cap clà usula a la GNU GPL per exigir a
la gent que
@@ -1377,13 +1395,13 @@
<!--TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.-->
Traducció: <a href="mailto:address@hidden";>puigcerver</a>, 2 d'abril
de 2008.<br />Darrera actualització: <a
-href="http://www.puigpe.org/";>puigpe</a>, 3 de febrer de 2013.</div>
+href="http://www.puigpe.org/";>puigpe</a>, 17 de maig de 2013.</div>
<p><!-- timestamp start -->
Updated:
-$Date: 2013/03/25 07:04:26 $
+$Date: 2013/05/17 17:28:30 $
<!-- timestamp end -->
</p>
Index: linux-and-gnu.ca.html
===================================================================
RCS file: /web/www/www/gnu/linux-and-gnu.ca.html,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- linux-and-gnu.ca.html 25 Mar 2013 08:03:35 -0000 1.30
+++ linux-and-gnu.ca.html 17 May 2013 17:28:30 -0000 1.31
@@ -136,8 +136,8 @@
gent podia llavors <a
href="http://ftp.funet.fi/pub/linux/historical/kernel/old-versions/RELNOTES-0.01";>unir
Linux i el sistema GNU</a> per tal d'obtenir un sistema operatiu complet i
-lliure: una versió del sistema GNU basada en Linux (o, abreujadament, un
-sistema GNU/Linux).</p>
+lliure: una versió del sistema GNU que contenia Linux. En altres paraules,
+un sistema GNU/Linux.</p>
<p>
Posar-los tots dos junts sona senzill, però no va ser una tasca
@@ -322,7 +322,7 @@
<p><!-- timestamp start -->
Updated:
-$Date: 2013/03/25 08:03:35 $
+$Date: 2013/05/17 17:28:30 $
<!-- timestamp end -->
</p>
Index: thegnuproject.ca.html
===================================================================
RCS file: /web/www/www/gnu/thegnuproject.ca.html,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- thegnuproject.ca.html 25 Mar 2013 07:04:50 -0000 1.26
+++ thegnuproject.ca.html 17 May 2013 17:28:30 -0000 1.27
@@ -321,13 +321,13 @@
<p>
Podria haver dit, "Troba un amic que estigui a la xarxa i que et faci una
còpia". O podria haver fet el que vaig fer amb l'Emacs PDP-10 original:
-dir-los:"Envieu-me una cinta i un SASE, i us ho retornaré amb l'Emacs". Però
-jo no tenia feina remunerada i estava cercant vies per obtenir diners del
-programari lliure. Vaig decidir-me per tant a anunciar que enviaria una
-cinta a tothom que ho volgués, però previ pagament de 150 $. D'aquesta
-manera vaig començar el negoci de la distribució de programari lliure, el
-precursor de les empreses que avui distribueixen sistemes complets GNU
-basats en Linux.</p>
+dir-los:"Envieu-me una cinta i un <acronym title="Self-addressed Stamped
+Envelope">SASE</acronym>, i us ho retornaré amb l'Emacs". Però jo no tenia
+feina remunerada i estava cercant vies per obtenir diners del programari
+lliure. Vaig decidir-me per tant a anunciar que enviaria una cinta a tothom
+que ho volgués, però previ pagament de 150 $. D'aquesta manera vaig començar
+el negoci de la distribució de programari lliure, el precursor de les
+empreses que avui distribueixen sistemes complets GNU basats en Linux.</p>
<h3>Ãs un programa lliure per a tots els usuaris?</h3>
<p>
@@ -1068,7 +1068,7 @@
<p><!-- timestamp start -->
Updated:
-$Date: 2013/03/25 07:04:50 $
+$Date: 2013/05/17 17:28:30 $
<!-- timestamp end -->
</p>
Index: po/gnu-linux-faq.ca-en.html
===================================================================
RCS file: /web/www/www/gnu/po/gnu-linux-faq.ca-en.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- po/gnu-linux-faq.ca-en.html 25 Mar 2013 07:04:59 -0000 1.8
+++ po/gnu-linux-faq.ca-en.html 17 May 2013 17:28:30 -0000 1.9
@@ -77,6 +77,10 @@
“GNU/Linux” is that it is too long. How about
recommending a shorter name?</a></li>
+<li><a href="#long2" id="TOClong2">The problem with
+ “GNU/Linux” is that it is too long. Why should
+ I go to the trouble of saying “GNU/”?</a></li>
+
<li><a href="#justgnu" id="TOCjustgnu">Since Linux is a secondary
contribution, would it be false to the facts to call the system
simply “GNU”?</a></li>
@@ -556,8 +560,19 @@
and “Linux”. The reaction was very bad. People accept
“GNU/Linux”
much better.
<p>
-The shortest legitimate name for this system is “GNU”, but we call
it
-“GNU/Linux” for the reasons given below.</p>
+The shortest legitimate name for this system is “GNU”, but
+we call it “GNU/Linux” <a href="#justgnu"> for the reasons
+given below</a>.</p>
+</dd>
+
+<dt id="long2">The problem with “GNU/Linux” is that it is too long.
+ Why should I go to the trouble of saying “GNU/”?
+ <span class="anchor-reference-id">(<a href="#long2">#long2</a>)</span></dt>
+
+<dd>
+<p>It only takes a second to say or type “GNU/”. If you
+appreciate the system that we developed, can't you take one second
+to recognize our work?</p>
</dd>
<dt id="justgnu">Since Linux is a secondary
@@ -1249,6 +1264,11 @@
It would be hypocritical to make the name GNU/Linux a license
requirement, and we don't. We only <em>ask</em> you to give us the
credit we deserve.
+
+<p>
+Please note that there are at least <a href="/philosophy/bsd.html">
+two different BSD licenses</a>. For clarity's sake, please don't use
+the term “BSD license” without specifying which one.</p>
</dd>
<dt id="deserve">Since you failed to put
@@ -1357,7 +1377,7 @@
<p>Updated:
<!-- timestamp start -->
-$Date: 2013/03/25 07:04:59 $
+$Date: 2013/05/17 17:28:30 $
<!-- timestamp end -->
</p>
</div>
Index: po/gnu-linux-faq.ca.po
===================================================================
RCS file: /web/www/www/gnu/po/gnu-linux-faq.ca.po,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -b -r1.39 -r1.40
--- po/gnu-linux-faq.ca.po 17 May 2013 17:17:23 -0000 1.39
+++ po/gnu-linux-faq.ca.po 17 May 2013 17:28:30 -0000 1.40
@@ -11,9 +11,10 @@
"PO-Revision-Date: 2013-05-17 19:16+0200\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>
@@ -212,17 +213,13 @@
# type: Content of: <ul><li>
#. type: Content of: <ul><li>
-#| msgid ""
-#| "<a href=\"#long\" id=\"TOClong\">The problem with “GNU/Linux” "
-#| "is that it is too long. How about recommending a shorter name?</a>"
msgid ""
"<a href=\"#long2\" id=\"TOClong2\">The problem with “GNU/Linux” "
"is that it is too long. Why should I go to the trouble of saying “GNU/"
"”?</a>"
msgstr ""
-"<a href=\"#long2\" id=\"TOClong2\">El problema de “GNU/Linux” "
-"és que és massa llarg. Per què m'he de complicar dient “GNU/"
-"”?</a>"
+"<a href=\"#long2\" id=\"TOClong2\">El problema de “GNU/Linux” és
"
+"que és massa llarg. Per què m'he de complicar dient
“GNU/”?</a>"
# type: Content of: <ul><li>
#. type: Content of: <ul><li>
@@ -1397,9 +1394,6 @@
# type: Content of: <dl><dd><p>
#. type: Content of: <dl><dd><p>
-#| msgid ""
-#| "The shortest legitimate name for this system is “GNU”, but we "
-#| "call it “GNU/Linux” for the reasons given below."
msgid ""
"The shortest legitimate name for this system is “GNU”, but we "
"call it “GNU/Linux” <a href=\"#justgnu\"> for the reasons given "
@@ -1410,16 +1404,14 @@
# type: Content of: <dl><dt>
#. type: Content of: <dl><dt>
-#| msgid ""
-#| "The problem with “GNU/Linux” is that it is too long. How "
-#| "about recommending a shorter name? <span class=\"anchor-reference-id\">"
-#| "(<a href=\"#long\">#long</a>)</span>"
msgid ""
"The problem with “GNU/Linux” is that it is too long. Why should "
"I go to the trouble of saying “GNU/”? <span class=\"anchor-"
"reference-id\">(<a href=\"#long2\">#long2</a>)</span>"
msgstr ""
-"El problema de “GNU/Linux” és que és massa llarg. Per què
m'he de complicar dient “GNU/”? <span
class=\"anchor-reference-id\">(<a href=\"#long2\">#long2</a>)</span>"
+"El problema de “GNU/Linux” és que és massa llarg. Per què
m'he "
+"de complicar dient “GNU/”? <span class=\"anchor-reference-id\">"
+"(<a href=\"#long2\">#long2</a>)</span>"
#. type: Content of: <dl><dd><p>
msgid ""
@@ -1427,7 +1419,9 @@
"the system that we developed, can't you take one second to recognize our "
"work?"
msgstr ""
-"Només pren un segon dir o teclejar “GNU/”. Si aprecieu el
sistema que và rem desenvolupar, no podeu gastar un segon en reconèixer la
nostra feina?"
+"Només pren un segon dir o teclejar “GNU/”. Si aprecieu el "
+"sistema que và rem desenvolupar, no podeu gastar un segon en reconèixer la "
+"nostra feina?"
# type: Content of: <dl><dt>
#. type: Content of: <dl><dt>
@@ -3009,7 +3003,8 @@
"“BSD license” without specifying which one."
msgstr ""
"Noteu que hi ha com a mÃnim <a href=\"/philosophy/bsd.ca.html\"> dues "
-"llicències BSD diferents</a>. Per a major claredat, no utilitzeu si us plau
l'expressió “llicència BSD ” sense especificar quina."
+"llicències BSD diferents</a>. Per a major claredat, no utilitzeu si us plau
"
+"l'expressió “llicència BSD ” sense especificar quina."
# type: Content of: <dl><dt>
#. type: Content of: <dl><dt>
Index: po/linux-and-gnu.ca-en.html
===================================================================
RCS file: /web/www/www/gnu/po/linux-and-gnu.ca-en.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- po/linux-and-gnu.ca-en.html 25 Mar 2013 08:03:37 -0000 1.7
+++ po/linux-and-gnu.ca-en.html 17 May 2013 17:28:30 -0000 1.8
@@ -129,9 +129,9 @@
Once Torvalds freed Linux in 1992, it fit into the last major gap in
the GNU system. People could
then <a
href="http://ftp.funet.fi/pub/linux/historical/kernel/old-versions/RELNOTES-0.01";>
-combine Linux with the GNU system</a> to make a complete free system:
-a Linux-based version of the GNU system; the GNU/Linux system, for
-short.</p>
+combine Linux with the GNU system</a> to make a complete free system
+— a version of the GNU system which also contained Linux. The
+GNU/Linux system, in other words.</p>
<p>
Making them work well together was not a trivial job. Some GNU
@@ -302,7 +302,7 @@
<p>Updated:
<!-- timestamp start -->
-$Date: 2013/03/25 08:03:37 $
+$Date: 2013/05/17 17:28:30 $
<!-- timestamp end -->
</p>
</div>
Index: po/linux-and-gnu.ca.po
===================================================================
RCS file: /web/www/www/gnu/po/linux-and-gnu.ca.po,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -b -r1.40 -r1.41
--- po/linux-and-gnu.ca.po 17 May 2013 17:17:23 -0000 1.40
+++ po/linux-and-gnu.ca.po 17 May 2013 17:28:31 -0000 1.41
@@ -11,9 +11,10 @@
"PO-Revision-Date: 2013-05-17 19:00+0200\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>
@@ -280,13 +281,6 @@
# type: Content of: <p>
#. type: Content of: <p>
-#| msgid ""
-#| "Fortunately, we didn't have to wait for the Hurd, because of Linux. Once "
-#| "Torvalds freed Linux in 1992, it fit into the last major gap in the GNU "
-#| "system. People could then <a href=\"http://ftp.funet.fi/pub/linux/";
-#| "historical/kernel/old-versions/RELNOTES-0.01\"> combine Linux with the "
-#| "GNU system</a> to make a complete free system: a Linux-based version of "
-#| "the GNU system; the GNU/Linux system, for short."
msgid ""
"Fortunately, we didn't have to wait for the Hurd, because of Linux. Once "
"Torvalds freed Linux in 1992, it fit into the last major gap in the GNU "
Index: po/thegnuproject.ca-en.html
===================================================================
RCS file: /web/www/www/gnu/po/thegnuproject.ca-en.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- po/thegnuproject.ca-en.html 25 Mar 2013 07:05:05 -0000 1.5
+++ po/thegnuproject.ca-en.html 17 May 2013 17:28:31 -0000 1.6
@@ -323,8 +323,8 @@
looking for ways to make money from free software. So I announced
that I would mail a tape to whoever wanted one, for a fee of $150. In
this way, I started a free software distribution business, the
-precursor of the companies that today distribute entire Linux-based
-GNU systems.</p>
+precursor of the companies that today distribute entire GNU/Linux
+system distributions.</p>
<h3>Is a program free for every user?</h3>
<p>
@@ -1041,7 +1041,7 @@
<p>Updated:
<!-- timestamp start -->
-$Date: 2013/03/25 07:05:05 $
+$Date: 2013/05/17 17:28:31 $
<!-- timestamp end -->
</p>
</div>
Index: po/thegnuproject.ca.po
===================================================================
RCS file: /web/www/www/gnu/po/thegnuproject.ca.po,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- po/thegnuproject.ca.po 17 May 2013 17:17:23 -0000 1.29
+++ po/thegnuproject.ca.po 17 May 2013 17:28:31 -0000 1.30
@@ -11,9 +11,10 @@
"PO-Revision-Date: 2013-05-17 18:54+0200\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>
@@ -759,16 +760,6 @@
# type: Content of: <p>
#. type: Content of: <p>
-#| msgid ""
-#| "I could have said, “Find a friend who is on the net and who will "
-#| "make a copy for you.” Or I could have done what I did with the "
-#| "original PDP-10 Emacs: tell them, “Mail me a tape and a <acronym "
-#| "title=\"Self-addressed Stamped Envelope\">SASE</acronym>, and I will mail "
-#| "it back with Emacs on it.” But I had no job, and I was looking for "
-#| "ways to make money from free software. So I announced that I would mail "
-#| "a tape to whoever wanted one, for a fee of $150. In this way, I started "
-#| "a free software distribution business, the precursor of the companies "
-#| "that today distribute entire Linux-based GNU systems."
msgid ""
"I could have said, “Find a friend who is on the net and who will make "
"a copy for you.” Or I could have done what I did with the original "
@@ -782,10 +773,13 @@
msgstr ""
"Podria haver dit, \"Troba un amic que estigui a la xarxa i que et faci una "
"còpia\". O podria haver fet el que vaig fer amb l'Emacs PDP-10 original:
dir-"
-"los:\"Envieu-me una cinta i un <acronym title=\"Self-addressed Stamped
Envelope\">SASE</acronym>, i us ho retornaré amb l'Emacs\". Però jo no tenia
feina remunerada i estava cercant vies per obtenir diners del programari
lliure. Vaig decidir-me per tant a anunciar que enviaria una cinta a tothom que
ho volgués, però previ pagament de 150 $. D'aquesta "
-"manera vaig començar el negoci de la distribució de programari lliure, el "
-"precursor de les empreses que avui distribueixen sistemes complets GNU "
-"basats en Linux."
+"los:\"Envieu-me una cinta i un <acronym title=\"Self-addressed Stamped "
+"Envelope\">SASE</acronym>, i us ho retornaré amb l'Emacs\". Però jo no
tenia "
+"feina remunerada i estava cercant vies per obtenir diners del programari "
+"lliure. Vaig decidir-me per tant a anunciar que enviaria una cinta a tothom "
+"que ho volgués, però previ pagament de 150 $. D'aquesta manera vaig
començar "
+"el negoci de la distribució de programari lliure, el precursor de les "
+"empreses que avui distribueixen sistemes complets GNU basats en Linux."
# type: Content of: <h3>
#. type: Content of: <h3>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- www/gnu gnu-linux-faq.ca.html linux-and-gnu.ca....,
GNUN <=