Imported Upstream version 3.2.0

[glabels] / help / sl / mergefeatures.page

diff --git a/help/sl/mergefeatures.page b/help/sl/mergefeatures.page
index 0352c089d931450b9378edef789f0a0976deb8f6..32089139b97155dfe75607669fe733949c9c4860 100644 (file)
--- a/help/sl/mergefeatures.page
+++ b/help/sl/mergefeatures.page
@@ -4,21 +4,23 @@
   <info>
     <link type="guide" xref="index#merging"/>
     <revision pkgversion="3.0" version="0.1" date="2010-05-04" status="incomplete"/>
-    <desc>Kaj lahko pričakujete od spajanja dokumentov.</desc>
+    <desc>
+       What you may expect from a document merge.
+    </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>Izvajanje spajanja dokumentov</title>
+    <title>Performing a document merge</title>
 
       <p>Document Merge (sometimes called "Mail Merge") is a powerful
         feature that allows a unique label or card to be printed for each
@@ -34,7 +36,43 @@
         can be embedded into fields by using the "\n" entity.  This file
         could be created using any text editor or could be created by
         another program or script.  A common way of creating CSV files is
-       to export them from a spreadsheet program.</p>
+       to export them from a spreadsheet program or from address book
+       applications.</p>
+       
+       <note style="advanced">
+         <p>
+         To export a CSV file from <app>kaddressbook</app>, first select the
+        contacts you wish to export. Click on the first contact, then press and
+        hold <key>Ctrl</key> and click on the other desired contacts to select them.
+        Then choose <guiseq><gui>File</gui><gui>Export</gui>
+        <gui>Export CSV File</gui></guiseq>.</p>
+        
+        <p>
+        In the <gui>Select Contacts</gui>
+        window, enable the button <gui>Selected contacts</gui> (which should be
+        enabled by default anyway). Then click on <gui>OK</gui>.
+        In the <gui>Save As</gui> dialog, choose the desired folder and a name
+        for the file and click on <gui>Save</gui>.
+         </p>
+        </note>
+       
+       <note style="advanced">
+         <p>
+        To export a CSV file from <app>Thunderbird</app>, click on the
+        <gui>Address Book</gui> toolbar button or choose <guiseq><gui>Tools
+        </gui><gui>Address Book</gui></guiseq> from the menu.
+        Then select the contacts you wish to export. Click on the first contact,
+        then press and hold <key>Ctrl</key> and click on the other desired contacts
+        to select them. Then choose <guiseq><gui>Tools</gui><gui>Export</gui>
+        </guiseq>.</p>
+        
+        <p>
+        In the file chooser window, choose the desired folder and a name
+        for the file and change the value of the drop-down button in the
+        right bottom corner to <gui>Comma Separated</gui>. Finally, click on
+        <gui>Save</gui>.
+         </p>
+        </note>
 
       <p>A label must then be configured to "point at" this data file.
         To configure the merge properties of a document, choose