CVSROOT: /web/www Module name: www Changes by: Pavel Kharitonov <ineiev> 12/01/03 15:08:41
Modified files: gnu/po : linux-and-gnu.ru.po philosophy/po : categories.ru.po Log message: update CVSWeb URLs: http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/linux-and-gnu.ru.po?cvsroot=www&r1=1.10&r2=1.11 http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/categories.ru.po?cvsroot=www&r1=1.5&r2=1.6 Patches: Index: gnu/po/linux-and-gnu.ru.po =================================================================== RCS file: /web/www/www/gnu/po/linux-and-gnu.ru.po,v retrieving revision 1.10 retrieving revision 1.11 diff -u -b -r1.10 -r1.11 --- gnu/po/linux-and-gnu.ru.po 2 Jan 2012 17:26:47 -0000 1.10 +++ gnu/po/linux-and-gnu.ru.po 3 Jan 2012 15:08:30 -0000 1.11 @@ -1,20 +1,20 @@ # Russian translation for http://www.gnu.org/gnu/gnu-and-linux.html -# Copyright (C) 2011 Free Software Foundation, Inc. +# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2007 Richard M. Stallman +# Copyright (C) 2010, 2011, 2012 Free Software Foundation, Inc. (translation) # This file is distributed under the same license as the original article. # СеÑгей ÐоÑоп, 1999 -# Ineiev <ine...@gnu.org>, 2010, 2011 +# Ineiev <ine...@gnu.org>, 2010, 2011, 2012 # msgid "" msgstr "" "Project-Id-Version: gnu-and-linux.html\n" "POT-Creation-Date: 2012-01-02 12:25-0500\n" -"PO-Revision-Date: 2011-11-21 17:17+0000\n" +"PO-Revision-Date: 2011-12-03 17:17+0000\n" "Last-Translator: Ineiev <ine...@gnu.org>\n" "Language-Team: Russian <www-ru-l...@gnu.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Outdated-Since: 2012-01-02 12:25-0500\n" # type: Content of: <title> #. type: Content of: <title> @@ -283,20 +283,6 @@ # type: Content of: <p> #. type: Content of: <p> -# | Fortunately, we didn't have to wait for the Hurd, because of Linux. Once -# | Torvalds [-wrote Linux,-] {+freed Linux in 1992,+} it fit into the last -# | major gap in the GNU system. People could then <a -# | href=\"http://ftp.funet.fi/pub/linux/historical/kernel/old-versions/RELNOTES-0.01\"> -# | combine Linux with the GNU system</a> to make a complete free system: a -# | Linux-based version of the GNU system; the GNU/Linux system, for short. -#, fuzzy -#| msgid "" -#| "Fortunately, we didn't have to wait for the Hurd, because of Linux. Once " -#| "Torvalds wrote Linux, it fit into the last major gap in the GNU system. " -#| "People could then <a href=\"http://ftp.funet.fi/pub/linux/historical/" -#| "kernel/old-versions/RELNOTES-0.01\"> combine Linux with the GNU system</" -#| "a> to make a complete free system: a Linux-based version of the GNU " -#| "system; the GNU/Linux system, for short." msgid "" "Fortunately, we didn't have to wait for the Hurd, because of Linux. Once " "Torvalds freed Linux in 1992, it fit into the last major gap in the GNU " @@ -306,10 +292,10 @@ "system; the GNU/Linux system, for short." msgstr "" "Ð ÑÑаÑÑÑÑ, благодаÑÑ Linux нам не пÑиÑлоÑÑ Ð¶Ð´Ð°ÑÑ Hurd. Ðогда ТоÑвалÑÐ´Ñ " -"напиÑал Linux, ÑÑо заполнило поÑледний ÑеÑÑезнÑй пÑобел в ÑиÑÑеме GNU. Тогда " -"лÑди Ñмогли ÑоÑеÑаÑÑ Linux Ñ ÑиÑÑемой GNU <a href=\"#ft1\">[1]</a>, " -"ÑÑÐ¾Ð±Ñ ÑоÑÑавиÑÑ Ð¿Ð¾Ð»Ð½ÑÑ ÑвободнÑÑ ÑиÑÑемÑ: веÑÑÐ¸Ñ GNU на базе Linux; коÑоÑе " -"говоÑÑ, ÑиÑÑÐµÐ¼Ñ GNU/Linux." +"оÑвободил Linux в 1992 годÑ, ÑÑо заполнило поÑледний ÑеÑÑезнÑй пÑобел в " +"ÑиÑÑеме GNU. Тогда лÑди Ñмогли ÑоÑеÑаÑÑ Linux Ñ ÑиÑÑемой GNU <a " +"href=\"#ft1\">[1]</a>, ÑÑÐ¾Ð±Ñ ÑоÑÑавиÑÑ Ð¿Ð¾Ð»Ð½ÑÑ ÑвободнÑÑ ÑиÑÑемÑ: веÑÑÐ¸Ñ GNU " +"на базе Linux; коÑоÑе говоÑÑ, ÑиÑÑÐµÐ¼Ñ GNU/Linux." # type: Content of: <p> #. type: Content of: <p> @@ -614,8 +600,8 @@ msgid "*GNUN-SLOT: TRANSLATOR'S CREDITS*" msgstr "" "ÐеÑевод на ÑÑÑÑкий ÑзÑк: <br /> Copyright © 1999 СеÑгей ÐоÑоп <a href=" -"\"mailto:s...@lib.ru\"><s...@lib.ru></a>. <br />Copyright © 2010 " -"Free Software Foundation, Inc." +"\"mailto:s...@lib.ru\"><s...@lib.ru></a>. <br />Copyright © 2010, " +"2011, 2012 Free Software Foundation, Inc." # type: Content of: <div><p> #. timestamp start Index: philosophy/po/categories.ru.po =================================================================== RCS file: /web/www/www/philosophy/po/categories.ru.po,v retrieving revision 1.5 retrieving revision 1.6 diff -u -b -r1.5 -r1.6 --- philosophy/po/categories.ru.po 31 Dec 2011 01:28:17 -0000 1.5 +++ philosophy/po/categories.ru.po 3 Jan 2012 15:08:35 -0000 1.6 @@ -1,21 +1,20 @@ # Russian translation for http://www.gnu.org/philosophy/categories.html -# Copyright (C) 1996, 1997, 1998, 2001, 2006, 2007, 2009, 2010, 2011 -# Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1998, 2001, 2006, 2007, 2009, 2010, 2011, +# 2012 Free Software Foundation, Inc. # This file is distributed under the same license as the original page. -# Ineiev <ine...@gnu.org>, 2010, 2011 +# Ineiev <ine...@gnu.org>, 2010, 2011, 2012 # the translation needs revision by someone else # msgid "" msgstr "" "Project-Id-Version: categories.html\n" "POT-Creation-Date: 2011-12-30 20:25-0500\n" -"PO-Revision-Date: 2011-03-11 17:17+0000\n" +"PO-Revision-Date: 2012-11-03 17:17+0000\n" "Last-Translator: Ineiev <ine...@gnu.org>\n" "Language-Team: Russian <www-ru-l...@gnu.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Outdated-Since: 2011-12-30 20:25-0500\n" # type: Content of: <title> #. type: Content of: <title> @@ -473,48 +472,19 @@ # type: Content of: <p> #. type: Content of: <p> -# | A Unix-like operating system consists of many programs. The GNU system -# | includes all {+of+} the {+<a href=\"#GNUsoftware\">offical+} GNU -# | [-software, as well as-] {+packages</a>. It also includes+} many other -# | packages{+,+} such as the X Window System and TeX{+,+} which are not GNU -# | software. -#, fuzzy -#| msgid "" -#| "A Unix-like operating system consists of many programs. The GNU system " -#| "includes all the GNU software, as well as many other packages such as the " -#| "X Window System and TeX which are not GNU software." msgid "" "A Unix-like operating system consists of many programs. The GNU system " "includes all of the <a href=\"#GNUsoftware\">offical GNU packages</a>. It " "also includes many other packages, such as the X Window System and TeX, " "which are not GNU software." msgstr "" -"ÐпеÑаÑÐ¸Ð¾Ð½Ð½Ð°Ñ ÑиÑÑема Ñипа Unix ÑоÑÑÐ¾Ð¸Ñ Ð¸Ð· множеÑÑва пÑогÑамм. СиÑÑема GNU " -"вклÑÑÐ°ÐµÑ Ð²Ñе пÑогÑÐ°Ð¼Ð¼Ñ GNU, а Ñакже много дÑÑÐ³Ð¸Ñ Ð¿Ð°ÐºÐµÑов, ÑÐ°ÐºÐ¸Ñ , как ÑиÑÑема " -"X Window и TeX, коÑоÑÑе не ÑвлÑÑÑÑÑ Ð¿ÑогÑаммами GNU." +"ÐпеÑаÑÐ¸Ð¾Ð½Ð½Ð°Ñ ÑиÑÑема Ñипа Unix ÑоÑÑÐ¾Ð¸Ñ Ð¸Ð· множеÑÑва пÑогÑамм. Ð ÑиÑÑÐµÐ¼Ñ GNU " +"Ð²Ñ Ð¾Ð´ÑÑ Ð²Ñе <a href=\"#GNUsoftware\">оÑиÑиалÑнÑе пакеÑÑ GNU</a>. Рнее Ð²Ñ Ð¾Ð´Ð¸Ñ " +"Ñакже много дÑÑÐ³Ð¸Ñ Ð¿Ð°ÐºÐµÑов, ÑÐ°ÐºÐ¸Ñ , как ÑиÑÑема X Window и TeX, коÑоÑÑе " +"не ÑвлÑÑÑÑÑ Ð¿ÑогÑаммами GNU." # type: Content of: <p> #. type: Content of: <p> -# | The first test release of the complete GNU system was in 1996. This -# | includes the GNU Hurd, our kernel, developed since 1990. In 2001 the GNU -# | system (including the GNU Hurd) began working fairly reliably, but the -# | Hurd still lacks some important features, so it is not widely used. -# | Meanwhile, the <a href=[- -]\"/gnu/linux-and-gnu.html\">GNU/Linux -# | system</a>, an offshoot of the GNU operating system which uses Linux as -# | the kernel instead of the GNU Hurd, has been a great success since the -# | 90s. {+As this shows, the GNU system is not a single static set of -# | programs; users and distributors may select different packages according -# | to their needs and desires. The result is still a variant of the GNU -# | system.+} -#, fuzzy -#| msgid "" -#| "The first test release of the complete GNU system was in 1996. This " -#| "includes the GNU Hurd, our kernel, developed since 1990. In 2001 the GNU " -#| "system (including the GNU Hurd) began working fairly reliably, but the " -#| "Hurd still lacks some important features, so it is not widely used. " -#| "Meanwhile, the <a href= \"/gnu/linux-and-gnu.html\">GNU/Linux system</a>, " -#| "an offshoot of the GNU operating system which uses Linux as the kernel " -#| "instead of the GNU Hurd, has been a great success since the 90s." msgid "" "The first test release of the complete GNU system was in 1996. This " "includes the GNU Hurd, our kernel, developed since 1990. In 2001 the GNU " @@ -527,33 +497,21 @@ "different packages according to their needs and desires. The result is " "still a variant of the GNU system." msgstr "" -"ÐеÑвÑй пÑобнÑй вÑпÑÑк полной ÑиÑÑÐµÐ¼Ñ GNU бÑл в 1996 годÑ. Ðн вклÑÑал " -"GNU Hurd, наÑе ÑдÑо, ÑазÑабоÑка коÑоÑого ведеÑÑÑ Ñ 1990 года. Ð " -"2001 Ð³Ð¾Ð´Ñ ÑиÑÑема GNU (вклÑÑÐ°Ñ GNU Hurd) наÑала ÑабоÑаÑÑ Ð²Ð¿Ð¾Ð»Ð½Ðµ " -"надежно, но ÑдÑÑ Hurd до ÑÐ¸Ñ Ð¿Ð¾Ñ Ð½Ðµ Ñ Ð²Ð°ÑÐ°ÐµÑ Ð½ÐµÐºÐ¾ÑоÑÑÑ Ð²Ð°Ð¶Ð½ÑÑ Ð¾ÑобенноÑÑей, " -"Ñак ÑÑо ÑиÑоко его не иÑполÑзÑÑÑ. ÐÐµÐ¶Ð´Ñ Ñем <a href=\"/gnu/linux-and-gnu.html" -"\">ÑиÑÑема GNU/Linux</a>, оÑвеÑвление опеÑаÑионной ÑиÑÑÐµÐ¼Ñ GNU, в коÑоÑом в " -"каÑеÑÑве ÑдÑа вмеÑÑо GNU Hurd пÑименÑеÑÑÑ Linux, полÑзÑеÑÑÑ Ð±Ð¾Ð»ÑÑим ÑÑÐ¿ÐµÑ Ð¾Ð¼ " -"наÑÐ¸Ð½Ð°Ñ Ñ Ð´ÐµÐ²ÑноÑÑÑÑ Ð³Ð¾Ð´Ð¾Ð²." +"ÐеÑвÑй пÑобнÑй вÑпÑÑк полной ÑиÑÑÐµÐ¼Ñ GNU бÑл в 1996 годÑ. Ðн вклÑÑал GNU " +"Hurd, наÑе ÑдÑо, ÑазÑабоÑка коÑоÑого ведеÑÑÑ Ñ 1990 года. Ð " +"2001 Ð³Ð¾Ð´Ñ ÑиÑÑема GNU (вклÑÑÐ°Ñ GNU Hurd) наÑала ÑабоÑаÑÑ Ð²Ð¿Ð¾Ð»Ð½Ðµ надежно, " +"но ÑдÑÑ Hurd до ÑÐ¸Ñ Ð¿Ð¾Ñ Ð½Ðµ Ñ Ð²Ð°ÑÐ°ÐµÑ Ð½ÐµÐºÐ¾ÑоÑÑÑ Ð²Ð°Ð¶Ð½ÑÑ Ð¾ÑобенноÑÑей, Ñак ÑÑо " +"ÑиÑоко его не иÑполÑзÑÑÑ. ÐÐµÐ¶Ð´Ñ Ñем <a " +"href=\"/gnu/linux-and-gnu.html\">ÑиÑÑема GNU/Linux</a>, оÑвеÑвление " +"опеÑаÑионной ÑиÑÑÐµÐ¼Ñ GNU, в коÑоÑом в каÑеÑÑве ÑдÑа вмеÑÑо GNU Hurd " +"пÑименÑеÑÑÑ Linux, полÑзÑеÑÑÑ Ð±Ð¾Ð»ÑÑим ÑÑÐ¿ÐµÑ Ð¾Ð¼ наÑÐ¸Ð½Ð°Ñ Ñ Ð´ÐµÐ²ÑноÑÑÑÑ Ð³Ð¾Ð´Ð¾Ð². Ðз " +"ÑÑого видно, ÑÑо ÑиÑÑема GNU — ÑÑо не какой-Ñо один ÑÑаÑиÑнÑй " +"Ð½Ð°Ð±Ð¾Ñ Ð¿ÑогÑамм; полÑзоваÑели и поÑÑавÑики могÑÑ Ð²ÑбиÑаÑÑ ÑазнÑе пакеÑÑ Ð² " +"ÑооÑвеÑÑÑвии Ñо Ñвоими желаниÑми и нÑждами. Ð ÑезÑлÑÑаÑе вÑе Ñавно полÑÑаеÑÑÑ " +"ваÑÐ¸Ð°Ð½Ñ ÑиÑÑÐµÐ¼Ñ GNU." # type: Content of: <p> #. type: Content of: <p> -# | Since the purpose of GNU is to be free, every single component in the GNU -# | operating system [-has to be-] {+is+} free software. They don't all have -# | to be copylefted, however; any kind of free software is legally suitable -# | to include if it helps meet technical goals. [-And it isn't necessary for -# | all the components to be GNU software, individually. GNU can and does -# | include noncopylefted free software such as the X Window System that were -# | developed by other projects.-] -#, fuzzy -#| msgid "" -#| "Since the purpose of GNU is to be free, every single component in the GNU " -#| "operating system has to be free software. They don't all have to be " -#| "copylefted, however; any kind of free software is legally suitable to " -#| "include if it helps meet technical goals. And it isn't necessary for all " -#| "the components to be GNU software, individually. GNU can and does " -#| "include noncopylefted free software such as the X Window System that were " -#| "developed by other projects." msgid "" "Since the purpose of GNU is to be free, every single component in the GNU " "operating system is free software. They don't all have to be copylefted, " @@ -561,13 +519,10 @@ "helps meet technical goals." msgstr "" "ÐоÑколÑÐºÑ ÑÐµÐ»Ñ GNU — Ñвобода, ÐºÐ°Ð¶Ð´Ð°Ñ Ð¾ÑделÑÐ½Ð°Ñ ÑоÑÑавлÑÑÑÐ°Ñ Ð² " -"опеÑаÑионной ÑиÑÑеме GNU должна бÑÑÑ Ñвободной пÑогÑаммой. Ðднако не " +"опеÑаÑионной ÑиÑÑеме GNU ÑвлÑеÑÑÑ Ñвободной пÑогÑаммой. Ðднако не " "ÑÑебÑеÑÑÑ, ÑÑÐ¾Ð±Ñ Ð½Ð° Ð½Ð¸Ñ ÑаÑпÑоÑÑÑанÑлоÑÑ Ð°Ð²ÑоÑÑкое лево; лÑбого Ñода " "ÑвободнÑе пÑогÑÐ°Ð¼Ð¼Ñ ÑÑидиÑеÑки Ð¿Ð¾Ð´Ñ Ð¾Ð´ÑÑ Ð´Ð»Ñ Ð¿ÑиÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ Ðº ÑиÑÑеме, еÑли " -"они помогаÑÑ ÑеÑаÑÑ ÑÐµÑ Ð½Ð¸ÑеÑкие задаÑи. Также Ð½ÐµÑ Ð½ÐµÐ¾Ð±Ñ Ð¾Ð´Ð¸Ð¼Ð¾ÑÑи, ÑÑÐ¾Ð±Ñ " -"ÐºÐ°Ð¶Ð´Ð°Ñ Ð¾ÑделÑÐ½Ð°Ñ ÑоÑÑавлÑÑÑÐ°Ñ Ð±Ñла пÑогÑаммой GNU. GNU Ð¼Ð¾Ð¶ÐµÑ Ð²ÐºÐ»ÑÑаÑÑ Ð¸ " -"вклÑÑÐ°ÐµÑ ÑвободнÑе пÑогÑÐ°Ð¼Ð¼Ñ Ð±ÐµÐ· авÑоÑÑкого лева, Ñакие, как ÑиÑÑема X " -"Window, коÑоÑÑе ÑазÑабоÑÐ°Ð½Ñ Ð² дÑÑÐ³Ð¸Ñ Ð¿ÑоекÑÐ°Ñ ." +"они помогаÑÑ ÑеÑаÑÑ ÑÐµÑ Ð½Ð¸ÑеÑкие задаÑи." # type: Content of: <h3> # skip the next passages: no need to support homomorphical synonyms in Russian @@ -999,34 +954,3 @@ #. type: Content of: <div><p> msgid "Updated:" msgstr "Ðбновлено:" - -# type: Content of: <div><h4> -#~ msgid "Translations of this page" -#~ msgstr "ÐеÑÐµÐ²Ð¾Ð´Ñ ÑÑой ÑÑÑаниÑÑ" - -#~ msgid "" -#~ "Please send FSF & GNU inquiries to <a href=\"mailto:g...@gnu.org\"><" -#~ "g...@gnu.org></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:webmast...@gnu.org\"><" -#~ "webmast...@gnu.org></a>." -#~ msgstr "" -#~ "ÐожалÑйÑÑа, пÑиÑÑлайÑе запÑоÑÑ ÑÐ¾Ð½Ð´Ñ Ð¸ GNU по адÑеÑÑ <a href=\"mailto:" -#~ "g...@gnu.org\"><g...@gnu.org></a>. ÐÑÑÑ Ñакже <a href=\"/contact/" -#~ "\">дÑÑгие ÑпоÑÐ¾Ð±Ñ ÑвÑзаÑÑÑÑ</a> Ñ Ñондом. <br /> ÐожалÑйÑÑа, пÑиÑÑлайÑе " -#~ "оÑÑеÑÑ Ð¾ неÑабоÑаÑÑÐ¸Ñ ÑÑÑÐ»ÐºÐ°Ñ Ð¸ дÑÑгие попÑавки или пÑÐµÐ´Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ Ð¿Ð¾ адÑеÑÑ " -#~ "<a href=\"mailto:web-translat...@gnu.org\"><web-translat...@gnu.org>" -#~ "</a>." - -# type: Content of: <div><p> -#~ msgid "" -#~ "Verbatim copying and distribution of this entire article are permitted " -#~ "worldwide, without royalty, in any medium, provided this notice, and the " -#~ "copyright notice, are preserved." -#~ msgstr "" -#~ "Verbatim copying and distribution of this entire article are permitted " -#~ "worldwide, without royalty, in any medium, provided this notice, and the " -#~ "copyright notice, are preserved. <br /> (ÐÑквалÑное копиÑование и " -#~ "ÑаÑпÑоÑÑÑанение вÑей ÑÑой ÑÑаÑÑи ÑазÑеÑÐµÐ½Ñ \n" -#~ "по вÑÐµÐ¼Ñ Ð¼Ð¸ÑÑ Ð±ÐµÐ·Ð²Ð¾Ð·Ð¼ÐµÐ·Ð´Ð½Ð¾ на лÑбом ноÑиÑеле пÑи ÑÑловии, ÑÑо ÑÑо \n" -#~ "Ñведомление и Ñведомление об авÑоÑÑÐºÐ¸Ñ Ð¿ÑÐ°Ð²Ð°Ñ ÑÐ¾Ñ ÑанÑÑÑÑÑ)"