X-Git-Url: https://git.sur5r.net/?p=glabels;a=blobdiff_plain;f=help%2Fel%2Fmerge-ex2.page;h=d8fbd54f87aebc53fb04fccd18afe936ac83302a;hp=cc6c5d51c7bad3bb85e042a168832700748ff264;hb=0be9b6d8653b1020e466541b890e97a03590f83b;hpb=8e4c50283c4f353b18c68474f91209b8bd050557

diff --git a/help/el/merge-ex2.page b/help/el/merge-ex2.page
index cc6c5d51..d8fbd54f 100644
--- a/help/el/merge-ex2.page
+++ b/help/el/merge-ex2.page
@@ -20,7 +20,7 @@
     <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
       <mal:name> ÎÎ·Î¼Î®ÏÏÎ·Ï Î£ÏÎ¯Î³Î³Î¿Ï</mal:name>
       <mal:email>dmtrs32@gmail.com</mal:email>
-      <mal:years>2013, 2014</mal:years>
+      <mal:years>2013, 2015</mal:years>
     </mal:credit>
   
     <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
@@ -44,7 +44,7 @@ McGarret,Steve,O,"404 Piikoi Street",,Honolulu,HI,96813
 Kramer,Cosmo,,"Apt 5B","129 W. 81 St.","New York",NY,10024-7207
       </code>
 
-      <p>Î£ÏÎ¿ <app>glabels</app> Î­ÏÎ¿ÏÎ¼Îµ Î´Î·Î¼Î¹Î¿ÏÏÎ³Î®ÏÎµÎ¹ Î­Î½Î± Î½Î­Î¿ Î­Î³Î³ÏÎ±ÏÎ¿ <app>glabels</app> ÏÏÎ·ÏÎ¹Î¼Î¿ÏÎ¿Î¹ÏÎ½ÏÎ±Ï ÏÎ¿ ÏÏÏÏÏÏÎ¿ Avery 5512 "ÎÏÎ¹ÎºÎ­ÏÎµÏ Î´Î¹ÎµÏÎ¸ÏÎ½ÏÎµÏÎ½" . Î£ÏÎ· ÏÏÎ½Î­ÏÎµÎ¹Î± ÏÏÎ·ÏÎ¹Î¼Î¿ÏÎ¿Î¹Î¿ÏÎ¼Îµ ÏÎ¿ ÏÏÎ¿Î¹ÏÎµÎ¯Î¿ Î¼ÎµÎ½Î¿Ï <guiseq><gui>ÎÎ½ÏÎ¹ÎºÎµÎ¯Î¼ÎµÎ½Î±</gui><gui>ÎÎ´Î¹ÏÏÎ·ÏÎµÏ ÏÏÎ³ÏÏÎ½ÎµÏÏÎ·Ï</gui></guiseq> Î³Î¹Î± Î½Î± ÎµÎ¼ÏÎ±Î½Î¹ÏÏÎµÎ¯ Î¿ Î´Î¹Î¬Î»Î¿Î³Î¿Ï <gui>Î¹Î´Î¹ÏÏÎ·ÏÎµÏ ÏÏÎ³ÏÏÎ½ÎµÏÏÎ·Ï</gui> . ÎÎ± ÏÏÎ·ÏÎ¹Î¼Î¿ÏÎ¿Î¹Î®ÏÎ¿ÏÎ¼Îµ Î±ÏÏÏÎ½ ÏÎ¿Î½ Î´Î¹Î¬Î»Î¿Î³Î¿ Î³Î¹Î± Î½Î± ÎµÏÎ¹Î»Î­Î¾Î¿ÏÎ¼Îµ ÏÎ¿Î½ ÏÏÏÎ¿ ÏÎ·Ï ÏÎ·Î³Î®Ï (ÏÏÎ· ÏÎµÏÎ¯ÏÏÏÏÎ® Î¼Î±Ï CSV Î¼Îµ ÏÎ± ÎºÎ»ÎµÎ¹Î´Î¹Î¬ ÏÏÎ· Î³ÏÎ±Î¼Î¼Î® 1) ÎºÎ±Î¹ ÏÎ·Î½ ÏÎ·Î³Î® ÏÏÎ³ÏÏÎ½ÎµÏÏÎ·Ï (ÏÎ½Î¿Î¼Î± Î±ÏÏÎµÎ¯Î¿Ï) ÏÏÏÏ ÏÎ±Î¯Î½ÎµÏÎ±Î¹.</p>
+      <p>Î£ÏÎ¿ <app>glabels</app> Î­ÏÎ¿ÏÎ¼Îµ Î´Î·Î¼Î¹Î¿ÏÏÎ³Î®ÏÎµÎ¹ Î­Î½Î± Î½Î­Î¿ Î­Î³Î³ÏÎ±ÏÎ¿ <app>glabels</app> ÏÏÎ·ÏÎ¹Î¼Î¿ÏÎ¿Î¹ÏÎ½ÏÎ±Ï ÏÎ¿ ÏÏÏÏÏÏÎ¿ Avery 5512 "ÎÏÎ¹ÎºÎ­ÏÎµÏ Î´Î¹ÎµÏÎ¸ÏÎ½ÏÎµÏÎ½" . Î£ÏÎ· ÏÏÎ½Î­ÏÎµÎ¹Î± ÏÏÎ·ÏÎ¹Î¼Î¿ÏÎ¿Î¹Î¿ÏÎ¼Îµ ÏÎ¿ ÏÏÎ¿Î¹ÏÎµÎ¯Î¿ Î¼ÎµÎ½Î¿Ï <guiseq> <gui>ÎÎ½ÏÎ¹ÎºÎµÎ¯Î¼ÎµÎ½Î±</gui> <gui>Î£ÏÎ³ÏÏÎ½ÎµÏÏÎ· Î¹Î´Î¹Î¿ÏÎ®ÏÏÎ½</gui> </guiseq> Î³Î¹Î± Î½Î± ÎµÎ¼ÏÎ±Î½Î¹ÏÏÎµÎ¯ Î¿ Î´Î¹Î¬Î»Î¿Î³Î¿Ï <gui>ÏÏÎ³ÏÏÎ½ÎµÏÏÎ· Î¹Î´Î¹Î¿ÏÎ®ÏÏÎ½</gui>. ÎÎ± ÏÏÎ·ÏÎ¹Î¼Î¿ÏÎ¿Î¹Î®ÏÎ¿ÏÎ¼Îµ Î±ÏÏÏÎ½ ÏÎ¿Î½ Î´Î¹Î¬Î»Î¿Î³Î¿ Î³Î¹Î± Î½Î± ÎµÏÎ¹Î»Î­Î¾Î¿ÏÎ¼Îµ ÏÎ¿Î½ ÏÏÏÎ¿ ÏÎ·Ï ÏÎ·Î³Î®Ï (ÏÏÎ· ÏÎµÏÎ¯ÏÏÏÏÎ® Î¼Î±Ï CSV Î¼Îµ ÏÎ± ÎºÎ»ÎµÎ¹Î´Î¹Î¬ ÏÏÎ· Î³ÏÎ±Î¼Î¼Î® 1) ÎºÎ±Î¹ ÏÎ·Î½ ÏÎ·Î³Î® ÏÏÎ³ÏÏÎ½ÎµÏÏÎ·Ï (ÏÎ½Î¿Î¼Î± Î±ÏÏÎµÎ¯Î¿Ï) ÏÏÏÏ ÏÎ±Î¯Î½ÎµÏÎ±Î¹.</p>
 
       <!-- ==== Figure ==== -->
 		<media type="image" src="figures/merge-ex2-1.png" mime="image/png" style="right">
@@ -66,7 +66,7 @@ Kramer,Cosmo,,"Apt 5B","129 W. 81 St.","New York",NY,10024-7207
 
       <p>Î£Îµ Î±ÏÏÏ ÏÎ¿ ÏÎ±ÏÎ¬Î´ÎµÎ¹Î³Î¼Î± Î­ÏÎ¿ÏÎ¼Îµ Î­Î½Î± Î¼ÏÎ½Î¿ Î±Î½ÏÎ¹ÎºÎµÎ¯Î¼ÎµÎ½Î¿ ÎºÎµÎ¹Î¼Î­Î½Î¿Ï. ÎÏÏÏ ÏÎ¿ Î±Î½ÏÎ¹ÎºÎµÎ¯Î¼ÎµÎ½Î¿ ÎºÎµÎ¹Î¼Î­Î½Î¿Ï ÏÎµÏÎ¹Î­ÏÎµÎ¹ ÏÎ»Î± ÏÎ± ÏÎµÎ´Î¯Î± ÏÏÎ³ÏÏÎ½ÎµÏÏÎ·Ï Î¼Î±Ï Î¿ÏÎ³Î±Î½ÏÎ¼Î­Î½Î± ÏÎµ ÏÎ¿Î»Î»Î­Ï Î³ÏÎ±Î¼Î¼Î­Ï, ÏÏ Î¼Î¹Î± ÏÎ±ÏÏÎ´ÏÎ¿Î¼Î¹ÎºÎ® Î´Î¹ÎµÏÎ¸ÏÎ½ÏÎ·. Î£Î·Î¼ÎµÎ¹ÏÏÏÎµ ÏÏÎ¹ ÏÎ± ÏÎµÎ´Î¯Î± ${ADDR1} ÎºÎ±Î¹ ${ADDR2} Î´ÎµÎ½ Î­ÏÎµÎ¹ Î¬Î»Î»Î¿ ÎºÎµÎ¯Î¼ÎµÎ½Î¿ Î¼Î­ÏÎ± ÏÏÎ¹Ï Î´Î¹ÎºÎ­Ï ÏÎ¿ÏÏ Î³ÏÎ±Î¼Î¼Î­Ï. ÎÏÎ±Î½ ÏÎ¿ <app>glabels</app> ÏÏÎ½Î±Î½ÏÎ¬ Î­Î½Î± ÏÎµÎ´Î¯Î¿ ÏÏ ÏÎ¿ Î¼ÏÎ½Î¿ ÎºÎµÎ¯Î¼ÎµÎ½Î¿ ÏÎµ Î¼Î¹Î± Î³ÏÎ±Î¼Î¼Î®, Î´ÎµÎ½ Î¸Î± ÎµÏÎµÎºÏÎµÎ¯Î½ÎµÎ¹ ÏÎ· Î³ÏÎ±Î¼Î¼Î® Î±Î½ ÏÎ¿ ÏÎµÎ´Î¯Î¿ ÎµÎ¯Î½Î±Î¹ ÎºÎµÎ½Ï.</p>
 
-      <p>Î¤ÏÏÎ± Î¼ÏÎ¿ÏÎ¿ÏÎ¼Îµ Î½Î± ÏÏÏÏÏÎ¿ÏÎ¼Îµ ÏÎ¹Ï ÎµÏÎ¹ÎºÎ­ÏÎµÏ Î´Î¹ÎµÏÎ¸ÏÎ½ÏÎµÏÎ½ Î¼Î±Ï ÎµÏÎ¹Î»Î­Î³Î¿Î½ÏÎ±Ï ÏÎ¿ ÏÏÎ¿Î¹ÏÎµÎ¯Î¿ Î¼ÎµÎ½Î¿Ï <guiseq><gui>ÎÏÏÎµÎ¯Î¿</gui><gui>ÎÎºÏÏÏÏÏÎ·</gui></guiseq>. ÎÏÏÏ Î¸Î± ÎµÎ¼ÏÎ±Î½Î¯ÏÎµÎ¹ ÏÎ¿Î½ Î´Î¹Î¬Î»Î¿Î³Î¿ ÎµÎºÏÏÏÏÏÎ·Ï ÏÏÏÏ ÏÎ±Î¯Î½ÎµÏÎ±Î¹ ÏÎ±ÏÎ±ÎºÎ¬ÏÏ.</p>
+      <p>Î¤ÏÏÎ± Î¼ÏÎ¿ÏÎ¿ÏÎ¼Îµ Î½Î± ÏÏÏÏÏÎ¿ÏÎ¼Îµ ÏÎ¹Ï ÎµÏÎ¹ÎºÎ­ÏÎµÏ Î´Î¹ÎµÏÎ¸ÏÎ½ÏÎµÏÎ½ Î¼Î±Ï ÎµÏÎ¹Î»Î­Î³Î¿Î½ÏÎ±Ï ÏÎ¿ ÏÏÎ¿Î¹ÏÎµÎ¯Î¿ Î¼ÎµÎ½Î¿Ï <guiseq> <gui>ÎÏÏÎµÎ¯Î¿</gui> <gui>ÎÎºÏÏÏÏÏÎ·</gui> </guiseq>. ÎÏÏÏ Î¸Î± ÎµÎ¼ÏÎ±Î½Î¯ÏÎµÎ¹ ÏÎ¿Î½ Î´Î¹Î¬Î»Î¿Î³Î¿ ÎµÎºÏÏÏÏÏÎ·Ï ÏÏÏÏ ÏÎ±Î¯Î½ÎµÏÎ±Î¹ ÏÎ±ÏÎ±ÎºÎ¬ÏÏ.</p>
 
       <!-- ==== Figure ==== -->
 		<media type="image" src="figures/merge-ex2-3.png" mime="image/png" style="right">
