From 103b35169f36a80b4e3f7537a145b6d54f6280a3 Mon Sep 17 00:00:00 2001
From: tarek_saidi <tarek_saidi@b624d157-de02-0410-bad0-e51aec6abb33>
Date: Fri, 23 Jun 2006 22:03:39 +0000
Subject: [PATCH] 0.2.2 RC

git-svn-id: https://svn.code.sf.net/p/keepassx/code/trunk@100 b624d157-de02-0410-bad0-e51aec6abb33
---
 share/keepass/icons/settings.png | Bin 2373 -> 880 bytes
 src/dialogs/AboutDlg.cpp         |   9 ++++++---
 src/forms/AboutDlg.ui            |  18 +++++++++---------
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/share/keepass/icons/settings.png b/share/keepass/icons/settings.png
index 430a62341c613b35c9dddc9bfa359615b2e60b39..7c4529fff22ae89417a248965ab398098b188ada 100755
GIT binary patch
delta 868
zcmV-q1DpKC67U9)8Gi%-007x@vVQ;o00Lr5M??VshmXv^00009a7bBm000XU000XU
z0RWnu7ytkO2XskIMF-Xf7ZolS*aRYE00094Nkl<ZNXO09U1-&H7zgmr**SZ4b1y85
zOs8wI)+#HSxSABZiNXt;5MD%Y5L9Ro7z9D|Vo3y&AtdV}Eq{o#H<O?XZ=|yDCNOuA
zA#G?h&vqtzb1&zd|M_*X?YLuWGa~5u-~IpJ-}nD~pXd2~pP1lZMG^loL2MqRUgZMc
z7nQI=r;MXAsP=|hUpgXNfC-B|dqWg{4;>*Egw8M-Lf9XQ3lNFL1&j!;x7V|(Jgp2V
znF7QT1Sh1$t$*^Ga}v(FQA$Eq%rX;lOA`zk^o2=xy4{#>4C>M+X_HoOI&)<aV~Rwe
zL$d)RcKAt`202+dk#Qe+%uR~$wwF!K^{C17%5AV;4az*|1$!LOr%U6!jLJOXpd2O*
ziC>mb<1GnyxLHiGTGcWl8PnFy<}?>2ZuOlOJALKSjDLhGYt-AUMTt{V+U;_|7F+#c
zxqC#Syo9XClw-#1p6y10CI|fJ0cEDG@wEzr&gs_Yerp#fY>5e#a+gQB$98GUXJ3?h
zPcNn<l^9)sAQIDQi`qGY2qSr=6JE6yE3{eZ)B*%&th3hp-qAQiaGfXB`p~4{q@=?}
zHG0No#eb5LR~!$1&?X~iqcBs%xYfozq1=G`eD1KAZ5|dEmv-EC)%hZ(ee5>pCDiG&
z+n5BAUPXd2pQ%wb`<D%h^c%6!yVh${Yg~^L?)I~NCX^~NHh&W9<y=%LEi0#3vmwKR
z4m%9!bxDZ^t;&6%d*1lw-6G{8#@*s|%e31iYk$&|l&ovCtCLYKNNXyvmA_o33OkK!
zu?A(L*_r%Jw?S>5Q||^f#`5^MSIo1lR&`P~sdrL~7o|j2iaVr7<bnwmj`-E|!j9A#
zPKSM=KP1EXa5n4---qT<9#)6DLgg%?JX{-M1&&m3olD*8A={*-P5ag{pDgM61+JVG
z8C}gE8TOJ##r_FFgQrwFBodsKbky{c85Bq;(P-4;ij7$BxPw=*SPI&h_KRY1(>_(J
uW~rs|cZ+3}tbR3yuWGf${{PE$srVE4+&%g1%6rlP0000<MNUMnLSTY&m6{R&

literal 2373
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

diff --git a/src/dialogs/AboutDlg.cpp b/src/dialogs/AboutDlg.cpp
index 666d551..1b1441e 100755
--- a/src/dialogs/AboutDlg.cpp
+++ b/src/dialogs/AboutDlg.cpp
@@ -44,7 +44,7 @@ if(TrActive){
 }
 Edit_Translation->setHtml(AboutTr+tr("\
 Information on how to translate KeePassX can be found under:\n\
-http://keepass.berlios.de/"));
+http://keepassx.sourceforge.net/"));
 QString str;
 str+="<b>"+tr("Team")+"</b><br>";
 str+="<div style='margin-left:10px;'>";
@@ -55,6 +55,9 @@ str+="</div><br><div style='margin-left:0px;'>";
 str+="<b>"+tr("Thanks To")+"</b>";
 str+="</div><div style='margin-left:10px;'>";
 str+="<u>"+tr("Matthias Miller")+"</u><br>"+tr("Patches for better MacOS X support")+"<br>"+tr("www.outofhanwell.com")+"<br></div>";
+str+="<br>";
+str+="</div><div style='margin-left:10px;'>";
+str+="<u>"+tr("James Nicholls")+"</u><br>"+tr("Main Application Icon")/*+"<br>"+tr("mailto:???")*/+"<br></div>";
 Edit_Thanks->setHtml(str);
 }
 
@@ -93,10 +96,10 @@ delete buffer;
 }
 
 void CAboutDialog::OnHomepageClicked(){
-openBrowser(tr("http://keepass.berlios.de/index.php"));
+openBrowser(tr("http://keepassx.sf.net"));
 }
 
 void CAboutDialog::OnEMailClicked(){
-openBrowser("mailto:tarek.saidi@arcor.de");
+openBrowser("mailto:keepassx@gmail.com");
 }
 
diff --git a/src/forms/AboutDlg.ui b/src/forms/AboutDlg.ui
index 5c0503a..8e54db6 100644
--- a/src/forms/AboutDlg.ui
+++ b/src/forms/AboutDlg.ui
@@ -92,33 +92,33 @@ KeePassX is distributed under the terms of the
 General Public License (GPL) version 2.</string>
      </property>
     </widget>
-    <widget class="LinkLabel" name="label_3" >
+    <widget class="LinkLabel" name="label_2" >
      <property name="geometry" >
       <rect>
        <x>30</x>
-       <y>80</y>
+       <y>50</y>
        <width>351</width>
        <height>17</height>
       </rect>
      </property>
      <property name="text" >
-      <string>tarek.saidi@arcor.de</string>
+      <string>http://keepassx.sourceforge.net</string>
+     </property>
+     <property name="buddy" >
+      <cstring></cstring>
      </property>
     </widget>
-    <widget class="LinkLabel" name="label_2" >
+    <widget class="LinkLabel" name="label_3" >
      <property name="geometry" >
       <rect>
        <x>30</x>
-       <y>50</y>
+       <y>80</y>
        <width>351</width>
        <height>17</height>
       </rect>
      </property>
      <property name="text" >
-      <string>http://keepass.berlios.de/</string>
-     </property>
-     <property name="buddy" >
-      <cstring></cstring>
+      <string>keepassx@gmail.com</string>
      </property>
     </widget>
    </widget>