www-commits
[Top][All Lists]
Advanced

[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>
 &lt;!--#include virtual="/server/header.html" --&gt;
-<span class="inserted"><ins><em>&lt;!-- Parent-Version: 1.69 
--&gt;</em></ins></span>
-
+<span class="inserted"><ins><em>&lt;!-- Parent-Version: 1.72 
--&gt;</em></ins></span>
 &lt;title&gt;How you can help the GNU Project - GNU Project - Free Software 
<span class="removed"><del><strong>Foundation 
(FSF)&lt;/title&gt;</strong></del></span> <span 
class="inserted"><ins><em>Foundation&lt;/title&gt;</em></ins></span>
-
 &lt;!--#include virtual="/server/banner.html" --&gt;
 &lt;!--#include virtual="/help/po/help.translist" --&gt;
 
 <span class="removed"><del><strong>&lt;h2&gt;A guide to 
helping</strong></del></span>
-
 <span class="inserted"><ins><em>&lt;h2&gt;Helping the GNU Project and the Free 
Software Movement&lt;/h2&gt;
 
 &lt;ul&gt;
@@ -97,12 +94,12 @@
 
         <span class="removed"><del><strong>&lt;li&gt;When writing software for 
GNU, please follow</strong></del></span>
 
-       <span class="inserted"><ins><em>&lt;li&gt;Please let</em></ins></span> 
the <span class="removed"><del><strong>&lt;a</strong></del></span> <span 
class="inserted"><ins><em>GNU Volunteer
+       <span class="inserted"><ins><em>&lt;li&gt;Please let the GNU Volunteer
        Coordinators &lt;a 
href="mailto:address@hidden"&gt;&lt;address@hidden&gt;&lt;/a&gt;
        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.&lt;/li&gt;
 
-        &lt;li&gt;When writing software for GNU, please follow the 
&lt;a</em></ins></span>
+        &lt;li&gt;When writing software for GNU, please 
follow</em></ins></span> the &lt;a
         href="/prep/standards/"&gt;GNU Coding Standards&lt;/a&gt; and &lt;a
         href="/prep/maintain/"&gt;Information for Maintainers of GNU
         Software&lt;/a&gt; documents.&lt;/li&gt;
@@ -261,15 +258,15 @@
 
         &lt;li&gt;
         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.
 &lt;/p&gt;
 &lt;ul&gt;
-  &lt;li&gt;Help with &lt;a 
href="http://savannah.gnu.org"&gt;Savannah&lt;/a&gt;. We are
-  especially looking for technical sysadmin volunteers</em></ins></span> to 
<span class="inserted"><ins><em>help with
+  &lt;li&gt;Help with</em></ins></span> &lt;a <span 
class="removed"><del><strong>href="http://order.fsf.org/"&gt;order&lt;/a&gt;
+        manuals and t-shirts from</strong></del></span> <span 
class="inserted"><ins><em>href="http://savannah.gnu.org"&gt;Savannah&lt;/a&gt;. 
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> &lt;a <span 
class="removed"><del><strong>href="http://order.fsf.org/"&gt;order&lt;/a&gt;
-        manuals and t-shirts from</strong></del></span>
-  <span 
class="inserted"><ins><em>href="http://savannah.gnu.org/maintenance/HowToBecomeASavannahHacker"&gt;general
+  project submissions are also very welcome.  Please see this &lt;a
+  
href="http://savannah.gnu.org/maintenance/HowToBecomeASavannahHacker"&gt;general
   information on how to become a savannah hacker&lt;/a&gt;.  Please
   communicate with us on</em></ins></span> the <span 
class="removed"><del><strong>FSF.
         &lt;/li&gt;
@@ -289,24 +286,24 @@
     &lt;li id="helptranslations"&gt;Translate the GNU Web site into other
     languages.  More information about the issue can be found at the
     &lt;a 
href="/server/standards/README.translations.html"&gt;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&lt;/a&gt;.  Write 
to</em></ins></span> &lt;a <span 
class="removed"><del><strong>href="/fsf/fsf.html"&gt;Free Software
-        Foundation&lt;/a&gt; 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&lt;/a&gt;.  Write 
to</em></ins></span> &lt;a <span 
class="removed"><del><strong>href="/fsf/fsf.html"&gt;Free</strong></del></span>
     <span 
class="inserted"><ins><em>href="mailto:address@hidden"&gt;&lt;address@hidden&gt;&lt;/a&gt;
 if
     you want to help.&lt;/li&gt;
 
-    &lt;li&gt;Tell others about the GNU Project and the Free Software
-    Foundation by:
+    &lt;li&gt;Tell others about the GNU Project and the Free</em></ins></span> 
Software
+        <span class="removed"><del><strong>Foundation&lt;/a&gt; or some other 
free software development
+        project. By funding development,</strong></del></span>
+    <span class="inserted"><ins><em>Foundation by:
     &lt;ul&gt;
 
     &lt;li&gt;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 &lt;a href="http://www.dwheeler.com/oss_fs_why.html"&gt;Why
+    Open Source / Free Software? Look at</em></ins></span> the
+        <span class="removed"><del><strong>world of free software.
         &lt;p&gt;
-        &lt;strong&gt;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 &lt;a 
href="http://www.dwheeler.com/oss_fs_why.html"&gt;Why
-    Open Source / Free Software? Look at the 
Numbers!&lt;/a&gt;</em></ins></span> for <span 
class="removed"><del><strong>development.</strong></del></span> <span 
class="inserted"><ins><em>some
+        &lt;strong&gt;Distributing free software is an opportunity to raise
+        funds</strong></del></span> <span 
class="inserted"><ins><em>Numbers!&lt;/a&gt;</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!&lt;/strong&gt;
         &lt;/p&gt;&lt;/li&gt;
@@ -327,12 +324,14 @@
     &lt;a href="mailto:address@hidden"&gt;&lt;address@hidden&gt;&lt;/a&gt;.
     &lt;/li&gt;
 
-    <span class="removed"><del><strong>&lt;li&gt;Donate</strong></del></span>
-
-    <span class="inserted"><ins><em>&lt;li&gt;Donate &lt;a 
href="/help/help-hardware.html"&gt;hardware&lt;/a&gt; to the
+    &lt;li&gt;Donate &lt;a 
href="/help/help-hardware.html"&gt;hardware&lt;/a&gt; to the
     FSF.&lt;/li&gt;
 
-    &lt;li&gt;Take on one of the &lt;a 
href="/server/tasks.html"&gt;jobs&lt;/a&gt; we need
+    &lt;li&gt;Take on one of the &lt;a <span 
class="removed"><del><strong>href="/server/tasks.html"&gt;jobs&lt;/a&gt; we need
+    done for this &lt;a href="/server/server.html"&gt;web 
server&lt;/a&gt;.&lt;/li&gt;
+
+    &lt;li id="ServiceDirectory"&gt;If you or your company work
+    supporting</strong></del></span> <span 
class="inserted"><ins><em>href="/server/tasks.html"&gt;jobs&lt;/a&gt; we need
     done for this &lt;a href="/server/server.html"&gt;web 
server&lt;/a&gt;.&lt;/li&gt;
 
     &lt;li id="ServiceDirectory"&gt;If you or your company work
@@ -377,27 +376,20 @@
     signature, software project, and writings.
     &lt;/li&gt;
 
-    &lt;li&gt;</em></ins></span>
-    &lt;a <span 
class="removed"><del><strong>href="/help/help-hardware.html"&gt;hardware&lt;/a&gt;</strong></del></span>
 <span 
class="inserted"><ins><em>href="http://order.fsf.org/"&gt;Order&lt;/a&gt; 
manuals,
+    &lt;li&gt;
+    &lt;a href="http://order.fsf.org/"&gt;Order&lt;/a&gt; manuals,
     t-shirts, stickers and gear from the FSF.
     &lt;/li&gt;
 
     &lt;li&gt;
-    Convince your office</em></ins></span> to <span 
class="inserted"><ins><em>&lt;a href="http://order.fsf.org/"&gt;order&lt;/a&gt;
-    manuals and t-shirts from</em></ins></span> the
-    <span class="removed"><del><strong>FSF.&lt;/li&gt;
-
-    &lt;li&gt;Take on one</strong></del></span> <span 
class="inserted"><ins><em>FSF.
+    Convince your office to &lt;a 
href="http://order.fsf.org/"&gt;order&lt;/a&gt;
+    manuals and t-shirts from the FSF.
     &lt;/li&gt;
 
     &lt;li&gt;
     &lt;a href="/philosophy/selling.html"&gt;Sell free
-    software&lt;/a&gt; and donating a part</em></ins></span> of the <span 
class="inserted"><ins><em>proceeds to
-    the</em></ins></span> &lt;a <span 
class="removed"><del><strong>href="/server/tasks.html"&gt;jobs&lt;/a&gt; we need
-    done for this &lt;a href="/server/server.html"&gt;web 
server&lt;/a&gt;.&lt;/li&gt;
-
-    &lt;li id="ServiceDirectory"&gt;If you or your company work
-    supporting</strong></del></span> <span 
class="inserted"><ins><em>href="/fsf/fsf.html"&gt;Free Software
+    software&lt;/a&gt; and donating a part of the proceeds to
+    the &lt;a href="/fsf/fsf.html"&gt;Free Software
     Foundation&lt;/a&gt;</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>&lt;a href="/prep/service.html"&gt;GNU
@@ -414,25 +406,14 @@
     &lt;strong&gt;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 &lt;a href="http://www.fsf.org/resources/jobs/"&gt;Free
-    Software Job Page&lt;/a&gt;.</strong></del></span> <span 
class="inserted"><ins><em>development.  Don't waste it!&lt;/strong&gt;
-    &lt;/p&gt;&lt;/li&gt;
-&lt;/ul&gt;
-
-&lt;!--</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. --&gt;
-
-&lt;/div&gt;&lt;!-- for id="content", starts</em></ins></span> in <span 
class="removed"><del><strong>this, please
-    contact &lt;a 
href="mailto:address@hidden"&gt;&lt;address@hidden&gt;&lt;/a&gt;.&lt;/li&gt;
-
+    Software Job Page&lt;/a&gt;.  If you would be interested in this, please
+    contact &lt;a 
href="mailto:address@hidden"&gt;&lt;address@hidden&gt;&lt;/a&gt;.&lt;/li&gt;</strong></del></span>
 <span class="inserted"><ins><em>development.  Don't waste it!&lt;/strong&gt;
+    &lt;/p&gt;&lt;/li&gt;</em></ins></span>
 &lt;/ul&gt;
 
-&lt;/div&gt;</strong></del></span> <span class="inserted"><ins><em>the include 
above --&gt;</em></ins></span>
+<span class="removed"><del><strong>&lt;/div&gt;</strong></del></span>
 
+<span class="inserted"><ins><em>&lt;/div&gt;&lt;!-- for id="content", starts 
in the include above --&gt;</em></ins></span>
 &lt;!--#include virtual="/server/footer.html" --&gt;
 &lt;div id="footer"&gt;
 <span class="removed"><del><strong>&lt;p&gt;
@@ -445,7 +426,10 @@
 <span class="removed"><del><strong>&lt;br /&gt;
 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 &lt;a <span 
class="removed"><del><strong>href="mailto:address@hidden"&gt;&lt;em&gt;address@hidden&lt;/em&gt;&lt;/a&gt;.
-&lt;/p&gt;</strong></del></span> <span 
class="inserted"><ins><em>href="mailto:address@hidden"&gt;&lt;address@hidden&gt;&lt;/a&gt;.&lt;/p&gt;
+&lt;/p&gt;
+
+&lt;p&gt;
+Copyright</strong></del></span> <span 
class="inserted"><ins><em>href="mailto:address@hidden"&gt;&lt;address@hidden&gt;&lt;/a&gt;.&lt;/p&gt;
 
 &lt;p&gt;&lt;!-- TRANSLATORS: Ignore the original text in this paragraph,
         replace it with the translation of these two:
@@ -460,30 +444,47 @@
         our web pages, see &lt;a
         href="/server/standards/README.translations.html"&gt;Translations
         README&lt;/a&gt;. --&gt;
-
 Please see the &lt;a
 href="/server/standards/README.translations.html"&gt;Translations
 README&lt;/a&gt; for information on coordinating and submitting translations
-of this article.&lt;/p&gt;</em></ins></span>
+of this article.&lt;/p&gt;
 
-&lt;p&gt;
-Copyright &copy; 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.
+&lt;!-- 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. --&gt;
+
+&lt;p&gt;Copyright</em></ins></span> &copy; 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.
 &lt;br /&gt;
-This page is licensed under a &lt;a rel="license"
+This</strong></del></span> <span class="inserted"><ins><em>Inc.&lt;/p&gt;
+
+&lt;p&gt;This</em></ins></span> page is licensed under a &lt;a rel="license"
 href="http://creativecommons.org/licenses/by-nd/3.0/us/"&gt;Creative
-Commons Attribution-NoDerivs 3.0 United States License&lt;/a&gt;.
+Commons Attribution-NoDerivs 3.0 United States <span 
class="removed"><del><strong>License&lt;/a&gt;.
 &lt;/p&gt;
 
 &lt;p&gt;
-Updated:
+Updated:</strong></del></span> <span 
class="inserted"><ins><em>License&lt;/a&gt;.&lt;/p&gt;
+
+&lt;p&gt;Updated:</em></ins></span>
 &lt;!-- timestamp start --&gt;
-$Date: 2013/02/15 01:01:07 $
+$Date: 2013/02/15 04:02:18 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
-
 &lt;/div&gt;
-
 &lt;/div&gt;
 &lt;/body&gt;
 &lt;/html&gt;



reply via email to

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