[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
www/server irc-rules.ja.html po/irc-rules.ja-di...
|
From: |
GNUN |
|
Subject: |
www/server irc-rules.ja.html po/irc-rules.ja-di... |
|
Date: |
Tue, 14 Sep 2021 02:03:37 -0400 (EDT) |
CVSROOT: /web/www
Module name: www
Changes by: GNUN <gnun> 21/09/14 02:03:37
Modified files:
server : irc-rules.ja.html
server/po : irc-rules.ja-diff.html
Log message:
Automatic update by GNUnited Nations.
CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/server/irc-rules.ja.html?cvsroot=www&r1=1.33&r2=1.34
http://web.cvs.savannah.gnu.org/viewcvs/www/server/po/irc-rules.ja-diff.html?cvsroot=www&r1=1.6&r2=1.7
Patches:
Index: irc-rules.ja.html
===================================================================
RCS file: /web/www/www/server/irc-rules.ja.html,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- irc-rules.ja.html 16 Jul 2021 05:00:30 -0000 1.33
+++ irc-rules.ja.html 14 Sep 2021 06:03:37 -0000 1.34
@@ -1,4 +1,9 @@
-<!--#set var="ENGLISH_PAGE" value="/server/irc-rules.en.html" -->
+<!--#set var="PO_FILE"
+ value='<a href="/server/po/irc-rules.ja.po">
+ https://www.gnu.org/server/po/irc-rules.ja.po</a>'
+ --><!--#set var="ORIGINAL_FILE" value="/server/irc-rules.html"
+ --><!--#set var="DIFF_FILE" value="/server/po/irc-rules.ja-diff.html"
+ --><!--#set var="OUTDATED_SINCE" value="2021-07-16" --><!--#set
var="ENGLISH_PAGE" value="/server/irc-rules.en.html" -->
<!--#include virtual="/server/header.ja.html" -->
<!-- Parent-Version: 1.86 -->
@@ -8,6 +13,7 @@
<!--#include virtual="/server/po/irc-rules.translist" -->
<!--#include virtual="/server/banner.ja.html" -->
+<!--#include virtual="/server/outdated.ja.html" -->
<h2>å
¬å¼GNUããã³FSFã®IRCãã£ã³ãã«ã®ã«ã¼ã«ã¨ã¬ã¤ãã©ã¤ã³</h2>
<div class="important">
@@ -170,7 +176,7 @@
<p class="unprintable"><!-- timestamp start -->
æçµæ´æ°:
-$Date: 2021/07/16 05:00:30 $
+$Date: 2021/09/14 06:03:37 $
<!-- timestamp end -->
</p>
Index: po/irc-rules.ja-diff.html
===================================================================
RCS file: /web/www/www/server/po/irc-rules.ja-diff.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- po/irc-rules.ja-diff.html 15 Dec 2018 14:46:49 -0000 1.6
+++ po/irc-rules.ja-diff.html 14 Sep 2021 06:03:37 -0000 1.7
@@ -11,15 +11,25 @@
</style></head>
<body><pre>
<!--#include virtual="/server/header.html" -->
-<!-- Parent-Version: <span
class="removed"><del><strong>1.79</strong></del></span> <span
class="inserted"><ins><em>1.86</em></ins></span> -->
+<!-- Parent-Version: <span
class="removed"><del><strong>1.86</strong></del></span> <span
class="inserted"><ins><em>1.96</em></ins></span> -->
<title>GNU and FSF related IRC channels
- GNU Project - Free Software Foundation</title>
<!--#include virtual="/server/po/irc-rules.translist" -->
<!--#include virtual="/server/banner.html" -->
-
+<span class="inserted"><ins><em><div
class="reduced-width"></em></ins></span>
<h2>Rules and guidelines for the official GNU and FSF IRC
channels</h2>
+<div class="important">
+<p><strong>GNU and FSF move official IRC channels to the
Libera.Chat
+network effective immediately.</strong></p>
+<p>Please see the
+<a
href="https://lists.gnu.org/archive/html/info-gnu/2021-06/msg00005.html">original
+announcement</a> and the follow-up
+<a
href="https://lists.gnu.org/archive/html/info-gnu/2021-06/msg00007.html">update
+announcement</a> for more details.</p>
+</div>
+
<p>IRC (Internet Relay Chat) provides a wonderful resource to connect
free software users and developers together. Our channels try to be
welcoming to both new people and long-time regulars. These guidelines
@@ -31,37 +41,50 @@
and talk about free software and other issues which affect the rights
of computer users, such as Digital Restrictions Management.</p>
-<p><b>If you have problems with any of these channels, with trolls
or
+<span class="removed"><del><strong><p><b>If you have problems with
any of these channels, with trolls or
abusive members, please email us at: <a
-href="mailto:campaigns@fsf.org">campaigns@fsf.org</a>.</b></p>
+href="mailto:campaigns@fsf.org">campaigns@fsf.org</a>.</b></p></strong></del></span>
<h3>List of channels</h3>
+
<p>This is a list of our channels.</p>
<ul>
-<li><a href="irc://irc.gnu.org/gnu">#gnu</a> —
+<li><a href="ircs://irc.libera.chat:6697/gnu">#gnu</a>
—
the <em>official</em> GNU Project Channel</li>
-<li><a href="irc://irc.gnu.org/gnu-women">#gnu-women</a>
— a channel for women in GNU and other free software</li>
-<li><a href="irc://irc.gnu.org/gnu-es">#gnu-es</a> —
GNU in Spanish</li>
-<li><a href="irc://irc.gnu.org/gnu-mx">#gnu-mx</a> —
Discussion
- about GNU Mexico chapter</li>
-<li><a href="irc://irc.gnu.org/fsf">#fsf</a> —
Discussion about the
-<a href="http://www.fsf.org/">FSF (Free Software Foundation) and
fsf.org</a>
+<li><a
href="ircs://irc.libera.chat:6697/gnu-women">#gnu-women</a>
+— a channel for women in GNU and other free software</li>
+<li><a href="ircs://irc.libera.chat:6697/gnu-es">#gnu-es</a>
—
+GNU in Spanish</li>
+<li><a href="ircs://irc.libera.chat:6697/gnu-mx">#gnu-mx</a>
—
+Discussion about GNU Mexico chapter</li>
+<li><a href="ircs://irc.libera.chat:6697/fsf">#fsf</a>
—
+Discussion about the <a href="https://www.fsf.org/">FSF (Free Software
+Foundation) and fsf.org</a>
</li>
-<li><a href="irc://irc.gnu.org/libreplanet">#libreplanet</a>
— Discussion of the LibrePlanet website, and <a
href="http://www.fsf.org/conference/">conference</a>.</li>
-<li><a href="irc://irc.gnu.org/emacs">#emacs</a> —
Discussion
-regarding <a href="/software/emacs/">Emacs</a></li>
-<li><a href="irc://irc.gnu.org/hurd">#hurd</a> —
Discussion regarding
-<a href="/software/hurd/">Hurd</a></li>
-<li><a href="irc://irc.gnu.org/grub">#grub</a> — for
the GNU bootloader, <a href="/software/grub/">GRUB</a>.</li>
-<li><a href="irc://irc.oftc.net/savannah">#savannah</a>
—
-<a href="http://savannah.gnu.org/">Savannah.GNU.org</a> hangout
channel</li>
-<li><a
href="irc://irc.gnu.org/gnu-webmasters">#gnu-webmasters</a> — The
-<a href="http://www.gnu.org/people/webmeisters.html">GNU
Webmasters</a>
+<li><a
href="ircs://irc.libera.chat:6697/libreplanet">#libreplanet</a>
+— Discussion of the LibrePlanet website, and
+<a
href="https://www.fsf.org/conference/">conference</a>.</li>
+<li><a href="ircs://irc.libera.chat:6697/emacs">#emacs</a>
—
+Discussion regarding <a
href="/software/emacs/">Emacs</a></li>
+<li><a href="ircs://irc.libera.chat:6697/hurd">#hurd</a>
—
+Discussion regarding <a href="/software/hurd/">Hurd</a></li>
+<li><a href="ircs://irc.libera.chat:6697/grub">#grub</a>
— for
+the GNU bootloader, <a href="/software/grub/">GRUB</a></li>
+<li><a
href="ircs://irc.libera.chat:6697/savannah">#savannah</a>
+— GNU and NonGNU <a
href="https://savannah.gnu.org">Savannah</a>
+hangout and support channel</li>
+<li><a
href="ircs://irc.libera.chat:6697/gnu-webmasters">#gnu-webmasters</a>
— The
+<a href="/people/webmeisters.html">GNU Webmasters</a>
channel, for discussions about www.gnu.org</li>
-<li><a href="irc://irc.gnu.org/erc">#erc</a> — IRC
channel about ERC, an IRC client for Emacs</li>
-<li><a
href="irc://irc.gnu.org/emacs-beginners">#emacs-beginners</a> —
IRC channel for helping out Emacs beginners</li>
-<li><a href="irc://irc.gnu.org/emacsconf">#emacsconf</a>
— Discussion about the Emacs Conference</li>
-<span class="inserted"><ins><em><li><a
href="irc://irc.gnu.org/pspp">#pspp</a> — Discussion regarding
<a href="/software/pspp/">PSPP</a></li></em></ins></span>
+<li><a href="ircs://irc.libera.chat:6697/erc">#erc</a>
— IRC
+channel about ERC, an IRC client built into GNU Emacs</li>
+<li><a
href="ircs://irc.libera.chat:6697/emacs-beginners">#emacs-beginners</a>
+— IRC channel for helping out Emacs beginners</li>
+<li><a
href="ircs://irc.libera.chat:6697/emacsconf">#emacsconf</a>
+— Discussion about the Emacs Conference</li>
+<li><a
href="ircs://irc.libera.chat:6697/gnu-librejs">#librejs</a>
+— Discussion regarding <a
href="/software/librejs/">LibreJS</a>
+and how to free your JavaScript</li>
</ul>
<h3>Channel rules</h3>
@@ -100,27 +123,48 @@
instead of trying to blame operators for this, blame the users who are
not willing to be in our community.</p>
-<hr />
+<hr <span class="inserted"><ins><em>class="column-limit"</em></ins></span>
/>
<p>Rules end here, but here are some helpful
suggestions…</p>
<h3>Getting help</h3>
-<p>Speak to one of the operators. If an operator is unable to help
-you immediately, please be patient. Ask other members of the channel
-for help and contact details for the operator.</p>
-
-<p>You can find a list of operators by typing <tt>/msg chanserv
access
-#gnu list</tt> (where #gnu is the channel you are interested
in).</p>
-
-<h3>Freenode guidelines</h3>
-
-<p>Freenode also
-maintains <a href="http://freenode.net/changuide">a
-list of channel guidelines</a> which you should also consider.
-Certain discussions such as GNU vs BSD, vi
-vs <a href="/software/emacs/">Emacs</a> are often healthy to free
-software discussion and we encourage healthy debate.</p>
+<span class="removed"><del><strong><p>Speak</strong></del></span>
+
+<span class="inserted"><ins><em><p>
+If you had any problem with trolls, abusers, or people violating channels'
rules,
+please reach out</em></ins></span> to <span class="removed"><del><strong>one
of</strong></del></span> the <span
class="inserted"><ins><em>channel's</em></ins></span> operators.
+If an operator is unable to help you immediately, please be patient. <span
class="removed"><del><strong>Ask</strong></del></span>
+<span class="inserted"><ins><em></p>
+<p>
+Prefer to ask general questions generally;</em></ins></span>
+other <span class="removed"><del><strong>members of the</strong></del></span>
channel
+<span class="removed"><del><strong>for help and contact details
for</strong></del></span> <span class="inserted"><ins><em>members can help, as
much as</em></ins></span> the <span
class="removed"><del><strong>operator.</p>
+
+<p>You</strong></del></span> <span class="inserted"><ins><em>operators,
in most cases.
+</p>
+<p>
+You</em></ins></span> can <span class="removed"><del><strong>find a list
of</strong></del></span> <span class="inserted"><ins><em>identify
the</em></ins></span> operators by <span
class="removed"><del><strong>typing</strong></del></span> <span
class="inserted"><ins><em>typing:
+</p>
+<p class="emph-box"></em></ins></span>
+<code>/msg ChanServ flags
+<span class="removed"><del><strong>#gnu</code> (where
#gnu</strong></del></span> <span
class="inserted"><ins><em><var>channel</var></code>
+</p>
+<p>where
<code><var>channel</var></code></em></ins></span> is
the channel <span class="removed"><del><strong>you</strong></del></span> <span
class="inserted"><ins><em>name, for example
+<code>#gnu</code>.
+If the operators</em></ins></span> are <span
class="removed"><del><strong>interested in).</p></strong></del></span>
<span class="inserted"><ins><em>unable to help you,
+or if your concern is of a more sensitive nature,
+please email <a
href="mailto:campaigns@fsf.org"><campaigns@fsf.org></a>.
+</p></em></ins></span>
+
+<h3>Libera.Chat guidelines</h3>
+
+<p>Libera.Chat also
+maintains <a href="https://libera.chat/guidelines">a list of channel
+guidelines</a> which you should also consider. Certain discussions
+such as GNU vs BSD, vi vs <a href="/software/emacs/">Emacs</a> are
+often healthy to free software discussion and we encourage healthy
+debate.</p>
<h3>Remember</h3>
@@ -128,10 +172,11 @@
unreasonable to expect everyone to ignore a user who is misbehaving,
and if you have a GNU or FSF cloak, you may be reassigned an
“unaffiliated” cloak if you continue to abuse your
privileges.</p>
+<span class="inserted"><ins><em></div></em></ins></span>
</div><!-- for id="content", starts in the include above -->
<!--#include virtual="/server/footer.html" -->
-<div id="footer">
+<div <span
class="removed"><del><strong>id="footer"></strong></del></span> <span
class="inserted"><ins><em>id="footer" role="contentinfo"></em></ins></span>
<div class="unprintable">
<p>Please send general FSF & GNU inquiries to
@@ -149,13 +194,13 @@
to <a href="mailto:web-translators@gnu.org">
<web-translators@gnu.org></a>.</p>
- <p>For information on coordinating and submitting translations of
+ <p>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 <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
+README</a> 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.</p>
</div>
@@ -176,23 +221,21 @@
There is more detail about copyright years in the GNU Maintainers
Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright © 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-2005, 2006, 2007, 2008, 2009, 2014, 2015, <span
class="removed"><del><strong>2016</strong></del></span> <span
class="inserted"><ins><em>2016, 2017, 2018</em></ins></span> Free Software
Foundation, Inc.</p>
+<p>Copyright © <span class="removed"><del><strong>1996-2009,
2014-2018, 2020,</strong></del></span> <span
class="inserted"><ins><em>1996-2010, 2015,</em></ins></span> 2021 Free Software
Foundation, Inc.</p>
<p>This page is licensed under a <a rel="license"
-href="http://creativecommons.org/licenses/by-nd/4.0/">Creative
+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: 2018/12/15 14:46:49 $
+$Date: 2021/09/14 06:03:37 $
<!-- 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/server irc-rules.ja.html po/irc-rules.ja-di...,
GNUN <=