Imported Upstream version 3.2.0

[glabels] / help / sl / merge.page

diff --git a/help/sl/merge.page b/help/sl/merge.page
index 035d8d9de44d97f477facfcb3a7de95206d50f48..c9cbf90aa9152a3ac8aea19b69b7a8f777b2b6de 100644 (file)
--- a/help/sl/merge.page
+++ b/help/sl/merge.page
@@ -13,14 +13,14 @@
     </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>Vodnik za spajanje dokumentov</title>
+    <title>Document merge tutorial</title>
 
     <p>Document Merge (sometimes called "Mail Merge") is a powerful
       feature that allows a unique label or card to be printed for each