cvs: smarty /docs/ru/designers/language-modifiers language-modifier-capitalize.xml language-modifier-cat.xml language-modifier-count-characters.xml language-modifier-count-paragraphs.xml language-modifier-count-sentences.xml language-modifier-count-words.xml language-modifier-date-format.xml language-modifier-default.xml language-modifier-escape.xml language-modifier-indent.xml language-modifier-lower.xml language-modifier-nl2br.xml language-modifier-regex-replace.xml language-modifier-replace.xml language-modifier-spacify.xml language-modifier-string-format.xml language-modifier-strip-tags.xml language-modifier-strip.xml language-modifier-truncate.xml language-modifier-upper.xml language-modifier-wordwrap.xml

[email protected] ("George Miroshnikov") Thu, 19 Jan 2006 13:02:39 -0000
Newsgroups php.smarty.cvs
Message-ID <cvsfreespace1137675759@cvsserver>
freespace		Thu Jan 19 13:02:39 2006 UTC

  Modified files:              
    /smarty/docs/ru/designers/language-modifiers	
                                                	language-modifier-capitalize.xml 
                                                	language-modifier-cat.xml 
                                                	language-modifier-count-characters.xml 
                                                	language-modifier-count-paragraphs.xml 
                                                	language-modifier-count-sentences.xml 
                                                	language-modifier-count-words.xml 
                                                	language-modifier-date-format.xml 
                                                	language-modifier-default.xml 
                                                	language-modifier-escape.xml 
                                                	language-modifier-indent.xml 
                                                	language-modifier-lower.xml 
                                                	language-modifier-nl2br.xml 
                                                	language-modifier-regex-replace.xml 
                                                	language-modifier-replace.xml 
                                                	language-modifier-spacify.xml 
                                                	language-modifier-string-format.xml 
                                                	language-modifier-strip-tags.xml 
                                                	language-modifier-strip.xml 
                                                	language-modifier-truncate.xml 
                                                	language-modifier-upper.xml 
                                                	language-modifier-wordwrap.xml 
  Log:
  sync with EN
freespace-20060119130239.txt (text/plain, 90.6 KB)
http://cvs.php.net/viewcvs.cgi/smarty/docs/ru/designers/language-modifiers/language-modifier-capitalize.xml?r1=1.4&r2=1.5&diff_format=u
Index: smarty/docs/ru/designers/language-modifiers/language-modifier-capitalize.xml
diff -u smarty/docs/ru/designers/language-modifiers/language-modifier-capitalize.xml:1.4 smarty/docs/ru/designers/language-modifiers/language-modifier-capitalize.xml:1.5
--- smarty/docs/ru/designers/language-modifiers/language-modifier-capitalize.xml:1.4	Mon May  9 17:34:37 2005
+++ smarty/docs/ru/designers/language-modifiers/language-modifier-capitalize.xml	Thu Jan 19 13:02:38 2006
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="windows-1251"?>
-<!-- $Revision: 1.4 $ -->
-<!-- EN-Revision: 1.3 Maintainer: freespace Status: ready -->
+<!-- $Revision: 1.5 $ -->
+<!-- EN-Revision: 1.6 Maintainer: freespace Status: ready -->
 <sect1 id="language.modifier.capitalize">
  <title>capitalize</title>
+ <para>
+  Ïðåîáðàçîâûâàåò ïåðâûå áóêâû êàæäîãî â ïåðåìåííîé ñëîâà â çàãëàâíûå.
+ </para>
   <informaltable frame="all">
    <tgroup cols="5">
     <colspec colname="param" align="center" />
@@ -31,24 +34,19 @@
     </tbody>
    </tgroup>
   </informaltable>
- <para>
-  Ïåðâûå áóêâû êàæäîãî ñëîâà ïðåîáðàçóþòñÿ â çàãëàâíûå.
- </para>
  <example>
   <title>capitalize</title>
    <programlisting role="php">
 <![CDATA[
 <?php
 
-$smarty = new Smarty;
 $smarty->assign('articleTitle', 'next x-men film, x3, delayed.');
-$smarty->display('index.tpl');
 
 ?>
 ]]>
    </programlisting>
    <para>
-    Øàáëîí index.tpl:
+    Øàáëîí:
    </para>
    <programlisting>
 <![CDATA[
@@ -70,7 +68,8 @@
   </example>
  <para>
   Ñì. òàêæå
-  <link linkend="language.modifier.lower">lower</link> è
+  <link linkend="language.modifier.lower">lower</link>
+  è
   <link linkend="language.modifier.upper">upper</link>
  </para>
 </sect1>
http://cvs.php.net/viewcvs.cgi/smarty/docs/ru/designers/language-modifiers/language-modifier-cat.xml?r1=1.4&r2=1.5&diff_format=u
Index: smarty/docs/ru/designers/language-modifiers/language-modifier-cat.xml
diff -u smarty/docs/ru/designers/language-modifiers/language-modifier-cat.xml:1.4 smarty/docs/ru/designers/language-modifiers/language-modifier-cat.xml:1.5
--- smarty/docs/ru/designers/language-modifiers/language-modifier-cat.xml:1.4	Thu Nov 25 23:26:13 2004
+++ smarty/docs/ru/designers/language-modifiers/language-modifier-cat.xml	Thu Jan 19 13:02:38 2006
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="windows-1251"?>
-<!-- $Revision: 1.4 $ -->
-<!-- EN-Revision: 1.1 Maintainer: tony2001 Status: ready -->
+<!-- $Revision: 1.5 $ -->
+<!-- EN-Revision: 1.3 Maintainer: freespace Status: ready -->
 <sect1 id="language.modifier.cat">
  <title>cat</title>
+ <para>
+		Äàííàÿ ñòðîêà äîáàâëÿåòñÿ ê ìîäèôèöèðóåìîìó çíà÷åíèþ ïåðåìåííîé.
+	</para>
  <informaltable frame="all">
                 <tgroup cols="5">
                 <colspec colname="param" align="center" />
@@ -31,26 +34,35 @@
                 </tbody>
                 </tgroup>
  </informaltable>
- <para>
-		Äàííàÿ ñòðîêà äîáàâëÿåòñÿ ê ìîäèôèöèðóåìîìó çíà÷åíèþ.
-	</para>
- <example>
-  <title>cat</title>
-<programlisting>
-index.php:
 
-$smarty = new Smarty;
-$smarty-&gt;assign('articleTitle', "Psychics predict world didn't end");
-$smarty-&gt;display('index.tpl');
+  <example>
+   <title>cat</title>
+   <programlisting role="php">
+<![CDATA[
+<?php    
 
-index.tpl:
+$smarty->assign('articleTitle', "Psychics predict world didn't end");
 
+?>
+]]>
+   </programlisting>
+   <para>
+    Øàáëîí:
+   </para>
+   <programlisting>
+<![CDATA[
 {$articleTitle|cat:" yesterday."}
-
-OUTPUT:
-
-Psychics predict world didn't end yesterday.</programlisting>
- </example>
+]]>
+   </programlisting>
+   <para>
+    Ðåçóëüòàò îáðàáîòêè:
+   </para>
+   <screen>
+<![CDATA[    
+Psychics predict world didn't end yesterday.
+]]>
+   </screen>
+  </example>
 </sect1>
 <!-- Keep this comment at the end of the file
 Local variables:
http://cvs.php.net/viewcvs.cgi/smarty/docs/ru/designers/language-modifiers/language-modifier-count-characters.xml?r1=1.3&r2=1.4&diff_format=u
Index: smarty/docs/ru/designers/language-modifiers/language-modifier-count-characters.xml
diff -u smarty/docs/ru/designers/language-modifiers/language-modifier-count-characters.xml:1.3 smarty/docs/ru/designers/language-modifiers/language-modifier-count-characters.xml:1.4
--- smarty/docs/ru/designers/language-modifiers/language-modifier-count-characters.xml:1.3	Mon May  9 17:34:38 2005
+++ smarty/docs/ru/designers/language-modifiers/language-modifier-count-characters.xml	Thu Jan 19 13:02:38 2006
@@ -1,38 +1,79 @@
 <?xml version="1.0" encoding="windows-1251"?>
-<!-- $Revision: 1.3 $ -->
-<!-- EN-Revision: 1.2 Maintainer: freespace Status: ready -->
+<!-- $Revision: 1.4 $ -->
+<!-- EN-Revision: 1.6 Maintainer: freespace Status: ready -->
 <sect1 id="language.modifier.count.characters">
  <title>count_characters</title>
  <para>
-  Âîçâðàùàåò êîëè÷åñòâî ñèìâîëîâ â ñòðîêå.
+  Ïîäñ÷èòûâàåò êîëè÷åñòâî ñèìâîëîâ â ïåðåìåííîé.
  </para>
- <example>
-  <title>count_characters</title>
-  <programlisting>
-index.php:
+  <informaltable frame="all">
+   <tgroup cols="5">
+    <colspec colname="param" align="center" />
+    <colspec colname="type" align="center" />
+    <colspec colname="required" align="center" />
+    <colspec colname="default" align="center" />
+    <colspec colname="desc" />
+    <thead>
+     <row>
+      <entry>Ïîçèöèÿ ïàðàìåòðà</entry>
+      <entry>Òèï</entry>
+      <entry>Îáÿçàòåëåí</entry>
+      <entry>Ïî óìîë÷àíèþ</entry>
+      <entry>Îïèñàíèå</entry>
+     </row>
+    </thead>
+    <tbody>
+     <row>
+      <entry>1</entry>
+      <entry>boolean</entry>
+      <entry>Íåò</entry>
+      <entry>false</entry>
+      <entry>Îïðåäåëÿåò, ó÷èòûâàòü ëè ïðîáåëû ïðè ïîäñ÷åòå.</entry>
+     </row>
+    </tbody>
+   </tgroup>
+  </informaltable>
+ 
+  <example>
+   <title>count_characters</title>
+   <programlisting role="php">
+<![CDATA[
+<?php
 
-$smarty = new Smarty;
-$smarty-&gt;assign('articleTitle', 'Cold Wave Linked to Temperatures.');
-$smarty-&gt;display('index.tpl');
-
-index.tpl:
+$smarty->assign('articleTitle', 'Cold Wave Linked to Temperatures.');
 
+?>
+]]>
+   </programlisting>
+   <para>
+    Øàáëîí:
+   </para>
+   <programlisting>
+<![CDATA[
 {$articleTitle}
 {$articleTitle|count_characters}
-
-OUTPUT:
-
+{$articleTitle|count_characters:true}
+]]>
+   </programlisting>
+   <para>
+    Ðåçóëüòàò îáðàáîòêè:
+   </para>
+   <screen>
+<![CDATA[
 Cold Wave Linked to Temperatures.
-32
-  </programlisting>
- </example>
- <para>
-  Ñì. òàêæå
-  <link linkend="language.modifier.count.paragraphs">count_paragraphs</link>,
-  <link linkend="language.modifier.count.sentences">count_sentences</link> è
-  <link linkend="language.modifier.count.words">count_words</link>
- </para>
-</sect1>
+29
+33
+]]>
+   </screen>
+  </example>
+  <para>
+   Ñì. òàêæå
+   <link linkend="language.modifier.count.words">count_words</link>,
+   <link linkend="language.modifier.count.sentences">count_sentences</link>
+   è
+   <link linkend="language.modifier.count.paragraphs">count_paragraphs</link>.
+  </para>
+ </sect1>
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
http://cvs.php.net/viewcvs.cgi/smarty/docs/ru/designers/language-modifiers/language-modifier-count-paragraphs.xml?r1=1.4&r2=1.5&diff_format=u
Index: smarty/docs/ru/designers/language-modifiers/language-modifier-count-paragraphs.xml
diff -u smarty/docs/ru/designers/language-modifiers/language-modifier-count-paragraphs.xml:1.4 smarty/docs/ru/designers/language-modifiers/language-modifier-count-paragraphs.xml:1.5
--- smarty/docs/ru/designers/language-modifiers/language-modifier-count-paragraphs.xml:1.4	Mon May  9 17:34:38 2005
+++ smarty/docs/ru/designers/language-modifiers/language-modifier-count-paragraphs.xml	Thu Jan 19 13:02:38 2006
@@ -1,38 +1,52 @@
 <?xml version="1.0" encoding="windows-1251"?>
-<!-- $Revision: 1.4 $ -->
-<!-- EN-Revision: 1.2 Maintainer: freespace Status: ready -->
+<!-- $Revision: 1.5 $ -->
+<!-- EN-Revision: 1.5 Maintainer: freespace Status: ready -->
 <sect1 id="language.modifier.count.paragraphs">
 	<title>count_paragraphs</title>
 	<para>
-		Âîçâðàùàåò êîëè÷åñòâî àáçàöåâ â ñòðîêå.
+		Ïîäñ÷èòûâàåò êîëè÷åñòâî àáçàöåâ â ïåðåìåííîé.
 	</para>
  <example>
   <title>count_paragraphs</title>
-<programlisting>
-index.php:
-
-$smarty = new Smarty;
-$smarty-&gt;assign('articleTitle', "War Dims Hope for Peace. Child's Death Ruins
-Couple's Holiday.\n\nMan is Fatally Slain. Death Causes Loneliness, Feeling of Isolation.");
-$smarty-&gt;display('index.tpl');
-
-index.tpl:
-
+  <programlisting role="php">
+<![CDATA[
+<?php
+
+$smarty->assign('articleTitle',
+                "War Dims Hope for Peace. Child's Death Ruins Couple's Holiday.\n\n
+                Man is Fatally Slain. Death Causes Loneliness, Feeling of Isolation."
+               );
+
+?>
+]]>
+  </programlisting>
+  <para>
+   Øàáëîí:
+  </para>
+  <programlisting>
+<![CDATA[
 {$articleTitle}
 {$articleTitle|count_paragraphs}
-
-OUTPUT:
-
+]]>
+  </programlisting>
+  <para>
+   Ðåçóëüòàò îáðàáîòêè:
+  </para>
+  <screen>
+<![CDATA[
 War Dims Hope for Peace. Child's Death Ruins Couple's Holiday.
-
+    
 Man is Fatally Slain. Death Causes Loneliness, Feeling of Isolation.
-2</programlisting>
+2
+]]>
+  </screen>
  </example>
  <para>
   Ñì. òàêæå
   <link linkend="language.modifier.count.characters">count_characters</link>,
-  <link linkend="language.modifier.count.sentences">count_sentences</link> è
-  <link linkend="language.modifier.count.words">count_words</link>
+  <link linkend="language.modifier.count.sentences">count_sentences</link>
+  è
+  <link linkend="language.modifier.count.words">count_words</link>.		
  </para>
 </sect1>
 <!-- Keep this comment at the end of the file
http://cvs.php.net/viewcvs.cgi/smarty/docs/ru/designers/language-modifiers/language-modifier-count-sentences.xml?r1=1.3&r2=1.4&diff_format=u
Index: smarty/docs/ru/designers/language-modifiers/language-modifier-count-sentences.xml
diff -u smarty/docs/ru/designers/language-modifiers/language-modifier-count-sentences.xml:1.3 smarty/docs/ru/designers/language-modifiers/language-modifier-count-sentences.xml:1.4
--- smarty/docs/ru/designers/language-modifiers/language-modifier-count-sentences.xml:1.3	Mon May  9 17:34:38 2005
+++ smarty/docs/ru/designers/language-modifiers/language-modifier-count-sentences.xml	Thu Jan 19 13:02:38 2006
@@ -1,38 +1,52 @@
 <?xml version="1.0" encoding="windows-1251"?>
-<!-- $Revision: 1.3 $ -->
-<!-- EN-Revision: 1.2 Maintainer: freespace Status: ready -->
+<!-- $Revision: 1.4 $ -->
+<!-- EN-Revision: 1.5 Maintainer: freespace Status: ready -->
 <sect1 id="language.modifier.count.sentences">
 	<title>count_sentences</title>
 	<para>
- 	Âîçâðàùàåò êîëè÷åñòâî ïðåäëîæåíèé.
+ 	Ïîäñ÷èòûâàåò êîëè÷åñòâî ïðåäëîæåíèé â ïåðåìåííîé.
 	</para>
- <example>
-  <title>count_sentences</title>
-  <programlisting>
-index.php:
-
-$smarty = new Smarty;
-$smarty-&gt;assign('articleTitle', 'Two Soviet Ships Collide - One Dies. Enraged Cow Injures Farmer with Axe.');
-$smarty-&gt;display('index.tpl');
-
-index.tpl:
+  <example>
+   <title>count_sentences</title>
+   <programlisting role="php">
+<![CDATA[
+<?php
+    
+$smarty->assign('articleTitle',
+                 'Two Soviet Ships Collide - One Dies.
+                 Enraged Cow Injures Farmer with Axe.'
+                 );
 
+?>
+]]>
+   </programlisting>
+   <para>
+    Øàáëîí:
+   </para>
+   <programlisting>
+<![CDATA[
 {$articleTitle}
 {$articleTitle|count_sentences}
-
-OUTPUT:
-
+]]>
+   </programlisting>
+   <para>
+    Ðåçóëüòàò îáðàáîòêè:
+   </para>
+   <screen>
+<![CDATA[
 Two Soviet Ships Collide - One Dies. Enraged Cow Injures Farmer with Axe.
 2
- </programlisting>
- </example>
- <para>
-  Ñì. òàêæå
-  <link linkend="language.modifier.count.characters">count_characters</link>,
-  <link linkend="language.modifier.count.paragraphs">count_paragraphs</link> è
-  <link linkend="language.modifier.count.words">count_words</link>
- </para>
-</sect1>
+]]>
+   </screen>
+  </example>
+  <para>
+   Ñì. òàêæå
+   <link linkend="language.modifier.count.characters">count_characters</link>,
+   <link linkend="language.modifier.count.paragraphs">count_paragraphs</link>
+   è
+   <link linkend="language.modifier.count.words">count_words</link>.
+  </para>
+ </sect1>
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
http://cvs.php.net/viewcvs.cgi/smarty/docs/ru/designers/language-modifiers/language-modifier-count-words.xml?r1=1.3&r2=1.4&diff_format=u
Index: smarty/docs/ru/designers/language-modifiers/language-modifier-count-words.xml
diff -u smarty/docs/ru/designers/language-modifiers/language-modifier-count-words.xml:1.3 smarty/docs/ru/designers/language-modifiers/language-modifier-count-words.xml:1.4
--- smarty/docs/ru/designers/language-modifiers/language-modifier-count-words.xml:1.3	Mon May  9 17:34:38 2005
+++ smarty/docs/ru/designers/language-modifiers/language-modifier-count-words.xml	Thu Jan 19 13:02:38 2006
@@ -1,38 +1,47 @@
 <?xml version="1.0" encoding="windows-1251"?>
-<!-- $Revision: 1.3 $ -->
-<!-- EN-Revision: 1.2 Maintainer: freespace Status: ready -->
+<!-- $Revision: 1.4 $ -->
+<!-- EN-Revision: 1.5 Maintainer: freespace Status: ready -->
 <sect1 id="language.modifier.count.words">
 	<title>count_words</title>
 	<para>
-		Âîçâðàùàåò êîëè÷åñòâî ñëîâ.
+		Ïîäñ÷èòûâàåò êîëè÷åñòâî ñëîâ â ïåðåìåííîé.
 	</para>
- <example>
-  <title>count_words</title>
-  <programlisting>
-index.php:
-
-$smarty = new Smarty;
-$smarty-&gt;assign('articleTitle', 'Dealers Will Hear Car Talk at Noon.');
-$smarty-&gt;display('index.tpl');
-
-index.tpl:
+  <example>
+   <title>count_words</title>
+   <programlisting role="php">
+<![CDATA[
+<?php
+    
+$smarty->assign('articleTitle', 'Dealers Will Hear Car Talk at Noon.');
 
+?>
+]]>
+   </programlisting>
+   <para>
+    Øàáëîí:
+   </para>
+   <programlisting>
+<![CDATA[
 {$articleTitle}
 {$articleTitle|count_words}
-
-OUTPUT:
-
+]]>
+   </programlisting>
+   <para>
+    Øàáëîí:
+   </para>
+   <screen>
+<![CDATA[
 Dealers Will Hear Car Talk at Noon.
 7
-  </programlisting>
- </example>
- <para>
-  Ñì. òàêæå
-  <link linkend="language.modifier.count.characters">count_characters</link>,
-  <link linkend="language.modifier.count.paragraphs">count_paragraphs</link> è
-  <link linkend="language.modifier.count.sentences">count_sentences</link>
- </para>
-</sect1>
+]]>
+   </screen>
+  </example>
+  <para>
+   See also <link linkend="language.modifier.count.characters">count_characters</link>,
+   <link linkend="language.modifier.count.paragraphs">count_paragraphs</link> and
+   <link linkend="language.modifier.count.sentences">count_sentences</link>.
+  </para>		
+ </sect1>
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
http://cvs.php.net/viewcvs.cgi/smarty/docs/ru/designers/language-modifiers/language-modifier-date-format.xml?r1=1.5&r2=1.6&diff_format=u
Index: smarty/docs/ru/designers/language-modifiers/language-modifier-date-format.xml
diff -u smarty/docs/ru/designers/language-modifiers/language-modifier-date-format.xml:1.5 smarty/docs/ru/designers/language-modifiers/language-modifier-date-format.xml:1.6
--- smarty/docs/ru/designers/language-modifiers/language-modifier-date-format.xml:1.5	Mon May  9 17:34:38 2005
+++ smarty/docs/ru/designers/language-modifiers/language-modifier-date-format.xml	Thu Jan 19 13:02:38 2006
@@ -1,91 +1,118 @@
 <?xml version="1.0" encoding="windows-1251"?>
-<!-- $Revision: 1.5 $ -->
-<!-- EN-Revision: 1.2 Maintainer: freespace Status: ready -->
-<sect1 id="language.modifier.date.format">
- <title>date_format</title>
- <informaltable frame="all">
-  <tgroup cols="5">
-   <colspec colname="param" align="center" />
-   <colspec colname="type" align="center" />
-   <colspec colname="required" align="center" />
-   <colspec colname="default" align="center" />
-   <colspec colname="desc" />
-   <thead>
-    <row>
-     <entry>Ïîçèöèÿ ïàðàìåòðà</entry>
-     <entry>Òèï</entry>
-     <entry>Îáÿçàòåëåí</entry>
-     <entry>Ïî óìîë÷àíèþ</entry>
-     <entry>Îïèñàíèå</entry>
-    </row>
-   </thead>
-   <tbody>
-    <row>
-     <entry>1</entry>
-     <entry>string</entry>
-     <entry>Íåò</entry>
-     <entry>%b %e, %Y</entry>
-     <entry>Ôîðìàò âûâîäà äàòû.</entry>
-    </row>
-    <row>
-     <entry>2</entry>
-     <entry>string</entry>
-     <entry>Íåò</entry>
-     <entry>n/a</entry>
-     <entry>Åñëè ìîäèôèöèðóåìîå çíà÷åíèå ïóñòî, òî èñïîëüçóåòñÿ ýòî.</entry>
-    </row>
-   </tbody>
-  </tgroup>
- </informaltable>
-	<para>
-		Ôîðìèðóåò äàòó è âðåìÿ ïî çàäàííîìó ôîðìàòó strftime(). Äàòû ìîãóò
- 	áûòü â âèäå unix timestamps, mysql timestamps èëè â ëþáîì äðóãîì âèäå,
-		êîòîðûé ïîéìåò strtotime(). Ïðîåêòèðîâùèêè øàáëîíîâ ìîãóò èñïîëüçîâàòü
-		date_format äëÿ êîíòðîëÿ íàä ôîðìàòîì âûâîäèìûõ äàò. Åñëè äàòà,
-		ïåðåäàííàÿ ìîäèôèêàòîðó, ïóñòà, òî âòîðîé ïàðàìåòð èñïîëüçóåòñÿ êàê äàòà.
-	</para>
- <example>
+<!-- $Revision: 1.6 $ -->
+<!-- EN-Revision: 1.11 Maintainer: freespace Status: ready -->
+ <sect1 id="language.modifier.date.format">
   <title>date_format</title>
-  <programlisting role="php">
+    <para>
+     Ôîðìàòèðóåò äàòó ñîãëàñíî óêàçàííîìó ôîðìàòó
+     <ulink url="&url.php-manual;strftime">strftime()</ulink>.
+     Äàòû ìîãóò áûòü ïåðåäàíû Smarty â âèäå
+     <ulink url="&url.php-manual;function.time">âðåìåííûõ ìåòîê</ulink> unix,
+     âðåìåííûõ ìåòîê mysql èëè â âèäå ëþáîé ñòðîêè, ñîäåðæàùåé äåíü, ìåñÿö è
+     ãîä, êîòîðóþ ìîæåò îáðàáîòàòü ôóíêöèÿ
+     <ulink url="&url.php-manual;strtotime">strtotime()</ulink>.
+     Äèçàéíåð ìîãóò èñïîëüçîâàòü date_format äëÿ ïîëó÷åíèÿ ïîëíîãî êîíòðîëÿ
+     íàä ôîðìàòèðîâàíèåì äàòû. Åñëè äàòà, ïåðåäàííàÿ â
+     <command>date_format</command>, ïóñòà è âòîðîé àðãóìåíò ïåðåäàí, îí áóäåò
+     èñïîëüçîâàòüñÿ â êà÷åñòâå äàòû äëÿ ôîðìàòèðîâàíèÿ.
+   </para>
+   
+  <informaltable frame="all">
+   <tgroup cols="5">
+    <colspec colname="param" align="center" />
+    <colspec colname="type" align="center" />
+    <colspec colname="required" align="center" />
+    <colspec colname="default" align="center" />
+    <colspec colname="desc" />
+    <thead>
+     <row>
+      <entry>Ïîçèöèÿ ïàðàìåòðà</entry>
+      <entry>Òèï</entry>
+      <entry>Îáÿçàòåëåí</entry>
+      <entry>Ïî óìîë÷àíèþ</entry>
+      <entry>Îïèñàíèå</entry>
+     </row>
+    </thead>
+    <tbody>
+     <row>
+      <entry>1</entry>
+      <entry>string</entry>
+      <entry>Íåò</entry>
+      <entry>%b %e, %Y</entry>
+      <entry>Ýòî ôîðìàò äëÿ îáðàáàòûâàåìîé äàòû.</entry>
+     </row>
+     <row>
+      <entry>2</entry>
+      <entry>string</entry>
+      <entry>Íåò</entry>
+      <entry>n/a</entry>
+      <entry>Ýòî äàòà ïî óìîë÷àíèþ, åñëè âõîäÿùåå çíà÷åíèå ïóñòîå.</entry>
+     </row>
+    </tbody>
+   </tgroup>
+  </informaltable>
+
+   <para>
+   <note>
+    <para>
+     Íà÷èíàÿ ñî Smarty-2.6.10, ÷èñëîâûå çíà÷åíèÿ, ïåðåäàâàåìûå â date_format,
+     <emphasis>âñåãäà</emphasis> ðàññìàòðèâàþòñÿ êàê âðåìåííàÿ ìåòêà unix
+     (êðîìå âðåìåííûõ ìåòîê mysql, ñì. íèæå).
+    </para>
+    <para>
+     Äî Smarty-2.6.10, ÷èñëîâûå ñòðîêè, êîòîðûå òàê æå ìîãëè áûòü îáðàáîòàíû
+     ôóíêöèåé strtotime() â php (ê ïðèìåðó, "ÃÃÃÃÌÌÄÄ"), èíîãäà - 
+     â çàâèñèìîñòè îò êîíêðåòíîé ðåàëèçàöèè strtotime() - èíòåðïðåòèðîâàëèñü
+     êàê ñòðîêè ñ äàòîé, à íå âðåìåííûå ìåòêè.
+    </para>
+    <para>
+     Åäèíñòâåííîå èñêëþ÷åíèå - ýòî âðåìåííûå ìåòêè mysql: Îíè òàê æå
+     ÿâëÿþòñÿ ÷èñëîâûìè è ñîñòîÿò èç 14 ñèìâîëîâ ("ÃÃÃÃÌÌÄÄ××ÌÌÑÑ").
+     Âðåìåííûå ìåòêè mysql èìåþò áîëåå âûñîêèé ïðèîðèòåò, ÷åì âðåìåííûå
+     ìåòêè unix.
+    </para>
+   </note>
+  </para>
+  <example>
+   <title>date_format</title>
+   <programlisting role="php">
 <![CDATA[
 <?php
-    
-$smarty = new Smarty;
+
 $smarty->assign('yesterday', strtotime('-1 day'));
-$smarty->display('index.tpl');
-    
+
 ?>
 ]]>
-  </programlisting>
-  <para>
-   Ãäå index.tpl:
-  </para>
-  <programlisting>
+   </programlisting>
+   <para>
+    Øàáëîí (èñïîëüçóåò <link linkend="language.variables.smarty.now">$smarty.now</link>):
+   </para>
+   <programlisting>
 <![CDATA[
 {$smarty.now|date_format}
-{$smarty.now|date_format:"%A, %B %e, %Y"}
-{$smarty.now|date_format:"%H:%M:%S"}
+{$smarty.now|date_format:"%D"}
+{$smarty.now|date_format:"%I:%M %p"}
 {$yesterday|date_format}
 {$yesterday|date_format:"%A, %B %e, %Y"}
 {$yesterday|date_format:"%H:%M:%S"}
 ]]>
-  </programlisting>
-  <para>
-   Ðåçóëüòàòîì áóäåò:
-  </para>
-  <screen>
+   </programlisting>
+   <para>
+    Ðåçóëüòàò îáðàáîòêè:
+   </para>
+   <screen>
 <![CDATA[
 Feb 6, 2001
-Tuesday, February 6, 2001
-14:33:00
+02/06/01
+02:33 pm
 Feb 5, 2001
 Monday, February 5, 2001
 14:33:00
 ]]>
-  </screen>
- </example>
- <para>
-  Óêàçàòåëè ïðåîáðàçîâàíèÿ date_format:
+   </screen>
+  </example>
+  <para>
+   Êîíâåðñèîííûå óêàçàòåëè <command>date_format</command>:
   <itemizedlist>
    <listitem><para>
     %a - ñîêðàùåííîå íàçâàíèå äíÿ íåäåëè, â çàâèñèìîñòè îò òåêóùåé ëîêàëè
@@ -201,19 +228,29 @@
     %% - áóêâàëüíûé ñèìâîë `%'
    </para></listitem>
   </itemizedlist>
-  <note>
-   <title>Çàìå÷àíèå äëÿ ïðîãðàììèñòîâ</title>
-   <para>
-    date_format - ýòî ïðîñòî îá¸ðòêà ôóíêöèè PHP
-    <ulink url="&url.php-manual;strftime">strftime()</ulink>.
-    Âû ìîæåòå èìåòü áîëüøå èëè ìåíüøå äîñòóïíûõ óêàçàòåëåé ïðåîáðàçîâàíèÿ
-    â çàâèñèìîñòè îò ôóíêöèè strftime() òîé ñèñòåìû, ãäå áûë
-    ñêîìïèëèðîâàí PHP. Îáðàòèòåñü ê ðóêîâîäñòâó âàøåé ñèñòåìû
-    äëÿ ïîëíîãî ñïèñêà äîñòóïíûõ óêàçàòåëåé.
-   </para>
-  </note>
- </para>
-</sect1>
+   <note>
+    <title>Çàìå÷àíèå äëÿ ïðîãðàììèñòîâ</title>
+    <para>
+     <command>date_format</command> ÿâëÿåòñÿ îáû÷íîé îáåðòêîé äëÿ ôóíêöèè
+     PHP <ulink url="&url.php-manual;strftime">strftime()</ulink>.
+     Âû ìîæåòå ðàñïîëàãàòü á<emphasis>î</emphasis>ëüø èëè ìåíüøèì êîëè÷åñòâîì
+     äîñòóïíûõ êîíâåðñèîííûõ óêàçàòåëåé â çàâèñèìîñòè îò ôóíêöèè
+     <ulink url="&url.php-manual;strftime">strftime()</ulink> òîé ñèñòåìû,
+     ãäå áûë ñêîìïèëèðîâàí PHP. Îáðàòèòåñü ê ðóêîâîäñòâó âàøåé ñèñòåìû äëÿ
+     ïîëó÷åíèÿ ïîëíîãî ñïèñêà äîñòóïíûõ óêàçàòåëåé.
+    </para>
+   </note>
+  </para>
+  <para>
+   Ñì. òàêæå
+   <link linkend="language.variables.smarty.now">$smarty.now</link>,
+   <ulink url="&url.php-manual;strftime">ôóíêöèÿ php strftime()</ulink>,
+   <link linkend="language.function.html.select.date">{html_select_date}</link>
+   è
+   <link linkend="tips.dates">äàòû</link>.
+  </para>
+ </sect1>
+
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
@@ -234,3 +271,6 @@
 vim: et tw=78 syn=sgml
 vi: ts=1 sw=1
 -->
+
+
+
http://cvs.php.net/viewcvs.cgi/smarty/docs/ru/designers/language-modifiers/language-modifier-default.xml?r1=1.4&r2=1.5&diff_format=u
Index: smarty/docs/ru/designers/language-modifiers/language-modifier-default.xml
diff -u smarty/docs/ru/designers/language-modifiers/language-modifier-default.xml:1.4 smarty/docs/ru/designers/language-modifiers/language-modifier-default.xml:1.5
--- smarty/docs/ru/designers/language-modifiers/language-modifier-default.xml:1.4	Thu Nov 25 23:26:13 2004
+++ smarty/docs/ru/designers/language-modifiers/language-modifier-default.xml	Thu Jan 19 13:02:38 2006
@@ -1,61 +1,80 @@
 <?xml version="1.0" encoding="windows-1251"?>
-<!-- $Revision: 1.4 $ -->
-<!-- EN-Revision: 1.1 Maintainer: tony2001 Status: ready -->
-<sect1 id="language.modifier.default">
- <title>default</title>
- <informaltable frame="all">
-  <tgroup cols="5">
-   <colspec colname="param" align="center" />
-   <colspec colname="type" align="center" />
-   <colspec colname="required" align="center" />
-   <colspec colname="default" align="center" />
-   <colspec colname="desc" />
-   <thead>
-    <row>
-     <entry>Ïîçèöèÿ ïàðàìåòðà</entry>
-     <entry>Òèï</entry>
-     <entry>Îáÿçàòåëåí</entry>
-     <entry>Ïî óìîë÷àíèþ</entry>
-     <entry>Îïèñàíèå</entry>
-    </row>
-   </thead>
-   <tbody>
-    <row>
-     <entry>1</entry>
-     <entry>string</entry>
-     <entry>Íåò</entry>
-     <entry><emphasis>ïóñòî</emphasis></entry>
-     <entry>Çíà÷åíèå ïî óìîë÷àíèþ äëÿ ïóñòîé ïåðåìåííîé.</entry>
-    </row>
-   </tbody>
-  </tgroup>
- </informaltable>
-	<para>
-		Èñïîëüçóåòñÿ äëÿ óñòàíîâêè çíà÷åíèÿ ïî óìîë÷àíèþ äëÿ ïåðåìåííîé. Åñëè
-		ïåðåìåííàÿ îêàçûâàåòñÿ ïóñòîé, òî âûâîäèòüñÿ çíà÷åíèå ïî óìîë÷àíèþ.
-		Ìîäèôèêàòîð ïðèíèìàåò îäèí ïàðàìåòð.
-	</para>
- <example>
+<!-- $Revision: 1.5 $ -->
+<!-- EN-Revision: 1.5 Maintainer: freespace Status: ready -->
+ <sect1 id="language.modifier.default">
   <title>default</title>
-  <programlisting>
-index.php:
+   <para>
+     Èñïîëüçóåòñÿ äëÿ óñòàíîâêè çíà÷åíèÿ ïî óìîë÷àíèþ äëÿ ïåðåìåííîé.
+     Åñëè ïåðåìåííàÿ ïóñòà èëè íå óñòàíîâëåíà, óêàçàííîå çíà÷åíèå ïî óìîë÷àíèþ
+     áóäåò ïîäñòàâëåíî âìåñòî íå¸.
+   </para>
+  
+  <informaltable frame="all">
+   <tgroup cols="5">
+    <colspec colname="param" align="center" />
+    <colspec colname="type" align="center" />
+    <colspec colname="required" align="center" />
+    <colspec colname="default" align="center" />
+    <colspec colname="desc" />
+    <thead>
+     <row>
+      <entry>Ïîçèöèÿ ïàðàìåòðà</entry>
+      <entry>Òèï</entry>
+      <entry>Îáÿçàòåëåí</entry>
+      <entry>Ïî óìîë÷àíèþ</entry>
+      <entry>Îïèñàíèå</entry>
+     </row>
+    </thead>
+    <tbody>
+     <row>
+      <entry>1</entry>
+      <entry>string</entry>
+      <entry>Íåò</entry>
+      <entry><emphasis>empty</emphasis></entry>
+      <entry>Ýòî çíà÷åíèå ïî óìîë÷àíèþ äëÿ âûâîäà, åñëè ïåðåìåííàÿ ïóñòà.</entry>
+     </row>
+    </tbody>
+   </tgroup>
+  </informaltable>
 
-$smarty = new Smarty;
-$smarty-&gt;assign('articleTitle', 'Dealers Will Hear Car Talk at Noon.');
-$smarty-&gt;display('index.tpl');
+  <example>
+   <title>default</title>
+   <programlisting role="php">
+<![CDATA[
+<?php
 
-index.tpl:
+$smarty->assign('articleTitle', 'Dealers Will Hear Car Talk at Noon.');
 
+?>
+]]>
+   </programlisting>
+   <para>
+    Øàáëîí:
+   </para>
+   <programlisting>
+<![CDATA[
 {$articleTitle|default:"no title"}
 {$myTitle|default:"no title"}
-
-OUTPUT:
-
+]]>
+   </programlisting>
+   <para>
+    Ðåçóëüòàò îáðàáîòêè:
+   </para>
+   <screen>
+<![CDATA[
 Dealers Will Hear Car Talk at Noon.
 no title
-  </programlisting>
- </example>
-</sect1>
+]]>
+   </screen>
+  </example>
+  <para>
+  Ñì. òàêæå
+  <link linkend="tips.default.var.handling">Îáðàáîòêà ïåðåìåííûõ ïî óìîë÷àíèþ</link>
+  è
+  <link linkend="tips.blank.var.handling">Îáðàáîòêà ïóñòûõ ïåðåìåííûõ</link>.
+  </para>
+ </sect1>
+
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
http://cvs.php.net/viewcvs.cgi/smarty/docs/ru/designers/language-modifiers/language-modifier-escape.xml?r1=1.5&r2=1.6&diff_format=u
Index: smarty/docs/ru/designers/language-modifiers/language-modifier-escape.xml
diff -u smarty/docs/ru/designers/language-modifiers/language-modifier-escape.xml:1.5 smarty/docs/ru/designers/language-modifiers/language-modifier-escape.xml:1.6
--- smarty/docs/ru/designers/language-modifiers/language-modifier-escape.xml:1.5	Mon May  9 17:34:38 2005
+++ smarty/docs/ru/designers/language-modifiers/language-modifier-escape.xml	Thu Jan 19 13:02:38 2006
@@ -1,77 +1,86 @@
 <?xml version="1.0" encoding="windows-1251"?>
-<!-- $Revision: 1.5 $ -->
-<!-- EN-Revision: 1.2 Maintainer: freespace Status: ready -->
-<sect1 id="language.modifier.escape">
- <title>escape</title>
- <informaltable frame="all">
-  <tgroup cols="6">
-   <colspec colname="param" align="center" />
-   <colspec colname="type" align="center" />
-   <colspec colname="required" align="center" />
-   <colspec colname="possible" align="center" />
-   <colspec colname="default" align="center" />
-   <colspec colname="desc" />
-   <thead>
-    <row>
-     <entry>Ïîçèöèÿ ïàðàìåòðà</entry>
-     <entry>Òèï</entry>
-     <entry>Îáÿçàòåëåí</entry>
-     <entry>Âîçìîæíûå çíà÷åíèÿ</entry>
-     <entry>Ïî óìîë÷àíèþ</entry>
-     <entry>Îïèñàíèå</entry>
-    </row>
-   </thead>
-   <tbody>
-    <row>
-     <entry>1</entry>
-     <entry>string</entry>
-     <entry>Íåò</entry>
-     <entry>html,htmlall,url,quotes,hex,hexentity,javascript</entry>
-     <entry>html</entry>
-     <entry>Ôîðìàò çàùèòû (escape).</entry>
-    </row>
-   </tbody>
-  </tgroup>
- </informaltable>
- <para>
-		"Çàùèùàåò" ñïåöèàëüíûå ñèìâîëû â ïåðåìåííîé. Èñïîëüçóåòñÿ äëÿ
-		çàùèòû ñïåöèàëüíûõ ñèìâîëîâ html, çàùèòû ñïåöèàëüíûõ ñèìâîëîâ
-		url, çàùèòû îäèíî÷íûõ êàâû÷åê, êîíâåðòàöèè â øåñòàíäöàòåðè÷íûé
-		âèä (hex), êîíâåðòàöèè êàæäîãî ñèìâîëà â øåñòàíäöàòåðè÷íîå
-		html ïðåäñòàâëåíèå (hexentity), çàùèòà ñïåöèàëüíûõ ñèìâîëîâ
-		javascript. Ïî óìîë÷àíèþ èñïîëüçóåòñÿ çàùèòà ñïåöñèìâîëîâ html.
-	</para>
- <example>
+<!-- $Revision: 1.6 $ -->
+<!-- EN-Revision: 1.8 Maintainer: freespace Status: ready -->
+ <sect1 id="language.modifier.escape">
   <title>escape</title>
-  <programlisting role="php">
+  <para>
+    Èñïîëüçóåòñÿ äëÿ ýêðàíèðîâàíèÿ ñïåöñèìâîëîâ html, url, îäèíàðíûõ êàâû÷åê
+    íà ïåðåìåííîé, åñëè îíè åù¸ íå ýêðàíèðîâàíû; øåñòíàäöàòèðè÷íîå êîäèðîâàíèå,
+    øåñòíàäöàòèðè÷íîå êîäèðîâàíèå â HTML-entities è javascript-ýêðàíèðîâàíèå.
+    Ïî óìîë÷àíèþ àêòèâèðîâàí ðåæèì ýêðàíèðîâàíèÿ HTML.
+  </para>
+  
+  <informaltable frame="all">
+   <tgroup cols="6">
+    <colspec colname="param" align="center" />
+    <colspec colname="type" align="center" />
+    <colspec colname="required" align="center" />
+    <colspec colname="possible" align="center" />
+    <colspec colname="default" align="center" />
+    <colspec colname="desc" />
+    <thead>
+     <row>
+      <entry>Ïîçèöèÿ ïàðàìåòðà</entry>
+      <entry>Òèï</entry>
+      <entry>Îáÿçàòåëåí</entry>
+      <entry>Possible Values</entry>
+      <entry>Ïî óìîë÷àíèþ</entry>
+      <entry>Îïèñàíèå</entry>
+     </row>
+    </thead>
+    <tbody>
+     <row>
+      <entry>1</entry>
+      <entry>string</entry>
+      <entry>Íåò</entry>
+      <entry><literal>html</literal>,<literal>htmlall</literal>,<literal>url</literal>,<literal>urlpathinfo</literal>,<literal>quotes</literal>,<literal>hex</literal>,<literal>hexentity</literal>,<literal>javascript</literal></entry>
+      <entry><literal>html</literal></entry>
+      <entry>ôîðìàò ýêðàíèðîâàíèÿ</entry>
+     </row>
+     <row>
+      <entry>2</entry>
+      <entry>string</entry>
+      <entry>Íåò</entry>
+      <entry><literal>ISO-8859-1</literal>, <literal>UTF-8</literal>, ... ëþáàÿ êîäèðîâêà, ïîääåðæèâàåìàÿ ôóíêöèåé <ulink url="&url.php-manual;htmlentities">htmlentities()</ulink>
+</entry>
+      <entry><literal>ISO-8859-1</literal></entry>
+      <entry>Êîäèðîâêà äëÿ ýêðàíèðîâàíèÿ, ïåðåäàâàåìàÿ â htmlentities() è ò.ä.</entry>
+     </row>
+    </tbody>
+   </tgroup>
+  </informaltable>
+
+  <example>
+   <title>escape</title>
+   <programlisting role="php">
 <![CDATA[
 <?php
     
-$smarty = new Smarty;
-$smarty->assign('articleTitle', "'Stiff Opposition Expected to Casketless Funeral Plan'");
-$smarty->display('index.tpl');
+$smarty->assign('articleTitle',
+                "'Stiff Opposition Expected to Casketless Funeral Plan'"
+                );
     
 ?>
 ]]>
-  </programlisting>
-  <para>
-   Ãäå index.tpl:
-  </para>
-  <programlisting>
+   </programlisting>
+   <para>
+    Øàáëîí:
+   </para>
+   <programlisting>
 <![CDATA[
 {$articleTitle}
 {$articleTitle|escape}
-{$articleTitle|escape:"html"}    {* escapes  & " ' < > *}
-{$articleTitle|escape:"htmlall"} {* escapes ALL html entities *}
+{$articleTitle|escape:"html"}    {* ýêðàíèðóåò  & " ' < > *}
+{$articleTitle|escape:"htmlall"} {* ýêðàíèðóåò âñå html entities *}
 {$articleTitle|escape:"url"}
 {$articleTitle|escape:"quotes"}
 <a href="mailto:{$EmailAddress|escape:"hex"}">{$EmailAddress|escape:"hexentity"}</a>
 ]]>
-  </programlisting>
-  <para>
-   Ðåçóëüòàòîì áóäåò:
-  </para>
-  <screen>
+   </programlisting>
+   <para>
+    Ðåçóëüòàò îáðàáîòêè:
+   </para>
+   <screen>
 <![CDATA[
 'Stiff Opposition Expected to Casketless Funeral Plan'
 &#039;Stiff Opposition Expected to Casketless Funeral Plan&#039;
@@ -79,15 +88,18 @@
 &#039;Stiff Opposition Expected to Casketless Funeral Plan&#039;
 %27Stiff+Opposition+Expected+to+Casketless+Funeral+Plan%27
 \'Stiff Opposition Expected to Casketless Funeral Plan\'
-<a href="mailto:%62%6f%62%40%6d%65%2e%6e%65%74">&#x62;&#x6f;&#x62;&#x40;&#x6d;&#x65;&#x2e;&#x6e;&#x65;&#x74;</a>
+<a href="mailto:%62%6f%..snip..%65%74">&#x62;&#x6f;&#x62..snip..&#x65;&#x74;</a>
 ]]>
-  </screen>
- </example>
- <para>
-  Ñì. òàêæå
-  <link linkend="language.escaping">Ïðåäîòâðàùåíèå îáðàáîòêè Smarty</link>
- </para>
-</sect1>
+   </screen>
+  </example>
+  <para>
+   Ñì. òàêæå
+   <link linkend="language.escaping">Ïðåäîòâðàùåíèå îáðàáîòêè Smarty</link>
+   è
+   <link linkend="tips.obfuscating.email">Ñîêðûòèå E-mail àäðåñà</link>.
+  </para>
+ </sect1>
+
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
http://cvs.php.net/viewcvs.cgi/smarty/docs/ru/designers/language-modifiers/language-modifier-indent.xml?r1=1.5&r2=1.6&diff_format=u
Index: smarty/docs/ru/designers/language-modifiers/language-modifier-indent.xml
diff -u smarty/docs/ru/designers/language-modifiers/language-modifier-indent.xml:1.5 smarty/docs/ru/designers/language-modifiers/language-modifier-indent.xml:1.6
--- smarty/docs/ru/designers/language-modifiers/language-modifier-indent.xml:1.5	Thu Nov 25 23:26:13 2004
+++ smarty/docs/ru/designers/language-modifiers/language-modifier-indent.xml	Thu Jan 19 13:02:38 2006
@@ -1,58 +1,71 @@
 <?xml version="1.0" encoding="windows-1251"?>
-<!-- $Revision: 1.5 $ -->
-<!-- EN-Revision: 1.2 Maintainer: tony2001 Status: ready -->
-<sect1 id="language.modifier.indent">
- <title>indent</title>
- <informaltable frame="all">
-  <tgroup cols="5">
-  <colspec colname="param" />
-  <colspec colname="type" />
-  <colspec colname="required" />
-  <colspec colname="default" />
-  <colspec colname="desc" />
-  <thead>
-   <row>
-    <entry>Ïîçèöèÿ ïàðàìåòðà</entry>
-    <entry>Òèï</entry>
-    <entry>Îáÿçàòåëåí</entry>
-    <entry>Ïî óìîë÷àíèþ</entry>
-    <entry>Îïèñàíèå</entry>
-   </row>
-  </thead>
-  <tbody>
-   <row>
-    <entry>1</entry>
-    <entry>integer</entry>
-    <entry>Íåò</entry>
-    <entry>4</entry>
-    <entry>Êîëè÷åñòâî ñèìâîëîâ äëÿ âñòàâêè.</entry>
-   </row>
-   <row>
-    <entry>2</entry>
-    <entry>string</entry>
-    <entry>Íåò</entry>
-    <entry>(îäèí ïðîáåë)</entry>
-    <entry>Ñèìâîë äëÿ âñòàâêè.</entry>
-   </row>
-  </tbody>
-  </tgroup>
- </informaltable>
- <para>
-  Âñòàâëÿåò â íà÷àëî êàæäîé ñòðîêè çàäàííîå êîëè÷åñòâî
-  çàäàííûõ ñèìâîëîâ. Ïî óìîë÷àíèþ âñòàâëÿåòñÿ 4 ïðîáåëà.
- </para>
- <example>
+<!-- $Revision: 1.6 $ -->
+<!-- EN-Revision: 1.5 Maintainer: freespace Status: ready -->
+ <sect1 id="language.modifier.indent">
   <title>indent</title>
-  <programlisting>
+  <para>
+   Ñîçäàåò îòñòóïû â íà÷àëå êàæäîé ñòðîêè, ïî óìîë÷àíèþ - 4 ïðîáåëà.
+    êà÷åñòâå íåîáÿçàòåëüíûõ àðãóìåíòîâ ìîæíî óêàçàòü êîëè÷åñòâî ïîâòîðåíèé
+   ñèìâîëà è ñàì ñèìâîë, êîòîðûé áóäåò èñïîëüçîâàòüñÿ äëÿ ñîçäàíèÿ îòñòóïîâ.
+   (èñïîëüçóéòå "\t" äëÿ òàáóëÿöèè).
+  </para>
+  
+  <informaltable frame="all">
+   <tgroup cols="5">
+    <colspec colname="param" align="center" />
+    <colspec colname="type" align="center" />
+    <colspec colname="required" align="center" />
+    <colspec colname="default" align="center" />
+    <colspec colname="desc" />
+    <thead>
+     <row>
+      <entry>Ïîçèöèÿ ïàðàìåòðà</entry>
+      <entry>Òèï</entry>
+      <entry>Îáÿçàòåëåí</entry>
+      <entry>Ïî óìîë÷àíèþ</entry>
+      <entry>Îïèñàíèå</entry>
+     </row>
+    </thead>
+    <tbody>
+     <row>
+      <entry>1</entry>
+      <entry>integer</entry>
+      <entry>Íåò</entry>
+      <entry>4</entry>
+      <entry>Îïðåäåëÿåò êîëè÷åñòâî ïîâòîðåíèé ñèìâîëà ïðè ñîçäàíèè îòñòóïà.</entry>
+      </row>
+      <row>
+       <entry>2</entry>
+       <entry>string</entry>
+       <entry>Íåò</entry>
+       <entry>(îäèí ïðîáåë)</entry>
+       <entry>Ñèìâîë, êîòîðûé èñïîëüçóåòñÿ ïðè ñîçäàíèè îòñòóïà.</entry>
+      </row>
+     </tbody>
+    </tgroup>
+  </informaltable>
+
+  <example>
+   <title>indent</title>
+   <programlisting role="php">
 <![CDATA[
-index.php:
-
-$smarty = new Smarty;
-$smarty->assign('articleTitle', 'NJ judge to rule on nude beach.');
-$smarty->display('index.tpl');
+<?php
+    
+$smarty->assign('articleTitle',
+                'NJ judge to rule on nude beach.
+Sun or rain expected today, dark tonight.
+Statistics show that teen pregnancy drops off significantly after 25.'
+                );
 
-index.tpl:
 
+?>
+]]>
+   </programlisting>
+   <para>
+    Øàáëîí:
+   </para>
+   <programlisting>
+<![CDATA[
 {$articleTitle}
 
 {$articleTitle|indent}
@@ -60,9 +73,13 @@
 {$articleTitle|indent:10}
 
 {$articleTitle|indent:1:"\t"}
-
-OUTPUT:
-
+]]>
+   </programlisting>
+   <para>
+    Ðåçóëüòàò îáðàáîòêè:
+   </para>
+   <screen>
+<![CDATA[
 NJ judge to rule on nude beach.
 Sun or rain expected today, dark tonight.
 Statistics show that teen pregnancy drops off significantly after 25.
@@ -75,13 +92,20 @@
           Sun or rain expected today, dark tonight.
           Statistics show that teen pregnancy drops off significantly after 25.
 
-	NJ judge to rule on nude beach.
-	Sun or rain expected today, dark tonight.
- Statistics show that teen pregnancy drops off significantly after 25.
+        NJ judge to rule on nude beach.
+        Sun or rain expected today, dark tonight.
+        Statistics show that teen pregnancy drops off significantly after 25.
 ]]>
-  </programlisting>
- </example>
-</sect1>
+   </screen>
+  </example>
+  <para>
+   Ñì. òàêæå
+   <link linkend="language.modifier.strip">strip</link>
+   è
+   <link linkend="language.modifier.spacify">spacify</link>.
+  </para>
+ </sect1>
+
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
http://cvs.php.net/viewcvs.cgi/smarty/docs/ru/designers/language-modifiers/language-modifier-lower.xml?r1=1.3&r2=1.4&diff_format=u
Index: smarty/docs/ru/designers/language-modifiers/language-modifier-lower.xml
diff -u smarty/docs/ru/designers/language-modifiers/language-modifier-lower.xml:1.3 smarty/docs/ru/designers/language-modifiers/language-modifier-lower.xml:1.4
--- smarty/docs/ru/designers/language-modifiers/language-modifier-lower.xml:1.3	Mon May  9 17:34:38 2005
+++ smarty/docs/ru/designers/language-modifiers/language-modifier-lower.xml	Thu Jan 19 13:02:38 2006
@@ -1,49 +1,49 @@
 <?xml version="1.0" encoding="windows-1251"?>
-<!-- $Revision: 1.3 $ -->
-<!-- EN-Revision: 1.2 Maintainer: freespace Status: ready -->
-<sect1 id="language.modifier.lower">
- <title>lower</title>
- <para>
-  Ïåðåâîäèò òåêñò â íèæíèé ðåãèñòð.
- </para>
- <example>
+<!-- $Revision: 1.4 $ -->
+<!-- EN-Revision: 1.3 Maintainer: freespace Status: ready -->
+ <sect1 id="language.modifier.lower">
   <title>lower</title>
-  <programlisting role="php">
+  <para>
+   Ïåðåâîäèò ñòðîêó â íèæíèé ðåãèñòð.
+  </para>
+  <example>
+   <title>lower</title>
+   <programlisting role="php">
 <![CDATA[
 <?php
-   
-$smarty = new Smarty;
+    
 $smarty->assign('articleTitle', 'Two Convicts Evade Noose, Jury Hung.');
-$smarty->display('index.tpl');
-   
+    
 ?>
 ]]>
-  </programlisting>
-  <para>
-   Ãäå index.tpl:
-  </para>
-  <programlisting> 
+   </programlisting>
+   <para>
+    Øàáëîí:
+   </para>
+   <programlisting> 
 <![CDATA[
 {$articleTitle}
 {$articleTitle|lower}
 ]]>
-  </programlisting>
-  <para>
-   Ðåçóëüòàòîì áóäåò:
-  </para>
-  <screen>
+   </programlisting>
+   <para>
+    Ðåçóëüòàò îáðàáîòêè:
+   </para>
+   <screen>
 <![CDATA[
 Two Convicts Evade Noose, Jury Hung.
 two convicts evade noose, jury hung.
 ]]>
-  </screen>
- </example>
- <para>
-  Ñì. òàêæå
-  <link linkend="language.modifier.upper">upper</link> è
-  <link linkend="language.modifier.capitalize">capitalize</link>.
- </para>
-</sect1>
+   </screen>
+  </example>
+  <para>
+   Ñì. òàêæå
+   <link linkend="language.modifier.upper">upper</link>
+   è
+   <link linkend="language.modifier.capitalize">capitalize</link>.
+  </para>
+ </sect1>
+
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
http://cvs.php.net/viewcvs.cgi/smarty/docs/ru/designers/language-modifiers/language-modifier-nl2br.xml?r1=1.3&r2=1.4&diff_format=u
Index: smarty/docs/ru/designers/language-modifiers/language-modifier-nl2br.xml
diff -u smarty/docs/ru/designers/language-modifiers/language-modifier-nl2br.xml:1.3 smarty/docs/ru/designers/language-modifiers/language-modifier-nl2br.xml:1.4
--- smarty/docs/ru/designers/language-modifiers/language-modifier-nl2br.xml:1.3	Thu Nov 25 23:26:13 2004
+++ smarty/docs/ru/designers/language-modifiers/language-modifier-nl2br.xml	Thu Jan 19 13:02:39 2006
@@ -1,30 +1,52 @@
 <?xml version="1.0" encoding="windows-1251"?>
-<!-- $Revision: 1.3 $ -->
-<!-- EN-Revision: 1.1 Maintainer: tony2001 Status: ready -->
-<sect1 id="language.modifier.nl2br">
- <title>nl2br</title>
- <para>
-  Çàìåíÿåò âñå ïåðåíîñû ñòðîê íà òýã &lt;br /&gt; â çàäàííîé
-  ïåðåìåííîé. Ýòî ýêâèâàëåíò PHP ôóíêöèè nl2br().
- </para>
- <example>
+<!-- $Revision: 1.4 $ -->
+<!-- EN-Revision: 1.4 Maintainer: freespace Status: ready -->
+ <sect1 id="language.modifier.nl2br">
   <title>nl2br</title>
-<programlisting>
-index.php:
+  <para>
+   Ïðåâðàùàåò êàæäûé ïåðåâîä ñòðîêè â òýã &lt;br /&gt; â óêàçàííîé ïåðåìåííîé.
+   Ýòî ýêâèâàëåíò ôóíêöèè PHP
+   <ulink url="&url.php-manual;nl2br">nl2br()</ulink>.
+  </para>
+  <example>
+   <title>nl2br</title>
+   <programlisting role="php">
+<![CDATA[
+<?php
 
-$smarty = new Smarty;
-$smarty-&gt;assign('articleTitle', "Sun or rain expected\ntoday, dark tonight");
-$smarty-&gt;display('index.tpl');
-
-index.tpl:
+$smarty->assign('articleTitle',
+                "Sun or rain expected\ntoday, dark tonight"
+                );
 
+?>
+]]>
+   </programlisting>
+   <para>
+    Øàáëîí:
+   </para>
+   <programlisting>
+<![CDATA[
 {$articleTitle|nl2br}
+]]>
+   </programlisting>
+   <para>
+    Ðåçóëüòàò îáðàáîòêè:
+   </para>
+   <screen>
+<![CDATA[
+Sun or rain expected<br />today, dark tonight
+]]>
+   </screen>
+  </example>
+  <para>
+   Ñì. òàêæå
+   <link linkend="language.modifier.wordwrap">word_wrap</link>,
+   <link linkend="language.modifier.count.paragraphs">count_paragraphs</link>
+   è
+   <link linkend="language.modifier.count.sentences">count_sentences</link>.
+  </para>
+ </sect1>
 
-OUTPUT:
-
-Sun or rain expected&lt;br /&gt;today, dark tonight</programlisting>
- </example>
-</sect1>
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
http://cvs.php.net/viewcvs.cgi/smarty/docs/ru/designers/language-modifiers/language-modifier-regex-replace.xml?r1=1.4&r2=1.5&diff_format=u
Index: smarty/docs/ru/designers/language-modifiers/language-modifier-regex-replace.xml
diff -u smarty/docs/ru/designers/language-modifiers/language-modifier-regex-replace.xml:1.4 smarty/docs/ru/designers/language-modifiers/language-modifier-regex-replace.xml:1.5
--- smarty/docs/ru/designers/language-modifiers/language-modifier-regex-replace.xml:1.4	Thu Nov 25 23:26:13 2004
+++ smarty/docs/ru/designers/language-modifiers/language-modifier-regex-replace.xml	Thu Jan 19 13:02:39 2006
@@ -1,70 +1,90 @@
 <?xml version="1.0" encoding="windows-1251"?>
-<!-- $Revision: 1.4 $ -->
-<!-- EN-Revision: 1.1 Maintainer: tony2001 Status: ready -->
-<sect1 id="language.modifier.regex.replace">
- <title>regex_replace</title>
- <informaltable frame="all">
-                <tgroup cols="5">
-                <colspec colname="param" />
-                <colspec colname="type" />
-                <colspec colname="required" />
-                <colspec colname="default" />
-                <colspec colname="desc" />
-                <thead>
-                    <row>
-                        <entry>Ïîçèöèÿ ïàðàìåòðà</entry>
-                        <entry>Òèï</entry>
-                        <entry>Îáÿçàòåëåí</entry>
-                        <entry>Ïî óìîë÷àíèþ</entry>
-                        <entry>Îïèñàíèå</entry>
-                    </row>
-                </thead>
-                <tbody>
-                    <row>
-                        <entry>1</entry>
-                        <entry>string</entry>
-                        <entry>Äà</entry>
-                        <entry><emphasis>n/a</emphasis></entry>
-                        <entry>Ðåãóëÿðíîå âûðàæåíèå äëÿ çàìåíû.</entry>
-                    </row>
-                    <row>
-                        <entry>2</entry>
-                        <entry>string</entry>
-                        <entry>Äà</entry>
-                        <entry><emphasis>n/a</emphasis></entry>
-                        <entry>Ñòðîêà äëÿ çàìåíû.</entry>
-                    </row>
-                </tbody>
-                </tgroup>
- </informaltable>
-	<para>
-		Âûïîëíÿåòñÿ ïîèñê è çàìåíà ïî ðåãóëÿðíîìó âûðàæåíèþ â
-		ïåðåìåíííîé. Èñïîëüçóåòñÿ ñèíòàêñèñ äëÿ ôóíêöèè
-		preg_replace() èç ðóêîâîäñòâà ïî PHP.
-	</para>
- <example>
+<!-- $Revision: 1.5 $ -->
+<!-- EN-Revision: 1.4 Maintainer: freespace Status: ready -->
+ <sect1 id="language.modifier.regex.replace">
   <title>regex_replace</title>
-<programlisting>
-index.php:
-
-$smarty = new Smarty;
-$smarty-&gt;assign('articleTitle', "Infertility unlikely to\nbe passed on, experts say.");
-$smarty-&gt;display('index.tpl');
-
-index.tpl:
-
-{* replace each carriage return, tab &amp; new line with a space *}
+  <para>
+   Ïîèñê è çàìåíà ïðè ïîìîùè ðåãóëÿðíîãî âûðàæåíèÿ â ïåðåìåííîé.
+   Èñïîëüçóéòå ñèíòàêñèñ èç ðóêîâîäñòâà ê ôóíêöèè PHP <ulink
+   url="&url.php-manual;preg_replace">preg_replace()</ulink>.
+  </para>
+  
+  <informaltable frame="all">
+   <tgroup cols="5">
+    <colspec colname="param" align="center" />
+    <colspec colname="type" align="center" />
+    <colspec colname="required" align="center" />
+    <colspec colname="default" align="center" />
+    <colspec colname="desc"/>
+    <thead>
+     <row>
+      <entry>Ïîçèöèÿ ïàðàìåòðà</entry>
+      <entry>Òèï</entry>
+      <entry>Îáÿçàòåëåí</entry>
+      <entry>Ïî óìîë÷àíèþ</entry>
+      <entry>Îïèñàíèå</entry>
+     </row>
+    </thead>
+    <tbody>
+     <row>
+      <entry>1</entry>
+      <entry>string</entry>
+      <entry>Äà</entry>
+      <entry><emphasis>n/a</emphasis></entry>
+      <entry>Ðåãóëÿðíîå âûðàæåíèå äëÿ ïðîâåäåíèÿ çàìåíû.</entry>
+     </row>
+     <row>
+      <entry>2</entry>
+      <entry>string</entry>
+      <entry>Äà</entry>
+      <entry><emphasis>n/a</emphasis></entry>
+      <entry>Ñòðîêà, íà êîòîðóþ áóäåò ïðîâåäåíà çàìåíà.</entry>
+     </row>
+    </tbody>
+   </tgroup>
+  </informaltable>
+
+  <example>
+   <title>regex_replace</title>
+   <programlisting role="php">
+<![CDATA[
+<?php
+
+$smarty->assign('articleTitle', "Infertility unlikely to\nbe passed on, experts say.");
+
+?>
+]]>
+   </programlisting>
+   <para>
+    Øàáëîí:
+   </para>
+   <programlisting>
+<![CDATA[
+{* çàìåíÿåò êàæäûé âîçâðàò êàðåòêè, òàáóëÿöèþ è ïåðåâîä ñòðîêè íà ïðîáåë *}
 
 {$articleTitle}
 {$articleTitle|regex_replace:"/[\r\t\n]/":" "}
-
-OUTPUT:
-
+]]>
+   </programlisting>
+   <para>
+    Ðåçóëüòàò îáðàáîòêè:
+   </para>
+   <screen>
+<![CDATA[
 Infertility unlikely to
- be passed on, experts say.
-Infertility unlikely to be passed on, experts say.</programlisting>
- </example>
-</sect1>
+be passed on, experts say.
+Infertility unlikely to be passed on, experts say.
+]]>
+   </screen>
+  </example>
+  <para>
+   Ñì. òàêæå
+   <link linkend="language.modifier.replace">replace</link>
+   è
+   <link linkend="language.modifier.escape">escape</link>.
+  </para>
+ </sect1>
+
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
http://cvs.php.net/viewcvs.cgi/smarty/docs/ru/designers/language-modifiers/language-modifier-replace.xml?r1=1.3&r2=1.4&diff_format=u
Index: smarty/docs/ru/designers/language-modifiers/language-modifier-replace.xml
diff -u smarty/docs/ru/designers/language-modifiers/language-modifier-replace.xml:1.3 smarty/docs/ru/designers/language-modifiers/language-modifier-replace.xml:1.4
--- smarty/docs/ru/designers/language-modifiers/language-modifier-replace.xml:1.3	Mon Nov  1 16:02:39 2004
+++ smarty/docs/ru/designers/language-modifiers/language-modifier-replace.xml	Thu Jan 19 13:02:39 2006
@@ -1,68 +1,88 @@
 <?xml version="1.0" encoding="windows-1251"?>
-<!-- $Revision: 1.3 $ -->
-<!-- EN-Revision: 1.1 Maintainer: tony2001 Status: ready -->
-<sect1 id="language.modifier.replace">
- <title>replace</title>
- <informaltable frame="all">
-                <tgroup cols="5">
-                <colspec colname="param" />
-                <colspec colname="type" />
-                <colspec colname="required" />
-                <colspec colname="default" />
-                <colspec colname="desc" />
-                <thead>
-                    <row>
-                        <entry>Ïîçèöèÿ ïàðàìåòðà</entry>
-                        <entry>Òèï</entry>
-                        <entry>Îáÿçàòåëåí</entry>
-                        <entry>Ïî óìîë÷àíèþ</entry>
-                        <entry>Îïèñàíèå</entry>
-                    </row>
-                </thead>
-                <tbody>
-                    <row>
-                        <entry>1</entry>
-                        <entry>string</entry>
-                        <entry>Äà</entry>
-                        <entry><emphasis>n/a</emphasis></entry>
-                        <entry>Ñòðîêà äëÿ ïîèñêà.</entry>
-                    </row>
-                    <row>
-                        <entry>2</entry>
-                        <entry>string</entry>
-                        <entry>Äà</entry>
-                        <entry><emphasis>n/a</emphasis></entry>
-                        <entry>Ñòðîêà äëÿ çàìåíû.</entry>
-                    </row>
-                </tbody>
-                </tgroup>
- </informaltable>
-	<para>
-		Âûïîëíÿåòüñÿ ïðîñòîé ïîèñê è çàìåíà ñòðîêè.
-	</para>
- <example>
+<!-- $Revision: 1.4 $ -->
+<!-- EN-Revision: 1.5 Maintainer: freespace Status: ready -->
+ <sect1 id="language.modifier.replace">
   <title>replace</title>
-  <programlisting>
-index.php:
+  <para>
+   Ïðîñòîé ïîèñê è çàìåíà â ïåðåìåííîé. Ýòî ýêâèâàëåíò ôóíêöèè PHP
+   <ulink url="&url.php-manual;str_replace">str_replace()</ulink>.
+  </para>
+  
+  <informaltable frame="all">
+   <tgroup cols="5">
+    <colspec colname="param" align="center" />
+    <colspec colname="type" align="center" />
+    <colspec colname="required" align="center" />
+    <colspec colname="default" align="center" />
+    <colspec colname="desc"/>
+    <thead>
+     <row>
+      <entry>Ïîçèöèÿ ïàðàìåòðà</entry>
+      <entry>Òèï</entry>
+      <entry>Îáÿçàòåëåí</entry>
+      <entry>Ïî óìîë÷àíèþ</entry>
+      <entry>Îïèñàíèå</entry>
+     </row>
+    </thead>
+    <tbody>
+     <row>
+      <entry>1</entry>
+      <entry>string</entry>
+      <entry>Äà</entry>
+      <entry><emphasis>n/a</emphasis></entry>
+      <entry>Ñòðîêà òåêñòà, êîòîðóþ ñëåäóåò çàìåíèòü.</entry>
+     </row>
+     <row>
+      <entry>2</entry>
+      <entry>string</entry>
+      <entry>Yes</entry>
+      <entry><emphasis>n/a</emphasis></entry>
+      <entry>Ñòðîêà òåêñòà, íà êîòîðóþ ñëåäóåò çàìåíèòü.</entry>
+     </row>
+    </tbody>
+   </tgroup>
+  </informaltable>
 
-$smarty = new Smarty;
-$smarty-&gt;assign('articleTitle', "Child's Stool Great for Use in Garden.");
-$smarty-&gt;display('index.tpl');
+  <example>
+   <title>replace</title>
+   <programlisting role="php">
+<![CDATA[
+<?php
 
-index.tpl:
+$smarty->assign('articleTitle', "Child's Stool Great for Use in Garden.");
 
+?>
+]]>
+   </programlisting>
+   <para>
+    Øàáëîí:
+   </para>
+   <programlisting>
+<![CDATA[
 {$articleTitle}
-{$articleTitle|replace:"Garden":"Vineyard"}
-{$articleTitle|replace:" ":"   "}
-
-OUTPUT:
-
+{$articleTitle|replace:'Garden':'Vineyard'}
+{$articleTitle|replace:' ':'   '}
+]]>
+   </programlisting>
+   <para>
+    Ðåçóëüòàò îáðàáîòêè:
+   </para>
+   <screen>
+<![CDATA[
 Child's Stool Great for Use in Garden.
 Child's Stool Great for Use in Vineyard.
 Child's   Stool   Great   for   Use   in   Garden.
-  </programlisting>
- </example>
-</sect1>
+]]>
+   </screen>
+  </example>
+  <para>
+   Ñì. òàêæå
+   <link linkend="language.modifier.regex.replace">regex_replace</link>
+   è
+   <link linkend="language.modifier.escape">escape</link>.
+  </para>
+ </sect1>
+
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
http://cvs.php.net/viewcvs.cgi/smarty/docs/ru/designers/language-modifiers/language-modifier-spacify.xml?r1=1.3&r2=1.4&diff_format=u
Index: smarty/docs/ru/designers/language-modifiers/language-modifier-spacify.xml
diff -u smarty/docs/ru/designers/language-modifiers/language-modifier-spacify.xml:1.3 smarty/docs/ru/designers/language-modifiers/language-modifier-spacify.xml:1.4
--- smarty/docs/ru/designers/language-modifiers/language-modifier-spacify.xml:1.3	Mon Nov  1 16:02:39 2004
+++ smarty/docs/ru/designers/language-modifiers/language-modifier-spacify.xml	Thu Jan 19 13:02:39 2006
@@ -1,61 +1,80 @@
 <?xml version="1.0" encoding="windows-1251"?>
-<!-- $Revision: 1.3 $ -->
-<!-- EN-Revision: 1.1 Maintainer: tony2001 Status: ready -->
-<sect1 id="language.modifier.spacify">
- <title>spacify</title>
- <informaltable frame="all">
-                <tgroup cols="5">
-                <colspec colname="param" />
-                <colspec colname="type" />
-                <colspec colname="required" />
-                <colspec colname="default" />
-                <colspec colname="desc" />
-                <thead>
-                    <row>
-                        <entry>Ïîçèöèÿ ïàðàìåòðà</entry>
-                        <entry>Òèï</entry>
-                        <entry>Îáÿçàòåëåí</entry>
-                        <entry>Ïî óìîë÷àíèþ</entry>
-                        <entry>Îïèñàíèå</entry>
-                    </row>
-                </thead>
-                <tbody>
-                    <row>
-                        <entry>1</entry>
-                        <entry>string</entry>
-                        <entry>Íåò</entry>
-                        <entry><emphasis>îäèí ïðîáåë</emphasis></entry>
-                        <entry>Ñòðîêà âñòàâÿëåòñÿ ìåæäó êàæäûì ñèìâîëîì ïåðåìåííîé.</entry>
-                    </row>
-                </tbody>
-                </tgroup>
- </informaltable>
- <para>
-  spacify ïîçâîëÿåò âñòàâèòü ïðîáåë ìåæäó êàæäûì ñèìâîëîì ïåðåìåííîé.
-  Ìîæíî òàêæå óêàçàòü äðóãîé ñèìâîë (èëè ñòðîêó) äëÿ âñòàâêè.
- </para>
- <example>
+<!-- $Revision: 1.4 $ -->
+<!-- EN-Revision: 1.4 Maintainer: freespace Status: ready -->
+ <sect1 id="language.modifier.spacify">
   <title>spacify</title>
-<programlisting>
-index.php:
+  <para>
+   spacify is a way to insert a space between every character of a variable.
+   You can optionally pass a different character (or string) to insert.
+  </para>
+  <informaltable frame="all">
+   <tgroup cols="5">
+    <colspec colname="param" align="center" />
+    <colspec colname="type" align="center" />
+    <colspec colname="required" align="center" />
+    <colspec colname="default" align="center" />
+    <colspec colname="desc"/>
+    <thead>
+     <row>
+      <entry>Ïîçèöèÿ ïàðàìåòðà</entry>
+      <entry>Òèï</entry>
+      <entry>Îáÿçàòåëåí</entry>
+      <entry>Ïî óìîë÷àíèþ</entry>
+      <entry>Îïèñàíèå</entry>
+     </row>
+    </thead>
+    <tbody>
+     <row>
+      <entry>1</entry>
+      <entry>string</entry>
+      <entry>Íåò</entry>
+      <entry><emphasis>îäèí ïðîáåë</emphasis></entry>
+      <entry>Ýòî âñòàâëÿåòñÿ ìåæäó êàæäûì ñèìâîëîì ïåðåìåííîé.</entry>
+      </row>
+     </tbody>
+    </tgroup>
+  </informaltable>
 
-$smarty = new Smarty;
-$smarty-&gt;assign('articleTitle', 'Something Went Wrong in Jet Crash, Experts Say.');
-$smarty-&gt;display('index.tpl');
+  <example>
+   <title>spacify</title>
+   <programlisting role="php">
+<![CDATA[
+<?php
 
-index.tpl:
+$smarty->assign('articleTitle', 'Something Went Wrong in Jet Crash, Experts Say.');
 
+?>
+]]>
+   </programlisting>
+   <para>
+    Øàáëîí:
+   </para>
+   <programlisting>
+<![CDATA[
 {$articleTitle}
 {$articleTitle|spacify}
 {$articleTitle|spacify:"^^"}
-
-OUTPUT:
-
+]]>
+   </programlisting>
+   <para>
+    Ðåçóëüòàò:
+   </para>
+   <screen>
+<![CDATA[
 Something Went Wrong in Jet Crash, Experts Say.
-S o m e t h i n g   W e n t   W r o n g   i n   J e t   C r a s h ,   E x p e r t s   S a y .
-S^^o^^m^^e^^t^^h^^i^^n^^g^^ ^^W^^e^^n^^t^^ ^^W^^r^^o^^n^^g^^ ^^i^^n^^ ^^J^^e^^t^^ ^^C^^r^^a^^s^^h^^,^^ ^^E^^x^^p^^e^^r^^t^^s^^ ^^S^^a^^y^^.</programlisting>
- </example>
-</sect1>
+S o m e t h i n g   W .... âûðåçàíî ....  s h ,   E x p e r t s   S a y .
+S^^o^^m^^e^^t^^h^^i^^n^^g^^ .... âûðåçàíî .... ^^e^^r^^t^^s^^ ^^S^^a^^y^^.
+]]>
+   </screen>
+  </example>
+  <para>
+   Ñì. òàêæå
+   <link linkend="language.modifier.wordwrap">wordwrap</link>
+   è
+   <link linkend="language.modifier.nl2br">nl2br</link>.
+  </para>
+ </sect1>
+
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
http://cvs.php.net/viewcvs.cgi/smarty/docs/ru/designers/language-modifiers/language-modifier-string-format.xml?r1=1.3&r2=1.4&diff_format=u
Index: smarty/docs/ru/designers/language-modifiers/language-modifier-string-format.xml
diff -u smarty/docs/ru/designers/language-modifiers/language-modifier-string-format.xml:1.3 smarty/docs/ru/designers/language-modifiers/language-modifier-string-format.xml:1.4
--- smarty/docs/ru/designers/language-modifiers/language-modifier-string-format.xml:1.3	Mon Nov  1 16:02:39 2004
+++ smarty/docs/ru/designers/language-modifiers/language-modifier-string-format.xml	Thu Jan 19 13:02:39 2006
@@ -1,62 +1,81 @@
 <?xml version="1.0" encoding="windows-1251"?>
-<!-- $Revision: 1.3 $ -->
-<!-- EN-Revision: 1.1 Maintainer: tony2001 Status: ready -->
-<sect1 id="language.modifier.string.format">
- <title>string_format</title>
- <informaltable frame="all">
-                <tgroup cols="5">
-                <colspec colname="param" />
-                <colspec colname="type" />
-                <colspec colname="required" />
-                <colspec colname="default" />
-                <colspec colname="desc" />
-                <thead>
-                    <row>
-                        <entry>Ïîçèöèÿ ïàðàìåòðà</entry>
-                        <entry>Òèï</entry>
-                        <entry>Îáÿçàòåëåí</entry>
-                        <entry>Ïî óìîë÷àíèþ</entry>
-                        <entry>Îïèñàíèå</entry>
-                    </row>
-                </thead>
-                <tbody>
-                    <row>
-                        <entry>1</entry>
-                        <entry>string</entry>
-                        <entry>Äà</entry>
-                        <entry><emphasis>n/a</emphasis></entry>
-                        <entry>Ôîðìàò. (sprintf)</entry>
-                    </row>
-                </tbody>
-                </tgroup>
- </informaltable>
- <para>
-  Ôîðìàòèðóåò ñòðîêó ïî óêàçàííîìó ôîðìàòó. Èñïîëüçóåòñÿ
-  ñèíòàêñèñ ôîðìàòèðîâàíèÿ PHP ôóíêöèè sprintf.
- </para>
- <example>
+<!-- $Revision: 1.4 $ -->
+<!-- EN-Revision: 1.5 Maintainer: freespace Status: ready -->
+ <sect1 id="language.modifier.string.format">
   <title>string_format</title>
-  <programlisting>
-index.php:
+  <para>
+   Ýòîò ìîäèôèêàòîð èñïîëüçóåòñÿ äëÿ ôîðìàòèðîâàíèÿ ñòðîê, òàêèõ êàê äåñÿòè÷íûå
+   ÷èñëà è ò.ä.
+   Èñïîëüçóéòå ñèíòàêñèñ îò
+   <ulink url="&url.php-manual;sprintf">sprintf()</ulink> äëÿ ôîðìàòèðîâàíèÿ.
+  </para>
+  
+  <informaltable frame="all">
+   <tgroup cols="5">
+    <colspec colname="param" align="center" />
+    <colspec colname="type" align="center" />
+    <colspec colname="required" align="center" />
+    <colspec colname="default" align="center" />
+    <colspec colname="desc"/>
+    <thead>
+     <row>
+      <entry>Ïîçèöèÿ ïàðàìåòðà</entry>
+      <entry>Òèï</entry>
+      <entry>Îáÿçàòåëåí</entry>
+      <entry>Ïî óìîë÷àíèþ</entry>
+      <entry>Îïèñàíèå</entry>
+     </row>
+    </thead>
+    <tbody>
+     <row>
+      <entry>1</entry>
+      <entry>string</entry>
+      <entry>Äà</entry>
+      <entry><emphasis>n/a</emphasis></entry>
+      <entry>Ôîðìàò äëÿ èñïîëüçîâàíèÿ (sprintf).</entry>
+     </row>
+    </tbody>
+   </tgroup>
+  </informaltable>
 
-$smarty = new Smarty;
-$smarty-&gt;assign('number', 23.5787446);
-$smarty-&gt;display('index.tpl');
+  <example>
+   <title>string_format</title>
+   <programlisting role="php">
+<![CDATA[
+<?php
 
-index.tpl:
+$smarty->assign('number', 23.5787446);
 
+?>
+]]>
+   </programlisting>
+   <para>
+    Øàáëîí:
+   </para>
+   <programlisting>
+<![CDATA[
 {$number}
 {$number|string_format:"%.2f"}
 {$number|string_format:"%d"}
-
-OUTPUT:
-
+]]>
+   </programlisting>
+   <para>
+    This should output:
+   </para>
+   <screen>
+<![CDATA[
 23.5787446
 23.58
 24
-  </programlisting>
- </example>
-</sect1>
+]]>
+   </screen>
+  </example>
+  <para>
+   Ñì. òàêæå
+   <link linkend="language.modifier.date.format">date_format</link>.
+  </para>
+ </sect1>
+
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
http://cvs.php.net/viewcvs.cgi/smarty/docs/ru/designers/language-modifiers/language-modifier-strip-tags.xml?r1=1.3&r2=1.4&diff_format=u
Index: smarty/docs/ru/designers/language-modifiers/language-modifier-strip-tags.xml
diff -u smarty/docs/ru/designers/language-modifiers/language-modifier-strip-tags.xml:1.3 smarty/docs/ru/designers/language-modifiers/language-modifier-strip-tags.xml:1.4
--- smarty/docs/ru/designers/language-modifiers/language-modifier-strip-tags.xml:1.3	Fri Dec 30 15:43:38 2005
+++ smarty/docs/ru/designers/language-modifiers/language-modifier-strip-tags.xml	Thu Jan 19 13:02:39 2006
@@ -1,31 +1,76 @@
 <?xml version="1.0" encoding="windows-1251"?>
-<!-- $Revision: 1.3 $ -->
-<!-- EN-Revision: 1.2 Maintainer: tony2001 Status: ready -->
-<sect1 id="language.modifier.strip.tags">
- <title>strip_tags</title>
- <para>
-  Âûðåçàåò HTML òýãè, îáû÷íî âñå ìåæäó &lt; è &gt;.
- </para>
- <example>
+<!-- $Revision: 1.4 $ -->
+<!-- EN-Revision: 1.4 Maintainer: freespace Status: ready -->
+ <sect1 id="language.modifier.strip.tags">
   <title>strip_tags</title>
-  <programlisting>
-index.php:
+  <para>
+   Óäàëÿåò òýãè ðàçìåòêè. Ãðóáî ãîâîðÿ, âñ¸, ÷òî íàõîäèòñÿ ìåæäó &lt; è &gt;,
+   âêëþ÷èòåëüíî.
+  </para>
+  
+  <informaltable frame="all">
+   <tgroup cols="5">
+    <colspec colname="param" align="center" />
+    <colspec colname="type" align="center" />
+    <colspec colname="required" align="center" />
+    <colspec colname="default" align="center" />
+    <colspec colname="desc"/>
+    <thead>
+     <row>
+      <entry>Ïîçèöèÿ ïàðàìåòðà</entry>
+      <entry>Òèï</entry>
+      <entry>Îáÿçàòåëåí</entry>
+      <entry>Ïî óìîë÷àíèþ</entry>
+      <entry>Îïèñàíèå</entry>
+     </row>
+    </thead>
+    <tbody>
+     <row>
+      <entry>1</entry>
+      <entry>bool</entry>
+      <entry>Íåò</entry>
+      <entry>true</entry>
+      <entry>Îïðåäåëÿåò, áóäóò òýãè çàìåíÿòüñÿ íà ' ' èëè íà ''</entry>
+     </row>
+    </tbody>
+   </tgroup>
+  </informaltable>
 
-$smarty = new Smarty;
-$smarty-&gt;assign('articleTitle', "Blind Woman Gets &lt;font face=\"helvetica\"&gt;New Kidney&lt;/font&gt; from Dad she Hasn't Seen in &lt;b&gt;years&lt;/b&gt;.");
-$smarty-&gt;display('index.tpl');
+  <example>
+   <title>strip_tags</title>
+   <programlisting role="php">
+<![CDATA[
+<?php
 
-index.tpl:
+$smarty->assign('articleTitle',
+                "Blind Woman Gets <font face=\"helvetica\">New
+Kidney</font> from Dad she Hasn't Seen in <b>years</b>."
+               );
 
+?>
+]]>
+   </programlisting>
+   <para>
+    Øàáëîí:
+   </para>
+   <programlisting>
+<![CDATA[
 {$articleTitle}
-{$articleTitle|strip_tags}
-
-OUTPUT:
-
-Blind Woman Gets &lt;font face="helvetica"&gt;New Kidney&lt;/font&gt; from Dad she Hasn't Seen in &lt;b&gt;years&lt;/b&gt;.
+{$articleTitle|strip_tags} {* òî æå ñàìîå, ÷òî è {$articleTitle|strip_tags:true} *} 
+{$articleTitle|strip_tags:false}
+]]>
+   </programlisting>
+   <para>
+    Ðåçóëüòàò îáðàáîòêè:
+   </para>
+   <screen>
+<![CDATA[
+Blind Woman Gets <font face="helvetica">New Kidney</font> from Dad she Hasn't Seen in <b>years</b>.
+Blind Woman Gets  New Kidney  from Dad she Hasn't Seen in  years .
 Blind Woman Gets New Kidney from Dad she Hasn't Seen in years.
-  </programlisting>
- </example>
+]]>
+   </screen>
+  </example>
 </sect1>
 <!-- Keep this comment at the end of the file
 Local variables:
@@ -46,4 +91,4 @@
 vim600: syn=xml fen fdm=syntax fdl=2 si
 vim: et tw=78 syn=sgml
 vi: ts=1 sw=1
--->
+-->
\ No newline at end of file
http://cvs.php.net/viewcvs.cgi/smarty/docs/ru/designers/language-modifiers/language-modifier-strip.xml?r1=1.2&r2=1.3&diff_format=u
Index: smarty/docs/ru/designers/language-modifiers/language-modifier-strip.xml
diff -u smarty/docs/ru/designers/language-modifiers/language-modifier-strip.xml:1.2 smarty/docs/ru/designers/language-modifiers/language-modifier-strip.xml:1.3
--- smarty/docs/ru/designers/language-modifiers/language-modifier-strip.xml:1.2	Mon Jul 19 13:11:29 2004
+++ smarty/docs/ru/designers/language-modifiers/language-modifier-strip.xml	Thu Jan 19 13:02:39 2006
@@ -1,43 +1,53 @@
 <?xml version="1.0" encoding="windows-1251"?>
-<!-- $Revision: 1.2 $ -->
-<!-- EN-Revision: 1.1 Maintainer: tony2001 Status: ready -->
-<sect1 id="language.modifier.strip">
- <title>strip</title>
- <para>
-  Çàìåíÿåò âñå ïîâòîðíûå ïðîáåëû, íîâûå ñòðîêè è çíàêè òàáóëÿöèè íà
-  îäèíî÷íûé ïðîáåë èëè íà çàäàííóþ ñòðîêó.
- </para>
- <note>
-  <title>Çàìå÷àíèå</title>
+<!-- $Revision: 1.3 $ -->
+<!-- EN-Revision: 1.2 Maintainer: freespace Status: ready -->
+ <sect1 id="language.modifier.strip">
+  <title>strip</title>
   <para>
-   Åñëè âû õîòèòå ñäåëàòü àíàëîãè÷íóþ îïåðàöèþ íàä ÷àñòüþ
-   òåêñòà øàáëîíà, òî èñïîëüçóéòå ôóíêöèþ <link
-   linkend="language.function.strip">strip</link>.
+   Çàìåíÿåò âñå ïîâòîðÿþùèåñÿ ïðîáåëû, ïåðåâîäû ñòðîê è ñèìâîëû òàáóëÿöèè
+   îäíèì ïðîáåëîì (èëè äðóãîé óêàçàííîé ñòðîêîé).
   </para>
- </note>
- <example>
-  <title>strip</title>
-  <programlisting>
-index.php:
-
-$smarty = new Smarty;
-$smarty-&gt;assign('articleTitle', "Grandmother of\neight makes\t    hole in one.");
-$smarty-&gt;display('index.tpl');
+  <note>
+   <title>Îáðàòèòå âíèìàíèå</title>
+   <para>
+    Åñëè âû õîòèòå îáðàáîòàòü áëîêè òåêñòà â øàáëîíå àíàëîãè÷íûì îáðàçîì,
+    âîñïîëüçóéòåñü ôóíêöèåé <link
+    linkend="language.function.strip">{strip}</link>.
+   </para>
+  </note>
+  <example>
+   <title>strip</title>
+   <programlisting role="php">
+<![CDATA[
+<?php
 
-index.tpl:
+$smarty->assign('articleTitle', "Grandmother of\neight makes\t    hole in one.");
 
+?>
+]]>
+   </programlisting>
+   <para>
+    Øàáëîí:
+   </para>
+   <programlisting>
+<![CDATA[
 {$articleTitle}
 {$articleTitle|strip}
-{$articleTitle|strip:"&amp;nbsp;"}
-
-OUTPUT:
-
+{$articleTitle|strip:"&nbsp;"}
+]]>
+   </programlisting>
+   <para>
+    Ðåçóëüòàò îáðàáîòêè:
+   </para>
+   <screen>
+<![CDATA[
 Grandmother of
 eight makes        hole in one.
 Grandmother of eight makes hole in one.
-Grandmother&amp;nbsp;of&amp;nbsp;eight&amp;nbsp;makes&amp;nbsp;hole&amp;nbsp;in&amp;nbsp;one.
-  </programlisting>
- </example>
+Grandmother&nbsp;of&nbsp;eight&nbsp;makes&nbsp;hole&nbsp;in&nbsp;one.
+]]>
+   </screen>
+  </example>
 </sect1>
 <!-- Keep this comment at the end of the file
 Local variables:
@@ -58,4 +68,4 @@
 vim600: syn=xml fen fdm=syntax fdl=2 si
 vim: et tw=78 syn=sgml
 vi: ts=1 sw=1
--->
+-->
\ No newline at end of file
http://cvs.php.net/viewcvs.cgi/smarty/docs/ru/designers/language-modifiers/language-modifier-truncate.xml?r1=1.4&r2=1.5&diff_format=u
Index: smarty/docs/ru/designers/language-modifiers/language-modifier-truncate.xml
diff -u smarty/docs/ru/designers/language-modifiers/language-modifier-truncate.xml:1.4 smarty/docs/ru/designers/language-modifiers/language-modifier-truncate.xml:1.5
--- smarty/docs/ru/designers/language-modifiers/language-modifier-truncate.xml:1.4	Thu Nov 25 23:26:13 2004
+++ smarty/docs/ru/designers/language-modifiers/language-modifier-truncate.xml	Thu Jan 19 13:02:39 2006
@@ -1,70 +1,87 @@
 <?xml version="1.0" encoding="windows-1251"?>
-<!-- $Revision: 1.4 $ -->
-<!-- EN-Revision: 1.1 Maintainer: tony2001 Status: ready -->
-<sect1 id="language.modifier.truncate">
- <title>truncate</title>
- <informaltable frame="all">
-                <tgroup cols="5">
-                <colspec colname="param" />
-                <colspec colname="type" />
-                <colspec colname="required" />
-                <colspec colname="default" />
-                <colspec colname="desc" />
-                <thead>
-                    <row>
-                        <entry>Ïîçèöèÿ ïàðàìåòðà</entry>
-                        <entry>Òèï</entry>
-                        <entry>Îáÿçàòåëåí</entry>
-                        <entry>Ïî óìîë÷àíèþ</entry>
-                        <entry>Îïèñàíèå</entry>
-                    </row>
-                </thead>
-                <tbody>
-                    <row>
-                        <entry>1</entry>
-                        <entry>integer</entry>
-                        <entry>Íåò</entry>
-                        <entry>80</entry>
-                        <entry>Êîëè÷åñòâî ñèìâîëîâ äëÿ îáðåçàíèÿ
-                        to.</entry>
-                    </row>
-                    <row>
-                        <entry>2</entry>
-                        <entry>string</entry>
-                        <entry>Íåò</entry>
-                        <entry>...</entry>
-                        <entry>Òåêñò, êîòîðûé äîáàâëÿåòñÿ, åñëè ïðîèçîøëî îáðåçàíèå.</entry>
-                    </row>
-                    <row>
-                        <entry>3</entry>
-                        <entry>boolean</entry>
-                        <entry>Íåò</entry>
-                        <entry>false</entry>
-                        <entry>Óêàçûâàåò, íàäî ëè îáðåçàòü ïî ãðàíèöå ñëîâà (false) èëè
-                        ïî ñèìâîëó (true).</entry>
-                    </row>
-                </tbody>
-                </tgroup>
- </informaltable>
- <para>
-  Îáðåçàåò ïåðåìåííóþ ïî óêàçàííîé äëèíå (ïî óìîë÷àíèþ 80). Âòîðûì
-  ïàðàìåòðîì ìîæíî óêàçàòü òåêñò, êîòîðûé áóäåò äîáàâëåí â êîíåö
-  îáðåçàííîé ñòðîêè. Ïî óìîë÷àíèþ truncate áóäåò ïûòàòüñÿ âûðåçàòü
-  ñëîâî, êîòîðîé ëåæèò íà âûðåçàåìîé ãðàíèöå, öåëèêîì. Ìîæíî óêàçàòü
-  òðåòèé ïàðàìåòð true, åñëè íàäî îáðåçàòü ñòðîêó òî÷íî ïî
-  îïðåäåëåííîìó ñèìâîëó.
- </para>
- <example>
+<!-- $Revision: 1.5 $ -->
+<!-- EN-Revision: 1.5 Maintainer: freespace Status: ready -->
+ <sect1 id="language.modifier.truncate">
   <title>truncate</title>
-  <programlisting>
-index.php:
+  <para>
+   Îáðåçàåò ïåðåìåííóþ äî îïðåäåëåííîé äëèííû, ïî óìîë÷àíèþ - 80 ñèìâîëîâ.
+    êà÷åñòâå íåîáÿçàòåëüíîãî âòîðîãî ïàðàìåòðà, âû ìîæåòå ïåðåäàòü ñòðîêó
+   òåêñòà, êîòîðàÿ áóäåò îòîáðàæàòñÿ â êîíöå îáðåçàííîé ïåðåìåííîé.
+   Ñèìâîëû ýòîé ñòðîêè íå âêëþ÷àþòñÿ â îáùóþ äëèííó îáðåçàåìîé ñòðîêè.
+   Ïî óìîë÷àíèþ, truncate ïîïûòàåòñÿ îáðåçàòü ñòðîêó â ïðîìåæóòêå ìåæäó ñëîâàìè.
+   Åñëè âû õîòèòå îáðåçàòü ñòðîêó ñòðîãî íà óêàçàíîé äëèííå, ïåðåäàéòå â òðåòèé
+   íåîáÿçàòåëüíûé ïàðàìåòð çíà÷åíèå true.
+  </para>
+  
+  <informaltable frame="all">
+   <tgroup cols="5">
+    <colspec colname="param" align="center" />
+    <colspec colname="type" align="center" />
+    <colspec colname="required" align="center" />
+    <colspec colname="default" align="center" />
+    <colspec colname="desc"/>
+    <thead>
+     <row>
+      <entry>Ïîçèöèÿ ïàðàìåòðà</entry>
+      <entry>Òèï</entry>
+      <entry>Îáÿçàòåëåí</entry>
+      <entry>Ïî óìîë÷àíèþ</entry>
+      <entry>Îïèñàíèå</entry>
+     </row>
+    </thead>
+    <tbody>
+     <row>
+      <entry>1</entry>
+      <entry>integer</entry>
+      <entry>Íåò</entry>
+      <entry>80</entry>
+      <entry>Îïðåäåëÿåò ìàêñèìàëüíóþ äëèííó îáðåçàåìîé ñòðîêè.</entry>
+     </row>
+     <row>
+      <entry>2</entry>
+      <entry>string</entry>
+      <entry>Íåò</entry>
+      <entry>...</entry>
+      <entry>Òåêñòîâàÿ ñòðîêà, êîòîðàÿ çàìåíÿåò îáðåçàííûé òåêñò. Ÿ äëèííà
+      ÍÅ âêëþ÷åíà â ìàêñèìàëüíóþ äëèííó îáðåçàåìîé ñòðîêè.</entry>
+     </row>
+     <row>
+      <entry>3</entry>
+      <entry>boolean</entry>
+      <entry>Íåò</entry>
+      <entry>false</entry>
+      <entry>Îïðåäåëÿåò, îáðåçàòü ëè ñòðîêó â ïðîìåæóòêå ìåæäó ñëîâàìè (false)
+      èëè ñòðîãî íà óêàçàíîé äëèííå (true).</entry>
+     </row>
+     <row>
+      <entry>4</entry>
+      <entry>boolean</entry>
+      <entry>Íåò</entry>
+      <entry>false</entry>
+      <entry>Îïðåäåëÿåò, íóæíî ëè îáðåçàòü ñòðîêó â êîíöå (false) èëè â
+      ñåðåäèíå ñòðîêè (true). Îáðàòèòå âíèìàíèå, ÷òî ïðè âêëþ÷åíèè ýòîé
+      îïöèè, ïðîìåæóòêè ìåæäó ñëîâàìè èãíîðèðóþòñÿ.</entry>
+     </row>
+    </tbody>
+   </tgroup>
+  </informaltable>
 
-$smarty = new Smarty;
-$smarty-&gt;assign('articleTitle', 'Two Sisters Reunite after Eighteen Years at Checkout Counter.');
-$smarty-&gt;display('index.tpl');
-
-index.tpl:
+  <example>
+   <title>truncate</title>
+   <programlisting role="php">
+<![CDATA[
+<?php
+    
+$smarty->assign('articleTitle', 'Two Sisters Reunite after Eighteen Years at Checkout Counter.');
 
+?>
+]]>
+   </programlisting>
+   <para>
+    Øàáëîí:
+   </para>
+   <programlisting>
+<![CDATA[
 {$articleTitle}
 {$articleTitle|truncate}
 {$articleTitle|truncate:30}
@@ -72,9 +89,13 @@
 {$articleTitle|truncate:30:"---"}
 {$articleTitle|truncate:30:"":true}
 {$articleTitle|truncate:30:"...":true}
-
-OUTPUT:
-
+]]>
+   </programlisting>
+   <para>
+    Ðåçóëüòàò îáðàáîòêè:
+   </para>
+   <screen>
+<![CDATA[
 Two Sisters Reunite after Eighteen Years at Checkout Counter.
 Two Sisters Reunite after Eighteen Years at Checkout Counter.
 Two Sisters Reunite after...
@@ -82,8 +103,9 @@
 Two Sisters Reunite after---
 Two Sisters Reunite after Eigh
 Two Sisters Reunite after E...
-  </programlisting>
- </example>
+]]>
+   </screen>
+  </example>
 </sect1>
 <!-- Keep this comment at the end of the file
 Local variables:
http://cvs.php.net/viewcvs.cgi/smarty/docs/ru/designers/language-modifiers/language-modifier-upper.xml?r1=1.3&r2=1.4&diff_format=u
Index: smarty/docs/ru/designers/language-modifiers/language-modifier-upper.xml
diff -u smarty/docs/ru/designers/language-modifiers/language-modifier-upper.xml:1.3 smarty/docs/ru/designers/language-modifiers/language-modifier-upper.xml:1.4
--- smarty/docs/ru/designers/language-modifiers/language-modifier-upper.xml:1.3	Mon May  9 17:34:38 2005
+++ smarty/docs/ru/designers/language-modifiers/language-modifier-upper.xml	Thu Jan 19 13:02:39 2006
@@ -1,50 +1,49 @@
 <?xml version="1.0" encoding="windows-1251"?>
-<!-- $Revision: 1.3 $ -->
-<!-- EN-Revision: 1.2 Maintainer: freespace Status: ready -->
-<sect1 id="language.modifier.upper">
- <title>upper</title>
- <para>
-  Çàìåíÿåò âñå ìàëåíüêèå áóêâû íà áîëüøèå.
- </para>
- <example>
+<!-- $Revision: 1.4 $ -->
+<!-- EN-Revision: 1.3 Maintainer: freespace Status: ready -->
+ <sect1 id="language.modifier.upper">
   <title>upper</title>
-  <programlisting role="php">
+  <para>
+   Ïåðåâîäèò ñòðîêó â âåðõíèé ðåãèñòð.
+  </para>
+  <example>
+   <title>upper</title>
+   <programlisting role="php">
 <![CDATA[
 <?php
 
-$smarty = new Smarty;
 $smarty->assign('articleTitle', "If Strike isn't Settled Quickly it may Last a While.");
-$smarty->display('index.tpl');
 
 ?>
 ]]>
-  </programlisting>
-  <para>
-   Ãäå index.tpl:
-  </para>
-  <programlisting>
+   </programlisting>
+   <para>
+    Øàáëîí:
+   </para>
+   <programlisting>
 <![CDATA[
 {$articleTitle}
 {$articleTitle|upper}
 ]]>
-  </programlisting>
-  <para>
-   Ðåçóëüòàòîì áóäåò:
-  </para>
-  <screen>
+   </programlisting>
+   <para>
+    Ðåçóëüòàò îáðàáîòêè:
+   </para>
+   <screen>
 <![CDATA[
 If Strike isn't Settled Quickly it may Last a While.
 IF STRIKE ISN'T SETTLED QUICKLY IT MAY LAST A WHILE.
 ]]>
-  </screen>
- </example>
- <para>
-  Ñì. òàêæå
-  <link linkend="language.modifier.lower">lower</link> è
-  <link linkend="language.modifier.capitalize">capitalize</link>.
- </para>
-</sect1>
- 
+   </screen>
+  </example>
+  <para>
+   Ñì. òàêæå
+   <link linkend="language.modifier.lower">lower</link>
+   è
+   <link linkend="language.modifier.capitalize">capitalize</link>.
+  </para>
+ </sect1>
+
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
http://cvs.php.net/viewcvs.cgi/smarty/docs/ru/designers/language-modifiers/language-modifier-wordwrap.xml?r1=1.5&r2=1.6&diff_format=u
Index: smarty/docs/ru/designers/language-modifiers/language-modifier-wordwrap.xml
diff -u smarty/docs/ru/designers/language-modifiers/language-modifier-wordwrap.xml:1.5 smarty/docs/ru/designers/language-modifiers/language-modifier-wordwrap.xml:1.6
--- smarty/docs/ru/designers/language-modifiers/language-modifier-wordwrap.xml:1.5	Thu Nov 25 23:26:13 2004
+++ smarty/docs/ru/designers/language-modifiers/language-modifier-wordwrap.xml	Thu Jan 19 13:02:39 2006
@@ -1,79 +1,97 @@
 <?xml version="1.0" encoding="windows-1251"?>
-<!-- $Revision: 1.5 $ -->
-<!-- EN-Revision: 1.1 Maintainer: tony2001 Status: ready -->
-<sect1 id="language.modifier.wordwrap">
- <title>wordwrap</title>
- <informaltable frame="all">
-                <tgroup cols="5">
-                <colspec colname="param" />
-                <colspec colname="type" />
-                <colspec colname="required" />
-                <colspec colname="default" />
-                <colspec colname="desc" />
-                <thead>
-                    <row>
-                        <entry>Ïîçèöèÿ ïàðàìåòðà</entry>
-                        <entry>Òèï</entry>
-                        <entry>Îáÿçàòåëåí</entry>
-                        <entry>Ïî óìîë÷àíèþ</entry>
-                        <entry>Îïèñàíèå</entry>
-                    </row>
-                </thead>
-                <tbody>
-                    <row>
-                        <entry>1</entry>
-                        <entry>integer</entry>
-                        <entry>Íåò</entry>
-                        <entry>80</entry>
-						<entry>Êîëè÷åñòâî ñòîëáöîâ äëÿ ïåðåíîñà.</entry>
-                    </row>
-                    <row>
-                        <entry>2</entry>
-                        <entry>string</entry>
-                        <entry>Íåò</entry>
-                        <entry>\n</entry>
-                        <entry>Ñòðîêà, êîòîðàÿ âñòàâëÿåòñÿ íà ìåñòå ïåðåíîñà.</entry>
-                    </row>
-                    <row>
-                        <entry>3</entry>
-                        <entry>boolean</entry>
-                        <entry>Íåò</entry>
-                        <entry>false</entry>
-                        <entry>Óêàçûâàåò, ïåðåíîñèòü ïî ñëîâàì (false) èëè íåò (true).</entry>
-                    </row>
-                </tbody>
-                </tgroup>
- </informaltable>
- <para>
-  Ïåðåíîñèò ñòðîêó ïî êîëè÷åñòâó ñòîëáöîâ (ïî óìîë÷àíèþ 80). Ìîæíî
-  óêàçàòü ñòðîêó, êîòîðàÿ áóäåò âñòàâëÿòñÿ íà ìåñòå ïåðåíîñà (ïî
-  óìîë÷àíèþ ñèìâîë íîâîé ñòðîêè). Ïî óìîë÷àíèþ wordwrap ïûòàåòñÿ
-  ïåðåíîñèòü ïî ñëîâàì, íî åñëè óêàçàòü òðåòèì ïàðàìåòðîì true, òî
-  ïåðåíîñèòüñÿ áóäåò ïî êîíêðåòíîìó ñèìâîëó.
- </para>
- <example>
+<!-- $Revision: 1.6 $ -->
+ <sect1 id="language.modifier.wordwrap">
   <title>wordwrap</title>
-  <programlisting>
-index.php:
-
-$smarty = new Smarty;
-$smarty-&gt;assign('articleTitle', "Blind woman gets new kidney from dad she hasn't seen in years.");
-$smarty-&gt;display('index.tpl');
-
-index.tpl:
-
+  <para>
+   <command>wordwrap</command> âñòàâëÿåò ïåðåâîäû ñòðîê íà îïðåäåëåííîé øèðèíå
+   êîëîíêè, ïî óìîë÷àíèþ - 80 ñèìâîëîâ.  êà÷åñòâå íåîáÿçàòåëüíîãî âòîðîãî
+   àðãóìåíòà âû ìîæåòå ïåðåäàòü òåêñòîâóþ ñòðîêó, èñïîëüçóåìóþ â êà÷åñòâå
+   ïåðåâîäà ñòðîêè (ïî óìîë÷àíèþ - ñèìâîë ïåðåâîäà ñòðîêè \n).
+   Ïî óìîë÷àíèþ, wordwrap ïîïûòàåòñÿ âñòàâèòü ïåðåâîä ñòðîêè â ïðîìåæóòîê ìåæäó
+   ñëîâàìè. Åñëè âû õîòèòå, ÷òîáû ñòðîêà îáðûâàëàñü ñòðîãî íà îïðåäåëåííîé
+   äëèííå, ïåðåäàéòå â òðåòèé íåîáÿçàòåëüíûé ïàðàìåòð çíà÷åíèå true.
+   Ýòî ýêâèâàëåíò ôóíêöèè PHP <ulink
+   url="&url.php-manual;wordwrap">wordwrap()</ulink>.
+  </para>
+  
+  <informaltable frame="all">
+   <tgroup cols="5">
+    <colspec colname="param" align="center" />
+    <colspec colname="type" align="center" />
+    <colspec colname="required" align="center" />
+    <colspec colname="default" align="center" />
+    <colspec colname="desc"/>
+    <thead>
+     <row>
+      <entry>Ïîçèöèÿ ïàðàìåòðà</entry>
+      <entry>Òèï</entry>
+      <entry>Îáÿçàòåëåí</entry>
+      <entry>Ïî óìîë÷àíèþ</entry>
+      <entry>Îïèñàíèå</entry>
+     </row>
+    </thead>
+    <tbody>
+     <row>
+      <entry>1</entry>
+      <entry>integer</entry>
+      <entry>Íåò</entry>
+      <entry>80</entry>
+      <entry>Îïðåäåëÿåò êîëè÷åñòâî êîëîíîê, ïîñëå êîòîðûõ òåêñò áóäåò ïåðåâåäåí
+      íà íîâóþ ñòðîêó.</entry>
+     </row>
+     <row>
+      <entry>2</entry>
+      <entry>string</entry>
+      <entry>Íåò</entry>
+      <entry>\n</entry>
+      <entry>Ýòà ñòðîêà èñïîëüçóåòñÿ â êà÷åñòâå ñèìâîëà ïåðåâîäà ñòðîêè.</entry>
+     </row>
+     <row>
+      <entry>3</entry>
+      <entry>boolean</entry>
+      <entry>Íåò</entry>
+      <entry>false</entry>
+      <entry>Îïðåäåëÿåò, ïåðåâîäèòü ëè ñòðîêó â ïðîìåæóòêàõ ìåæäó ñëîâàìè
+      (false), èëè ñòðîãî íà çàäàíîé äëèííå ñòðîêè (true).</entry>
+     </row>
+    </tbody>
+   </tgroup>
+  </informaltable>
+
+  <example>
+   <title>wordwrap</title>
+   <programlisting role="php">
+<![CDATA[
+<?php
+    
+$smarty->assign('articleTitle',
+                "Blind woman gets new kidney from dad she hasn't seen in years."
+               );
+
+?>
+]]>
+   </programlisting>
+   <para>
+    Øàáëîí:
+   </para>
+   <programlisting>
+<![CDATA[ 
 {$articleTitle}
 
 {$articleTitle|wordwrap:30}
-
+    
 {$articleTitle|wordwrap:20}
-
-{$articleTitle|wordwrap:30:"&lt;br&gt;\n"}
-
+    
+{$articleTitle|wordwrap:30:"<br />\n"}
+    
 {$articleTitle|wordwrap:30:"\n":true}
-
-OUTPUT:
-
+]]>
+   </programlisting>
+   <para>
+    Ðåçóëüòàò îáðàáîòêè:
+   </para>
+   <screen>
+<![CDATA[
 Blind woman gets new kidney from dad she hasn't seen in years.
 
 Blind woman gets new kidney
@@ -85,15 +103,23 @@
 hasn't seen in
 years.
 
-Blind woman gets new kidney&lt;br&gt;
-from dad she hasn't seen in years.
+Blind woman gets new kidney<br />
+from dad she hasn't seen in<br />
+years.
+
+Blind woman gets new kidney
+from dad she hasn't seen in
+years.
+]]>
+   </screen>
+  </example>
+  <para>
+   Ñì. òàêæå <link linkend="language.modifier.nl2br">nl2br</link>
+   è
+   <link linkend="language.function.textformat">{textformat}</link>.
+  </para>
+ </sect1>
 
-Blind woman gets new kidney fr
-om dad she hasn't seen in year
-s.
-  </programlisting>
- </example>
-</sect1>
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
@@ -114,3 +140,4 @@
 vim: et tw=78 syn=sgml
 vi: ts=1 sw=1
 -->
+