[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
www philosophy/kind-communication.ru.html philo...
From: |
GNUN |
Subject: |
www philosophy/kind-communication.ru.html philo... |
Date: |
Tue, 7 Jan 2020 11:01:40 -0500 (EST) |
CVSROOT: /web/www
Module name: www
Changes by: GNUN <gnun> 20/01/07 11:01:40
Modified files:
philosophy : kind-communication.ru.html
philosophy/po : kind-communication.ru-en.html
kind-communication.ru.po
thankgnus/po : 2019supporters.de.po 2019supporters.pot
2019supporters.pt-br.po 2020supporters.pot
2020supporters.pt-br.po
Log message:
Automatic update by GNUnited Nations.
CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/kind-communication.ru.html?cvsroot=www&r1=1.2&r2=1.3
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/kind-communication.ru-en.html?cvsroot=www&r1=1.2&r2=1.3
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/kind-communication.ru.po?cvsroot=www&r1=1.6&r2=1.7
http://web.cvs.savannah.gnu.org/viewcvs/www/thankgnus/po/2019supporters.de.po?cvsroot=www&r1=1.18&r2=1.19
http://web.cvs.savannah.gnu.org/viewcvs/www/thankgnus/po/2019supporters.pot?cvsroot=www&r1=1.100&r2=1.101
http://web.cvs.savannah.gnu.org/viewcvs/www/thankgnus/po/2019supporters.pt-br.po?cvsroot=www&r1=1.148&r2=1.149
http://web.cvs.savannah.gnu.org/viewcvs/www/thankgnus/po/2020supporters.pot?cvsroot=www&r1=1.3&r2=1.4
http://web.cvs.savannah.gnu.org/viewcvs/www/thankgnus/po/2020supporters.pt-br.po?cvsroot=www&r1=1.5&r2=1.6
Patches:
Index: philosophy/kind-communication.ru.html
===================================================================
RCS file: /web/www/www/philosophy/kind-communication.ru.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- philosophy/kind-communication.ru.html 27 Oct 2019 08:59:26 -0000
1.2
+++ philosophy/kind-communication.ru.html 7 Jan 2020 16:01:40 -0000
1.3
@@ -86,9 +86,9 @@
Ð´Ð¾Ð»Ð¶Ð½Ñ Ð±ÑÑÑ Ð¼Ñгкими и не ÑлиÑком
ÑаÑÑÑми — не деÑгайÑе иÑ
поÑÑоÑнно за ÑÑкав.
- <p>ÐапÑоÑив, пÑедположение, ÑÑо дÑÑгие
полÑзÑÑÑÑÑ Ð½ÐµÑвободнÑми пÑогÑаммами,
-Ð¸Ð´ÐµÑ Ð²ÑазÑез Ñ Ð¾ÑновнÑми пÑинÑипами GNU, Ñак
ÑÑо ÑÑо недопÑÑÑимо в
-обÑÑждениÑÑ
пÑоекÑа GNU.</p>
+ <p>ÐапÑоÑив, пÑедположение, ÑÑо дÑÑгие
запÑÑкаÑÑ Ð½ÐµÑвободнÑе пÑогÑаммÑ, идеÑ
+вÑазÑез Ñ Ð¾ÑновнÑми пÑинÑипами GNU, Ñак ÑÑо
ÑÑо недопÑÑÑимо в обÑÑждениÑÑ
+пÑоекÑа GNU.</p>
</li>
<li>ÐÑвеÑайÑе на Ñо, ÑÑо дейÑÑвиÑелÑно
Ñказано лÑдÑми, а не на пÑеÑвелиÑеннÑе
@@ -116,6 +116,12 @@
<li>Ðе оÑÑÑаивайÑе неоÑÑÑÑпно Ñвой
пÑедпоÑÑиÑелÑнÑй план дейÑÑвий поÑле Ñого,
как Ñже бÑло пÑинÑÑо ÑеÑение о дÑÑгом
плане. ÐÑо заÑÑÑднÑÐµÑ Ñ
од ÑабоÑÑ.</li>
+ <li>ÐÑли дÑÑгие Ð²Ð°Ñ Ñазозлили, возможно,
пÑенебÑÐµÐ³Ð°Ñ ÑÑими ÑекомендаÑиÑми,
+пожалÑйÑÑа, не ÑазноÑиÑе иÑ
в пÑÑ
и пÑаÑ
, и
оÑобенно не деÑжиÑе на ниÑ
+зла. ÐонÑÑÑÑкÑивнÑй подÑ
од ÑоÑÑÐ¾Ð¸Ñ Ð² Ñом,
ÑÑÐ¾Ð±Ñ Ð¿Ð¾Ð¼Ð¾Ð³Ð°ÑÑ Ð´ÑÑгим ÑÑаÑÑ
+лÑÑÑе. Ðогда они ÑÑÑемÑÑÑÑ Ðº ÑÑомÑ,
пожалÑйÑÑа, пÑедоÑÑавлÑйÑе им Ð´Ð»Ñ ÑÑого
+вÑе возможноÑÑи.</li>
+
<li>ÐÑли дÑÑгие ÑÑаÑÑники жалÑÑÑÑÑ Ð½Ð° ваÑ
ÑпоÑоб вÑÑÐ°Ð¶ÐµÐ½Ð¸Ñ Ð¼ÑÑлей, поÑÑаÑайÑеÑÑ
ÑгодиÑÑ Ð¸Ð¼. Ðожно найÑи ÑпоÑÐ¾Ð±Ñ Ð²ÑÑазиÑÑ
Ñе же аÑгÑменÑÑ, не ÑÐ¾Ð·Ð´Ð°Ð²Ð°Ñ Ð² Ñо
же вÑÐµÐ¼Ñ Ð½ÐµÑдобÑÑв дÑÑгим. Ðам бÑÐ´ÐµÑ Ð¿ÑоÑе
ÑбедиÑÑ Ð¸Ñ
, еÑли Ð²Ñ Ð½Ðµ ÑÑанеÑе
@@ -207,7 +213,7 @@
There is more detail about copyright years in the GNU Maintainers
Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright © 2018, 2019 Free Software Foundation, Inc.</p>
+<p>Copyright © 2018, 2019, 2020 Free Software Foundation, Inc.</p>
<p>ÐÑо пÑоизведение доÑÑÑпно по <a rel="license"
@@ -228,7 +234,7 @@
<p class="unprintable"><!-- timestamp start -->
Ðбновлено:
-$Date: 2019/10/27 08:59:26 $
+$Date: 2020/01/07 16:01:40 $
<!-- timestamp end -->
</p>
Index: philosophy/po/kind-communication.ru-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/kind-communication.ru-en.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- philosophy/po/kind-communication.ru-en.html 27 Oct 2019 08:59:27 -0000
1.2
+++ philosophy/po/kind-communication.ru-en.html 7 Jan 2020 16:01:40 -0000
1.3
@@ -83,7 +83,7 @@
software packages even if they don't do that. So these reminders
should be gentle and not too frequent—don't nag.
- <p>By contrast, to suggest that others use nonfree software opposes
+ <p>By contrast, to suggest that others run a nonfree program opposes
the basic principles of GNU, so it is not allowed in GNU Project
discussions.</p>
</li>
@@ -116,6 +116,12 @@
when a decision for some other course has already been made. That
tends to block the activity's progress.</li>
+ <li>If others have irritated you, perhaps by disregarding these
+ guidelines, please don't excoriate them, and especially please don't
+ hold a grudge against them. The constructive approach is to
+ encourage and help other people to do better. When they are trying
+ to learn to do better, please give them plenty of chances.</li>
+
<li>If other participants complain about the way you express your
ideas, please make an effort to cater to them. You can find ways to
express the same points while making others more comfortable. You are
@@ -206,7 +212,7 @@
There is more detail about copyright years in the GNU Maintainers
Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright © 2018, 2019 Free Software Foundation, Inc.</p>
+<p>Copyright © 2018, 2019, 2020 Free Software Foundation, Inc.</p>
<p>This page is licensed under a <a rel="license"
@@ -217,7 +223,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2019/10/27 08:59:27 $
+$Date: 2020/01/07 16:01:40 $
<!-- timestamp end -->
</p>
</div>
Index: philosophy/po/kind-communication.ru.po
===================================================================
RCS file: /web/www/www/philosophy/po/kind-communication.ru.po,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- philosophy/po/kind-communication.ru.po 7 Jan 2020 15:32:46 -0000
1.6
+++ philosophy/po/kind-communication.ru.po 7 Jan 2020 16:01:40 -0000
1.7
@@ -15,7 +15,6 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Outdated-Since: 2020-01-07 13:25+0000\n"
#. type: Content of: <title>
msgid ""
@@ -176,19 +175,13 @@
"поÑÑоÑнно за ÑÑкав."
#. type: Content of: <div><div><ul><li><p>
-# | By contrast, to suggest that others [-use-] {+run a+} nonfree [-software-]
-# | {+program+} opposes the basic principles of GNU, so it is not allowed in
-# | GNU Project discussions.
-#| msgid ""
-#| "By contrast, to suggest that others use nonfree software opposes the "
-#| "basic principles of GNU, so it is not allowed in GNU Project discussions."
msgid ""
"By contrast, to suggest that others run a nonfree program opposes the basic "
"principles of GNU, so it is not allowed in GNU Project discussions."
msgstr ""
-"ÐапÑоÑив, пÑедположение, ÑÑо дÑÑгие
запÑÑкаÑÑ Ð½ÐµÑвободнÑе пÑогÑаммÑ, "
-"Ð¸Ð´ÐµÑ Ð²ÑазÑез Ñ Ð¾ÑновнÑми пÑинÑипами GNU,
Ñак ÑÑо ÑÑо недопÑÑÑимо в "
-"обÑÑждениÑÑ
пÑоекÑа GNU."
+"ÐапÑоÑив, пÑедположение, ÑÑо дÑÑгие
запÑÑкаÑÑ Ð½ÐµÑвободнÑе пÑогÑаммÑ, Ð¸Ð´ÐµÑ "
+"вÑазÑез Ñ Ð¾ÑновнÑми пÑинÑипами GNU, Ñак ÑÑо
ÑÑо недопÑÑÑимо в обÑÑждениÑÑ
"
+"пÑоекÑа GNU."
#. type: Content of: <div><div><ul><li>
msgid ""
@@ -259,10 +252,10 @@
"give them plenty of chances."
msgstr ""
"ÐÑли дÑÑгие Ð²Ð°Ñ Ñазозлили, возможно,
пÑенебÑÐµÐ³Ð°Ñ ÑÑими ÑекомендаÑиÑми, "
-"пожалÑйÑÑа, не ÑазноÑиÑе иÑ
в пÑÑ
и пÑаÑ
, и
оÑобенно не деÑжиÑе на "
-"ниÑ
зла. ÐонÑÑÑÑкÑивнÑй подÑ
од ÑоÑÑÐ¾Ð¸Ñ Ð²
Ñом, ÑÑÐ¾Ð±Ñ Ð¿Ð¾Ð¼Ð¾Ð³Ð°ÑÑ Ð´ÑÑгим "
-"ÑÑаÑÑ Ð»ÑÑÑе. Ðогда они ÑÑÑемÑÑÑÑ Ðº ÑÑомÑ,
пожалÑйÑÑа, пÑедоÑÑавлÑйÑе "
-"им Ð´Ð»Ñ ÑÑого вÑе возможноÑÑи."
+"пожалÑйÑÑа, не ÑазноÑиÑе иÑ
в пÑÑ
и пÑаÑ
, и
оÑобенно не деÑжиÑе на ниÑ
зла. "
+"ÐонÑÑÑÑкÑивнÑй подÑ
од ÑоÑÑÐ¾Ð¸Ñ Ð² Ñом,
ÑÑÐ¾Ð±Ñ Ð¿Ð¾Ð¼Ð¾Ð³Ð°ÑÑ Ð´ÑÑгим ÑÑаÑÑ Ð»ÑÑÑе. "
+"Ðогда они ÑÑÑемÑÑÑÑ Ðº ÑÑомÑ, пожалÑйÑÑа,
пÑедоÑÑавлÑйÑе им Ð´Ð»Ñ ÑÑого вÑе "
+"возможноÑÑи."
#. type: Content of: <div><div><ul><li>
msgid ""
@@ -374,9 +367,6 @@
"translations.html\">“Ð ÑководÑÑве по
пеÑеводам”</a>."
#. type: Content of: <div><p>
-# | Copyright © 2018, [-2019-] {+2019, 2020+} Free Software Foundation,
-# | Inc.
-#| msgid "Copyright © 2018, 2019 Free Software Foundation, Inc."
msgid "Copyright © 2018, 2019, 2020 Free Software Foundation, Inc."
msgstr "Copyright © 2018, 2019, 2020 Free Software Foundation, Inc."
Index: thankgnus/po/2019supporters.de.po
===================================================================
RCS file: /web/www/www/thankgnus/po/2019supporters.de.po,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- thankgnus/po/2019supporters.de.po 3 Jan 2020 18:29:35 -0000 1.18
+++ thankgnus/po/2019supporters.de.po 7 Jan 2020 16:01:40 -0000 1.19
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: 2019supporters.html\n"
"Report-Msgid-Bugs-To: <address@hidden>\n"
-"POT-Creation-Date: 2020-01-03 18:25+0000\n"
+"POT-Creation-Date: 2020-01-07 15:56+0000\n"
"PO-Revision-Date: 2019-12-02 22:00+0100\n"
"Last-Translator: Jоегg Kоhпе <joeko (AT) online [PUNKT] de>\n"
"Language-Team: German <address@hidden>\n"
@@ -306,6 +306,10 @@
msgstr "Sreeram Ramachandran"
#. type: Content of: <ul><li>
+msgid "Steve Wickert"
+msgstr "Steve Wickert"
+
+#. type: Content of: <ul><li>
msgid "Terence O'Gorman"
msgstr "Terence O'Gorman"
@@ -941,9 +945,6 @@
#~ msgid "Nikolay Ksenev"
#~ msgstr "Nikolay Ksenev"
-#~ msgid "Steve Wickert"
-#~ msgstr "Steve Wickert"
-
#~ msgid "Thomas Weeks III"
#~ msgstr "Thomas Weeks III"
Index: thankgnus/po/2019supporters.pot
===================================================================
RCS file: /web/www/www/thankgnus/po/2019supporters.pot,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -b -r1.100 -r1.101
--- thankgnus/po/2019supporters.pot 3 Jan 2020 18:29:35 -0000 1.100
+++ thankgnus/po/2019supporters.pot 7 Jan 2020 16:01:40 -0000 1.101
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: 2019supporters.html\n"
-"POT-Creation-Date: 2020-01-03 18:25+0000\n"
+"POT-Creation-Date: 2020-01-07 15:56+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <address@hidden>\n"
@@ -259,6 +259,10 @@
msgstr ""
#. type: Content of: <ul><li>
+msgid "Steve Wickert"
+msgstr ""
+
+#. type: Content of: <ul><li>
msgid "Terence O'Gorman"
msgstr ""
Index: thankgnus/po/2019supporters.pt-br.po
===================================================================
RCS file: /web/www/www/thankgnus/po/2019supporters.pt-br.po,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -b -r1.148 -r1.149
--- thankgnus/po/2019supporters.pt-br.po 3 Jan 2020 20:29:19 -0000
1.148
+++ thankgnus/po/2019supporters.pt-br.po 7 Jan 2020 16:01:40 -0000
1.149
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: 2019supporters.html\n"
-"POT-Creation-Date: 2020-01-03 18:25+0000\n"
+"POT-Creation-Date: 2020-01-07 15:56+0000\n"
"PO-Revision-Date: 2020-01-03 16:34-0300\n"
"Last-Translator: Rafael Fontenelle <address@hidden>\n"
"Language-Team: Brazilian Portuguese <address@hidden>\n"
@@ -13,6 +13,7 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2020-01-07 15:56+0000\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
"X-Generator: Virtaal 1.0.0-beta1\n"
@@ -276,6 +277,10 @@
msgstr "Sreeram Ramachandran"
#. type: Content of: <ul><li>
+msgid "Steve Wickert"
+msgstr ""
+
+#. type: Content of: <ul><li>
msgid "Terence O'Gorman"
msgstr "Terence O'Gorman"
Index: thankgnus/po/2020supporters.pot
===================================================================
RCS file: /web/www/www/thankgnus/po/2020supporters.pot,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- thankgnus/po/2020supporters.pot 3 Jan 2020 20:01:19 -0000 1.3
+++ thankgnus/po/2020supporters.pot 7 Jan 2020 16:01:40 -0000 1.4
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: 2020supporters.html\n"
-"POT-Creation-Date: 2020-01-03 19:55+0000\n"
+"POT-Creation-Date: 2020-01-07 15:56+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <address@hidden>\n"
@@ -111,6 +111,10 @@
msgstr ""
#. type: Content of: <ul><li>
+msgid "Alex Boulette"
+msgstr ""
+
+#. type: Content of: <ul><li>
msgid "Conan Chiles"
msgstr ""
Index: thankgnus/po/2020supporters.pt-br.po
===================================================================
RCS file: /web/www/www/thankgnus/po/2020supporters.pt-br.po,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- thankgnus/po/2020supporters.pt-br.po 3 Jan 2020 20:29:19 -0000
1.5
+++ thankgnus/po/2020supporters.pt-br.po 7 Jan 2020 16:01:40 -0000
1.6
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: 2020supporters.html\n"
-"POT-Creation-Date: 2020-01-03 19:55+0000\n"
+"POT-Creation-Date: 2020-01-07 15:56+0000\n"
"PO-Revision-Date: 2020-01-03 17:11-0300\n"
"Last-Translator: Rafael Fontenelle <address@hidden>\n"
"Language-Team: Brazilian Portuguese <address@hidden>\n"
@@ -13,6 +13,7 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2020-01-07 15:56+0000\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
"X-Generator: Virtaal 1.0.0-beta1\n"
@@ -128,6 +129,10 @@
"a US$ 999,00)"
#. type: Content of: <ul><li>
+msgid "Alex Boulette"
+msgstr ""
+
+#. type: Content of: <ul><li>
msgid "Conan Chiles"
msgstr "Conan Chiles"
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- www philosophy/kind-communication.ru.html philo...,
GNUN <=