[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
www/help/po help.el-diff.html
From: |
GNUN |
Subject: |
www/help/po help.el-diff.html |
Date: |
Fri, 15 Feb 2013 04:02:18 +0000 |
CVSROOT: /web/www
Module name: www
Changes by: GNUN <gnun> 13/02/15 04:02:18
Modified files:
help/po : help.el-diff.html
Log message:
Automatic update by GNUnited Nations.
CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/help/po/help.el-diff.html?cvsroot=www&r1=1.5&r2=1.6
Patches:
Index: help.el-diff.html
===================================================================
RCS file: /web/www/www/help/po/help.el-diff.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- help.el-diff.html 15 Feb 2013 01:01:07 -0000 1.5
+++ help.el-diff.html 15 Feb 2013 04:02:18 -0000 1.6
@@ -11,15 +11,12 @@
</style></head>
<body><pre>
<!--#include virtual="/server/header.html" -->
-<span class="inserted"><ins><em><!-- Parent-Version: 1.69
--></em></ins></span>
-
+<span class="inserted"><ins><em><!-- Parent-Version: 1.72
--></em></ins></span>
<title>How you can help the GNU Project - GNU Project - Free Software
<span class="removed"><del><strong>Foundation
(FSF)</title></strong></del></span> <span
class="inserted"><ins><em>Foundation</title></em></ins></span>
-
<!--#include virtual="/server/banner.html" -->
<!--#include virtual="/help/po/help.translist" -->
<span class="removed"><del><strong><h2>A guide to
helping</strong></del></span>
-
<span class="inserted"><ins><em><h2>Helping the GNU Project and the Free
Software Movement</h2>
<ul>
@@ -97,12 +94,12 @@
<span class="removed"><del><strong><li>When writing software for
GNU, please follow</strong></del></span>
- <span class="inserted"><ins><em><li>Please let</em></ins></span>
the <span class="removed"><del><strong><a</strong></del></span> <span
class="inserted"><ins><em>GNU Volunteer
+ <span class="inserted"><ins><em><li>Please let the GNU Volunteer
Coordinators <a
href="mailto:address@hidden"><address@hidden></a>
know if you start a new package that you found in those lists.
We want to keep track of what tasks are being worked on.</li>
- <li>When writing software for GNU, please follow the
<a</em></ins></span>
+ <li>When writing software for GNU, please
follow</em></ins></span> the <a
href="/prep/standards/">GNU Coding Standards</a> and <a
href="/prep/maintain/">Information for Maintainers of GNU
Software</a> documents.</li>
@@ -261,15 +258,15 @@
<li>
convincing your office</strong></del></span> <span
class="inserted"><ins><em>more urgent items near the top.
-Please note that many things on this list link to larger, expanded lists.
+Please note that many things on this list link</em></ins></span> to <span
class="inserted"><ins><em>larger, expanded lists.
</p>
<ul>
- <li>Help with <a
href="http://savannah.gnu.org">Savannah</a>. We are
- especially looking for technical sysadmin volunteers</em></ins></span> to
<span class="inserted"><ins><em>help with
+ <li>Help with</em></ins></span> <a <span
class="removed"><del><strong>href="http://order.fsf.org/">order</a>
+ manuals and t-shirts from</strong></del></span> <span
class="inserted"><ins><em>href="http://savannah.gnu.org">Savannah</a>.
We are
+ especially looking for technical sysadmin volunteers to help with
underlying infrastructure support. Volunteers to help with pending
- project submissions are also very welcome. Please see
this</em></ins></span> <a <span
class="removed"><del><strong>href="http://order.fsf.org/">order</a>
- manuals and t-shirts from</strong></del></span>
- <span
class="inserted"><ins><em>href="http://savannah.gnu.org/maintenance/HowToBecomeASavannahHacker">general
+ project submissions are also very welcome. Please see this <a
+
href="http://savannah.gnu.org/maintenance/HowToBecomeASavannahHacker">general
information on how to become a savannah hacker</a>. Please
communicate with us on</em></ins></span> the <span
class="removed"><del><strong>FSF.
</li>
@@ -289,24 +286,24 @@
<li id="helptranslations">Translate the GNU Web site into other
languages. More information about the issue can be found at the
<a
href="/server/standards/README.translations.html">Guide</em></ins></span> to
- <span class="inserted"><ins><em>Translating</em></ins></span> the <span
class="inserted"><ins><em>www.gnu.org Web Pages</a>. Write
to</em></ins></span> <a <span
class="removed"><del><strong>href="/fsf/fsf.html">Free Software
- Foundation</a> or some other free software development
- project. By funding development,</strong></del></span>
+ <span class="inserted"><ins><em>Translating</em></ins></span> the <span
class="inserted"><ins><em>www.gnu.org Web Pages</a>. Write
to</em></ins></span> <a <span
class="removed"><del><strong>href="/fsf/fsf.html">Free</strong></del></span>
<span
class="inserted"><ins><em>href="mailto:address@hidden"><address@hidden></a>
if
you want to help.</li>
- <li>Tell others about the GNU Project and the Free Software
- Foundation by:
+ <li>Tell others about the GNU Project and the Free</em></ins></span>
Software
+ <span class="removed"><del><strong>Foundation</a> or some other
free software development
+ project. By funding development,</strong></del></span>
+ <span class="inserted"><ins><em>Foundation by:
<ul>
<li>When you are talking with people that don't value freedom and
- community,</em></ins></span> you can <span
class="removed"><del><strong>advance</strong></del></span> <span
class="inserted"><ins><em>show them</em></ins></span> the
- <span class="removed"><del><strong>world</strong></del></span> <span
class="inserted"><ins><em>many practical advantages</em></ins></span> of free
<span class="removed"><del><strong>software.
+ community,</em></ins></span> you can <span
class="removed"><del><strong>advance</strong></del></span> <span
class="inserted"><ins><em>show them the many practical advantages of free
+ software (see <a href="http://www.dwheeler.com/oss_fs_why.html">Why
+ Open Source / Free Software? Look at</em></ins></span> the
+ <span class="removed"><del><strong>world of free software.
<p>
- <strong>Distributing free</strong></del></span>
- software <span class="removed"><del><strong>is an opportunity to raise
- funds</strong></del></span> <span class="inserted"><ins><em>(see <a
href="http://www.dwheeler.com/oss_fs_why.html">Why
- Open Source / Free Software? Look at the
Numbers!</a></em></ins></span> for <span
class="removed"><del><strong>development.</strong></del></span> <span
class="inserted"><ins><em>some
+ <strong>Distributing free software is an opportunity to raise
+ funds</strong></del></span> <span
class="inserted"><ins><em>Numbers!</a></em></ins></span> for <span
class="removed"><del><strong>development.</strong></del></span> <span
class="inserted"><ins><em>some
useful evidence). But keep mentioning the ethical issues
too!</em></ins></span>
Don't <span class="removed"><del><strong>waste it!</strong>
</p></li>
@@ -327,12 +324,14 @@
<a href="mailto:address@hidden"><address@hidden></a>.
</li>
- <span class="removed"><del><strong><li>Donate</strong></del></span>
-
- <span class="inserted"><ins><em><li>Donate <a
href="/help/help-hardware.html">hardware</a> to the
+ <li>Donate <a
href="/help/help-hardware.html">hardware</a> to the
FSF.</li>
- <li>Take on one of the <a
href="/server/tasks.html">jobs</a> we need
+ <li>Take on one of the <a <span
class="removed"><del><strong>href="/server/tasks.html">jobs</a> we need
+ done for this <a href="/server/server.html">web
server</a>.</li>
+
+ <li id="ServiceDirectory">If you or your company work
+ supporting</strong></del></span> <span
class="inserted"><ins><em>href="/server/tasks.html">jobs</a> we need
done for this <a href="/server/server.html">web
server</a>.</li>
<li id="ServiceDirectory">If you or your company work
@@ -377,27 +376,20 @@
signature, software project, and writings.
</li>
- <li></em></ins></span>
- <a <span
class="removed"><del><strong>href="/help/help-hardware.html">hardware</a></strong></del></span>
<span
class="inserted"><ins><em>href="http://order.fsf.org/">Order</a>
manuals,
+ <li>
+ <a href="http://order.fsf.org/">Order</a> manuals,
t-shirts, stickers and gear from the FSF.
</li>
<li>
- Convince your office</em></ins></span> to <span
class="inserted"><ins><em><a href="http://order.fsf.org/">order</a>
- manuals and t-shirts from</em></ins></span> the
- <span class="removed"><del><strong>FSF.</li>
-
- <li>Take on one</strong></del></span> <span
class="inserted"><ins><em>FSF.
+ Convince your office to <a
href="http://order.fsf.org/">order</a>
+ manuals and t-shirts from the FSF.
</li>
<li>
<a href="/philosophy/selling.html">Sell free
- software</a> and donating a part</em></ins></span> of the <span
class="inserted"><ins><em>proceeds to
- the</em></ins></span> <a <span
class="removed"><del><strong>href="/server/tasks.html">jobs</a> we need
- done for this <a href="/server/server.html">web
server</a>.</li>
-
- <li id="ServiceDirectory">If you or your company work
- supporting</strong></del></span> <span
class="inserted"><ins><em>href="/fsf/fsf.html">Free Software
+ software</a> and donating a part of the proceeds to
+ the <a href="/fsf/fsf.html">Free Software
Foundation</a></em></ins></span> or <span
class="removed"><del><strong>developing</strong></del></span> <span
class="inserted"><ins><em>some other</em></ins></span> free software <span
class="removed"><del><strong>in some way,</strong></del></span> <span
class="inserted"><ins><em>development
project. By funding development,</em></ins></span> you can <span
class="removed"><del><strong>list
yourself (or your company) in</strong></del></span> <span
class="inserted"><ins><em>advance</em></ins></span> the <span
class="removed"><del><strong><a href="/prep/service.html">GNU
@@ -414,25 +406,14 @@
<strong>Distributing free software is an
opportunity</em></ins></span> to <span class="removed"><del><strong>contact
companies looking</strong></del></span> <span class="inserted"><ins><em>raise
funds</em></ins></span> for <span class="removed"><del><strong>additional
job postings
to put on our <a href="http://www.fsf.org/resources/jobs/">Free
- Software Job Page</a>.</strong></del></span> <span
class="inserted"><ins><em>development. Don't waste it!</strong>
- </p></li>
-</ul>
-
-<!--</em></ins></span> If <span class="removed"><del><strong>you
would</strong></del></span> <span class="inserted"><ins><em>needed, change the
copyright block at the bottom. In general,
- pages on the GNU web server should</em></ins></span> be <span
class="removed"><del><strong>interested</strong></del></span> <span
class="inserted"><ins><em>under CC BY-ND 3.0 US.
- 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 document
- was modified, or published. -->
-
-</div><!-- for id="content", starts</em></ins></span> in <span
class="removed"><del><strong>this, please
- contact <a
href="mailto:address@hidden"><address@hidden></a>.</li>
-
+ Software Job Page</a>. If you would be interested in this, please
+ contact <a
href="mailto:address@hidden"><address@hidden></a>.</li></strong></del></span>
<span class="inserted"><ins><em>development. Don't waste it!</strong>
+ </p></li></em></ins></span>
</ul>
-</div></strong></del></span> <span class="inserted"><ins><em>the include
above --></em></ins></span>
+<span class="removed"><del><strong></div></strong></del></span>
+<span class="inserted"><ins><em></div><!-- for id="content", starts
in the include above --></em></ins></span>
<!--#include virtual="/server/footer.html" -->
<div id="footer">
<span class="removed"><del><strong><p>
@@ -445,7 +426,10 @@
<span class="removed"><del><strong><br />
Please send broken</strong></del></span> <span
class="inserted"><ins><em>Broken</em></ins></span> links and other corrections
or suggestions <span class="inserted"><ins><em>can be sent</em></ins></span>
to <a <span
class="removed"><del><strong>href="mailto:address@hidden"><em>address@hidden</em></a>.
-</p></strong></del></span> <span
class="inserted"><ins><em>href="mailto:address@hidden"><address@hidden></a>.</p>
+</p>
+
+<p>
+Copyright</strong></del></span> <span
class="inserted"><ins><em>href="mailto:address@hidden"><address@hidden></a>.</p>
<p><!-- TRANSLATORS: Ignore the original text in this paragraph,
replace it with the translation of these two:
@@ -460,30 +444,47 @@
our web pages, see <a
href="/server/standards/README.translations.html">Translations
README</a>. -->
-
Please see the <a
href="/server/standards/README.translations.html">Translations
README</a> for information on coordinating and submitting translations
-of this article.</p></em></ins></span>
+of this article.</p>
-<p>
-Copyright © 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-2005, 2006, 2007, <span
class="removed"><del><strong>2008</strong></del></span> <span
class="inserted"><ins><em>2008, 2013</em></ins></span> Free Software
Foundation, Inc.
+<!-- 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
+ 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
+ document was modified, or published.
+
+ If you wish to list earlier years, that is ok too.
+ Either "2001, 2002, 2003" or "2001-2003" are ok for specifying
+ years, as long as each year in the range is in fact a copyrightable
+ year, i.e., a year in which the document was published (including
+ being publicly visible on the web or in a revision control system).
+
+ There is more detail about copyright years in the GNU Maintainers
+ Information document, www.gnu.org/prep/maintain. -->
+
+<p>Copyright</em></ins></span> © 1996, 1997, 1998, 1999, 2000,
2001, 2002, 2003,
+2004, 2005, 2006, 2007, <span
class="removed"><del><strong>2008</strong></del></span> <span
class="inserted"><ins><em>2008, 2013</em></ins></span> Free Software
Foundation, <span class="removed"><del><strong>Inc.
<br />
-This page is licensed under a <a rel="license"
+This</strong></del></span> <span class="inserted"><ins><em>Inc.</p>
+
+<p>This</em></ins></span> 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>.
+Commons Attribution-NoDerivs 3.0 United States <span
class="removed"><del><strong>License</a>.
</p>
<p>
-Updated:
+Updated:</strong></del></span> <span
class="inserted"><ins><em>License</a>.</p>
+
+<p>Updated:</em></ins></span>
<!-- timestamp start -->
-$Date: 2013/02/15 01:01:07 $
+$Date: 2013/02/15 04:02:18 $
<!-- timestamp end -->
</p>
-
</div>
-
</div>
</body>
</html>
- www/help/po help.el-diff.html,
GNUN <=