Merge from BRANCH_1_0.

1 files changed, 31 insertions, 6 deletions

diff --git a/i18n/it/patience.ts b/i18n/it/patience.ts
index 2808659..f99552e 100644
--- a/i18n/it/patience.ts
+++ b/i18n/it/patience.ts
@@ -1,73 +1,98 @@
 <!DOCTYPE TS><TS>
+<defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>CanvasCardWindow</name>
     <message>
         <source>Patience</source>
         <translation>Patience</translation>
     </message>
     <message>
         <source>Freecell</source>
         <translation>Freecell</translation>
     </message>
     <message>
         <source>Chicane</source>
         <translation>Chicane</translation>
     </message>
     <message>
         <source>Harp</source>
         <translation>Harp</translation>
     </message>
     <message>
         <source>Teeclub</source>
         <translation>Teeclub</translation>
     </message>
     <message>
         <source>&amp;Game</source>
         <translation>&amp;Partita</translation>
     </message>
     <message>
         <source>&amp;Change Card Backs</source>
-        <translation>&amp;Cambia Retro delle Carte</translation>
+        <translation type="obsolete">&amp;Cambia Retro delle Carte</translation>
     </message>
     <message>
         <source>&amp;Snap To Position</source>
-        <translation>&amp;Metti In Posizione</translation>
+        <translation type="obsolete">&amp;Metti In Posizione</translation>
     </message>
     <message>
         <source>&amp;Settings</source>
         <translation>&amp;Settaggi</translation>
     </message>
     <message>
         <source>&amp;About</source>
         <translation>&amp;Informazioni</translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Aiuto</translation>
     </message>
     <message>
         <source>Play</source>
         <translation>Gioca</translation>
     </message>
     <message>
         <source>Change Card Backs</source>
-        <translation>Cambia Retro delle Carte</translation>
+        <translation type="obsolete">Cambia Retro delle Carte</translation>
     </message>
     <message>
         <source>Snap To Position</source>
-        <translation>Metti In Posizione</translation>
+        <translation type="obsolete">Metti In Posizione</translation>
     </message>
     <message>
         <source>Turn One Card</source>
-        <translation>Gira Una Carta</translation>
+        <translation type="obsolete">Gira Una Carta</translation>
     </message>
     <message>
         <source>Settings</source>
         <translation>Settaggi</translation>
     </message>
     <message>
         <source>Turn Three Cards</source>
-        <translation>Gira Tre Carte</translation>
+        <translation type="obsolete">Gira Tre Carte</translation>
+    </message>
+    <message>
+        <source>&amp;Change card backs</source>
+        <translation>&amp;Cambia retro delle carte</translation>
+    </message>
+    <message>
+        <source>&amp;Snap to position</source>
+        <translation>&amp;Metti in posizione</translation>
+    </message>
+    <message>
+        <source>Change card backs</source>
+        <translation>Cambia retro delle carte</translation>
+    </message>
+    <message>
+        <source>Snap to position</source>
+        <translation>Metti in posizione</translation>
+    </message>
+    <message>
+        <source>Turn one card</source>
+        <translation>Gira una carta</translation>
+    </message>
+    <message>
+        <source>Turn three cards</source>
+        <translation>Gira tre carte</translation>
     </message>
 </context>
 </TS>