From b5ed0da09b892a53ede0a594d5ae5270fc603c01 Mon Sep 17 00:00:00 2001
From: Ansa89 <ansalonistefano@gmail.com>
Date: Tue, 29 Jul 2014 12:08:14 +0200
Subject: [PATCH] Italian translation: update

---
 translations/it.qm | Bin 5826 -> 6298 bytes
 translations/it.ts |  39 ++++++++++++++++++++++++++++-----------
 2 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/translations/it.qm b/translations/it.qm
index db9dc34f8061ef1e47ed6ea048c0eb17a743e420..4c8c5f1eac59191ad08d918872f408b5455c907f 100644
GIT binary patch
delta 653
zcma)1O=uHQ7@WkUN!w&&vuP+8<PmLDP(-wf7e!E!UbI<?NTCvTUz)Y)ZpgmG<`mSU
z7njuEf;~vRT5Rzm2zn|3Pxh!F3VIR`Ju6N&#hc(;9`E~RXTF*5-H|89?q#Mv12Yw1
zw2jE~77()#y)*%goI>I4K0x2biQf@m=r+zZIzZ$BCQsf6G9R)0Ym2%#R<1{Z-Jim#
z8z%c_zC05iE&8j4u>RD4zc;M!_kR@f`gANbwge<MV?*N)fq`!S)fQvj?{|Rgwa!H7
zVmmvY@UDKPou2r4;5Cr`mbBJtKw>MYHhjuL$<6!++MnjT4W49oc^VjA)pAGkjBRPT
zM;6h7c6?<Ph#%65HO9`|(u#LqFn&}sa?}qlX=~*TAoV6SRo_FOw#^KW*S~}+BZIGC
zpo$WjotK$>8v+g_fgU7a!A70E2?du`YX=j3Nr1V;%%JKq9Wo^j6SG-21FZ~H|1)*Q
zqM%Ic1`SlaxAFk*d85>n!jnqb&YUNdD^x{_n{Iucy|C=MG?iO#3ET0MELp-W2ZV;#
zC{=~&I^`axb2dG8*<e(OIZn43szxW1Uxk<oRurrjxQyce-ck;{zbVp&tkOt$3wBku
cM6G1bb7uBn8W;Yl88-UlD?8-%NquqGA0Ho^*Z=?k

delta 262
zcmbPbcu04GNZ<(uhUg3i2I2h-EXyhx7}!%7SUpS`7zE83)D9{$FbEklnEYd5VBl(E
za4en7z`!z%!OLtaP`wPp?7vrlv<Jidcvc1mfxArnS;;{D<B6$uOu~~UE>&X^yf^Wz
z9Ft(m#J6fnf>YTUC8jVi@Sb4jQk~Agz;+5k^Hs2)dfv>yATo2ZDWhAuNGeZp_+y}T
z!n`RP3K$r8uJD#@nFv(Q$a_NRGSE4dK>9NS5b&Ow9m>GKy_8R8MhcLp#%DY~j)8$g
ylP{<M=uDx5d_mpofzD;+3zh-u<D9~`A#Do-1OL8Epj|gN|6<G#+^i&8!3+R=heF-}

diff --git a/translations/it.ts b/translations/it.ts
index 069303057..7e30f0a95 100644
--- a/translations/it.ts
+++ b/translations/it.ts
@@ -91,13 +91,13 @@
 <context>
     <name>ChatForm</name>
     <message>
-        <location filename="../widget/form/chatform.cpp" line="293"/>
+        <location filename="../widget/form/chatform.cpp" line="295"/>
         <source>Send a file</source>
         <translation>Invia un file</translation>
     </message>
     <message>
-        <location filename="../widget/form/chatform.cpp" line="618"/>
-        <location filename="../widget/form/chatform.cpp" line="624"/>
+        <location filename="../widget/form/chatform.cpp" line="620"/>
+        <location filename="../widget/form/chatform.cpp" line="626"/>
         <source>Save chat log</source>
         <translation>Salva il log della chat</translation>
     </message>
@@ -264,53 +264,70 @@
 <context>
     <name>SettingsForm</name>
     <message>
-        <location filename="../widget/form/settingsform.cpp" line="31"/>
+        <location filename="../widget/form/settingsform.cpp" line="33"/>
         <source>User Settings</source>
         <comment>&quot;Headline&quot; of the window</comment>
         <translation>Impostazioni</translation>
     </message>
     <message>
-        <location filename="../widget/form/settingsform.cpp" line="34"/>
+        <location filename="../widget/form/settingsform.cpp" line="36"/>
         <source>Name</source>
         <comment>Username/nick</comment>
         <translation>Nome</translation>
     </message>
     <message>
-        <location filename="../widget/form/settingsform.cpp" line="35"/>
+        <location filename="../widget/form/settingsform.cpp" line="37"/>
         <source>Status</source>
         <comment>Status message</comment>
         <translation>Stato</translation>
     </message>
     <message>
-        <location filename="../widget/form/settingsform.cpp" line="36"/>
+        <location filename="../widget/form/settingsform.cpp" line="38"/>
         <source>(click here to copy)</source>
         <comment>Click on this text to copy TID to clipboard</comment>
         <translation>(clicca qui per copiare)</translation>
     </message>
     <message>
-        <location filename="../widget/form/settingsform.cpp" line="44"/>
+        <location filename="../widget/form/settingsform.cpp" line="46"/>
         <source>Test video</source>
         <comment>Text on a button to test the video/webcam</comment>
         <translation>Prova la webcam</translation>
     </message>
     <message>
-        <location filename="../widget/form/settingsform.cpp" line="45"/>
+        <location filename="../widget/form/settingsform.cpp" line="47"/>
         <source>Enable IPv6 (recommended)</source>
         <comment>Text on a checkbox to enable IPv6</comment>
         <translation>Abilita IPv6 (consigliato)</translation>
     </message>
     <message>
-        <location filename="../widget/form/settingsform.cpp" line="47"/>
+        <location filename="../widget/form/settingsform.cpp" line="49"/>
         <source>Use translations</source>
         <comment>Text on a checkbox to enable translations</comment>
         <translation>Abilita traduzioni</translation>
     </message>
     <message>
-        <location filename="../widget/form/settingsform.cpp" line="49"/>
+        <location filename="../widget/form/settingsform.cpp" line="51"/>
         <source>Make Tox portable</source>
         <comment>Text on a checkbox to make qTox a portable application</comment>
         <translation>Rendi qTox portabile</translation>
     </message>
+    <message>
+        <location filename="../widget/form/settingsform.cpp" line="53"/>
+        <source>Save settings to the working directory instead of the usual conf dir</source>
+        <comment>describes makeToxPortable checkbox</comment>
+        <translation>Slava le impostazioni nella directory di lavoro corrente, invece della directory di default</translation>
+    </message>
+    <message>
+        <location filename="../widget/form/settingsform.cpp" line="55"/>
+        <source>Smiley Pack</source>
+        <comment>Text on smiley pack label</comment>
+        <translation>Emoticons</translation>
+    </message>
+    <message>
+        <location filename="../widget/form/settingsform.cpp" line="133"/>
+        <source>Select smiley pack</source>
+        <translation>Scegli pacchetto emoticons</translation>
+    </message>
 </context>
 <context>
     <name>Widget</name>