catch up with logo change

fix some typos

2 files changed, 10 insertions, 22 deletions

diff --git a/core/applets/aboutapplet/about.cpp b/core/applets/aboutapplet/about.cpp
index e909d0f..bbdc1b1 100644
--- a/core/applets/aboutapplet/about.cpp
+++ b/core/applets/aboutapplet/about.cpp
@@ -1,89 +1,89 @@
 #include "about.h"
 #include "dialog.h"
 
 #include <qpe/resource.h>
 #include <qpe/qcopenvelope_qws.h>
 
 #include <qapplication.h>
 #include <qlabel.h>
 
 AboutApplet::AboutApplet ( )
         : QObject ( 0, "AboutApplet" )
 {}
 
 AboutApplet::~AboutApplet ( )
 {}
 
 int AboutApplet::position ( ) const
 {
     return 1;
 }
 
 QString AboutApplet::name ( ) const
 {
     return tr( "About shortcut" );
 }
 
 QString AboutApplet::text ( ) const
 {
     return tr( "About" );
 }
 
 QString AboutApplet::tr( const char* s ) const
 {
     return qApp->translate( "AboutApplet", s, 0 );
 }
 
 QString AboutApplet::tr( const char* s, const char* p ) const
 {
     return qApp->translate( "AboutApplet", s, p );
 }
 
 QIconSet AboutApplet::icon ( ) const
 {
     QPixmap pix;
-    QImage img = Resource::loadImage ( "about" );
+    QImage img = Resource::loadImage ( "logo/opielogo" );
 
     if ( !img. isNull ( ) )
         pix. convertFromImage ( img. smoothScale ( 14, 14 ) );
     return pix;
 }
 
 QPopupMenu *AboutApplet::popup ( QWidget * ) const
 {
     return 0;
 }
 
 void AboutApplet::activated()
 {
     AboutDialog* d = new AboutDialog( qApp->mainWidget(), "aboutDialog", true );
     if ( qApp->desktop()->width() == 240 )
     {
         d->logo->hide();
         d->setFixedWidth( qApp->desktop()->width() - 5 );
         d->setFixedHeight( qApp->desktop()->height() - 50 );
     }
     d->exec();
 }
 
 QRESULT AboutApplet::queryInterface ( const QUuid &uuid, QUnknownInterface **iface )
 {
     *iface = 0;
     if ( uuid == IID_QUnknown )
         * iface = this;
     else if ( uuid == IID_MenuApplet )
         * iface = this;
     else
         return QS_FALSE;
 
     if ( *iface )
         ( *iface ) -> addRef ( );
     return QS_OK;
 }
 
 Q_EXPORT_INTERFACE( )
 {
     Q_CREATE_INSTANCE( AboutApplet )
 }
 
 
diff --git a/core/applets/aboutapplet/dialog.ui b/core/applets/aboutapplet/dialog.ui
index 6dca1ce..5c3a23b 100644
--- a/core/applets/aboutapplet/dialog.ui
+++ b/core/applets/aboutapplet/dialog.ui
@@ -1,62 +1,62 @@
 <!DOCTYPE UI><UI>
 <class>AboutDialog</class>
 <widget>
     <class>QDialog</class>
     <property stdset="1">
         <name>name</name>
         <cstring>AboutDialog</cstring>
     </property>
     <property stdset="1">
         <name>geometry</name>
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>414</width>
+            <width>410</width>
             <height>201</height>
         </rect>
     </property>
     <property stdset="1">
         <name>caption</name>
         <string>About</string>
     </property>
     <property>
         <name>layoutMargin</name>
     </property>
     <property>
         <name>layoutSpacing</name>
     </property>
     <grid>
         <property stdset="1">
             <name>margin</name>
             <number>2</number>
         </property>
         <property stdset="1">
             <name>spacing</name>
             <number>1</number>
         </property>
         <widget row="0"  column="0"  rowspan="1"  colspan="2" >
             <class>QLabel</class>
             <property stdset="1">
                 <name>name</name>
                 <cstring>TextLabel1</cstring>
             </property>
             <property stdset="1">
                 <name>text</name>
                 <string>&lt;center&gt;&lt;b&gt;The Open Palmtop Integrated Environment V1.1.2&lt;/b&gt;&lt;/center&gt;</string>
             </property>
         </widget>
         <widget row="1"  column="0" >
             <class>QLabel</class>
             <property stdset="1">
                 <name>name</name>
                 <cstring>logo</cstring>
             </property>
             <property stdset="1">
                 <name>palette</name>
                 <palette>
                     <active>
                         <color>
                             <red>0</red>
                             <green>0</green>
                             <blue>0</blue>
                         </color>
@@ -292,194 +292,182 @@
                 <name>pixmap</name>
                 <pixmap>image0</pixmap>
             </property>
             <property stdset="1">
                 <name>scaledContents</name>
                 <bool>false</bool>
             </property>
         </widget>
         <widget row="1"  column="1" >
             <class>QTabWidget</class>
             <property stdset="1">
                 <name>name</name>
                 <cstring>tab</cstring>
             </property>
             <property>
                 <name>layoutMargin</name>
             </property>
             <property>
                 <name>layoutSpacing</name>
             </property>
             <widget>
                 <class>QWidget</class>
                 <property stdset="1">
                     <name>name</name>
                     <cstring>tab</cstring>
                 </property>
                 <attribute>
                     <name>title</name>
                     <string>About</string>
                 </attribute>
                 <vbox>
                     <property stdset="1">
                         <name>margin</name>
                         <number>1</number>
                     </property>
                     <property stdset="1">
                         <name>spacing</name>
                         <number>1</number>
                     </property>
                     <widget>
                         <class>QTextBrowser</class>
                         <property stdset="1">
                             <name>name</name>
                             <cstring>TextBrowser1</cstring>
                         </property>
                         <property stdset="1">
                             <name>text</name>
                             <string>&lt;p&gt;
-The &lt;b&gt;Open Palmtop Desktop Environment&lt;/b&gt; is written and maintained by the Opie Team, a world-wide network of software engineers committed to free software development.
+The &lt;b&gt;Open Palmtop Integrated Environment&lt;/b&gt; is written and maintained by the Opie Team, a world-wide network of software engineers committed to free software development.
 &lt;/p&gt;
 &lt;p&gt;
 No single group, company or organization controls the Opie source code. Everyone is welcome to contribute to Opie.
 &lt;/p&gt;
 &lt;p&gt;
 Visit &lt;a href="http://opie.handhelds.org/"&gt;http://opie.handhelds.org&lt;/a&gt; for more information on the Opie Project.
 &lt;/p&gt;</string>
                         </property>
                         <property stdset="1">
                             <name>textFormat</name>
                             <enum>RichText</enum>
                         </property>
                     </widget>
                 </vbox>
             </widget>
             <widget>
                 <class>QWidget</class>
                 <property stdset="1">
                     <name>name</name>
                     <cstring>tab</cstring>
                 </property>
                 <attribute>
                     <name>title</name>
                     <string>Authors</string>
                 </attribute>
                 <hbox>
                     <property stdset="1">
                         <name>margin</name>
                         <number>1</number>
                     </property>
                     <property stdset="1">
                         <name>spacing</name>
                         <number>1</number>
                     </property>
                     <widget>
                         <class>QTextBrowser</class>
                         <property stdset="1">
                             <name>name</name>
                             <cstring>TextBrowser2</cstring>
                         </property>
                         <property stdset="1">
                             <name>text</name>
                             <string>&lt;p&gt;
 &lt;b&gt;Rajko 'alwin' Albrecht&lt;/b&gt; (alwin@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Holger 'Zecke' Freyther&lt;/b&gt; (zecke@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Chris 'Kergoth' Larson&lt;/b&gt; (kergoth@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Michael 'Mickey' Lauer&lt;/b&gt; (mickeyl@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Lorn 'ljp' Potter&lt;/b&gt; (ljp@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Max 'Harlekin' Reiss&lt;/b&gt; (harlekin@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Dan 'drw' Williams&lt;/b&gt; (drw@handhelds.org)&lt;/tt&gt;&lt;br/&gt;
 &lt;/p&gt;</string>
                         </property>
                     </widget>
                 </hbox>
             </widget>
             <widget>
                 <class>QWidget</class>
                 <property stdset="1">
                     <name>name</name>
                     <cstring>tab</cstring>
                 </property>
                 <attribute>
                     <name>title</name>
                     <string>Report</string>
                 </attribute>
                 <hbox>
                     <property stdset="1">
                         <name>margin</name>
                         <number>1</number>
                     </property>
                     <property stdset="1">
                         <name>spacing</name>
                         <number>1</number>
                     </property>
                     <widget>
                         <class>QTextBrowser</class>
                         <property stdset="1">
                             <name>name</name>
                             <cstring>TextBrowser3</cstring>
                         </property>
                         <property stdset="1">
                             <name>text</name>
-                            <string>&lt;p&gt;
-Software can always be improved, and the KDE Team is ready to do so. However, you - the user - must tell us when something does not work as expected or could be done better.
-&lt;/p&gt;
-&lt;p&gt;
-The Open Palmtop Desktop Environment has a bug tracking system. Visit &lt;a href="http://opie.handhelds.org/"&gt;http://opie.handhelds.org/&lt;/a&gt; to report bugs.
-&lt;/p&gt;
-&lt;p&gt;
-If you have a suggestion for improvement then you are welcome to use the bug tracking system to register your wish. Make sure you use the severity called "Wishlist".
-&lt;/p&gt;</string>
+                            <string>&lt;p&gt;Software can always be improved, and the Opie Team is ready to do so. However, you - the user - must tell us when something does not work as expected or could be done better.&lt;/p&gt;
+&lt;p&gt;The Open Palmtop Integrated Environment has a bug tracking system. Visit &lt;a href="http://opie.handhelds.org/"&gt;http://opie.handhelds.org/&lt;/a&gt; to report bugs.&lt;/p&gt;
+&lt;p&gt;If you have a suggestion for improvement then you are welcome to use the bug tracking system to register your wish. Make sure you use the severity called "Feature Wish".&lt;/p&gt;</string>
                         </property>
                     </widget>
                 </hbox>
             </widget>
             <widget>
                 <class>QWidget</class>
                 <property stdset="1">
                     <name>name</name>
                     <cstring>tab</cstring>
                 </property>
                 <attribute>
                     <name>title</name>
                     <string>Join</string>
                 </attribute>
                 <vbox>
                     <property stdset="1">
                         <name>margin</name>
                         <number>1</number>
                     </property>
                     <property stdset="1">
                         <name>spacing</name>
                         <number>1</number>
                     </property>
                     <widget>
                         <class>QTextBrowser</class>
                         <property stdset="1">
                             <name>name</name>
                             <cstring>TextBrowser4</cstring>
                         </property>
                         <property stdset="1">
                             <name>text</name>
-                            <string>&lt;p&gt;
-You don't have to be a software developer to be a member of the Opie Team. You can join the national teams that translate program interfaces. You can provide graphics, themes, sounds and improved documentation. You decide!
-&lt;/p&gt;
-&lt;p&gt;
-Visit &lt;a href="http://opie.handhelds.org/"&gt;http://opie.handhelds.org/&lt;/a&gt; for information on some projects in which you can participate.
-&lt;/p&gt;
-&lt;p&gt;
-If you need more information or documentation, then a visit to &lt;a href="http://opie.handhelds.org/"&gt;http://opie.handhelds.org/&lt;/a&gt; will provide you with what you need.
-&lt;/p&gt;</string>
+                            <string>&lt;p&gt;You don't have to be a software developer to be a member of the Opie Team. You can join the national teams that translate program interfaces. You can provide graphics, themes, sounds and improved documentation. You decide!&lt;/p&gt;
+&lt;p&gt;Visit &lt;a href="http://opie.handhelds.org/"&gt;http://opie.handhelds.org/&lt;/a&gt; for information on some projects in which you can participate.&lt;/p&gt;
+&lt;p&gt;If you need more information or documentation, then a visit to &lt;a href="http://opie.handhelds.org/"&gt;http://opie.handhelds.org/&lt;/a&gt; will provide you with what you need.&lt;/p&gt;</string>
                         </property>
                     </widget>
                 </vbox>
             </widget>
         </widget>
     </grid>
 </widget>
 <images>
     <image>
         <name>image0</name>