Attachment 118327 Details for Bug 177307 – hb-working-use.xml.diff

[patch] hb-working-use.xml.diff

hb-working-use.xml.diff (text/plain), 3.85 KB, created by Azamat H. Hackimov on 2007-05-06 12:22:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Azamat H. Hackimov

Created: 2007-05-06 12:22:14 UTC

Size: 3.85 KB

patch

obsolete

>Index: hb-working-use.xml
>===================================================================
>RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/ru/handbook/hb-working-use.xml,v
>retrieving revision 1.8
>diff -u -b -B -r1.8 hb-working-use.xml
>--- hb-working-use.xml	26 Sep 2006 11:12:43 -0000	1.8
>+++ hb-working-use.xml	6 May 2007 12:18:31 -0000
>@@ -9,8 +9,14 @@
> 
> <sections>
> 
>-<version>1.34</version>
>-<date>2006-09-03</date>
>+<abstract>
>+USE-ÑÐ»Ð°Ð³Ð¸ ÑÐ²Ð»ÑÑÑÑÑ Ð½ÐµÐ¼Ð°Ð»Ð¾Ð²Ð°Ð¶Ð½ÑÐ¼ Ð°ÑÐ¿ÐµÐºÑÐ¾Ð¼ ÑÐ¸ÑÑÐµÐ¼Ñ Gentoo. Ð ÑÑÐ¾Ð¹ Ð³Ð»Ð°Ð²Ðµ Ð²Ñ
>+ÑÐ·Ð½Ð°ÐµÑÐµ Ð¾ Ð¿ÑÐ¸Ð½ÑÐ¸Ð¿Ð°Ñ ÑÐ°Ð±Ð¾ÑÑ Ñ USE-ÑÐ»Ð°Ð³Ð°Ð¼Ð¸ Ð¸ Ð¿Ð¾Ð¹Ð¼ÐµÑÐµ, ÐºÐ°Ðº Ð¾Ð½Ð¸ Ð¼Ð¾Ð³ÑÑ
>+Ð²Ð¾Ð·Ð´ÐµÐ¹ÑÑÐ²Ð¾Ð²Ð°ÑÑ Ð½Ð° Ð²Ð°ÑÑ ÑÐ¸ÑÑÐµÐ¼Ñ.
>+</abstract>
>+
>+<version>1.36</version>
>+<date>2007-02-20</date>
> 
> <section>
> <title>Ð§ÑÐ¾ ÑÐ°ÐºÐ¾Ðµ USE-ÑÐ»Ð°Ð³Ð¸?</title>
>@@ -56,7 +62,7 @@
> 
> ÐÐ°Ð²Ð°Ð¹ÑÐµ ÑÐ°ÑÑÐ¼Ð¾ÑÑÐ¸Ð¼ ÐºÐ¾Ð½ÐºÑÐµÑÐ½ÑÐ¹ Ð¿ÑÐ¸Ð¼ÐµÑ &mdash; ÐºÐ»ÑÑÐµÐ²Ð¾Ðµ ÑÐ»Ð¾Ð²Ð¾ <c>kde</c>. ÐÑÐ»Ð¸ Ð²
> Ð²Ð°ÑÐµÐ¹ Ð¿ÐµÑÐµÐ¼ÐµÐ½Ð½Ð¾Ð¹ <c>USE</c> Ð½ÐµÑ ÑÑÐ¾Ð³Ð¾ ÑÐ»Ð¾Ð²Ð°, ÑÐ¾ Ð²ÑÐµ Ð¿Ð°ÐºÐµÑÑ, Ð³Ð´Ðµ Ð¿Ð¾Ð´Ð´ÐµÑÐ¶ÐºÐ° KDE
>-ÑÐ²Ð»ÑÐµÑÑÑ <e>Ð½ÐµÐ¾Ð±ÑÐ·Ð°ÑÐµÐ»ÑÐ½Ð¾Ð¹</e>, ÑÐ¾Ð±ÑÐ¸ÑÐ°ÑÑÑÑ <e>Ð±ÐµÐ·</e> Ð½ÐµÐµ. ÐÑÐµ Ð¿Ð°ÐºÐµÑÑ, Ð³Ð´Ðµ
>+ÑÐ²Ð»ÑÐµÑÑÑ <e>Ð½ÐµÐ¾Ð±ÑÐ·Ð°ÑÐµÐ»ÑÐ½Ð¾Ð¹</e>, ÑÐ¾Ð±Ð¸ÑÐ°ÑÑÑÑ <e>Ð±ÐµÐ·</e> Ð½ÐµÐµ. ÐÑÐµ Ð¿Ð°ÐºÐµÑÑ, Ð³Ð´Ðµ
> Ð·Ð°Ð²Ð¸ÑÐ¸Ð¼Ð¾ÑÑÑ Ð¾Ñ KDE ÑÐ²Ð»ÑÐµÑÑÑ <e>Ð½ÐµÐ¾Ð±ÑÐ·Ð°ÑÐµÐ»ÑÐ½Ð¾Ð¹</e>, ÑÑÑÐ°Ð½Ð°Ð²Ð»Ð¸Ð²Ð°ÑÑÑÑ <e>Ð±ÐµÐ·</e>
> ÑÑÑÐ°Ð½Ð¾Ð²ÐºÐ¸ Ð±Ð¸Ð±Ð»Ð¸Ð¾ÑÐµÐº KDE (Ð¿Ð¾ Ð·Ð°Ð²Ð¸ÑÐ¸Ð¼Ð¾ÑÑÐ¸). ÐÑÐ»Ð¸ Ð¶Ðµ Ð²Ñ Ð¾Ð¿ÑÐµÐ´ÐµÐ»Ð¸ÑÐµ ÐºÐ»ÑÑÐµÐ²Ð¾Ðµ
> ÑÐ»Ð¾Ð²Ð¾ <c>kde</c>, ÑÐ¾ ÑÑÐ¸ Ð¿Ð°ÐºÐµÑÑ Ð±ÑÐ´ÑÑ ÑÐ¾Ð±Ð¸ÑÐ°ÑÑÑÑ <e>Ñ Ð¿Ð¾Ð´Ð´ÐµÑÐ¶ÐºÐ¾Ð¹</e> KDE, Ð° KDE 
>@@ -163,7 +169,7 @@
> 
> 
> <pre caption="ÐÑÐ¸Ð¼ÐµÑ Ð·Ð½Ð°ÑÐµÐ½Ð¸Ñ USE Ð² /etc/make.conf">
>-USE="-kde -qt ldap"
>+USE="-kde -qt3 -qt4 ldap"
> </pre>
> 
> </body>
>@@ -212,11 +218,11 @@
> 
> 
> 
>-ÐÐ°Ð¿ÑÐ¸Ð¼ÐµÑ, ÑÐ±ÐµÑÐµÐ¼ java Ð¸Ð· Ð·Ð½Ð°ÑÐµÐ½Ð¸Ñ USE Ð½Ð° Ð²ÑÐµÐ¼Ñ ÑÑÑÐ°Ð½Ð¾Ð²ÐºÐ¸ mozilla.
>+ÐÐ°Ð¿ÑÐ¸Ð¼ÐµÑ, ÑÐ±ÐµÑÐµÐ¼ java Ð¸Ð· Ð·Ð½Ð°ÑÐµÐ½Ð¸Ñ USE Ð½Ð° Ð²ÑÐµÐ¼Ñ ÑÑÑÐ°Ð½Ð¾Ð²ÐºÐ¸ seamonkey.
> 
> 
> <pre caption="ÐÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ðµ USE Ð² Ð²Ð¸Ð´Ðµ Ð¿ÐµÑÐµÐ¼ÐµÐ½Ð½Ð¾Ð¹ ÑÑÐµÐ´Ñ">
>-# USE="-java" emerge mozilla
>+# USE="-java" emerge seamonkey
> </pre>
> 
> </body>
>@@ -319,19 +325,19 @@
> <body>
> 
> 
>-ÐÐ¾Ð·ÑÐ¼ÐµÐ¼, Ðº Ð¿ÑÐ¸Ð¼ÐµÑÑ, <c>mozilla</c> &mdash; ÐºÐ°ÐºÐ¸Ðµ USE-ÑÐ»Ð°Ð³Ð¸ Ð¾Ð½Ð° Ð¼Ð¾Ð¶ÐµÑ
>+ÐÐ¾Ð·ÑÐ¼ÐµÐ¼, Ðº Ð¿ÑÐ¸Ð¼ÐµÑÑ, <c>seamonkey</c> &mdash; ÐºÐ°ÐºÐ¸Ðµ USE-ÑÐ»Ð°Ð³Ð¸ Ð¾Ð½Ð° Ð¼Ð¾Ð¶ÐµÑ
> Ð¸ÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÑ? Ð§ÑÐ¾Ð±Ñ ÑÑÐ¾ Ð²ÑÑÑÐ½Ð¸ÑÑ, Ð·Ð°Ð¿ÑÑÑÐ¸Ð¼ <c>emerge</c> Ñ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÐ°Ð¼Ð¸
> <c>--pretend</c> Ð¸ <c>--verbose</c>:
> 
> 
>-<pre caption="ÐÑÐ¾ÑÐ¼Ð¾ÑÑ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·ÑÐµÐ¼ÑÑ USE ÑÐ»Ð°Ð³Ð¾Ð²">
>-# emerge --pretend --verbose mozilla
>+<pre caption="ÐÑÐ¾ÑÐ¼Ð¾ÑÑ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·ÑÐµÐ¼ÑÑ USE-ÑÐ»Ð°Ð³Ð¾Ð²">
>+# emerge --pretend --verbose seamonkey
> These are the packages that I would merge, in order:
> 
> Calculating dependencies ...done!
>-[ebuild R ] www-client/mozilla-1.7.12-r2 USE="crypt gnome java mozsvg ssl
>-truetype xprint -debug -ipv6 -ldap -mozcalendar -mozdevelop -moznocompose
>--moznoirc -moznomail -moznoxft -postgres -xinerama" 0 kB
>+[ebuild R ] www-client/seamonkey-1.0.7 USE="crypt gnome java -debug -ipv6
>+-ldap -mozcalendar -mozdevelop -moznocompose -moznoirc -moznomail -moznopango
>+-moznoroaming -postgres -xinerama -xprint" 0 kB
> </pre>
> 
> 
>@@ -374,10 +380,10 @@
> 
> <!-- *$Localization:
> target-language: Russian
>-target-version: 1.34-r1
>-target-date: 2006-09-25
>-source-cvs-revision: 1.42
>-translated-by: unknown up to v1.23
>+target-version: 1.36-r1
>+target-date: 2007-05-06
>+source-cvs-revision: 1.46
>+translated-by:
> edited-by: Azamat H. Hackimov; Alexey Chumakov [achumakov@gentoo.org]
> 
> notes:

Actions: View | Diff

Attachments on bug 177307: 118327