CVSROOT: /web/www Module name: www Changes by: Pavel Kharitonov <ineiev> 12/01/11 13:15:33
Modified files: gnu/po : gnu-history.ru.po Log message: update CVSWeb URLs: http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-history.ru.po?cvsroot=www&r1=1.14&r2=1.15 Patches: Index: gnu-history.ru.po =================================================================== RCS file: /web/www/www/gnu/po/gnu-history.ru.po,v retrieving revision 1.14 retrieving revision 1.15 diff -u -b -r1.14 -r1.15 --- gnu-history.ru.po 10 Jan 2012 17:29:52 -0000 1.14 +++ gnu-history.ru.po 11 Jan 2012 13:15:26 -0000 1.15 @@ -2,13 +2,13 @@ # Copyright (C) 2010, 2011 Free Software Foundation, Inc. # This file is distributed under the same license as the www.gnu.org page. # Vladimir Smolyar <v...@ukr.net>, 2010 -# Ineiev <ine...@gnu.org>, 2010, 2011 +# Ineiev <ine...@gnu.org>, 2010, 2011, 2012 # msgid "" msgstr "" "Project-Id-Version: gnu-history.ru.po\n" "POT-Creation-Date: 2012-01-08 20:25-0500\n" -"PO-Revision-Date: 2011-10-07 17:17+0000\n" +"PO-Revision-Date: 2012-01-11 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" @@ -168,21 +168,6 @@ # type: Content of: <p> #. type: Content of: <p> -# | A Unix-like operating system [-is much more than a kernel; it also-] -# | includes {+a kernel,+} compilers, editors, text formatters, mail software, -# | {+graphical interfaces, libraries, games+} and many other things. Thus, -# | writing a whole operating system is a very large job. We started in -# | January 1984. [-It took many years.-] The <a href=\"http://fsf.org/\">{+ -# | +}Free Software Foundation</a> was founded in October 1985, initially to -# | raise funds to help develop GNU. -#, fuzzy -#| msgid "" -#| "A Unix-like operating system is much more than a kernel; it also includes " -#| "compilers, editors, text formatters, mail software, and many other " -#| "things. Thus, writing a whole operating system is a very large job. We " -#| "started in January 1984. It took many years. The <a href=\"http://fsf." -#| "org/\">Free Software Foundation</a> was founded in October 1985, " -#| "initially to raise funds to help develop GNU." msgid "" "A Unix-like operating system includes a kernel, compilers, editors, text " "formatters, mail software, graphical interfaces, libraries, games and many " @@ -191,37 +176,16 @@ "Foundation</a> was founded in October 1985, initially to raise funds to help " "develop GNU." msgstr "" -"ÐпеÑаÑÐ¸Ð¾Ð½Ð½Ð°Ñ ÑиÑÑема Ñипа Unix — ÑÑо гоÑаздо болÑÑе, Ñем ÑдÑо; " -"она вклÑÑÐ°ÐµÑ Ñакже компилÑÑоÑÑ, ÑедакÑоÑÑ, пÑогÑÐ°Ð¼Ð¼Ñ Ð´Ð»Ñ ÑоÑмаÑиÑÐ¾Ð²Ð°Ð½Ð¸Ñ " -"ÑекÑÑов, поÑÑовÑе пÑогÑÐ°Ð¼Ð¼Ñ Ð¸ многое дÑÑгое. Так ÑÑо напиÑание Ñелой " +"ÐпеÑаÑÐ¸Ð¾Ð½Ð½Ð°Ñ ÑиÑÑема Ñипа Unix вклÑÑÐ°ÐµÑ Ð² ÑÐµÐ±Ñ ÑдÑо, компилÑÑоÑÑ, ÑедакÑоÑÑ, " +"пÑогÑÐ°Ð¼Ð¼Ñ Ð´Ð»Ñ ÑоÑмаÑиÑÐ¾Ð²Ð°Ð½Ð¸Ñ ÑекÑÑов, поÑÑовÑе пÑогÑаммÑ, гÑаÑиÑеÑкие " +"оболоÑки, библиоÑеки, игÑÑ Ð¸ многое дÑÑгое. Так ÑÑо напиÑание Ñелой " "опеÑаÑионной ÑиÑÑÐµÐ¼Ñ — ÑÑо оÑÐµÐ½Ñ Ð±Ð¾Ð»ÑÑÐ°Ñ ÑабоÑа. ÐÑ Ð½Ð°Ñали в " -"ÑнваÑе 1984 года. ÐÑо занÑло много леÑ. РокÑÑбÑе 1985 года бÑл " +"ÑнваÑе 1984 года. РокÑÑбÑе 1985 года бÑл " "оÑнован <a href=\"http://fsf.org/\">Фонд Ñвободного пÑогÑаммного " "обеÑпеÑениÑ</a>, пеÑвонаÑалÑно Ð´Ð»Ñ ÑбоÑа Ñондов в поддеÑÐ¶ÐºÑ ÑазÑабоÑки GNU." # type: Content of: <p> #. type: Content of: <p> -# | By 1990 we had either found or written all the major components except -# | one—the kernel. Then Linux, a Unix-like kernel, was developed by -# | Linus Torvalds in 1991 and made free software in 1992. Combining Linux -# | with the almost-complete GNU system resulted in a complete operating -# | system: the GNU/Linux system. Estimates are that tens of millions of -# | people now use GNU/Linux systems, typically via <a -# | [-href=\"/distros\">distributions</a> such as Slackware, Debian, Red Hat, -# | and others.-] {+href=\"/distros\">GNU/Linux distributions</a>. The -# | principal version of Linux now contains non-free firmware -# | “blobs”; free software activists now maintain a modified free -# | version of Linux, called <a -# | href=\"http://directory.fsf.org/project/linux\"> Linux-libre</a>.)+} -#, fuzzy -#| msgid "" -#| "By 1990 we had either found or written all the major components except " -#| "one—the kernel. Then Linux, a Unix-like kernel, was developed by " -#| "Linus Torvalds in 1991 and made free software in 1992. Combining Linux " -#| "with the almost-complete GNU system resulted in a complete operating " -#| "system: the GNU/Linux system. Estimates are that tens of millions of " -#| "people now use GNU/Linux systems, typically via <a href=\"/distros" -#| "\">distributions</a> such as Slackware, Debian, Red Hat, and others." msgid "" "By 1990 we had either found or written all the major components except " "one—the kernel. Then Linux, a Unix-like kernel, was developed by " @@ -240,7 +204,11 @@ "ÐбÑединение Linux Ñ Ð¿Ð¾ÑÑи законÑенной ÑиÑÑемой GNU дало полнÑÑ Ð¾Ð¿ÐµÑаÑионнÑÑ " "ÑиÑÑемÑ: ÑиÑÑÐµÐ¼Ñ GNU/Linux. СоглаÑно оÑенкам, деÑÑÑки миллионов лÑдей ÑейÑÐ°Ñ " "иÑполÑзÑÑÑ ÑиÑÑÐµÐ¼Ñ GNU/Linux, обÑÑно в виде <a href=\"/distros/distros.html" -"\">диÑÑÑибÑÑивов</a>, ÑÐ°ÐºÐ¸Ñ , как Slackware, Debian, Red Hat и дÑÑгие." +"\">диÑÑÑибÑÑивов GNU/Linux</a>. ÐÑÐ½Ð¾Ð²Ð½Ð°Ñ Ð²ÐµÑÑÐ¸Ñ Linux ÑодеÑÐ¶Ð¸Ñ ÑейÑÐ°Ñ " +"“клÑкÑÑ” c неÑвободнÑми пÑогÑаммами Ð´Ð»Ñ ÑÑÑÑойÑÑв; акÑивиÑÑÑ " +"Ñвободного пÑогÑаммного обеÑпеÑÐµÐ½Ð¸Ñ Ð² наÑÑоÑÑее вÑÐµÐ¼Ñ Ð¿Ð¾Ð´Ð´ÐµÑживаÑÑ " +"измененнÑÑ ÑвободнÑÑ Ð²ÐµÑÑÐ¸Ñ Linux, назÑваемÑÑ <a " +"href=\"http://directory.fsf.org/project/linux\">Linux-libre</a>." # type: Content of: <p> #. type: Content of: <p> @@ -282,19 +250,6 @@ # type: Content of: <p> #. type: Content of: <p> -# | How far can free software go? There are no limits, except when <a -# | href=\"/philosophy/fighting-software-patents.html\">laws such as the -# | patent system prohibit free [-software</a> entirely.-] {+software</a>.+} -# | The ultimate goal is to provide free software to do all of the jobs -# | computer users want to do—and thus make proprietary software a thing -# | of the past. -#, fuzzy -#| msgid "" -#| "How far can free software go? There are no limits, except when <a href=\"/" -#| "philosophy/fighting-software-patents.html\">laws such as the patent " -#| "system prohibit free software</a> entirely. The ultimate goal is to " -#| "provide free software to do all of the jobs computer users want to " -#| "do—and thus make proprietary software a thing of the past." msgid "" "How far can free software go? There are no limits, except when <a href=\"/" "philosophy/fighting-software-patents.html\">laws such as the patent system " @@ -304,8 +259,8 @@ msgstr "" "Ðак далеко Ð¼Ð¾Ð¶ÐµÑ Ð¿Ð¾Ð¹Ñи Ñвободное пÑогÑаммное обеÑпеÑение? ÐÑеделов неÑ, " "кÑоме ÑлÑÑаев, когда <a href=\"/philosophy/fighting-software-patents.html" -"\">законÑ, Ñакие, как паÑенÑÐ½Ð°Ñ ÑиÑÑема, запÑеÑаÑÑ ÑвободнÑе пÑогÑаммÑ</a> в " -"пÑинÑипе. ÐонеÑÐ½Ð°Ñ ÑÐµÐ»Ñ — Ñоздание ÑвободнÑÑ Ð¿ÑогÑамм Ð´Ð»Ñ " +"\">законÑ, Ñакие, как паÑенÑÐ½Ð°Ñ ÑиÑÑема, запÑеÑаÑÑ ÑвободнÑе пÑогÑаммÑ</a>. " +"ÐонеÑÐ½Ð°Ñ ÑÐµÐ»Ñ — Ñоздание ÑвободнÑÑ Ð¿ÑогÑамм Ð´Ð»Ñ " "ÑеÑÐµÐ½Ð¸Ñ Ð½Ð° компÑÑÑеÑе лÑбÑÑ Ð·Ð°Ð´Ð°Ñ, коÑоÑÑе полÑзоваÑели желаÑÑ ÑеÑаÑÑ " "— и Ñаким обÑазом оÑÑавиÑÑ Ð½ÐµÑвободнÑе пÑогÑÐ°Ð¼Ð¼Ñ Ð² пÑоÑлом." @@ -380,14 +335,3 @@ #. type: Content of: <div><p> msgid "Updated:" msgstr "Ðбновлено:" - -# type: Content of: <p> -#~ msgid "" -#~ "(The principal version of Linux now contains non-free firmware “" -#~ "blobs”. Free software activists now maintain a modified <a href=" -#~ "\"http://directory.fsf.org/project/linux\">free version</a> of Linux.)" -#~ msgstr "" -#~ "(ÐÑÐ½Ð¾Ð²Ð½Ð°Ñ Ð²ÐµÑÑÐ¸Ñ Linux ÑейÑÐ°Ñ ÑодеÑÐ¶Ð¸Ñ “вкÑаплениє " -#~ "неÑвободнÑÑ Ð¿ÑогÑамм Ð´Ð»Ñ ÑÑÑÑойÑÑв. ÐкÑивиÑÑÑ Ð´Ð²Ð¸Ð¶ÐµÐ½Ð¸Ñ Ð·Ð° Ñвободное " -#~ "пÑогÑаммное обеÑпеÑение поддеÑживаÑÑ ÑепеÑÑ Ð¼Ð¾Ð´Ð¸ÑиÑиÑованнÑÑ <a href=" -#~ "\"http://directory.fsf.org/project/linux\">ÑвободнÑÑ Ð²ÐµÑÑиÑ</a> Linux.)"