Imported Upstream version 3.2.0

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

diff --git a/help/sl/merge-ex2.page b/help/sl/merge-ex2.page
index 0cd0cac539a713f194a48a30cce6e78b83fc3ce5..5997f3979ec74e5f2fc88cbb4661fc307f611fa9 100644 (file)
--- a/help/sl/merge-ex2.page
+++ b/help/sl/merge-ex2.page
@@ -13,10 +13,10 @@
     </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>
 
@@ -66,7 +66,7 @@ Kramer,Cosmo,,"Apt 5B","129 W. 81 St.","New York",NY,10024-7207
 
       <!-- ==== Figure ==== -->
                <media type="image" src="figures/merge-ex2-2.png" mime="image/png" style="right">
-               <p>Adding objects</p>
+               <p>Dodajanje predmetov</p>
                </media>
       <!-- ==== End of Figure ==== -->