www-commits
[Top][All Lists]
Advanced

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

www/licenses gpl-howto.ja.html po/gpl-howto.ja-...


From: GNUN
Subject: www/licenses gpl-howto.ja.html po/gpl-howto.ja-...
Date: Wed, 22 Mar 2023 08:30:22 -0400 (EDT)

CVSROOT:        /web/www
Module name:    www
Changes by:     GNUN <gnun>     23/03/22 08:30:22

Modified files:
        licenses       : gpl-howto.ja.html 
        licenses/po    : gpl-howto.ja-diff.html 

Log message:
        Automatic update by GNUnited Nations.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/gpl-howto.ja.html?cvsroot=www&r1=1.19&r2=1.20
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/gpl-howto.ja-diff.html?cvsroot=www&r1=1.12&r2=1.13

Patches:
Index: gpl-howto.ja.html
===================================================================
RCS file: /web/www/www/licenses/gpl-howto.ja.html,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- gpl-howto.ja.html   31 Aug 2022 05:38:48 -0000      1.19
+++ gpl-howto.ja.html   22 Mar 2023 12:30:17 -0000      1.20
@@ -1,4 +1,9 @@
-<!--#set var="ENGLISH_PAGE" value="/licenses/gpl-howto.en.html" -->
+<!--#set var="PO_FILE"
+ value='<a href="/licenses/po/gpl-howto.ja.po">
+ https://www.gnu.org/licenses/po/gpl-howto.ja.po</a>'
+ --><!--#set var="ORIGINAL_FILE" value="/licenses/gpl-howto.html"
+ --><!--#set var="DIFF_FILE" value="/licenses/po/gpl-howto.ja-diff.html"
+ --><!--#set var="OUTDATED_SINCE" value="2023-01-21" --><!--#set 
var="ENGLISH_PAGE" value="/licenses/gpl-howto.en.html" -->
 
 <!--#include virtual="/server/header.ja.html" -->
 <!-- Parent-Version: 1.97 -->
@@ -9,6 +14,7 @@
 
 <!--#include virtual="/licenses/po/gpl-howto.translist" -->
 <!--#include virtual="/server/banner.ja.html" -->
+<!--#include virtual="/server/outdated.ja.html" -->
 <div class="article reduced-width">
 
<h2>あなた自身のソフトウェアにGNUライセンスを使う方法</h2>
 <div class="thin"></div>
@@ -243,7 +249,7 @@
 <p class="unprintable"><!-- timestamp start -->
 最終更新:
 
-$Date: 2022/08/31 05:38:48 $
+$Date: 2023/03/22 12:30:17 $
 
 <!-- timestamp end -->
 </p>

Index: po/gpl-howto.ja-diff.html
===================================================================
RCS file: /web/www/www/licenses/po/gpl-howto.ja-diff.html,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- po/gpl-howto.ja-diff.html   3 Mar 2022 17:31:40 -0000       1.12
+++ po/gpl-howto.ja-diff.html   22 Mar 2023 12:30:20 -0000      1.13
@@ -11,15 +11,15 @@
 </style></head>
 <body><pre>
 &lt;!--#include virtual="/server/header.html" --&gt;
-&lt;!-- Parent-Version: <span 
class="removed"><del><strong>1.86</strong></del></span> <span 
class="inserted"><ins><em>1.97 --&gt;
-&lt;!-- This page is derived from 
/server/standards/boilerplate.html</em></ins></span> --&gt;
-&lt;title&gt;How to <span 
class="removed"><del><strong>use</strong></del></span> <span 
class="inserted"><ins><em>Use</em></ins></span> GNU <span 
class="removed"><del><strong>licenses</strong></del></span> <span 
class="inserted"><ins><em>Licenses</em></ins></span> for <span 
class="removed"><del><strong>your own software</strong></del></span> <span 
class="inserted"><ins><em>Your Own Software</em></ins></span>
+&lt;!-- Parent-Version: 1.97 --&gt;
+&lt;!-- This page is derived from /server/standards/boilerplate.html --&gt;
+&lt;title&gt;How to Use GNU Licenses for Your Own Software
 - GNU Project - Free Software Foundation&lt;/title&gt;
 &lt;!--#include virtual="/licenses/po/gpl-howto.translist" --&gt;
 &lt;!--#include virtual="/server/banner.html" --&gt;
-<span class="inserted"><ins><em>&lt;div class="article 
reduced-width"&gt;</em></ins></span>
-&lt;h2&gt;How to <span class="removed"><del><strong>use</strong></del></span> 
<span class="inserted"><ins><em>Use</em></ins></span> GNU <span 
class="removed"><del><strong>licenses</strong></del></span> <span 
class="inserted"><ins><em>Licenses</em></ins></span> for <span 
class="removed"><del><strong>your own software&lt;/h2&gt;</strong></del></span> 
<span class="inserted"><ins><em>Your Own Software&lt;/h2&gt;
-&lt;div class="thin"&gt;&lt;/div&gt;</em></ins></span>
+&lt;div class="article reduced-width"&gt;
+&lt;h2&gt;How to Use GNU Licenses for Your Own Software&lt;/h2&gt;
+&lt;div class="thin"&gt;&lt;/div&gt;
 
 &lt;p&gt;This is a brief explanation of how to place a program under the &lt;a
 href="/licenses/gpl.html"&gt;GNU General Public License&lt;/a&gt;, &lt;a
@@ -60,7 +60,24 @@
 program is distributed under the terms of the GNU General Public
 License (or the Lesser GPL, or the Affero GPL).&lt;/p&gt;
 
-&lt;h3&gt;The copyright disclaimer&lt;/h3&gt;
+<span class="removed"><del><strong>&lt;h3&gt;The</strong></del></span>
+
+<span class="inserted"><ins><em>&lt;div class="summary"&gt;
+&lt;hr class="no-display" /&gt;
+&lt;h3 class="no-display"&gt;Table of contents&lt;/h3&gt;
+&lt;ul&gt;
+ &lt;li&gt;&lt;a href="#copyright-disclaimer"&gt;The copyright 
disclaimer&lt;/a&gt;&lt;/li&gt;
+ &lt;li&gt;&lt;a href="#copyright-notice"&gt;The copyright 
notice&lt;/a&gt;&lt;/li&gt;
+ &lt;li&gt;&lt;a href="#license-files"&gt;The license 
files&lt;/a&gt;&lt;/li&gt;
+ &lt;li&gt;&lt;a href="#license-notices"&gt;The license 
notices&lt;/a&gt;&lt;/li&gt;
+ &lt;li&gt;&lt;a href="#why-license-notices"&gt;Why license 
notices?&lt;/a&gt;&lt;/li&gt;
+ &lt;li&gt;&lt;a href="#startup-notice"&gt;The startup 
notice&lt;/a&gt;&lt;/li&gt;
+ &lt;li&gt;&lt;a href="#affero-notice"&gt;The Affero 
notice&lt;/a&gt;&lt;/li&gt;
+ &lt;li&gt;&lt;a href="#miscellaneous"&gt;Miscellaneous&lt;/a&gt;&lt;/li&gt;
+&lt;/ul&gt;
+&lt;/div&gt;
+
+&lt;h3 id="copyright-disclaimer"&gt;The</em></ins></span> copyright 
disclaimer&lt;/h3&gt;
 
 &lt;p&gt;If you are an individual, and you have an employer or study in
 a school, it's wise to ask your
@@ -73,9 +90,7 @@
 &lt;p&gt;Here is a sample copyright disclaimer; just alter the names, title,
 and program description as appropriate:&lt;/p&gt;
 
-<span class="removed"><del><strong>&lt;blockquote&gt;</strong></del></span>
-
-<span class="inserted"><ins><em>&lt;blockquote 
class="emph-box"&gt;</em></ins></span>
+&lt;blockquote class="emph-box"&gt;
 &lt;p&gt;Yoyodyne, Inc., hereby disclaims all copyright interest
 in the program &ldquo;Woodpecker&rdquo; (which deconstructs trees)
 written by James Hacker.&lt;/p&gt;
@@ -94,7 +109,9 @@
 &lt;p&gt;If you work, the best time to negotiate permission to release free
 software is &lt;em&gt;when negotiating your employment 
agreement&lt;/em&gt;.&lt;/p&gt;
 
-&lt;h3&gt;The copyright notice&lt;/h3&gt;
+<span class="removed"><del><strong>&lt;h3&gt;The</strong></del></span>
+
+<span class="inserted"><ins><em>&lt;h3 
id="copyright-notice"&gt;The</em></ins></span> copyright notice&lt;/h3&gt;
 
 &lt;p&gt;The copyright notice should include the year in which you finished
 preparing the release (so if you finished it in 1998 but didn't post
@@ -122,7 +139,9 @@
 license, copy their copyright notices too.  Put all the copyright
 notices for a file together, right near the top of the file.&lt;/p&gt;
 
-&lt;h3&gt;The license files&lt;/h3&gt;
+<span class="removed"><del><strong>&lt;h3&gt;The</strong></del></span>
+
+<span class="inserted"><ins><em>&lt;h3 
id="license-files"&gt;The</em></ins></span> license files&lt;/h3&gt;
 
 &lt;p&gt;You should also include a copy of the license itself somewhere in the
 distribution of your program.  All programs, whether they are released
@@ -141,55 +160,51 @@
 to include both licenses so users have all the materials they need to
 understand their rights.&lt;/p&gt;
 
-&lt;h3&gt;The license notices&lt;/h3&gt;
+<span class="removed"><del><strong>&lt;h3&gt;The</strong></del></span>
+
+<span class="inserted"><ins><em>&lt;h3 
id="license-notices"&gt;The</em></ins></span> license notices&lt;/h3&gt;
 
 &lt;p&gt;Each file's copying permission statement (also called the license 
notice)
 should come right after its copyright notices.  For a one-file
 program, the statement (for the GPL) should look like this, to use
 GPL version 3 or later:&lt;/p&gt;
 
-<span class="removed"><del><strong>&lt;pre&gt;</strong></del></span>
-
-<span class="inserted"><ins><em>&lt;blockquote 
class="emph-box"&gt;&lt;p&gt;</em></ins></span>
+&lt;blockquote class="emph-box"&gt;&lt;p&gt;
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later <span 
class="removed"><del><strong>version.</strong></del></span> <span 
class="inserted"><ins><em>version.&lt;/p&gt;
-&lt;p&gt;</em></ins></span>
+    (at your option) any later version.&lt;/p&gt;
+&lt;p&gt;
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more <span 
class="removed"><del><strong>details.</strong></del></span> <span 
class="inserted"><ins><em>details.&lt;/p&gt;
-&lt;p&gt;</em></ins></span>
+    GNU General Public License for more details.&lt;/p&gt;
+&lt;p&gt;
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see 
&lt;https://www.gnu.org/licenses/&gt;.
-<span class="removed"><del><strong>&lt;/pre&gt;</strong></del></span>
-<span class="inserted"><ins><em>&lt;/p&gt;&lt;/blockquote&gt;</em></ins></span>
+&lt;/p&gt;&lt;/blockquote&gt;
 
 &lt;p&gt;For programs that are more than one file, it is better to replace
 &ldquo;this program&rdquo; with the name of the program, and begin the
 statement with a line saying &ldquo;This file is part of NAME&rdquo;.
 For instance,&lt;/p&gt;
 
-<span class="removed"><del><strong>&lt;pre&gt;</strong></del></span>
-
-<span class="inserted"><ins><em>&lt;blockquote 
class="emph-box"&gt;&lt;p&gt;</em></ins></span>
-    This file is part of <span 
class="removed"><del><strong>Foobar.</strong></del></span> <span 
class="inserted"><ins><em>Foobar.&lt;/p&gt;
-&lt;p&gt;</em></ins></span>
+&lt;blockquote class="emph-box"&gt;&lt;p&gt;
+    This file is part of Foobar.&lt;/p&gt;
+&lt;p&gt;
     Foobar is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later <span 
class="removed"><del><strong>version.</strong></del></span> <span 
class="inserted"><ins><em>version.&lt;/p&gt;
-&lt;p&gt;</em></ins></span>
+    (at your option) any later version.&lt;/p&gt;
+&lt;p&gt;
     Foobar is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more <span 
class="removed"><del><strong>details.</strong></del></span> <span 
class="inserted"><ins><em>details.&lt;/p&gt;
-&lt;p&gt;</em></ins></span>
+    GNU General Public License for more details.&lt;/p&gt;
+&lt;p&gt;
     You should have received a copy of the GNU General Public License
     along with Foobar.  If not, see &lt;https://www.gnu.org/licenses/&gt;.
-<span class="removed"><del><strong>&lt;/pre&gt;</strong></del></span>
-<span class="inserted"><ins><em>&lt;/p&gt;&lt;/blockquote&gt;</em></ins></span>
+&lt;/p&gt;&lt;/blockquote&gt;
 
 &lt;p&gt;To use a different set of GPL versions, you would modify the end of
 the first long paragraph.  For instance, to license under version 2 or
@@ -202,7 +217,9 @@
 word &ldquo;Affero&rdquo; before &ldquo;General&rdquo; in &lt;em&gt;all
 three&lt;/em&gt; places.&lt;/p&gt;
 
-&lt;h3&gt;Why license notices?&lt;/h3&gt;
+<span class="removed"><del><strong>&lt;h3&gt;Why</strong></del></span>
+
+<span class="inserted"><ins><em>&lt;h3 
id="why-license-notices"&gt;Why</em></ins></span> license notices?&lt;/h3&gt;
 
 &lt;p&gt;The purpose of a free software license is to give certain rights to
 all users of a program.  If it is not clear what rights you have given
@@ -222,14 +239,18 @@
 license is, then moving it into another context eliminates all trace
 of that point.  This invites confusion and error.&lt;/p&gt;
 
-&lt;h3&gt;The startup notice&lt;/h3&gt;
+<span class="removed"><del><strong>&lt;h3&gt;The</strong></del></span>
+
+<span class="inserted"><ins><em>&lt;h3 
id="startup-notice"&gt;The</em></ins></span> startup notice&lt;/h3&gt;
 
 &lt;p&gt;For interactive programs, it is usually a good idea to make the
 program display a brief notice about copyright and copying permission
 when it starts up.  See &lt;a href="/licenses/gpl-3.0.html#howto"&gt;the end
 of the GNU GPL&lt;/a&gt; for more information about this.&lt;/p&gt;
 
-&lt;h3&gt;The Affero notice&lt;/h3&gt;
+<span class="removed"><del><strong>&lt;h3&gt;The</strong></del></span>
+
+<span class="inserted"><ins><em>&lt;h3 
id="affero-notice"&gt;The</em></ins></span> Affero notice&lt;/h3&gt;
 
 &lt;p&gt;If you are releasing your program under the GNU AGPL, and it can
 interact with users over a network, the program should offer its source to
@@ -239,7 +260,9 @@
 that you can choose a method that's suitable for your specific
 program&mdash;see section 13 for details.&lt;/p&gt;
 
-&lt;h3&gt;Miscellaneous&lt;/h3&gt;
+<span 
class="removed"><del><strong>&lt;h3&gt;Miscellaneous&lt;/h3&gt;</strong></del></span>
+
+<span class="inserted"><ins><em>&lt;h3 
id="miscellaneous"&gt;Miscellaneous&lt;/h3&gt;</em></ins></span>
 
 &lt;p&gt;It is very important for practical reasons to include contact
 information for how to reach you, perhaps in the README file, but this
@@ -255,9 +278,9 @@
 &lt;p&gt;We would like to list all free software programs in the Free
 Software Directory, including all programs licensed under the GPL (any
 version).  So please submit an entry for your program, when it has
-reached the point of being useful.  Please see the &lt;a <span 
class="removed"><del><strong>href="http://directory.fsf.org/"&gt;Directory web 
page&lt;/a&gt;</strong></del></span>
-<span 
class="inserted"><ins><em>href="https://directory.fsf.org/wiki/Free_Software_Directory:Participate"&gt;
-Directory wiki&lt;/a&gt;</em></ins></span> for information and an online 
submission form.&lt;/p&gt;
+reached the point of being useful.  Please see the &lt;a
+href="https://directory.fsf.org/wiki/Free_Software_Directory:Participate"&gt;
+Directory wiki&lt;/a&gt; for information and an online submission 
form.&lt;/p&gt;
 
 &lt;p&gt;It is also possible to make your program a GNU package, a part of the
 GNU Project.  If you might be interested in joining up with the
@@ -271,11 +294,11 @@
 everyone.  If you'd like to advertise your use of a particular license,
 feel free to use &lt;a href="/graphics/license-logos.html"
 title="GNU License Logos"&gt;one of our logos&lt;/a&gt;.&lt;/p&gt;
-<span class="inserted"><ins><em>&lt;/div&gt;</em></ins></span>
+&lt;/div&gt;
 
 &lt;/div&gt;&lt;!-- for id="content", starts in the include above --&gt;
 &lt;!--#include virtual="/server/footer.html" --&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 id="footer" role="contentinfo"&gt;
 &lt;div class="unprintable"&gt;
 
 &lt;p&gt;Please send general FSF &amp; GNU inquiries to
@@ -293,13 +316,13 @@
         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 <span 
class="removed"><del><strong>submitting</strong></del></span> <span 
class="inserted"><ins><em>contributing</em></ins></span> translations of
+        &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;
 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
+README&lt;/a&gt; for information on coordinating and contributing translations
 of this article.&lt;/p&gt;
 &lt;/div&gt;
 
@@ -320,7 +343,7 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. --&gt;
 
-&lt;p&gt;Copyright &copy; 2001, <span class="removed"><del><strong>2007, 2008, 
2009, 2013, 2014,</strong></del></span> <span 
class="inserted"><ins><em>2007-2009, 2011,</em></ins></span> 2017, <span 
class="removed"><del><strong>2018</strong></del></span> <span 
class="inserted"><ins><em>2018, 2022</em></ins></span> Free Software
+&lt;p&gt;Copyright &copy; 2001, 2007-2009, 2011, 2017, 2018, <span 
class="removed"><del><strong>2022</strong></del></span> <span 
class="inserted"><ins><em>2022, 2023</em></ins></span> Free Software
 Foundation, Inc.&lt;/p&gt;
 
 &lt;p&gt;This page is licensed under a &lt;a rel="license"
@@ -331,7 +354,7 @@
 
 &lt;p class="unprintable"&gt;Updated:
 &lt;!-- timestamp start --&gt;
-$Date: 2022/03/03 17:31:40 $
+$Date: 2023/03/22 12:30:20 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;



reply via email to

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