Imported Upstream version 3.2.0

[glabels] / help / sl / merge-ex1.page

diff --git a/help/sl/merge-ex1.page b/help/sl/merge-ex1.page
index df27caae636c6f8d466550ee2171aa8e9eeb9cde..eff7f77373eb44fcf7a42f9f90f2dbb1e54e9efe 100644 (file)
--- a/help/sl/merge-ex1.page
+++ b/help/sl/merge-ex1.page
@@ -4,21 +4,23 @@
   <info>
     <link type="guide" xref="merge#merge-ex"/>
     <revision pkgversion="3.0" version="0.1" date="2010-05-04" status="incomplete"/>
-    <desc>Ustvari imenske značke iz datoteke CSV.</desc>
+    <desc>
+       Create name tags from a CSV file.
+    </desc>
     <credit type="author">
       <name>Jim Evins</name>
       <email>evins@snaught.com</email>
     </credit>
     <credit type="author">
       <name>Mario Blättermann</name>
-      <email>mariobl@gnome.org</email>
+      <email>mario.blaettermann@gmail.com</email>
     </credit>
     <license>
-      <p>Creative Commons Share Alike 3.0</p>
+      <p>Creative Commons - deljenje pod enakimi pogoji 3.0</p>
     </license>    
   </info>
 
-    <title>Primer 1: Značke z imeni</title>
+    <title>Example 1: Name Tags</title>
 
       <p>In this example we are organizing an orientation party for the new
         crew members of our ship.  We have a list of freshman crew members that we
@@ -78,7 +80,7 @@ Name,Department,SN
 
       <!-- ==== Figure ==== -->
                <media type="image" src="figures/merge-ex1-3.png" mime="image/png" style="right">
-               <p>Tiskanje imenskih značk</p>
+               <p>Printing name tags</p>
                </media>
       <!-- ==== End of Figure ==== -->