From 31bdfe4f1a4f431092dfa74b23991453da04ecd9 Mon Sep 17 00:00:00 2001
From: nowrep <nowrep@gmail.com>
Date: Wed, 4 Jan 2012 13:44:43 +0100
Subject: [PATCH] Showing right default directories for bookmarks on Windows.
 Closes #116 - also updated Italian translation

---
 README.md                                     |   4 ++++
 bin/locale/it_IT.qm                           | Bin 89064 -> 89955 bytes
 src/bookmarksimport/bookmarksimportdialog.cpp |   4 ++--
 translations/it_IT.ts                         |  20 +++++++++---------
 4 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/README.md b/README.md
index 72b4dc990..5d2c074b6 100644
--- a/README.md
+++ b/README.md
@@ -60,6 +60,10 @@ If you are using Ubuntu, you can download QupZilla from PPA:
     $ sudo apt-get update
     $ sudo apt-get install qupzilla
     
+    for development version:
+    
+    $ sudo apt-get install qupzilla-next
+    
 FAQ and Changelog
 ----------------------------------------------------------------------------------------
 
diff --git a/bin/locale/it_IT.qm b/bin/locale/it_IT.qm
index d3a12878527d3b2614bd65078ddc8f6b99b6d3c4..ccb9dc75c8fa36bdcfd2ad977be24759aaeb1c18 100644
GIT binary patch
delta 2012
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

delta 1377
zcmXApX-t%75XWbpz1a7aeck0+7Fl401-TYPZdeZ6ZKHxs3tN$}TI*s+MX4t>g`^@F
zZ8gEkB2`qdBGro8Py|Xqt5AiCM=RDwv?^&LO#~aIhZfVP@agyEnVIK5^Pd^*RXpxc
zc%^l&)(=iJxQ2q}oL|}0b1xgfx3kvE#{33ri*lLY!P?eDZ7j%dga8_~oUd_OYbUMD
zI6?84s0{_hl@|c3&x7LnWxyZ@RiF<V$%WA@X@L6C&XT*ypJfFsir5a2FTgY%mtawX
z3n0a3n&?+T)vQji+QGiNnV0CM5LqlaWR=NzP+BJdtP)}US^_9M44YH;0?zvzwmsbe
zXy}0*rEUP*8=$&#0ATG#sOw$_xS*K4<V(?;obs(Gr+ac6Gw-7i#X6n-ISbQo0uXvx
z)bWjgN&ix_B3Aln@E?Fv7Pj*P9-ZV(PZX6be1uAs$5ZC+krmf$0QC2iZK~f3kg-Gd
zan?9M8_5pdyahO?MRw@)X#mqw*|F!Z01Ro<L`wwasEk6)1KGnjDgiUjv~5;tkcC{Q
zYPV?S_k!Bpa)q$3<pbpx0q5Q#ceOFayi7i@%>)=WKEt>JGfW$m57cGx+`}_$J~>VF
zh?=4Q2szc!%zq2H)R*xsDiVCDQm|qm^$6!uQu-9_)f#}ag^F`Q{O7xZ6`jinP~|nl
zq!o$_V{rgWwkY~jzX0&Osrdd&K8MIT)GFFo)cZ6k7La{bw04QoajXpBj~eBQNS^3{
zftqL4gj<G`Eq9CnyB90ZhV%H7x0LOTPQcW9<;AOOdA@g)m%N(*V-`@pyNzY$(joT%
ztyU#FItlQdUZps26fpD@4Y}vC&<XO_m<<8%sy2<^2WTBrmA5zm?p);jzl)_*q_G(c
zHL8X}uE3*Db$E<Fd-HA8R}b$4hJQ{y8k^4giE3o&B|!6p>erX6xR6uiCCww7<YYm6
zs8z~PXSnVADHAX-k|w1D7Fa@2v&}4HlJaL)>H-?njSH^<z<u@6wmv}1R{CxBX_h`h
zE^Rck-lcx61?SVGHXv3f*u@Q8!=J+PE58HkCWXQ&IiOH3tiJn<+q7J8Hs%AU{t}%1
z+*pZc>2;l*#SPOTomp7$Nazaf<(f=1taHo{D;4n^mzdTh%9T}sS&Kz^TLD1vGf}8;
zai0~7Vtp^biQS_A5eHz(I&ykgO^NHpf~ir!kXPbL^EUu3Aik%*3h<;%T=n6PfWdXt
z?_oBXs>ILY^8kK`nI<OJh<jwb{q>__-G*wwOc%L(8d<<7MR{Ihfn7A^nZSa6X^Z#r
zMrJIf9Pgc&N5kG`7U85R?_3u7igJ9c^V3T-I@=?Fm^zK_1ZOPg)gi#B+ZqqXH&v?A
z7?uYEJnz!@WoZC?8>z=<jXFY8W@!gZH&T?|$WkLIM<2~HpHhY1f?3q6_u<9*_4e$T
z3dxiZ&zoYEf|u}cy-kV;UI;LiBgJ%cOKF>CXqb=^zTE~;5iX^hLI83`rG?qM0OQ-K
z$k!(*S6cHp8NhWxDzW{{&&j7!$(cMrH(#mDhfmnlM=oExF7=)?_LAGWe7iK>#cxCK
zZJP4+W7$%b!O&qa;39p86o*@b(7b<z1^xFQ%fqpb3;DQD)-hOsN3i2YA=+_&g99)B
E2k#%Jr~m)}

diff --git a/src/bookmarksimport/bookmarksimportdialog.cpp b/src/bookmarksimport/bookmarksimportdialog.cpp
index e5f9da41c..bfada8f7f 100644
--- a/src/bookmarksimport/bookmarksimportdialog.cpp
+++ b/src/bookmarksimport/bookmarksimportdialog.cpp
@@ -299,7 +299,7 @@ void BookmarksImportDialog::setupBrowser(Browser browser)
         m_browserFileText2 = tr("Please choose this file to begin importing bookmarks.");
         m_standardDir =
 #ifdef Q_WS_WIN
-            "%APPDATA%/Opera/";
+            "%APPDATA%/Chrome/Default/";
 #else
             "/home/user/.config/chrome/Default/";
 #endif
@@ -315,7 +315,7 @@ void BookmarksImportDialog::setupBrowser(Browser browser)
         m_browserFileText2 = tr("Please choose this file to begin importing bookmarks.");
         m_standardDir =
 #ifdef Q_WS_WIN
-            "%APPDATA%/Chrome/Default/";
+            "%APPDATA%/Opera/";
 #else
             "/home/user/.opera/";
 #endif
diff --git a/translations/it_IT.ts b/translations/it_IT.ts
index 5d344b502..62a541655 100644
--- a/translations/it_IT.ts
+++ b/translations/it_IT.ts
@@ -3918,7 +3918,7 @@ Dopo l&apos;aggiunta o la rimozione dei percorsi di certificazione, è necessari
     <message>
         <location filename="../src/webview/siteinfowidget.cpp" line="70"/>
         <source>This is your &lt;b&gt;%1&lt;/b&gt; visit of this site.</source>
-        <translation type="unfinished"></translation>
+        <translation>Questa è la tua &lt;b&gt;%1&lt;/b&gt; visita a questo sito.</translation>
     </message>
 </context>
 <context>
@@ -4427,7 +4427,7 @@ Dopo l&apos;aggiunta o la rimozione dei percorsi di certificazione, è necessari
     <message>
         <location filename="../src/webview/webview.cpp" line="486"/>
         <source>&amp;Save image as...</source>
-        <translation>&amp;Salva immagine come...</translation>
+        <translation>Sa&amp;lva immagine come...</translation>
     </message>
     <message>
         <location filename="../src/webview/webview.cpp" line="487"/>
@@ -4458,42 +4458,42 @@ Dopo l&apos;aggiunta o la rimozione dei percorsi di certificazione, è necessari
     <message>
         <location filename="../src/webview/webview.cpp" line="520"/>
         <source>This frame</source>
-        <translation type="unfinished"></translation>
+        <translation>Questa cornice</translation>
     </message>
     <message>
         <location filename="../src/webview/webview.cpp" line="521"/>
         <source>Show &amp;only this frame</source>
-        <translation type="unfinished"></translation>
+        <translation>Mostra s&amp;olo questa cornice</translation>
     </message>
     <message>
         <location filename="../src/webview/webview.cpp" line="522"/>
         <source>Show this frame in new &amp;tab</source>
-        <translation type="unfinished"></translation>
+        <translation>Mostra questa cornice in una nuova &amp;scheda</translation>
     </message>
     <message>
         <location filename="../src/webview/webview.cpp" line="525"/>
         <source>Print frame</source>
-        <translation type="unfinished"></translation>
+        <translation>Stampa cornice</translation>
     </message>
     <message>
         <location filename="../src/webview/webview.cpp" line="527"/>
         <source>Zoom &amp;in</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Ingrandisci</translation>
     </message>
     <message>
         <location filename="../src/webview/webview.cpp" line="528"/>
         <source>&amp;Zoom out</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Riduci</translation>
     </message>
     <message>
         <location filename="../src/webview/webview.cpp" line="529"/>
         <source>Reset</source>
-        <translation type="unfinished">Ripristina</translation>
+        <translation>Ripristina</translation>
     </message>
     <message>
         <location filename="../src/webview/webview.cpp" line="531"/>
         <source>Show so&amp;urce of frame</source>
-        <translation type="unfinished"></translation>
+        <translation>Mostra sor&amp;gente della cornice</translation>
     </message>
     <message>
         <location filename="../src/webview/webview.cpp" line="537"/>