Import CVS snapshot Release-1_2_1

2003-08-26 13:15:15 +00:00
28 changed files with 375 additions and 271 deletions
@@ -3,6 +3,21 @@ Pre-release checklist:
 __ KMESSDEBUG removed
 __ Optimization level set

+
+
+--- 1.2.1 released ---
+
+2003-05-13
+  * Readied for 1.2.1.
+  * Fixed tab order in settings widgets.
+  * Made the message edit have focus when a chat starts.
+
+2003-05-?
+  * Added "include"s to help some peoples' compilation
+  * Put in checks for Qt 3.0
+
+--- 1.2 released ---
+
 2003-05-04
  * Fixed a problem with URL parsing.

@@ -1877,7 +1877,7 @@ fi

 # Define the identity of the package.
 PACKAGE=kmess
-VERSION=1.1
+VERSION=1.2.1

 cat >>confdefs.h <<_ACEOF
@%:@define PACKAGE "$PACKAGE"
@@ -66,7 +66,7 @@ m4trace:configure.in:34: -1- AC_SUBST([target], [$ac_cv_target])
 m4trace:configure.in:34: -1- AC_SUBST([target_cpu], [`echo $ac_cv_target | sed 's/^\([[^-]]*\)-\([[^-]]*\)-\(.*\)$/\1/'`])
 m4trace:configure.in:34: -1- AC_SUBST([target_vendor], [`echo $ac_cv_target | sed 's/^\([[^-]]*\)-\([[^-]]*\)-\(.*\)$/\2/'`])
 m4trace:configure.in:34: -1- AC_SUBST([target_os], [`echo $ac_cv_target | sed 's/^\([[^-]]*\)-\([[^-]]*\)-\(.*\)$/\3/'`])
-m4trace:configure.in:39: -1- AM_INIT_AUTOMAKE([kmess], [1.1])
+m4trace:configure.in:39: -1- AM_INIT_AUTOMAKE([kmess], [1.2.1])
 m4trace:configure.in:39: -1- AC_PROG_INSTALL
 m4trace:configure.in:39: -1- AC_PROG_INSTALL
 m4trace:configure.in:39: -1- AC_SUBST([INSTALL_PROGRAM])
@@ -1,6 +1,6 @@
 #MIN_CONFIG(3)

-AM_INIT_AUTOMAKE(kmess,1.1)
+AM_INIT_AUTOMAKE(kmess,1.2.1)

 dnl CXXFLAGS="$NOOPT_CXXFLAGS" dnl __kdevelop[noopt]__
 dnl CFLAGS="$NOOPT_CFLAGS" dnl __kdevelop[noopt]__
@@ -23,7 +23,7 @@ cflags=
 cppflags=
 cxxflags=\s-O3 -Wall
 ldadd=-lkio -lmimelib $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT)
-ldflags=\s       \s
+ldflags=\s        \s

 [FEATURES]
 dist=true
@@ -47,7 +47,7 @@ project_type=mini_kde2
 sgml_file=/home/mike/Project/TDD/kmess/doc/en/index.docbook
 short_info=
 sub_dir=kmess/
-version=1.1
+version=1.2.1
 version_control=None
 workspace=1

@@ -949,6 +949,7 @@ void ChatWindow::receivedMessage(QString handle, QString name, QString text, QFo
    firstMessage_ = false;
    // Show the window minimized
    showMinimized();
+    chatView_->messageEdit_->setFocus( );
    checkSidebarPreferences();
    // Check if we should autoreply
    if ( ( currentAccount_ != 0 ) && ( msnSwitchboardConnection_ != 0 ) )
@@ -1245,6 +1246,7 @@ void ChatWindow::startChat( ChatInformation *chatInfo )
    if ( isMinimized() ) hide();
    show();
    raise();
+    chatView_->messageEdit_->setFocus( );
    checkSidebarPreferences();
    firstMessage_ = false;
  }
@@ -17,6 +17,7 @@

 #include "contactsidebar.h"

+#include <qglobal.h>
 #include <qlayout.h>
 #include <qscrollview.h>
 #include <qvbox.h>
@@ -114,12 +115,15 @@ void ContactSidebar::contactLeft(QString handle)
    // deactivate (grey out) the contact frame
    contactFrame->deactivate();

+    // the following code only works correctly on Qt > 3.1.0
+    #if (QT_VERSION >= 0x030100)
    // frame is deactivated, so remove it from the layout
    viewBox_->remove( contactFrame );
    // and add it to the end of the layout
    viewBox_->insertWidget( -1, contactFrame );
    // ... this means that contacts in the chat move to the top,
    //  while others go to the bottom.
+    #endif
  }
 }

@@ -3,9 +3,9 @@ Encoding=UTF-8
 Name=KMess
 Exec=kmess %i %m -caption "%c"
 Icon=kmess
-Type=Application
+Type=Internet
 DocPath=kmess/index.html
-Comment=MSN Messenger Clone für KDE 3
+Comment=MSN Messenger Clone for KDE 3
 Comment[de]=MSN Messenger Clone für KDE 3
 Terminal=0

@@ -41,9 +41,10 @@ int main(int argc, char *argv[])
  KAboutData aboutData( "kmess", I18N_NOOP("KMess"),
    VERSION, description, KAboutData::License_GPL,
    "(c) 2002, Mike K. Bennett\n\nkmess.sourceforge.net", 0, 0, "mkb137b@hotmail.com");
-  aboutData.addAuthor("Mike K. Bennett",0, "mkb137b@hotmail.com");
-  aboutData.addAuthor("Michael Curtis",0, "mdcurtis@users.sourceforge.net");
-  aboutData.addCredit("Jan TÃ¶njes",I18N_NOOP("German translation, testing, documentation, and web page"),"jan.toenjes@web.de");
+  aboutData.addAuthor("Mike K. Bennett", 0, "mkb137b@hotmail.com");
+  aboutData.addAuthor("Michael Curtis", 0, "mdcurtis@users.sourceforge.net");
+  aboutData.addAuthor("Jan TÃ¶njes", 0,"jan.toenjes@web.de");
+  aboutData.addCredit("Jan TÃ¶njes",I18N_NOOP("German translation, testing, documentation, web master, project management, etc"),"jan.toenjes@web.de");
  aboutData.addCredit("Dane Harnett", I18N_NOOP("Web design"), "dynamitedane@hotmail.com");
  aboutData.addCredit("Johanna Gersch",I18N_NOOP("Spanish translation"));
  aboutData.addCredit("Gorkem Cetin",I18N_NOOP("Turkish translation"),"gorkem@gelecek.com.tr");
@@ -18,6 +18,8 @@
 #ifndef MIMEMESSAGE_H
 #define MIMEMESSAGE_H

+#include <ctype.h>
+
 #include <qobject.h>
 #include <qstringlist.h>

@@ -139,6 +139,9 @@ bool MsnConnection::connectToServer(const QString& server, const int& port)
  kdDebug() << "Connection: Starting connection to server...." << endl;
 #endif

+  // Apparently async lookups don't work correctly under Qt3
+  socket_->lookup();
+
  return socket_->startAsyncConnect() == 0;
 }

@@ -1,8 +1,8 @@
 /****************************************************************************
 ** Form implementation generated from reading ui file 'accountswidget.ui'
 **
-** Created: Sat Apr 19 19:03:45 2003
-**      by: The User Interface Compiler ($Id: accountswidget.cpp,v 1.2 2003/04/20 01:31:43 mkb137 Exp $)
+** Created: Tue May 13 19:10:09 2003
+**      by: The User Interface Compiler ($Id: accountswidget.cpp,v 1.4 2003/05/14 01:46:19 mkb137 Exp $)
 **
 ** WARNING! All changes made in this file will be lost!
 ****************************************************************************/
@@ -10,9 +10,9 @@
 #include "accountswidget.h"

 #include <qvariant.h>
+#include <qlabel.h>
 #include <kpassdlg.h>
 #include <qcheckbox.h>
-#include <qlabel.h>
 #include <qlineedit.h>
 #include <qlayout.h>
 #include <qtooltip.h>
@@ -66,6 +66,13 @@ AccountsWidget::AccountsWidget( QWidget* parent, const char* name, WFlags fl )
    layout3->addWidget( autologinCheckBox_, 6, 0 );
    languageChange();
    resize( QSize(600, 480).expandedTo(minimumSizeHint()) );
+    clearWState( WState_Polished );
+
+    // tab order
+    setTabOrder( friendlyNameEdit_, handleEdit_ );
+    setTabOrder( handleEdit_, passwordEdit_ );
+    setTabOrder( passwordEdit_, autologinCheckBox_ );
+    setTabOrder( autologinCheckBox_, startInvisibleCheckBox_ );
 }

 /*
@@ -82,7 +89,7 @@ AccountsWidget::~AccountsWidget()
 */
 void AccountsWidget::languageChange()
 {
-    setCaption( i18n( "Accounts" ) );
+    setCaption( "Accounts" );
    friendlyNameLabel_->setText( i18n( "Your friendly name:" ) );
    handleLabel_->setText( i18n( "Your email address:" ) );
    startInvisibleCheckBox_->setText( i18n( "Start in \"Invisible\" mode." ) );
@@ -1,8 +1,8 @@
 /****************************************************************************
 ** Form interface generated from reading ui file 'accountswidget.ui'
 **
-** Created: Sat Apr 19 19:03:45 2003
-**      by: The User Interface Compiler ($Id: accountswidget.h,v 1.2 2003/04/20 01:31:43 mkb137 Exp $)
+** Created: Tue May 13 19:10:09 2003
+**      by: The User Interface Compiler ($Id: accountswidget.h,v 1.3 2003/05/14 01:15:43 mkb137 Exp $)
 **
 ** WARNING! All changes made in this file will be lost!
 ****************************************************************************/
@@ -12,12 +12,13 @@

 #include <qvariant.h>
 #include <qwidget.h>
+
 class QVBoxLayout;
 class QHBoxLayout;
 class QGridLayout;
+class QLabel;
 class KPasswordEdit;
 class QCheckBox;
-class QLabel;
 class QLineEdit;

 class AccountsWidget : public QWidget
@@ -42,6 +43,7 @@ protected:

 protected slots:
    virtual void languageChange();
+
 };

 #endif // ACCOUNTSWIDGET_H
@@ -106,6 +106,13 @@
        </grid>
    </widget>
 </widget>
+<tabstops>
+    <tabstop>friendlyNameEdit_</tabstop>
+    <tabstop>handleEdit_</tabstop>
+    <tabstop>passwordEdit_</tabstop>
+    <tabstop>autologinCheckBox_</tabstop>
+    <tabstop>startInvisibleCheckBox_</tabstop>
+</tabstops>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
    <includehint>kpassdlg.h</includehint>
@@ -1,8 +1,8 @@
 /****************************************************************************
 ** Form implementation generated from reading ui file 'alertswidget.ui'
 **
-** Created: Fri Feb 7 17:58:43 2003
-**      by: The User Interface Compiler ($Id: alertswidget.cpp,v 1.2 2003/02/08 00:23:44 mkb137 Exp $)
+** Created: Tue May 13 19:10:14 2003
+**      by: The User Interface Compiler ($Id: alertswidget.cpp,v 1.4 2003/05/14 01:46:19 mkb137 Exp $)
 **
 ** WARNING! All changes made in this file will be lost!
 ****************************************************************************/
@@ -10,10 +10,10 @@
 #include "alertswidget.h"

 #include <qvariant.h>
-#include <qcheckbox.h>
-#include <qlabel.h>
 #include <qpushbutton.h>
+#include <qlabel.h>
 #include <qspinbox.h>
+#include <qcheckbox.h>
 #include <qlayout.h>
 #include <qtooltip.h>
 #include <qwhatsthis.h>
@@ -78,6 +78,13 @@ AlertsWidget::AlertsWidget( QWidget* parent, const char* name, WFlags fl )
    layout17->addWidget( showOfflineNotificationsCheckBox_, 6, 0 );
    languageChange();
    resize( QSize(600, 480).expandedTo(minimumSizeHint()) );
+    clearWState( WState_Polished );
+
+    // tab order
+    setTabOrder( useIdleTimerCheckBox_, idleTimeSpinBox_ );
+    setTabOrder( idleTimeSpinBox_, useNotifierCheckBox_ );
+    setTabOrder( useNotifierCheckBox_, notificationDurationSpinBox_ );
+    setTabOrder( notificationDurationSpinBox_, showOfflineNotificationsCheckBox_ );
 }

 /*
@@ -94,7 +101,7 @@ AlertsWidget::~AlertsWidget()
 */
 void AlertsWidget::languageChange()
 {
-    setCaption( QString::null  );
+    setCaption( "Alerts" );
    textLabel5->setText( i18n( "Hide popups after" ) );
    textLabel6->setText( i18n( "seconds" ) );
    textLabel3->setText( i18n( "Become idle after" ) );
@@ -1,8 +1,8 @@
 /****************************************************************************
 ** Form interface generated from reading ui file 'alertswidget.ui'
 **
-** Created: Fri Feb 7 17:58:43 2003
-**      by: The User Interface Compiler ($Id: alertswidget.h,v 1.2 2003/02/08 00:23:44 mkb137 Exp $)
+** Created: Tue May 13 19:10:13 2003
+**      by: The User Interface Compiler ($Id: alertswidget.h,v 1.3 2003/05/14 01:15:43 mkb137 Exp $)
 **
 ** WARNING! All changes made in this file will be lost!
 ****************************************************************************/
@@ -12,12 +12,13 @@

 #include <qvariant.h>
 #include <qwidget.h>
+
 class QVBoxLayout;
 class QHBoxLayout;
 class QGridLayout;
-class QCheckBox;
 class QLabel;
 class QSpinBox;
+class QCheckBox;

 class AlertsWidget : public QWidget
 {
@@ -44,6 +45,7 @@ protected:

 protected slots:
    virtual void languageChange();
+
 };

 #endif // ALERTSWIDGET_H
@@ -195,5 +195,12 @@
        </grid>
    </widget>
 </widget>
+<tabstops>
+    <tabstop>useIdleTimerCheckBox_</tabstop>
+    <tabstop>idleTimeSpinBox_</tabstop>
+    <tabstop>useNotifierCheckBox_</tabstop>
+    <tabstop>notificationDurationSpinBox_</tabstop>
+    <tabstop>showOfflineNotificationsCheckBox_</tabstop>
+</tabstops>
 <layoutdefaults spacing="6" margin="11"/>
 </UI>
@@ -1,8 +1,8 @@
 /****************************************************************************
 ** Form implementation generated from reading ui file 'chatloggingwidget.ui'
 **
-** Created: Tue Dec 24 12:59:53 2002
-**      by: The User Interface Compiler ($Id: chatloggingwidget.cpp,v 1.2 2003/02/06 03:11:09 mdcurtis Exp $)
+** Created: Tue May 13 19:10:17 2003
+**      by: The User Interface Compiler ($Id: chatloggingwidget.cpp,v 1.4 2003/05/14 01:46:19 mkb137 Exp $)
 **
 ** WARNING! All changes made in this file will be lost!
 ****************************************************************************/
@@ -10,20 +10,20 @@
 #include "chatloggingwidget.h"

 #include <qvariant.h>
-#include <qvbuttongroup.h>
+#include <qpushbutton.h>
+#include <qbuttongroup.h>
+#include <qradiobutton.h>
 #include <qcheckbox.h>
 #include <qlabel.h>
-#include <qlineedit.h>
-#include <qpushbutton.h>
-#include <qradiobutton.h>
 #include <qtoolbutton.h>
+#include <qlineedit.h>
 #include <qlayout.h>
 #include <qtooltip.h>
 #include <qwhatsthis.h>
 #include <klocale.h>

-/*
- *  Constructs a ChatLoggingWidget as a child of 'parent', with the
+/* 
+ *  Constructs a ChatLoggingWidget as a child of 'parent', with the 
 *  name 'name' and widget flags set to 'f'.
 */
 ChatLoggingWidget::ChatLoggingWidget( QWidget* parent, const char* name, WFlags fl )
@@ -36,18 +36,31 @@ ChatLoggingWidget::ChatLoggingWidget( QWidget* parent, const char* name, WFlags
    QSpacerItem* spacer = new QSpacerItem( 0, 63, QSizePolicy::Minimum, QSizePolicy::Expanding );
    Layout4->addItem( spacer, 3, 1 );

-    organizeButtonGroup_ = new QVButtonGroup( this, "organizeButtonGroup_" );
+    organizeButtonGroup_ = new QButtonGroup( this, "organizeButtonGroup_" );
+    organizeButtonGroup_->setMargin( 6 );
    organizeButtonGroup_->setExclusive( TRUE );

-    dayRadioButton_ = new QRadioButton( organizeButtonGroup_, "dayRadioButton_" );
+    QWidget* this_2 = new QWidget( organizeButtonGroup_, "Layout3" );
+    this_2->setGeometry( QRect( 20, 32, 263, 108 ) );
+    Layout3 = new QGridLayout( this_2, 1, 1, 0, 6, "Layout3");

-    monthRadioButton_ = new QRadioButton( organizeButtonGroup_, "monthRadioButton_" );
+    monthRadioButton_ = new QRadioButton( this_2, "monthRadioButton_" );

-    yearRadioButton_ = new QRadioButton( organizeButtonGroup_, "yearRadioButton_" );
+    Layout3->addWidget( monthRadioButton_, 1, 0 );

-    singleDirectoryRadioButton_ = new QRadioButton( organizeButtonGroup_, "singleDirectoryRadioButton_" );
+    yearRadioButton_ = new QRadioButton( this_2, "yearRadioButton_" );
+
+    Layout3->addWidget( yearRadioButton_, 0, 0 );
+
+    singleDirectoryRadioButton_ = new QRadioButton( this_2, "singleDirectoryRadioButton_" );
    singleDirectoryRadioButton_->setChecked( TRUE );

+    Layout3->addWidget( singleDirectoryRadioButton_, 3, 0 );
+
+    dayRadioButton_ = new QRadioButton( this_2, "dayRadioButton_" );
+
+    Layout3->addWidget( dayRadioButton_, 2, 0 );
+
    Layout4->addMultiCellWidget( organizeButtonGroup_, 2, 2, 0, 1 );

    logChatsCheckBox_ = new QCheckBox( this, "logChatsCheckBox_" );
@@ -74,6 +87,14 @@ ChatLoggingWidget::ChatLoggingWidget( QWidget* parent, const char* name, WFlags
    Layout4->addLayout( layout18, 1, 1 );
    languageChange();
    resize( QSize(600, 480).expandedTo(minimumSizeHint()) );
+    clearWState( WState_Polished );
+
+    // tab order
+    setTabOrder( logChatsCheckBox_, chatSavePathEdit_ );
+    setTabOrder( chatSavePathEdit_, yearRadioButton_ );
+    setTabOrder( yearRadioButton_, monthRadioButton_ );
+    setTabOrder( monthRadioButton_, dayRadioButton_ );
+    setTabOrder( dayRadioButton_, singleDirectoryRadioButton_ );
 }

 /*
@@ -90,7 +111,7 @@ ChatLoggingWidget::~ChatLoggingWidget()
 */
 void ChatLoggingWidget::languageChange()
 {
-    setCaption( i18n( "Chat Logging" ) );
+    setCaption( "Chat Logging" );
    organizeButtonGroup_->setTitle( i18n( "Organize chat folders by:" ) );
    monthRadioButton_->setText( i18n( "Month" ) );
    yearRadioButton_->setText( i18n( "Year" ) );
@@ -1,8 +1,8 @@
 /****************************************************************************
 ** Form interface generated from reading ui file 'chatloggingwidget.ui'
 **
-** Created: Tue Dec 24 12:59:53 2002
-**      by: The User Interface Compiler ($Id: chatloggingwidget.h,v 1.2 2003/02/06 03:11:10 mdcurtis Exp $)
+** Created: Tue May 13 19:10:17 2003
+**      by: The User Interface Compiler ($Id: chatloggingwidget.h,v 1.3 2003/05/14 01:15:43 mkb137 Exp $)
 **
 ** WARNING! All changes made in this file will be lost!
 ****************************************************************************/
@@ -16,12 +16,12 @@
 class QVBoxLayout;
 class QHBoxLayout;
 class QGridLayout;
-class QVButtonGroup;
+class QButtonGroup;
+class QRadioButton;
 class QCheckBox;
 class QLabel;
-class QLineEdit;
-class QRadioButton;
 class QToolButton;
+class QLineEdit;

 class ChatLoggingWidget : public QWidget
 {
@@ -31,7 +31,7 @@ public:
    ChatLoggingWidget( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
    ~ChatLoggingWidget();

-    QVButtonGroup* organizeButtonGroup_;
+    QButtonGroup* organizeButtonGroup_;
    QRadioButton* monthRadioButton_;
    QRadioButton* yearRadioButton_;
    QRadioButton* singleDirectoryRadioButton_;
@@ -43,10 +43,12 @@ public:

 protected:
    QGridLayout* Layout4;
+    QGridLayout* Layout3;
    QGridLayout* layout18;

 protected slots:
    virtual void languageChange();
+
 };

 #endif // CHATLOGGINGWIDGET_H
@@ -1,4 +1,4 @@
-<!DOCTYPE UI><UI version="3.0" stdsetdef="1">
+<!DOCTYPE UI><UI version="3.1" stdsetdef="1">
 <class>ChatLoggingWidget</class>
 <widget class="QWidget">
    <property name="name">
@@ -198,5 +198,13 @@
        </grid>
    </widget>
 </widget>
+<tabstops>
+    <tabstop>logChatsCheckBox_</tabstop>
+    <tabstop>chatSavePathEdit_</tabstop>
+    <tabstop>yearRadioButton_</tabstop>
+    <tabstop>monthRadioButton_</tabstop>
+    <tabstop>dayRadioButton_</tabstop>
+    <tabstop>singleDirectoryRadioButton_</tabstop>
+</tabstops>
 <layoutdefaults spacing="6" margin="11"/>
 </UI>
@@ -1,8 +1,8 @@
 /****************************************************************************
 ** Form implementation generated from reading ui file 'chattingwidget.ui'
 **
-** Created: Tue Apr 22 21:37:17 2003
-**      by: The User Interface Compiler ($Id: chattingwidget.cpp,v 1.4 2003/04/23 03:49:49 mkb137 Exp $)
+** Created: Tue May 13 19:10:21 2003
+**      by: The User Interface Compiler ($Id: chattingwidget.cpp,v 1.6 2003/05/14 01:46:19 mkb137 Exp $)
 **
 ** WARNING! All changes made in this file will be lost!
 ****************************************************************************/
@@ -105,6 +105,16 @@ ChattingWidget::ChattingWidget( QWidget* parent, const char* name, WFlags fl )
    languageChange();
    resize( QSize(551, 480).expandedTo(minimumSizeHint()) );
    clearWState( WState_Polished );
+
+    // tab order
+    setTabOrder( fontButton_, fontColorCombo_ );
+    setTabOrder( fontColorCombo_, useContactFontCheckBox_ );
+    setTabOrder( useContactFontCheckBox_, contactFontButton_ );
+    setTabOrder( contactFontButton_, contactFontColorCombo_ );
+    setTabOrder( contactFontColorCombo_, useEmoticonsCheckBox_ );
+    setTabOrder( useEmoticonsCheckBox_, useFontEffectsCheckBox_ );
+    setTabOrder( useFontEffectsCheckBox_, showTimestampsCheckBox_ );
+    setTabOrder( showTimestampsCheckBox_, useCompactChatCheckBox_ );
 }

 /*
@@ -1,8 +1,8 @@
 /****************************************************************************
 ** Form interface generated from reading ui file 'chattingwidget.ui'
 **
-** Created: Tue Apr 22 21:37:17 2003
-**      by: The User Interface Compiler ($Id: chattingwidget.h,v 1.3 2003/04/23 03:49:49 mkb137 Exp $)
+** Created: Tue May 13 19:10:21 2003
+**      by: The User Interface Compiler ($Id: chattingwidget.h,v 1.4 2003/05/14 01:15:43 mkb137 Exp $)
 **
 ** WARNING! All changes made in this file will be lost!
 ****************************************************************************/
@@ -276,6 +276,17 @@
        </grid>
    </widget>
 </widget>
+<tabstops>
+    <tabstop>fontButton_</tabstop>
+    <tabstop>fontColorCombo_</tabstop>
+    <tabstop>useContactFontCheckBox_</tabstop>
+    <tabstop>contactFontButton_</tabstop>
+    <tabstop>contactFontColorCombo_</tabstop>
+    <tabstop>useEmoticonsCheckBox_</tabstop>
+    <tabstop>useFontEffectsCheckBox_</tabstop>
+    <tabstop>showTimestampsCheckBox_</tabstop>
+    <tabstop>useCompactChatCheckBox_</tabstop>
+</tabstops>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
    <includehint>kcolorcombo.h</includehint>
@@ -1,8 +1,8 @@
 /****************************************************************************
 ** Form implementation generated from reading ui file 'emailwidget.ui'
 **
-** Created: Mon Dec 23 18:05:41 2002
-**      by: The User Interface Compiler ($Id: emailwidget.cpp,v 1.5 2003/05/04 04:37:03 mkb137 Exp $)
+** Created: Tue May 13 19:10:23 2003
+**      by: The User Interface Compiler ($Id: emailwidget.cpp,v 1.7 2003/05/14 01:46:19 mkb137 Exp $)
 **
 ** WARNING! All changes made in this file will be lost!
 ****************************************************************************/
@@ -11,10 +11,11 @@

 #include <qvariant.h>
 #include <qvbuttongroup.h>
-#include <qcheckbox.h>
-#include <qlineedit.h>
 #include <qpushbutton.h>
+#include <qbuttongroup.h>
 #include <qradiobutton.h>
+#include <qlineedit.h>
+#include <qcheckbox.h>
 #include <qlayout.h>
 #include <qtooltip.h>
 #include <qwhatsthis.h>
@@ -56,6 +57,13 @@ EmailWidget::EmailWidget( QWidget* parent, const char* name, WFlags fl )

    languageChange();
    resize( QSize(600, 480).expandedTo(minimumSizeHint()) );
+    clearWState( WState_Polished );
+
+    // tab order
+    setTabOrder( useHotmailRadioButton_, useCommandRadioButton_ );
+    setTabOrder( useCommandRadioButton_, emailCommandEdit_ );
+    setTabOrder( emailCommandEdit_, showEmailInfoCheckBox_ );
+    setTabOrder( showEmailInfoCheckBox_, showOtherFoldersCheckBox_ );
 }

 /*
@@ -78,6 +86,6 @@ void EmailWidget::languageChange()
    useHotmailRadioButton_->setText( i18n( "Use Hotmail" ) );
    notificationButtonGroup_->setTitle( i18n( "Email Notification" ) );
    showOtherFoldersCheckBox_->setText( i18n( "Show a notification when email is received in \"other folders\"" ) );
-    showEmailInfoCheckBox_->setText( i18n( "Show email information in the contact list" ) );
+    showEmailInfoCheckBox_->setText( i18n( "Show email information" ) );
 }

@@ -1,8 +1,8 @@
 /****************************************************************************
 ** Form interface generated from reading ui file 'emailwidget.ui'
 **
-** Created: Mon Dec 23 18:05:41 2002
-**      by: The User Interface Compiler ($Id: emailwidget.h,v 1.2 2003/02/06 03:11:10 mdcurtis Exp $)
+** Created: Tue May 13 19:10:23 2003
+**      by: The User Interface Compiler ($Id: emailwidget.h,v 1.4 2003/05/14 01:46:19 mkb137 Exp $)
 **
 ** WARNING! All changes made in this file will be lost!
 ****************************************************************************/
@@ -16,10 +16,10 @@
 class QVBoxLayout;
 class QHBoxLayout;
 class QGridLayout;
-class QVButtonGroup;
-class QCheckBox;
-class QLineEdit;
+class QButtonGroup;
 class QRadioButton;
+class QLineEdit;
+class QCheckBox;

 class EmailWidget : public QWidget
 {
@@ -29,11 +29,11 @@ public:
    EmailWidget( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
    ~EmailWidget();

-    QVButtonGroup* clientButtonGroup_;
+    QButtonGroup* clientButtonGroup_;
    QRadioButton* useCommandRadioButton_;
    QRadioButton* useHotmailRadioButton_;
    QLineEdit* emailCommandEdit_;
-    QVButtonGroup* notificationButtonGroup_;
+    QButtonGroup* notificationButtonGroup_;
    QCheckBox* showOtherFoldersCheckBox_;
    QCheckBox* showEmailInfoCheckBox_;

@@ -44,6 +44,7 @@ protected:

 protected slots:
    virtual void languageChange();
+
 };

 #endif // EMAILWIDGET_H
@@ -1,4 +1,4 @@
-<!DOCTYPE UI><UI version="3.0" stdsetdef="1">
+<!DOCTYPE UI><UI version="3.1" stdsetdef="1">
 <class>EmailWidget</class>
 <widget class="QWidget">
    <property name="name">
@@ -170,5 +170,12 @@
        </vbox>
    </widget>
 </widget>
+<tabstops>
+    <tabstop>useHotmailRadioButton_</tabstop>
+    <tabstop>useCommandRadioButton_</tabstop>
+    <tabstop>emailCommandEdit_</tabstop>
+    <tabstop>showEmailInfoCheckBox_</tabstop>
+    <tabstop>showOtherFoldersCheckBox_</tabstop>
+</tabstops>
 <layoutdefaults spacing="6" margin="11"/>
 </UI>
@@ -1,19 +1,21 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# translation of ar.po to 
+# translation of ar.po to Arabic
 # This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# Mohammed Assar (محمد عَصَر) <mohasr@link.net>, 2003
+# Mohammed Assar (محمد عَصَر) <mohasr@link.net>, 2003
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: ar\n"
 "POT-Creation-Date: 2003-04-30 18:58-0600\n"
-"PO-Revision-Date: 2003-02-11 05:15+0200\n"
-"Last-Translator: Mohamed Aser (محمد عَصَر) <aser@arabeyes.org>\n"
-"Language-Team: arabic <ar@li.org>\n"
+"PO-Revision-Date: 2003-05-11 07:03+0300\n"
+"Last-Translator: \n"
+"Language-Team:  <en@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 0.9.6\n"
+"X-Generator: KBabel 1.0.1\n"

 #: ../kmess/account.cpp:35 ../kmess/account.cpp:416 ../kmess/account.cpp:517
 msgid "I'm away from my computer"
@@ -29,7 +31,7 @@ msgstr "you@hotmail.com"

 #: ../kmess/autologinview.cpp:45
 msgid "Logging in..."
-msgstr ""
+msgstr "يتم تسجيل الدخول..."

 #: ../kmess/currentaccount.cpp:259
 msgid "You can't login to hotmail with this account."
@@ -174,9 +176,8 @@ msgid "Show &Allowed Contacts"
 msgstr "اظهر ج&هات الاتصال المسموحة"

 #: ../kmess/kmessinterface.cpp:264
-#, fuzzy
 msgid "Show &Offline Contacts"
-msgstr "اظهر ج&هات الاتصال المسموحة"
+msgstr "أظهر الجهات ال&غير متصلة"

 #: ../kmess/kmessinterface.cpp:265
 msgid "Show &Removed Contacts"
@@ -252,7 +253,7 @@ msgstr "ترجمة المانية , اختبار , توثيق وصفحة انت

 #: ../kmess/main.cpp:47
 msgid "Web design"
-msgstr ""
+msgstr "تصميم ويب"

 #: ../kmess/main.cpp:48
 msgid "Spanish translation"
@@ -319,37 +320,32 @@ msgid "Thai tranlation"
 msgstr "ترجمة تايلاندية"

 #: ../kmess/main.cpp:64
-#, fuzzy
 msgid "Simplified Chinese tranlation, file send bug fix"
-msgstr "ترجمة صينية"
+msgstr "ترجمة صينية مبسطة , اصلا خطأ ارسال ملف"

 #: ../kmess/main.cpp:65
-#, fuzzy
 msgid "Catalan tranlation"
-msgstr "ترجمة تايلاندية"
+msgstr "ترجمة كاتالونية"

 #: ../kmess/main.cpp:66
-#, fuzzy
 msgid "More Turkish translation"
-msgstr "ترجمة تركية"
+msgstr "ترجمة تركية اضافية"

 #: ../kmess/main.cpp:67
 msgid "Guy with a bag over his head"
-msgstr ""
+msgstr "شخص بكيس فوق رأسه"

 #: ../kmess/main.cpp:68
 msgid "GnomeMeeting developer"
-msgstr ""
+msgstr "مطور GnomeMeeting"

 #: ../kmess/main.cpp:69
-#, fuzzy
 msgid "Danish tranlation"
-msgstr "ترجمة اسبانية"
+msgstr "ترجمة المانية"

 #: ../kmess/main.cpp:70
-#, fuzzy
 msgid "Estonian tranlation"
-msgstr "ترجمة كورية"
+msgstr "ترجمة إستونية"

 #: ../kmess/main.cpp:71
 msgid "Inspiration and assorted code"
@@ -428,11 +424,11 @@ msgstr "ارسل &ملف"

 #: ../kmess/chat/chatwindowinterface.cpp:165
 msgid "Start a &Meeting"
-msgstr ""
+msgstr "ابدأ &لقاء"

 #: ../kmess/chat/chatwindowinterface.cpp:166
 msgid "Share your &Desktop"
-msgstr ""
+msgstr "شارك س&طح مكتبك"

 #: ../kmess/chat/chatwindowinterface.cpp:173
 msgid "&Invite"
@@ -476,19 +472,16 @@ msgid "Away - Idle"
 msgstr "بالخارج - آلي"

 #: ../kmess/chat/contactframeinterface.cpp:109
-#, fuzzy
 msgid "Send this person an email"
-msgstr "غيّر اسم هذا الشخص"
+msgstr "أرسل بريد لهذا الشخص"

 #: ../kmess/chat/contactframeinterface.cpp:111
-#, fuzzy
 msgid "Show this person's profile"
-msgstr "غيّر اسم هذا الشخص"
+msgstr "أظهر ملف معلومات هذا الشخص"

 #: ../kmess/contact/contact.cpp:488
-#, fuzzy
 msgid "Blocked"
-msgstr "(محظور)"
+msgstr "محظور"

 #: ../kmess/contact/contactlist.cpp:697
 msgid "Allowed"
@@ -539,14 +532,12 @@ msgid "&Add Group"
 msgstr "ا&ضف مجموعة"

 #: ../kmess/contact/contactlist.cpp:774
-#, fuzzy
 msgid "Move Group &Down"
-msgstr "انقل لمجمو&عة"
+msgstr "حرّك المجموعة للأ&سفل"

 #: ../kmess/contact/contactlist.cpp:775
-#, fuzzy
 msgid "Move Group &Up"
-msgstr "انقل لمجمو&عة"
+msgstr "حرّك المجموعة للأ&على"

 #: ../kmess/contact/contactlist.cpp:776
 msgid "Re&move Group"
@@ -624,9 +615,8 @@ msgid "Got synchronization"
 msgstr "حصلت المزامنة"

 #: ../kmess/network/msnnotificationconnection.cpp:691
-#, fuzzy
 msgid "Password"
-msgstr "كلمة المرور:"
+msgstr "كلمة المرور"

 #: ../kmess/network/msnnotificationconnection.cpp:712
 msgid "Received user confirmation"
@@ -682,7 +672,7 @@ msgstr "فشل التوثيق"

 #: ../kmess/network/msnnotificationconnection.cpp:1052
 msgid "You can't start a chat with someone while you are invisible."
-msgstr ""
+msgstr "لا يمكنك بدأ محادثة مع شخص وأنت في حالة مخفي."

 #: ../kmess/network/msnnotificationconnection.cpp:1056
 msgid "Got mystery '919' error"
@@ -725,26 +715,18 @@ msgid "This person is offline or invisible."
 msgstr "هذا الشخص غير متصل او مخفي."

 #: ../kmess/network/msnswitchboardconnection.cpp:1037
-#, fuzzy
 msgid "Cancelled"
-msgstr "قد ألغي"
+msgstr "ملغي"

 #: ../kmess/network/applications/application.cpp:59
-#, fuzzy
 msgid "The contact has cancelled the invitation."
-msgstr ""
-"لقد اتصلت\n"
-"من مكان آخر"
+msgstr "لقد قامت جهة الاتصال بالغاء الدعوة."

 #: ../kmess/network/applications/application.cpp:78
-#, fuzzy
 msgid "The contact has rejected the invitation."
-msgstr ""
-"لقد اتصلت\n"
-"من مكان آخر"
+msgstr "لقد قامت جهة الاتصال برفض الدعوة."

 #: ../kmess/network/applications/application.cpp:283
-#, fuzzy
 msgid "accept"
 msgstr "قبول"

@@ -754,45 +736,36 @@ msgid "cancel"
 msgstr "الغاء"

 #: ../kmess/network/applications/application.cpp:288
-#, fuzzy
 msgid "Do you want to"
 msgstr "هل تريد "

 #: ../kmess/network/applications/application.cpp:290
-#, fuzzy
 msgid "or"
 msgstr " أو "

 #: ../kmess/network/applications/application.cpp:309
-#, fuzzy
 msgid "Click to"
-msgstr ".  اضغط ل "
+msgstr " اضغط ل "

 #: ../kmess/network/applications/application.cpp:372
-#, fuzzy
 msgid "You have cancelled the invitation."
-msgstr ""
-"لقد اتصلت\n"
-"من مكان آخر"
+msgstr "لقد ألغيت الدعوة."

 #: ../kmess/network/applications/application.cpp:393
-#, fuzzy
 msgid "You have rejected the invitation."
-msgstr ""
-"لقد اتصلت\n"
-"من مكان آخر"
+msgstr "لقد رفضت الدعوة."

 #: ../kmess/network/applications/gnomemeeting.cpp:55
 msgid "You are invited to start a meeting (using GnomeMeeting)."
-msgstr ""
+msgstr "أنت مدعو لبدأ لقاء (باستخدام GnomeMeeting)."

 #: ../kmess/network/applications/gnomemeeting.cpp:116
 msgid "Starting GnomeMeeting.  Connecting to "
-msgstr ""
+msgstr "يتم تشغيل GnomeMeeting.  الاتصال بـ "

 #: ../kmess/network/applications/gnomemeeting.cpp:160
 msgid "Inviting the contact to a meeting."
-msgstr ""
+msgstr "دعوة جهة الاتصال الى لقاء"

 #: ../kmess/network/applications/ipdialog.cpp:32
 msgid "Confirm IP Address"
@@ -813,19 +786,19 @@ msgstr "افتح www.whatismyip.com"
 #: ../kmess/network/applications/kderemotedesktop.cpp:55
 #: ../kmess/network/applications/msnremotedesktop.cpp:52
 msgid "You are invited to share this person's desktop."
-msgstr ""
+msgstr "أنت مدعو لمشاركة سطح مكتب هذا الشخص."

 #: ../kmess/network/applications/kderemotedesktop.cpp:116
 msgid "Starting KdeRemoteDesktop.  Connecting to "
-msgstr ""
+msgstr "يتم تشغيل KdeRemoteDesktop.  الاتصال بـ "

 #: ../kmess/network/applications/kderemotedesktop.cpp:160
 msgid "Inviting the contact to share your desktop."
-msgstr ""
+msgstr "دعوة جهة الاتصال لمشاركة سطح مكتبك."

 #: ../kmess/network/applications/msnremotedesktop.cpp:150
 msgid "Starting KRDC.  Connecting to "
-msgstr ""
+msgstr "يتم تشغيل KRDC.  الاتصال بـ "

 #: ../kmess/network/applications/receivefile.cpp:136
 msgid "Do you want to accept the file: "
@@ -869,7 +842,7 @@ msgstr "فشل  مسار غير صحيح"

 #: ../kmess/network/applications/sendfile.cpp:343
 msgid "failed.  The file doesn't exist"
-msgstr ""
+msgstr "فشل.  الملف غير موجود"

 #: ../kmess/network/applications/sendfile.cpp:392
 msgid "Transfer accepted."
@@ -973,9 +946,8 @@ msgid "Contact Properties for "
 msgstr "خصائص جهة الاتصال لـ"

 #: ../kmess/dialogs/contactpropertiesdialog.cpp:243
-#, fuzzy
 msgid "Email address: "
-msgstr "البريد الالكتروني:"
+msgstr "البريد الالكتروني: "

 #: ../kmess/dialogs/contactpropertiesdialog.cpp:244
 msgid "Current name: "
@@ -1004,7 +976,7 @@ msgstr "عنوان بريدك الالكتروني:"

 #: ../kmess/settings/accountswidget.cpp:88
 msgid "Start in \"Invisible\" mode."
-msgstr ""
+msgstr "ابدأ في حالة \"مخفي\"."

 #: ../kmess/settings/accountswidget.cpp:89
 msgid "Your password:"
@@ -1089,7 +1061,7 @@ msgstr "اظهر المحادثة في الوضع المضغوط"

 #: ../kmess/settings/chattingwidget.cpp:129
 msgid "Use font effects in messages, i.e. *bold*, /italic/, and _underline_"
-msgstr ""
+msgstr "استخدم تأثيرات الخط في المحادثة, *عريض* و /مائل/ و _تحته خط_"

 #: ../kmess/settings/chattingwidget.cpp:130
 msgid "Show timestamps on messages"
@@ -1156,3 +1128,4 @@ msgstr "هل أنت من متأكد من أنك تريد حذف هذا الحس

 #~ msgid "EmailWidget"
 #~ msgstr "EmailWidget"
+
@@ -1,22 +1,27 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# translation of fr.po to 
+# translation of fr.po to
+# translation of fr.po to
+# translation of fr.po to
+# translation of fr.po to
+# translation of fr.po to
 # This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER, 2003
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: kmess.fr\n"
+"Project-Id-Version: fr\n"
 "POT-Creation-Date: 2003-04-30 18:58-0600\n"
-"PO-Revision-Date: 2003-04-26 15:40--100\n"
-"Last-Translator: Choplair <choplair@fr.st>\n"
-"Language-Team: French <fr@li.org>\n"
+"PO-Revision-Date: 2003-05-13 17:42+0200\n"
+"Last-Translator: \n"
+"Language-Team:  <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.1\n"

 #: ../kmess/account.cpp:35 ../kmess/account.cpp:416 ../kmess/account.cpp:517
 msgid "I'm away from my computer"
-msgstr "Je suis pas devant mon ordinateur"
+msgstr "Je ne suis pas devant mon ordinateur."

 #: ../kmess/account.cpp:40
 msgid "Your name"
@@ -28,7 +33,7 @@ msgstr "vous@hotmail.com"

 #: ../kmess/autologinview.cpp:45
 msgid "Logging in..."
-msgstr "En train de se logguer..."
+msgstr "Ouverture de session..."

 #: ../kmess/currentaccount.cpp:259
 msgid "You can't login to hotmail with this account."
@@ -36,11 +41,11 @@ msgstr "Vous ne pouvez pas vous connecter à hotmail avec ce compte."

 #: ../kmess/initialviewinterface.cpp:208
 msgid "Connect"
-msgstr "Connection"
+msgstr "Connexion"

 #: ../kmess/initialviewinterface.cpp:217
 msgid "Login with a saved profile:"
-msgstr "Se logguer avec un compte existant:"
+msgstr "Se connecter avec un compte existant :"

 #: ../kmess/initialviewinterface.cpp:223
 msgid "Remember this profile"
@@ -48,15 +53,15 @@ msgstr "Mémoriser ce compte"

 #: ../kmess/initialviewinterface.cpp:229
 msgid "Password:"
-msgstr "Mot de passe:"
+msgstr "Mot de passe :"

 #: ../kmess/initialviewinterface.cpp:235
 msgid "Email address:"
-msgstr "Adresse email:"
+msgstr "Adresse email :"

 #: ../kmess/initialviewinterface.cpp:245
 msgid "Or enter your login information:"
-msgstr "Ou entrez les infos pour vous logguer:"
+msgstr "Ou entrez les infos pour vous connecter :"

 #: ../kmess/kmess.cpp:202 ../kmess/kmessinterface.cpp:181
 #: ../kmess/chat/contactframe.cpp:267 ../kmess/contact/contact.cpp:493
@@ -65,12 +70,12 @@ msgstr "Absent"

 #: ../kmess/kmess.cpp:206 ../kmess/kmessinterface.cpp:182
 msgid "Away with auto-reply"
-msgstr "Absent avec reponce-auto"
+msgstr "Absent avec auto-réponse"

 #: ../kmess/kmess.cpp:223 ../kmess/kmessinterface.cpp:183
 #: ../kmess/chat/contactframe.cpp:272 ../kmess/contact/contact.cpp:498
 msgid "Be Right Back"
-msgstr "Bientot de retour"
+msgstr "Bientôt de retour"

 #: ../kmess/kmess.cpp:227 ../kmess/kmessinterface.cpp:184
 #: ../kmess/chat/contactframe.cpp:277 ../kmess/contact/contact.cpp:503
@@ -89,7 +94,7 @@ msgstr "Parti manger"
 #: ../kmess/kmess.cpp:239 ../kmess/kmessinterface.cpp:180
 #: ../kmess/chat/contactframe.cpp:297 ../kmess/contact/contactlist.cpp:695
 msgid "Online"
-msgstr "Online"
+msgstr "En ligne"

 #: ../kmess/kmess.cpp:243 ../kmess/kmessinterface.cpp:186
 #: ../kmess/chat/contactframe.cpp:302 ../kmess/contact/contact.cpp:528
@@ -102,15 +107,15 @@ msgstr "Connecté"

 #: ../kmess/kmess.cpp:460
 msgid "The connection to the server failed."
-msgstr "La connection au serveur a échoué."
+msgstr "La connection au serveur a échoué"

 #: ../kmess/kmess.cpp:461
 msgid "You may not be connected to the internet."
-msgstr "Vous n'etes peut etre pas connecté à internet."
+msgstr "Vous n'êtes peut-être pas connecté à internet."

 #: ../kmess/kmess.cpp:646
 msgid "Changes will take place when the program is restarted."
-msgstr "Les modifications prendront effet quand le programme aura redémaré."
+msgstr "Les modifications prendront effet quand le programme aura redémarré"

 #: ../kmess/kmess.cpp:679 ../kmess/kmessview.cpp:76
 msgid "Disconnected"
@@ -138,11 +143,11 @@ msgstr "Rech&ercher un Contact"

 #: ../kmess/kmessinterface.cpp:145
 msgid "Search by &Interest"
-msgstr "Rechercher par &Interéts"
+msgstr "Rechercher par &Intérêts"

 #: ../kmess/kmessinterface.cpp:146
 msgid "Get New Emoticon or Sound &Themes"
-msgstr "Plus de &Sons/Emoticons!"
+msgstr "Plus de &Sons/Emoticons !"

 #: ../kmess/kmessinterface.cpp:160
 msgid "&Actions"
@@ -154,19 +159,19 @@ msgstr "Con&nection"

 #: ../kmess/kmessinterface.cpp:177
 msgid "&Disconnect"
-msgstr "&Déconnection"
+msgstr "&Déconnexion"

 #: ../kmess/kmessinterface.cpp:178
 msgid "Show My &Profile"
-msgstr "Voir mon &Profile"
+msgstr "Afficher mon &Profil"

 #: ../kmess/kmessinterface.cpp:179
 msgid "&My Status"
-msgstr "&Mon Status"
+msgstr "&Mon Statut"

 #: ../kmess/kmessinterface.cpp:208
 msgid "&Connect"
-msgstr "&Connection"
+msgstr "&Connexion"

 #: ../kmess/kmessinterface.cpp:263
 msgid "Show &Allowed Contacts"
@@ -174,11 +179,11 @@ msgstr "Afficher les Contacts &Autorisés"

 #: ../kmess/kmessinterface.cpp:264
 msgid "Show &Offline Contacts"
-msgstr "Afficher les Contacts &Offline"
+msgstr "Afficher les Contacts &Hors ligne"

 #: ../kmess/kmessinterface.cpp:265
 msgid "Show &Removed Contacts"
-msgstr "Afficher les Contact Supp&rimés"
+msgstr "Afficher les Contacts Supp&rimés"

 #: ../kmess/kmessinterface.cpp:266
 msgid "&Sort Contacts by"
@@ -190,11 +195,11 @@ msgstr "Groupe"

 #: ../kmess/kmessinterface.cpp:267
 msgid "Online/Offline"
-msgstr "Online/Offline"
+msgstr "En ligne/Hors ligne"

 #: ../kmess/kmessinterface.cpp:371
 msgid "Ready"
-msgstr "Prét"
+msgstr "Prêt"

 #: ../kmess/kmessview.cpp:196 ../kmess/kmessview.cpp:200
 msgid "You have"
@@ -202,11 +207,11 @@ msgstr "Vous avez"

 #: ../kmess/kmessview.cpp:196
 msgid "new email in your inbox"
-msgstr "nouveau(x) message(s)"
+msgstr "nouveau message dans votre boîte de réception"

 #: ../kmess/kmessview.cpp:200
 msgid "new emails in your inbox"
-msgstr "nouveau(x) message(s)"
+msgstr "nouveaux messages"

 #: ../kmess/kmessview.cpp:225
 msgid "(Away)"
@@ -214,7 +219,7 @@ msgstr "(Absent)"

 #: ../kmess/kmessview.cpp:230
 msgid "(Be Right Back)"
-msgstr "(Bientot de retour)"
+msgstr "(Bientôt de retour)"

 #: ../kmess/kmessview.cpp:235
 msgid "(Busy)"
@@ -242,7 +247,7 @@ msgstr "KMess"

 #: ../kmess/main.cpp:34
 msgid "Autologin with the given email address"
-msgstr "Se logguer auto avec ce compte"
+msgstr "Se connecter automatiquement avec ce compte"

 #: ../kmess/main.cpp:46
 msgid "German translation, testing, documentation, and web page"
@@ -262,7 +267,7 @@ msgstr "Traduction Turque"

 #: ../kmess/main.cpp:50
 msgid "Brazilian Portuguese translation"
-msgstr "Traduction Portugaise/Brézillienne"
+msgstr "Traduction Portugaise/Brésillienne"

 #: ../kmess/main.cpp:51
 msgid "The main and yellow/blue/violet emoticon sets and Italian translation"
@@ -290,13 +295,13 @@ msgstr "Les Emoticons \"Cartoon\""

 #: ../kmess/main.cpp:57
 msgid "Default sound theme"
-msgstr "Thème sonore par defaut"
+msgstr "Thème sonore par défaut"

 #: ../kmess/main.cpp:58
 msgid "Arabic translation, internationalization of file saving fix."
 msgstr ""
 "Traduction Arabe, Correction de l'internationalisation des fichiers "
-"sauvegardés."
+"sauvegardé."

 #: ../kmess/main.cpp:59
 msgid "Various internationalization fixes."
@@ -304,7 +309,7 @@ msgstr "Corrections d'internationalisation diverses."

 #: ../kmess/main.cpp:60
 msgid "French translation"
-msgstr "Traduction Francaise"
+msgstr "Traduction Française"

 #: ../kmess/main.cpp:61
 msgid "Korean translation"
@@ -320,7 +325,7 @@ msgstr "Traduction Thai"

 #: ../kmess/main.cpp:64
 msgid "Simplified Chinese tranlation, file send bug fix"
-msgstr "Traduction Chinoise Simplifiée, fixage du bug de l'envois de fichier"
+msgstr "Traduction Chinoise Simplifié, fixage du bug de l'envois de fichier"

 #: ../kmess/main.cpp:65
 msgid "Catalan tranlation"
@@ -332,11 +337,11 @@ msgstr "Traduction Turque supplémentaire"

 #: ../kmess/main.cpp:67
 msgid "Guy with a bag over his head"
-msgstr "Mec avec un sac sur sa tete"
+msgstr "Mec avec un sac sur sa tête"

 #: ../kmess/main.cpp:68
 msgid "GnomeMeeting developer"
-msgstr "Developpeur de GnomeMeeting"
+msgstr "Développeur de GnomeMeeting"

 #: ../kmess/main.cpp:69
 msgid "Danish tranlation"
@@ -373,7 +378,7 @@ msgstr "choplair@fr.st"
 #: ../kmess/chat/chatview.cpp:578
 #: ../kmess/notification/chatnotification.cpp:99
 msgid "says: "
-msgstr "dit: "
+msgstr "dit : "

 #: ../kmess/chat/chatviewinterface.cpp:97
 msgid "Send"
@@ -403,7 +408,7 @@ msgstr "a quitté la conversation."

 #: ../kmess/chat/chatwindow.cpp:292
 msgid " is typing."
-msgstr " est en train d'ecrire."
+msgstr " est en train d'écrire."

 #: ../kmess/chat/chatwindow.cpp:901
 msgid "Application message"
@@ -423,7 +428,7 @@ msgstr "Envoyer un &Fichier"

 #: ../kmess/chat/chatwindowinterface.cpp:165
 msgid "Start a &Meeting"
-msgstr "Démarer un &Meeting"
+msgstr "Démarrer un &Meeting"

 #: ../kmess/chat/chatwindowinterface.cpp:166
 msgid "Share your &Desktop"
@@ -440,15 +445,15 @@ msgstr "&Conversation"

 #: ../kmess/chat/chatwindowinterface.cpp:201
 msgid "Change &Font"
-msgstr "Changer votre &Police"
+msgstr "Changer la &Police"

 #: ../kmess/chat/chatwindowinterface.cpp:202
 msgid "Change Font &Color"
-msgstr "Changer votre &Couleur"
+msgstr "Changer la &Couleur"

 #: ../kmess/chat/chatwindowinterface.cpp:270
 msgid "Insert an emoticon"
-msgstr "Inserer un Emoticon"
+msgstr "Insérer un Emoticon"

 #: ../kmess/chat/chatwindowinterface.cpp:287
 msgid "Show &Emoticons"
@@ -464,7 +469,7 @@ msgstr "Afficher ou masquer la barre de contact"

 #: ../kmess/chat/contactframe.cpp:282 ../kmess/contact/contactlist.cpp:696
 msgid "Offline"
-msgstr "Offline"
+msgstr "Hors ligne"

 #: ../kmess/chat/contactframe.cpp:287 ../kmess/contact/contact.cpp:513
 msgid "Away - Idle"
@@ -472,11 +477,11 @@ msgstr "Absent - Inactif"

 #: ../kmess/chat/contactframeinterface.cpp:109
 msgid "Send this person an email"
-msgstr "Envoyer un email a cette personne"
+msgstr "Envoyer un email à cette personne"

 #: ../kmess/chat/contactframeinterface.cpp:111
 msgid "Show this person's profile"
-msgstr "Afficher le profile de cette personne"
+msgstr "Afficher le profil de cette personne"

 #: ../kmess/contact/contact.cpp:488
 msgid "Blocked"
@@ -500,7 +505,7 @@ msgstr "&Autoriser le Contact"

 #: ../kmess/contact/contactlist.cpp:714
 msgid "&Block Contact"
-msgstr "&Bloquer le Contact"
+msgstr "&Bloquer ce Contact"

 #: ../kmess/contact/contactlist.cpp:716
 msgid "&Send email"
@@ -508,23 +513,23 @@ msgstr "&Envoyer un Email"

 #: ../kmess/contact/contactlist.cpp:717
 msgid "&Properties"
-msgstr "&Propriété"
+msgstr "&Propriétés"

 #: ../kmess/contact/contactlist.cpp:718
 msgid "&Remove Contact"
-msgstr "&Supprimer le Contact"
+msgstr "&Supprimer ce Contact"

 #: ../kmess/contact/contactlist.cpp:719
 msgid "&Show Profile"
-msgstr "&Voir son Profile"
+msgstr "&Afficher son Profil"

 #: ../kmess/contact/contactlist.cpp:720
 msgid "&Unblock Contact"
-msgstr "&Débloquer le Contact"
+msgstr "&Débloquer ce Contact"

 #: ../kmess/contact/contactlist.cpp:744
 msgid "&Move to Group"
-msgstr "Délpacer dans le &Groupe"
+msgstr "Déplacer dans le &Groupe"

 #: ../kmess/contact/contactlist.cpp:773
 msgid "&Add Group"
@@ -540,36 +545,36 @@ msgstr "Placer le Groupe en &Haut"

 #: ../kmess/contact/contactlist.cpp:776
 msgid "Re&move Group"
-msgstr "Suppri&mer le Groupe"
+msgstr "Suppri&mer ce Groupe"

 #: ../kmess/contact/contactlist.cpp:777
 msgid "Re&name Group"
-msgstr "Re&nomer le Group"
+msgstr "Re&nommer ce Groupe"

 #: ../kmess/contact/contactlist.cpp:1145 ../kmess/contact/contactlist.cpp:1251
 msgid "This is a special group and can't be changed."
-msgstr "C'est un groupe special qui ne peut etre changé."
+msgstr "C'est un groupe spécial qui ne peut être changé."

 #: ../kmess/contact/contactlist.cpp:1149
 msgid "Are you sure you want to remove this group?"
-msgstr "Etes-vous sûre de vouloir supprimer ce groupe?"
+msgstr "Etes-vous sûr de vouloir supprimer ce groupe ?"

 #: ../kmess/notification/contactofflinenotification.cpp:86
 msgid " is offline"
-msgstr " est Offline"
+msgstr " est hors ligne"

 #: ../kmess/notification/contactonlinenotification.cpp:95
 msgid " is online"
-msgstr " est Online"
+msgstr " est en ligne"

 #: ../kmess/notification/emailnotification.cpp:88
 #: ../kmess/network/msnnotificationconnection.cpp:1112
 msgid "in your inbox"
-msgstr "dans votre Boite de Récetion"
+msgstr "dans votre boîte de réception"

 #: ../kmess/notification/emailnotification.cpp:94
 msgid "You have a new e-mail"
-msgstr "Vous avez un nouvel email"
+msgstr "Vous avez un nouveau message"

 #: ../kmess/notification/emailnotification.cpp:95
 msgid "from"
@@ -581,15 +586,15 @@ msgstr "et"

 #: ../kmess/network/msnnotificationconnection.cpp:123
 msgid "Connection timed out"
-msgstr "TimeOut de la connection"
+msgstr "Temps dépassé de la connection (TimeOut)"

 #: ../kmess/network/msnnotificationconnection.cpp:124
 msgid "There may be a problem with the servers"
-msgstr "Il y'a peut être un problème avec le serveur"
+msgstr "Il y a peut être un problème avec le serveur"

 #: ../kmess/network/msnnotificationconnection.cpp:161
 msgid "Show .NET service status?"
-msgstr "Voir le status des services .NET ?"
+msgstr "Voir le statut des services .NET ?"

 #: ../kmess/network/msnnotificationconnection.cpp:162
 msgid "Server Error"
@@ -605,13 +610,13 @@ msgid ""
 "connected from another MSN Messenger client \n"
 "or from another location"
 msgstr ""
-"Vous avez été déconnecté parce-que vous \n"
-"etes connecté depuis un autre client MSN ou\n"
+"Vous avez été déonnecté parce que vous \n"
+"vous êtes connecté depuis un autre client MSN ou\n"
 "depuis un autre endroit."

 #: ../kmess/network/msnnotificationconnection.cpp:638
 msgid "Got synchronization"
-msgstr "Syncronisation"
+msgstr "Synchronisation"

 #: ../kmess/network/msnnotificationconnection.cpp:691
 msgid "Password"
@@ -619,7 +624,7 @@ msgstr "Mot de passe"

 #: ../kmess/network/msnnotificationconnection.cpp:712
 msgid "Received user confirmation"
-msgstr "Recoit la confimation d'utilisateur"
+msgstr "Reçoit la confimation d'utilisateur"

 #: ../kmess/network/msnnotificationconnection.cpp:772
 msgid "Transfer to notification server"
@@ -627,7 +632,7 @@ msgstr "Transfer au serveur de notification"

 #: ../kmess/network/msnnotificationconnection.cpp:881
 msgid "Sending verification"
-msgstr "Envoit la verification"
+msgstr "Envoit la vérification"

 #: ../kmess/network/msnnotificationconnection.cpp:1006
 msgid "The username given was invalid"
@@ -659,7 +664,7 @@ msgstr "Le serveur de notification est DOWN"

 #: ../kmess/network/msnnotificationconnection.cpp:1039
 msgid "The server is going down soon"
-msgstr "Le serveur va bientot être DOWN"
+msgstr "Le serveur va bientôt être DOWN"

 #: ../kmess/network/msnnotificationconnection.cpp:1043
 msgid "User too active"
@@ -671,12 +676,11 @@ msgstr "L'authentification a échoué"

 #: ../kmess/network/msnnotificationconnection.cpp:1052
 msgid "You can't start a chat with someone while you are invisible."
-msgstr ""
-"Vous ne pouvez pas demarer une conversation lorsque vous êtes en Invisible."
+msgstr "Vous ne pouvez pas démarrer une conversation lorsque vous êtes Invisible."

 #: ../kmess/network/msnnotificationconnection.cpp:1056
 msgid "Got mystery '919' error"
-msgstr "Mysterieuse erreur '919'"
+msgstr "Mystérieuse erreur '919'"

 #: ../kmess/network/msnnotificationconnection.cpp:1116
 msgid "in another folder"
@@ -700,19 +704,19 @@ msgstr "n'a pas été reçu."

 #: ../kmess/network/msnswitchboardconnection.cpp:752
 msgid "The contact is inviting you to start "
-msgstr "Le contact vous invite a démarer "
+msgstr "Le contact vous invite a démarrer "

 #: ../kmess/network/msnswitchboardconnection.cpp:752
 msgid ", but this is not implemented yet."
-msgstr ", mais cette fonction n'est pas encore disponible :-(, "
+msgstr ", mais cette fonction n'est pas encore disponible."

 #: ../kmess/network/msnswitchboardconnection.cpp:812
 msgid "This person is online, but he or she is blocking you."
-msgstr "Cette personne est connectée, mais elle vous a blocké."
+msgstr "Cette personne est en ligne, mais il ou elle vous a bloqué"

 #: ../kmess/network/msnswitchboardconnection.cpp:816
 msgid "This person is offline or invisible."
-msgstr "Cette personne est Offline ou en mode Invisible."
+msgstr "Cette personne est hors ligne ou en mode Invisible."

 #: ../kmess/network/msnswitchboardconnection.cpp:1037
 msgid "Cancelled"
@@ -737,7 +741,7 @@ msgstr "annuler"

 #: ../kmess/network/applications/application.cpp:288
 msgid "Do you want to"
-msgstr "Vous voullez "
+msgstr "Voullez-vous "

 #: ../kmess/network/applications/application.cpp:290
 msgid "or"
@@ -749,7 +753,7 @@ msgstr "Cliquer pour"

 #: ../kmess/network/applications/application.cpp:372
 msgid "You have cancelled the invitation."
-msgstr "Vous avez annule l'invitation."
+msgstr "Vous avez annulé l'invitation."

 #: ../kmess/network/applications/application.cpp:393
 msgid "You have rejected the invitation."
@@ -757,11 +761,11 @@ msgstr "Vous avez rejeté l'invitation."

 #: ../kmess/network/applications/gnomemeeting.cpp:55
 msgid "You are invited to start a meeting (using GnomeMeeting)."
-msgstr "Vous etes invité à démarer un Meeting (utilise GnomeMeeting)."
+msgstr "Vous êtes invité à démarrer un Meeting (utilise GnomeMeeting)."

 #: ../kmess/network/applications/gnomemeeting.cpp:116
 msgid "Starting GnomeMeeting.  Connecting to "
-msgstr "Démarage de GnomeMeeting.  Connection à "
+msgstr "Démarrage de GnomeMeeting. Connection à "

 #: ../kmess/network/applications/gnomemeeting.cpp:160
 msgid "Inviting the contact to a meeting."
@@ -773,11 +777,11 @@ msgstr "Confirmer l'addresse IP"

 #: ../kmess/network/applications/ipdialog.cpp:44
 msgid "Use this IP address:"
-msgstr "Utiliser l'adresse IP par defaut: "
+msgstr "Utiliser l'adresse IP par defaut : "

 #: ../kmess/network/applications/ipdialog.cpp:52
 msgid "or enter an IP to use:"
-msgstr "Ou utiliser une autre adresse IP (pour utilisateur avertis!) :"
+msgstr "Ou utiliser une autre adresse IP (pour utilisateurs avertis !) :"

 #: ../kmess/network/applications/ipdialog.cpp:62
 msgid "Open www.whatismyip.com"
@@ -786,11 +790,11 @@ msgstr "Ouvrir le site \"www.whatismyip.com\""
 #: ../kmess/network/applications/kderemotedesktop.cpp:55
 #: ../kmess/network/applications/msnremotedesktop.cpp:52
 msgid "You are invited to share this person's desktop."
-msgstr "Vous etes invité a partager le bureau de cette personne."
+msgstr "Vous êtes invité à partager le bureau de cette personne."

 #: ../kmess/network/applications/kderemotedesktop.cpp:116
 msgid "Starting KdeRemoteDesktop.  Connecting to "
-msgstr "Démarage de KdeRemoteDesktop.  Connection à "
+msgstr "Démarrage de KdeRemoteDesktop. Connection à "

 #: ../kmess/network/applications/kderemotedesktop.cpp:160
 msgid "Inviting the contact to share your desktop."
@@ -798,11 +802,11 @@ msgstr "Invite le contact à partager votre bureau."

 #: ../kmess/network/applications/msnremotedesktop.cpp:150
 msgid "Starting KRDC.  Connecting to "
-msgstr "Démarage de KRDC.  Connection à "
+msgstr "Démarrage de KRDC.  Connection à "

 #: ../kmess/network/applications/receivefile.cpp:136
 msgid "Do you want to accept the file: "
-msgstr "Acceptez-vous le fichier: "
+msgstr "Acceptez-vous le fichier : "

 #: ../kmess/network/applications/receivefile.cpp:324
 msgid "was cancelled by the sender"
@@ -811,11 +815,11 @@ msgstr "a été annulé par l'expéditeur"
 #: ../kmess/network/applications/receivefile.cpp:411
 #: ../kmess/network/applications/sendfile.cpp:350
 msgid "failed.  Couldn't open file"
-msgstr "a échoué.  Impossible d'ouvrir le fichier"
+msgstr "a échoué Impossible d'ouvrir le fichier"

 #: ../kmess/network/applications/receivefile.cpp:452
 msgid "failed.  A connection could not be made"
-msgstr "a échoué.  La connection n'a pas pu se faire"
+msgstr "a échoué. La connection n'a pas pu se faire"

 #: ../kmess/network/applications/receivefile.cpp:460
 #: ../kmess/network/applications/receivefile.cpp:521
@@ -834,11 +838,11 @@ msgstr "Envoi du fichier "

 #: ../kmess/network/applications/sendfile.cpp:271
 msgid "failed.  Couldn't create a socket"
-msgstr "a échoué.  N'a pas pu créér de socket"
+msgstr "a échoué. N'a pas pu créer de socket"

 #: ../kmess/network/applications/sendfile.cpp:333
 msgid "failed.  Null file path"
-msgstr "a échoué.  Répertoire du fichier vide"
+msgstr "a échoué Répertoire du fichier vide"

 #: ../kmess/network/applications/sendfile.cpp:343
 msgid "failed.  The file doesn't exist"
@@ -854,7 +858,7 @@ msgstr "Le transfer de "

 #: ../kmess/network/applications/transferfile.cpp:228
 msgid "Successfully transferred file: "
-msgstr "Fichier transféré avec succès: "
+msgstr "Fichier transféré avec succès : "

 #: ../kmess/network/applications/transferprogressdialog.cpp:32
 msgid "&Hide"
@@ -862,12 +866,12 @@ msgstr "&Masquer"

 #: ../kmess/network/applications/transferprogressdialog.cpp:89
 msgid "File transfer completed."
-msgstr "Transfer de fichier completé."
+msgstr "Transfer de fichier terminé."

 #: ../kmess/network/applications/transferprogressdialog.cpp:89
 #: ../kmess/network/applications/transferprogressdialog.cpp:101
 msgid " bytes transferred."
-msgstr " octlets transferrés."
+msgstr " octets transferré."

 #: ../kmess/network/applications/transferprogressdialog.cpp:101
 msgid " of "
@@ -879,19 +883,19 @@ msgstr "Ajouter un Contact"

 #: ../kmess/dialogs/addcontactdialog.cpp:38
 msgid "Enter the email address of the person you wish to add:"
-msgstr "Entrer l'adresse email de la personne que vous voulez ajouter:"
+msgstr "Entrer l'adresse email de la personne que vous voulez ajouter :"

 #: ../kmess/dialogs/awaymessagedialog.cpp:28
 msgid "Specify an Away message"
-msgstr "Specifier un message d'Absence"
+msgstr "Spécifier un message d'Absence"

 #: ../kmess/dialogs/awaymessagedialog.cpp:37
 msgid ""
 "Enter the message that will automatically be\n"
 "sent to people who try to message you:"
 msgstr ""
-"Entrer le message qui sera automatiquement envoyé\n"
-"aux personnes qui tenteront de vous contacter:"
+"Entrez le message qui sera automatiquement envoyé "
+"aux personnes qui tenteront de vous contacter :"

 #: ../kmess/dialogs/contactaddeduserdialoginterface.cpp:33
 msgid "Add contact"
@@ -899,7 +903,7 @@ msgstr "Ajouter le contact"

 #: ../kmess/dialogs/contactaddeduserdialoginterface.cpp:37
 msgid "has added you to his or her contact list.  Do you want to:"
-msgstr "vous a ajouté dans sa liste de contact. Que voulez vous faire:"
+msgstr "vous a ajouté dans sa liste de contact. Que voulez-vous faire ?"

 #: ../kmess/dialogs/contactaddeduserdialoginterface.cpp:42
 msgid "So-and-so (blah@hotmail.com)"
@@ -907,15 +911,15 @@ msgstr "So-and-so (blah@hotmail.com)"

 #: ../kmess/dialogs/contactaddeduserdialoginterface.cpp:47
 msgid "Add this contact to your \"Friends\" list"
-msgstr "Ajouter cette personne dans votre liste de contact"
+msgstr "Ajouter cette personne dans ma liste de contact"

 #: ../kmess/dialogs/contactaddeduserdialoginterface.cpp:51
 msgid "Not add this contact, but let them see your online state"
-msgstr "Ne pas ajouter ce contact, mais le laisser voir votre status"
+msgstr "Ne pas ajouter ce contact, mais le laisser voir mon statut"

 #: ../kmess/dialogs/contactaddeduserdialoginterface.cpp:55
 msgid "Block this person from contacting you or seeing your online state."
-msgstr "Empécher cette personne de vous contacter et de voir votre status."
+msgstr "Empêcher cette personne de me contacter et de voir mon statut."

 #: ../kmess/dialogs/contactnamedialog.cpp:29
 msgid "Change this person's name"
@@ -923,35 +927,35 @@ msgstr "Changer le nom de cette personne"

 #: ../kmess/dialogs/contactnamedialog.cpp:38
 msgid "Enter the name you would prefer to have used for this person:"
-msgstr "Entrer le nom que vous preferez donner a cette personne:"
+msgstr "Entrer le nom que vous préferez donner à cette personne :"

 #: ../kmess/dialogs/contactpropertiesdialog.cpp:66
 msgid "Use an alternative name for this person"
-msgstr "Choisir un autre Pseudo pour cette personne:"
+msgstr "Choisir un autre Pseudo pour cette personne :"

 #: ../kmess/dialogs/contactpropertiesdialog.cpp:74
 msgid "Show a popup balloon when this person goes online or offline"
-msgstr "Afficher une Bulle quand ce contact se connecte ou déconnecte."
+msgstr "Afficher une Bulle quand ce contact se connecte ou se déconnecte."

 #: ../kmess/dialogs/contactpropertiesdialog.cpp:81
 msgid "Picture:"
-msgstr "Attribuer une image: "
+msgstr "Attribuer une image : "

 #: ../kmess/dialogs/contactpropertiesdialog.cpp:92
 msgid "Sound:"
-msgstr "Attribuer un son: "
+msgstr "Attribuer un son : "

 #: ../kmess/dialogs/contactpropertiesdialog.cpp:210
 msgid "Contact Properties for "
-msgstr "Propriété pour "
+msgstr "Propriétés pour "

 #: ../kmess/dialogs/contactpropertiesdialog.cpp:243
 msgid "Email address: "
-msgstr "Adresse email: "
+msgstr "Adresse email : "

 #: ../kmess/dialogs/contactpropertiesdialog.cpp:244
 msgid "Current name: "
-msgstr "Pseudo actuel: "
+msgstr "Pseudo actuel : "

 #: ../kmess/dialogs/groupnamedialog.cpp:28
 msgid "Group Name"
@@ -959,7 +963,7 @@ msgstr "Nom du Groupe"

 #: ../kmess/dialogs/groupnamedialog.cpp:37
 msgid "Enter the new name for this group:"
-msgstr "Entrer le nouveau nom pour ce groupe:"
+msgstr "Entrer le nouveau nom pour ce groupe :"

 #: ../kmess/settings/accountswidget.cpp:85
 #: ../kmess/settings/settingsdialog.cpp:73
@@ -968,23 +972,23 @@ msgstr "Comptes"

 #: ../kmess/settings/accountswidget.cpp:86
 msgid "Your friendly name:"
-msgstr "Votre pseudo (libre):"
+msgstr "Votre pseudo :"

 #: ../kmess/settings/accountswidget.cpp:87
 msgid "Your email address:"
-msgstr "Votre adresse email:"
+msgstr "Votre adresse email :"

 #: ../kmess/settings/accountswidget.cpp:88
 msgid "Start in \"Invisible\" mode."
-msgstr "Demarer en mode \"Invisible\""
+msgstr "Démarrer en mode \"Invisible\""

 #: ../kmess/settings/accountswidget.cpp:89
 msgid "Your password:"
-msgstr "Votre mot de passe:"
+msgstr "Votre mot de passe :"

 #: ../kmess/settings/accountswidget.cpp:90
 msgid "Login with this account automatically at start-up"
-msgstr "Ce logguez auto avec ce compte au démarage"
+msgstr "Ce connecter automatiquement avec ce compte au démarrage"

 #: ../kmess/settings/alertswidget.cpp:98
 msgid "Hide popups after"
@@ -1004,7 +1008,7 @@ msgstr "minutes"

 #: ../kmess/settings/alertswidget.cpp:102
 msgid "Change status to \"Away-Idle\" when inactive"
-msgstr "Changer le status en \"Absent-Inactif\" quand vous etes inactif"
+msgstr "Changer le statut en \"Absent-Inactif\" quand vous êtes inactif"

 #: ../kmess/settings/alertswidget.cpp:103
 msgid "Show popup notifications for program events"
@@ -1012,16 +1016,16 @@ msgstr "Afficher une Bulle pour les notifications du programme"

 #: ../kmess/settings/alertswidget.cpp:104
 msgid "Show notifications when contacts go offline"
-msgstr "Afficher une Bulle quand un contact est Online"
+msgstr "Afficher une Bulle quand un contact est hors ligne"

 #: ../kmess/settings/chatloggingwidget.cpp:93
 #: ../kmess/settings/settingsdialog.cpp:76
 msgid "Chat Logging"
-msgstr "Enregistrements"
+msgstr "Enregistrements des Chats"

 #: ../kmess/settings/chatloggingwidget.cpp:94
 msgid "Organize chat folders by:"
-msgstr "Organiser les enregistrements dans des sous-repertoires par:"
+msgstr "Organiser les enregistrements dans des sous-repertoires par :"

 #: ../kmess/settings/chatloggingwidget.cpp:95
 msgid "Month"
@@ -1033,7 +1037,7 @@ msgstr "Années"

 #: ../kmess/settings/chatloggingwidget.cpp:97
 msgid "Save all chats in the parent directory"
-msgstr "Pas d'organisation (toutes les conversations dans le meme repertoire)"
+msgstr "Pas d'organisation (toutes les conversations dans le même répertoire)"

 #: ../kmess/settings/chatloggingwidget.cpp:98
 msgid "Day"
@@ -1045,7 +1049,7 @@ msgstr "Enregistrer toutes les conversations"

 #: ../kmess/settings/chatloggingwidget.cpp:100
 msgid "Save chat files in this parent directory:"
-msgstr "Enregistrer les conversations dans ce repertoire:"
+msgstr "Enregistrer les conversations dans ce répertoire :"

 #: ../kmess/settings/chatloggingwidget.cpp:101
 msgid "..."
@@ -1053,24 +1057,23 @@ msgstr "..."

 #: ../kmess/settings/chattingwidget.cpp:125
 msgid "Your message font:"
-msgstr "Police de vos messages:"
+msgstr "Police de vos messages :"

 #: ../kmess/settings/chattingwidget.cpp:128
 msgid "Show chat messages in a compact form"
-msgstr "Affiicher les messages de maniere compacte"
+msgstr "Afficher les messages de manière compacte"

 #: ../kmess/settings/chattingwidget.cpp:129
 msgid "Use font effects in messages, i.e. *bold*, /italic/, and _underline_"
-msgstr ""
-"Utiliser les effets dans les messages, ex: *gras*, /italique/ et _souligné_"
+msgstr "Utiliser les effets dans les messages, ex: *gras*, /italique/ et _souligné"

 #: ../kmess/settings/chattingwidget.cpp:130
 msgid "Show timestamps on messages"
-msgstr "Afficher la date dans les messages"
+msgstr "Afficher l'heure dans les messages"

 #: ../kmess/settings/chattingwidget.cpp:131
 msgid "Force contacts' messages to use this font:"
-msgstr "Forcer les messages des contacts a utiliser cette police:"
+msgstr "Forcer les messages des contacts à utiliser cette police :"

 #: ../kmess/settings/chattingwidget.cpp:132
 msgid "Show graphics in chat messages"
@@ -1078,11 +1081,11 @@ msgstr "Afficher les graphiques dans les messages"

 #: ../kmess/settings/emailwidget.cpp:76
 msgid "Mail Client"
-msgstr "Client email:"
+msgstr "Client email :"

 #: ../kmess/settings/emailwidget.cpp:77
 msgid "Use a specified command:"
-msgstr "Utiliser une commande spécifique:"
+msgstr "Utiliser une commande spécifique :"

 #: ../kmess/settings/emailwidget.cpp:78
 msgid "Use Hotmail"
@@ -1119,7 +1122,7 @@ msgstr "Email"

 #: ../kmess/settings/settingsdialog.cpp:523
 msgid "Are you sure you want to delete this account?"
-msgstr "Etes-vous sûr de vouloir supprimer ce compte?"
+msgstr "Etes-vous sûr de vouloir supprimer ce compte ?"

 #~ msgid "ChatViewInterface"
 #~ msgstr "ChatViewInterface"
@@ -1129,3 +1132,4 @@ msgstr "Etes-vous sûr de vouloir supprimer ce compte?"

 #~ msgid "EmailWidget"
 #~ msgstr "EmailWidget"
+