Merge from BRANCH_1_0.

1 files changed, 43 insertions, 8 deletions

diff --git a/i18n/it/showimg.ts b/i18n/it/showimg.ts
index 7f1d4ef..f2f4675 100644
--- a/i18n/it/showimg.ts
+++ b/i18n/it/showimg.ts
@@ -1,124 +1,159 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>ControlsDialog</name>
     <message>
         <source>Brightness</source>
         <translation>Luminosità</translation>
     </message>
 </context>
 <context>
     <name>ImageFileSelector</name>
     <message>
         <source>Title</source>
         <translation>Titolo</translation>
     </message>
     <message>
         <source>Type</source>
         <translation>Tipo</translation>
     </message>
 </context>
 <context>
     <name>ImageViewer</name>
     <message>
         <source>Image Viewer</source>
         <translation>Image Viewer</translation>
     </message>
     <message>
         <source>Open</source>
         <translation>Apri</translation>
     </message>
     <message>
         <source>Thumbnail View</source>
         <translation>Mostra Miniature</translation>
     </message>
     <message>
-        <source>Slideshow</source>
-        <translation>Slideshow</translation>
-    </message>
-    <message>
         <source>Preferences..</source>
         <translation>Impostazioni..</translation>
     </message>
     <message>
-        <source>Help</source>
-        <translation>Aiuto</translation>
-    </message>
-    <message>
         <source>Image Info ...</source>
         <translation>Info Immagine ...</translation>
     </message>
     <message>
         <source>Horizontal flip</source>
         <translation>Flip Orizzontale</translation>
     </message>
     <message>
         <source>Vertical flip</source>
         <translation>Flip Verticale</translation>
     </message>
     <message>
         <source>Open ...</source>
         <translation>Apri ...</translation>
     </message>
     <message>
         <source>Rotate 90</source>
         <translation>Ruota 90</translation>
     </message>
     <message>
         <source>Rotate 180</source>
         <translation>Ruota 180</translation>
     </message>
     <message>
         <source>Rotate 270</source>
         <translation>Ruota 270</translation>
     </message>
     <message>
         <source>Brightness ...</source>
         <translation>Luminosità ...</translation>
     </message>
     <message>
         <source>Black And White</source>
         <translation>Bianco e Nero</translation>
     </message>
     <message>
         <source>Scale to Screen</source>
         <translation>Ingrandisci</translation>
     </message>
     <message>
         <source>Fullscreen</source>
         <translation>Schermo Intero</translation>
     </message>
     <message>
         <source>File</source>
         <translation>File</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Mostra</translation>
     </message>
     <message>
         <source>Options</source>
         <translation>Opzioni</translation>
     </message>
     <message>
         <source> - Image Viewer</source>
         <translation> - Image Viewer</translation>
     </message>
     <message>
         <source>%1 colors</source>
         <translation>%1 colori</translation>
     </message>
     <message>
         <source> True color</source>
         <translation> True color</translation>
     </message>
     <message>
         <source>%1 alpha levels</source>
         <translation>%1 alpha levels</translation>
     </message>
     <message>
         <source>8-bit alpha channel</source>
         <translation>8-bit alpha channel</translation>
     </message>
+    <message>
+        <source>Slide show</source>
+        <translation>Slide show</translation>
+    </message>
+    <message>
+        <source>Stop Slideshow</source>
+        <translation>Fine Slideshow</translation>
+    </message>
+</context>
+<context>
+    <name>SettingsDialogBase</name>
+    <message>
+        <source>Preferences</source>
+        <translation>Impostazioni</translation>
+    </message>
+    <message>
+        <source>Slide Show</source>
+        <translation>Slide Show</translation>
+    </message>
+    <message>
+        <source>Delay between pictures</source>
+        <translation>Ritardo tra le immagini</translation>
+    </message>
+    <message>
+        <source>s</source>
+        <translation>s</translation>
+    </message>
+    <message>
+        <source>Repeat slideshow</source>
+        <translation>Ripeti slideshow</translation>
+    </message>
+    <message>
+        <source>Show pictures in reverse</source>
+        <translation>Mostra immagini in negativo</translation>
+    </message>
+    <message>
+        <source>Load pictures rotated 90 degrees</source>
+        <translation>Carica immagini ruotate a 90 gradi</translation>
+    </message>
+    <message>
+        <source>Fast load pictures</source>
+        <translation>Caricamento veloce immagini</translation>
+    </message>
 </context>
 </TS>