www-commits
[Top][All Lists]
Advanced

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

www/fun/jokes fsf-in-german.uk.html purchase.ag...


From: GNUN
Subject: www/fun/jokes fsf-in-german.uk.html purchase.ag...
Date: Mon, 13 Sep 2021 12:04:14 -0400 (EDT)

CVSROOT:        /web/www
Module name:    www
Changes by:     GNUN <gnun>     21/09/13 12:04:14

Modified files:
        fun/jokes      : fsf-in-german.uk.html 
                         purchase.agreement.de.html 
                         users-lightbulb.de.html 
        fun/jokes/po   : fsf-in-german.uk-diff.html 
                         purchase.agreement.de-diff.html 
                         users-lightbulb.de-diff.html 

Log message:
        Automatic update by GNUnited Nations.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/jokes/fsf-in-german.uk.html?cvsroot=www&r1=1.5&r2=1.6
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/jokes/purchase.agreement.de.html?cvsroot=www&r1=1.44&r2=1.45
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/jokes/users-lightbulb.de.html?cvsroot=www&r1=1.6&r2=1.7
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/jokes/po/fsf-in-german.uk-diff.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/jokes/po/purchase.agreement.de-diff.html?cvsroot=www&r1=1.2&r2=1.3
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/jokes/po/users-lightbulb.de-diff.html?cvsroot=www&r1=1.2&r2=1.3

Patches:
Index: fsf-in-german.uk.html
===================================================================
RCS file: /web/www/www/fun/jokes/fsf-in-german.uk.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- fsf-in-german.uk.html       31 May 2021 20:31:26 -0000      1.5
+++ fsf-in-german.uk.html       13 Sep 2021 16:04:10 -0000      1.6
@@ -1,4 +1,9 @@
-<!--#set var="ENGLISH_PAGE" value="/fun/jokes/fsf-in-german.en.html" -->
+<!--#set var="PO_FILE"
+ value='<a href="/fun/jokes/po/fsf-in-german.uk.po">
+ https://www.gnu.org/fun/jokes/po/fsf-in-german.uk.po</a>'
+ --><!--#set var="ORIGINAL_FILE" value="/fun/jokes/fsf-in-german.html"
+ --><!--#set var="DIFF_FILE" value="/fun/jokes/po/fsf-in-german.uk-diff.html"
+ --><!--#set var="OUTDATED_SINCE" value="2021-07-15" --><!--#set 
var="ENGLISH_PAGE" value="/fun/jokes/fsf-in-german.en.html" -->
 <!--#include virtual="/server/header.uk.html" -->
 
 <!-- This file is automatically generated by GNUnited Nations! -->
@@ -6,6 +11,7 @@
 
 <!--#include virtual="/fun/jokes/po/fsf-in-german.translist" -->
 <!--#include virtual="/server/banner.uk.html" -->
+<!--#include virtual="/server/outdated.uk.html" -->
 <h2>ФВПЗ німецькою</h2>
 
 <blockquote><pre>
@@ -70,7 +76,7 @@
 <p><!-- timestamp start -->
 Оновлено:
 
-$Date: 2021/05/31 20:31:26 $
+$Date: 2021/09/13 16:04:10 $
 
 <!-- timestamp end -->
 </p>

Index: purchase.agreement.de.html
===================================================================
RCS file: /web/www/www/fun/jokes/purchase.agreement.de.html,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -b -r1.44 -r1.45
--- purchase.agreement.de.html  30 Apr 2021 17:04:19 -0000      1.44
+++ purchase.agreement.de.html  13 Sep 2021 16:04:10 -0000      1.45
@@ -1,4 +1,9 @@
-<!--#set var="ENGLISH_PAGE" value="/fun/jokes/purchase.agreement.en.html" -->
+<!--#set var="PO_FILE"
+ value='<a href="/fun/jokes/po/purchase.agreement.de.po">
+ https://www.gnu.org/fun/jokes/po/purchase.agreement.de.po</a>'
+ --><!--#set var="ORIGINAL_FILE" value="/fun/jokes/purchase.agreement.html"
+ --><!--#set var="DIFF_FILE" 
value="/fun/jokes/po/purchase.agreement.de-diff.html"
+ --><!--#set var="OUTDATED_SINCE" value="2021-07-15" --><!--#set 
var="ENGLISH_PAGE" value="/fun/jokes/purchase.agreement.en.html" -->
 
 <!--#include virtual="/server/header.de.html" -->
 <!-- Parent-Version: 1.77 -->
@@ -8,6 +13,7 @@
 
 <!--#include virtual="/fun/jokes/po/purchase.agreement.translist" -->
 <!--#include virtual="/server/banner.de.html" -->
+<!--#include virtual="/server/outdated.de.html" -->
 <h2>Haftungsausschluss</h2>
 
 <p><a href="/graphics/gleesons"><img src="/graphics/gleeson_head.jpg"
@@ -158,7 +164,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Letzte Änderung:
 
-$Date: 2021/04/30 17:04:19 $
+$Date: 2021/09/13 16:04:10 $
 
 <!-- timestamp end -->
 </p>

Index: users-lightbulb.de.html
===================================================================
RCS file: /web/www/www/fun/jokes/users-lightbulb.de.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- users-lightbulb.de.html     30 Apr 2021 17:04:19 -0000      1.6
+++ users-lightbulb.de.html     13 Sep 2021 16:04:13 -0000      1.7
@@ -1,4 +1,9 @@
-<!--#set var="ENGLISH_PAGE" value="/fun/jokes/users-lightbulb.en.html" -->
+<!--#set var="PO_FILE"
+ value='<a href="/fun/jokes/po/users-lightbulb.de.po">
+ https://www.gnu.org/fun/jokes/po/users-lightbulb.de.po</a>'
+ --><!--#set var="ORIGINAL_FILE" value="/fun/jokes/users-lightbulb.html"
+ --><!--#set var="DIFF_FILE" value="/fun/jokes/po/users-lightbulb.de-diff.html"
+ --><!--#set var="OUTDATED_SINCE" value="2021-07-15" --><!--#set 
var="ENGLISH_PAGE" value="/fun/jokes/users-lightbulb.en.html" -->
 
 <!--#include virtual="/server/header.de.html" -->
 <!-- Parent-Version: 1.77 -->
@@ -9,6 +14,7 @@
 
 <!--#include virtual="/fun/jokes/po/users-lightbulb.translist" -->
 <!--#include virtual="/server/banner.de.html" -->
+<!--#include virtual="/server/outdated.de.html" -->
 <h2>Wie viele GNU/Linux-Nutzer braucht man, um eine Glühbirne zu 
wechseln?</h2>
 
 <ul>
@@ -165,7 +171,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Letzte Änderung:
 
-$Date: 2021/04/30 17:04:19 $
+$Date: 2021/09/13 16:04:13 $
 
 <!-- timestamp end -->
 </p>

Index: po/fsf-in-german.uk-diff.html
===================================================================
RCS file: /web/www/www/fun/jokes/po/fsf-in-german.uk-diff.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- po/fsf-in-german.uk-diff.html       3 Aug 2019 07:00:15 -0000       1.1
+++ po/fsf-in-german.uk-diff.html       13 Sep 2021 16:04:14 -0000      1.2
@@ -11,26 +11,44 @@
 </style></head>
 <body><pre>
 &lt;!--#include virtual="/server/header.html" --&gt;
-&lt;title&gt;FSF in German - GNU Project - Free Software Foundation 
(FSF)&lt;/title&gt;
+<span class="inserted"><ins><em>&lt;!-- Parent-Version: 1.96 --&gt;
+&lt;!-- This page is derived from /server/standards/boilerplate.html --&gt;
+&lt;!--#set var="DISABLE_TOP_ADDENDUM" value="yes" --&gt;</em></ins></span>
+&lt;title&gt;FSF in German - 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="/fun/jokes/po/fsf-in-german.translist" --&gt;
 &lt;!--#include virtual="/server/banner.html" --&gt;
+<span class="inserted"><ins><em>&lt;div class="breadcrumb" 
role="navigation"&gt;
+ &lt;a href="/"&gt;&lt;img src="/graphics/icons/home.png" height="26" 
width="26"
+    alt="GNU Home" title="GNU Home" /&gt;&lt;/a&gt;&nbsp;/
+ &lt;a href="/fun/humor.html#content"&gt;GNU humor&lt;/a&gt;&nbsp;/
+ &lt;a 
href="/fun/humor.html#Dictionary"&gt;Dictionary&nbsp;&amp;&nbsp;word&nbsp;play&lt;/a&gt;&nbsp;/
+&lt;/div&gt;
+&lt;!--GNUN: OUT-OF-DATE NOTICE--&gt;
+&lt;!--#include virtual="/server/top-addendum.html" --&gt;
+&lt;div class="reduced-width"&gt;</em></ins></span>
 &lt;h2&gt;FSF in German&lt;/h2&gt;
 
-&lt;blockquote&gt;&lt;pre&gt;
-Date: Fri, 7 May 93 21:30:47 PDT
+<span 
class="removed"><del><strong>&lt;blockquote&gt;&lt;pre&gt;</strong></del></span>
+
+<span class="inserted"><ins><em>&lt;p class="infobox"&gt;
+From: Paul Rubin&lt;br /&gt;
+To: rms@ai.mit.edu&lt;br /&gt;
+Subject: FSF&lt;br /&gt;</em></ins></span>
+Date: Fri, 7 May 93 21:30:47 <span class="removed"><del><strong>PDT
 From: phr@america.telebit.com (Paul Rubin)
 To: rms@ai.mit.edu
 Subject: FSF
-&lt;/pre&gt;
+&lt;/pre&gt;</strong></del></span> <span 
class="inserted"><ins><em>PDT&lt;/p&gt;</em></ins></span>
 
-&lt;p&gt;Did you know that FSF in Germany stands for &ldquo;Fisch sucht
-Fahrrad&rdquo;"?  Translation: fish seeks bicycle.  An FSF-party is a
+&lt;p&gt;Did you know that FSF in Germany stands for <span 
class="removed"><del><strong>&ldquo;Fisch</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;&lt;i&gt;Fisch</em></ins></span> sucht
+<span class="removed"><del><strong>Fahrrad&rdquo;"?</strong></del></span>
+<span class="inserted"><ins><em>Fahrrad&lt;/i&gt;&rdquo;?</em></ins></span>  
Translation: fish seeks bicycle.  An FSF-party is a
 singles gathering, I think.&lt;/p&gt;
 
 &lt;p&gt;I'm not sure whether the expression is widely used.&lt;/p&gt;
-&lt;/blockquote&gt;
+<span class="removed"><del><strong>&lt;/blockquote&gt;
 
-&lt;p&gt;This joke is also available in &lt;a <span 
class="removed"><del><strong>href="/fun/jokes/fsf-in-german"&gt;</strong></del></span>
 <span 
class="inserted"><ins><em>href="/fun/jokes/fsf-in-german.txt"&gt;</em></ins></span>
+&lt;p&gt;This joke is also available in &lt;a 
href="/fun/jokes/fsf-in-german.txt"&gt;
 plain text&lt;/a&gt;.&lt;/p&gt;
 
 &lt;p&gt;&lt;a href="/fun/humor.html"&gt;Other humor&lt;/a&gt; in the GNU Humor
@@ -39,39 +57,69 @@
 &lt;h4 id="Disclaimer"&gt;Disclaimer&lt;/h4&gt;
 &lt;p&gt;The joke on this page was obtained from the
 FSF's &lt;a href="http://lists.gnu.org/"&gt;email archives&lt;/a&gt; of the GNU
-Project.&lt;/p&gt;
+Project.&lt;/p&gt;</strong></del></span>
+
+<span class="inserted"><ins><em>&lt;p class="button right-align"&gt;&lt;a 
href="/fun/jokes/fsf-in-german.txt"&gt;Original
+email&lt;/a&gt;&lt;/p&gt;
+
+&lt;div class="infobox" role="contentinfo"&gt;
+&lt;hr /&gt;
+&lt;h3 id="Disclaimer"&gt;Disclaimer&lt;/h3&gt;</em></ins></span>
 &lt;p&gt;The Free Software Foundation claims no copyright on this 
joke.&lt;/p&gt;
 &lt;/div&gt;
+<span class="inserted"><ins><em>&lt;/div&gt;
 
+&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;
+&lt;div <span class="removed"><del><strong>id="footer"&gt;
 &lt;p&gt;
-Please send FSF &amp; GNU inquiries to
-&lt;a href="mailto:gnu@gnu.org"&gt;&lt;gnu@gnu.org&gt;&lt;/a&gt;.  There are
-also &lt;a href="/contact/"&gt;other ways to contact&lt;/a&gt; the FSF.
-&lt;br /&gt;
-Please send broken links and other corrections or suggestions to
-&lt;a href="mailto:webmasters@gnu.org"&gt;&lt;webmasters@gnu.org&gt;&lt;/a&gt;.
-&lt;/p&gt;
+Please</strong></del></span> <span class="inserted"><ins><em>id="footer" 
role="contentinfo"&gt;
+&lt;div class="unprintable"&gt;
 
-&lt;p&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;Please</em></ins></span> send <span 
class="inserted"><ins><em>general</em></ins></span> FSF &amp; GNU inquiries to
+&lt;a href="mailto:gnu@gnu.org"&gt;&lt;gnu@gnu.org&gt;&lt;/a&gt;.
+There are also &lt;a href="/contact/"&gt;other ways to contact&lt;/a&gt;
+the FSF.
+<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:webmasters@gnu.org"&gt;&lt;webmasters@gnu.org&gt;&lt;/a&gt;.
 &lt;/p&gt;
 
+&lt;p&gt;</strong></del></span> <span 
class="inserted"><ins><em>href="mailto:webmasters@gnu.org"&gt;&lt;webmasters@gnu.org&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:
+
+        We work hard and do our best to provide accurate, good quality
+        translations.  However, we are not exempt from imperfection.
+        Please send your comments and general suggestions in this regard
+        to &lt;a href="mailto:web-translators@gnu.org"&gt;
+        &lt;web-translators@gnu.org&gt;&lt;/a&gt;.&lt;/p&gt;
+
+        &lt;p&gt;For information on coordinating and contributing translations 
of
+        our web pages, see &lt;a
+        href="/server/standards/README.translations.html"&gt;Translations
+        README&lt;/a&gt;. --&gt;</em></ins></span>
+Please see the &lt;a
+href="/server/standards/README.translations.html"&gt;Translations
+README&lt;/a&gt; for information on coordinating and <span 
class="removed"><del><strong>submitting</strong></del></span> <span 
class="inserted"><ins><em>contributing</em></ins></span> translations
+of this <span class="removed"><del><strong>article.
+&lt;/p&gt;</strong></del></span> <span 
class="inserted"><ins><em>article.&lt;/p&gt;
+&lt;/div&gt;</em></ins></span>
+
 &lt;!--#include virtual="/server/bottom-notes.html" --&gt;
 
-&lt;p&gt;Updated:
+<span class="removed"><del><strong>&lt;p&gt;Updated:</strong></del></span>
+
+<span class="inserted"><ins><em>&lt;p 
class="unprintable"&gt;Updated:</em></ins></span>
 &lt;!-- timestamp start --&gt;
-$Date: 2019/08/03 07:00:15 $
+$Date: 2021/09/13 16:04:14 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;
 
-&lt;/div&gt;
+<span class="removed"><del><strong>&lt;/div&gt;</strong></del></span>
+<span class="inserted"><ins><em>&lt;/div&gt;&lt;!-- for class="inner", starts 
in the banner include --&gt;</em></ins></span>
 &lt;/body&gt;
 &lt;/html&gt;
 </pre></body></html>

Index: po/purchase.agreement.de-diff.html
===================================================================
RCS file: /web/www/www/fun/jokes/po/purchase.agreement.de-diff.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- po/purchase.agreement.de-diff.html  30 Apr 2021 11:18:30 -0000      1.2
+++ po/purchase.agreement.de-diff.html  13 Sep 2021 16:04:14 -0000      1.3
@@ -11,25 +11,39 @@
 </style></head>
 <body><pre>
 &lt;!--#include virtual="/server/header.html" --&gt;
-&lt;!-- Parent-Version: 1.77 --&gt;
+&lt;!-- Parent-Version: <span 
class="removed"><del><strong>1.77</strong></del></span> <span 
class="inserted"><ins><em>1.96 --&gt;
+&lt;!-- This page is derived from /server/standards/boilerplate.html --&gt;
+&lt;!--#set var="DISABLE_TOP_ADDENDUM" value="yes"</em></ins></span> --&gt;
 &lt;title&gt;Disclaimer 
 - GNU Project - Free Software Foundation&lt;/title&gt;
 &lt;!--#include virtual="/fun/jokes/po/purchase.agreement.translist" --&gt;
 &lt;!--#include virtual="/server/banner.html" --&gt;
+<span class="inserted"><ins><em>&lt;div class="breadcrumb" 
role="navigation"&gt;
+ &lt;a href="/"&gt;&lt;img src="/graphics/icons/home.png" height="26" 
width="26"
+    alt="GNU Home" title="GNU Home" /&gt;&lt;/a&gt;&nbsp;/
+ &lt;a href="/fun/humor.html#content"&gt;GNU humor&lt;/a&gt;&nbsp;/
+&lt;/div&gt;
+&lt;!--GNUN: OUT-OF-DATE NOTICE--&gt;
+&lt;!--#include virtual="/server/top-addendum.html" --&gt;
+&lt;div class="reduced-width"&gt;</em></ins></span>
 &lt;h2&gt;Disclaimer!&lt;/h2&gt;
 
-&lt;p&gt;&lt;a href="/graphics/gleesons.html"&gt;&lt;img 
src="/graphics/gleeson_head.jpg"
+<span class="removed"><del><strong>&lt;p&gt;&lt;a 
href="/graphics/gleesons.html"&gt;&lt;img src="/graphics/gleeson_head.jpg"
 alt=" [colorful rounded image of the Head of a GNU]" width="153" height="128" 
style="float: right;"
 /&gt;&lt;/a&gt;&lt;/p&gt;
 
 &lt;hr /&gt;
        
 &lt;pre&gt;
-Disclaimer to be used when purchasing software:
+Disclaimer</strong></del></span>
+
+<span class="inserted"><ins><em>&lt;p&gt;Disclaimer</em></ins></span> to be 
used when purchasing <span class="removed"><del><strong>software:
 
 
-                 AGREEMENT AND LIMITED WARRANTY
+                 AGREEMENT</strong></del></span> <span 
class="inserted"><ins><em>software:&lt;/p&gt;
 
+&lt;h3 class="c"&gt;AGREEMENT</em></ins></span> AND LIMITED <span 
class="removed"><del><strong>WARRANTY</strong></del></span> <span 
class="inserted"><ins><em>WARRANTY&lt;/h3&gt;
+&lt;p&gt;</em></ins></span>
 This check is fully warranted against physical defects and poor
 workmanship in its stationery. If the check is physically damaged,
 return it to me and I will replace or repair it at my discretion.
@@ -41,7 +55,7 @@
 assured you of its worth, either verbally or in written
 communication, we may have had our fingers crossed, so don't come
 whimpering back to me if it bounces.
-
+<span class="inserted"><ins><em>&lt;/p&gt;&lt;p&gt;</em></ins></span>
 The money, if any, represented by this instrument remains my
 property. You are licensed to use it, however you are not allowed
 to copy the original check except for your personal records, nor
@@ -49,7 +63,7 @@
 may you allow any other person to use the money. Remember, you may
 have it in your possession, but it still belongs to me, and I'm
 going to call on you from time to time just to keep tabs on it.
-
+<span class="inserted"><ins><em>&lt;/p&gt;&lt;p&gt;</em></ins></span>
 This agreement supersedes all others between us, including the
 equally ridiculous one you have undoubtedly pasted on the back of
 your packaging, or concealed somewhere in the middle of it. The
@@ -59,20 +73,30 @@
 though yours may say that it supersedes mine. Why, even if yours
 said it would supersede mine even if mine said it would supersede
 yours even if yours said... Oh well. You get the idea.
-
+<span class="inserted"><ins><em>&lt;/p&gt;&lt;p&gt;</em></ins></span>
 You may decline this agreement by returning the uncashed check to
 me within twenty-four hours. If you attempt to cash it, however,
 you have implicitly accepted these terms. You may also implicitly
 accept these terms by:
 
-1) Calling my bank to inquire about the status of my account;
+<span class="removed"><del><strong>1) Calling</strong></del></span>
+<span class="inserted"><ins><em>&lt;/p&gt;
+&lt;ol&gt;
+&lt;li&gt;Calling</em></ins></span> my bank to inquire about the status of my 
<span class="removed"><del><strong>account;
+
+2) Thanking</strong></del></span> <span 
class="inserted"><ins><em>account;&lt;/li&gt;
 
-2) Thanking me at the conclusion of our business transaction;
+&lt;li&gt;Thanking</em></ins></span> me at the conclusion of our business 
<span class="removed"><del><strong>transaction;
 
-3) Going to bed at the end of this or any other day; or
+3) Going</strong></del></span> <span 
class="inserted"><ins><em>transaction;&lt;/li&gt;
 
-4) Using any toilet or rest room.
+&lt;li&gt;Going</em></ins></span> to bed at the end of this or any other day; 
<span class="removed"><del><strong>or
 
+4) Using</strong></del></span> <span class="inserted"><ins><em>or&lt;/li&gt;
+
+&lt;li&gt;Using</em></ins></span> any toilet or rest <span 
class="removed"><del><strong>room.</strong></del></span> <span 
class="inserted"><ins><em>room.&lt;/li&gt;
+&lt;/ol&gt;
+&lt;p&gt;</em></ins></span>
 Please be advised that I have adopted a strict rubber-glue policy.
 Any nasty thing that your lawyers say bounces off of me and sticks
 back to you. Be further advised that you agree to pay my legal
@@ -80,27 +104,36 @@
 any other reason that might strike my fancy. Violations will be
 punishable by fine, imprisonment, death, any two of the above, or
 all three.
-
+<span class="inserted"><ins><em>&lt;/p&gt;&lt;p&gt;</em></ins></span>
 Thank you and have a nice day!
 
-&lt;/pre&gt;
+<span class="removed"><del><strong>&lt;/pre&gt;</strong></del></span>
+<span class="inserted"><ins><em>&lt;/p&gt;
+
+&lt;p class="button right-align"&gt;&lt;a 
href="/fun/jokes/purchase.agreement.txt"&gt;Plain
+text version&lt;/a&gt;&lt;/p&gt;
 
+&lt;div class="infobox" role="contentinfo"&gt;</em></ins></span>
 &lt;hr /&gt;
 
-&lt;p&gt;&lt;a href="/fun/humor.html"&gt;Other humor&lt;/a&gt; in the GNU Humor
+<span class="removed"><del><strong>&lt;p&gt;&lt;a 
href="/fun/humor.html"&gt;Other humor&lt;/a&gt; in the GNU Humor
 Collection.&lt;/p&gt;
 
 &lt;h3 id="license"&gt;Disclaimer&lt;/h3&gt;
 
-&lt;p&gt;The joke on this page was obtained from the FSF's
-<span class="removed"><del><strong>&lt;a href="http://mail.gnu.org/"&gt;email 
archives&lt;/a&gt;</strong></del></span> <span class="inserted"><ins><em>email 
archives</em></ins></span>
+&lt;p&gt;The joke on this page was obtained from the FSF's email archives
 of the GNU Project.&lt;/p&gt;
 
-&lt;p&gt;The Free Software Foundation claims no copyrights on this 
joke.&lt;/p&gt;
+&lt;p&gt;The Free Software Foundation claims no copyrights on this 
joke.&lt;/p&gt;</strong></del></span>
+<span class="inserted"><ins><em>&lt;p&gt;Source:&nbsp; &lt;a
+href="https://www.netfunny.com/rhf/jokes/91q4/softcheq.html"&gt;
+rec.humor.funny&lt;/a&gt; (1991)&lt;/p&gt;
+&lt;/div&gt;
+&lt;/div&gt;</em></ins></span>
 
 &lt;/div&gt;&lt;!-- for id="content", starts in the include above --&gt;
 &lt;!--#include virtual="/server/footer.html" --&gt;
-&lt;div id="footer"&gt;
+&lt;div <span 
class="removed"><del><strong>id="footer"&gt;</strong></del></span> <span 
class="inserted"><ins><em>id="footer" role="contentinfo"&gt;</em></ins></span>
 &lt;div class="unprintable"&gt;
 
 &lt;p&gt;Please send general FSF &amp; GNU inquiries to
@@ -118,17 +151,17 @@
         to &lt;a href="mailto:web-translators@gnu.org"&gt;
         &lt;web-translators@gnu.org&gt;&lt;/a&gt;.&lt;/p&gt;
 
-        &lt;p&gt;For information on coordinating and submitting translations of
+        &lt;p&gt;For information on coordinating and <span 
class="removed"><del><strong>submitting</strong></del></span> <span 
class="inserted"><ins><em>contributing</em></ins></span> translations of
         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
+README&lt;/a&gt; for information on coordinating and <span 
class="removed"><del><strong>submitting</strong></del></span> <span 
class="inserted"><ins><em>contributing</em></ins></span> translations
 of this article.&lt;/p&gt;
 &lt;/div&gt;
 
-&lt;!-- Regarding copyright, in general, standalone pages (as opposed to
+<span class="removed"><del><strong>&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.
@@ -143,18 +176,18 @@
      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;
-
+     Information document, www.gnu.org/prep/maintain. 
--&gt;</strong></del></span>
 
 &lt;!--#include virtual="/server/bottom-notes.html" --&gt;
 
 &lt;p class="unprintable"&gt;Updated:
 &lt;!-- timestamp start --&gt;
-$Date: 2021/04/30 11:18:30 $
+$Date: 2021/09/13 16:04:14 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;
-&lt;/div&gt;
+<span class="removed"><del><strong>&lt;/div&gt;</strong></del></span>
+<span class="inserted"><ins><em>&lt;/div&gt;&lt;!-- for class="inner", starts 
in the banner include --&gt;</em></ins></span>
 &lt;/body&gt;
 &lt;/html&gt;
 </pre></body></html>

Index: po/users-lightbulb.de-diff.html
===================================================================
RCS file: /web/www/www/fun/jokes/po/users-lightbulb.de-diff.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- po/users-lightbulb.de-diff.html     30 Apr 2021 11:18:30 -0000      1.2
+++ po/users-lightbulb.de-diff.html     13 Sep 2021 16:04:14 -0000      1.3
@@ -11,20 +11,33 @@
 </style></head>
 <body><pre>
 &lt;!--#include virtual="/server/header.html" --&gt;
-&lt;!-- Parent-Version: 1.77 --&gt;
+&lt;!-- Parent-Version: <span 
class="removed"><del><strong>1.77</strong></del></span> <span 
class="inserted"><ins><em>1.96 --&gt;
+&lt;!-- This page is derived from /server/standards/boilerplate.html --&gt;
+&lt;!--#set var="DISABLE_TOP_ADDENDUM" value="yes"</em></ins></span> --&gt;
 &lt;title&gt;How many GNU/Linux users are needed to change a light bulb?
 - GNU Project - Free Software Foundation&lt;/title&gt;
  &lt;!--#include virtual="/fun/jokes/po/users-lightbulb.translist" --&gt;
 &lt;!--#include virtual="/server/banner.html" --&gt;
+<span class="inserted"><ins><em>&lt;div class="breadcrumb" 
role="navigation"&gt;
+ &lt;a href="/"&gt;&lt;img src="/graphics/icons/home.png" height="26" 
width="26"
+    alt="GNU Home" title="GNU Home" /&gt;&lt;/a&gt;&nbsp;/
+ &lt;a href="/fun/humor.html#content"&gt;GNU humor&lt;/a&gt;&nbsp;/
+ &lt;a href="/fun/humor.html#Unclassified"&gt;Unclassified&lt;/a&gt;&nbsp;/
+&lt;/div&gt;
+&lt;!--GNUN: OUT-OF-DATE NOTICE--&gt;
+&lt;!--#include virtual="/server/top-addendum.html" --&gt;
+&lt;div class="reduced-width"&gt;</em></ins></span>
 &lt;h2&gt;How many GNU/Linux users are needed to change a light 
bulb?&lt;/h2&gt;
 
+<span class="inserted"><ins><em>&lt;address class="byline"&gt;by Andr&eacute; 
Ferreira Machado&lt;/address&gt;</em></ins></span>
+
 &lt;ul&gt;
 &lt;li&gt;1 to post a thread in a mailing list telling the bulb has
 burnt.&lt;/li&gt;
 &lt;li&gt;1 to suggest to try to turn the lamp on through command 
lines.&lt;/li&gt;
 &lt;li&gt;1 to complain that the user broke the thread.&lt;/li&gt;
 &lt;li&gt;1 to ask what new bulb will he install.&lt;/li&gt;
-&lt;li&gt;1 to <span class="removed"><del><strong>advice</strong></del></span> 
<span class="inserted"><ins><em>advise</em></ins></span> that we shouldn't use 
the word burn for meaning a
+&lt;li&gt;1 to advise that we shouldn't use the word burn for meaning a
 broken lightbulb, because it would mean that the bulb was set on fire
 and that it would be right to say that the bulb broke due to an excess
 of electrical current.&lt;/li&gt;
@@ -52,7 +65,7 @@
 &lt;li&gt;1 to announce finally which will be the model of the installed
 bulb.&lt;/li&gt;
 &lt;li&gt;217 to discard the chosen model and suggest another.&lt;/li&gt;
-&lt;li&gt;6 to complain that the chosen lightbulb has <span 
class="removed"><del><strong>propietary</strong></del></span> <span 
class="inserted"><ins><em>proprietary</em></ins></span> elements,
+&lt;li&gt;6 to complain that the chosen lightbulb has proprietary elements,
 and that another should be used.&lt;/li&gt;
 &lt;li&gt;20 to say that a 100% free bulb, isn't compatible with the lamp
 switch.&lt;/li&gt;
@@ -70,14 +83,14 @@
 scratch.&lt;/li&gt;
 &lt;li&gt;14 to complain about the format of the previous file and asking to
 send it in txt or LaTeX.&lt;/li&gt;
-&lt;li&gt;5 to say that they didn't like the taken <span 
class="removed"><del><strong>decission</strong></del></span> <span 
class="inserted"><ins><em>decision</em></ins></span> and that
+&lt;li&gt;5 to say that they didn't like the taken decision and that
 they'll fork the house's electric installation and install a better
 lamp.&lt;/li&gt;
 &lt;li&gt;1 to post a series of commands to put to change the
 lightbulb.&lt;/li&gt;
 &lt;li&gt;1 to comment that he executed the commands and had an error
 message.&lt;/li&gt;
-&lt;li&gt;1 to <span class="removed"><del><strong>advice</strong></del></span> 
<span class="inserted"><ins><em>advise</em></ins></span> that the commands must 
be executed as root.&lt;/li&gt;
+&lt;li&gt;1 to advise that the commands must be executed as root.&lt;/li&gt;
 &lt;/ul&gt;
 
 &lt;p&gt;And finally:&lt;/p&gt;
@@ -87,14 +100,15 @@
 went to the shop and bought the cheapest lightbulb.&lt;/li&gt;
 &lt;/ul&gt;
 
-&lt;h3 id="Disclaimer"&gt;Disclaimer&lt;/h3&gt;
+<span class="removed"><del><strong>&lt;h3 
id="Disclaimer"&gt;Disclaimer&lt;/h3&gt;
 &lt;p&gt;The joke on this page was
 mailed to the FSF by its author Andre Machado.&lt;/p&gt;
-&lt;p&gt;The Free Software Foundation claims no copyright on this 
joke.&lt;/p&gt;
+&lt;p&gt;The Free Software Foundation claims no copyright on this 
joke.&lt;/p&gt;</strong></del></span>
+<span class="inserted"><ins><em>&lt;/div&gt;</em></ins></span>
 
 &lt;/div&gt;&lt;!-- for id="content", starts in the include above --&gt;
 &lt;!--#include virtual="/server/footer.html" --&gt;
-&lt;div id="footer"&gt;
+&lt;div <span 
class="removed"><del><strong>id="footer"&gt;</strong></del></span> <span 
class="inserted"><ins><em>id="footer" role="contentinfo"&gt;</em></ins></span>
 &lt;div class="unprintable"&gt;
 
 &lt;p&gt;Please send general FSF &amp; GNU inquiries to
@@ -112,19 +126,19 @@
         to &lt;a href="mailto:web-translators@gnu.org"&gt;
         &lt;web-translators@gnu.org&gt;&lt;/a&gt;.&lt;/p&gt;
 
-        &lt;p&gt;For information on coordinating and submitting translations of
+        &lt;p&gt;For information on coordinating and <span 
class="removed"><del><strong>submitting</strong></del></span> <span 
class="inserted"><ins><em>contributing</em></ins></span> translations of
         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
+README&lt;/a&gt; for information on coordinating and <span 
class="removed"><del><strong>submitting</strong></del></span> <span 
class="inserted"><ins><em>contributing</em></ins></span> translations
 of this article.&lt;/p&gt;
 &lt;/div&gt;
 
-&lt;!-- Regarding copyright, in general, standalone pages (as opposed to
+<span class="removed"><del><strong>&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 <span class="removed"><del><strong>3.0 
US.</strong></del></span> <span 
class="inserted"><ins><em>4.0.</em></ins></span>  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
@@ -137,24 +151,26 @@
      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;
+     Information document, www.gnu.org/prep/maintain. 
--&gt;</strong></del></span>
 
-&lt;p&gt;Copyright &copy; 2014 Andre Machado&lt;/p&gt;
+&lt;p&gt;Copyright &copy; <span 
class="removed"><del><strong>2014</strong></del></span> <span 
class="inserted"><ins><em>2013</em></ins></span> Andre Machado&lt;/p&gt;
 
-&lt;p&gt;This page is licensed under a &lt;a rel="license"
-<span 
class="removed"><del><strong>href="http://creativecommons.org/licenses/by-nd/3.0/us/"&gt;Creative</strong></del></span>
-<span 
class="inserted"><ins><em>href="http://creativecommons.org/licenses/by-nd/4.0/"&gt;Creative</em></ins></span>
-Commons <span class="removed"><del><strong>Attribution-NoDerivs 3.0 United 
States</strong></del></span> <span 
class="inserted"><ins><em>Attribution-NoDerivatives 4.0 
International</em></ins></span> License&lt;/a&gt;.&lt;/p&gt;
+<span class="removed"><del><strong>&lt;p&gt;This</strong></del></span>
+
+<span class="inserted"><ins><em>&lt;p&gt;The joke on this</em></ins></span> 
page is licensed under <span 
class="removed"><del><strong>a</strong></del></span> <span 
class="inserted"><ins><em>the</em></ins></span> &lt;a rel="license"
+href="http://creativecommons.org/licenses/by-nd/4.0/"&gt;Creative
+Commons Attribution-NoDerivatives 4.0 International 
License&lt;/a&gt;.&lt;/p&gt;
 
 &lt;!--#include virtual="/server/bottom-notes.html" --&gt;
 
 &lt;p class="unprintable"&gt;Updated:
 &lt;!-- timestamp start --&gt;
-$Date: 2021/04/30 11:18:30 $
+$Date: 2021/09/13 16:04:14 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;
-&lt;/div&gt;
+<span class="removed"><del><strong>&lt;/div&gt;</strong></del></span>
+<span class="inserted"><ins><em>&lt;/div&gt;&lt;!-- for class="inner", starts 
in the banner include --&gt;</em></ins></span>
 &lt;/body&gt;
 &lt;/html&gt;
 </pre></body></html>



reply via email to

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