www-commits
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

www licenses/po/license-recommendations.fr.po l...

From: GNUN
Subject: www licenses/po/license-recommendations.fr.po l...
Date: Sat, 28 Jul 2012 08:35:05 +0000 
CVSROOT:        /web/www
Module name:    www
Changes by:     GNUN <gnun>     12/07/28 08:35:03

Modified files:
        licenses/po    : license-recommendations.fr.po 
                         license-recommendations.pot 
                         license-recommendations.ru.po 
        links/po       : companies.ru.po companies.translist 
        philosophy/po  : nonfree-games.cs.po nonfree-games.de.po 
                         nonfree-games.fr.po nonfree-games.pot 
                         nonfree-games.ru.po 
Added files:
        links          : companies.ru.html 
        links/po       : companies.ru-en.html 

Log message:
        Automatic update by GNUnited Nations.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-recommendations.fr.po?cvsroot=www&r1=1.2&r2=1.3
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-recommendations.pot?cvsroot=www&r1=1.10&r2=1.11
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-recommendations.ru.po?cvsroot=www&r1=1.10&r2=1.11
http://web.cvs.savannah.gnu.org/viewcvs/www/links/companies.ru.html?cvsroot=www&rev=1.1
http://web.cvs.savannah.gnu.org/viewcvs/www/links/po/companies.ru.po?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/links/po/companies.translist?cvsroot=www&r1=1.5&r2=1.6
http://web.cvs.savannah.gnu.org/viewcvs/www/links/po/companies.ru-en.html?cvsroot=www&rev=1.1
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/nonfree-games.cs.po?cvsroot=www&r1=1.3&r2=1.4
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/nonfree-games.de.po?cvsroot=www&r1=1.9&r2=1.10
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/nonfree-games.fr.po?cvsroot=www&r1=1.8&r2=1.9
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/nonfree-games.pot?cvsroot=www&r1=1.3&r2=1.4
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/nonfree-games.ru.po?cvsroot=www&r1=1.7&r2=1.8

Patches:
Index: licenses/po/license-recommendations.fr.po
===================================================================
RCS file: /web/www/www/licenses/po/license-recommendations.fr.po,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- licenses/po/license-recommendations.fr.po   5 Jul 2012 17:44:42 -0000       
1.2
+++ licenses/po/license-recommendations.fr.po   28 Jul 2012 08:32:11 -0000      
1.3
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: license-recommendations.html\n"
-"POT-Creation-Date: 2012-06-10 04:27-0300\n"
+"POT-Creation-Date: 2012-07-28 04:29-0300\n"
 "PO-Revision-Date: 2012-06-24 23:51+0200\n"
 "Last-Translator: Thérèse Godefroy <godef.th AT free.fr>\n"
 "Language-Team: French <address@hidden>\n"
@@ -14,6 +14,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Outdated-Since: 2012-07-28 04:29-0300\n"
 "Plural-Forms:  \n"
 
 #. type: Content of: <title>
@@ -48,11 +49,36 @@
 
 #. type: Content of: <p>
 msgid ""
-"The recommendations below are focused on licensing a work that you "
-"create&mdash;whether that's a modification of an existing work, or a new "
-"original work.  These recommendations do not address the issue of combining "
-"existing material under different licenses.  If you're looking for help with "
-"that, please check <a href=\"/licenses/gpl-faq.html\">our license FAQ</a>."
+"These recommendations are for works designed to do practical jobs.  Those "
+"include software, documentation, and some other things.  Works of art, and "
+"works that state a point of view, are different issues; the GNU Project has "
+"no general stand about how they should be released, except that they should "
+"all be usable without nonfree software (in particular, <a href=\"http://";
+"defectivebydesign.org/\">without DRM</a>).  However, you might want to "
+"follow these recommendations for art works that go with a particular program."
+msgstr ""
+
+#. type: Content of: <p>
+# | The recommendations [-below are focused on-] {+apply to+} licensing a work
+# | that you create&mdash;whether that's a modification of an existing work,
+# | or a new original work.  [-These recommendations-]  {+They+} do not
+# | address the issue of combining existing material under different licenses.
+# |  If you're looking for help with that, please check <a
+# | href=\"/licenses/gpl-faq.html\">our [-license-] {+GPL+} FAQ</a>.
+#, fuzzy
+#| msgid ""
+#| "The recommendations below are focused on licensing a work that you "
+#| "create&mdash;whether that's a modification of an existing work, or a new "
+#| "original work.  These recommendations do not address the issue of "
+#| "combining existing material under different licenses.  If you're looking "
+#| "for help with that, please check <a href=\"/licenses/gpl-faq.html\">our "
+#| "license FAQ</a>."
+msgid ""
+"The recommendations apply to licensing a work that you create&mdash;whether "
+"that's a modification of an existing work, or a new original work.  They do "
+"not address the issue of combining existing material under different "
+"licenses.  If you're looking for help with that, please check <a href=\"/"
+"licenses/gpl-faq.html\">our GPL FAQ</a>."
 msgstr ""
 "Les recommandations ci-dessous sont ciblées sur le choix d'une licence pour "
 "une œuvre que vous avez créée – que ce soit la modification d'une 
œuvre "
@@ -274,12 +300,26 @@
 msgstr "Documentation"
 
 #. type: Content of: <p>
+# | We recommend the <a href=\"/licenses/fdl.html\">GNU Free Documentation
+# | License ({+G+}FDL)</a> for {+tutorials, reference manuals and other large
+# | works of+} documentation.  It's a strong copyleft license for educational
+# | works, initially written for software manuals, and includes terms which
+# | specifically address common issues that arise when those works are
+# | distributed or modified.
+#, fuzzy
+#| msgid ""
+#| "We recommend the <a href=\"/licenses/fdl.html\">GNU Free Documentation "
+#| "License (FDL)</a> for documentation.  It's a strong copyleft license for "
+#| "educational works, initially written for software manuals, and includes "
+#| "terms which specifically address common issues that arise when those "
+#| "works are distributed or modified."
 msgid ""
 "We recommend the <a href=\"/licenses/fdl.html\">GNU Free Documentation "
-"License (FDL)</a> for documentation.  It's a strong copyleft license for "
-"educational works, initially written for software manuals, and includes "
-"terms which specifically address common issues that arise when those works "
-"are distributed or modified."
+"License (GFDL)</a> for tutorials, reference manuals and other large works of "
+"documentation.  It's a strong copyleft license for educational works, "
+"initially written for software manuals, and includes terms which "
+"specifically address common issues that arise when those works are "
+"distributed or modified."
 msgstr ""
 "Pour la documentation, nous recommandons la <a href=\"/licenses/fdl.html"
 "\">licence de documentation libre GNU (<acronym title=\"Free Documentation "
@@ -290,6 +330,20 @@
 
 #. type: Content of: <p>
 msgid ""
+"For short, secondary documentation works, such as a reference card, it is "
+"better to use a lax permissive license, since a copy of the GFDL could "
+"hardly fit in a reference card.  CC-BY is fine, since the issue of patents "
+"does not arise for documentation."
+msgstr ""
+
+#. type: Content of: <p>
+msgid ""
+"For man pages, we recommend the GFDL if the page is long, and a lax "
+"permissive license if it is short."
+msgstr ""
+
+#. type: Content of: <p>
+msgid ""
 "Some documentation includes software source code.  For instance, a manual "
 "for a programming language might include examples for readers to follow.  "
 "You should both include these in the manual under the FDL's terms, and "
@@ -315,13 +369,26 @@
 msgstr "Autres données des programmes"
 
 #. type: Content of: <p>
+# | This section discusses all other works for practical use that you might
+# | include with software.  To give you some examples, this includes icons and
+# | other functional or useful graphics, fonts, and geographic data.  [-These
+# | recommendations do not concern artistic works that have an aesthetic
+# | (rather than functional or educational) purpose, or statements of opinion
+# | or judgment.-]  {+You can also follow them for art, though we wouldn't
+# | criticize if you don't.+}
+#, fuzzy
+#| msgid ""
+#| "This section discusses all other works for practical use that you might "
+#| "include with software.  To give you some examples, this includes icons "
+#| "and other functional or useful graphics, fonts, and geographic data.  "
+#| "These recommendations do not concern artistic works that have an "
+#| "aesthetic (rather than functional or educational) purpose, or statements "
+#| "of opinion or judgment."
 msgid ""
 "This section discusses all other works for practical use that you might "
 "include with software.  To give you some examples, this includes icons and "
-"other functional or useful graphics, fonts, and geographic data.  These "
-"recommendations do not concern artistic works that have an aesthetic (rather "
-"than functional or educational) purpose, or statements of opinion or "
-"judgment."
+"other functional or useful graphics, fonts, and geographic data.  You can "
+"also follow them for art, though we wouldn't criticize if you don't."
 msgstr ""
 "Cette section se rapporte à toutes les autres œuvres d'utilité pratique 
que "
 "vous pouvez inclure dans le logiciel. Pour vous donner quelques exemples, "

Index: licenses/po/license-recommendations.pot
===================================================================
RCS file: /web/www/www/licenses/po/license-recommendations.pot,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- licenses/po/license-recommendations.pot     10 Jun 2012 09:16:30 -0000      
1.10
+++ licenses/po/license-recommendations.pot     28 Jul 2012 08:32:12 -0000      
1.11
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: license-recommendations.html\n"
-"POT-Creation-Date: 2012-06-10 04:27-0300\n"
+"POT-Creation-Date: 2012-07-28 04:29-0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <address@hidden>\n"
 "Language-Team: LANGUAGE <address@hidden>\n"
@@ -40,11 +40,23 @@
 
 #. type: Content of: <p>
 msgid ""
-"The recommendations below are focused on licensing a work that you "
-"create&mdash;whether that's a modification of an existing work, or a new "
-"original work.  These recommendations do not address the issue of combining "
-"existing material under different licenses.  If you're looking for help with "
-"that, please check <a href=\"/licenses/gpl-faq.html\">our license FAQ</a>."
+"These recommendations are for works designed to do practical jobs.  Those "
+"include software, documentation, and some other things.  Works of art, and "
+"works that state a point of view, are different issues; the GNU Project has "
+"no general stand about how they should be released, except that they should "
+"all be usable without nonfree software (in particular, <a "
+"href=\"http://defectivebydesign.org/\";>without DRM</a>).  However, you might "
+"want to follow these recommendations for art works that go with a particular "
+"program."
+msgstr ""
+
+#. type: Content of: <p>
+msgid ""
+"The recommendations apply to licensing a work that you create&mdash;whether "
+"that's a modification of an existing work, or a new original work.  They do "
+"not address the issue of combining existing material under different "
+"licenses.  If you're looking for help with that, please check <a "
+"href=\"/licenses/gpl-faq.html\">our GPL FAQ</a>."
 msgstr ""
 
 #. type: Content of: <h3>
@@ -178,10 +190,25 @@
 #. type: Content of: <p>
 msgid ""
 "We recommend the <a href=\"/licenses/fdl.html\">GNU Free Documentation "
-"License (FDL)</a> for documentation.  It's a strong copyleft license for "
-"educational works, initially written for software manuals, and includes "
-"terms which specifically address common issues that arise when those works "
-"are distributed or modified."
+"License (GFDL)</a> for tutorials, reference manuals and other large works of "
+"documentation.  It's a strong copyleft license for educational works, "
+"initially written for software manuals, and includes terms which "
+"specifically address common issues that arise when those works are "
+"distributed or modified."
+msgstr ""
+
+#. type: Content of: <p>
+msgid ""
+"For short, secondary documentation works, such as a reference card, it is "
+"better to use a lax permissive license, since a copy of the GFDL could "
+"hardly fit in a reference card.  CC-BY is fine, since the issue of patents "
+"does not arise for documentation."
+msgstr ""
+
+#. type: Content of: <p>
+msgid ""
+"For man pages, we recommend the GFDL if the page is long, and a lax "
+"permissive license if it is short."
 msgstr ""
 
 #. type: Content of: <p>
@@ -204,10 +231,8 @@
 msgid ""
 "This section discusses all other works for practical use that you might "
 "include with software.  To give you some examples, this includes icons and "
-"other functional or useful graphics, fonts, and geographic data.  These "
-"recommendations do not concern artistic works that have an aesthetic (rather "
-"than functional or educational) purpose, or statements of opinion or "
-"judgment."
+"other functional or useful graphics, fonts, and geographic data.  You can "
+"also follow them for art, though we wouldn't criticize if you don't."
 msgstr ""
 
 #. type: Content of: <p>

Index: licenses/po/license-recommendations.ru.po
===================================================================
RCS file: /web/www/www/licenses/po/license-recommendations.ru.po,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- licenses/po/license-recommendations.ru.po   13 Jun 2012 16:34:59 -0000      
1.10
+++ licenses/po/license-recommendations.ru.po   28 Jul 2012 08:32:12 -0000      
1.11
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: license-recommendations.html\n"
-"POT-Creation-Date: 2012-06-10 04:27-0300\n"
+"POT-Creation-Date: 2012-07-28 04:29-0300\n"
 "PO-Revision-Date: 2012-01-06 17:17+0000\n"
 "Last-Translator: Ineiev <address@hidden>\n"
 "Language-Team: Russian <address@hidden>\n"
@@ -15,6 +15,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Outdated-Since: 2012-07-28 04:29-0300\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
@@ -50,11 +51,36 @@
 
 #. type: Content of: <p>
 msgid ""
-"The recommendations below are focused on licensing a work that you "
-"create&mdash;whether that's a modification of an existing work, or a new "
-"original work.  These recommendations do not address the issue of combining "
-"existing material under different licenses.  If you're looking for help with "
-"that, please check <a href=\"/licenses/gpl-faq.html\">our license FAQ</a>."
+"These recommendations are for works designed to do practical jobs.  Those "
+"include software, documentation, and some other things.  Works of art, and "
+"works that state a point of view, are different issues; the GNU Project has "
+"no general stand about how they should be released, except that they should "
+"all be usable without nonfree software (in particular, <a href=\"http://";
+"defectivebydesign.org/\">without DRM</a>).  However, you might want to "
+"follow these recommendations for art works that go with a particular program."
+msgstr ""
+
+#. type: Content of: <p>
+# | The recommendations [-below are focused on-] {+apply to+} licensing a work
+# | that you create&mdash;whether that's a modification of an existing work,
+# | or a new original work.  [-These recommendations-]  {+They+} do not
+# | address the issue of combining existing material under different licenses.
+# |  If you're looking for help with that, please check <a
+# | href=\"/licenses/gpl-faq.html\">our [-license-] {+GPL+} FAQ</a>.
+#, fuzzy
+#| msgid ""
+#| "The recommendations below are focused on licensing a work that you "
+#| "create&mdash;whether that's a modification of an existing work, or a new "
+#| "original work.  These recommendations do not address the issue of "
+#| "combining existing material under different licenses.  If you're looking "
+#| "for help with that, please check <a href=\"/licenses/gpl-faq.html\">our "
+#| "license FAQ</a>."
+msgid ""
+"The recommendations apply to licensing a work that you create&mdash;whether "
+"that's a modification of an existing work, or a new original work.  They do "
+"not address the issue of combining existing material under different "
+"licenses.  If you're looking for help with that, please check <a href=\"/"
+"licenses/gpl-faq.html\">our GPL FAQ</a>."
 msgstr ""
 "Приводимые ниже рекомендации 
сосредоточиваются на лицензировании 
работ, "
 "которые вы создаете&nbsp;&mdash; это может быть 
доработка существующих работ "
@@ -276,12 +302,26 @@
 msgstr "Документация"
 
 #. type: Content of: <p>
+# | We recommend the <a href=\"/licenses/fdl.html\">GNU Free Documentation
+# | License ({+G+}FDL)</a> for {+tutorials, reference manuals and other large
+# | works of+} documentation.  It's a strong copyleft license for educational
+# | works, initially written for software manuals, and includes terms which
+# | specifically address common issues that arise when those works are
+# | distributed or modified.
+#, fuzzy
+#| msgid ""
+#| "We recommend the <a href=\"/licenses/fdl.html\">GNU Free Documentation "
+#| "License (FDL)</a> for documentation.  It's a strong copyleft license for "
+#| "educational works, initially written for software manuals, and includes "
+#| "terms which specifically address common issues that arise when those "
+#| "works are distributed or modified."
 msgid ""
 "We recommend the <a href=\"/licenses/fdl.html\">GNU Free Documentation "
-"License (FDL)</a> for documentation.  It's a strong copyleft license for "
-"educational works, initially written for software manuals, and includes "
-"terms which specifically address common issues that arise when those works "
-"are distributed or modified."
+"License (GFDL)</a> for tutorials, reference manuals and other large works of "
+"documentation.  It's a strong copyleft license for educational works, "
+"initially written for software manuals, and includes terms which "
+"specifically address common issues that arise when those works are "
+"distributed or modified."
 msgstr ""
 "Для документации мы рекомендуем <a 
href=\"/licenses/fdl.html\">Лицензию "
 "свободной документации GNU (FDL)</a>. Это 
лицензия с сильным авторским левом "
@@ -291,6 +331,20 @@
 
 #. type: Content of: <p>
 msgid ""
+"For short, secondary documentation works, such as a reference card, it is "
+"better to use a lax permissive license, since a copy of the GFDL could "
+"hardly fit in a reference card.  CC-BY is fine, since the issue of patents "
+"does not arise for documentation."
+msgstr ""
+
+#. type: Content of: <p>
+msgid ""
+"For man pages, we recommend the GFDL if the page is long, and a lax "
+"permissive license if it is short."
+msgstr ""
+
+#. type: Content of: <p>
+msgid ""
 "Some documentation includes software source code.  For instance, a manual "
 "for a programming language might include examples for readers to follow.  "
 "You should both include these in the manual under the FDL's terms, and "
@@ -315,13 +369,26 @@
 msgstr "Прочие данные для программ"
 
 #. type: Content of: <p>
+# | This section discusses all other works for practical use that you might
+# | include with software.  To give you some examples, this includes icons and
+# | other functional or useful graphics, fonts, and geographic data.  [-These
+# | recommendations do not concern artistic works that have an aesthetic
+# | (rather than functional or educational) purpose, or statements of opinion
+# | or judgment.-]  {+You can also follow them for art, though we wouldn't
+# | criticize if you don't.+}
+#, fuzzy
+#| msgid ""
+#| "This section discusses all other works for practical use that you might "
+#| "include with software.  To give you some examples, this includes icons "
+#| "and other functional or useful graphics, fonts, and geographic data.  "
+#| "These recommendations do not concern artistic works that have an "
+#| "aesthetic (rather than functional or educational) purpose, or statements "
+#| "of opinion or judgment."
 msgid ""
 "This section discusses all other works for practical use that you might "
 "include with software.  To give you some examples, this includes icons and "
-"other functional or useful graphics, fonts, and geographic data.  These "
-"recommendations do not concern artistic works that have an aesthetic (rather "
-"than functional or educational) purpose, or statements of opinion or "
-"judgment."
+"other functional or useful graphics, fonts, and geographic data.  You can "
+"also follow them for art, though we wouldn't criticize if you don't."
 msgstr ""
 "В этом разделе обсуждаются все прочие 
работы практического значения, которые "
 "вы могли бы присоединять к программам. В 
качестве примеров можно привести "

Index: links/po/companies.ru.po
===================================================================
RCS file: /web/www/www/links/po/companies.ru.po,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- links/po/companies.ru.po    28 Jul 2012 04:59:26 -0000      1.1
+++ links/po/companies.ru.po    28 Jul 2012 08:34:05 -0000      1.2
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: companies.html\n"
-"POT-Creation-Date: 2012-03-17 04:27-0300\n"
+"POT-Creation-Date: 2012-06-10 04:28-0300\n"
 "PO-Revision-Date: 2012-03-27 11:25+0400\n"
 "Last-Translator: Ineiev <address@hidden>\n"
 "Language-Team: Russian <address@hidden>\n"
@@ -21,8 +21,8 @@
 "Companies that sell computers with GNU/Linux preinstalled - GNU Project - "
 "Free Software Foundation (FSF)"
 msgstr ""
-"Компании, торгующие компьютерами с 
предустановленной GNU/Linux "
-"- проект GNU - Фонд свободного программного 
обеспечения (ФСПО)"
+"Компании, торгующие компьютерами с 
предустановленной GNU/Linux - проект GNU "
+"- Фонд свободного программного 
обеспечения (ФСПО)"
 
 # type: Content of: <div><p>
 #. type: Attribute 'content' of: <meta>
@@ -67,8 +67,8 @@
 "Companies that sell computers with <acronym title=\"GNU's Not Unix!\">GNU</"
 "acronym>/Linux preinstalled"
 msgstr ""
-"Компании, торгующие компьютерами с 
предустановленной <abbr "
-"title=\"GNU's Not Unix!\">GNU</abbr>/Linux."
+"Компании, торгующие компьютерами с 
предустановленной <abbr title=\"GNU's Not "
+"Unix!\">GNU</abbr>/Linux."
 
 #. type: Content of: <p>
 msgid ""
@@ -77,8 +77,8 @@
 "info\">Trisquel GNU/Linux</a>."
 msgstr ""
 "<a href=\"http://www.garlach44.eu/en/for-free-software-users\";>Garlach44</a> "
-"предлагает в ассортименте портативные 
компьютеры с предустановленным <a "
-"href=\"http://trisquel.info\";>Trisquel GNU/Linux</a>."
+"предлагает в ассортименте портативные 
компьютеры с предустановленным <a href="
+"\"http://trisquel.info\";>Trisquel GNU/Linux</a>."
 
 #. type: Content of: <p>
 msgid ""
@@ -91,9 +91,9 @@
 "<a href=\"http://laclinux.com/gnu/Start\";>Los Alamos Computers (LAC)</a> "
 "продает портативные и настольные 
компьютеры, а также серверы с "
 "предустановленными <a href=\"/distros\">полностью 
свободными дистрибутивами "
-"<abbr>GNU</abbr>/Linux</a>, в том числе <a "
-"href=\"http://gnewsense.org\";>gNewSense</a>. Кроме того, они 
отчисляют часть "
-"выручки от продажи таких систем в ФСПО."
+"<abbr>GNU</abbr>/Linux</a>, в том числе <a 
href=\"http://gnewsense.org";
+"\">gNewSense</a>. Кроме того, они отчисляют часть 
выручки от продажи таких "
+"систем в ФСПО."
 
 #. type: Content of: <p>
 msgid ""
@@ -117,9 +117,9 @@
 "id=0877000000007G5AAI\">idea about gNewSense being preinstalled on computers "
 "from Dell</a>."
 msgstr ""
-"Вы можете обсудить и поддержать <a "
-"href=\"http://www.ideastorm.com/ideaView?id=0877000000007G5AAI\";>идею о "
-"предустановке gNewSense на компьютерах Dell</a>."
+"Вы можете обсудить и поддержать <a 
href=\"http://www.ideastorm.com/ideaView?";
+"id=0877000000007G5AAI\">идею о предустановке gNewSense на 
компьютерах Dell</"
+"a>."
 
 # type: Content of: <div><div>
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
@@ -127,7 +127,6 @@
 msgid "*GNUN-SLOT: TRANSLATOR'S NOTES*"
 msgstr " "
 
-# type: Content of: <div><p>
 #. type: Content of: <div><p>
 msgid ""
 "Please send FSF &amp; GNU inquiries to <a href=\"mailto:address@hidden";>&lt;"
@@ -138,7 +137,6 @@
 "address@hidden">&lt;address@hidden&gt;</a>. Есть также <a 
href=\"/contact/"
 "\">другие способы связаться</a> с фондом."
 
-# type: Content of: <div><p>
 #. type: Content of: <div><p>
 msgid ""
 "Please send broken links and other corrections or suggestions to <a href="
@@ -148,16 +146,18 @@
 "предложения по адресу <a 
href=\"mailto:address@hidden";>&lt;"
 "address@hidden&gt;</a>."
 
-# type: Content of: <div><p>
 #. type: Content of: <div><p>
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
 "\">Translations README</a> for information on coordinating and submitting "
 "translations of this article."
 msgstr ""
-"Сведения по координации и предложениям 
переводов этой статьи см. в <a href="
-"\"/server/standards/README.translations.html\">&ldquo;Руководстве 
по "
-"переводам&rdquo;</a>."
+"Мы старались сделать этот перевод точным 
и качественным, но исключить "
+"возможность ошибки мы не можем. 
Присылайте, пожалуйста, свои замечания и "
+"предложения по переводу по адресу <a 
href=\"mailto:address@hidden";
+"\">&lt;address@hidden&gt;</a>. </p><p>Сведения по 
координации и "
+"предложениям переводов наших статей см. в 
<a href=\"/server/standards/README."
+"translations.html\">&ldquo;Руководстве по 
переводам&rdquo;</a>."
 
 # type: Content of: <div><div>
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.
@@ -169,7 +169,6 @@
 "найденных ошибках в <a 
href=\"http://savannah.gnu.org/projects/www-ru";
 "\">русской группе переводов gnu.org</a>.</em>"
 
-# type: Content of: <div><p>
 #.  timestamp start 
 #. type: Content of: <div><p>
 msgid "Updated:"

Index: links/po/companies.translist
===================================================================
RCS file: /web/www/www/links/po/companies.translist,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- links/po/companies.translist        11 Mar 2012 11:50:56 -0000      1.5
+++ links/po/companies.translist        28 Jul 2012 08:34:07 -0000      1.6
@@ -16,6 +16,8 @@
 <li><a href="/links/companies.nb.html">norsk (bokmål)</a>&nbsp;[nb]</li>
 <!-- Polish -->
 <li><a href="/links/companies.pl.html">polski</a>&nbsp;[pl]</li>
+<!-- Russian -->
+<li><a href="/links/companies.ru.html">русский</a>&nbsp;[ru]</li>
 </ul>
 </div> <!-- id="translations" -->
 <div class="netscape4" id="skiptrans"></div>

Index: philosophy/po/nonfree-games.cs.po
===================================================================
RCS file: /web/www/www/philosophy/po/nonfree-games.cs.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- philosophy/po/nonfree-games.cs.po   1 Jul 2012 00:29:35 -0000       1.3
+++ philosophy/po/nonfree-games.cs.po   28 Jul 2012 08:34:30 -0000      1.4
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: nonfree-games.html\n"
-"POT-Creation-Date: 2012-06-30 20:26-0300\n"
+"POT-Creation-Date: 2012-07-28 04:29-0300\n"
 "PO-Revision-Date: 2012-05-20 00:15+0200\n"
 "Last-Translator: František Kučera <address@hidden>\n"
 "Language-Team: Czech <address@hidden>\n"
@@ -58,10 +58,16 @@
 "tedy je, jak tato změna ovlivní svobodu uživatelů."
 
 #. type: Content of: <p>
-msgid ""
-"Nonfree games (like other nonfree programs) are unethical because they deny "
-"freedom to their users.  If you want freedom, one requisite for it is not "
-"having these games on your computer.  That much is clear."
+#, fuzzy
+#| msgid ""
+#| "Nonfree games (like other nonfree programs) are unethical because they "
+#| "deny freedom to their users.  If you want freedom, one requisite for it "
+#| "is not having these games on your computer.  That much is clear."
+msgid ""
+"Nonfree game programs (like other nonfree programs) are unethical because "
+"they deny freedom to their users.  (Game art is a different issue, because "
+"it isn't software.)  If you want freedom, one requisite for it is not having "
+"nonfree programs on your computer.  That much is clear."
 msgstr ""
 "Nesvobodné hry (stejně jako ostatní nesvobodné programy) jsou neetické, "
 "protože odepírají svobodu svým uživatelům. Jestliže požadujete 
svobodu, "

Index: philosophy/po/nonfree-games.de.po
===================================================================
RCS file: /web/www/www/philosophy/po/nonfree-games.de.po,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- philosophy/po/nonfree-games.de.po   3 Jul 2012 16:49:26 -0000       1.9
+++ philosophy/po/nonfree-games.de.po   28 Jul 2012 08:34:33 -0000      1.10
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: nonfree-games.html\n"
-"POT-Creation-Date: 2012-06-30 20:26-0300\n"
+"POT-Creation-Date: 2012-07-28 04:29-0300\n"
 "PO-Revision-Date: 2012-07-03 08:48+0200\n"
 "Last-Translator: Roland Zowislo <address@hidden>>\n"
 "Language-Team: German <address@hidden>\n"
@@ -14,6 +14,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Outdated-Since: 2012-07-28 04:29-0300\n"
 
 #. type: Content of: <title>
 msgid ""
@@ -59,10 +60,16 @@
 "Entwicklung die Freiheit der Nutzer beeinflusst."
 
 #. type: Content of: <p>
-msgid ""
-"Nonfree games (like other nonfree programs) are unethical because they deny "
-"freedom to their users.  If you want freedom, one requisite for it is not "
-"having these games on your computer.  That much is clear."
+#, fuzzy
+#| msgid ""
+#| "Nonfree games (like other nonfree programs) are unethical because they "
+#| "deny freedom to their users.  If you want freedom, one requisite for it "
+#| "is not having these games on your computer.  That much is clear."
+msgid ""
+"Nonfree game programs (like other nonfree programs) are unethical because "
+"they deny freedom to their users.  (Game art is a different issue, because "
+"it isn't software.)  If you want freedom, one requisite for it is not having "
+"nonfree programs on your computer.  That much is clear."
 msgstr ""
 "Unfreie Spiele (wie andere unfreie Programme) sind unethisch, weil sie den "
 "Nutzern diese Freiheit vorenthalten. Wenn Sie Freiheit wollen, ist eine "

Index: philosophy/po/nonfree-games.fr.po
===================================================================
RCS file: /web/www/www/philosophy/po/nonfree-games.fr.po,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- philosophy/po/nonfree-games.fr.po   1 Jul 2012 08:50:04 -0000       1.8
+++ philosophy/po/nonfree-games.fr.po   28 Jul 2012 08:34:34 -0000      1.9
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: nonfree-games.html\n"
-"POT-Creation-Date: 2012-06-30 20:26-0300\n"
+"POT-Creation-Date: 2012-07-28 04:29-0300\n"
 "PO-Revision-Date: 2012-07-01 07:05+0200\n"
 "Last-Translator: Thérèse Godefroy <godef.th AT free.fr>\n"
 "Language-Team: French <address@hidden>\n"
@@ -14,6 +14,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Outdated-Since: 2012-07-28 04:29-0300\n"
 "Plural-Forms:  \n"
 
 #. type: Content of: <title>
@@ -58,10 +59,21 @@
 "comment ce développement affecte la liberté des utilisateurs."
 
 #. type: Content of: <p>
-msgid ""
-"Nonfree games (like other nonfree programs) are unethical because they deny "
-"freedom to their users.  If you want freedom, one requisite for it is not "
-"having these games on your computer.  That much is clear."
+# | Nonfree [-games-] {+game programs+} (like other nonfree programs) are
+# | unethical because they deny freedom to their users.  {+(Game art is a
+# | different issue, because it isn't software.)+}  If you want freedom, one
+# | requisite for it is not having [-these games-] {+nonfree programs+} on
+# | your computer.  That much is clear.
+#, fuzzy
+#| msgid ""
+#| "Nonfree games (like other nonfree programs) are unethical because they "
+#| "deny freedom to their users.  If you want freedom, one requisite for it "
+#| "is not having these games on your computer.  That much is clear."
+msgid ""
+"Nonfree game programs (like other nonfree programs) are unethical because "
+"they deny freedom to their users.  (Game art is a different issue, because "
+"it isn't software.)  If you want freedom, one requisite for it is not having "
+"nonfree programs on your computer.  That much is clear."
 msgstr ""
 "Les jeux non libres (comme tout autre programme non libre) ne sont pas "
 "éthiques car ils nient la liberté de leurs utilisateurs. Si vous voulez la "

Index: philosophy/po/nonfree-games.pot
===================================================================
RCS file: /web/www/www/philosophy/po/nonfree-games.pot,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- philosophy/po/nonfree-games.pot     1 Jul 2012 00:29:35 -0000       1.3
+++ philosophy/po/nonfree-games.pot     28 Jul 2012 08:34:34 -0000      1.4
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: nonfree-games.html\n"
-"POT-Creation-Date: 2012-06-30 20:26-0300\n"
+"POT-Creation-Date: 2012-07-28 04:29-0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <address@hidden>\n"
 "Language-Team: LANGUAGE <address@hidden>\n"
@@ -46,9 +46,10 @@
 
 #. type: Content of: <p>
 msgid ""
-"Nonfree games (like other nonfree programs) are unethical because they deny "
-"freedom to their users.  If you want freedom, one requisite for it is not "
-"having these games on your computer.  That much is clear."
+"Nonfree game programs (like other nonfree programs) are unethical because "
+"they deny freedom to their users.  (Game art is a different issue, because "
+"it isn't software.)  If you want freedom, one requisite for it is not having "
+"nonfree programs on your computer.  That much is clear."
 msgstr ""
 
 #. type: Content of: <p>

Index: philosophy/po/nonfree-games.ru.po
===================================================================
RCS file: /web/www/www/philosophy/po/nonfree-games.ru.po,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- philosophy/po/nonfree-games.ru.po   4 Jul 2012 16:27:03 -0000       1.7
+++ philosophy/po/nonfree-games.ru.po   28 Jul 2012 08:34:35 -0000      1.8
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: nonfree-games.html\n"
-"POT-Creation-Date: 2012-06-30 20:26-0300\n"
+"POT-Creation-Date: 2012-07-28 04:29-0300\n"
 "PO-Revision-Date: 2012-07-04 16:49+0000\n"
 "Last-Translator: Ineiev <address@hidden>\n"
 "Language-Team: Russian <address@hidden>\n"
@@ -15,6 +15,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Outdated-Since: 2012-07-28 04:29-0300\n"
 
 #. type: Content of: <title>
 msgid ""
@@ -58,10 +59,21 @@
 "эта перемена влияет на свободу 
пользователей."
 
 #. type: Content of: <p>
-msgid ""
-"Nonfree games (like other nonfree programs) are unethical because they deny "
-"freedom to their users.  If you want freedom, one requisite for it is not "
-"having these games on your computer.  That much is clear."
+# | Nonfree [-games-] {+game programs+} (like other nonfree programs) are
+# | unethical because they deny freedom to their users.  {+(Game art is a
+# | different issue, because it isn't software.)+}  If you want freedom, one
+# | requisite for it is not having [-these games-] {+nonfree programs+} on
+# | your computer.  That much is clear.
+#, fuzzy
+#| msgid ""
+#| "Nonfree games (like other nonfree programs) are unethical because they "
+#| "deny freedom to their users.  If you want freedom, one requisite for it "
+#| "is not having these games on your computer.  That much is clear."
+msgid ""
+"Nonfree game programs (like other nonfree programs) are unethical because "
+"they deny freedom to their users.  (Game art is a different issue, because "
+"it isn't software.)  If you want freedom, one requisite for it is not having "
+"nonfree programs on your computer.  That much is clear."
 msgstr ""
 "Несвободные игры (как и другие 
несвободные программы) неэтичны, потому 
что "
 "они отказывают своим пользователям в 
свободе. Если вы хотите свободы, то "

Index: links/companies.ru.html
===================================================================
RCS file: links/companies.ru.html
diff -N links/companies.ru.html
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ links/companies.ru.html     28 Jul 2012 08:33:17 -0000      1.1
@@ -0,0 +1,99 @@
+
+
+<!--#include virtual="/server/header.ru.html" -->
+
+<!-- This file is automatically generated by GNUnited Nations! -->
+<title>Компании, торгующие компьютерами с 
предустановленной GNU/Linux - проект GNU
+- Фонд свободного программного 
обеспечения (ФСПО)</title>
+<meta name="author" content="Free Software Foundation, Inc" />
+<meta http-equiv="imagetoolbar" content="no" />
+<meta name="author" content="Free Software Foundation, Inc" />
+<meta name="features" content="WAI AA, XHTML, CSS, Semantic Markup, Tableless 
Design, Freedom" />
+<link rel="alternate" type="application/rss+xml" title="Что нового" 
href="http://www.gnu.org/rss/whatsnew.rss"; />
+<meta name="Keywords" content="Свободная операционная 
система GNU/Linux" />
+<meta content="Фонд свободного программного 
обеспечения" name="dc.creator" />
+<meta content="Web Page" name="dc.type" />
+<meta content="text/html" name="dc.format" />
+<meta content="ru" name="dc.language" />
+
+<!--#include virtual="/server/banner.ru.html" -->
+<!--#include virtual="/links/po/companies.translist" -->
+<h2>Компании, торгующие компьютерами с 
предустановленной <abbr title="GNU's Not
+Unix!">GNU</abbr>/Linux.</h2>
+
+<p><a href="http://www.garlach44.eu/en/for-free-software-users";>Garlach44</a>
+предлагает в ассортименте портативные 
компьютеры с предустановленным <a
+href="http://trisquel.info";>Trisquel GNU/Linux</a>.</p>
+
+<p><a href="http://laclinux.com/gnu/Start";>Los Alamos Computers (LAC)</a>
+продает портативные и настольные 
компьютеры, а также серверы с
+предустановленными <a href="/distros">полностью 
свободными дистрибутивами
+<abbr>GNU</abbr>/Linux</a>, в том числе <a
+href="http://gnewsense.org";>gNewSense</a>. Кроме того, они 
отчисляют часть
+выручки от продажи таких систем в ФСПО.</p>
+
+<p>
+<a href="http://www.inatux.com/gnu";>InaTux</a> также предлагает 
компьютеры с
+предустановленным gNewSense.
+</p>
+
+<p><a href="http://libre.thinkpenguin.com/";>ThinkPenguin.com</a> 
предлагает
+компьютеры с предустановленным Trisquel.</p>
+
+<p>Вы можете обсудить и поддержать <a
+href="http://www.ideastorm.com/ideaView?id=0877000000007G5AAI";>идею о
+предустановке gNewSense на компьютерах Dell</a>.</p>
+
+
+<div style="font-size: small;">
+
+<!--TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.-->
+ </div>
+</div>
+
+<!--#include virtual="/server/footer.ru.html" -->
+<div id="footer">
+<p>
+Пожалуйста, присылайте запросы фонду и GNU 
по адресу <a
+href="mailto:address@hidden";>&lt;address@hidden&gt;</a>. Есть также <a
+href="/contact/">другие способы связаться</a> с 
фондом.  
+<br />
+Пожалуйста, присылайте отчеты о 
неработающих ссылках и другие поправки или
+предложения по адресу <a
+href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.
+</p>
+
+<p>
+Мы старались сделать этот перевод точным и 
качественным, но исключить
+возможность ошибки мы не можем. 
Присылайте, пожалуйста, свои замечания и
+предложения по переводу по адресу <a
+href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.
+</p><p>Сведения по координации и 
предложениям переводов наших статей см. в
+<a href="/server/standards/README.translations.html">&ldquo;Р
уководстве по
+переводам&rdquo;</a>.
+</p>
+
+
+<div class="translators-credits">
+
+<!--TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.-->
+<em>Внимание! В подготовке этого перевода 
участвовал только один человек. Вы
+можете существенно улучшить перевод, если 
проверите его и расскажете о
+найденных ошибках в <a
+href="http://savannah.gnu.org/projects/www-ru";>русской группе 
переводов
+gnu.org</a>.</em></div>
+
+
+ <p>
+<!-- timestamp start -->
+Обновлено:
+
+$Date: 2012/07/28 08:33:17 $
+
+<!-- timestamp end -->
+</p>
+</div>
+
+</div>
+</body>
+</html>

Index: links/po/companies.ru-en.html
===================================================================
RCS file: links/po/companies.ru-en.html
diff -N links/po/companies.ru-en.html
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ links/po/companies.ru-en.html       28 Jul 2012 08:34:01 -0000      1.1
@@ -0,0 +1,73 @@
+<!--#include virtual="/server/header.html" -->
+
+<title>Companies that sell computers with GNU/Linux preinstalled - GNU Project 
- Free Software Foundation (FSF)</title>
+<meta name="author" content="Free Software Foundation, Inc" />
+<meta http-equiv="imagetoolbar" content="no" />
+<meta name="author" content="Free Software Foundation, Inc" />
+<meta name="features" content="WAI AA, XHTML, CSS, Semantic Markup, Tableless 
Design, Freedom" />
+<link rel="alternate" type="application/rss+xml" title="What's New" 
href="http://www.gnu.org/rss/whatsnew.rss"; />
+<meta name="Keywords" content="Free Software Operating System GNU/Linux" />
+<meta content="Free Software Foundation" name="dc.creator" />
+<meta content="Web Page" name="dc.type" />
+<meta content="text/html" name="dc.format" />
+<meta content="en" name="dc.language" />
+
+<!--#include virtual="/server/banner.html" -->
+<!--#include virtual="/links/po/companies.translist" -->
+
+<h2>Companies that sell computers with <acronym title="GNU's Not 
Unix!">GNU</acronym>/Linux preinstalled</h2>
+
+<p><a
+href="http://www.garlach44.eu/en/for-free-software-users";>Garlach44</a>
+offers a selection of laptops preinstalled with <a
+href="http://trisquel.info";>Trisquel GNU/Linux</a>.</p>
+
+<p><a href="http://laclinux.com/gnu/Start";>Los Alamos Computers (LAC)</a> sells
+laptops, desktops and servers preinstalled with
+<a href="/distros">fully free
+<acronym>GNU</acronym>/Linux distributions</a>, including 
+<a href="http://gnewsense.org";>gNewSense</a>. In addition, they donate a 
portion
+of every sale of such systems to the FSF.</p>
+
+<p>
+<a href="http://www.inatux.com/gnu";>InaTux</a> also offers computers 
preinstalled with gNewSense.
+</p>
+
+<p><a href="http://libre.thinkpenguin.com/";>ThinkPenguin.com</a> offers 
computers preinstalled with Trisquel.</p>
+
+<p>You may check out and promote an <a 
href="http://www.ideastorm.com/ideaView?id=0877000000007G5AAI";>idea
+about gNewSense being preinstalled on computers from Dell</a>.</p>
+
+</div>
+
+<!--#include virtual="/server/footer.html" -->
+
+<div id="footer">
+<p>
+Please send FSF &amp; GNU inquiries to 
+<a href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.  There are
+also <a href="/contact/">other ways to
+contact</a> the FSF.  
+<br />
+Please send broken links and other corrections or suggestions to
+<a href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.
+</p>
+
+<p>
+Please see the 
+<a href="/server/standards/README.translations.html">Translations
+README</a> for information on coordinating and submitting
+translations of this article.
+</p>
+
+<p>
+Updated:
+<!-- timestamp start -->
+$Date: 2012/07/28 08:34:01 $
+<!-- timestamp end -->
+</p>
+</div>
+
+</div>
+</body>
+</html>
reply via email to
[Prev in Thread] Current Thread [Next in Thread]