[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
www/graphics agnuhead.ja.html po/agnuhead.ja-di...
|
From: |
GNUN |
|
Subject: |
www/graphics agnuhead.ja.html po/agnuhead.ja-di... |
|
Date: |
Sun, 23 Aug 2020 04:00:09 -0400 (EDT) |
CVSROOT: /web/www
Module name: www
Changes by: GNUN <gnun> 20/08/23 04:00:09
Modified files:
graphics : agnuhead.ja.html
graphics/po : agnuhead.ja-diff.html
Log message:
Automatic update by GNUnited Nations.
CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/graphics/agnuhead.ja.html?cvsroot=www&r1=1.33&r2=1.34
http://web.cvs.savannah.gnu.org/viewcvs/www/graphics/po/agnuhead.ja-diff.html?cvsroot=www&r1=1.10&r2=1.11
Patches:
Index: agnuhead.ja.html
===================================================================
RCS file: /web/www/www/graphics/agnuhead.ja.html,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- agnuhead.ja.html 30 Jun 2019 03:28:12 -0000 1.33
+++ agnuhead.ja.html 23 Aug 2020 08:00:08 -0000 1.34
@@ -1,4 +1,9 @@
-<!--#set var="ENGLISH_PAGE" value="/graphics/agnuhead.en.html" -->
+<!--#set var="PO_FILE"
+ value='<a href="/graphics/po/agnuhead.ja.po">
+ https://www.gnu.org/graphics/po/agnuhead.ja.po</a>'
+ --><!--#set var="ORIGINAL_FILE" value="/graphics/agnuhead.html"
+ --><!--#set var="DIFF_FILE" value="/graphics/po/agnuhead.ja-diff.html"
+ --><!--#set var="OUTDATED_SINCE" value="2020-06-24" --><!--#set
var="ENGLISH_PAGE" value="/graphics/agnuhead.en.html" -->
<!--#include virtual="/server/header.ja.html" -->
<!-- Parent-Version: 1.87 -->
@@ -9,6 +14,7 @@
<!--#include virtual="/graphics/po/agnuhead.translist" -->
<!--#include virtual="/server/banner.ja.html" -->
+<!--#include virtual="/server/outdated.ja.html" -->
<h2>GNUã®é </h2>
<p class="byline">ã¨ãã£ã¨ã³ãã»ã¹ããµç»</p>
@@ -136,7 +142,7 @@
<p class="unprintable"><!-- timestamp start -->
æçµæ´æ°:
-$Date: 2019/06/30 03:28:12 $
+$Date: 2020/08/23 08:00:08 $
<!-- timestamp end -->
</p>
Index: po/agnuhead.ja-diff.html
===================================================================
RCS file: /web/www/www/graphics/po/agnuhead.ja-diff.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- po/agnuhead.ja-diff.html 26 Jun 2019 20:32:16 -0000 1.10
+++ po/agnuhead.ja-diff.html 23 Aug 2020 08:00:09 -0000 1.11
@@ -11,63 +11,37 @@
</style></head>
<body><pre>
<!--#include virtual="/server/header.html" -->
-<!-- Parent-Version: <span
class="removed"><del><strong>1.77</strong></del></span> <span
class="inserted"><ins><em>1.87</em></ins></span> -->
-<title>A GNU Head <span class="inserted"><ins><em>by Etienne
Suvasa</em></ins></span>
+<!-- Parent-Version: 1.87 -->
+<title>A GNU Head by Etienne Suvasa
- GNU Project - Free Software Foundation</title>
-<span class="inserted"><ins><em><link rel="stylesheet" type="text/css"
href="/graphics/graphics.css" media="print,screen" /></em></ins></span>
+<link rel="stylesheet" type="text/css" href="/graphics/graphics.css"
media="print,screen" />
<!--#include virtual="/graphics/po/agnuhead.translist" -->
<!--#include virtual="/server/banner.html" -->
<h2>A GNU Head</h2>
-<span class="removed"><del><strong><p><a
href="/graphics/gnu-head-sm.jpg"><img src="/graphics/gnu-head-sm.jpg"
-alt=" [Image of the head of a GNU] "
-width="129" height="122" /></a></p>
-
-<p>You</strong></del></span>
-
-<span class="inserted"><ins><em><p class="byline">by Etienne
Suvasa</p>
+<p class="byline">by Etienne Suvasa</p>
<div class="reduced-width">
-<p class="important" style="margin-bottom: 1.5em">You</em></ins></span>
may prefer to use
-<span class="inserted"><ins><em>the</em></ins></span> <a <span
class="removed"><del><strong>href="/graphics/heckert_gnu.html">a
bold</strong></del></span> <span
class="inserted"><ins><em>href="/graphics/heckert_gnu.html">Bold</em></ins></span>
GNU Head</a>, which is the
-version now used by the Free Software Foundation on any new GNU-emblem <span
class="removed"><del><strong>items,</strong></del></span>
-<span class="inserted"><ins><em>items</em></ins></span> and stickers.</p>
+<p <span
class="removed"><del><strong>class="important"</strong></del></span> <span
class="inserted"><ins><em>class="announcement"</em></ins></span>
style="margin-bottom: 1.5em">You may prefer to use
+the <a href="/graphics/heckert_gnu.html">Bold GNU Head</a>, which
is the
+version now used by the Free Software Foundation on any new GNU-emblem
+items and stickers.</p>
-<span class="inserted"><ins><em><div class="pict narrow">
+<div class="pict narrow">
<a href="/graphics/gerwinski-gnu-head.png"><img
src="/graphics/gnu-head.jpg"
alt=" [Image of the head of a GNU] " /></a>
-</div></em></ins></span>
+</div>
-<p>A handsome GNU <span
class="removed"><del><strong>Head</strong></del></span> <span
class="inserted"><ins><em>head</em></ins></span> with typical beard and
smart-looking curled horns.
+<p>A handsome GNU head with typical beard and smart-looking curled horns.
He or she appears to be smiling contentedly with its works as of yet,
but it still gazes off into the distance.</p>
-<p>This image <span class="removed"><del><strong>is available in the
following formats:</p>
-
-<ul>
- <li>jpeg <a href="/graphics/gnu-head-sm.jpg">7k</a>,
- <a href="/graphics/gnu-head.jpg">21k</a></li>
- <li>png <a href="/graphics/gnu-head-sm.png">2k</a>,
- <a href="/graphics/gnu-head.png">6k</a>,
- <a href="/graphics/gerwinski-gnu-head.png">566k</a></li>
- <li>pdf <a href="/graphics/gnu-head.pdf">41k</a></li>
- <li>ascii (txt) <a href="gnu-head.txt">5k</a></li>
-</ul>
-
-<p>This Head of a GNU</strong></del></span> was the default art for
pages on this <span class="removed"><del><strong>web site</strong></del></span>
<span class="inserted"><ins><em>website,</em></ins></span> including
-<a <span
class="removed"><del><strong>href="/home.html">GNU's</strong></del></span>
<span class="inserted"><ins><em>href="/">GNU's</em></ins></span> home <span
class="removed"><del><strong>page</a>.</p>
-
-<p>It</strong></del></span> <span
class="inserted"><ins><em>page</a>. It</em></ins></span> was also used on
the front of the 1997 <a
-<span class="removed"><del><strong>href="/order/t-shirts.html">GNU
T-shirt</a>. It is also on</strong></del></span>
-<span
class="inserted"><ins><em>href="https://shop.fsf.org/collection/gnu-gear#Tshirts">GNU
t-shirt</a>, and</em></ins></span>
-the spine of many <a <span
class="removed"><del><strong>href="/doc/doc.html">GNU
Manuals</a>.</p>
-
-
-<h3 id="license">Licensing</h3>
-
-<p>This</strong></del></span>
-<span
class="inserted"><ins><em>href="https://shop.fsf.org/collection/books-docs">GNU
manuals</a>.</p>
+<p>This image was the default art for pages on this website, including
+<a href="/">GNU's home page</a>. It was also used on the front of
the 1997 <a
+href="https://shop.fsf.org/collection/gnu-gear#Tshirts">GNU
t-shirt</a>, and
+the spine of many <a
+href="https://shop.fsf.org/collection/books-docs">GNU
manuals</a>.</p>
<dl>
<dt>Original image</dt>
@@ -84,7 +58,7 @@
<dt>Redrawn version</dt>
<dd>
-<p>The original</em></ins></span> image <span
class="removed"><del><strong>is available</strong></del></span> <span
class="inserted"><ins><em>was enlarged and redrawn by Peter Gerwinski.</p>
+<p>The original image was enlarged and redrawn by Peter
Gerwinski.</p>
<ul>
<li>PNG <a
href="/graphics/gerwinski-gnu-head.png">292kB</a>
(1200x1200)</li>
<li>JPEG on <a
href="https://commons.wikimedia.org/wiki/File:Gerwinski-gnu-head.jpg">
@@ -102,7 +76,7 @@
<dt>ASCII version</dt>
<dd>
-<p>It was made by SpAwN</em></ins></span> for <span
class="removed"><del><strong>use</strong></del></span> <span
class="inserted"><ins><em>ASCII-only terminals.</p>
+<p>It was made by SpAwN for ASCII-only terminals.</p>
<ul>
<li>TXT <a
href="/graphics/gnu-head.txt">5kB</a></li>
</ul>
@@ -113,70 +87,24 @@
<hr />
<p>Copyright © 1996 Etienne Suvasa</p>
-<p>These images are available</em></ins></span> under <span
class="removed"><del><strong>either</strong></del></span> the <a
-<span
class="removed"><del><strong>href="http://www.gnu.org/copyleft/fdl.html">GFDL
1.3</a>, <a
-href="http://directory.fsf.org/wiki/License:FAL1.3">the</strong></del></span>
<span class="inserted"><ins><em>rel="license"
-href="/licenses/fdl-1.3.html">GNU</em></ins></span> Free <span
class="inserted"><ins><em>Documentation License</a> v1.3, or the
-<a rel="license"
href="https://directory.fsf.org/wiki/License:FAL1.3">Free</em></ins></span>
-Art License</a>, or <span
class="removed"><del><strong>under</strong></del></span> <span
class="inserted"><ins><em>the</em></ins></span> <a <span
class="removed"><del><strong>href="http://directory.fsf.org/wiki/License:CC_ASA2.0">
-CC-BY-SA 2.0</a>.
-It</strong></del></span> <span class="inserted"><ins><em>rel="license"
+<p>These images are available under the <a rel="license"
+href="/licenses/fdl-1.3.html">GNU Free Documentation License</a>
v1.3, or the
+<a rel="license"
href="https://directory.fsf.org/wiki/License:FAL1.3">Free
+Art License</a>, or the <a rel="license"
href="https://directory.fsf.org/wiki/License:CC_ASA2.0">Creative Commons
Attribution-ShareAlike 2.0 License</a>.</p>
<p>
-The GNU head</em></ins></span> is, however, also a trademark for the GNU
Project.
+The GNU head is, however, also a trademark for the GNU Project.
<strong>If you want to use the GNU head to link to a website run by
the Free Software Foundation or the GNU project, feel free, or if
you're using it in contexts talking about GNU in a supportive and
accurate way, you can also do this without permission. For any other
-requests, please ask <span class="removed"><del><strong><a
-href="mailto:licensing@fsf.org">licensing@fsf.org</a></strong></del></span>
<span class="inserted"><ins><em><<a
-href="mailto:licensing@fsf.org">licensing@fsf.org</a>></em></ins></span>
for
+requests, please ask <<a
+href="mailto:licensing@fsf.org">licensing@fsf.org</a>> for
permission first.</strong></p>
-
-<span class="removed"><del><strong><h3
id="attribution">Attribution</h3>
-
-<p>This graphic was drawn by Etienne Suvasa, who has also done several
-covers for FSF publications.</p>
-
-<p>We also would like to thank Peter Gerwinski for the 1200x1200 PNG
version
-of this image.</p>
-
-<h3 id="Variations">Variations</h3>
-
-<p>Dustin Jorge made a nice wallpaper inspired by this GNU head. He spent
-some time researching copyright for a paper he had to do for a
-class. In the meantime he made this desktop. It is available in the
-following formats:</p>
-
-<ul>
- <li>png <a href="/graphics/gnublue.png">503k</a></li>
-</ul>
-
-<p>Ville Solarius has come up with the following variations of the GNU
Head
-in the SVG format: </p>
-<ul>
- <li>Plain <a
href="/graphics/gnuhead_plain.svg">99.2k</a></li>
- <li>Inkscape <a
href="/graphics/gnuhead_inkscape.svg">99.2k</a></li>
-</ul>
-
-<p><a href="mailto: ripley@salug.it">Ripley</a> added the
slogan "Your
-Passion. Our Potential." to the <a
href="/graphics/gnupassion.svg.gz">GNU head</a>.</p>
-
-<p>A set of colorful GNU heads by <a
-href="mailto:johnmwooten@youspeakmylanguage.com">John M.
Wooten</a>:</p>
- <ul>
- <li>
- <a href="/graphics/gnuwooblk.png">Black</a> |
- <a href="/graphics/gnuwoogrn.png">Green</a> |
- <a href="/graphics/gnuwoored.png">Red</a> |
- <a href="/graphics/gnuwoowht.png">White</a> |
- <a href="/graphics/gnuwooylw.png">Yellow</a>
- </li>
- </ul></strong></del></span>
-<span class="inserted"><ins><em></div>
-</div></em></ins></span>
+</div>
+</div>
</div><!-- for id="content", starts in the include above -->
<!--#include virtual="/server/footer.html" -->
@@ -208,42 +136,22 @@
of this article.</p>
</div>
-<!-- <span class="removed"><del><strong>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.</strong></del></span> Please <span class="removed"><del><strong>make
sure the copyright date is consistent with the
- document. For web pages, it is ok to</strong></del></span> <span
class="inserted"><ins><em>only</em></ins></span> list <span
class="removed"><del><strong>just</strong></del></span> the latest year the
- <span class="removed"><del><strong>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</strong></del></span> <span
class="inserted"><ins><em>page</em></ins></span> was <span
class="removed"><del><strong>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.</strong></del></span>
<span class="inserted"><ins><em>modified.</em></ins></span> -->
-
-<span class="removed"><del><strong><p>Copyright</strong></del></span>
-<span class="inserted"><ins><em><p><em>Page text:</em>
-Copyright</em></ins></span> © <span class="removed"><del><strong>2007,
2013, 2014, 2015</strong></del></span> <span
class="inserted"><ins><em>2019</em></ins></span> Free Software Foundation,
<span class="removed"><del><strong>Inc.</p>
-
-<p>This page is licensed</strong></del></span> <span
class="inserted"><ins><em>Inc.<br />
-Available</em></ins></span> under <span
class="removed"><del><strong>a</strong></del></span> <span
class="inserted"><ins><em>the</em></ins></span> <a rel="license"
-<span
class="removed"><del><strong>href="http://creativecommons.org/licenses/by-nd/3.0/us/">Creative</strong></del></span>
-<span
class="inserted"><ins><em>href="https://creativecommons.org/licenses/by-nd/4.0/">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</a>.</p>
+<!-- Please only list the latest year the page was modified. -->
+<p><em>Page text:</em>
+Copyright © <span class="removed"><del><strong>2019</strong></del></span>
<span class="inserted"><ins><em>2019, 2020</em></ins></span> Free Software
Foundation, Inc.<br />
+Available under the <a rel="license"
+href="https://creativecommons.org/licenses/by-nd/4.0/">Creative Commons
+Attribution-NoDerivatives 4.0 International License</a>.</p>
<!--#include virtual="/server/bottom-notes.html" -->
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2019/06/26 20:32:16 $
+$Date: 2020/08/23 08:00:09 $
<!-- timestamp end -->
</p>
</div>
-<span class="removed"><del><strong></div></strong></del></span>
-<span class="inserted"><ins><em></div><!-- for class="inner", starts
in the banner include --></em></ins></span>
+</div><!-- for class="inner", starts in the banner include -->
</body>
</html>
</pre></body></html>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- www/graphics agnuhead.ja.html po/agnuhead.ja-di...,
GNUN <=