X-Git-Url: https://git.sur5r.net/?p=glabels;a=blobdiff_plain;f=help%2Fel%2Fmerge-ex1.page;h=3d9e060050eff66e43e72c5c8d87ac78a5b46b79;hp=05f67e7f2da6573ee899f4577ea2a6d29736c4e1;hb=38d44627bd551b2f3855ee44d2d1e3f03f30e2ce;hpb=80f8b7f229a635ac0bdcbe81cc260ab37a55d32e

diff --git a/help/el/merge-ex1.page b/help/el/merge-ex1.page
index 05f67e7f..3d9e0600 100644
--- a/help/el/merge-ex1.page
+++ b/help/el/merge-ex1.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">
@@ -42,7 +42,7 @@ Name,Department,SN
 "Montgomery Scott",Engineering,SE-197-54T
       </code>
 
-      <p>Î£ÏÎ¿ <app>glabels</app> Î­ÏÎ¿ÏÎ¼Îµ Î´Î·Î¼Î¹Î¿ÏÏÎ³Î®ÏÎµÎ¹ Î­Î½Î± Î½Î­Î¿ Î­Î³Î³ÏÎ±ÏÎ¿ <app>glabels</app> ÏÏÎ·ÏÎ¹Î¼Î¿ÏÎ¿Î¹ÏÎ½ÏÎ±Ï ÏÎ¿ ÏÏÏÏÏÏÎ¿ Avery 5395 "ÎÏÎ¹ÎºÎ­ÏÎµÏ Î¿Î½ÏÎ¼Î±ÏÎ¿Ï ÏÎ·Î¼Î¬ÏÏÎ½" . Î£ÏÎ· ÏÏÎ½Î­ÏÎµÎ¹Î± ÏÏÎ·ÏÎ¹Î¼Î¿ÏÎ¿Î¹Î¿ÏÎ¼Îµ ÏÎ¿ ÏÏÎ¿Î¹ÏÎµÎ¯Î¿ Î¼ÎµÎ½Î¿Ï <guiseq><gui>ÎÎ½ÏÎ¹ÎºÎµÎ¯Î¼ÎµÎ½Î±</gui><gui>ÎÎ´Î¹ÏÏÎ·ÏÎµÏ ÏÏÎ³ÏÏÎ½ÎµÏÏÎ·Ï</gui></guiseq> Î³Î¹Î± Î½Î± ÎµÎ¼ÏÎ±Î½Î¹ÏÏÎµÎ¯ Î¿ Î´Î¹Î¬Î»Î¿Î³Î¿Ï <gui>Î¹Î´Î¹ÏÏÎ·ÏÎµÏ ÏÏÎ³ÏÏÎ½ÎµÏÏÎ·Ï</gui> . ÎÎ± ÏÏÎ·ÏÎ¹Î¼Î¿ÏÎ¿Î¹Î®ÏÎ¿ÏÎ¼Îµ Î±ÏÏÏÎ½ ÏÎ¿Î½ Î´Î¹Î¬Î»Î¿Î³Î¿ Î³Î¹Î± Î½Î± ÎµÏÎ¹Î»Î­Î¾Î¿ÏÎ¼Îµ ÏÎ¿Î½ ÏÏÏÎ¿ ÏÎ·Ï ÏÎ·Î³Î®Ï (ÏÏÎ· ÏÎµÏÎ¯ÏÏÏÏÎ® Î¼Î±Ï CSV Î¼Îµ ÏÎ± ÎºÎ»ÎµÎ¹Î´Î¹Î¬ ÏÏÎ· Î³ÏÎ±Î¼Î¼Î® 1) ÎºÎ±Î¹ ÏÎ·Î½ ÏÎ·Î³Î® ÏÏÎ³ÏÏÎ½ÎµÏÏÎ·Ï (ÏÎ½Î¿Î¼Î± Î±ÏÏÎµÎ¯Î¿Ï) ÏÏÏÏ ÏÎ±Î¯Î½ÎµÏÎ±Î¹.</p>
+      <p>Î£ÏÎ¿ <app>glabels</app> Î­ÏÎ¿ÏÎ¼Îµ Î´Î·Î¼Î¹Î¿ÏÏÎ³Î®ÏÎµÎ¹ Î­Î½Î± Î½Î­Î¿ Î­Î³Î³ÏÎ±ÏÎ¿ <app>glabels</app> ÏÏÎ·ÏÎ¹Î¼Î¿ÏÎ¿Î¹ÏÎ½ÏÎ±Ï ÏÎ¿ ÏÏÏÏÏÏÎ¿ Avery 5395 "ÎÏÎ¹ÎºÎ­ÏÎµÏ Î¿Î½ÏÎ¼Î±ÏÎ¿Ï ÏÎ·Î¼Î¬ÏÏÎ½". Î£ÏÎ· ÏÏÎ½Î­ÏÎµÎ¹Î± ÏÏÎ·ÏÎ¹Î¼Î¿ÏÎ¿Î¹Î¿ÏÎ¼Îµ ÏÎ¿ ÏÏÎ¿Î¹ÏÎµÎ¯Î¿ Î¼ÎµÎ½Î¿Ï <guiseq> <gui>ÎÎ½ÏÎ¹ÎºÎµÎ¯Î¼ÎµÎ½Î±</gui> <gui>Î£ÏÎ³ÏÏÎ½ÎµÏÏÎ· Î¹Î´Î¹Î¿ÏÎ®ÏÏÎ½</gui> </guiseq> Î³Î¹Î± Î½Î± ÎµÎ¼ÏÎ±Î½Î¹ÏÏÎµÎ¯ Î¿ Î´Î¹Î¬Î»Î¿Î³Î¿Ï <gui>ÏÏÎ³ÏÏÎ½ÎµÏÏÎ· Î¹Î´Î¹Î¿ÏÎ®ÏÏÎ½</gui>. ÎÎ± ÏÏÎ·ÏÎ¹Î¼Î¿ÏÎ¿Î¹Î®ÏÎ¿ÏÎ¼Îµ Î±ÏÏÏÎ½ ÏÎ¿Î½ Î´Î¹Î¬Î»Î¿Î³Î¿ Î³Î¹Î± Î½Î± ÎµÏÎ¹Î»Î­Î¾Î¿ÏÎ¼Îµ ÏÎ¿Î½ ÏÏÏÎ¿ ÏÎ·Ï ÏÎ·Î³Î®Ï (ÏÏÎ· ÏÎµÏÎ¯ÏÏÏÏÎ® Î¼Î±Ï CSV Î¼Îµ ÏÎ± ÎºÎ»ÎµÎ¹Î´Î¹Î¬ ÏÏÎ· Î³ÏÎ±Î¼Î¼Î® 1) ÎºÎ±Î¹ ÏÎ·Î½ ÏÎ·Î³Î® ÏÏÎ³ÏÏÎ½ÎµÏÏÎ·Ï (ÏÎ½Î¿Î¼Î± Î±ÏÏÎµÎ¯Î¿Ï) ÏÏÏÏ ÏÎ±Î¯Î½ÎµÏÎ±Î¹.</p>
 
       <!-- ==== Figure ==== -->
 		<media type="image" src="figures/merge-ex1-1.png" mime="image/png" style="right">
@@ -62,7 +62,7 @@ Name,Department,SN
 
       <p>Î£Îµ Î±ÏÏÏ ÏÎ¿ ÏÎ±ÏÎ¬Î´ÎµÎ¹Î³Î¼Î± Î­ÏÎ¿ÏÎ¼Îµ ÏÏÎ¿ÏÎ¸Î­ÏÎµÎ¹ ÏÏÎ¯Î± Î±Î½ÏÎ¹ÎºÎµÎ¯Î¼ÎµÎ½Î± ÎºÎµÎ¹Î¼Î­Î½Î¿Ï ÎºÎ±Î¹ Î­Î½Î± Î±Î½ÏÎ¹ÎºÎµÎ¯Î¼ÎµÎ½Î¿ ÏÎ±Î²Î´Î¿ÎºÏÎ´Î¹ÎºÎ± barcode. Î¤Î¿ ÏÏÏÏÎ¿ Î±Î½ÏÎ¹ÎºÎµÎ¯Î¼ÎµÎ½Î¿ ÎºÎµÎ¹Î¼Î­Î½Î¿Ï ÏÎµÏÎ¹Î­ÏÎµÎ¹ Î¼ÏÎ½Î¿ Î±ÏÎ»Ï ÎºÎµÎ¯Î¼ÎµÎ½Î¿ ÎºÎ±ÏÎ¬ Î³ÏÎ¬Î¼Î¼Î± ("Hello, my name is"). Î¤Î¿ Î´ÎµÏÏÎµÏÎ¿ Î±Î½ÏÎ¹ÎºÎµÎ¯Î¼ÎµÎ½Î¿ ÎºÎµÎ¹Î¼Î­Î½Î¿Ï ÏÎµÏÎ¹Î­ÏÎµÎ¹ Î­Î½Î± ÏÎµÎ´Î¯Î¿ ÏÏÎ³ÏÏÎ½ÎµÏÏÎ·Ï ("${Name}") ÏÎ¿Ï Î±Î½ÏÎ¹ÏÏÎ¿Î¹ÏÎµÎ¯ ÏÏÎ¿ ÏÏÏÏÎ¿ ÏÎµÎ´Î¯Î¿ Î¼Î¹Î±Ï ÎµÎ³Î³ÏÎ±ÏÎ®Ï (ÏÏÏÏÎ· ÏÏÎ®Î»Î· ÏÎ·Ï Î³ÏÎ±Î¼Î¼Î®Ï) , Î· Î¿ÏÎ¿Î¯Î± ÏÎµÏÎ¹Î»Î±Î¼Î²Î¬Î½ÎµÎ¹ ÏÎ¿ ÏÎ»Î®ÏÎµÏ ÏÎ½Î¿Î¼Î± ÏÎ¿Ï Î½Î­Î¿Ï Î¼Î­Î»Î¿ÏÏ ÏÎ¿Ï ÏÎ»Î·ÏÏÎ¼Î±ÏÎ¿Ï. Î¤Î¿ ÏÏÎ¯ÏÎ¿ ÏÎµÎ´Î¯Î¿ ÎºÎµÎ¹Î¼Î­Î½Î¿Ï ÏÎµÏÎ¹Î­ÏÎµÎ¹ ÏÏÏÎ¿ ÎºÏÏÎ¹Î¿Î»ÎµÎºÏÎ¹ÎºÏ ÎºÎµÎ¯Î¼ÎµÎ½Î¿ ("Department: ") ÏÎ¿Ï Î±ÎºÎ¿Î»Î¿ÏÎ¸ÎµÎ¯ÏÎ±Î¹ Î±ÏÏ Î­Î½Î± ÏÎµÎ´Î¯Î¿ ÏÏÎ³ÏÏÎ½ÎµÏÏÎ·Ï ("${Department}") ÏÎ¿Ï Î±Î½ÏÎ¹ÏÏÎ¿Î¹ÏÎµÎ¯ ÏÏÎ¿ Î´ÎµÏÏÎµÏÎ¿ ÏÎµÎ´Î¯Î¿ Î® ÏÎ¼Î®Î¼Î± ÏÏÎ½ Î¼ÎµÎ»ÏÎ½ ÏÎ¿Ï ÏÎ»Î·ÏÏÎ¼Î±ÏÎ¿Ï. Î¤Î¿ Î±Î½ÏÎ¹ÎºÎµÎ¯Î¼ÎµÎ½Î¿ barcode Î­ÏÎµÎ¹ ÏÏÎ¸Î¼Î¹ÏÏÎµÎ¯ Î½Î± ÏÏÎ·ÏÎ¹Î¼Î¿ÏÎ¿Î¹ÎµÎ¯ ÏÎ¿Î¼Î­Î± (Î® ÎºÎ»ÎµÎ¹Î´Î¯) "SN" ÏÎ¿Ï ÏÎµÏÎ¹Î­ÏÎµÎ¹ ÏÎ¿Î½ Î±ÏÎ¹Î¸Î¼Ï ÏÎµÎ¹ÏÎ¬Ï Starfleet Î¼Î­Î»Î¿ÏÏ ÏÎ¿Ï ÏÎ»Î·ÏÏÎ¼Î±ÏÎ¿Ï Î¼Î±Ï.</p>
 
-      <p>Î¤ÏÏÎ± Î¼ÏÎ¿ÏÎ¿ÏÎ¼Îµ Î½Î± ÏÏÏÏÏÎ¿ÏÎ¼Îµ ÏÎ¹Ï ÎµÏÎ¹ÎºÎ­ÏÎµÏ Î¿Î½Î¿Î¼Î¬ÏÏÎ½ Î¼Î±Ï ÎµÏÎ¹Î»Î­Î³Î¿Î½ÏÎ±Ï ÏÎ¿ ÏÏÎ¿Î¹ÏÎµÎ¯Î¿ Î¼ÎµÎ½Î¿Ï <guiseq><gui>ÎÏÏÎµÎ¯Î¿</gui><gui>ÎÎºÏÏÏÏÏÎ·</gui></guiseq>. ÎÏÏÏ Î¸Î± ÎµÎ¼ÏÎ±Î½Î¯ÏÎµÎ¹ ÏÎ¿ ÏÎ»Î±Î¯ÏÎ¹Î¿ Î´Î¹Î±Î»ÏÎ³Î¿Ï ÎµÎºÏÏÏÏÏÎ·Ï ÏÏÏÏ ÏÎ±Î¯Î½ÎµÏÎ±Î¹ ÏÎ±ÏÎ±ÎºÎ¬ÏÏ.</p>
+      <p>Î¤ÏÏÎ± Î¼ÏÎ¿ÏÎ¿ÏÎ¼Îµ Î½Î± ÏÏÏÏÏÎ¿ÏÎ¼Îµ ÏÎ¹Ï ÎµÏÎ¹ÎºÎ­ÏÎµÏ Î¿Î½Î¿Î¼Î¬ÏÏÎ½ Î¼Î±Ï ÎµÏÎ¹Î»Î­Î³Î¿Î½ÏÎ±Ï ÏÎ¿ ÏÏÎ¿Î¹ÏÎµÎ¯Î¿ Î¼ÎµÎ½Î¿Ï <guiseq> <gui>ÎÏÏÎµÎ¯Î¿</gui> <gui>ÎÎºÏÏÏÏÏÎ·</gui> </guiseq>. ÎÏÏÏ Î¸Î± ÎµÎ¼ÏÎ±Î½Î¯ÏÎµÎ¹ ÏÎ¿Î½ Î´Î¹Î¬Î»Î¿Î³Î¿ ÎµÎºÏÏÏÏÏÎ·Ï ÏÏÏÏ ÏÎ±Î¯Î½ÎµÏÎ±Î¹ ÏÎ±ÏÎ±ÎºÎ¬ÏÏ.</p>
 
       <!-- ==== Figure ==== -->
 		<media type="image" src="figures/merge-ex1-3.png" mime="image/png" style="right">
